lihong 2 年之前
父節點
當前提交
ad60c4126b

+ 17 - 2
src/main/java/cn/hnthyy/thmz/Utils/TokenUtil.java

@@ -60,9 +60,24 @@ public class TokenUtil {
      * @return
      * @throws MzException
      */
-    public static User getUser(HttpServletRequest httpServletRequest){
+    public static User getUser(HttpServletRequest httpServletRequest) throws MzException {
         String token = TokenUtil.getToken(httpServletRequest);
-        AssertUtil.isNotBlank(token,"业务处理失败,用户Token不存在");
+        if(StringUtils.isBlank(token)){
+            throw new MzException("业务处理失败,用户token不存在");
+        }
+        DecodedJWT decodedJWT = TokenUtil.parseJWT(token);
+        return (User) JsonUtil.jsontoObject(decodedJWT.getSubject(), User.class);
+    }
+    /**
+     * @description:获取用户 新
+     * @author: lihong
+     * @date: 2023/8/15 15:40
+     * @param: httpServletRequest
+     * @return: cn.hnthyy.thmz.entity.thmz.User
+     **/
+    public static User getNewUser(HttpServletRequest httpServletRequest){
+        String token = TokenUtil.getToken(httpServletRequest);
+        AssertUtil.isNotBlank(token,"业务处理失败,用户token不存在");
         DecodedJWT decodedJWT = TokenUtil.parseJWT(token);
         return (User) JsonUtil.jsontoObject(decodedJWT.getSubject(), User.class);
     }

+ 1 - 1
src/main/java/cn/hnthyy/thmz/controller/bb/ReportStaticController.java

@@ -39,7 +39,7 @@ public class ReportStaticController {
     @RequestMapping(value = "/selectDoctorIndexData", method = {RequestMethod.GET, RequestMethod.POST})
     public R selectDoctorIndexData(@RequestBody ReportVo vo, HttpServletRequest httpServletRequest){
             AssertUtil.isNotBlank(vo.getReportId(),"报表id为空,查询报表数据失败");
-            User user = TokenUtil.getUser(httpServletRequest);
+            User user = TokenUtil.getNewUser(httpServletRequest);
             vo.setDoctorId(user.getUserIdCode());
             Map<String, Object> map = reportStaticService.selectDoctorIndexData(vo);
            return R.ok("查询报表数据成功").put("data",map);

+ 2 - 1
src/main/java/cn/hnthyy/thmz/interceptor/GlobalExceptionHandler.java

@@ -55,6 +55,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(Exception.class)
     @ResponseBody
     public R handleException(Exception e){
-        return R.error("系统错误:"+e.getMessage());
+        log.error("系统报错", e);
+        return R.error();
     }
 }