拦截器获取用户认证信息

server/src/main/java/edp/davinci/controller/DictController.java

@@ -45,7 +45,8 @@ public class DictController extends BaseController
             HttpServletRequest request)
     {
         List<DictType> dictTypes = dictService.getDictType();
-        return ResponseEntity.status(HttpStatus.OK).body(dictTypes);
+
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(dictTypes));
     }
 
     /**
@@ -60,7 +61,7 @@ public class DictController extends BaseController
                                     HttpServletRequest request)
     {
         List<DictData> dictDataList = dictService.getDictData(dictType);
-        return ResponseEntity.status(HttpStatus.OK).body(dictDataList);
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(dictDataList));
     }
 
     /**
@@ -78,7 +79,7 @@ public class DictController extends BaseController
 
         DictType record = dictService.createDictType(dictType);
 
-        return ResponseEntity.status(HttpStatus.OK).body(record);
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(record));
     }
 
     /**
@@ -95,7 +96,7 @@ public class DictController extends BaseController
     {
 
         DictData record = dictService.createDictData(dictData);
-        return ResponseEntity.ok(record);
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(record));
     }
 
     /**
@@ -116,7 +117,7 @@ public class DictController extends BaseController
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
         DictType sourceDetail = dictService.getDictTypeDetail(id);
-        return ResponseEntity.ok(sourceDetail);
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(sourceDetail));
     }
 
     /**
@@ -132,14 +133,14 @@ public class DictController extends BaseController
     public ResponseEntity getDictDataDetail(@PathVariable Long id,
                                           HttpServletRequest request) {
         DictData sourceDetail = dictService.getDictDataDetail(id);
-        return ResponseEntity.ok(sourceDetail);
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(sourceDetail));
     }
 
     /**
      * 更新dictType
      *
      * @param id
-     * @param source
+     * @param dictType
      * @param request
      * @return
      */
@@ -155,13 +156,13 @@ public class DictController extends BaseController
         }
 
         dictService.updateDictType(dictType);
-        return ResponseEntity.ok("update success");
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(dictType));
     }
     /**
      * 更新dictData
      *
      * @param id
-     * @param source
+     * @param dictData
      * @param request
      * @return
      */
@@ -177,7 +178,7 @@ public class DictController extends BaseController
         }
 
         dictService.updateDictData(dictData);
-        return ResponseEntity.ok("update success");
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(dictData));
     }
 
     /**
@@ -198,14 +199,13 @@ public class DictController extends BaseController
         }
 
         dictService.deleteDictType(id);
-        return ResponseEntity.ok("delete success");
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request));
     }
 
     /**
      * 删除dictdata
      *
      * @param id
-     * @param user
      * @param request
      * @return
      */
@@ -220,6 +220,6 @@ public class DictController extends BaseController
         }
 
         dictService.deleteDictData(id);
-        return ResponseEntity.ok("delete success");
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request));
     }
 }