傅行帆 5 anos atrás
pai
commit
b04761ae76

+ 2
- 2
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Ver arquivo

143
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
143
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
144
     public ResponseBean taUserGet(HttpServletRequest request){
144
     public ResponseBean taUserGet(HttpServletRequest request){
145
         ResponseBean responseBean = new ResponseBean();
145
         ResponseBean responseBean = new ResponseBean();
146
-        String userId = JWTUtils.getSubject(request);
146
+        Map map = JWTUtils.getUserIdAndOrgId(request);
147
         try {
147
         try {
148
-            TaUser taUser = iTaUserService.getById(userId);
148
+            TaUser taUser = iTaUserService.getById(map.get("userId").toString());
149
             taUser.setLoginPassword("");
149
             taUser.setLoginPassword("");
150
             responseBean.addSuccess(taUser);
150
             responseBean.addSuccess(taUser);
151
         }catch (Exception e){
151
         }catch (Exception e){

+ 21
- 0
src/main/java/com/huiju/estateagents/common/JWTUtils.java Ver arquivo

39
         return null;
39
         return null;
40
     }
40
     }
41
     
41
     
42
+    /**
43
+     * getSubject 获取 jwt subject
44
+     * @param request
45
+     * @return
46
+     */
47
+    public static Map getUserIdAndOrgId(HttpServletRequest request) {
48
+        String jwtHeader = request.getHeader("authorization");
49
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
50
+        
51
+        String[] jwtAuths = jwtHeader.split("Bearer ");
52
+        if (null == jwtAuths || jwtAuths.length < 2) return null;
53
+        
54
+        try {
55
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody();
56
+        } catch (Exception e) {
57
+            e.printStackTrace();
58
+        }
59
+        
60
+        return null;
61
+    }
62
+    
42
     /**
63
     /**
43
      * getSubject 获取 jwt subject
64
      * getSubject 获取 jwt subject
44
      * @param request
65
      * @param request

+ 3
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Ver arquivo

23
 import java.time.LocalDateTime;
23
 import java.time.LocalDateTime;
24
 import java.util.ArrayList;
24
 import java.util.ArrayList;
25
 import java.util.List;
25
 import java.util.List;
26
+import java.util.Map;
26
 
27
 
27
 /**
28
 /**
28
  * <p>
29
  * <p>
95
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
96
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
96
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
97
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
97
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
98
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
98
-                                     @RequestParam(value = "isMain",required = false)Integer isMain){
99
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,HttpServletRequest request){
100
+        Map a = JWTUtils.getUserIdAndOrgId(request);
99
         return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
101
         return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
100
     }
102
     }
101
 
103