im通用修改

fs-common-api/src/main/resources/application.yml

@@ -5,4 +5,4 @@ server:
 spring:
   profiles:
 #    active: dev
-    active: druid-jnmy
+    active: druid-myhk-test

fs-company/src/main/java/com/fs/company/controller/company/CompanyUserController.java

@@ -33,6 +33,7 @@ import com.fs.his.utils.qrcode.QRCodeUtils;
 import com.fs.his.vo.OptionsVO;
 import com.fs.hisStore.vo.FsStoreProductExportVO;
 import com.fs.im.config.IMConfig;
+import com.fs.im.dto.OpenImResponseDTO;
 import com.fs.im.service.OpenIMService;
 import com.fs.qw.domain.QwCompany;
 import com.fs.qw.service.IQwCompanyService;
@@ -601,13 +602,13 @@ public class CompanyUserController extends BaseController
                     ArrayList<Object> users = new ArrayList<>();
                     HashMap<String, String> map = new HashMap<>();
                     map.put("userID",userId);
-                    map.put("nickname",companyUser.getImNickName());
+                    map.put("nickname",companyUser.getNickName());
                     map.put("faceURL",companyUser.getAvatar());
                     users.add(map);
                     requestBody = new JSONObject();
-                    userIds.add(userId);
+                    //userIds.add(userId);
                     requestBody.put("users", users);
-                    HttpRequest.post(IMConfig.URL+"/user/user_register")
+                    String registerBody = HttpRequest.post(IMConfig.URL+"/user/user_register")
                             .header("operationID", String.valueOf(System.currentTimeMillis()))
                             .header("token", adminToken).body(requestBody.toString()).execute().body();
                 }
@@ -632,5 +633,12 @@ public class CompanyUserController extends BaseController
             return R.error("获取管理员token失败");
         }
     }
-
+    @ApiOperation("添加好友")
+    @PostMapping("/importFriend")
+    public R importFriend(@RequestBody HashMap<String,Object> map){
+        String ownerUserID = (String) map.get("ownerUserID");
+        List<String> friendUserIDs = (List<String>)map.get("friendUserIDs");
+        OpenImResponseDTO openImResponseDTO = openIMService.importFriend(ownerUserID, friendUserIDs);
+        return R.ok().put("data",openImResponseDTO);
+    }
 }

fs-company/src/main/java/com/fs/company/controller/store/FsPrescribeController.java

@@ -1,15 +1,20 @@
 package com.fs.company.controller.store;
 
+import cn.hutool.json.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.enums.ImTypeEnum;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.domain.FsPrescribe;
+import com.fs.his.dto.PayloadDTO;
 import com.fs.his.param.FsPrescribeParam;
 import com.fs.his.service.IFsExportTaskService;
 import com.fs.his.service.IFsPrescribeService;
@@ -17,6 +22,11 @@ import com.fs.his.vo.FsMessageFeedbackExportListVO;
 import com.fs.his.vo.FsPrescribeExcelListVO;
 import com.fs.his.vo.FsPrescribeListVO;
 import com.fs.his.vo.FsPrescribeVO;
+import com.fs.im.config.ImTypeConfig;
+import com.fs.im.dto.OpenImMsgDTO;
+import com.fs.im.dto.OpenImResponseDTO;
+import com.fs.im.service.OpenIMService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +41,7 @@ import java.util.List;
  * @author fs
  * @date 2023-06-13
  */
+@Slf4j
 @RestController
 @RequestMapping("/store/prescribe")
 public class FsPrescribeController extends BaseController
@@ -39,6 +50,8 @@ public class FsPrescribeController extends BaseController
     private IFsPrescribeService fsPrescribeService;
     @Autowired
     private IFsExportTaskService exportTaskService;
+    @Autowired
+    private OpenIMService openIMService;
     /**
      * 查询处方列表
      */
