添加配置

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

@@ -21,6 +21,7 @@ import com.fs.his.param.FsDoctorExtractListSParam;
 import com.fs.his.service.*;
 import com.fs.his.vo.FsDoctorBillListSVO;
 import com.fs.his.vo.FsDoctorExtractListSVO;
+import com.fs.im.config.IMConfig;
 import com.fs.im.service.OpenIMService;
 import com.fs.sms.service.SmsService;
 import com.fs.system.service.ISysConfigService;
@@ -67,6 +68,8 @@ public class DoctorController extends  AppBaseController {
     private OpenIMService openIMService;
     @Autowired
     private SmsService smsService;
+    @Autowired
+    IMConfig imConfig;
     @ApiOperation("登录")
     @PostMapping("/login")
     public R login(@Validated  @RequestBody DoctorLoginParam param) {
@@ -108,6 +111,7 @@ public class DoctorController extends  AppBaseController {
     @ApiOperation("校验医生是否注册新的im")
     @PostMapping("/accountCheck")
     public R accountCheck(@RequestBody Map<String, String> userIdMap){
+        String prefix = imConfig.getPrefix();
         //获取管理员token
         String userId = userIdMap.get("userId");
         String adminToken = openIMService.getAdminToken();
@@ -119,7 +123,7 @@ public class DoctorController extends  AppBaseController {
             requestBody = new JSONObject();
             userIds.add(userId);
             requestBody.put("checkUserIDs", userIds);
-            String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/account_check")
+            String body = HttpRequest.post(imConfig.getUrl()+"/user/account_check")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(requestBody.toString())
@@ -132,7 +136,7 @@ public class DoctorController extends  AppBaseController {
                 int accountStatus = resultObj.getInt("accountStatus");
                 //未注册自动注册
                 if (accountStatus==0){
-                    String s = userId.replaceFirst("^scrmD", "");
+                    String s = userId.replaceFirst("^"+prefix+"D", "");
                     FsDoctor fsDoctor = doctorService.selectFsDoctorByDoctorId(Long.parseLong(s));
                     if (null==fsDoctor){
                         return R.error("用户不存在");
@@ -146,7 +150,7 @@ public class DoctorController extends  AppBaseController {
                     requestBody = new JSONObject();
                     //userIds.add(userId);
                     requestBody.put("users", users);
-                    String body1 = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/user_register")
+                    String body1 = HttpRequest.post(imConfig.getUrl()+"/user/user_register")
                             .header("operationID", String.valueOf(System.currentTimeMillis()))
                             .header("token", adminToken).body(requestBody.toString()).execute().body();
                     log.info("注册结果:"+body1);
@@ -157,7 +161,7 @@ public class DoctorController extends  AppBaseController {
             requestBody = new JSONObject();
             requestBody.put("platformID",5);
             requestBody.put("userID",userId);
-            String body1 = HttpRequest.post("https://web.im.cdwjyyh.com/api/auth/get_user_token")
+            String body1 = HttpRequest.post(imConfig.getUrl()+"/api/auth/get_user_token")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(requestBody.toString()).execute().body();

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

@@ -58,6 +58,7 @@ public class DrugReportController extends AppBaseController {
     private IFsDrugReportCountService fsDrugReportCountService;
     @Autowired
     private OpenIMService openIMService;
+    private static final String PREFIX = "scrm";
     @ApiOperation("获取报告列表")
     @GetMapping("/getDrugReportList")
     public R getDrugReportList(FsDrugReportListDParam param)
@@ -111,7 +112,7 @@ public class DrugReportController extends AppBaseController {
             //imService.sendMsg(msgDTO);
             ObjectMapper objectMapper = new ObjectMapper();
             String ex = objectMapper.writeValueAsString(customDTO);
-            openIMService.sendUtil("scrmD"+follow.getDoctorId(),"scrmU"+follow.getUserId(),110,"drugReport","","","",report.getReportId().toString(),ex);
+            openIMService.sendUtil(PREFIX+"D"+follow.getDoctorId(),PREFIX+"U"+follow.getUserId(),110,"drugReport","","","",report.getReportId().toString(),ex);
 
             fsDrugReportCountService.addReportCountByUserIdAndDoctorId(follow.getUserId(),follow.getDoctorId());
 
@@ -146,7 +147,7 @@ public class DrugReportController extends AppBaseController {
         //imService.sendMsg(msgDTO);
         ObjectMapper objectMapper = new ObjectMapper();
         String ex = objectMapper.writeValueAsString(customDTO);
-        openIMService.sendUtil("scrmD"+follow.getDoctorId(),"scrmU"+follow.getUserId(),110,"finishDrugReport","","您的用药咨询报告已出具，本次咨询结束","","",ex);
+        openIMService.sendUtil(PREFIX+"D"+follow.getDoctorId(),PREFIX+"U"+follow.getUserId(),110,"finishDrugReport","","您的用药咨询报告已出具，本次咨询结束","","",ex);
 
         redisTemplate.delete("DrugReport:doctorId:" + follow.getDoctorId() + ":userId:" + follow.getUserId());
         return R.ok();

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

@@ -72,6 +72,7 @@ public class FsDoctorServiceImpl implements IFsDoctorService
     ConfigUtil configUtil;
     @Autowired
     private OpenIMService openIMService;
+    private static final String PREFIX = "scrm";
     /**
      * 查询医生管理
      *
@@ -415,7 +416,7 @@ public class FsDoctorServiceImpl implements IFsDoctorService
                         //imService.sendMsg(msgDTO);
                         ObjectMapper objectMapper = new ObjectMapper();
                         String ex = objectMapper.writeValueAsString(customDTO3);
-                        openIMService.sendUtil("scrmD"+fsFollow.getDoctorId(),"scrmU"+fsFollow.getUserId(),110,"follow","","",followId,"",ex);
+                        openIMService.sendUtil(PREFIX+"D"+fsFollow.getDoctorId(),PREFIX+"U"+fsFollow.getUserId(),110,"follow","","",followId,"",ex);
                         /*OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
                         openImMsgDTO.setSendID("D"+fsFollow.getDoctorId().toString());
                         openImMsgDTO.setRecvID("U"+fsFollow.getUserId().toString());

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

@@ -56,6 +56,7 @@ public class FsFollowServiceImpl implements IFsFollowService
     @Autowired
     private FsDoctorMapper fsDoctorMapper;
     Logger logger= LoggerFactory.getLogger(getClass());
+    private static final String PREFIX = "scrm";
     /**
      * 查询随访管理
      *
@@ -190,7 +191,7 @@ public class FsFollowServiceImpl implements IFsFollowService
             //MsgResponseDTO msgResponseDTO = imService.sendMsg(msgDTO);
             ObjectMapper objectMapper = new ObjectMapper();
             String ex = objectMapper.writeValueAsString(customDTO);
-            OpenImResponseDTO follow = openIMService.sendUtil("D"+fsFollow.getDoctorId(), "U"+fsFollow.getUserId(), 110, "follow", "", "", followId, "",ex);
+            OpenImResponseDTO follow = openIMService.sendUtil(PREFIX+"D"+fsFollow.getDoctorId(), PREFIX+"U"+fsFollow.getUserId(), 110, "follow", "", "", followId, "",ex);
             /*OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
             openImMsgDTO.setSendID("D"+fsFollow.getDoctorId().toString());
             openImMsgDTO.setRecvID("U"+fsFollow.getUserId().toString());

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

@@ -79,6 +79,7 @@ public class FsInquiryOrderMsgServiceImpl implements IFsInquiryOrderMsgService
     @Autowired
     private DeviceSetUpService deviceSetUpService;
 
+    private static final String PREFIX = "scrm";
 //    @Autowired
 //    TemplateListener publisher;
     Logger logger= LoggerFactory.getLogger(getClass());
@@ -347,20 +348,20 @@ public class FsInquiryOrderMsgServiceImpl implements IFsInquiryOrderMsgService
             String companyUserId="";
             String msgType="2";
             //用户发送消息
-            if (send.contains("U")){
+            if (send.contains(PREFIX+"U")){
                 msgType="1";
-                userId=send.replace("U","");
-                if (to.contains("D")){
-                    doctorId=to.replace("D","");
+                userId=send.replace(PREFIX+"U","");
+                if (to.contains(PREFIX+"D")){
+                    doctorId=to.replace(PREFIX+"D","");
                     fsFollowReportService.addReport(userId,doctorId);
-                }else if (to.contains("C")){
-                    companyUserId=to.replace("C","");
+                }else if (to.contains(PREFIX+"C")){
+                    companyUserId=to.replace(PREFIX+"C","");
                 }
                 //医生发送消息
-            }else if (send.contains("D")){
-                doctorId=send.replace("D","");
-                if (to.contains("U")){
-                    userId=to.replace("U","");
+            }else if (send.contains(PREFIX+"D")){
+                doctorId=send.replace(PREFIX+"D","");
+                if (to.contains(PREFIX+"U")){
+                    userId=to.replace(PREFIX+"U","");
                     TemplateBean templateBean = TemplateBean.builder()
                             .title("您收到咨询回复")
                             .remark("您的咨询已回复")
@@ -403,15 +404,15 @@ public class FsInquiryOrderMsgServiceImpl implements IFsInquiryOrderMsgService
                         }
                     }
                 }else {
-                    companyUserId = to.replace("C","");
+                    companyUserId = to.replace(PREFIX+"C","");
                 }
                 //销售发送消息
-            }else if (send.contains("C")){
-                companyUserId=send.replace("C","");
-                if (to.contains("U")){
-                    userId=to.replace("U","");
+            }else if (send.contains(PREFIX+"C")){
+                companyUserId=send.replace(PREFIX+"C","");
+                if (to.contains(PREFIX+"U")){
+                    userId=to.replace(PREFIX+"U","");
                 }else {
-                    doctorId = to.replace("D","");
+                    doctorId = to.replace(PREFIX+"D","");
                 }
             }
             Long orderId = fsInquiryOrderMsgMapper.selectFsInquiryOrderMsgOrderId(doctorId, userId);

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

@@ -176,6 +176,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
     private ConfigUtil configUtil;
     @Autowired
     private OpenIMService openIMService;
+    private static final String PREFIX = PREFIX+"";
     /**
      * 查询问诊订单
      *
@@ -933,7 +934,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         //imService.sendMsg(msgDTO);
         ObjectMapper objectMapper = new ObjectMapper();
         String ex = objectMapper.writeValueAsString(customDTO);
-        openIMService.sendUtil("scrmD"+param.getDoctorId(),"scrmU"+order.getUserId(),110,"startInquiry","",doctor.getDoctorName()+doc+"为您服务","","","");
+        openIMService.sendUtil(PREFIX+"D"+param.getDoctorId(),PREFIX+"U"+order.getUserId(),110,"startInquiry","",doctor.getDoctorName()+doc+"为您服务","","","");
         /*OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
         openImMsgDTO.setSendID("D"+param.getDoctorId().toString());
         openImMsgDTO.setRecvID("U"+order.getUserId().toString());
@@ -966,7 +967,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
 
             ObjectMapper objectMapper1 = new ObjectMapper();
             String ex1 = objectMapper.writeValueAsString(customDTO1);
-            openIMService.sendUtil("scrmD"+param.getDoctorId(),"scrmU"+order.getUserId(),110,"startInquiry","","您好，我是芸医汇互联网医院执业药师，请问您有什么问题想咨询?","","",ex1);
+            openIMService.sendUtil(PREFIX+"D"+param.getDoctorId(),PREFIX+"U"+order.getUserId(),110,"startInquiry","","您好，我是芸医汇互联网医院执业药师，请问您有什么问题想咨询?","","",ex1);
             /*OpenImMsgDTO openImMsgDTO1 = new OpenImMsgDTO();
             openImMsgDTO1.setSendID("D"+param.getDoctorId().toString());
             openImMsgDTO1.setRecvID("U"+order.getUserId().toString());
@@ -1097,7 +1098,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         //imService.sendMsg(msgDTO);
         ObjectMapper objectMapper = new ObjectMapper();
         String ex = objectMapper.writeValueAsString(customDTO);
-        openIMService.sendUtil("scrmD"+order.getDoctorId(),"scrmU"+order.getUserId(),110,"startInquiry","",doctor.getDoctorName()+doc+"为您服务","","",ex);
+        openIMService.sendUtil(PREFIX+"D"+order.getDoctorId(),PREFIX+"U"+order.getUserId(),110,"startInquiry","",doctor.getDoctorName()+doc+"为您服务","","",ex);
         /*OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
         openImMsgDTO.setSendID("D"+order.getDoctorId().toString());
         openImMsgDTO.setRecvID("U"+order.getUserId().toString());
@@ -1130,7 +1131,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
 
             ObjectMapper objectMapper1 = new ObjectMapper();
             String ex1 = objectMapper.writeValueAsString(customDTO1);
-            openIMService.sendUtil("scrmD"+param.getDoctorId(),"scrmU"+order.getUserId(),110,"startInquiry","","您好，我是芸医汇互联网医院执业药师，请问您有什么问题想咨询?","","",ex1);
+            openIMService.sendUtil(PREFIX+"D"+param.getDoctorId(),PREFIX+"U"+order.getUserId(),110,"startInquiry","","您好，我是芸医汇互联网医院执业药师，请问您有什么问题想咨询?","","",ex1);
            /* OpenImMsgDTO openImMsgDTO1 = new OpenImMsgDTO();
             openImMsgDTO1.setSendID("D"+order.getDoctorId().toString());
             openImMsgDTO1.setRecvID("U"+order.getUserId().toString());

fs-service/src/main/java/com/fs/im/config/IMConfig.java

@@ -10,6 +10,11 @@ public class IMConfig {
     private String secret;
     @Value("${openIM.userID}")
     private String userID;
+    @Value("${openIM.url}")
+    private String url;
+    @Value("${openIM.prefix}")
+    private String prefix;
+
 
     public String getSecret() {
         return secret;
@@ -26,4 +31,20 @@ public class IMConfig {
     public void setUserID(String userID) {
         this.userID = userID;
     }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String scrm) {
+        this.prefix = scrm;
+    }
 }

fs-service/src/main/java/com/fs/im/service/impl/OpenIMServiceImpl.java

@@ -67,6 +67,8 @@ public class OpenIMServiceImpl implements OpenIMService {
     @Autowired
     @Lazy
     private AiHookService aiHookService;
+    private static final String OPEN_IM_URL = "https://web.im.cdwjyyh.com/api";
+    private static final String PREFIX = "scrm";
     /*@Autowired
     private IFsUserService fsUserService;*/
     @Override
@@ -81,7 +83,7 @@ public class OpenIMServiceImpl implements OpenIMService {
         String adminToken = null;
         // 发起 HTTP POST 请求，获取管理员 token
         try {
-            String response = HttpRequest.post("https://web.im.cdwjyyh.com/api/auth/get_admin_token")
+            String response = HttpRequest.post(OPEN_IM_URL+"/auth/get_admin_token")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .body(requestBody.toString())
                     .execute()
@@ -265,7 +267,7 @@ public class OpenIMServiceImpl implements OpenIMService {
                 pagination.put("pageNumber", pageNumber);
                 pagination.put("showNumber", pageSize);
                 requestBody.put("pagination", pagination);
-                String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/conversation/get_owner_conversation")
+                String body = HttpRequest.post(OPEN_IM_URL+"/conversation/get_owner_conversation")
                         .header("operationID", String.valueOf(System.currentTimeMillis()))
                         .header("token", adminToken)
                         .body(requestBody.toString())
@@ -318,7 +320,7 @@ public class OpenIMServiceImpl implements OpenIMService {
             pagination.put("showNumber", pageSize);
             requestPage.put("pagination", pagination);
 
-            String result = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/get_all_users_uid")
+            String result = HttpRequest.post(OPEN_IM_URL+"/user/get_all_users_uid")
                     .header("operationID", String.valueOf(time))
                     .header("token", token)
                     .body(requestPage.toString())
@@ -335,7 +337,7 @@ public class OpenIMServiceImpl implements OpenIMService {
 
             // 过滤出以C开头的用户ID
             List<String> userIds = userIDs.stream()
-                    .filter(uid -> uid.startsWith("scrmC"))
+                    .filter(uid -> uid.startsWith(PREFIX+"C"))
                     .collect(Collectors.toList());
 
             if (CollectionUtil.isNotEmpty(userIds)) {
@@ -343,7 +345,7 @@ public class OpenIMServiceImpl implements OpenIMService {
                 paramMap.put("userIDs", userIds);
 
                 String jsonBody = JSONUtil.toJsonStr(paramMap);
-                String result1 = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/get_users_info")
+                String result1 = HttpRequest.post(OPEN_IM_URL+"/user/get_users_info")
                         .header("operationID", String.valueOf(time))
                         .header("token", token)
                         .body(jsonBody)
@@ -365,7 +367,7 @@ public class OpenIMServiceImpl implements OpenIMService {
                         bodyMap.put("userInfo", updateUserInfo);
 
                         String jsonBody1 = JSONUtil.toJsonStr(bodyMap);
-                        String result2 = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/update_user_info_ex")
+                        String result2 = HttpRequest.post(OPEN_IM_URL+"/user/update_user_info_ex")
                                 .header("operationID", String.valueOf(System.currentTimeMillis()))
                                 .header("token", token)
                                 .body(jsonBody1)
@@ -401,11 +403,11 @@ public class OpenIMServiceImpl implements OpenIMService {
         OpenImResponseDTO responseDTO = null;
         Map<String, Object> paramMap = new HashMap<>();
         ArrayList<String> userIDs = new ArrayList<>();
-        userIDs.add("scrmC"+companyUser.getUserId());
+        userIDs.add(PREFIX+"C"+companyUser.getUserId());
         paramMap.put("userIDs", userIDs);
 
         String jsonBody = JSONUtil.toJsonStr(paramMap);
-        String result1 = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/get_users_info")
+        String result1 = HttpRequest.post(OPEN_IM_URL+"/user/get_users_info")
                 .header("operationID", String.valueOf(time))
                 .header("token", adminToken)
                 .body(jsonBody)
@@ -426,7 +428,7 @@ public class OpenIMServiceImpl implements OpenIMService {
             Map<String, Object> bodyMap = new HashMap<>();
             bodyMap.put("userInfo", updateUserInfo);
             String jsonBody1 = JSONUtil.toJsonStr(bodyMap);
-            String result2 = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/update_user_info_ex")
+            String result2 = HttpRequest.post(OPEN_IM_URL+"/user/update_user_info_ex")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(jsonBody1)
@@ -464,7 +466,7 @@ public class OpenIMServiceImpl implements OpenIMService {
         JSONObject jsonObject = new JSONObject(openImMsgDTO);
         log.info("发送消息的请求体:\n{}", jsonObject.toString());
         long time = new Date().getTime();
-        String result = HttpRequest.post("https://web.im.cdwjyyh.com/api/msg/send_msg")
+        String result = HttpRequest.post(OPEN_IM_URL+"/msg/send_msg")
                 .header("operationID", time + "")
                 .header("token",adminToken)
                 .body(jsonObject.toString())
@@ -507,8 +509,8 @@ public class OpenIMServiceImpl implements OpenIMService {
 
 
 
-        openImMsgDTO.setSendID("scrmC"+companyUserId);
-        openImMsgDTO.setRecvID("scrmU"+userId);
+        openImMsgDTO.setSendID(PREFIX+"C"+companyUserId);
+        openImMsgDTO.setRecvID(PREFIX+"U"+userId);
         openImMsgDTO.setContentType(110);
         openImMsgDTO.setSessionType(1);
         // 输出格式化JSON日志
@@ -524,8 +526,8 @@ public class OpenIMServiceImpl implements OpenIMService {
             OpenImMsgDTO.OfflinePushInfo offlinePushInfo = new OpenImMsgDTO.OfflinePushInfo();
             ObjectMapper objectMapper = new ObjectMapper();
             OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
-            if (sendID.startsWith("scrmC")){
-                CompanyUser company = companyUserMapper.selectCompanyUserByUserId(Long.parseLong(sendID.replace("scrmC", "")));
+            if (sendID.startsWith(PREFIX+"C")){
+                CompanyUser company = companyUserMapper.selectCompanyUserByUserId(Long.parseLong(sendID.replace(PREFIX+"C", "")));
                 if (null!=company){
                     offlinePushInfo.setTitle(company.getNickName());
                     openImMsgDTO.setSenderFaceURL(company.getAvatar());
@@ -583,15 +585,15 @@ public class OpenIMServiceImpl implements OpenIMService {
             OpenImMsgDTO.OfflinePushInfo offlinePushInfo = new OpenImMsgDTO.OfflinePushInfo();
             ObjectMapper objectMapper = new ObjectMapper();
             OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
-            if (sendID.startsWith("scrmD")){
-                FsDoctor fsDoctor = fsDoctorMapper.selectFsDoctorByDoctorId(Long.parseLong(sendID.replace("scrmD","")));
+            if (sendID.startsWith(PREFIX+"D")){
+                FsDoctor fsDoctor = fsDoctorMapper.selectFsDoctorByDoctorId(Long.parseLong(sendID.replace(PREFIX+"D","")));
                 //FsUser fsUser = fsUserService.selectFsUserByUserId(sendID);
                 if (null!=fsDoctor&&StringUtils.isNotEmpty(fsDoctor.getAvatar())){
                     offlinePushInfo.setTitle(fsDoctor.getDoctorName());
                     openImMsgDTO.setSenderFaceURL(fsDoctor.getAvatar());
                 }
-            }else if (sendID.startsWith("scrmC")){
-                CompanyUser company = companyUserMapper.selectCompanyUserByUserId(Long.parseLong(sendID.replace("scrmC", "")));
+            }else if (sendID.startsWith(PREFIX+"C")){
+                CompanyUser company = companyUserMapper.selectCompanyUserByUserId(Long.parseLong(sendID.replace(PREFIX+"C", "")));
                 if (null!=company&&StringUtils.isNotEmpty(company.getAvatar())){
                     offlinePushInfo.setTitle(company.getNickName());
                     openImMsgDTO.setSenderFaceURL(company.getAvatar());
@@ -678,9 +680,9 @@ public class OpenIMServiceImpl implements OpenIMService {
         try {
             ObjectMapper objectMapper = new ObjectMapper();
             OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
-            if (sendID.startsWith("scrmU")){
+            if (sendID.startsWith(PREFIX+"U")){
                 //FsDoctor fsDoctor = fsDoctorMapper.selectFsDoctorByDoctorId(Long.parseLong(sendID.replace("D","")));
-                FsUser fsUser = fsUserMapper.selectFsUserByUserId(Long.parseLong(sendID.replace("scrmU","")));
+                FsUser fsUser = fsUserMapper.selectFsUserByUserId(Long.parseLong(sendID.replace(PREFIX+"U","")));
                 if (null!=fsUser&&StringUtils.isNotEmpty(fsUser.getAvatar())){
                     openImMsgDTO.setSenderFaceURL(fsUser.getAvatar());
                 }
@@ -778,7 +780,7 @@ public class OpenIMServiceImpl implements OpenIMService {
         while (retryCount < maxRetries) {
             try {
                 JSONObject jsonObject = new JSONObject(dto);
-                String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/conversation/set_conversations")
+                String body = HttpRequest.post(OPEN_IM_URL+"/conversation/set_conversations")
                         .header("operationID", String.valueOf(System.currentTimeMillis()))
                         .header("token", adminToken)
                         .body(jsonObject.toString())
@@ -810,7 +812,7 @@ public class OpenIMServiceImpl implements OpenIMService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("userID1",userID1);
         jsonObject.put("userID2",userID2);
-        String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/friend/is_friend")
+        String body = HttpRequest.post(OPEN_IM_URL+"/friend/is_friend")
                 .header("operationID", String.valueOf(System.currentTimeMillis()))
                 .header("token", adminToken)
                 .body(jsonObject.toString())
@@ -847,7 +849,7 @@ public class OpenIMServiceImpl implements OpenIMService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("ownerUserID",ownerUserID);
         jsonObject.put("friendUserIDs",newFriendIds);
-        String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/friend/import_friend")
+        String body = HttpRequest.post(OPEN_IM_URL+"/friend/import_friend")
                 .header("operationID", String.valueOf(System.currentTimeMillis()))
                 .header("token", adminToken)
                 .body(jsonObject.toString())
@@ -884,7 +886,7 @@ public class OpenIMServiceImpl implements OpenIMService {
             requestBody = new JSONObject();
             userIds.add(userId);
             requestBody.put("checkUserIDs", userIds);
-            String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/account_check")
+            String body = HttpRequest.post(OPEN_IM_URL+"/user/account_check")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(requestBody.toString())
@@ -939,7 +941,7 @@ public class OpenIMServiceImpl implements OpenIMService {
                     requestBody = new JSONObject();
                     userIds.add(userId);
                     requestBody.put("users", users);
-                    HttpRequest.post("https://web.im.cdwjyyh.com/api/user/user_register")
+                    HttpRequest.post(OPEN_IM_URL+"/user/user_register")
                             .header("operationID", String.valueOf(System.currentTimeMillis()))
                             .header("token", adminToken).body(requestBody.toString()).execute().body();
                 }
@@ -952,7 +954,7 @@ public class OpenIMServiceImpl implements OpenIMService {
             requestBody = new JSONObject();
             requestBody.put("platformID",5);
             requestBody.put("userID",userId);
-            String body1 = HttpRequest.post("https://web.im.cdwjyyh.com/api/auth/get_user_token")
+            String body1 = HttpRequest.post(OPEN_IM_URL+"/auth/get_user_token")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(requestBody.toString()).execute().body();
@@ -973,13 +975,13 @@ public class OpenIMServiceImpl implements OpenIMService {
     public void checkAndImportFriend(Long companyUserId,String fsUserId) {
         try {
             // 注册账号
-            accountCheck("scrmC" + companyUserId, "2");
-            accountCheck("scrmU"+fsUserId, "1");
+            accountCheck(PREFIX+"C" + companyUserId, "2");
+            accountCheck(PREFIX+"U"+fsUserId, "1");
 
             // 导入好友关系
             ArrayList<String> userIds = new ArrayList<>();
-            userIds.add("scrmU" + fsUserId);
-            importFriend("scrmC" + companyUserId, userIds);
+            userIds.add(PREFIX+"U" + fsUserId);
+            importFriend(PREFIX+"C" + companyUserId, userIds);
         } catch (Exception e) {
             log.error("异步执行IM注册/添加好友失败:", e);
         }
@@ -990,14 +992,14 @@ public class OpenIMServiceImpl implements OpenIMService {
     public void checkAndImportFriendByDianBo(Long companyUserId,String fsUserId,String cropId) {
         try {
             // 注册账号
-            accountCheck("scrmC" + companyUserId, "2");
-            accountCheck("scrmU"+fsUserId, "1");
+            accountCheck(PREFIX+"C" + companyUserId, "2");
+            accountCheck(PREFIX+"U"+fsUserId, "1");
 
             // 导入好友关系
             ArrayList<String> userIds = new ArrayList<>();
-            userIds.add("scrmU" + fsUserId);
-            importFriend("scrmC" + companyUserId, userIds);
-            updateFriendByDianBo("scrmC" + companyUserId, userIds,cropId);
+            userIds.add(PREFIX+"U" + fsUserId);
+            importFriend(PREFIX+"C" + companyUserId, userIds);
+            updateFriendByDianBo(PREFIX+"C" + companyUserId, userIds,cropId);
         } catch (Exception e) {
             log.error("异步执行IM注册/添加好友失败:", e);
         }
@@ -1035,7 +1037,7 @@ public class OpenIMServiceImpl implements OpenIMService {
         jsonObject.put("ownerUserID",ownerUserID);
         jsonObject.put("friendUserIDs",friendUserIDs);
         jsonObject.put("remark",remark.get(0));
-        String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/friend/update_friends")
+        String body = HttpRequest.post(OPEN_IM_URL+"/friend/update_friends")
                 .header("operationID", String.valueOf(System.currentTimeMillis()))
                 .header("token", adminToken)
                 .body(jsonObject.toString())

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

@@ -141,4 +141,6 @@ image:
 
 openIM:
   secret: openIM123
-  userID: imAdmin
+  userID: imAdmin
+  url: https://web.im.cdwjyyh.com/api
+  prefix: scrm