openim分支合并

fs-company/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 # Spring配置
 spring:
   profiles:
-#    active: druid-fcky-test
+    active: druid-jnsyj-test
 #    active: druid-jnmy-test
 #    active: druid-jzzx-test
 #    active: druid-hdt
@@ -11,5 +11,5 @@ spring:
 #    active: druid-yzt
 #    active: druid-myhk
 #    active: druid-sft
-    active: dev-jnlzjk
+#    active: dev-jnlzjk
 #    active: dev-yjb

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

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

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

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

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

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

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

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

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

@@ -168,8 +168,12 @@ token:
     # 令牌有效期（默认30分钟）
     expireTime: 180
 openIM:
-    secret: open
-    userID: imAd
+    secret: openIM123
+    userID: imAdmin
+    url: https://web.im.fbylive.com/api
+#是否使用新im
+im:
+    type: NONE
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: false
 

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

@@ -168,8 +168,12 @@ token:
     # 令牌有效期（默认30分钟）
     expireTime: 180
 openIM:
-    secret: open
-    userID: imAd
+    secret: openIM123
+    userID: imAdmin
+    url: https://web.im.fbylive.com/api
+#是否使用新im
+im:
+    type: NONE
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: false
 

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

@@ -149,7 +149,11 @@ rocketmq:
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
 openIM:
-    secret: op
-    userID: im
+    secret: openIM123
+    userID: imAdmin
+    url: https://web.im.fbylive.com/api
+#是否使用新im
+im:
+    type: NONE
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: false

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

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

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

@@ -139,9 +139,12 @@ rocketmq:
     access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
     secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
 openIM:
-  secret: op
-  userID: im
-
+  secret: openIM123
+  userID: imAdmin
+  url: https://web.im.fbylive.com/api
+#是否使用新im
+im:
+  type: NONE
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: false
 

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

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

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

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

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

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

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

@@ -158,5 +158,9 @@ rocketmq:
 openIM:
     secret: openIM123
     userID: imAdmin
+    url: https://web.im.fbylive.com/api
+#是否使用新im
+im:
+    type: TENCENT
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: true

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

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

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

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

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

@@ -164,7 +164,11 @@ token:
     # 令牌有效期（默认30分钟）
     expireTime: 180
 openIM:
-    secret:
-    userID:
+    secret: openIM123
+    userID: imAdmin
+    url: https://web.im.fbylive.com/api
+#是否使用新im
+im:
+    type: NONE
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: false

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

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