格式化代码

bc7b1346 · fengshuonan · ce330a0e · bc7b1346 · bc7b1346 · bc7b1346
Commit bc7b1346 authored Oct 15, 2018 by fengshuonan
63 changed files
--- a/src/main/java/cn/stylefeng/guns/config/SwaggerConfig.java
+++ b/src/main/java/cn/stylefeng/guns/config/SwaggerConfig.java
@@ -36,7 +36,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration
 @EnableSwagger2
 @ConditionalOnProperty(prefix = "guns", name = "swagger-open", havingValue = "true")
-public class SwaggerConfig{
+public class SwaggerConfig {
    @Bean
    public Docket createRestApi() {

--- a/src/main/java/cn/stylefeng/guns/config/datasource/MultiDataSourceConfig.java
+++ b/src/main/java/cn/stylefeng/guns/config/datasource/MultiDataSourceConfig.java
@@ -45,7 +45,7 @@ import java.util.HashMap;
 @Configuration
 @ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "true")
 @EnableTransactionManagement(order = 2)
-@MapperScan(basePackages = {"cn.stylefeng.guns.modular.*.dao","cn.stylefeng.guns.multi.mapper"})
+@MapperScan(basePackages = {"cn.stylefeng.guns.modular.*.dao", "cn.stylefeng.guns.multi.mapper"})
 public class MultiDataSourceConfig {
    @Bean

--- a/src/main/java/cn/stylefeng/guns/config/properties/BeetlProperties.java
+++ b/src/main/java/cn/stylefeng/guns/config/properties/BeetlProperties.java
@@ -47,27 +47,27 @@ public class BeetlProperties {
    @Value("${spring.mvc.view.prefix}")
    private String prefix;
-    public Properties getProperties(){
+    public Properties getProperties() {
        Properties properties = new Properties();
-        if(ToolUtil.isNotEmpty(delimiterStatementStart)){
+        if (ToolUtil.isNotEmpty(delimiterStatementStart)) {
-            if(delimiterStatementStart.startsWith("\\")){
+            if (delimiterStatementStart.startsWith("\\")) {
                delimiterStatementStart = delimiterStatementStart.substring(1);
            }
-            properties.setProperty("DELIMITER_STATEMENT_START",delimiterStatementStart);
+            properties.setProperty("DELIMITER_STATEMENT_START", delimiterStatementStart);
        }
-        if(ToolUtil.isNotEmpty(delimiterStatementEnd)){
+        if (ToolUtil.isNotEmpty(delimiterStatementEnd)) {
-            properties.setProperty("DELIMITER_STATEMENT_END",delimiterStatementEnd);
+            properties.setProperty("DELIMITER_STATEMENT_END", delimiterStatementEnd);
-        }else{
+        } else {
-            properties.setProperty("DELIMITER_STATEMENT_END","null");
+            properties.setProperty("DELIMITER_STATEMENT_END", "null");
        }
-        if(ToolUtil.isNotEmpty(resourceTagroot)){
+        if (ToolUtil.isNotEmpty(resourceTagroot)) {
-            properties.setProperty("RESOURCE.tagRoot",resourceTagroot);
+            properties.setProperty("RESOURCE.tagRoot", resourceTagroot);
        }
-        if(ToolUtil.isNotEmpty(resourceTagsuffix)){
+        if (ToolUtil.isNotEmpty(resourceTagsuffix)) {
-            properties.setProperty("RESOURCE.tagSuffix",resourceTagsuffix);
+            properties.setProperty("RESOURCE.tagSuffix", resourceTagsuffix);
        }
-        if(ToolUtil.isNotEmpty(resourceAutoCheck)){
+        if (ToolUtil.isNotEmpty(resourceAutoCheck)) {
-            properties.setProperty("RESOURCE.autoCheck",resourceAutoCheck);
+            properties.setProperty("RESOURCE.autoCheck", resourceAutoCheck);
        }
        return properties;
    }

--- a/src/main/java/cn/stylefeng/guns/core/aop/GlobalExceptionHandler.java
+++ b/src/main/java/cn/stylefeng/guns/core/aop/GlobalExceptionHandler.java
@@ -15,13 +15,13 @@
 */
 package cn.stylefeng.guns.core.aop;
+import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.core.common.exception.InvalidKaptchaException;
 import cn.stylefeng.guns.core.log.LogManager;
 import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.exception.InvalidKaptchaException;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.CredentialsException;
 import org.apache.shiro.authc.DisabledAccountException;

--- a/src/main/java/cn/stylefeng/guns/core/aop/LogAop.java
+++ b/src/main/java/cn/stylefeng/guns/core/aop/LogAop.java
@@ -16,6 +16,7 @@
 package cn.stylefeng.guns.core.aop;
 import cn.stylefeng.guns.core.common.annotion.BussinessLog;
+import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
 import cn.stylefeng.guns.core.log.LogManager;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
@@ -23,7 +24,6 @@ import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
 import cn.stylefeng.guns.core.util.Contrast;
 import cn.stylefeng.roses.core.util.HttpContext;
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Around;
@@ -112,7 +112,7 @@ public class LogAop {
        } else {
            Map<String, String> parameters = HttpContext.getRequestParameters();
            AbstractDictMap dictMap = (AbstractDictMap) dictClass.newInstance();
-            msg = Contrast.parseMutiKey(dictMap,key,parameters);
+            msg = Contrast.parseMutiKey(dictMap, key, parameters);
        }
        LogManager.me().executeLog(LogTaskFactory.bussinessLog(user.getId(), bussinessName, className, methodName, msg));

--- a/src/main/java/cn/stylefeng/guns/core/beetl/BeetlConfiguration.java
+++ b/src/main/java/cn/stylefeng/guns/core/beetl/BeetlConfiguration.java
@@ -15,9 +15,9 @@
 */
 package cn.stylefeng.guns.core.beetl;
-import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.guns.core.tag.DictSelectorTag;
 import cn.stylefeng.guns.core.util.KaptchaUtil;
+import cn.stylefeng.roses.core.util.ToolUtil;
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 import org.beetl.ext.spring.BeetlGroupUtilConfiguration;

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/DatasourceEnum.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/DatasourceEnum.java
@@ -16,7 +16,6 @@
 package cn.stylefeng.guns.core.common.constant;
 /**
- *
 * 多数据源的枚举
 *
 * @author fengshuonan

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java
@@ -27,7 +27,7 @@ public class DeleteDict extends AbstractDictMap {
    @Override
    public void init() {
-        put("roleId","角色名称");
+        put("roleId", "角色名称");
        put("deptId", "部门名称");
        put("menuId", "菜单名称");
        put("dictId", "字典名称");
@@ -36,11 +36,11 @@ public class DeleteDict extends AbstractDictMap {
    @Override
    protected void initBeWrapped() {
-        putFieldWrapperMethodName("roleId","getCacheObject");
+        putFieldWrapperMethodName("roleId", "getCacheObject");
-        putFieldWrapperMethodName("deptId","getCacheObject");
+        putFieldWrapperMethodName("deptId", "getCacheObject");
-        putFieldWrapperMethodName("menuId","getCacheObject");
+        putFieldWrapperMethodName("menuId", "getCacheObject");
-        putFieldWrapperMethodName("dictId","getCacheObject");
+        putFieldWrapperMethodName("dictId", "getCacheObject");
-        putFieldWrapperMethodName("noticeId","getCacheObject");
+        putFieldWrapperMethodName("noticeId", "getCacheObject");
    }
 }
--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DictMap.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DictMap.java
@@ -27,9 +27,9 @@ public class DictMap extends AbstractDictMap {
    @Override
    public void init() {
-        put("dictId","字典名称");
+        put("dictId", "字典名称");
-        put("dictName","字典名称");
+        put("dictName", "字典名称");
-        put("dictValues","字典内容");
+        put("dictValues", "字典内容");
    }
    @Override

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/LogDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/LogDict.java
@@ -27,7 +27,7 @@ public class LogDict extends AbstractDictMap {
    @Override
    public void init() {
-        put("tips","备注");
+        put("tips", "备注");
    }
    @Override

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/MenuDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/MenuDict.java
@@ -27,19 +27,19 @@ public class MenuDict extends AbstractDictMap {
    @Override
    public void init() {
-        put("menuId","菜单id");
+        put("menuId", "菜单id");
-        put("id","菜单id");
+        put("id", "菜单id");
-        put("code","菜单编号");
+        put("code", "菜单编号");
-        put("pcode","菜单父编号");
+        put("pcode", "菜单父编号");
-        put("name","菜单名称");
+        put("name", "菜单名称");
-        put("icon","菜单图标");
+        put("icon", "菜单图标");
-        put("url","url地址");
+        put("url", "url地址");
-        put("num","菜单排序号");
+        put("num", "菜单排序号");
-        put("levels","菜单层级");
+        put("levels", "菜单层级");
-        put("tips","备注");
+        put("tips", "备注");
-        put("status","菜单状态");
+        put("status", "菜单状态");
-        put("isopen","是否打开");
+        put("isopen", "是否打开");
-        put("","");
+        put("", "");
    }
    @Override

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
@@ -27,20 +27,20 @@ public class RoleDict extends AbstractDictMap {
    @Override
    public void init() {
-        put("roleId","角色名称");
+        put("roleId", "角色名称");
-        put("num","角色排序");
+        put("num", "角色排序");
-        put("pid","角色的父级");
+        put("pid", "角色的父级");
-        put("name","角色名称");
+        put("name", "角色名称");
-        put("deptid","部门名称");
+        put("deptid", "部门名称");
-        put("tips","备注");
+        put("tips", "备注");
-        put("ids","资源名称");
+        put("ids", "资源名称");
    }
    @Override
    protected void initBeWrapped() {
-        putFieldWrapperMethodName("pid","getSingleRoleName");
+        putFieldWrapperMethodName("pid", "getSingleRoleName");
-        putFieldWrapperMethodName("deptid","getDeptName");
+        putFieldWrapperMethodName("deptid", "getDeptName");
-        putFieldWrapperMethodName("roleId","getSingleRoleName");
+        putFieldWrapperMethodName("roleId", "getSingleRoleName");
-        putFieldWrapperMethodName("ids","getMenuNames");
+        putFieldWrapperMethodName("ids", "getMenuNames");
    }
 }
--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/UserDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/UserDict.java
@@ -27,25 +27,25 @@ public class UserDict extends AbstractDictMap {
    @Override
    public void init() {
-        put("userId","账号");
+        put("userId", "账号");
-        put("avatar","头像");
+        put("avatar", "头像");
-        put("account","账号");
+        put("account", "账号");
-        put("name","名字");
+        put("name", "名字");
-        put("birthday","生日");
+        put("birthday", "生日");
-        put("sex","性别");
+        put("sex", "性别");
-        put("email","电子邮件");
+        put("email", "电子邮件");
-        put("phone","电话");
+        put("phone", "电话");
-        put("roleid","角色名称");
+        put("roleid", "角色名称");
-        put("deptid","部门名称");
+        put("deptid", "部门名称");
-        put("roleIds","角色名称集合");
+        put("roleIds", "角色名称集合");
    }
    @Override
    protected void initBeWrapped() {
-        putFieldWrapperMethodName("sex","getSexName");
+        putFieldWrapperMethodName("sex", "getSexName");
-        putFieldWrapperMethodName("deptid","getDeptName");
+        putFieldWrapperMethodName("deptid", "getDeptName");
-        putFieldWrapperMethodName("roleid","getSingleRoleName");
+        putFieldWrapperMethodName("roleid", "getSingleRoleName");
-        putFieldWrapperMethodName("userId","getUserAccountById");
+        putFieldWrapperMethodName("userId", "getUserAccountById");
-        putFieldWrapperMethodName("roleIds","getRoleName");
+        putFieldWrapperMethodName("roleIds", "getRoleName");
    }
 }
--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java
@@ -28,8 +28,8 @@ public abstract class AbstractDictMap {
    protected HashMap<String, String> dictory = new HashMap<>();
    protected HashMap<String, String> fieldWarpperDictory = new HashMap<>();
-    public AbstractDictMap(){
+    public AbstractDictMap() {
-        put("id","主键id");
+        put("id", "主键id");
        init();
        initBeWrapped();
    }
@@ -58,11 +58,11 @@ public abstract class AbstractDictMap {
        this.dictory.put(key, value);
    }
-    public String getFieldWarpperMethodName(String key){
+    public String getFieldWarpperMethodName(String key) {
        return this.fieldWarpperDictory.get(key);
    }
-    public void putFieldWrapperMethodName(String key,String methodName){
+    public void putFieldWrapperMethodName(String key, String methodName) {
-        this.fieldWarpperDictory.put(key,methodName);
+        this.fieldWarpperDictory.put(key, methodName);
    }
 }
--- a/src/main/java/cn/stylefeng/guns/core/common/constant/factory/PageFactory.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/factory/PageFactory.java
@@ -15,10 +15,10 @@
 */
 package cn.stylefeng.guns.core.common.constant.factory;
+import cn.stylefeng.guns.core.common.constant.state.Order;
 import cn.stylefeng.roses.core.util.HttpContext;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import com.baomidou.mybatisplus.plugins.Page;
-import cn.stylefeng.guns.core.common.constant.state.Order;
 import javax.servlet.http.HttpServletRequest;

--- a/src/main/java/cn/stylefeng/guns/core/common/node/MenuNode.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/node/MenuNode.java
@@ -230,22 +230,22 @@ public class MenuNode implements Comparable {
        Map<Long, List<MenuNode>> currentMap = new HashMap<>();
        //由于按等级从小到大排序，需要从后往前排序
        //判断该节点是否属于当前循环的等级,不等于则跳出循环
-        for (n = menuList.size() - 1; n >=0&&menuList.get(n).getLevels() == rank; n--) {
+        for (n = menuList.size() - 1; n >= 0 && menuList.get(n).getLevels() == rank; n--) {
            //判断之前的调用是否有返回以该节点的id为key的map，有则设置为children列表。
            if (listMap != null && listMap.get(menuList.get(n).getId()) != null) {
                menuList.get(n).setChildren(listMap.get(menuList.get(n).getId()));
            }
-            if (menuList.get(n).getParentId()!=null&&menuList.get(n).getParentId()!=0) {
+            if (menuList.get(n).getParentId() != null && menuList.get(n).getParentId() != 0) {
                //判断当前节点所属的pid是否已经创建了以该pid为key的键值对，没有则创建新的链表
                currentMap.computeIfAbsent(menuList.get(n).getParentId(), k -> new LinkedList<>());
                //将该节点插入到对应的list的头部
                currentMap.get(menuList.get(n).getParentId()).add(0, menuList.get(n));
            }
        }
-        if (n <0) {
+        if (n < 0) {
            return menuList;
        } else {
-            return mergeList(menuList.subList(0, n+1), menuList.get(n).getLevels(), currentMap);
+            return mergeList(menuList.subList(0, n + 1), menuList.get(n).getLevels(), currentMap);
        }
    }

--- a/src/main/java/cn/stylefeng/guns/core/log/LogObjectHolder.java
+++ b/src/main/java/cn/stylefeng/guns/core/log/LogObjectHolder.java
@@ -30,7 +30,7 @@ import java.io.Serializable;
 */
 @Component
 @Scope(scopeName = WebApplicationContext.SCOPE_SESSION)
-public class LogObjectHolder implements Serializable{
+public class LogObjectHolder implements Serializable {
    private Object object = null;
@@ -42,7 +42,7 @@ public class LogObjectHolder implements Serializable{
        return object;
    }
-    public static LogObjectHolder me(){
+    public static LogObjectHolder me() {
        return SpringContextHolder.getBean(LogObjectHolder.class);
    }
 }
--- a/src/main/java/cn/stylefeng/guns/core/log/factory/LogTaskFactory.java
+++ b/src/main/java/cn/stylefeng/guns/core/log/factory/LogTaskFactory.java
@@ -15,8 +15,6 @@
 */
 package cn.stylefeng.guns.core.log.factory;
-import cn.stylefeng.roses.core.util.SpringContextHolder;
-import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.guns.core.common.constant.state.LogSucceed;
 import cn.stylefeng.guns.core.common.constant.state.LogType;
 import cn.stylefeng.guns.core.log.LogManager;
@@ -24,6 +22,8 @@ import cn.stylefeng.guns.modular.system.dao.LoginLogMapper;
 import cn.stylefeng.guns.modular.system.dao.OperationLogMapper;
 import cn.stylefeng.guns.modular.system.model.LoginLog;
 import cn.stylefeng.guns.modular.system.model.OperationLog;
+import cn.stylefeng.roses.core.util.SpringContextHolder;
+import cn.stylefeng.roses.core.util.ToolUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

--- a/src/main/java/cn/stylefeng/guns/core/shiro/ShiroKit.java
+++ b/src/main/java/cn/stylefeng/guns/core/shiro/ShiroKit.java
@@ -15,9 +15,9 @@
 */
 package cn.stylefeng.guns.core.shiro;
-import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.guns.core.common.constant.Const;
 import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.roses.core.util.ToolUtil;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.crypto.hash.Md5Hash;
 import org.apache.shiro.crypto.hash.SimpleHash;
@@ -60,6 +60,7 @@ public class ShiroKit {
    /**
     * 获取随机盐值
+     *
     * @param length
     * @return
     */
@@ -91,7 +92,6 @@ public class ShiroKit {
    /**
     * 从shiro获取session
-     *
     */
    public static Session getSession() {
        return getSubject().getSession();
@@ -99,7 +99,6 @@ public class ShiroKit {
    /**
     * 获取shiro指定的sessionKey
-     *
     */
    @SuppressWarnings("unchecked")
    public static <T> T getSessionAttr(String key) {
@@ -109,7 +108,6 @@ public class ShiroKit {
    /**
     * 设置shiro指定的sessionKey
-     *
     */
    public static void setSessionAttr(String key, Object value) {
        Session session = getSession();
@@ -128,8 +126,7 @@ public class ShiroKit {
    /**
     * 验证当前用户是否属于该角色？,使用时与lacksRole 搭配使用
     *
-     * @param roleName
+     * @param roleName 角色名
-     *            角色名
     * @return 属于该角色：true，否则false
     */
    public static boolean hasRole(String roleName) {
@@ -140,8 +137,7 @@ public class ShiroKit {
    /**
     * 与hasRole标签逻辑相反，当用户不属于该角色时验证通过。
     *
-     * @param roleName
+     * @param roleName 角色名
-     *            角色名
     * @return 不属于该角色：true，否则false
     */
    public static boolean lacksRole(String roleName) {
@@ -151,8 +147,7 @@ public class ShiroKit {
    /**
     * 验证当前用户是否属于以下任意一个角色。
     *
-     * @param roleNames
+     * @param roleNames 角色列表
-     *            角色列表
     * @return 属于:true,否则false
     */
    public static boolean hasAnyRoles(String roleNames) {
@@ -172,8 +167,7 @@ public class ShiroKit {
    /**
     * 验证当前用户是否属于以下所有角色。
     *
-     * @param roleNames
+     * @param roleNames 角色列表
-     *            角色列表
     * @return 属于:true,否则false
     */
    public static boolean hasAllRoles(String roleNames) {
@@ -193,8 +187,7 @@ public class ShiroKit {
    /**
     * 验证当前用户是否拥有指定权限,使用时与lacksPermission 搭配使用
     *
-     * @param permission
+     * @param permission 权限名
-     *            权限名
     * @return 拥有权限：true，否则false
     */
    public static boolean hasPermission(String permission) {
@@ -206,8 +199,7 @@ public class ShiroKit {
    /**
     * 与hasPermission标签逻辑相反，当前用户没有制定权限时，验证通过。
     *
-     * @param permission
+     * @param permission 权限名
-     *            权限名
     * @return 拥有权限：true，否则false
     */
    public static boolean lacksPermission(String permission) {

--- a/src/main/java/cn/stylefeng/guns/core/tag/DictSelectorTag.java
+++ b/src/main/java/cn/stylefeng/guns/core/tag/DictSelectorTag.java
--- a/src/main/java/cn/stylefeng/guns/core/util/JwtTokenUtil.java
+++ b/src/main/java/cn/stylefeng/guns/core/util/JwtTokenUtil.java
@@ -15,8 +15,8 @@
 */
 package cn.stylefeng.guns.core.util;
-import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.guns.core.common.constant.JwtConstants;
+import cn.stylefeng.roses.core.util.ToolUtil;
 import io.jsonwebtoken.*;
 import java.util.Date;

--- a/src/main/java/cn/stylefeng/guns/core/util/KaptchaUtil.java
+++ b/src/main/java/cn/stylefeng/guns/core/util/KaptchaUtil.java
@@ -15,8 +15,8 @@
 */
 package cn.stylefeng.guns.core.util;
-import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.guns.config.properties.GunsProperties;
+import cn.stylefeng.roses.core.util.SpringContextHolder;
 /**
 * 验证码工具类

--- a/src/main/java/cn/stylefeng/guns/modular/system/controller/BlackboardController.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/controller/BlackboardController.java
@@ -15,8 +15,8 @@
 */
 package cn.stylefeng.guns.modular.system.controller;
-import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.guns.modular.system.service.INoticeService;
+import cn.stylefeng.roses.core.base.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

--- a/src/main/java/cn/stylefeng/guns/modular/system/controller/DictController.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/controller/DictController.java
@@ -17,18 +17,18 @@ package cn.stylefeng.guns.modular.system.controller;
 import cn.stylefeng.guns.core.common.annotion.BussinessLog;
 import cn.stylefeng.guns.core.common.annotion.Permission;
-import cn.stylefeng.guns.core.log.LogObjectHolder;
-import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.util.ToolUtil;
-import cn.stylefeng.roses.kernel.model.exception.ServiceException;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import cn.stylefeng.guns.core.common.constant.Const;
 import cn.stylefeng.guns.core.common.constant.dictmap.DictMap;
 import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.modular.system.model.Dict;
 import cn.stylefeng.guns.modular.system.service.IDictService;
 import cn.stylefeng.guns.modular.system.warpper.DictWarpper;
+import cn.stylefeng.roses.core.base.controller.BaseController;
+import cn.stylefeng.roses.core.util.ToolUtil;
+import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -94,11 +94,11 @@ public class DictController extends BaseController {
    @RequestMapping(value = "/add")
    @Permission(Const.ADMIN_NAME)
    @ResponseBody
-    public Object add(String dictCode,String dictTips,String dictName, String dictValues) {
+    public Object add(String dictCode, String dictTips, String dictName, String dictValues) {
-        if (ToolUtil.isOneEmpty(dictCode,dictName, dictValues)) {
+        if (ToolUtil.isOneEmpty(dictCode, dictName, dictValues)) {
            throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
        }
-        this.dictService.addDict(dictCode,dictName,dictTips,dictValues);
+        this.dictService.addDict(dictCode, dictName, dictTips, dictValues);
        return SUCCESS_TIP;
    }
@@ -130,11 +130,11 @@ public class DictController extends BaseController {
    @RequestMapping(value = "/update")
    @Permission(Const.ADMIN_NAME)
    @ResponseBody
-    public Object update(Integer dictId,String dictCode,String dictName, String dictTips,String dictValues) {
+    public Object update(Integer dictId, String dictCode, String dictName, String dictTips, String dictValues) {
        if (ToolUtil.isOneEmpty(dictId, dictCode, dictName, dictValues)) {
            throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
        }
-        dictService.editDict(dictId, dictCode,dictName, dictTips,dictValues);
+        dictService.editDict(dictId, dictCode, dictName, dictTips, dictValues);
        return SUCCESS_TIP;
    }

--- a/src/main/java/cn/stylefeng/guns/modular/system/controller/KaptchaController.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/controller/KaptchaController.java
@@ -15,10 +15,10 @@
 */
 package cn.stylefeng.guns.modular.system.controller;
+import cn.stylefeng.guns.config.properties.GunsProperties;
 import cn.stylefeng.roses.core.util.FileUtil;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
-import cn.stylefeng.guns.config.properties.GunsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;

--- a/src/main/java/cn/stylefeng/guns/modular/system/controller/NoticeController.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/controller/NoticeController.java
@@ -16,17 +16,17 @@
 package cn.stylefeng.guns.modular.system.controller;
 import cn.stylefeng.guns.core.common.annotion.BussinessLog;
-import cn.stylefeng.guns.core.log.LogObjectHolder;
-import cn.stylefeng.guns.core.shiro.ShiroKit;
-import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.util.ToolUtil;
-import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.guns.core.common.constant.dictmap.NoticeMap;
 import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.core.log.LogObjectHolder;
+import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.modular.system.model.Notice;
 import cn.stylefeng.guns.modular.system.service.INoticeService;
 import cn.stylefeng.guns.modular.system.warpper.NoticeWrapper;
+import cn.stylefeng.roses.core.base.controller.BaseController;
+import cn.stylefeng.roses.core.util.ToolUtil;
+import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -76,7 +76,7 @@ public class NoticeController extends BaseController {
    @RequestMapping("/notice_update/{noticeId}")
    public String noticeUpdate(@PathVariable Integer noticeId, Model model) {
        Notice notice = this.noticeService.selectById(noticeId);
-        model.addAttribute("notice",notice);
+        model.addAttribute("notice", notice);
        LogObjectHolder.me().set(notice);
        return PREFIX + "notice_edit.html";
    }
@@ -87,7 +87,7 @@ public class NoticeController extends BaseController {
    @RequestMapping("/hello")
    public String hello() {
        List<Map<String, Object>> notices = noticeService.list(null);
-        super.setAttr("noticeList",notices);
+        super.setAttr("noticeList", notices);
        return "/blackboard.html";
    }
@@ -106,7 +106,7 @@ public class NoticeController extends BaseController {
     */
    @RequestMapping(value = "/add")
    @ResponseBody
-    @BussinessLog(value = "新增通知",key = "title",dict = NoticeMap.class)
+    @BussinessLog(value = "新增通知", key = "title", dict = NoticeMap.class)
    public Object add(Notice notice) {
        if (ToolUtil.isOneEmpty(notice, notice.getTitle(), notice.getContent())) {
            throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
@@ -122,7 +122,7 @@ public class NoticeController extends BaseController {
     */
    @RequestMapping(value = "/delete")
    @ResponseBody
-    @BussinessLog(value = "删除通知",key = "noticeId",dict = NoticeMap.class)
+    @BussinessLog(value = "删除通知", key = "noticeId", dict = NoticeMap.class)
    public Object delete(@RequestParam Integer noticeId) {
        //缓存通知名称
@@ -138,7 +138,7 @@ public class NoticeController extends BaseController {
     */
    @RequestMapping(value = "/update")
    @ResponseBody
-    @BussinessLog(value = "修改通知",key = "title",dict = NoticeMap.class)
+    @BussinessLog(value = "修改通知", key = "title", dict = NoticeMap.class)
    public Object update(Notice notice) {
        if (ToolUtil.isOneEmpty(notice, notice.getId(), notice.getTitle(), notice.getContent())) {
            throw new ServiceException(BizExceptionEnum.REQUEST_NULL);

--- a/src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java
@@ -15,28 +15,28 @@
 */
 package cn.stylefeng.guns.modular.system.controller;
+import cn.stylefeng.guns.config.properties.GunsProperties;
 import cn.stylefeng.guns.core.common.annotion.BussinessLog;
 import cn.stylefeng.guns.core.common.annotion.Permission;
-import cn.stylefeng.guns.core.log.LogObjectHolder;
-import cn.stylefeng.guns.core.shiro.ShiroKit;
-import cn.stylefeng.guns.core.shiro.ShiroUser;
-import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.datascope.DataScope;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.util.ToolUtil;
-import cn.stylefeng.roses.kernel.model.exception.ServiceException;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import cn.stylefeng.guns.config.properties.GunsProperties;
 import cn.stylefeng.guns.core.common.constant.Const;
 import cn.stylefeng.guns.core.common.constant.dictmap.UserDict;
 import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
 import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.core.log.LogObjectHolder;
+import cn.stylefeng.guns.core.shiro.ShiroKit;
+import cn.stylefeng.guns.core.shiro.ShiroUser;
 import cn.stylefeng.guns.modular.system.factory.UserFactory;
 import cn.stylefeng.guns.modular.system.model.User;
 import cn.stylefeng.guns.modular.system.service.IUserService;
 import cn.stylefeng.guns.modular.system.transfer.UserDto;
 import cn.stylefeng.guns.modular.system.warpper.UserWarpper;
+import cn.stylefeng.roses.core.base.controller.BaseController;
+import cn.stylefeng.roses.core.datascope.DataScope;
+import cn.stylefeng.roses.core.reqres.response.ResponseData;
+import cn.stylefeng.roses.core.util.ToolUtil;
+import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

--- a/src/main/java/cn/stylefeng/guns/modular/system/factory/UserFactory.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/factory/UserFactory.java
@@ -15,9 +15,9 @@
 */
 package cn.stylefeng.guns.modular.system.factory;
+import cn.stylefeng.guns.modular.system.model.User;
 import cn.stylefeng.guns.modular.system.transfer.UserDto;
 import cn.stylefeng.roses.core.util.ToolUtil;
-import cn.stylefeng.guns.modular.system.model.User;
 import org.springframework.beans.BeanUtils;
 /**

--- a/src/main/java/cn/stylefeng/guns/modular/system/model/Dept.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/model/Dept.java
@@ -23,7 +23,7 @@ public class Dept extends Model<Dept> {
    /**
     * 主键id
     */
-	@TableId(value="id", type= IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 排序

--- a/src/main/java/cn/stylefeng/guns/modular/system/model/Dict.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/model/Dict.java
@@ -23,7 +23,7 @@ public class Dict extends Model<Dict> {
    /**
     * 主键id
     */
-	@TableId(value="id", type= IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 排序

--- a/src/main/java/cn/stylefeng/guns/modular/system/model/Expense.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/model/Expense.java
@@ -22,7 +22,7 @@ public class Expense extends Model<Expense> {
    private static final long serialVersionUID = 1L;
-	@TableId(value="id", type= IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 报销金额

--- a/src/main/java/cn/stylefeng/guns/modular/system/model/LoginLog.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/model/LoginLog.java
@@ -24,7 +24,7 @@ public class LoginLog extends Model<LoginLog> {
    /**
     * 主键
     */
-	@TableId(value="id", type= IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 日志名称

--- a/src/main/java/cn/stylefeng/guns/modular/system/model/Notice.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/model/Notice.java
@@ -24,7 +24,7 @@ public class Notice extends Model<Notice> {
    /**
     * 主键
     */
-	@TableId(value="id", type= IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 标题

--- a/src/main/java/cn/stylefeng/guns/modular/system/model/OperationLog.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/model/OperationLog.java
@@ -24,7 +24,7 @@ public class OperationLog extends Model<OperationLog> {
    /**
     * 主键
     */
-	@TableId(value="id", type= IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 日志类型

--- a/src/main/java/cn/stylefeng/guns/modular/system/model/Role.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/model/Role.java
@@ -23,7 +23,7 @@ public class Role extends Model<Role> {
    /**
     * 主键id
     */
-	@TableId(value="id", type= IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 序号

--- a/src/main/java/cn/stylefeng/guns/modular/system/model/User.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/model/User.java
@@ -24,7 +24,7 @@ public class User extends Model<User> {
    /**
     * 主键id
     */
-	@TableId(value="id", type= IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 头像

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/IDictService.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/IDictService.java
@@ -15,8 +15,8 @@
 */
 package cn.stylefeng.guns.modular.system.service;
-import com.baomidou.mybatisplus.service.IService;
 import cn.stylefeng.guns.modular.system.model.Dict;
+import com.baomidou.mybatisplus.service.IService;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -38,7 +38,7 @@ public interface IDictService extends IService<Dict> {
    /**
     * 编辑字典
     */
-    void editDict(Integer dictId,String dictCode, String dictName,String dictTips, String dicts);
+    void editDict(Integer dictId, String dictCode, String dictName, String dictTips, String dicts);
    /**
     * 删除字典

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/ILoginLogService.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/ILoginLogService.java
@@ -15,9 +15,9 @@
 */
 package cn.stylefeng.guns.modular.system.service;
+import cn.stylefeng.guns.modular.system.model.LoginLog;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
-import cn.stylefeng.guns.modular.system.model.LoginLog;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/INoticeService.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/INoticeService.java
@@ -15,8 +15,8 @@
 */
 package cn.stylefeng.guns.modular.system.service;
-import com.baomidou.mybatisplus.service.IService;
 import cn.stylefeng.guns.modular.system.model.Notice;
+import com.baomidou.mybatisplus.service.IService;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/IOperationLogService.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/IOperationLogService.java
@@ -15,9 +15,9 @@
 */
 package cn.stylefeng.guns.modular.system.service;
+import cn.stylefeng.guns.modular.system.model.OperationLog;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
-import cn.stylefeng.guns.modular.system.model.OperationLog;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/IRelationService.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/IRelationService.java
@@ -15,8 +15,8 @@
 */
 package cn.stylefeng.guns.modular.system.service;
-import com.baomidou.mybatisplus.service.IService;
 import cn.stylefeng.guns.modular.system.model.Relation;
+import com.baomidou.mybatisplus.service.IService;
 /**
 * <p>

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/IUserService.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/IUserService.java
@@ -15,9 +15,9 @@
 */
 package cn.stylefeng.guns.modular.system.service;
+import cn.stylefeng.guns.modular.system.model.User;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import com.baomidou.mybatisplus.service.IService;
-import cn.stylefeng.guns.modular.system.model.User;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java
@@ -15,14 +15,14 @@
 */
 package cn.stylefeng.guns.modular.system.service.impl;
+import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.modular.system.dao.DictMapper;
+import cn.stylefeng.guns.modular.system.model.Dict;
 import cn.stylefeng.guns.modular.system.service.IDictService;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.modular.system.dao.DictMapper;
-import cn.stylefeng.guns.modular.system.model.Dict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +40,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements ID
    private DictMapper dictMapper;
    @Override
-    public void addDict(String dictCode,String dictName,String dictTips, String dictValues) {
+    public void addDict(String dictCode, String dictName, String dictTips, String dictValues) {
        //判断有没有该字典
        List<Dict> dicts = dictMapper.selectList(new EntityWrapper<Dict>().eq("code", dictCode).and().eq("pid", 0));
        if (dicts != null && dicts.size() > 0) {
@@ -79,12 +79,12 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements ID
    }
    @Override
-    public void editDict(Integer dictId,String dictCode, String dictName,String dictTips, String dicts) {
+    public void editDict(Integer dictId, String dictCode, String dictName, String dictTips, String dicts) {
        //删除之前的字典
        this.delteDict(dictId);
        //重新添加新的字典
-        this.addDict(dictCode,dictName,dictTips, dicts);
+        this.addDict(dictCode, dictName, dictTips, dicts);
    }
    @Override

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java
@@ -15,11 +15,11 @@
 */
 package cn.stylefeng.guns.modular.system.service.impl;
+import cn.stylefeng.guns.modular.system.dao.LoginLogMapper;
+import cn.stylefeng.guns.modular.system.model.LoginLog;
 import cn.stylefeng.guns.modular.system.service.ILoginLogService;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import cn.stylefeng.guns.modular.system.dao.LoginLogMapper;
-import cn.stylefeng.guns.modular.system.model.LoginLog;
 import org.springframework.stereotype.Service;
 import java.util.List;

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java
@@ -15,10 +15,10 @@
 */
 package cn.stylefeng.guns.modular.system.service.impl;
-import cn.stylefeng.guns.modular.system.service.INoticeService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import cn.stylefeng.guns.modular.system.dao.NoticeMapper;
 import cn.stylefeng.guns.modular.system.model.Notice;
+import cn.stylefeng.guns.modular.system.service.INoticeService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import java.util.List;

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java
@@ -15,11 +15,11 @@
 */
 package cn.stylefeng.guns.modular.system.service.impl;
+import cn.stylefeng.guns.modular.system.dao.OperationLogMapper;
+import cn.stylefeng.guns.modular.system.model.OperationLog;
 import cn.stylefeng.guns.modular.system.service.IOperationLogService;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import cn.stylefeng.guns.modular.system.dao.OperationLogMapper;
-import cn.stylefeng.guns.modular.system.model.OperationLog;
 import org.springframework.stereotype.Service;
 import java.util.List;

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java
@@ -15,10 +15,10 @@
 */
 package cn.stylefeng.guns.modular.system.service.impl;
-import cn.stylefeng.guns.modular.system.service.IRelationService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import cn.stylefeng.guns.modular.system.dao.RelationMapper;
 import cn.stylefeng.guns.modular.system.model.Relation;
+import cn.stylefeng.guns.modular.system.service.IRelationService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 /**

--- a/src/main/java/cn/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
@@ -15,11 +15,11 @@
 */
 package cn.stylefeng.guns.modular.system.service.impl;
+import cn.stylefeng.guns.modular.system.dao.UserMapper;
+import cn.stylefeng.guns.modular.system.model.User;
 import cn.stylefeng.guns.modular.system.service.IUserService;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import cn.stylefeng.guns.modular.system.dao.UserMapper;
-import cn.stylefeng.guns.modular.system.model.User;
 import org.springframework.stereotype.Service;
 import java.util.List;

--- a/src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWarpper.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWarpper.java
@@ -15,11 +15,11 @@
 */
 package cn.stylefeng.guns.modular.system.warpper;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/warpper/DictWarpper.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/warpper/DictWarpper.java
@@ -16,11 +16,11 @@
 package cn.stylefeng.guns.modular.system.warpper;
 import cn.hutool.core.util.StrUtil;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.modular.system.model.Dict;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.modular.system.model.Dict;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWarpper.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWarpper.java
@@ -15,12 +15,12 @@
 */
 package cn.stylefeng.guns.modular.system.warpper;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.util.Contrast;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWarpper.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWarpper.java
@@ -15,11 +15,11 @@
 */
 package cn.stylefeng.guns.modular.system.warpper;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/warpper/NoticeWrapper.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/warpper/NoticeWrapper.java
@@ -15,10 +15,10 @@
 */
 package cn.stylefeng.guns.modular.system.warpper;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWarpper.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWarpper.java
@@ -15,10 +15,10 @@
 */
 package cn.stylefeng.guns.modular.system.warpper;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import java.util.List;
 import java.util.Map;

--- a/src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWarpper.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWarpper.java
@@ -15,10 +15,10 @@
 */
 package cn.stylefeng.guns.modular.system.warpper;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import java.util.List;
 import java.util.Map;

--- a/src/test/java/cn/stylefeng/guns/base/BaseJunit.java
+++ b/src/test/java/cn/stylefeng/guns/base/BaseJunit.java
@@ -30,11 +30,11 @@ public class BaseJunit {
    protected MockMvc mockMvc;
    @Before
-    public void setupMockMvc(){
+    public void setupMockMvc() {
        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
    }
    @Before
-    public void initDatabase(){
+    public void initDatabase() {
    }
 }
--- a/src/test/java/cn/stylefeng/guns/multi/entity/Test.java
+++ b/src/test/java/cn/stylefeng/guns/multi/entity/Test.java
--- a/src/test/java/cn/stylefeng/guns/multi/mapper/TestMapper.java
+++ b/src/test/java/cn/stylefeng/guns/multi/mapper/TestMapper.java
 package cn.stylefeng.guns.multi.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 import cn.stylefeng.guns.multi.entity.Test;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
 * <p>

--- a/src/test/java/cn/stylefeng/guns/multi/service/impl/TestServiceImpl.java
+++ b/src/test/java/cn/stylefeng/guns/multi/service/impl/TestServiceImpl.java
 package cn.stylefeng.guns.multi.service.impl;
-import cn.stylefeng.roses.core.mutidatasource.annotion.DataSource;
 import cn.stylefeng.guns.core.common.constant.DatasourceEnum;
 import cn.stylefeng.guns.multi.entity.Test;
 import cn.stylefeng.guns.multi.mapper.TestMapper;
 import cn.stylefeng.guns.multi.service.TestService;
+import cn.stylefeng.roses.core.mutidatasource.annotion.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

--- a/src/test/java/cn/stylefeng/guns/multi/test/BizTest.java
+++ b/src/test/java/cn/stylefeng/guns/multi/test/BizTest.java
 package cn.stylefeng.guns.multi.test;
-import cn.stylefeng.guns.multi.service.TestService;
 import cn.stylefeng.guns.base.BaseJunit;
+import cn.stylefeng.guns.multi.service.TestService;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

--- a/src/test/java/cn/stylefeng/guns/shiro/Base64Test.java
+++ b/src/test/java/cn/stylefeng/guns/shiro/Base64Test.java
--- a/src/test/java/cn/stylefeng/guns/system/DictTest.java
+++ b/src/test/java/cn/stylefeng/guns/system/DictTest.java
@@ -30,12 +30,12 @@ public class DictTest extends BaseJunit {
        String dictName = "字典测试";
        String dictTips = "这是一个字典测试";
        String dictValues = "1:测试1:1;2:测试2:2";
-        dictService.addDict(dictCode,dictName,dictTips, dictValues);
+        dictService.addDict(dictCode, dictName, dictTips, dictValues);
    }
    @Test
    public void editTest() {
-        dictService.editDict(16, "tes","测试","备注", "1:测试1;2:测试2");
+        dictService.editDict(16, "tes", "测试", "备注", "1:测试1;2:测试2");
    }
    @Test

--- a/src/test/java/cn/stylefeng/guns/system/MenuTest.java
+++ b/src/test/java/cn/stylefeng/guns/system/MenuTest.java
 package cn.stylefeng.guns.system;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
 import cn.stylefeng.guns.base.BaseJunit;
 import cn.stylefeng.guns.modular.system.dao.MenuMapper;
 import cn.stylefeng.guns.modular.system.model.Menu;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;