Browse Source

推送展示问题

koul 7 years ago
parent
commit
4559fd9fd1

+ 13 - 13
applications/school/school-server/src/main/resources/application.yml

@@ -21,18 +21,18 @@ spring:
   messages:
     basename: i18n/messages
     encoding: UTF-8
-#  rabbitmq:
-#    host: 10.10.100.166
-#    port: 3306
-#    virtual-host: school
-#    username: root
-#    password: select111***
-#  zipkin:
-#    sender:
-#      type: rabbit
-#    locator:
-#      discovery:
-#        enabled: true
+  rabbitmq:
+    host: 10.10.100.166
+    port: 3306
+    virtual-host: school
+    username: root
+    password: select111***
+  zipkin:
+    sender:
+      type: rabbit
+    locator:
+      discovery:
+        enabled: true
   sleuth:
     sampler:
       probability: 1.0
@@ -99,4 +99,4 @@ hystrix:
                 enabled: true
               isolation:
                     thread:
-                        timeoutInMilliseconds: 30000
+                        timeoutInMilliseconds: 4000

+ 1 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/api/WxPushApi.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(name = "wechat-server")
 public interface WxPushApi {
 
-    @GetMapping("/wxPush")
+    @GetMapping("/wxpush")
     public String wxPush(@RequestParam("appId") String appId, @RequestParam("secret") String secret, @RequestParam(
             "openid") String openid, @RequestParam("templateId") String templateId,
                          @RequestParam("title") String title, @RequestParam("keyword1") String keyword1,