Merge remote-tracking branch 'origin/master'

fs-service/src/main/resources/application-druid-jzzx-test.yml

@@ -170,10 +170,10 @@ token:
 openIM:
     secret: openIM123
     userID: imAdmin
-    url: https://web.im.fbylive.com/api
+    url: https://web.im.jiuzhouzaixian.com/api
 #是否使用新im
 im:
-    type: NONE
+    type: OPENIM
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: true
 

fs-service/src/main/resources/application-druid-jzzx.yml

@@ -170,10 +170,10 @@ token:
 openIM:
     secret: openIM123
     userID: imAdmin
-    url: https://web.im.fbylive.com/api
+    url: https://web.im.jiuzhouzaixian.com/api
 #是否使用新im
 im:
-    type: NONE
+    type: OPENIM
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: false