remove useless reference and modify log print type (#216)

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/Application.java

@@ -6,7 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-@SpringBootApplication(scanBasePackages = {"org.linlinjava.litemall.db", "org.linlinjava.litemall.core", "org.linlinjava.litemall.admin"})
+@SpringBootApplication(scanBasePackages = {"org.linlinjava.litemall.db", "org.linlinjava.litemall.core", "org" +
+        ".linlinjava.litemall.admin"})
 @MapperScan("org.linlinjava.litemall.db.dao")
 @EnableTransactionManagement
 @EnableScheduling

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/annotation/RequiresPermissionsDesc.java

@@ -1,7 +1,5 @@
 package org.linlinjava.litemall.admin.annotation;
 
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -11,5 +9,6 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface RequiresPermissionsDesc {
     String[] menu();
+
     String button();
 }

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/ShiroConfig.java

@@ -1,10 +1,10 @@
 package org.linlinjava.litemall.admin.config;
 
+import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.realm.Realm;
 import org.apache.shiro.session.mgt.SessionManager;
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
-import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.linlinjava.litemall.admin.shiro.AdminAuthorizingRealm;
 import org.linlinjava.litemall.admin.shiro.AdminWebSessionManager;
@@ -45,8 +45,8 @@ public class ShiroConfig {
 
     @Bean
     public SessionManager sessionManager() {
-        AdminWebSessionManager mySessionManager = new AdminWebSessionManager();
-        return mySessionManager;
+
+        return new AdminWebSessionManager();
     }
 
     @Bean
@@ -59,7 +59,8 @@ public class ShiroConfig {
 
     @Bean
     public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager) {
-        AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor = new AuthorizationAttributeSourceAdvisor();
+        AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor =
+                new AuthorizationAttributeSourceAdvisor();
         authorizationAttributeSourceAdvisor.setSecurityManager(securityManager);
         return authorizationAttributeSourceAdvisor;
     }

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/ShiroExceptionHandler.java

@@ -1,5 +1,7 @@
 package org.linlinjava.litemall.admin.config;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authz.AuthorizationException;
 import org.linlinjava.litemall.core.util.ResponseUtil;
@@ -10,20 +12,22 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @ControllerAdvice
-@Order( value = Ordered.HIGHEST_PRECEDENCE )
+@Order(value = Ordered.HIGHEST_PRECEDENCE)
 public class ShiroExceptionHandler {
 
+    private final Log logger = LogFactory.getLog(ShiroExceptionHandler.class);
+
     @ExceptionHandler(AuthenticationException.class)
     @ResponseBody
     public Object unauthenticatedHandler(AuthenticationException e) {
-        e.printStackTrace();
+        logger.warn(e.getMessage(), e);
         return ResponseUtil.unlogin();
     }
 
     @ExceptionHandler(AuthorizationException.class)
     @ResponseBody
     public Object unauthorizedHandler(AuthorizationException e) {
-        e.printStackTrace();
+        logger.warn(e.getMessage(), e);
         return ResponseUtil.unauthz();
     }
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/Swagger2Configuration.java

@@ -13,9 +13,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 /**
  * swagger在线文档配置<br>
  * 项目启动后可通过地址：http://host:ip/swagger-ui.html 查看在线文档
- * @version 2018-07-24
  *
  * @author enilu
+ * @version 2018-07-24
  */
 
 @Configuration

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/CouponJob.java

@@ -11,6 +11,7 @@ import org.linlinjava.litemall.db.util.CouponUserConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+
 import java.util.List;
 
 /**
@@ -35,13 +36,13 @@ public class CouponJob {
         logger.info("系统开启任务检查优惠券是否已经过期");
 
         List<LitemallCoupon> couponList = couponService.queryExpired();
-        for(LitemallCoupon coupon : couponList){
+        for (LitemallCoupon coupon : couponList) {
             coupon.setStatus(CouponConstant.STATUS_EXPIRED);
             couponService.updateById(coupon);
         }
 
         List<LitemallCouponUser> couponUserList = couponUserService.queryExpired();
-        for(LitemallCouponUser couponUser : couponUserList){
+        for (LitemallCouponUser couponUser : couponUserList) {
             couponUser.setStatus(CouponUserConstant.STATUS_EXPIRED);
             couponUserService.update(couponUser);
         }

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java

@@ -3,7 +3,6 @@ package org.linlinjava.litemall.admin.job;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.system.SystemConfig;
-import org.linlinjava.litemall.db.domain.LitemallGoodsProduct;
 import org.linlinjava.litemall.db.domain.LitemallOrder;
 import org.linlinjava.litemall.db.domain.LitemallOrderGoods;
 import org.linlinjava.litemall.db.service.LitemallGoodsProductService;
@@ -42,7 +41,7 @@ public class OrderJob {
      * 注意，因为是相隔半小时检查，因此导致订单真正超时时间是 [LITEMALL_ORDER_UNPAID, 30 + LITEMALL_ORDER_UNPAID]
      */
     @Scheduled(fixedDelay = 30 * 60 * 1000)
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void checkOrderUnpaid() {
         logger.info("系统开启任务检查订单是否已经超期自动取消订单");
 
@@ -65,7 +64,7 @@ public class OrderJob {
                     throw new RuntimeException("商品货品库存增加失败");
                 }
             }
-            logger.info("订单 ID=" + order.getId() + " 已经超期自动取消订单");
+            logger.info("订单 ID" + order.getId() + " 已经超期自动取消订单");
         }
     }
 
@@ -109,7 +108,6 @@ public class OrderJob {
     public void checkOrderComment() {
         logger.info("系统开启任务检查订单是否已经超期未评价");
 
-        LocalDateTime now = LocalDateTime.now();
         List<LitemallOrder> orderList = orderService.queryComment(SystemConfig.getOrderComment());
         for (LitemallOrder order : orderList) {
             order.setComments((short) 0);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java

@@ -37,10 +37,6 @@ public class AdminGoodsService {
     private LitemallCategoryService categoryService;
     @Autowired
     private LitemallBrandService brandService;
-    @Autowired
-    private LitemallCartService cartService;
-    @Autowired
-    private LitemallOrderGoodsService orderGoodsService;
 
     @Autowired
     private QCodeService qCodeService;

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java

@@ -53,7 +53,8 @@ public class AdminOrderService {
 
     public Object list(Integer userId, String orderSn, List<Short> orderStatusArray,
                        Integer page, Integer limit, String sort, String order) {
-        List<LitemallOrder> orderList = orderService.querySelective(userId, orderSn, orderStatusArray, page, limit, sort, order);
+        List<LitemallOrder> orderList = orderService.querySelective(userId, orderSn, orderStatusArray, page, limit,
+                sort, order);
         return ResponseUtil.okList(orderList);
     }
 
@@ -154,7 +155,8 @@ public class AdminOrderService {
         //TODO 发送邮件和短信通知，这里采用异步发送
         // 退款成功通知用户, 例如“您申请的订单退款 [ 单号:{1} ] 已成功，请耐心等待到账。”
         // 注意订单号只发后6位
-        notifyService.notifySmsTemplate(order.getMobile(), NotifyType.REFUND, new String[]{order.getOrderSn().substring(8, 14)});
+        notifyService.notifySmsTemplate(order.getMobile(), NotifyType.REFUND,
+                new String[]{order.getOrderSn().substring(8, 14)});
 
         logHelper.logOrderSucceed("退款", "订单编号 " + orderId);
         return ResponseUtil.ok();

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java

@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest;
  * 安全日志：用户安全相关的操作日志，例如登录、删除管理员
  * 订单日志：用户交易相关的操作日志，例如订单发货、退款
  * 其他日志：如果以上三种不合适，可以选择其他日志，建议是优先级最低的日志级别
- *
+ * <p>
  * 当然可能很多操作是不需要记录到数据库的，例如编辑商品、编辑广告品之类。
  */
 @Component
@@ -32,74 +32,73 @@ public class LogHelper {
     @Autowired
     private LitemallLogService logService;
 
-    public void logGeneralSucceed(String action){
+    public void logGeneralSucceed(String action) {
         logAdmin(LOG_TYPE_GENERAL, action, true, "", "");
     }
 
-    public void logGeneralSucceed(String action, String result){
+    public void logGeneralSucceed(String action, String result) {
         logAdmin(LOG_TYPE_GENERAL, action, true, result, "");
     }
 
-    public void logGeneralFail(String action, String error){
+    public void logGeneralFail(String action, String error) {
         logAdmin(LOG_TYPE_GENERAL, action, false, error, "");
     }
 
-    public void logAuthSucceed(String action){
+    public void logAuthSucceed(String action) {
         logAdmin(LOG_TYPE_AUTH, action, true, "", "");
     }
 
-    public void logAuthSucceed(String action, String result){
+    public void logAuthSucceed(String action, String result) {
         logAdmin(LOG_TYPE_AUTH, action, true, result, "");
     }
 
-    public void logAuthFail(String action, String error){
+    public void logAuthFail(String action, String error) {
         logAdmin(LOG_TYPE_AUTH, action, false, error, "");
     }
 
-    public void logOrderSucceed(String action){
+    public void logOrderSucceed(String action) {
         logAdmin(LOG_TYPE_ORDER, action, true, "", "");
     }
 
-    public void logOrderSucceed(String action, String result){
+    public void logOrderSucceed(String action, String result) {
         logAdmin(LOG_TYPE_ORDER, action, true, result, "");
     }
 
-    public void logOrderFail(String action, String error){
+    public void logOrderFail(String action, String error) {
         logAdmin(LOG_TYPE_ORDER, action, false, error, "");
     }
 
-    public void logOtherSucceed(String action){
+    public void logOtherSucceed(String action) {
         logAdmin(LOG_TYPE_OTHER, action, true, "", "");
     }
 
-    public void logOtherSucceed(String action, String result){
+    public void logOtherSucceed(String action, String result) {
         logAdmin(LOG_TYPE_OTHER, action, true, result, "");
     }
 
 
-    public void logOtherFail(String action, String error){
+    public void logOtherFail(String action, String error) {
         logAdmin(LOG_TYPE_OTHER, action, false, error, "");
     }
 
-    public void logAdmin (Integer type, String action, Boolean succeed, String result, String comment){
+    public void logAdmin(Integer type, String action, Boolean succeed, String result, String comment) {
         LitemallLog log = new LitemallLog();
 
         Subject currentUser = SecurityUtils.getSubject();
-        if(currentUser != null) {
+        if (currentUser != null) {
             LitemallAdmin admin = (LitemallAdmin) currentUser.getPrincipal();
-            if(admin != null) {
+            if (admin != null) {
                 log.setAdmin(admin.getUsername());
-            }
-            else{
+            } else {
                 log.setAdmin("匿名用户");
             }
-        }
-        else{
+        } else {
             log.setAdmin("匿名用户");
         }
 
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        if(request != null) {
+        HttpServletRequest request =
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        if (request != null) {
             log.setIp(IpUtil.getIpAddr(request));
         }
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java

@@ -52,7 +52,7 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
 
         UsernamePasswordToken upToken = (UsernamePasswordToken) token;
         String username = upToken.getUsername();
-        String password=new String(upToken.getPassword());
+        String password = new String(upToken.getPassword());
 
         if (StringUtils.isEmpty(username)) {
             throw new AccountException("用户名不能为空");
@@ -64,16 +64,16 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
         List<LitemallAdmin> adminList = adminService.findAdmin(username);
         Assert.state(adminList.size() < 2, "同一个用户名存在两个账户");
         if (adminList.size() == 0) {
-            throw new UnknownAccountException("找不到用户（"+username+"）的帐号信息");
+            throw new UnknownAccountException("找不到用户（" + username + "）的帐号信息");
         }
         LitemallAdmin admin = adminList.get(0);
 
         BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
         if (!encoder.matches(password, admin.getPassword())) {
-            throw new UnknownAccountException("找不到用户（"+username+"）的帐号信息");
+            throw new UnknownAccountException("找不到用户（" + username + "）的帐号信息");
         }
 
-        return new SimpleAuthenticationInfo(admin,password,getName());
+        return new SimpleAuthenticationInfo(admin, password, getName());
     }
 
 }

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminWebSessionManager.java

@@ -17,13 +17,13 @@ public class AdminWebSessionManager extends DefaultWebSessionManager {
     @Override
     protected Serializable getSessionId(ServletRequest request, ServletResponse response) {
         String id = WebUtils.toHttp(request).getHeader(LOGIN_TOKEN_KEY);
-         if (!StringUtils.isEmpty(id)) {
+        if (!StringUtils.isEmpty(id)) {
             request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE, REFERENCED_SESSION_ID_SOURCE);
             request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID, id);
             request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE);
             return id;
-         } else {
-              return super.getSessionId(request, response);
-         }
+        } else {
+            return super.getSessionId(request, response);
+        }
     }
 }

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/Permission.java

@@ -2,7 +2,6 @@ package org.linlinjava.litemall.admin.util;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 public class Permission {
     private RequiresPermissions requiresPermissions;

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java

@@ -74,8 +74,7 @@ public class PermissionUtil {
                 leftPerm.setLabel(requiresPermissionsDesc.button());
                 leftPerm.setApi(api);
                 perm2.getChildren().add(leftPerm);
-            }
-            else{
+            } else {
                 // TODO
                 // 目前限制Controller里面每个方法的RequiresPermissionsDesc注解是唯一的
                 // 如果允许相同，可能会造成内部权限不一致。
@@ -100,8 +99,10 @@ public class PermissionUtil {
             RequestMapping clazzRequestMapping = AnnotationUtils.findAnnotation(controllerClz, RequestMapping.class);
             List<Method> methods = MethodUtils.getMethodsListWithAnnotation(controllerClz, RequiresPermissions.class);
             for (Method method : methods) {
-                RequiresPermissions requiresPermissions = AnnotationUtils.getAnnotation(method, RequiresPermissions.class);
-                RequiresPermissionsDesc requiresPermissionsDesc = AnnotationUtils.getAnnotation(method, RequiresPermissionsDesc.class);
+                RequiresPermissions requiresPermissions = AnnotationUtils.getAnnotation(method,
+                        RequiresPermissions.class);
+                RequiresPermissionsDesc requiresPermissionsDesc = AnnotationUtils.getAnnotation(method,
+                        RequiresPermissionsDesc.class);
 
                 if (requiresPermissions == null || requiresPermissionsDesc == null) {
                     continue;
@@ -143,7 +144,7 @@ public class PermissionUtil {
 
     public static Set<String> listPermissionString(List<Permission> permissions) {
         Set<String> permissionsString = new HashSet<>();
-        for(Permission permission : permissions){
+        for (Permission permission : permissions) {
             permissionsString.add(permission.getRequiresPermissions().value()[0]);
         }
         return permissionsString;

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

@@ -27,7 +27,7 @@ public class AdminAdController {
     private LitemallAdService adService;
 
     @RequiresPermissions("admin:ad:list")
-    @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "查询")
     @GetMapping("/list")
     public Object list(String name, String content,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -51,7 +51,7 @@ public class AdminAdController {
     }
 
     @RequiresPermissions("admin:ad:create")
-    @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallAd ad) {
         Object error = validate(ad);
@@ -63,7 +63,7 @@ public class AdminAdController {
     }
 
     @RequiresPermissions("admin:ad:read")
-    @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallAd ad = adService.findById(id);
@@ -71,7 +71,7 @@ public class AdminAdController {
     }
 
     @RequiresPermissions("admin:ad:update")
-    @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallAd ad) {
         Object error = validate(ad);
@@ -86,7 +86,7 @@ public class AdminAdController {
     }
 
     @RequiresPermissions("admin:ad:delete")
-    @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallAd ad) {
         Integer id = ad.getId();

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

@@ -31,7 +31,7 @@ public class AdminAddressController {
     private LitemallRegionService regionService;
 
     @RequiresPermissions("admin:address:list")
-    @RequiresPermissionsDesc(menu={"用户管理" , "收货地址"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"用户管理", "收货地址"}, button = "查询")
     @GetMapping("/list")
     public Object list(Integer userId, String name,
                        @RequestParam(defaultValue = "1") Integer page,

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

@@ -36,7 +36,7 @@ public class AdminAdminController {
     private LogHelper logHelper;
 
     @RequiresPermissions("admin:admin:list")
-    @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "查询")
     @GetMapping("/list")
     public Object list(String username,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -63,7 +63,7 @@ public class AdminAdminController {
     }
 
     @RequiresPermissions("admin:admin:create")
-    @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallAdmin admin) {
         Object error = validate(admin);
@@ -87,7 +87,7 @@ public class AdminAdminController {
     }
 
     @RequiresPermissions("admin:admin:read")
-    @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallAdmin admin = adminService.findById(id);
@@ -95,7 +95,7 @@ public class AdminAdminController {
     }
 
     @RequiresPermissions("admin:admin:update")
-    @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallAdmin admin) {
         Object error = validate(admin);
@@ -120,7 +120,7 @@ public class AdminAdminController {
     }
 
     @RequiresPermissions("admin:admin:delete")
-    @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallAdmin admin) {
         Integer anotherAdminId = admin.getId();

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

@@ -16,9 +16,7 @@ import org.linlinjava.litemall.core.util.IpUtil;
 import org.linlinjava.litemall.core.util.JacksonUtil;
 import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.db.domain.LitemallAdmin;
-import org.linlinjava.litemall.db.domain.LitemallLog;
 import org.linlinjava.litemall.db.service.LitemallAdminService;
-import org.linlinjava.litemall.db.service.LitemallLogService;
 import org.linlinjava.litemall.db.service.LitemallPermissionService;
 import org.linlinjava.litemall.db.service.LitemallRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -153,7 +151,7 @@ public class AdminAuthController {
                 apis.clear();
                 apis.add("*");
                 return apis;
-//                return systemPermissionsMap.values();
+                //                return systemPermissionsMap.values();
 
             }
         }

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

@@ -28,7 +28,7 @@ public class AdminBrandController {
     private LitemallBrandService brandService;
 
     @RequiresPermissions("admin:brand:list")
-    @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "查询")
     @GetMapping("/list")
     public Object list(String id, String name,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -58,7 +58,7 @@ public class AdminBrandController {
     }
 
     @RequiresPermissions("admin:brand:create")
-    @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallBrand brand) {
         Object error = validate(brand);
@@ -70,7 +70,7 @@ public class AdminBrandController {
     }
 
     @RequiresPermissions("admin:brand:read")
-    @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallBrand brand = brandService.findById(id);
@@ -78,7 +78,7 @@ public class AdminBrandController {
     }
 
     @RequiresPermissions("admin:brand:update")
-    @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallBrand brand) {
         Object error = validate(brand);
@@ -92,7 +92,7 @@ public class AdminBrandController {
     }
 
     @RequiresPermissions("admin:brand:delete")
-    @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallBrand brand) {
         Integer id = brand.getId();

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

@@ -29,13 +29,13 @@ public class AdminCategoryController {
     private LitemallCategoryService categoryService;
 
     @RequiresPermissions("admin:category:list")
-    @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "查询")
     @GetMapping("/list")
     public Object list() {
         List<CategoryVo> categoryVoList = new ArrayList<>();
 
         List<LitemallCategory> categoryList = categoryService.queryByPid(0);
-        for(LitemallCategory category : categoryList){
+        for (LitemallCategory category : categoryList) {
             CategoryVo categoryVO = new CategoryVo();
             categoryVO.setId(category.getId());
             categoryVO.setDesc(category.getDesc());
@@ -47,7 +47,7 @@ public class AdminCategoryController {
 
             List<CategoryVo> children = new ArrayList<>();
             List<LitemallCategory> subCategoryList = categoryService.queryByPid(category.getId());
-            for(LitemallCategory subCategory : subCategoryList){
+            for (LitemallCategory subCategory : subCategoryList) {
                 CategoryVo subCategoryVo = new CategoryVo();
                 subCategoryVo.setId(subCategory.getId());
                 subCategoryVo.setDesc(subCategory.getDesc());
@@ -90,7 +90,7 @@ public class AdminCategoryController {
     }
 
     @RequiresPermissions("admin:category:create")
-    @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallCategory category) {
         Object error = validate(category);
@@ -102,7 +102,7 @@ public class AdminCategoryController {
     }
 
     @RequiresPermissions("admin:category:read")
-    @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallCategory category = categoryService.findById(id);
@@ -110,7 +110,7 @@ public class AdminCategoryController {
     }
 
     @RequiresPermissions("admin:category:update")
-    @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallCategory category) {
         Object error = validate(category);
@@ -125,7 +125,7 @@ public class AdminCategoryController {
     }
 
     @RequiresPermissions("admin:category:delete")
-    @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallCategory category) {
         Integer id = category.getId();

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

@@ -29,7 +29,7 @@ public class AdminCollectController {
 
 
     @RequiresPermissions("admin:collect:list")
-    @RequiresPermissionsDesc(menu={"用户管理" , "用户收藏"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"用户管理", "用户收藏"}, button = "查询")
     @GetMapping("/list")
     public Object list(String userId, String valueId,
                        @RequestParam(defaultValue = "1") Integer page,

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

@@ -25,7 +25,7 @@ public class AdminCommentController {
     private LitemallCommentService commentService;
 
     @RequiresPermissions("admin:comment:list")
-    @RequiresPermissionsDesc(menu={"商品管理" , "评论管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"商品管理", "评论管理"}, button = "查询")
     @GetMapping("/list")
     public Object list(String userId, String valueId,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -37,7 +37,7 @@ public class AdminCommentController {
     }
 
     @RequiresPermissions("admin:comment:delete")
-    @RequiresPermissionsDesc(menu={"商品管理" , "评论管理"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"商品管理", "评论管理"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallComment comment) {
         Integer id = comment.getId();

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

@@ -24,7 +24,7 @@ public class AdminConfigController {
     private LitemallSystemConfigService systemConfigService;
 
     @RequiresPermissions("admin:config:mall:list")
-    @RequiresPermissionsDesc(menu={"配置管理" , "商场配置"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"配置管理", "商场配置"}, button = "详情")
     @GetMapping("/mall")
     public Object listMall() {
         Map<String, String> data = systemConfigService.listMail();
@@ -32,9 +32,9 @@ public class AdminConfigController {
     }
 
     @RequiresPermissions("admin:config:mall:updateConfigs")
-    @RequiresPermissionsDesc(menu={"配置管理" , "商场配置"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"配置管理", "商场配置"}, button = "编辑")
     @PostMapping("/mall")
-    public Object updateMall(@RequestBody String body ) {
+    public Object updateMall(@RequestBody String body) {
         Map<String, String> data = JacksonUtil.toMap(body);
         systemConfigService.updateConfig(data);
         SystemConfig.updateConfigs(data);
@@ -42,7 +42,7 @@ public class AdminConfigController {
     }
 
     @RequiresPermissions("admin:config:express:list")
-    @RequiresPermissionsDesc(menu={"配置管理" , "运费配置"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"配置管理", "运费配置"}, button = "详情")
     @GetMapping("/express")
     public Object listExpress() {
         Map<String, String> data = systemConfigService.listExpress();
@@ -50,7 +50,7 @@ public class AdminConfigController {
     }
 
     @RequiresPermissions("admin:config:express:updateConfigs")
-    @RequiresPermissionsDesc(menu={"配置管理" , "运费配置"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"配置管理", "运费配置"}, button = "编辑")
     @PostMapping("/express")
     public Object updateExpress(@RequestBody String body) {
         Map<String, String> data = JacksonUtil.toMap(body);
@@ -60,7 +60,7 @@ public class AdminConfigController {
     }
 
     @RequiresPermissions("admin:config:order:list")
-    @RequiresPermissionsDesc(menu={"配置管理" , "订单配置"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"配置管理", "订单配置"}, button = "详情")
     @GetMapping("/order")
     public Object lisOrder() {
         Map<String, String> data = systemConfigService.listOrder();
@@ -68,7 +68,7 @@ public class AdminConfigController {
     }
 
     @RequiresPermissions("admin:config:order:updateConfigs")
-    @RequiresPermissionsDesc(menu={"配置管理" , "订单配置"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"配置管理", "订单配置"}, button = "编辑")
     @PostMapping("/order")
     public Object updateOrder(@RequestBody String body) {
         Map<String, String> data = JacksonUtil.toMap(body);
@@ -77,7 +77,7 @@ public class AdminConfigController {
     }
 
     @RequiresPermissions("admin:config:wx:list")
-    @RequiresPermissionsDesc(menu={"配置管理" , "小程序配置"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"配置管理", "小程序配置"}, button = "详情")
     @GetMapping("/wx")
     public Object listWx() {
         Map<String, String> data = systemConfigService.listWx();
@@ -85,7 +85,7 @@ public class AdminConfigController {
     }
 
     @RequiresPermissions("admin:config:wx:updateConfigs")
-    @RequiresPermissionsDesc(menu={"配置管理" , "小程序配置"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"配置管理", "小程序配置"}, button = "编辑")
     @PostMapping("/wx")
     public Object updateWx(@RequestBody String body) {
         Map<String, String> data = JacksonUtil.toMap(body);

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

@@ -32,7 +32,7 @@ public class AdminCouponController {
     private LitemallCouponUserService couponUserService;
 
     @RequiresPermissions("admin:coupon:list")
-    @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "查询")
     @GetMapping("/list")
     public Object list(String name, Short type, Short status,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -44,27 +44,28 @@ public class AdminCouponController {
     }
 
     @RequiresPermissions("admin:coupon:listuser")
-    @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="查询用户")
+    @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "查询用户")
     @GetMapping("/listuser")
     public Object listuser(Integer userId, Integer couponId, Short status,
-                       @RequestParam(defaultValue = "1") Integer page,
-                       @RequestParam(defaultValue = "10") Integer limit,
-                       @Sort @RequestParam(defaultValue = "add_time") String sort,
-                       @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallCouponUser> couponList = couponUserService.queryList(userId, couponId, status, page, limit, sort, order);
+                           @RequestParam(defaultValue = "1") Integer page,
+                           @RequestParam(defaultValue = "10") Integer limit,
+                           @Sort @RequestParam(defaultValue = "add_time") String sort,
+                           @Order @RequestParam(defaultValue = "desc") String order) {
+        List<LitemallCouponUser> couponList = couponUserService.queryList(userId, couponId, status, page, limit, sort
+                , order);
         return ResponseUtil.okList(couponList);
     }
 
     private Object validate(LitemallCoupon coupon) {
         String name = coupon.getName();
-        if(StringUtils.isEmpty(name)){
+        if (StringUtils.isEmpty(name)) {
             return ResponseUtil.badArgument();
         }
         return null;
     }
 
     @RequiresPermissions("admin:coupon:create")
-    @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallCoupon coupon) {
         Object error = validate(coupon);
@@ -73,7 +74,7 @@ public class AdminCouponController {
         }
 
         // 如果是兑换码类型，则这里需要生存一个兑换码
-        if (coupon.getType().equals(CouponConstant.TYPE_CODE)){
+        if (coupon.getType().equals(CouponConstant.TYPE_CODE)) {
             String code = couponService.generateCode();
             coupon.setCode(code);
         }
@@ -83,7 +84,7 @@ public class AdminCouponController {
     }
 
     @RequiresPermissions("admin:coupon:read")
-    @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallCoupon coupon = couponService.findById(id);
@@ -91,7 +92,7 @@ public class AdminCouponController {
     }
 
     @RequiresPermissions("admin:coupon:update")
-    @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallCoupon coupon) {
         Object error = validate(coupon);
@@ -105,7 +106,7 @@ public class AdminCouponController {
     }
 
     @RequiresPermissions("admin:coupon:delete")
-    @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallCoupon coupon) {
         couponService.deleteById(coupon.getId());

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

@@ -32,14 +32,15 @@ public class AdminFeedbackController {
     private LitemallFeedbackService feedbackService;
 
     @RequiresPermissions("admin:feedback:list")
-    @RequiresPermissionsDesc(menu={"用户管理" , "意见反馈"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"用户管理", "意见反馈"}, button = "查询")
     @GetMapping("/list")
     public Object list(Integer userId, String username,
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallFeedback> feedbackList = feedbackService.querySelective(userId, username, page, limit, sort, order);
+        List<LitemallFeedback> feedbackList = feedbackService.querySelective(userId, username, page, limit, sort,
+                order);
         return ResponseUtil.okList(feedbackList);
     }
 }

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

@@ -28,14 +28,15 @@ public class AdminFootprintController {
     private LitemallFootprintService footprintService;
 
     @RequiresPermissions("admin:footprint:list")
-    @RequiresPermissionsDesc(menu={"用户管理" , "用户足迹"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"用户管理", "用户足迹"}, button = "查询")
     @GetMapping("/list")
     public Object list(String userId, String goodsId,
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallFootprint> footprintList = footprintService.querySelective(userId, goodsId, page, limit, sort, order);
+        List<LitemallFootprint> footprintList = footprintService.querySelective(userId, goodsId, page, limit, sort,
+                order);
         return ResponseUtil.okList(footprintList);
     }
 }

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

@@ -38,7 +38,7 @@ public class AdminGrouponController {
     private LitemallGrouponService grouponService;
 
     @RequiresPermissions("admin:groupon:read")
-    @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "详情")
     @GetMapping("/listRecord")
     public Object listRecord(String grouponId,
                              @RequestParam(defaultValue = "1") Integer page,
@@ -70,7 +70,7 @@ public class AdminGrouponController {
     }
 
     @RequiresPermissions("admin:groupon:list")
-    @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "查询")
     @GetMapping("/list")
     public Object list(String goodsId,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -103,7 +103,7 @@ public class AdminGrouponController {
     }
 
     @RequiresPermissions("admin:groupon:update")
-    @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallGrouponRules grouponRules) {
         Object error = validate(grouponRules);
@@ -128,7 +128,7 @@ public class AdminGrouponController {
     }
 
     @RequiresPermissions("admin:groupon:create")
-    @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallGrouponRules grouponRules) {
         Object error = validate(grouponRules);
@@ -151,7 +151,7 @@ public class AdminGrouponController {
     }
 
     @RequiresPermissions("admin:groupon:delete")
-    @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallGrouponRules grouponRules) {
         Integer id = grouponRules.getId();

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

@@ -26,14 +26,15 @@ public class AdminHistoryController {
     private LitemallSearchHistoryService searchHistoryService;
 
     @RequiresPermissions("admin:history:list")
-    @RequiresPermissionsDesc(menu={"用户管理" , "搜索历史"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"用户管理", "搜索历史"}, button = "查询")
     @GetMapping("/list")
     public Object list(String userId, String keyword,
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallSearchHistory> historyList = searchHistoryService.querySelective(userId, keyword, page, limit, sort, order);
+        List<LitemallSearchHistory> historyList = searchHistoryService.querySelective(userId, keyword, page, limit,
+                sort, order);
         return ResponseUtil.okList(historyList);
     }
 }

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

@@ -51,14 +51,14 @@ public class AdminIndexController {
     }
 
     @RequiresPermissions("index:permission:read")
-    @RequiresPermissionsDesc(menu={"其他" , "权限测试"}, button="权限读")
+    @RequiresPermissionsDesc(menu = {"其他", "权限测试"}, button = "权限读")
     @GetMapping("/read")
     public Object read() {
         return ResponseUtil.ok("hello world, this is admin service");
     }
 
     @RequiresPermissions("index:permission:write")
-    @RequiresPermissionsDesc(menu={"其他" , "权限测试"}, button="权限写")
+    @RequiresPermissionsDesc(menu = {"其他", "权限测试"}, button = "权限写")
     @PostMapping("/write")
     public Object write() {
         return ResponseUtil.ok("hello world, this is admin service");

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

@@ -27,7 +27,7 @@ public class AdminIssueController {
     private LitemallIssueService issueService;
 
     @RequiresPermissions("admin:issue:list")
-    @RequiresPermissionsDesc(menu={"商场管理" , "通用问题"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"商场管理", "通用问题"}, button = "查询")
     @GetMapping("/list")
     public Object list(String question,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -51,7 +51,7 @@ public class AdminIssueController {
     }
 
     @RequiresPermissions("admin:issue:create")
-    @RequiresPermissionsDesc(menu={"商场管理" , "通用问题"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"商场管理", "通用问题"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallIssue issue) {
         Object error = validate(issue);
@@ -70,7 +70,7 @@ public class AdminIssueController {
     }
 
     @RequiresPermissions("admin:issue:update")
-    @RequiresPermissionsDesc(menu={"商场管理" , "通用问题"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"商场管理", "通用问题"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallIssue issue) {
         Object error = validate(issue);
@@ -85,7 +85,7 @@ public class AdminIssueController {
     }
 
     @RequiresPermissions("admin:issue:delete")
-    @RequiresPermissionsDesc(menu={"商场管理" , "通用问题"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"商场管理", "通用问题"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallIssue issue) {
         Integer id = issue.getId();

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

@@ -27,7 +27,7 @@ public class AdminKeywordController {
     private LitemallKeywordService keywordService;
 
     @RequiresPermissions("admin:keyword:list")
-    @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "查询")
     @GetMapping("/list")
     public Object list(String keyword, String url,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -47,7 +47,7 @@ public class AdminKeywordController {
     }
 
     @RequiresPermissions("admin:keyword:create")
-    @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallKeyword keyword) {
         Object error = validate(keyword);
@@ -59,7 +59,7 @@ public class AdminKeywordController {
     }
 
     @RequiresPermissions("admin:keyword:read")
-    @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallKeyword keyword = keywordService.findById(id);
@@ -67,7 +67,7 @@ public class AdminKeywordController {
     }
 
     @RequiresPermissions("admin:keyword:update")
-    @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallKeyword keyword) {
         Object error = validate(keyword);
@@ -81,7 +81,7 @@ public class AdminKeywordController {
     }
 
     @RequiresPermissions("admin:keyword:delete")
-    @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallKeyword keyword) {
         Integer id = keyword.getId();

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

@@ -11,7 +11,10 @@ import org.linlinjava.litemall.db.domain.LitemallLog;
 import org.linlinjava.litemall.db.service.LitemallLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -25,7 +28,7 @@ public class AdminLogController {
     private LitemallLogService logService;
 
     @RequiresPermissions("admin:log:list")
-    @RequiresPermissionsDesc(menu={"系统管理" , "操作日志"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"系统管理", "操作日志"}, button = "查询")
     @GetMapping("/list")
     public Object list(String name,
                        @RequestParam(defaultValue = "1") Integer page,

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

@@ -36,7 +36,7 @@ public class AdminRegionController {
         List<RegionVo> regionVoList = new ArrayList<>();
 
         List<LitemallRegion> provinceList = regionService.queryByPid(0);
-        for(LitemallRegion province : provinceList){
+        for (LitemallRegion province : provinceList) {
             RegionVo provinceVO = new RegionVo();
             provinceVO.setId(province.getId());
             provinceVO.setName(province.getName());
@@ -45,7 +45,7 @@ public class AdminRegionController {
 
             List<LitemallRegion> cityList = regionService.queryByPid(province.getId());
             List<RegionVo> cityVOList = new ArrayList<>();
-            for(LitemallRegion city : cityList){
+            for (LitemallRegion city : cityList) {
                 RegionVo cityVO = new RegionVo();
                 cityVO.setId(city.getId());
                 cityVO.setName(city.getName());
@@ -54,7 +54,7 @@ public class AdminRegionController {
 
                 List<LitemallRegion> areaList = regionService.queryByPid(city.getId());
                 List<RegionVo> areaVOList = new ArrayList<>();
-                for(LitemallRegion area : areaList){
+                for (LitemallRegion area : areaList) {
                     RegionVo areaVO = new RegionVo();
                     areaVO.setId(area.getId());
                     areaVO.setName(area.getName());

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

@@ -5,9 +5,9 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
 import org.linlinjava.litemall.admin.util.AdminResponseCode;
-import org.linlinjava.litemall.admin.vo.PermVo;
 import org.linlinjava.litemall.admin.util.Permission;
 import org.linlinjava.litemall.admin.util.PermissionUtil;
+import org.linlinjava.litemall.admin.vo.PermVo;
 import org.linlinjava.litemall.core.util.JacksonUtil;
 import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.core.validator.Order;
@@ -44,7 +44,7 @@ public class AdminRoleController {
     private LitemallAdminService adminService;
 
     @RequiresPermissions("admin:role:list")
-    @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色查询")
+    @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色查询")
     @GetMapping("/list")
     public Object list(String name,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -56,7 +56,7 @@ public class AdminRoleController {
     }
 
     @GetMapping("/options")
-    public Object options(){
+    public Object options() {
         List<LitemallRole> roleList = roleService.queryAll();
 
         List<Map<String, Object>> options = new ArrayList<>(roleList.size());
@@ -71,7 +71,7 @@ public class AdminRoleController {
     }
 
     @RequiresPermissions("admin:role:read")
-    @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色详情")
+    @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallRole role = roleService.findById(id);
@@ -89,7 +89,7 @@ public class AdminRoleController {
     }
 
     @RequiresPermissions("admin:role:create")
-    @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色添加")
+    @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallRole role) {
         Object error = validate(role);
@@ -97,7 +97,7 @@ public class AdminRoleController {
             return error;
         }
 
-        if (roleService.checkExist(role.getName())){
+        if (roleService.checkExist(role.getName())) {
             return ResponseUtil.fail(ROLE_NAME_EXIST, "角色已经存在");
         }
 
@@ -107,7 +107,7 @@ public class AdminRoleController {
     }
 
     @RequiresPermissions("admin:role:update")
-    @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色编辑")
+    @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallRole role) {
         Object error = validate(role);
@@ -120,7 +120,7 @@ public class AdminRoleController {
     }
 
     @RequiresPermissions("admin:role:delete")
-    @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色删除")
+    @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallRole role) {
         Integer id = role.getId();
@@ -130,10 +130,10 @@ public class AdminRoleController {
 
         // 如果当前角色所对应管理员仍存在，则拒绝删除角色。
         List<LitemallAdmin> adminList = adminService.all();
-        for(LitemallAdmin admin : adminList){
+        for (LitemallAdmin admin : adminList) {
             Integer[] roleIds = admin.getRoleIds();
-            for(Integer roleId : roleIds){
-                if(id.equals(roleId)){
+            for (Integer roleId : roleIds) {
+                if (id.equals(roleId)) {
                     return ResponseUtil.fail(ROLE_USER_EXIST, "当前角色存在管理员，不能删除");
                 }
             }
@@ -149,9 +149,9 @@ public class AdminRoleController {
     private List<PermVo> systemPermissions = null;
     private Set<String> systemPermissionsString = null;
 
-    private List<PermVo> getSystemPermissions(){
+    private List<PermVo> getSystemPermissions() {
         final String basicPackage = "org.linlinjava.litemall.admin";
-        if(systemPermissions == null){
+        if (systemPermissions == null) {
             List<Permission> permissions = PermissionUtil.listPermission(context, basicPackage);
             systemPermissions = PermissionUtil.listPermVo(permissions);
             systemPermissionsString = PermissionUtil.listPermissionString(permissions);
@@ -159,15 +159,14 @@ public class AdminRoleController {
         return systemPermissions;
     }
 
-    private Set<String> getAssignedPermissions(Integer roleId){
+    private Set<String> getAssignedPermissions(Integer roleId) {
         // 这里需要注意的是，如果存在超级权限*，那么这里需要转化成当前所有系统权限。
         // 之所以这么做，是因为前端不能识别超级权限，所以这里需要转换一下。
         Set<String> assignedPermissions = null;
-        if(permissionService.checkSuperPermission(roleId)){
+        if (permissionService.checkSuperPermission(roleId)) {
             getSystemPermissions();
             assignedPermissions = systemPermissionsString;
-        }
-        else{
+        } else {
             assignedPermissions = permissionService.queryByRoleId(roleId);
         }
 
@@ -180,7 +179,7 @@ public class AdminRoleController {
      * @return 系统所有权限列表和管理员已分配权限
      */
     @RequiresPermissions("admin:role:permission:get")
-    @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="权限详情")
+    @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "权限详情")
     @GetMapping("/permissions")
     public Object getPermissions(Integer roleId) {
         List<PermVo> systemPermissions = getSystemPermissions();
@@ -200,23 +199,23 @@ public class AdminRoleController {
      * @return
      */
     @RequiresPermissions("admin:role:permission:update")
-    @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="权限变更")
+    @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "权限变更")
     @PostMapping("/permissions")
     public Object updatePermissions(@RequestBody String body) {
         Integer roleId = JacksonUtil.parseInteger(body, "roleId");
         List<String> permissions = JacksonUtil.parseStringList(body, "permissions");
-        if(roleId == null || permissions == null){
+        if (roleId == null || permissions == null) {
             return ResponseUtil.badArgument();
         }
 
         // 如果修改的角色是超级权限，则拒绝修改。
-        if(permissionService.checkSuperPermission(roleId)){
+        if (permissionService.checkSuperPermission(roleId)) {
             return ResponseUtil.fail(AdminResponseCode.ROLE_SUPER_SUPERMISSION, "当前角色的超级权限不能变更");
         }
 
         // 先删除旧的权限，再更新新的权限
         permissionService.deleteByRoleId(roleId);
-        for(String permission : permissions){
+        for (String permission : permissions) {
             LitemallPermission litemallPermission = new LitemallPermission();
             litemallPermission.setRoleId(roleId);
             litemallPermission.setPermission(permission);

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

@@ -26,7 +26,7 @@ public class AdminStatController {
     private StatService statService;
 
     @RequiresPermissions("admin:stat:user")
-    @RequiresPermissionsDesc(menu={"统计管理" , "用户统计"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"统计管理", "用户统计"}, button = "查询")
     @GetMapping("/user")
     public Object statUser() {
         List<Map> rows = statService.statUser();
@@ -38,7 +38,7 @@ public class AdminStatController {
     }
 
     @RequiresPermissions("admin:stat:order")
-    @RequiresPermissionsDesc(menu={"统计管理" , "订单统计"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"统计管理", "订单统计"}, button = "查询")
     @GetMapping("/order")
     public Object statOrder() {
         List<Map> rows = statService.statOrder();
@@ -51,7 +51,7 @@ public class AdminStatController {
     }
 
     @RequiresPermissions("admin:stat:goods")
-    @RequiresPermissionsDesc(menu={"统计管理" , "商品统计"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"统计管理", "商品统计"}, button = "查询")
     @GetMapping("/goods")
     public Object statGoods() {
         List<Map> rows = statService.statGoods();

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

@@ -32,7 +32,7 @@ public class AdminStorageController {
     private LitemallStorageService litemallStorageService;
 
     @RequiresPermissions("admin:storage:list")
-    @RequiresPermissionsDesc(menu={"系统管理" , "对象存储"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"系统管理", "对象存储"}, button = "查询")
     @GetMapping("/list")
     public Object list(String key, String name,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -44,16 +44,17 @@ public class AdminStorageController {
     }
 
     @RequiresPermissions("admin:storage:create")
-    @RequiresPermissionsDesc(menu={"系统管理" , "对象存储"}, button="上传")
+    @RequiresPermissionsDesc(menu = {"系统管理", "对象存储"}, button = "上传")
     @PostMapping("/create")
     public Object create(@RequestParam("file") MultipartFile file) throws IOException {
         String originalFilename = file.getOriginalFilename();
-        LitemallStorage litemallStorage = storageService.store(file.getInputStream(), file.getSize(), file.getContentType(), originalFilename);
+        LitemallStorage litemallStorage = storageService.store(file.getInputStream(), file.getSize(),
+                file.getContentType(), originalFilename);
         return ResponseUtil.ok(litemallStorage);
     }
 
     @RequiresPermissions("admin:storage:read")
-    @RequiresPermissionsDesc(menu={"系统管理" , "对象存储"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"系统管理", "对象存储"}, button = "详情")
     @PostMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallStorage storageInfo = litemallStorageService.findById(id);
@@ -64,7 +65,7 @@ public class AdminStorageController {
     }
 
     @RequiresPermissions("admin:storage:update")
-    @RequiresPermissionsDesc(menu={"系统管理" , "对象存储"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"系统管理", "对象存储"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallStorage litemallStorage) {
         if (litemallStorageService.update(litemallStorage) == 0) {
@@ -74,7 +75,7 @@ public class AdminStorageController {
     }
 
     @RequiresPermissions("admin:storage:delete")
-    @RequiresPermissionsDesc(menu={"系统管理" , "对象存储"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"系统管理", "对象存储"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallStorage litemallStorage) {
         String key = litemallStorage.getKey();

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

@@ -35,7 +35,7 @@ public class AdminTopicController {
     private LitemallGoodsService goodsService;
 
     @RequiresPermissions("admin:topic:list")
-    @RequiresPermissionsDesc(menu={"推广管理" , "专题管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "查询")
     @GetMapping("/list")
     public Object list(String title, String subtitle,
                        @RequestParam(defaultValue = "1") Integer page,
@@ -63,7 +63,7 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:create")
-    @RequiresPermissionsDesc(menu={"推广管理" , "专题管理"}, button="添加")
+    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "添加")
     @PostMapping("/create")
     public Object create(@RequestBody LitemallTopic topic) {
         Object error = validate(topic);
@@ -75,16 +75,15 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:read")
-    @RequiresPermissionsDesc(menu={"推广管理" , "专题管理"}, button="详情")
+    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "详情")
     @GetMapping("/read")
     public Object read(@NotNull Integer id) {
         LitemallTopic topic = topicService.findById(id);
         Integer[] goodsIds = topic.getGoods();
         List<LitemallGoods> goodsList = null;
-        if(goodsIds == null || goodsIds.length == 0){
+        if (goodsIds == null || goodsIds.length == 0) {
             goodsList = new ArrayList<>();
-        }
-        else{
+        } else {
             goodsList = goodsService.queryByIds(goodsIds);
         }
         Map<String, Object> data = new HashMap<>(2);
@@ -94,7 +93,7 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:update")
-    @RequiresPermissionsDesc(menu={"推广管理" , "专题管理"}, button="编辑")
+    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "编辑")
     @PostMapping("/update")
     public Object update(@RequestBody LitemallTopic topic) {
         Object error = validate(topic);
@@ -108,7 +107,7 @@ public class AdminTopicController {
     }
 
     @RequiresPermissions("admin:topic:delete")
-    @RequiresPermissionsDesc(menu={"推广管理" , "专题管理"}, button="删除")
+    @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "删除")
     @PostMapping("/delete")
     public Object delete(@RequestBody LitemallTopic topic) {
         topicService.deleteById(topic.getId());

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

@@ -11,7 +11,10 @@ import org.linlinjava.litemall.db.domain.LitemallUser;
 import org.linlinjava.litemall.db.service.LitemallUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -25,7 +28,7 @@ public class AdminUserController {
     private LitemallUserService userService;
 
     @RequiresPermissions("admin:user:list")
-    @RequiresPermissionsDesc(menu={"用户管理" , "会员管理"}, button="查询")
+    @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "查询")
     @GetMapping("/list")
     public Object list(String username, String mobile,
                        @RequestParam(defaultValue = "1") Integer page,

litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/PermissionTest.java

@@ -2,9 +2,9 @@ package org.linlinjava.litemall.admin;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.linlinjava.litemall.admin.vo.PermVo;
 import org.linlinjava.litemall.admin.util.Permission;
 import org.linlinjava.litemall.admin.util.PermissionUtil;
+import org.linlinjava.litemall.admin.vo.PermVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;