zhouz/huachuang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 是否启用acs连接

Browse Source
This commit is contained in:
liyongde
2026-07-28 14:20:10 +08:00
parent 566027cfdf
commit 51701d94b0
5 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nl-framework/nl-spring-boot-starter-execute/pom.xml
View File

@@ -18,6 +18,12 @@
<artifactId>nl-common</artifactId>
</dependency>
<dependency>
<groupId>cn.nl.cloud</groupId>
<artifactId>nl-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<!-- Spring 核心 -->
<dependency>
<groupId>org.springframework.boot</groupId>

3
nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/config/NlExecuteRpcAutoConfiguration.java
View File

@@ -2,6 +2,7 @@ package cn.code.nl.framework.execute.config;
import cn.code.nl.framework.execute.biz.api.lms.LmsTaskCommonApi;
import cn.code.nl.framework.execute.biz.api.wms.WmsTaskCommonApi;
import cn.code.nl.module.infra.api.config.ConfigApi;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -13,6 +14,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
* @Date: 2026/7/15
*/
@AutoConfiguration
@EnableFeignClients(clients = {LmsTaskCommonApi.class, WmsTaskCommonApi.class})
@EnableFeignClients(clients = {LmsTaskCommonApi.class, WmsTaskCommonApi.class, ConfigApi.class})
public class NlExecuteRpcAutoConfiguration {
}

44
nl-framework/nl-common/src/main/java/cn/code/nl/framework/common/util/http/AcsUtil.java → nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/util/http/AcsUtil.java
View File

@@ -1,26 +1,24 @@
package cn.code.nl.framework.common.util.http;
package cn.code.nl.framework.execute.util.http;
import cn.code.nl.framework.common.exception.ServerException;
import cn.code.nl.framework.common.exception.ServiceException;
import cn.code.nl.framework.common.pojo.AcsBaseRespDTO;
import cn.code.nl.framework.common.pojo.CommonResult;
import cn.code.nl.framework.common.util.http.HttpUtils;
import cn.code.nl.framework.common.util.json.JsonUtils;
import cn.code.nl.framework.common.util.spring.SpringUtils;
import cn.code.nl.module.infra.api.config.ConfigApi;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.InvocationTargetException;
import java.net.ConnectException;
import java.net.NoRouteToHostException;
import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.net.*;
import java.util.Collections;
import java.util.Map;
/**
* ACS 调用工具
*/
@Slf4j
public class AcsUtil {
/**
@@ -71,29 +69,13 @@ public class AcsUtil {
* 获取 ACS 开关配置
*/
private static String getAcsSwitchConfigValue() {
Object configApi;
try {
configApi = SpringUtils.getBean("configApi");
} catch (RuntimeException ex) {
return null;
}
try {
Object result = configApi.getClass()
.getMethod("getConfigValueByKey", String.class)
.invoke(configApi, ACS_SWITCH_CONFIG_KEY);
if (result instanceof CommonResult<?> commonResult) {
Object data = commonResult.getCheckedData();
return data instanceof String value ? value : null;
}
return null;
} catch (InvocationTargetException ex) {
Throwable targetException = ex.getTargetException();
if (targetException instanceof RuntimeException runtimeException) {
throw runtimeException;
}
throw new ServerException(500, "获取 ACS 开关配置失败");
} catch (ReflectiveOperationException ex) {
throw new ServerException(500, "获取 ACS 开关配置失败");
ConfigApi configApi = SpringUtils.getBean("configApi");
String checkedData = configApi.getConfigValueByKey(ACS_SWITCH_CONFIG_KEY).getCheckedData();
return ObjectUtil.isEmpty(checkedData) ? ACS_DISABLED : checkedData;
} catch (Exception ex) {
log.error("获取 ACS 开关配置失败", ex);
return ACS_DISABLED;
}
}

2
nl-module-task/nl-module-task-server/src/main/java/cn/code/nl/module/task/manage/TransportTaskIssueManager.java
View File

@@ -2,8 +2,8 @@ package cn.code.nl.module.task.manage;
import cn.code.nl.framework.common.exception.ServiceException;
import cn.code.nl.framework.common.pojo.CommonResult;
import cn.code.nl.framework.common.util.http.AcsUtil;
import cn.code.nl.framework.common.util.json.JsonUtils;
import cn.code.nl.framework.execute.util.http.AcsUtil;
import cn.code.nl.module.infra.api.config.ConfigApi;
import cn.code.nl.module.task.dal.dataobject.transporttask.TransportTaskDO;
import cn.code.nl.module.task.dal.mysql.transporttask.TransportTaskMapper;

2
nl-module-task/nl-module-task-server/src/main/java/cn/code/nl/module/task/manage/TransportTaskOperateCheckManager.java
View File

@@ -2,8 +2,8 @@ package cn.code.nl.module.task.manage;
import cn.code.nl.framework.common.exception.ServiceException;
import cn.code.nl.framework.common.pojo.CommonResult;
import cn.code.nl.framework.common.util.http.AcsUtil;
import cn.code.nl.framework.common.util.json.JsonUtils;
import cn.code.nl.framework.execute.util.http.AcsUtil;
import cn.code.nl.module.infra.api.config.ConfigApi;
import cn.code.nl.module.task.dal.dataobject.transporttask.TransportTaskDO;
import cn.code.nl.module.task.enums.TaskOperationTypeEnum;