更新结构

src/main/java/cn/stylefeng/guns/config/SchedulingConfig.java

@@ -8,7 +8,7 @@
 //import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 //
 ///**
-// * 定时任务自动配置
+// * 定时任务自动配置(需要定时任务的可以打开注释)
 // *
 // * @author fengshuonan
 // * @Date 2019/2/24 16:23

src/main/java/cn/stylefeng/guns/core/metadata/GunsMpFieldHandler.java → src/main/java/cn/stylefeng/guns/config/datasource/MpPluginsConfig.java

-/**
- * Copyright 2018-2020 stylefeng & fengshuonan (sn93@qq.com)
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.stylefeng.guns.core.metadata;
+package cn.stylefeng.guns.config.datasource;
 
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.roses.core.metadata.CustomMetaObjectHandler;
-import org.springframework.stereotype.Component;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
- * 字段填充器
+ * mp的插件拓展
  *
  * @author fengshuonan
- * @Date 2018/12/8 15:01
+ * @Date 2019/5/10 21:33
  */
-@Component
-public class GunsMpFieldHandler extends CustomMetaObjectHandler {
+@Configuration
+public class MpPluginsConfig {
 
-    @Override
-    protected Object getUserUniqueId() {
-        try {
+    /**
+     * 拓展核心包中的字段包装器
+     *
+     * @author fengshuonan
+     * @Date 2019/5/10 21:35
+     */
+    @Bean
+    public CustomMetaObjectHandler gunsMpFieldHandler() {
+        return new CustomMetaObjectHandler() {
 
-            return ShiroKit.getUser().getId();
+            @Override
+            protected Object getUserUniqueId() {
+                try {
 
-        } catch (Exception e) {
+                    return ShiroKit.getUser().getId();
 
-            //如果获取不到当前用户就存空id
-            return "";
-        }
+                } catch (Exception e) {
+
+                    //如果获取不到当前用户就存空id
+                    return "";
+                }
+            }
+        };
     }
+
 }

src/main/java/cn/stylefeng/guns/config/properties/BeetlProperties.java

@@ -16,6 +16,7 @@
 package cn.stylefeng.guns.config.properties;
 
 import cn.stylefeng.roses.core.util.ToolUtil;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -30,6 +31,7 @@ import java.util.Properties;
  */
 @Configuration
 @ConfigurationProperties(prefix = BeetlProperties.BEETLCONF_PREFIX)
+@Data
 public class BeetlProperties {
 
     public static final String BEETLCONF_PREFIX = "beetl";
@@ -71,48 +73,4 @@ public class BeetlProperties {
         }
         return properties;
     }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public String getDelimiterStatementStart() {
-        return delimiterStatementStart;
-    }
-
-    public void setDelimiterStatementStart(String delimiterStatementStart) {
-        this.delimiterStatementStart = delimiterStatementStart;
-    }
-
-    public String getDelimiterStatementEnd() {
-        return delimiterStatementEnd;
-    }
-
-    public void setDelimiterStatementEnd(String delimiterStatementEnd) {
-        this.delimiterStatementEnd = delimiterStatementEnd;
-    }
-
-    public String getResourceTagroot() {
-        return resourceTagroot;
-    }
-
-    public void setResourceTagroot(String resourceTagroot) {
-        this.resourceTagroot = resourceTagroot;
-    }
-
-    public String getResourceTagsuffix() {
-        return resourceTagsuffix;
-    }
-
-    public void setResourceTagsuffix(String resourceTagsuffix) {
-        this.resourceTagsuffix = resourceTagsuffix;
-    }
-
-    public String getResourceAutoCheck() {
-        return resourceAutoCheck;
-    }
-
-    public void setResourceAutoCheck(String resourceAutoCheck) {
-        this.resourceAutoCheck = resourceAutoCheck;
-    }
 }

src/main/java/cn/stylefeng/guns/config/properties/GunsProperties.java

@@ -16,6 +16,7 @@
 package cn.stylefeng.guns.config.properties;
 
 import cn.stylefeng.roses.core.util.ToolUtil;
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -31,6 +32,7 @@ import static cn.stylefeng.roses.core.util.ToolUtil.getTempPath;
  */
 @Component
 @ConfigurationProperties(prefix = GunsProperties.PREFIX)
+@Data
 public class GunsProperties {
 
     public static final String PREFIX = "guns";
@@ -74,47 +76,4 @@ public class GunsProperties {
         }
     }
 
-    public void setFileUploadPath(String fileUploadPath) {
-        this.fileUploadPath = fileUploadPath;
-    }
-
-    public Boolean getKaptchaOpen() {
-        return kaptchaOpen;
-    }
-
-    public void setKaptchaOpen(Boolean kaptchaOpen) {
-        this.kaptchaOpen = kaptchaOpen;
-    }
-
-    public Boolean getSwaggerOpen() {
-        return swaggerOpen;
-    }
-
-    public void setSwaggerOpen(Boolean swaggerOpen) {
-        this.swaggerOpen = swaggerOpen;
-    }
-
-    public Boolean getSpringSessionOpen() {
-        return springSessionOpen;
-    }
-
-    public void setSpringSessionOpen(Boolean springSessionOpen) {
-        this.springSessionOpen = springSessionOpen;
-    }
-
-    public Integer getSessionInvalidateTime() {
-        return sessionInvalidateTime;
-    }
-
-    public void setSessionInvalidateTime(Integer sessionInvalidateTime) {
-        this.sessionInvalidateTime = sessionInvalidateTime;
-    }
-
-    public Integer getSessionValidationInterval() {
-        return sessionValidationInterval;
-    }
-
-    public void setSessionValidationInterval(Integer sessionValidationInterval) {
-        this.sessionValidationInterval = sessionValidationInterval;
-    }
 }

