diff --git a/lab-auth/src/main/java/org/springblade/auth/utils/YaweiConstant.java b/lab-auth/src/main/java/org/springblade/auth/utils/YaweiConstant.java index d3c1dc8..8a353f5 100644 --- a/lab-auth/src/main/java/org/springblade/auth/utils/YaweiConstant.java +++ b/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 = "用户没有此业务系统权限,请重新登录!"; diff --git a/lab-common/src/main/java/org/springblade/common/constant/BusinessConstant.java b/lab-common/src/main/java/org/springblade/common/constant/BusinessConstant.java new file mode 100644 index 0000000..dca4959 --- /dev/null +++ b/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/"; +} diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/AutoStartModelServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/AutoStartModelServiceImpl.java index fc06677..714bc42 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/AutoStartModelServiceImpl.java +++ b/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