chore[litemall-admin-api]： 简化代码

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java

@@ -31,12 +31,7 @@ public class AdminRegionController {
 
     @GetMapping("/clist")
     public Object clist(@LoginAdmin Integer adminId, @NotNull Integer id) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
-
         List<LitemallRegion> regionList = regionService.queryByPid(id);
-
         return ResponseUtil.ok(regionList);
     }
 
@@ -47,10 +42,6 @@ public class AdminRegionController {
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort(accepts = {"id"}) @RequestParam(defaultValue = "id") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
-
         List<LitemallRegion> regionList = regionService.querySelective(name, code, page, limit, sort, order);
         int total = regionService.countSelective(name, code, page, limit, sort, order);
         Map<String, Object> data = new HashMap<>();

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java

@@ -26,25 +26,16 @@ public class AdminStatController {
 
     @GetMapping("/user")
     public Object statUser(@LoginAdmin Integer adminId) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
-
         List<Map> rows = statService.statUser();
         String[] columns = new String[]{"day", "users"};
         StatVo statVo = new StatVo();
         statVo.setColumns(columns);
         statVo.setRows(rows);
-
         return ResponseUtil.ok(statVo);
     }
 
     @GetMapping("/order")
     public Object statOrder(@LoginAdmin Integer adminId) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
-
         List<Map> rows = statService.statOrder();
         String[] columns = new String[]{"day", "orders", "customers", "amount", "pcr"};
         StatVo statVo = new StatVo();
@@ -56,17 +47,11 @@ public class AdminStatController {
 
     @GetMapping("/goods")
     public Object statGoods(@LoginAdmin Integer adminId) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
-
         List<Map> rows = statService.statGoods();
         String[] columns = new String[]{"day", "orders", "products", "amount"};
         StatVo statVo = new StatVo();
         statVo.setColumns(columns);
         statVo.setRows(rows);
-
-
         return ResponseUtil.ok(statVo);
     }
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java

@@ -50,9 +50,6 @@ public class AdminStorageController {
 
     @PostMapping("/create")
     public Object create(@LoginAdmin Integer adminId, @RequestParam("file") MultipartFile file) throws IOException {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         String originalFilename = file.getOriginalFilename();
         String url = storageService.store(file.getInputStream(), file.getSize(), file.getContentType(), originalFilename);
         Map<String, Object> data = new HashMap<>();
@@ -62,9 +59,6 @@ public class AdminStorageController {
 
     @PostMapping("/read")
     public Object read(@LoginAdmin Integer adminId, @NotNull Integer id) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         LitemallStorage storageInfo = litemallStorageService.findById(id);
         if (storageInfo == null) {
             return ResponseUtil.badArgumentValue();
@@ -74,9 +68,6 @@ public class AdminStorageController {
 
     @PostMapping("/update")
     public Object update(@LoginAdmin Integer adminId, @RequestBody LitemallStorage litemallStorage) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         if (litemallStorageService.update(litemallStorage) == 0) {
             return ResponseUtil.updatedDataFailed();
         }
@@ -85,9 +76,6 @@ public class AdminStorageController {
 
     @PostMapping("/delete")
     public Object delete(@LoginAdmin Integer adminId, @RequestBody LitemallStorage litemallStorage) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         String key = litemallStorage.getKey();
         if (StringUtils.isEmpty(key)) {
             return ResponseUtil.badArgument();

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java

@@ -35,10 +35,6 @@ public class AdminTopicController {
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
-
         List<LitemallTopic> topicList = topicService.querySelective(title, subtitle, page, limit, sort, order);
         int total = topicService.countSelective(title, subtitle, page, limit, sort, order);
         Map<String, Object> data = new HashMap<>();
@@ -66,9 +62,6 @@ public class AdminTopicController {
 
     @PostMapping("/create")
     public Object create(@LoginAdmin Integer adminId, @RequestBody LitemallTopic topic) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         Object error = validate(topic);
         if (error != null) {
             return error;
@@ -79,19 +72,12 @@ public class AdminTopicController {
 
     @GetMapping("/read")
     public Object read(@LoginAdmin Integer adminId, @NotNull Integer id) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
-
         LitemallTopic topic = topicService.findById(id);
         return ResponseUtil.ok(topic);
     }
 
     @PostMapping("/update")
     public Object update(@LoginAdmin Integer adminId, @RequestBody LitemallTopic topic) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         Object error = validate(topic);
         if (error != null) {
             return error;
@@ -104,9 +90,6 @@ public class AdminTopicController {
 
     @PostMapping("/delete")
     public Object delete(@LoginAdmin Integer adminId, @RequestBody LitemallTopic topic) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         topicService.deleteById(topic.getId());
         return ResponseUtil.ok();
     }

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java

@@ -38,9 +38,6 @@ public class AdminUserController {
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         List<LitemallUser> userList = userService.querySelective(username, mobile, page, limit, sort, order);
         int total = userService.countSeletive(username, mobile, page, limit, sort, order);
         Map<String, Object> data = new HashMap<>();
@@ -52,10 +49,6 @@ public class AdminUserController {
 
     @GetMapping("/username")
     public Object username(@LoginAdmin Integer adminId, @NotEmpty String username) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
-
         int total = userService.countSeletive(username, null, null, null, null, null);
         if (total == 0) {
             return ResponseUtil.ok("不存在");
@@ -87,9 +80,6 @@ public class AdminUserController {
 
     @PostMapping("/create")
     public Object create(@LoginAdmin Integer adminId, @RequestBody LitemallUser user) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         Object error = validate(user);
         if (error != null) {
             return error;
@@ -119,9 +109,6 @@ public class AdminUserController {
 
     @PostMapping("/update")
     public Object update(@LoginAdmin Integer adminId, @RequestBody LitemallUser user) {
-        if (adminId == null) {
-            return ResponseUtil.unlogin();
-        }
         Object error = validate(user);
         if (error != null) {
             return error;

litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java

 package org.linlinjava.litemall.core.config;
 
+import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authz.AuthorizationException;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.hibernate.validator.internal.engine.path.PathImpl;
@@ -47,6 +48,13 @@ public class GlobalExceptionHandler {
         return ResponseUtil.badArgumentValue();
     }
 
+    @ExceptionHandler(AuthenticationException.class)
+    @ResponseBody
+    public Object unauthenticatedHandler(AuthenticationException e) {
+        e.printStackTrace();
+        return ResponseUtil.unlogin();
+    }
+
     @ExceptionHandler(AuthorizationException.class)
     @ResponseBody
     public Object unauthorizedHandler(AuthorizationException e) {