SHA1
--- a/fs-service/src/main/resources/application-druid-fby.yml
+++ b/fs-service/src/main/resources/application-druid-fby.yml
@@ -167,9 +167,9 @@ openIM:
 
				     secret: openIM123
			
 
				     userID: imAdmin
			
 
				     url: https://web.im.fbylive.com/api
			
 
				-#是否使用新im
			
 
				+#im版本
			
 
				 im:
			
 
				-    type: NONE
			
 
				+    type: OPENIM
			
 
				 #是否为新商户，新商户不走mpOpenId
			
 
				 isNewWxMerchant: true
			
 
				 
			
--- a/fs-service/src/main/resources/application-druid-sxjz.yml
+++ b/fs-service/src/main/resources/application-druid-sxjz.yml
@@ -164,8 +164,8 @@ token:
 
				 openIM:
			
 
				     secret: openIM123
			
 
				     userID: imAdmin
			
 
				-    url: https://web.im.fbylive.com/api
			
 
				-#是否使用新im
			
 
				+    url:
			
 
				+#im版本
			
 
				 im:
			
 
				     type: NONE
			
 
				 #是否为新商户，新商户不走mpOpenId
Author	SHA1 Message	Date
caoliqin	7a14641f30 Merge branch 'openIm' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openIm	4 weeks ago
caoliqin	6da47b2855 feat：配置修改	4 weeks ago
caoliqin	be6101392f Merge branch 'openIm' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openIm	4 weeks ago
caoliqin	16af8c7c0f feat：今正配置添加	4 weeks ago