From a338d9eb04e8e22c96bcf82c4c08fd1d7665d803 Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Thu, 17 Aug 2023 11:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=8E=B7=E5=8F=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=90=8E=E7=9A=84=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/chjyj/szwh/service/UserService.java    |  5 ++--
 .../szwh/service/impl/UserServiceImpl.java    | 27 ++++---------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/service/UserService.java b/src/main/java/cn/chjyj/szwh/service/UserService.java
index 5ca19b8..41f751d 100644
--- a/src/main/java/cn/chjyj/szwh/service/UserService.java
+++ b/src/main/java/cn/chjyj/szwh/service/UserService.java
@@ -25,11 +25,12 @@ public interface UserService {
     User getUserByIsli(String userIsli);
 
     /**
-     * 远程获取用户信息
+     * 获取用户信息
+     * 完成json 到map 的转换
      * @param userIsli
      * @return
      */
-    Map<String,Object> getApiUser(String userIsli, String token);
+    Map<String,Object> getApiUser(String userIsli);
 
     /**
      * 新增用户
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java
index 43dc87a..5a9fbfb 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java
@@ -6,6 +6,7 @@ import cn.chjyj.szwh.service.UserService;
 import cn.chjyj.szwh.utils.ProperUtils;
 import cn.chjyj.szwh.utils.RequestUtils;
 import cn.chjyj.szwh.utils.SignUtils;
+import cn.chjyj.szwh.utils.SzwhApiUtils;
 import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -46,29 +47,12 @@ public class UserServiceImpl implements UserService {
     /**
      * 远程获取用户信息
      * @param userIsli 用户
-     * @param token 用户请求凭据
      * @return
      */
     @Override
-    public Map<String,Object> getApiUser(String userIsli,String token) {
-        String userHost= ProperUtils.getSzwhProp("REAL_URL");//用户主机
-        if(StringUtils.isEmpty(userHost)){
-            userHost="";
-        }
-        // 远程获取用户的信息
-        ///users/usermgt/v1/user-info/
-        String userUrl=userHost+"/users/usermgt/v1/user-info/"+userIsli;
-        log.info("rquest url:"+userUrl);
-        // 创建签名
-        String sign= SignUtils.createSign("user_real");
-        log.info("user token:"+sign);
-        // 请求头
-        Map<String,Object> hmap =new HashMap();
-        hmap.put("token",sign);
-        //hmap.put("Content-Type","application/json");
-
-        //执行请求
-        JSONObject json = RequestUtils.GetData(userUrl,hmap,true);
+    public Map<String,Object> getApiUser(String userIsli) {
+        // 查询到用户信息，完成json 到map 的转换
+        JSONObject json = SzwhApiUtils.getApiUser(userIsli);
         log.info("request result:"+json);
         // json 内容转为map
         Map rmap = JSONObject.parseObject(json.getString("data"));
@@ -82,8 +66,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public Map<String, Object> getUserInfo(String userIsli) {
-        String token = SignUtils.createSign("user_real");
-        Map apimap = getApiUser(userIsli,token);
+        Map apimap = getApiUser(userIsli);
         if(apimap==null){
             return null;
         }