From 252feb164154c1bbcb3f4a2f6d17457dcf392a0c Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 25 Oct 2024 09:26:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_grid' into gzdyh_grid
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 a677523..2ecadc2 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
@@ -17,10 +17,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
@Slf4j
@Service
@@ -165,8 +162,11 @@
// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
// 开发环境
if (SpringContextUtil.checkDev()) {
- log.info("xsdurl:{}",testUrl + "/api/thrid/grid/user/get-org-users");
- s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/user/get-org-users", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ log.info("xsdurl:{}",testUrl + "/api/thrid/grid/user/get-org-users"+JSON.toJSONString(gridOrgUsersVo));
+ Map<String, String> header = new HashMap<>();
+ String authorizationValue = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIVUdFSU5GTyIsImV4cCI6MTcyOTcwNzA3NywiaWF0IjoxNzI5NjYzODc3LCJ1c2VySWQiOiJkNjY2ZTUzZGMwMjU0NjNkYTllZTkwOTUyNjk5MTljNCYyMl8wMDAyNC0zIn0.a0TfTkKKDQpUJRyGUSVnfghIWvGy5hrTzxX26SpW7kA";
+ header.put("Authorization", authorizationValue);
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/user/get-org-users", JSON.toJSONString(gridOrgUsersVo), new HashMap<>(), "utf-8");
}else {
log.info("xsdurl:{}",gridUrl + "/sys/user/getUserListByOrg");
s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/user/getUserListByOrg", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
--
Gitblit v1.8.0