From b72d69fd3d44f5762b413c60bd66e2fe16c31e9f Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Tue, 19 Jul 2022 22:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/controller/admin/AdminUserController.java   | 12 ++++--------
 .../cn/chjyj/szwh/service/impl/UserServiceImpl.java  |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java
index 303b662..11dc1ee 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java
@@ -112,19 +112,15 @@ public class AdminUserController extends BaseController {
 
     /**
      * 查询用户具体信息
-     * @param request
+     * @param
      * @return
      */
     @RequestMapping("/getUser")
-    public JSONObject getUser(HttpServletRequest request){
-        String token = request.getHeader("token");
-        //从token中抽取出accout_id
-        DecodedJWT decodedJWT = JWT.decode(token);
-        String accountId= decodedJWT.getClaim("account_id").asString();
-        Admin admin = adminService.getAdminByAccountId(accountId);
+    public JSONObject getUser(){
+        List<Admin> admlist = adminService.getAllAdmin();
         jsonObject.put("code",200);
         jsonObject.put("msg","成功");
-        jsonObject.put("data",admin);
+        jsonObject.put("data",admlist);
         return jsonObject;
     }
 }
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 1eb641e..bcc4631 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java
@@ -65,11 +65,11 @@ public class UserServiceImpl implements UserService {
         // 请求头
         Map<String,Object> hmap =new HashMap();
         hmap.put("token",sign);
-        hmap.put("Content-Type","application/json");
+        //hmap.put("Content-Type","application/json");
 
         //执行请求
         JSONObject json = RequestUtils.GetData(userUrl,hmap);
-        log.info("request result:"+json.toString());
+        log.info("request result:"+json);
         // json 内容转为map
         Map rmap = JSONObject.parseObject(json.getString("data"));
         return rmap;