大数据平台服务迁移修改服务IP地址

lab-auth/src/main/java/org/springblade/auth/utils/YaweiConstant.java

@@ -1,9 +1,11 @@
 package org.springblade.auth.utils;
 
+import org.springblade.common.constant.BusinessConstant;
+
 public interface YaweiConstant {
     String GRANT_TYPE = "yawei";
     String REDIRECT_ADDR = "http://jhoa.qd.gov.cn/Keeper.aspx";
-    String FALLBACK_ADDR = "http://10.133.191.105/#/login";
+    String FALLBACK_ADDR = BusinessConstant.WEB_SERVER_ADDR + "#/login";
 
     String MSG_USER_NO_GRANT = "用户没有此业务系统权限，请重新登录！";
 

lab-common/src/main/java/org/springblade/common/constant/BusinessConstant.java

@@ -0,0 +1,12 @@
+
+package org.springblade.common.constant;
+
+/**
+ * 业务常量
+ *
+ * @author lqk
+ */
+public interface BusinessConstant {
+
+	String WEB_SERVER_ADDR = "http://10.133.187.53/";
+}

lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/AutoStartModelServiceImpl.java

@@ -1,7 +1,6 @@
 package org.springblade.plugin.workbench.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
@@ -10,9 +9,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.HistoryService;
 import org.flowable.task.api.history.HistoricTaskInstance;
 import org.flowable.variable.api.history.HistoricVariableInstance;
+import org.springblade.common.constant.BusinessConstant;
 import org.springblade.core.log.model.LogError;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
@@ -20,10 +19,6 @@ import org.springblade.plugin.operation.database.entity.ProjectDatabase;
 import org.springblade.plugin.operation.database.entity.ModuleDatatable;
 import org.springblade.plugin.operation.database.service.IProjectDatabaseService;
 import org.springblade.plugin.operation.database.service.IModuleDatatableService;
-import org.springblade.plugin.operation.system.entity.ModuleInfo;
-import org.springblade.plugin.operation.system.entity.ProjectInfo;
-import org.springblade.plugin.operation.system.service.IModuleInfoService;
-import org.springblade.plugin.operation.system.service.IProjectInfoService;
 import org.springblade.plugin.operation.task.service.ITaskInfoService;
 import org.springblade.plugin.operation.webservice.WebServiceUtils;
 import org.springblade.plugin.operation.workorder.entity.InsertTodealByPollCode;
@@ -591,8 +586,7 @@ public class AutoStartModelServiceImpl extends BaseServiceImpl<BladeManMadeMappe
             code.setSendpersonGuid(startUser.getGuid());
             code.setFromExchangeCode(startUser.getMobile());
         }
-
-        code.setUrl("http://10.133.191.105/#/workflow/process/effect?id=" + workOrder.getId());
+        code.setUrl(BusinessConstant.WEB_SERVER_ADDR + "#/workflow/process/effect?id=" + workOrder.getId());
         System.out.println("workUrl===" + code.getUrl());
         WebServiceUtils.InsertTodealByPollCode(WebServiceUtils.getData(code));
     }

lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java

@@ -1,7 +1,6 @@
 package org.springblade.plugin.workflow.process.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -34,6 +33,7 @@ import org.flowable.task.api.history.HistoricTaskInstance;
 import org.flowable.task.api.history.HistoricTaskInstanceQuery;
 import org.flowable.variable.api.history.HistoricVariableInstance;
 import org.flowable.variable.api.history.HistoricVariableInstanceQuery;
+import org.springblade.common.constant.BusinessConstant;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.redis.lock.RedisLock;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -70,11 +70,8 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import sun.misc.BASE64Encoder;
 
 import javax.annotation.Nullable;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
@@ -1664,7 +1661,7 @@ public class WfProcessService implements IWfProcessService {
                 code.setFromExchangeCode(startUser.getMobile());
             }
 //            String base = "{\"taskId\":\""+list.get(0).getId()+"\"";
-            code.setUrl("http://10.133.191.105/#/workflow/process/details?taskId=" + list.get(0).getId() + "&processInsId=" + processInsId);
+            code.setUrl(BusinessConstant.WEB_SERVER_ADDR + "#/workflow/process/details?taskId=" + list.get(0).getId() + "&processInsId=" + processInsId);
 //            code.setUrl("http://10.133.191.105/#/plugin/workflow/process/todo");
             System.out.println("url====" + code.getUrl());
             WebServiceUtils.InsertTodealByPollCode(WebServiceUtils.getData(code));