对接IM增加本系统baseurl配置

tip-api/src/main/java/com/minto/app/organization/workpro/config/WorkProConfig.java

@@ -17,6 +17,8 @@ public class WorkProConfig{
 
     private boolean enable;
 
+    private String tcBaseUrl;
+
     private String url;
 
     private String appid;
@@ -43,6 +45,7 @@ public class WorkProConfig{
                     SystemProperties instance = SystemProperties.getInstance();
                     INSTANCE.setEnable(
                             Boolean.TRUE.toString().equalsIgnoreCase(instance.getProperty("workpro.enable")));
+                    INSTANCE.setTcBaseUrl(instance.getProperty("workpro.tc.baseUrl"));
                     INSTANCE.setUrl(instance.getProperty("workpro.url"));
                     INSTANCE.setAppid(instance.getProperty("workpro.appid"));
                     INSTANCE.setAppSecret(instance.getProperty("workpro.appSecret"));
@@ -57,8 +60,8 @@ public class WorkProConfig{
     }
 
     public boolean enable(){
-        return this.enable && StringUtils.isNoneEmpty(this.url, this.appid, this.appSecret, this.userId, this.account,
-                this.password);
+        return this.enable && StringUtils.isNoneEmpty(this.tcBaseUrl, this.url, this.appid, this.appSecret, this.userId,
+                this.account, this.password);
     }
 
 }

tip-api/src/main/java/com/minto/app/task/util/TaskImUtil.java

@@ -1,8 +1,6 @@
 package com.minto.app.task.util;
 
-import java.net.InetAddress;
 import java.net.URLEncoder;
-import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.Date;
@@ -14,11 +12,11 @@ import cn.hutool.core.date.DateUtil;
 import com.minto.app.organization.beans.OrgPersonBean;
 import com.minto.app.organization.manager.IOrgManager;
 import com.minto.app.organization.workpro.api.message.MessageSendMsgFormview;
+import com.minto.app.organization.workpro.config.WorkProConfig;
 import com.minto.app.organization.workpro.service.IWorkProService;
 import com.minto.app.task.beans.TaskSummaryBean;
 import com.minto.tip.common.util.ApplicationContextHolder;
 import org.apache.groovy.util.Maps;
-import org.springframework.core.env.Environment;
 
 /**
  * 应用模块名称<p>
@@ -32,28 +30,12 @@ public final class TaskImUtil{
 
     private static final String appName = "检察工作任务";
 
-    private static String baseUrl;
-
     private static IWorkProService workProService;
 
     private static IOrgManager orgManager;
 
     private static String getBaseUrl(){
-        if(baseUrl == null){
-            Environment env = ApplicationContextHolder.getApplicationContext().getEnvironment();
-            baseUrl = env.getProperty("tc.baseUrl");
-            if(baseUrl == null){
-                try{
-                    baseUrl = MessageFormat.format("http://{0}:{1}{2}", InetAddress.getLocalHost().getHostAddress(),
-                            env.getProperty("server.port", "8080"),
-                            env.getProperty("server.servlet.context-path", "/minto"));
-                } catch(UnknownHostException e){
-
-                }
-            }
-        }
-
-        return baseUrl;
+        return WorkProConfig.getInstance().getTcBaseUrl();
     }
 
     private static IWorkProService getWorkProService(){