src/main/java/cn/stylefeng/guns/config/web/BeetlConfig.java

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
 public class BeetlConfig {
 
     @Autowired
-    BeetlProperties beetlProperties;
+    private BeetlProperties beetlProperties;
 
     /**
      * beetl的配置

src/main/java/cn/stylefeng/guns/config/web/ShiroConfig.java

@@ -16,7 +16,7 @@
 package cn.stylefeng.guns.config.web;
 
 import cn.stylefeng.guns.config.properties.GunsProperties;
-import cn.stylefeng.guns.core.interceptor.GunsUserFilter;
+import cn.stylefeng.guns.core.shiro.GunsUserFilter;
 import cn.stylefeng.guns.core.shiro.ShiroDbRealm;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.cache.ehcache.EhCacheManager;
@@ -43,7 +43,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static cn.stylefeng.guns.core.common.constant.Const.NONE_PERMISSION_RES;
+import static cn.stylefeng.guns.core.constant.Const.NONE_PERMISSION_RES;
 
 /**
  * shiro权限管理的配置

src/main/java/cn/stylefeng/guns/config/web/WebConfig.java

@@ -16,10 +16,10 @@
 package cn.stylefeng.guns.config.web;
 
 import cn.stylefeng.guns.config.properties.GunsProperties;
-import cn.stylefeng.guns.core.common.controller.GunsErrorView;
-import cn.stylefeng.guns.core.interceptor.AttributeSetInteceptor;
-import cn.stylefeng.guns.core.interceptor.RestApiInteceptor;
+import cn.stylefeng.guns.core.attribute.AttributeSetInteceptor;
+import cn.stylefeng.guns.core.exception.page.GunsErrorView;
 import cn.stylefeng.guns.core.listener.ConfigListener;
+import cn.stylefeng.guns.modular.api.aop.RestApiInteceptor;
 import cn.stylefeng.roses.core.xss.XssFilter;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.support.http.StatViewServlet;
@@ -44,7 +44,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.Properties;
 
-import static cn.stylefeng.guns.core.common.constant.Const.NONE_PERMISSION_RES;
+import static cn.stylefeng.guns.core.constant.Const.NONE_PERMISSION_RES;
 
 /**
  * web 配置类

src/main/java/cn/stylefeng/guns/core/interceptor/AttributeSetInteceptor.java → src/main/java/cn/stylefeng/guns/core/attribute/AttributeSetInteceptor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.interceptor;
+package cn.stylefeng.guns.core.attribute;
 
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;

src/main/java/cn/stylefeng/guns/core/beetl/BeetlConfiguration.java

@@ -22,8 +22,8 @@ import org.beetl.ext.spring.BeetlGroupUtilConfiguration;
 import java.util.HashMap;
 import java.util.Map;
 
-import static cn.stylefeng.guns.core.common.constant.Const.DEFAULT_SYSTEM_NAME;
-import static cn.stylefeng.guns.core.common.constant.Const.DEFAULT_WELCOME_TIP;
+import static cn.stylefeng.guns.core.constant.Const.DEFAULT_SYSTEM_NAME;
+import static cn.stylefeng.guns.core.constant.Const.DEFAULT_WELCOME_TIP;
 
 /**
  * beetl拓展配置,绑定一些工具类,方便在模板中直接调用

src/main/java/cn/stylefeng/guns/core/common/constant/Const.java → src/main/java/cn/stylefeng/guns/core/constant/Const.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant;
+package cn.stylefeng.guns.core.constant;
 
 import cn.hutool.core.collection.CollectionUtil;
 

src/main/java/cn/stylefeng/guns/core/common/constant/DatasourceEnum.java → src/main/java/cn/stylefeng/guns/core/constant/DatasourceEnum.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant;
+package cn.stylefeng.guns.core.constant;
 
 /**
  * 多数据源的枚举

src/main/java/cn/stylefeng/guns/core/common/constant/DefaultAvatar.java → src/main/java/cn/stylefeng/guns/core/constant/DefaultAvatar.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant;
+package cn.stylefeng.guns.core.constant;
 
 /**
  * 默认的头像base64编码

src/main/java/cn/stylefeng/guns/core/common/constant/JwtConstants.java → src/main/java/cn/stylefeng/guns/core/constant/JwtConstants.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant;
+package cn.stylefeng.guns.core.constant;
 
 /**
  * jwt相关配置

src/main/java/cn/stylefeng/guns/core/common/constant/cache/Cache.java → src/main/java/cn/stylefeng/guns/core/constant/cache/Cache.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.cache;
+package cn.stylefeng.guns.core.constant.cache;
 
 /**
  * 所有缓存名称的集合

src/main/java/cn/stylefeng/guns/core/common/constant/cache/CacheKey.java → src/main/java/cn/stylefeng/guns/core/constant/cache/CacheKey.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.cache;
+package cn.stylefeng.guns.core.constant.cache;
 
 /**
  * 缓存标识前缀集合,常用在ConstantFactory类中

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/DeleteDict.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap;
+package cn.stylefeng.guns.core.constant.dictmap;
 
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
 
 /**
  * 用于删除业务的字典

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DeptDict.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/DeptDict.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap;
+package cn.stylefeng.guns.core.constant.dictmap;
 
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
 
 /**
  * 部门的映射

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DictMap.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/DictMap.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap;
+package cn.stylefeng.guns.core.constant.dictmap;
 
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
 
 /**
  * 字典map

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/MenuDict.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/MenuDict.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap;
+package cn.stylefeng.guns.core.constant.dictmap;
 
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
 
 /**
  * 菜单的字典

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/NoticeMap.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/NoticeMap.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap;
+package cn.stylefeng.guns.core.constant.dictmap;
 
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
 
 /**
  * 通知的映射

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/RoleDict.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/RoleDict.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap;
+package cn.stylefeng.guns.core.constant.dictmap;
 
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
 
 /**
  * 角色的字典

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/UserDict.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/UserDict.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap;
+package cn.stylefeng.guns.core.constant.dictmap;
 
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
 
 /**
  * 用户的字典

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/base/AbstractDictMap.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap.base;
+package cn.stylefeng.guns.core.constant.dictmap.base;
 
 import java.util.HashMap;
 

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/base/SystemDict.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/base/SystemDict.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap.base;
+package cn.stylefeng.guns.core.constant.dictmap.base;
 
 /**
  * 系统相关的字典

src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/factory/DictFieldWarpperFactory.java → src/main/java/cn/stylefeng/guns/core/constant/dictmap/factory/DictFieldWarpperFactory.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.dictmap.factory;
+package cn.stylefeng.guns.core.constant.dictmap.factory;
 
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.core.common.constant.factory.IConstantFactory;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.factory.IConstantFactory;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 
 import java.lang.reflect.Method;

src/main/java/cn/stylefeng/guns/core/common/constant/factory/ConstantFactory.java → src/main/java/cn/stylefeng/guns/core/constant/factory/ConstantFactory.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.factory;
+package cn.stylefeng.guns.core.constant.factory;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.guns.core.common.constant.cache.Cache;
-import cn.stylefeng.guns.core.common.constant.cache.CacheKey;
-import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
-import cn.stylefeng.guns.core.common.constant.state.MenuStatus;
+import cn.stylefeng.guns.core.constant.cache.Cache;
+import cn.stylefeng.guns.core.constant.cache.CacheKey;
+import cn.stylefeng.guns.core.constant.state.ManagerStatus;
+import cn.stylefeng.guns.core.constant.state.MenuStatus;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.modular.system.entity.*;
 import cn.stylefeng.guns.modular.system.mapper.*;

src/main/java/cn/stylefeng/guns/core/common/constant/factory/IConstantFactory.java → src/main/java/cn/stylefeng/guns/core/constant/factory/IConstantFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.factory;
+package cn.stylefeng.guns.core.constant.factory;
 
 import cn.stylefeng.guns.modular.system.entity.Dict;
 import cn.stylefeng.guns.modular.system.entity.Menu;

src/main/java/cn/stylefeng/guns/core/common/constant/state/BizLogType.java → src/main/java/cn/stylefeng/guns/core/constant/state/BizLogType.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 /**
  * 业务日志类型

src/main/java/cn/stylefeng/guns/core/common/constant/state/CommonStatus.java → src/main/java/cn/stylefeng/guns/core/constant/state/CommonStatus.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 import lombok.Getter;
 

src/main/java/cn/stylefeng/guns/core/common/constant/state/ExpenseState.java → src/main/java/cn/stylefeng/guns/core/constant/state/ExpenseState.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 /**
  * 是否是菜单的枚举

src/main/java/cn/stylefeng/guns/core/common/constant/state/LogSucceed.java → src/main/java/cn/stylefeng/guns/core/constant/state/LogSucceed.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 /**
  * 业务是否成功的日志记录

src/main/java/cn/stylefeng/guns/core/common/constant/state/LogType.java → src/main/java/cn/stylefeng/guns/core/constant/state/LogType.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 /**
  * 日志类型

src/main/java/cn/stylefeng/guns/core/common/constant/state/ManagerStatus.java → src/main/java/cn/stylefeng/guns/core/constant/state/ManagerStatus.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 import lombok.Getter;
 

src/main/java/cn/stylefeng/guns/core/common/constant/state/MenuOpenStatus.java → src/main/java/cn/stylefeng/guns/core/constant/state/MenuOpenStatus.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 /**
  * 菜单是否打开的状态

src/main/java/cn/stylefeng/guns/core/common/constant/state/MenuStatus.java → src/main/java/cn/stylefeng/guns/core/constant/state/MenuStatus.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 import lombok.Getter;
 

src/main/java/cn/stylefeng/guns/core/common/constant/state/Order.java → src/main/java/cn/stylefeng/guns/core/constant/state/Order.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.constant.state;
 
 /**
  * 数据库排序

src/main/java/cn/stylefeng/guns/core/common/exception/InvalidKaptchaException.java → src/main/java/cn/stylefeng/guns/core/exception/InvalidKaptchaException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.exception;
+package cn.stylefeng.guns.core.exception;
 
 /**
  * 验证码错误异常

src/main/java/cn/stylefeng/guns/core/aop/GlobalExceptionHandler.java → src/main/java/cn/stylefeng/guns/core/exception/aop/GlobalExceptionHandler.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.aop;
+package cn.stylefeng.guns.core.exception.aop;
 
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.exception.InvalidKaptchaException;
+import cn.stylefeng.guns.core.exception.InvalidKaptchaException;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.guns.core.log.LogManager;
 import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
 import cn.stylefeng.guns.core.shiro.ShiroKit;

src/main/java/cn/stylefeng/guns/core/common/exception/BizExceptionEnum.java → src/main/java/cn/stylefeng/guns/core/exception/enums/BizExceptionEnum.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.exception;
+package cn.stylefeng.guns.core.exception.enums;
 
 import cn.stylefeng.roses.kernel.model.exception.AbstractBaseExceptionEnum;
 

src/main/java/cn/stylefeng/guns/core/common/controller/GlobalController.java → src/main/java/cn/stylefeng/guns/core/exception/page/GlobalController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.controller;
+package cn.stylefeng.guns.core.exception.page;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

src/main/java/cn/stylefeng/guns/core/common/controller/GunsErrorView.java → src/main/java/cn/stylefeng/guns/core/exception/page/GunsErrorView.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.controller;
+package cn.stylefeng.guns.core.exception.page;
 
 import org.springframework.web.servlet.View;
 

src/main/java/cn/stylefeng/guns/core/interceptor/SessionHolderInterceptor.java

-/**
- * Copyright 2018-2020 stylefeng & fengshuonan (https://gitee.com/stylefeng)
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.stylefeng.guns.core.interceptor;
-
-import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.util.HttpSessionContext;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.stereotype.Component;
-
-/**
- * 静态调用session的拦截器
- *
- * @author fengshuonan
- * @date 2016年11月13日 下午10:15:42
- */
-@Aspect
-@Component
-public class SessionHolderInterceptor extends BaseController {
-
-    @Pointcut("execution(* cn.stylefeng.guns.*..controller.*.*(..))")
-    public void cutService() {
-    }
-
-    @Around("cutService()")
-    public Object sessionKit(ProceedingJoinPoint point) throws Throwable {
-        HttpSessionContext.put(super.getHttpServletRequest().getSession());
-        try {
-            return point.proceed();
-        } finally {
-            HttpSessionContext.remove();
-        }
-    }
-}

src/main/java/cn/stylefeng/guns/core/common/annotion/BussinessLog.java → src/main/java/cn/stylefeng/guns/core/log/annotion/BussinessLog.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.annotion;
+package cn.stylefeng.guns.core.log.annotion;
 
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
-import cn.stylefeng.guns.core.common.constant.dictmap.base.SystemDict;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.base.SystemDict;
 
 import java.lang.annotation.*;
 

src/main/java/cn/stylefeng/guns/core/aop/LogAop.java → src/main/java/cn/stylefeng/guns/core/log/aop/LogAop.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.aop;
+package cn.stylefeng.guns.core.log.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.annotion.BussinessLog;
+import cn.stylefeng.guns.core.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;
@@ -49,7 +49,7 @@ public class LogAop {
 
     private Logger log = LoggerFactory.getLogger(this.getClass());
 
-    @Pointcut(value = "@annotation(cn.stylefeng.guns.core.common.annotion.BussinessLog)")
+    @Pointcut(value = "@annotation(cn.stylefeng.guns.core.log.annotion.BussinessLog)")
     public void cutService() {
     }
 

src/main/java/cn/stylefeng/guns/core/log/factory/LogFactory.java

@@ -15,8 +15,8 @@
  */
 package cn.stylefeng.guns.core.log.factory;
 
-import cn.stylefeng.guns.core.common.constant.state.LogSucceed;
-import cn.stylefeng.guns.core.common.constant.state.LogType;
+import cn.stylefeng.guns.core.constant.state.LogSucceed;
+import cn.stylefeng.guns.core.constant.state.LogType;
 import cn.stylefeng.guns.modular.system.entity.LoginLog;
 import cn.stylefeng.guns.modular.system.entity.OperationLog;
 

src/main/java/cn/stylefeng/guns/core/log/factory/LogTaskFactory.java

@@ -15,8 +15,8 @@
  */
 package cn.stylefeng.guns.core.log.factory;
 
-import cn.stylefeng.guns.core.common.constant.state.LogSucceed;
-import cn.stylefeng.guns.core.common.constant.state.LogType;
+import cn.stylefeng.guns.core.constant.state.LogSucceed;
+import cn.stylefeng.guns.core.constant.state.LogType;
 import cn.stylefeng.guns.core.log.LogManager;
 import cn.stylefeng.guns.modular.system.entity.LoginLog;
 import cn.stylefeng.guns.modular.system.entity.OperationLog;

src/main/java/cn/stylefeng/guns/core/common/node/MenuNode.java → src/main/java/cn/stylefeng/guns/core/pojo/node/MenuNode.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.node;
+package cn.stylefeng.guns.core.pojo.node;
 
 import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
 import lombok.Data;

src/main/java/cn/stylefeng/guns/core/common/node/TreeviewNode.java → src/main/java/cn/stylefeng/guns/core/pojo/node/TreeviewNode.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.node;
+package cn.stylefeng.guns.core.pojo.node;
 
 import cn.stylefeng.roses.kernel.model.tree.Tree;
 import lombok.Data;

src/main/java/cn/stylefeng/guns/core/common/node/ZTreeNode.java → src/main/java/cn/stylefeng/guns/core/pojo/node/ZTreeNode.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.node;
+package cn.stylefeng.guns.core.pojo.node;
 
 import lombok.Data;
 

src/main/java/cn/stylefeng/guns/core/common/page/LayuiPageFactory.java → src/main/java/cn/stylefeng/guns/core/pojo/page/LayuiPageFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.page;
+package cn.stylefeng.guns.core.pojo.page;
 
 import cn.stylefeng.roses.core.util.HttpContext;
 import com.baomidou.mybatisplus.core.metadata.IPage;

src/main/java/cn/stylefeng/guns/core/common/page/LayuiPageInfo.java → src/main/java/cn/stylefeng/guns/core/pojo/page/LayuiPageInfo.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.page;
+package cn.stylefeng.guns.core.pojo.page;
 
 import lombok.Data;
 

src/main/java/cn/stylefeng/guns/core/interceptor/GunsUserFilter.java → src/main/java/cn/stylefeng/guns/core/shiro/GunsUserFilter.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package cn.stylefeng.guns.core.interceptor;
+package cn.stylefeng.guns.core.shiro;
 
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import org.apache.shiro.subject.Subject;

src/main/java/cn/stylefeng/guns/core/shiro/ShiroKit.java

@@ -15,9 +15,9 @@
  */
 package cn.stylefeng.guns.core.shiro;
 
-import cn.stylefeng.guns.core.common.constant.Const;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.guns.modular.system.entity.User;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;

src/main/java/cn/stylefeng/guns/core/common/annotion/Permission.java → src/main/java/cn/stylefeng/guns/core/shiro/annotion/Permission.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.common.annotion;
+package cn.stylefeng.guns.core.shiro.annotion;
 
 import java.lang.annotation.*;
 

src/main/java/cn/stylefeng/guns/core/aop/PermissionAop.java → src/main/java/cn/stylefeng/guns/core/shiro/aop/PermissionAop.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.aop;
+package cn.stylefeng.guns.core.shiro.aop;
 
-import cn.stylefeng.guns.core.common.annotion.Permission;
+import cn.stylefeng.guns.core.shiro.annotion.Permission;
 import cn.stylefeng.guns.core.shiro.service.PermissionCheckService;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -43,7 +43,7 @@ public class PermissionAop {
     @Autowired
     private PermissionCheckService check;
 
-    @Pointcut(value = "@annotation(cn.stylefeng.guns.core.common.annotion.Permission)")
+    @Pointcut(value = "@annotation(cn.stylefeng.guns.core.shiro.annotion.Permission)")
     private void cutPermission() {
 
     }

src/main/java/cn/stylefeng/guns/core/shiro/service/impl/UserAuthServiceServiceImpl.java

@@ -16,8 +16,8 @@
 package cn.stylefeng.guns.core.shiro.service.impl;
 
 import cn.hutool.core.convert.Convert;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.state.ManagerStatus;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
 import cn.stylefeng.guns.core.shiro.service.UserAuthService;

src/main/java/cn/stylefeng/guns/core/util/ApiMenuFilter.java

@@ -16,8 +16,8 @@
 package cn.stylefeng.guns.core.util;
 
 import cn.stylefeng.guns.config.properties.GunsProperties;
-import cn.stylefeng.guns.core.common.constant.Const;
-import cn.stylefeng.guns.core.common.node.MenuNode;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.pojo.node.MenuNode;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 
 import java.util.ArrayList;

src/main/java/cn/stylefeng/guns/core/util/Contrast.java

@@ -17,8 +17,8 @@ package cn.stylefeng.guns.core.util;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
-import cn.stylefeng.guns.core.common.constant.dictmap.factory.DictFieldWarpperFactory;
+import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.core.constant.dictmap.factory.DictFieldWarpperFactory;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;

src/main/java/cn/stylefeng/guns/core/util/JwtTokenUtil.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.core.util;
 
-import cn.stylefeng.guns.core.common.constant.JwtConstants;
+import cn.stylefeng.guns.core.constant.JwtConstants;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import io.jsonwebtoken.*;
 

src/main/java/cn/stylefeng/guns/core/interceptor/RestApiInteceptor.java → src/main/java/cn/stylefeng/guns/modular/api/aop/RestApiInteceptor.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.core.interceptor;
+package cn.stylefeng.guns.modular.api.aop;
 
-import cn.stylefeng.guns.core.common.constant.JwtConstants;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.core.constant.JwtConstants;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.guns.core.util.JwtTokenUtil;
 import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import cn.stylefeng.roses.core.util.RenderUtil;

src/main/java/cn/stylefeng/guns/modular/demos/controller/ApiController.java → src/main/java/cn/stylefeng/guns/modular/api/controller/ApiController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.modular.demos.controller;
+package cn.stylefeng.guns.modular.api.controller;
 
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;

src/main/java/cn/stylefeng/guns/modular/demos/controller/EgFormController.java

 package cn.stylefeng.guns.modular.demos.controller;
 
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
-import cn.stylefeng.guns.core.common.page.LayuiPageInfo;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.modular.demos.entity.EgForm;
 import cn.stylefeng.guns.modular.demos.model.EgFormParam;
 import cn.stylefeng.roses.core.base.controller.BaseController;

src/main/java/cn/stylefeng/guns/modular/demos/controller/ExcelController.java

@@ -8,8 +8,8 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.view.PoiBaseView;
 import cn.stylefeng.guns.config.properties.GunsProperties;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.page.LayuiPageInfo;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.modular.demos.entity.ExcelItem;
 import cn.stylefeng.guns.modular.system.service.UserService;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;

src/main/java/cn/stylefeng/guns/modular/system/controller/DeptController.java

@@ -16,13 +16,13 @@
 package cn.stylefeng.guns.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.core.common.annotion.BussinessLog;
-import cn.stylefeng.guns.core.common.annotion.Permission;
-import cn.stylefeng.guns.core.common.constant.dictmap.DeptDict;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.core.common.node.TreeviewNode;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.log.annotion.BussinessLog;
+import cn.stylefeng.guns.core.shiro.annotion.Permission;
+import cn.stylefeng.guns.core.constant.dictmap.DeptDict;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.pojo.node.TreeviewNode;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.modular.system.entity.Dept;
 import cn.stylefeng.guns.modular.system.model.DeptDto;

src/main/java/cn/stylefeng/guns/modular/system/controller/DictController.java

 package cn.stylefeng.guns.modular.system.controller;
 
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageInfo;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.modular.system.entity.Dict;
 import cn.stylefeng.guns.modular.system.entity.DictType;
 import cn.stylefeng.guns.modular.system.model.params.DictParam;

src/main/java/cn/stylefeng/guns/modular/system/controller/DictTypeController.java

 package cn.stylefeng.guns.modular.system.controller;
 
-import cn.stylefeng.guns.core.common.page.LayuiPageInfo;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.modular.system.entity.DictType;
 import cn.stylefeng.guns.modular.system.model.params.DictTypeParam;
 import cn.stylefeng.guns.modular.system.service.DictTypeService;

src/main/java/cn/stylefeng/guns/modular/system/controller/LogController.java

@@ -16,11 +16,11 @@
 package cn.stylefeng.guns.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.core.common.annotion.BussinessLog;
-import cn.stylefeng.guns.core.common.annotion.Permission;
-import cn.stylefeng.guns.core.common.constant.Const;
-import cn.stylefeng.guns.core.common.constant.state.BizLogType;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.log.annotion.BussinessLog;
+import cn.stylefeng.guns.core.shiro.annotion.Permission;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.constant.state.BizLogType;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.modular.system.entity.OperationLog;
 import cn.stylefeng.guns.modular.system.service.OperationLogService;
 import cn.stylefeng.guns.modular.system.warpper.LogWrapper;

src/main/java/cn/stylefeng/guns/modular/system/controller/LoginController.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.modular.system.controller;
 
-import cn.stylefeng.guns.core.common.node.MenuNode;
+import cn.stylefeng.guns.core.pojo.node.MenuNode;
 import cn.stylefeng.guns.core.log.LogManager;
 import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
 import cn.stylefeng.guns.core.shiro.ShiroKit;

src/main/java/cn/stylefeng/guns/modular/system/controller/LoginLogController.java

@@ -15,10 +15,10 @@
  */
 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.common.constant.Const;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.log.annotion.BussinessLog;
+import cn.stylefeng.guns.core.shiro.annotion.Permission;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.modular.system.service.LoginLogService;
 import cn.stylefeng.guns.modular.system.warpper.LogWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;

src/main/java/cn/stylefeng/guns/modular/system/controller/MenuController.java

@@ -16,16 +16,16 @@
 package cn.stylefeng.guns.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.core.common.annotion.BussinessLog;
-import cn.stylefeng.guns.core.common.annotion.Permission;
-import cn.stylefeng.guns.core.common.constant.Const;
-import cn.stylefeng.guns.core.common.constant.dictmap.DeleteDict;
-import cn.stylefeng.guns.core.common.constant.dictmap.MenuDict;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
-import cn.stylefeng.guns.core.common.page.LayuiPageInfo;
+import cn.stylefeng.guns.core.log.annotion.BussinessLog;
+import cn.stylefeng.guns.core.shiro.annotion.Permission;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.constant.dictmap.DeleteDict;
+import cn.stylefeng.guns.core.constant.dictmap.MenuDict;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.modular.system.entity.Menu;
 import cn.stylefeng.guns.modular.system.model.MenuDto;

src/main/java/cn/stylefeng/guns/modular/system/controller/NoticeController.java

@@ -16,12 +16,12 @@
 package cn.stylefeng.guns.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.core.common.annotion.BussinessLog;
-import cn.stylefeng.guns.core.common.constant.dictmap.DeleteDict;
-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.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.log.annotion.BussinessLog;
+import cn.stylefeng.guns.core.constant.dictmap.DeleteDict;
+import cn.stylefeng.guns.core.constant.dictmap.NoticeMap;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.modular.system.entity.Notice;

src/main/java/cn/stylefeng/guns/modular/system/controller/RoleController.java

@@ -16,15 +16,15 @@
 package cn.stylefeng.guns.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.core.common.annotion.BussinessLog;
-import cn.stylefeng.guns.core.common.annotion.Permission;
-import cn.stylefeng.guns.core.common.constant.Const;
-import cn.stylefeng.guns.core.common.constant.dictmap.DeleteDict;
-import cn.stylefeng.guns.core.common.constant.dictmap.RoleDict;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.log.annotion.BussinessLog;
+import cn.stylefeng.guns.core.shiro.annotion.Permission;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.constant.dictmap.DeleteDict;
+import cn.stylefeng.guns.core.constant.dictmap.RoleDict;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.modular.system.entity.Role;
 import cn.stylefeng.guns.modular.system.entity.User;

src/main/java/cn/stylefeng/guns/modular/system/controller/SystemController.java

@@ -17,7 +17,7 @@ package cn.stylefeng.guns.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.stylefeng.guns.config.properties.GunsProperties;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;

src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java

@@ -16,13 +16,13 @@
 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.common.constant.Const;
-import cn.stylefeng.guns.core.common.constant.dictmap.UserDict;
-import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.log.annotion.BussinessLog;
+import cn.stylefeng.guns.core.shiro.annotion.Permission;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.constant.dictmap.UserDict;
+import cn.stylefeng.guns.core.constant.state.ManagerStatus;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.modular.system.entity.User;

src/main/java/cn/stylefeng/guns/modular/system/factory/UserFactory.java

@@ -17,7 +17,7 @@ package cn.stylefeng.guns.modular.system.factory;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
+import cn.stylefeng.guns.core.constant.state.ManagerStatus;
 import cn.stylefeng.guns.modular.system.entity.User;
 import cn.stylefeng.guns.modular.system.model.UserDto;
 import cn.stylefeng.roses.core.util.ToolUtil;

src/main/java/cn/stylefeng/guns/modular/system/mapper/DeptMapper.java

 package cn.stylefeng.guns.modular.system.mapper;
 
-import cn.stylefeng.guns.core.common.node.TreeviewNode;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.node.TreeviewNode;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
 import cn.stylefeng.guns.modular.system.entity.Dept;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/cn/stylefeng/guns/modular/system/mapper/DictMapper.java

 package cn.stylefeng.guns.modular.system.mapper;
 
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
 import cn.stylefeng.guns.modular.system.entity.Dict;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/cn/stylefeng/guns/modular/system/mapper/MenuMapper.java

 package cn.stylefeng.guns.modular.system.mapper;
 
-import cn.stylefeng.guns.core.common.node.MenuNode;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.node.MenuNode;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
 import cn.stylefeng.guns.modular.system.entity.Menu;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/cn/stylefeng/guns/modular/system/mapper/RoleMapper.java

 package cn.stylefeng.guns.modular.system.mapper;
 
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
 import cn.stylefeng.guns.modular.system.entity.Role;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/DeptMapper.xml

@@ -23,7 +23,7 @@
         dept_id AS "deptId", pid AS "pid", pids AS "pids", simple_name AS "simpleName", full_name AS "fullName", description AS "description", version AS "version", sort AS "sort", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
     </sql>
 
-    <select id="tree" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
+    <select id="tree" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
 		select dept_id AS id, pid as "pId", simple_name as name,
 		(
 		CASE
@@ -35,7 +35,7 @@
 		) as "open" from sys_dept
 	</select>
 
-    <select id="tree" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode" databaseId="oracle">
+    <select id="tree" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
 		select dept_id AS id, pid as "pId", simple_name as name,
 		(
 		CASE
@@ -73,7 +73,7 @@
         order by sort ASC
     </select>
 
-    <select id="treeviewNodes" resultType="cn.stylefeng.guns.core.common.node.TreeviewNode">
+    <select id="treeviewNodes" resultType="cn.stylefeng.guns.core.pojo.node.TreeviewNode">
         select dept_id AS tags, pid as "parentId", simple_name as text from sys_dept
     </select>
 

src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/DictMapper.xml

@@ -24,7 +24,7 @@
         dict_id AS "dictId", dict_type_id AS "dictTypeId", code AS "code", name AS "name", parent_id AS "parentId", parent_ids AS "parentIds", status AS "status", sort AS "sort", description AS "description", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
     </sql>
 
-    <select id="dictTree" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
+    <select id="dictTree" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
         select dict_id AS id, parent_id as "pId", name as name,
 		(
 		CASE
@@ -36,7 +36,7 @@
 		) as "open" from sys_dict where dict_type_id = #{dictTypeId}
     </select>
 
-    <select id="dictTree" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode" databaseId="oracle">
+    <select id="dictTree" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
         select dict_id AS id, parent_id as "pId", name as name,
 		(
 		CASE

src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/MenuMapper.xml

@@ -66,7 +66,7 @@
         sys_relation where role_id = #{roleId}
     </select>
 
-    <select id="menuTreeList" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
+    <select id="menuTreeList" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
         SELECT
         m1.menu_id AS id,
         (
@@ -94,7 +94,7 @@
         m1.menu_id ASC
     </select>
 
-    <select id="menuTreeList" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode" databaseId="oracle">
+    <select id="menuTreeList" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
         SELECT
         m1.menu_id AS id,
         (
@@ -122,7 +122,7 @@
         m1.menu_id ASC
     </select>
 
-    <select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
+    <select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
         SELECT
         m1.menu_id AS id,
         (
@@ -173,7 +173,7 @@
         m1.menu_id ASC
     </select>
 
-    <select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode" databaseId="oracle">
+    <select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
         SELECT
         m1.menu_id AS id,
         (
@@ -235,7 +235,7 @@
         where rel.role_id = #{roleId}
     </select>
 
-    <select id="getMenusByRoleIds" resultType="cn.stylefeng.guns.core.common.node.MenuNode">
+    <select id="getMenusByRoleIds" resultType="cn.stylefeng.guns.core.pojo.node.MenuNode">
         SELECT
         m1.menu_id AS id,
         m1.icon AS icon,

src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/RoleMapper.xml

@@ -45,19 +45,19 @@
 		delete from sys_relation where role_id = #{roleId}
 	</delete>
 
-    <select id="roleTreeList" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
+    <select id="roleTreeList" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
 		select role_id AS id, pid as "pId",
 		name as name, (case when (pid = 0 or pid is null) then 'true'
 		else 'false' end) as "open" from sys_role
 	</select>
 
-    <select id="roleTreeList" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode" databaseId="oracle">
+    <select id="roleTreeList" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
 		select role_id AS id, pid as "pId",
 		name as name, (case when (pid = 0 or pid is null) then '1'
 		else '0' end) as "open" from sys_role
 	</select>
 
-    <select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
+    <select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
         SELECT
         r.role_id as id,
         pid as "pId",
@@ -96,7 +96,7 @@
         ORDER BY pid,sort ASC
     </select>
 
-    <select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode" databaseId="oracle">
+    <select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
         SELECT
         r.role_id as id,
         pid as "pId",

src/main/java/cn/stylefeng/guns/modular/system/service/DeptService.java

 package cn.stylefeng.guns.modular.system.service;
 
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.node.TreeviewNode;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.node.TreeviewNode;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.modular.system.entity.Dept;
 import cn.stylefeng.guns.modular.system.mapper.DeptMapper;
 import cn.stylefeng.roses.core.util.ToolUtil;

src/main/java/cn/stylefeng/guns/modular/system/service/DictService.java

 package cn.stylefeng.guns.modular.system.service;
 
-import cn.stylefeng.guns.core.common.constant.state.CommonStatus;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
-import cn.stylefeng.guns.core.common.page.LayuiPageInfo;
+import cn.stylefeng.guns.core.constant.state.CommonStatus;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.modular.system.entity.Dict;
 import cn.stylefeng.guns.modular.system.mapper.DictMapper;
 import cn.stylefeng.guns.modular.system.model.params.DictParam;

src/main/java/cn/stylefeng/guns/modular/system/service/DictTypeService.java

 package cn.stylefeng.guns.modular.system.service;
 
-import cn.stylefeng.guns.core.common.constant.state.CommonStatus;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
-import cn.stylefeng.guns.core.common.page.LayuiPageInfo;
+import cn.stylefeng.guns.core.constant.state.CommonStatus;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.modular.system.entity.DictType;
 import cn.stylefeng.guns.modular.system.mapper.DictTypeMapper;
 import cn.stylefeng.guns.modular.system.model.params.DictTypeParam;

src/main/java/cn/stylefeng/guns/modular/system/service/FileInfoService.java

@@ -3,8 +3,8 @@ package cn.stylefeng.guns.modular.system.service;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.IoUtil;
 import cn.stylefeng.guns.config.properties.GunsProperties;
-import cn.stylefeng.guns.core.common.constant.DefaultAvatar;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.core.constant.DefaultAvatar;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
 import cn.stylefeng.guns.modular.system.entity.FileInfo;

src/main/java/cn/stylefeng/guns/modular/system/service/MenuService.java

@@ -2,12 +2,12 @@ package cn.stylefeng.guns.modular.system.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.core.common.constant.state.MenuStatus;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.node.MenuNode;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.state.MenuStatus;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.node.MenuNode;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.listener.ConfigListener;
 import cn.stylefeng.guns.modular.system.entity.Menu;
 import cn.stylefeng.guns.modular.system.mapper.MenuMapper;

src/main/java/cn/stylefeng/guns/modular/system/service/NoticeService.java

 package cn.stylefeng.guns.modular.system.service;
 
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.modular.system.entity.Notice;
 import cn.stylefeng.guns.modular.system.mapper.NoticeMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/cn/stylefeng/guns/modular/system/service/RoleService.java

@@ -2,12 +2,12 @@ package cn.stylefeng.guns.modular.system.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
-import cn.stylefeng.guns.core.common.constant.Const;
-import cn.stylefeng.guns.core.common.constant.cache.Cache;
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import cn.stylefeng.guns.core.common.node.ZTreeNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.constant.cache.Cache;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.core.util.CacheUtil;
 import cn.stylefeng.guns.modular.system.entity.Relation;

src/main/java/cn/stylefeng/guns/modular/system/service/UserService.java

@@ -2,12 +2,12 @@ package cn.stylefeng.guns.modular.system.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.stylefeng.guns.core.common.constant.Const;
-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.common.node.MenuNode;
-import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.constant.Const;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.state.ManagerStatus;
+import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.core.pojo.node.MenuNode;
+import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
 import cn.stylefeng.guns.core.shiro.service.UserAuthService;

src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptTreeWrapper.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.modular.system.warpper;
 
-import cn.stylefeng.guns.core.common.node.TreeviewNode;
+import cn.stylefeng.guns.core.pojo.node.TreeviewNode;
 
 import java.util.List;
 

src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWrapper.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.modular.system.warpper;
 
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.util.DecimalUtil;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.util.ToolUtil;

src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWrapper.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.modular.system.warpper;
 
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.util.Contrast;
 import cn.stylefeng.guns.core.util.DecimalUtil;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;

src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWrapper.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.modular.system.warpper;
 
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.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;

src/main/java/cn/stylefeng/guns/modular/system/warpper/NoticeWrapper.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.modular.system.warpper;
 
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.util.DecimalUtil;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;

src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWrapper.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.modular.system.warpper;
 
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.util.DecimalUtil;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;

src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWrapper.java

@@ -15,7 +15,7 @@
  */
 package cn.stylefeng.guns.modular.system.warpper;
 
-import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
 import cn.stylefeng.guns.core.util.DecimalUtil;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;