From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
index 799ab53..a53dc14 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
@@ -2,6 +2,7 @@
import cn.huge.base.common.bo.R;
import cn.huge.base.common.utils.HttpClientUtils;
+import cn.huge.base.common.utils.SpringContextUtil;
import cn.huge.module.grid.domain.dto.GridOrgDTO;
import cn.huge.module.grid.domain.dto.GridRoleMenuDTO;
import cn.huge.module.grid.domain.dto.GridSysRoleDTO;
@@ -37,9 +38,14 @@
requestVo.setBodyVo(gridTokenVo);
try {
// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
- log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
-// log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
- s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ // 开发环境
+ if (SpringContextUtil.checkDev()) {
+ log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(testUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }else {
+ log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }
log.info("xsd:{}",s);
} catch (Exception e) {
log.info("xsderror:{}",e.getLocalizedMessage());
--
Gitblit v1.8.0