root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:三线地址

Browse Source
This commit is contained in:
zhangzq
2024-05-14 16:03:38 +08:00
parent 15efc27f89
commit 447ce3f874
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.enums.StatusEnum; import org.nl.common.enums.StatusEnum;
import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
@@ -34,9 +35,14 @@ public class AcsUtil {
result.put("data", new JSONObject()); result.put("data", new JSONObject());
return result; return result;
} }
String acsParam = "acs_url";
JSONObject jsonObject = list.getJSONObject(0);
String acs = jsonObject.getString("acs");
if (StringUtils.isNotEmpty(acs)){
acsParam=acs;
}
//ACS地址：127.0.0.1:8010 //ACS地址：127.0.0.1:8010
String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue(); String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(acsParam).getValue();
String url = acsUrl + api; String url = acsUrl + api;
try { try {

2
mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
View File

@@ -12,7 +12,7 @@ public class CodeUtil{
final String[] code = {""}; final String[] code = {""};
HashMap<String,String> map = new HashMap<>(); HashMap<String,String> map = new HashMap<>();
map.put("flag", "1"); map.put("flag", "1");
map.put("code", ruleCode);d map.put("code", ruleCode);
GenCodeService service = SpringContextHolder.getBean(GenCodeServiceImpl.class); GenCodeService service = SpringContextHolder.getBean(GenCodeServiceImpl.class);
String codeId = service.queryIdByCode(ruleCode); String codeId = service.queryIdByCode(ruleCode);
RedissonUtils.lock(() -> { RedissonUtils.lock(() -> {