@@ -72,6 +85,64 @@ public class FsPrescribeController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/myImList")
+    public TableDataInfo myImList(FsPrescribeParam fsPrescribe)
+    {
+        startPage();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        //fsPrescribe.setCompanyUserId(loginUser.getUser().getUserId());
+        List<FsPrescribeListVO> list = fsPrescribeService.selectFsPrescribeListVO(fsPrescribe);
+        for (FsPrescribeListVO vo : list) {
+            if (vo.getPatientTel()!=null){
+                vo.setPatientTel(vo.getPatientTel().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+            }
+        }
+        return getDataTable(list);
+    }
+
+    @PostMapping("/sendPrescribe")
+    public AjaxResult sendPrescribe(@RequestBody FsPrescribeParam fsPrescribe) throws JsonProcessingException {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(ImTypeConfig.IMTYPE== ImTypeEnum.OPENIM){
+            log.info("拼接消息体");
+            //部署到正式环境以后下面这段代码要注释，使用定时任务执行auditPrescribe审核处方以后发送消息
+            ObjectMapper objectMapper = new ObjectMapper();
+            OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
+            openImMsgDTO.setSendID("C"+loginUser.getUser().getUserId());
+            openImMsgDTO.setRecvID("U"+fsPrescribe.getUserId());
+            openImMsgDTO.setContentType(110);
+            openImMsgDTO.setSenderPlatformID(5);
+            openImMsgDTO.setSessionType(1);
+            OpenImMsgDTO.Content content = new OpenImMsgDTO.Content();
+            //content.setContent(ext);
+            PayloadDTO payload = new PayloadDTO();
+            payload.setData("prescribe");
+            PayloadDTO.Extension extension = new PayloadDTO.Extension();
+            extension.setDiagnose(fsPrescribe.getDiagnose());
+            extension.setPrescribeId(fsPrescribe.getPrescribeId().toString());
+            payload.setExtension(extension);
+            extension.setStatus(fsPrescribe.getStatus());
+            OpenImMsgDTO.ImData imData = new OpenImMsgDTO.ImData();
+
+            imData.setPayload(payload);
+
+            String imJson = objectMapper.writeValueAsString(imData);
+            content.setData(imJson);
+            openImMsgDTO.setContent(content);
+
+            JSONObject jsonObject = new JSONObject(openImMsgDTO);
+            log.info("开始发送消息");
+//            OpenImMsgDTO.OfflinePushInfo offlinePushInfo = new OpenImMsgDTO.OfflinePushInfo();
+//            offlinePushInfo.setDesc("处方单");
+//            offlinePushInfo.setTitle(doctor.getDoctorName());
+//            offlinePushInfo.setIOSBadgeCount(true);
+//            offlinePushInfo.setIOSPushSound("");
+//            openImMsgDTO.setOfflinePushInfo(offlinePushInfo);
+            OpenImResponseDTO openImResponseDTO = openIMService.openIMSendMsg(openImMsgDTO);
+            return AjaxResult.success(openImResponseDTO);
+        }
+        return AjaxResult.success(null);
+    }
 
     /**
      * 导出处方列表

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

@@ -11,4 +11,4 @@ spring:
 #    active: druid-yzt
 #    active: druid-myhk
 #    active: druid-sft
-    active: dev
+    active: druid-myhk-test

fs-doctor-app/src/main/java/com/fs/app/controller/PrescribeController.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fs.app.annotation.Login;
 import com.fs.common.core.domain.R;
+import com.fs.common.enums.ImTypeEnum;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.core.utils.OrderCodeUtils;
@@ -19,6 +20,7 @@ import com.fs.his.service.*;
 import com.fs.his.vo.FsDoctorPrescribeListDVO;
 import com.fs.his.vo.FsPrescribeListDVO;
 import com.fs.im.config.IMConfig;
+import com.fs.im.config.ImTypeConfig;
 import com.fs.im.dto.MsgCustomDTO;
 import com.fs.im.dto.OpenImMsgDTO;
 import com.fs.im.dto.OpenImResponseDTO;
@@ -197,7 +199,7 @@ public class PrescribeController extends  AppBaseController {
     @ApiOperation("创建处方")
     @Transactional
     @PostMapping("/createPrescribe")
-    public R createPrescribe(@Validated @RequestBody FsPrescribeCreateParam param, HttpServletRequest request){
+    public R createPrescribe(@Validated @RequestBody FsPrescribeCreateParam param, HttpServletRequest request) throws JsonProcessingException {
 
         //获取问诊单
         FsInquiryOrder inquiryOrder=inquiryOrderService.selectFsInquiryOrderByOrderId(param.getOrderId());
@@ -264,6 +266,44 @@ public class PrescribeController extends  AppBaseController {
                     prescribeDrug.setPrescribeId(prescribe.getPrescribeId());
                     prescribeDrugService.insertFsPrescribeDrug(prescribeDrug);
                 }
+                if(ImTypeConfig.IMTYPE== ImTypeEnum.OPENIM){
+                    log.info("拼接消息体");
+                    //部署到正式环境以后下面这段代码要注释，使用定时任务执行auditPrescribe审核处方以后发送消息
+                    ObjectMapper objectMapper = new ObjectMapper();
+                    OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
+                    openImMsgDTO.setSendID("D"+inquiryOrder.getDoctorId());
+                    openImMsgDTO.setRecvID("U"+inquiryOrder.getUserId());
+                    openImMsgDTO.setContentType(110);
+                    openImMsgDTO.setSenderPlatformID(5);
+                    openImMsgDTO.setSessionType(1);
+                    OpenImMsgDTO.Content content = new OpenImMsgDTO.Content();
+                    //content.setContent(ext);
+                    PayloadDTO payload = new PayloadDTO();
+                    payload.setData("prescribe");
+                    PayloadDTO.Extension extension = new PayloadDTO.Extension();
+                    extension.setDiagnose(inquiryOrder.getTitle());
+                    extension.setPrescribeId(prescribe.getPrescribeId().toString());
+                    payload.setExtension(extension);
+                    extension.setStatus(prescribe.getStatus());
+                    OpenImMsgDTO.ImData imData = new OpenImMsgDTO.ImData();
+
+                    imData.setPayload(payload);
+
+                    String imJson = objectMapper.writeValueAsString(imData);
+                    content.setData(imJson);
+                    openImMsgDTO.setContent(content);
+
+                    JSONObject jsonObject = new JSONObject(openImMsgDTO);
+                    log.info("开始发送消息");
+                    OpenImMsgDTO.OfflinePushInfo offlinePushInfo = new OpenImMsgDTO.OfflinePushInfo();
+                    offlinePushInfo.setDesc("处方单");
+                    offlinePushInfo.setTitle(doctor.getDoctorName());
+                    offlinePushInfo.setIOSBadgeCount(true);
+                    offlinePushInfo.setIOSPushSound("");
+                    openImMsgDTO.setOfflinePushInfo(offlinePushInfo);
+                    OpenImResponseDTO openImResponseDTO = openIMService.openIMSendMsg(openImMsgDTO);
+                }
+
 
                 return R.ok("操作成功").put("prescribe",prescribe);
             }

fs-doctor-app/src/main/java/com/fs/framework/config/MyBatisConfig.java

@@ -1,5 +1,6 @@
 package com.fs.framework.config;
 
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.fs.common.utils.StringUtils;
 import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -114,7 +115,7 @@ public class MyBatisConfig
         return resources.toArray(new Resource[resources.size()]);
     }
 
-//    @Bean
+    //    @Bean
 //    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
 //    {
 //        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
@@ -130,19 +131,19 @@ public class MyBatisConfig
 //        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
 //        return sessionFactory.getObject();
 //    }
-@Bean
-public SqlSessionFactory sqlSessionFactorys(DataSource dataSource) throws Exception
-{
-    String typeAliasesPackage = env.getProperty("mybatis-plus.typeAliasesPackage");
-    String mapperLocations = env.getProperty("mybatis-plus.mapperLocations");
-    String configLocation = env.getProperty("mybatis-plus.configLocation");
-    typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
-    VFS.addImplClass(SpringBootVFS.class);
+    @Bean
+    public SqlSessionFactory sqlSessionFactorys(DataSource dataSource) throws Exception
+    {
+        String typeAliasesPackage = env.getProperty("mybatis-plus.typeAliasesPackage");
+        String mapperLocations = env.getProperty("mybatis-plus.mapperLocations");
+        String configLocation = env.getProperty("mybatis-plus.configLocation");
+        typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
+        VFS.addImplClass(SpringBootVFS.class);
 
-        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
         sessionFactory.setDataSource(dataSource);
         sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
-        sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations));
         sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
         return sessionFactory.getObject();
     }

fs-doctor-app/src/main/resources/application.yml

@@ -5,5 +5,5 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
+    active: druid-myhk-test
 #    active: druid-jnmy

fs-service/src/main/java/com/fs/his/param/FsPrescribeParam.java

@@ -134,6 +134,7 @@ public class FsPrescribeParam {
     private Long companyUserId;
 
     private Long taskId;//任务ID
+    private boolean isImOpen;
 
 
 

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderMsgServiceImpl.java

@@ -69,7 +69,6 @@ public class FsInquiryOrderMsgServiceImpl implements IFsInquiryOrderMsgService
     private FsDoctorMapper  doctorMapper;
     @Lazy
     @Autowired
-            @Lazy
     SmsServiceImpl smsService;
     @Autowired
     FsUserMapper fsUserMapper;

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java

@@ -814,7 +814,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
             map.setTradeNo(tradeNo);
             fsInquiryOrderMapper.updateFsInquiryOrder(map);
             // 木易华康特殊处理（支付成功医生自动接单）
-            if (CloudHostUtils.isCloudHostName("木易华康")&&order.getDoctorId()!=null) {
+            if (CloudHostUtils.hasCloudHostName("木易华康")&&order.getDoctorId()!=null) {
                 FsInquiryOrderReceiveParam fsInquiryOrderReceiveParam = new FsInquiryOrderReceiveParam();
                 fsInquiryOrderReceiveParam.setOrderId(order.getOrderId());
                 fsInquiryOrderReceiveParam.setDoctorId(order.getDoctorId());

fs-service/src/main/resources/application-config-myhk.yml

@@ -64,7 +64,7 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs :
-  commonApi: http://172.27.0.7:8010
+  commonApi: http://127.0.0.1:7771
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16

fs-service/src/main/resources/application-dev.yml

@@ -167,4 +167,4 @@ openIM:
 isNewWxMerchant: true
 #是否使用新im
 im:
-    type: OPENIM
+    type: NONE

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -151,8 +151,10 @@ rocketmq:
 openIM:
     secret: openIM123
     userID: imAdmin
-isNewWxMerchant: true
+    url: https://web.im.fbylive.com/api
 #是否使用新im
 im:
-    type: OPENIM
+    type: NONE
+isNewWxMerchant: true
+
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -164,9 +164,10 @@ openIM:
     secret: openIM123
     userID: imAdmin
     url: https://web.im.ysya.top/api
-#是否为新商户，新商户不走mpOpenId
-isNewWxMerchant: true
 #是否使用新im
 im:
     type: OPENIM
+#是否为新商户，新商户不走mpOpenId
+isNewWxMerchant: true
+
 

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

@@ -164,9 +164,9 @@ openIM:
     secret: openIM123
     userID: imAdmin
     url: https://web.im.ysya.top/api
-#是否为新商户，新商户不走mpOpenId
-isNewWxMerchant: true
 #是否使用新im
 im:
     type: OPENIM
+#是否为新商户，新商户不走mpOpenId
+isNewWxMerchant: true
 

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

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

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

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

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

@@ -142,13 +142,15 @@ rocketmq:
 openIM:
     secret: openIM123
     userID: imAdmin
+    url: https://web.im.fbylive.com/api
+#是否使用新im
+im:
+    type: NONE
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: true
 #图片模板是否缓存
 tuiImgCache: '1'
 getTuiImg: 'C:\Tools\ylrm_his_scrm\images\36f5863ffbbbdfc31620ea177c75284c.jpg'
 getTuiFont: 'C:\Tools\ylrm_his_scrm\images\simsunb.ttf'
-#是否使用新im
-im:
-    type: OPENIM
+
 

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

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

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

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

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

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

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

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

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

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

fs-user-app/src/main/resources/application.yml

@@ -6,7 +6,7 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
+    active: druid-myhk-test
 #    active: druid-jzzx
 #    active: druid-yzt
 #    active: druid-hdt