更新框架

guns-vip-base/pom.xml → guns-base/pom.xml

@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>guns-vip-base</artifactId>
+    <artifactId>guns-base</artifactId>
 
     <packaging>jar</packaging>
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/base/AbstractDictMap.java → guns-base/src/main/java/cn/stylefeng/guns/base/dict/AbstractDictMap.java

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

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/base/SystemDict.java → guns-base/src/main/java/cn/stylefeng/guns/base/dict/SystemDict.java

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

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/annotion/BussinessLog.java → guns-base/src/main/java/cn/stylefeng/guns/base/log/BussinessLog.java

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

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/node/MenuNode.java → guns-base/src/main/java/cn/stylefeng/guns/base/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.base.core.pojo.node;
+package cn.stylefeng.guns.base.pojo.node;
 
 import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
 import lombok.Data;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/node/TreeviewNode.java → guns-base/src/main/java/cn/stylefeng/guns/base/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.base.core.pojo.node;
+package cn.stylefeng.guns.base.pojo.node;
 
 import cn.stylefeng.roses.kernel.model.tree.Tree;
 import lombok.Data;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/node/ZTreeNode.java → guns-base/src/main/java/cn/stylefeng/guns/base/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.base.core.pojo.node;
+package cn.stylefeng.guns.base.pojo.node;
 
 import lombok.Data;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/page/LayuiPageFactory.java → guns-base/src/main/java/cn/stylefeng/guns/base/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.base.core.pojo.page;
+package cn.stylefeng.guns.base.pojo.page;
 
 import cn.stylefeng.roses.core.util.HttpContext;
 import com.baomidou.mybatisplus.core.metadata.IPage;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/page/LayuiPageInfo.java → guns-base/src/main/java/cn/stylefeng/guns/base/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.base.core.pojo.page;
+package cn.stylefeng.guns.base.pojo.page;
 
 import lombok.Data;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/ShiroUser.java → guns-base/src/main/java/cn/stylefeng/guns/base/shiro/ShiroUser.java

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

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/annotion/Permission.java → guns-base/src/main/java/cn/stylefeng/guns/base/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.base.core.shiro.annotion;
+package cn.stylefeng.guns.base.shiro.annotion;
 
 import java.lang.annotation.*;
 

guns-sys/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cn.stylefeng</groupId>
+        <artifactId>guns-vip</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>guns-sys</artifactId>
+
+    <packaging>jar</packaging>
+
+    <dependencies>
+
+        <!--基础组件-->
+        <dependency>
+            <groupId>cn.stylefeng</groupId>
+            <artifactId>guns-base</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+</project>

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/EhCacheConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/EhCacheConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.config;
+package cn.stylefeng.guns.sys.config;
 
 import net.sf.ehcache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/SwaggerConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/SwaggerConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.config;
+package cn.stylefeng.guns.sys.config;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/datasource/MpPluginsConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/datasource/MpPluginsConfig.java

-package cn.stylefeng.guns.base.config.datasource;
+package cn.stylefeng.guns.sys.config.datasource;
 
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
 import cn.stylefeng.roses.core.metadata.CustomMetaObjectHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/datasource/SingleDataSourceConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/datasource/SingleDataSourceConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.config.datasource;
+package cn.stylefeng.guns.sys.config.datasource;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -31,7 +31,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @Configuration
 @ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "false", matchIfMissing = true)
 @EnableTransactionManagement(proxyTargetClass = true)
-@MapperScan(basePackages = {"cn.stylefeng.guns.base.modular.*.mapper", "cn.stylefeng.guns.modular.*.mapper"})
+@MapperScan(basePackages = {"cn.stylefeng.guns.sys.modular.*.mapper", "cn.stylefeng.guns.generator.modular.mapper", "cn.stylefeng.guns.modular.*.mapper"})
 public class SingleDataSourceConfig {
 
 }

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/properties/GunsPropertiesConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/properties/GunsPropertiesConfig.java

-package cn.stylefeng.guns.base.config.properties;
+package cn.stylefeng.guns.sys.config.properties;
 
+import cn.stylefeng.guns.sys.core.properties.BeetlProperties;
+import cn.stylefeng.guns.sys.core.properties.GunsProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/web/BeetlConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/web/BeetlConfig.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.config.web;
+package cn.stylefeng.guns.sys.config.web;
 
-import cn.stylefeng.guns.base.config.properties.BeetlProperties;
-import cn.stylefeng.guns.base.core.beetl.BeetlConfiguration;
+import cn.stylefeng.guns.sys.core.beetl.BeetlConfiguration;
+import cn.stylefeng.guns.sys.core.properties.BeetlProperties;
 import org.beetl.core.resource.ClasspathResourceLoader;
 import org.beetl.ext.spring.BeetlSpringViewResolver;
 import org.springframework.beans.factory.annotation.Autowired;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/web/ShiroConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/web/ShiroConfig.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.config.web;
+package cn.stylefeng.guns.sys.config.web;
 
-import cn.stylefeng.guns.base.config.properties.GunsProperties;
-import cn.stylefeng.guns.base.core.shiro.GunsUserFilter;
-import cn.stylefeng.guns.base.core.shiro.ShiroDbRealm;
+import cn.stylefeng.guns.sys.core.constant.Const;
+import cn.stylefeng.guns.sys.core.properties.GunsProperties;
+import cn.stylefeng.guns.sys.core.shiro.GunsUserFilter;
+import cn.stylefeng.guns.sys.core.shiro.ShiroDbRealm;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.cache.ehcache.EhCacheManager;
 import org.apache.shiro.codec.Base64;
@@ -43,8 +44,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static cn.stylefeng.guns.base.core.constant.Const.NONE_PERMISSION_RES;
-
 /**
  * shiro权限管理的配置
  *
@@ -177,7 +176,7 @@ public class ShiroConfig {
          *
          */
         Map<String, String> hashMap = new LinkedHashMap<>();
-        for (String nonePermissionRe : NONE_PERMISSION_RES) {
+        for (String nonePermissionRe : Const.NONE_PERMISSION_RES) {
             hashMap.put(nonePermissionRe, "anon");
         }
         hashMap.put("/**", "user");

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/web/String2DateConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/web/String2DateConfig.java

-package cn.stylefeng.guns.base.config.web;
+package cn.stylefeng.guns.sys.config.web;
 
 import cn.hutool.core.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/web/WebConfig.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/config/web/WebConfig.java

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.config.web;
-
-import cn.stylefeng.guns.base.core.attribute.AttributeSetInteceptor;
-import cn.stylefeng.guns.base.core.exception.page.GunsErrorView;
-import cn.stylefeng.guns.base.core.listener.ConfigListener;
-import cn.stylefeng.guns.base.modular.api.aop.RestApiInteceptor;
-import cn.stylefeng.guns.base.config.properties.GunsProperties;
+package cn.stylefeng.guns.sys.config.web;
+
+import cn.stylefeng.guns.sys.core.attribute.AttributeSetInteceptor;
+import cn.stylefeng.guns.sys.core.constant.Const;
+import cn.stylefeng.guns.sys.core.exception.page.GunsErrorView;
+import cn.stylefeng.guns.sys.core.listener.ConfigListener;
+import cn.stylefeng.guns.sys.core.properties.GunsProperties;
+import cn.stylefeng.guns.sys.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,8 +45,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.Properties;
 
-import static cn.stylefeng.guns.base.core.constant.Const.NONE_PERMISSION_RES;
-
 /**
  * web 配置类
  *
@@ -80,7 +79,7 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new RestApiInteceptor()).addPathPatterns("/gunsApi/**");
-        registry.addInterceptor(new AttributeSetInteceptor()).excludePathPatterns(NONE_PERMISSION_RES).addPathPatterns("/**");
+        registry.addInterceptor(new AttributeSetInteceptor()).excludePathPatterns(Const.NONE_PERMISSION_RES).addPathPatterns("/**");
     }
 
     /**

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/attribute/AttributeSetInteceptor.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/attribute/AttributeSetInteceptor.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.attribute;
+package cn.stylefeng.guns.sys.core.attribute;
 
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
-import cn.stylefeng.guns.base.core.util.DefaultImages;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.core.util.DefaultImages;
 import org.apache.shiro.authc.AuthenticationException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/beetl/BeetlConfiguration.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/beetl/BeetlConfiguration.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.beetl;
+package cn.stylefeng.guns.sys.core.beetl;
 
-import cn.stylefeng.guns.base.core.util.KaptchaUtil;
+import cn.stylefeng.guns.sys.core.util.KaptchaUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import org.beetl.ext.spring.BeetlGroupUtilConfiguration;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static cn.stylefeng.guns.base.core.constant.Const.DEFAULT_SYSTEM_NAME;
-import static cn.stylefeng.guns.base.core.constant.Const.DEFAULT_WELCOME_TIP;
+import static cn.stylefeng.guns.sys.core.constant.Const.DEFAULT_SYSTEM_NAME;
+import static cn.stylefeng.guns.sys.core.constant.Const.DEFAULT_WELCOME_TIP;
 
 /**
  * beetl拓展配置,绑定一些工具类,方便在模板中直接调用

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/beetl/ShiroExt.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/beetl/ShiroExt.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.beetl;
+package cn.stylefeng.guns.sys.core.beetl;
 
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/Const.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant;
+package cn.stylefeng.guns.sys.core.constant;
 
 import cn.hutool.core.collection.CollectionUtil;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/DatasourceEnum.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant;
+package cn.stylefeng.guns.sys.core.constant;
 
 /**
  * 多数据源的枚举

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/DefaultAvatar.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant;
+package cn.stylefeng.guns.sys.core.constant;
 
 /**
  * 默认的头像base64编码

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/JwtConstants.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant;
+package cn.stylefeng.guns.sys.core.constant;
 
 /**
  * jwt相关配置

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/cache/Cache.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.cache;
+package cn.stylefeng.guns.sys.core.constant.cache;
 
 /**
  * 所有缓存名称的集合

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/cache/CacheKey.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.cache;
+package cn.stylefeng.guns.sys.core.constant.cache;
 
 /**
  * 缓存标识前缀集合,常用在ConstantFactory类中

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/DeleteDict.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.dictmap;
+package cn.stylefeng.guns.sys.core.constant.dictmap;
 
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
 
 /**
  * 用于删除业务的字典

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/DeptDict.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.dictmap;
+package cn.stylefeng.guns.sys.core.constant.dictmap;
 
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
 
 /**
  * 部门的映射

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/DictMap.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.dictmap;
+package cn.stylefeng.guns.sys.core.constant.dictmap;
 
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
 
 /**
  * 字典map

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/MenuDict.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.dictmap;
+package cn.stylefeng.guns.sys.core.constant.dictmap;
 
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
 
 /**
  * 菜单的字典

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/NoticeMap.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.dictmap;
+package cn.stylefeng.guns.sys.core.constant.dictmap;
 
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
 
 /**
  * 通知的映射

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/RoleDict.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.dictmap;
+package cn.stylefeng.guns.sys.core.constant.dictmap;
 
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
 
 /**
  * 角色的字典

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/UserDict.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.dictmap;
+package cn.stylefeng.guns.sys.core.constant.dictmap;
 
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
 
 /**
  * 用户的字典

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/factory/DictFieldWarpperFactory.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.dictmap.factory;
+package cn.stylefeng.guns.sys.core.constant.dictmap.factory;
 
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.constant.factory.IConstantFactory;
-import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.constant.factory.IConstantFactory;
+import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 
 import java.lang.reflect.Method;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/factory/ConstantFactory.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/constant/factory/ConstantFactory.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.constant.factory;
+package cn.stylefeng.guns.sys.core.constant.factory;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.guns.base.core.constant.cache.Cache;
-import cn.stylefeng.guns.base.core.constant.cache.CacheKey;
-import cn.stylefeng.guns.base.core.constant.state.ManagerStatus;
-import cn.stylefeng.guns.base.core.constant.state.MenuStatus;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.modular.system.entity.*;
-import cn.stylefeng.guns.base.modular.system.mapper.*;
+import cn.stylefeng.guns.sys.core.constant.cache.Cache;
+import cn.stylefeng.guns.sys.core.constant.cache.CacheKey;
+import cn.stylefeng.guns.sys.core.constant.state.ManagerStatus;
+import cn.stylefeng.guns.sys.core.constant.state.MenuStatus;
+import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
+import cn.stylefeng.guns.sys.modular.system.entity.*;
+import cn.stylefeng.guns.sys.modular.system.mapper.*;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/factory/IConstantFactory.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/constant/factory/IConstantFactory.java

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

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/BizLogType.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 /**
  * 业务日志类型

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/CommonStatus.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 import lombok.Getter;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/ExpenseState.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 /**
  * 是否是菜单的枚举

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/LogSucceed.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 /**
  * 业务是否成功的日志记录

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/LogType.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 /**
  * 日志类型

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/ManagerStatus.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 import lombok.Getter;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/MenuOpenStatus.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 /**
  * 菜单是否打开的状态

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/MenuStatus.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 import lombok.Getter;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/Order.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.constant.state;
+package cn.stylefeng.guns.sys.core.constant.state;
 
 /**
  * 数据库排序

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/InvalidKaptchaException.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.exception;
+package cn.stylefeng.guns.sys.core.exception;
 
 /**
  * 验证码错误异常

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/aop/GlobalExceptionHandler.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/exception/aop/GlobalExceptionHandler.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.exception.aop;
+package cn.stylefeng.guns.sys.core.exception.aop;
 
-import cn.stylefeng.guns.base.core.exception.InvalidKaptchaException;
-import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
-import cn.stylefeng.guns.base.core.log.LogManager;
-import cn.stylefeng.guns.base.core.log.factory.LogTaskFactory;
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.core.exception.InvalidKaptchaException;
+import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.sys.core.log.LogManager;
+import cn.stylefeng.guns.sys.core.log.factory.LogTaskFactory;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
 import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import org.apache.shiro.authc.AuthenticationException;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/enums/BizExceptionEnum.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.exception.enums;
+package cn.stylefeng.guns.sys.core.exception.enums;
 
 import cn.stylefeng.roses.kernel.model.exception.AbstractBaseExceptionEnum;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/page/GlobalController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.exception.page;
+package cn.stylefeng.guns.sys.core.exception.page;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/page/GunsErrorView.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/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.base.core.exception.page;
+package cn.stylefeng.guns.sys.core.exception.page;
 
 import org.springframework.web.servlet.View;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/listener/ConfigListener.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/listener/ConfigListener.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.listener;
+package cn.stylefeng.guns.sys.core.listener;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/LogManager.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/log/LogManager.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.log;
+package cn.stylefeng.guns.sys.core.log;
 
 import java.util.TimerTask;
 import java.util.concurrent.ScheduledThreadPoolExecutor;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/LogObjectHolder.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/log/LogObjectHolder.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.log;
+package cn.stylefeng.guns.sys.core.log;
 
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import org.springframework.context.annotation.Scope;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/aop/LogAop.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/log/aop/LogAop.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.log.aop;
-
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
-import cn.stylefeng.guns.base.core.log.LogManager;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
-import cn.stylefeng.guns.base.core.log.factory.LogTaskFactory;
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
-import cn.stylefeng.guns.base.core.util.Contrast;
+package cn.stylefeng.guns.sys.core.log.aop;
+
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
+import cn.stylefeng.guns.base.log.BussinessLog;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.core.log.LogManager;
+import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
+import cn.stylefeng.guns.sys.core.log.factory.LogTaskFactory;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.core.util.Contrast;
 import cn.stylefeng.roses.core.util.HttpContext;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -49,7 +49,7 @@ public class LogAop {
 
     private Logger log = LoggerFactory.getLogger(this.getClass());
 
-    @Pointcut(value = "@annotation(cn.stylefeng.guns.base.core.log.annotion.BussinessLog)")
+    @Pointcut(value = "@annotation(cn.stylefeng.guns.base.log.BussinessLog)")
     public void cutService() {
     }
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/factory/LogFactory.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/log/factory/LogFactory.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.log.factory;
+package cn.stylefeng.guns.sys.core.log.factory;
 
-import cn.stylefeng.guns.base.modular.system.entity.LoginLog;
-import cn.stylefeng.guns.base.modular.system.entity.OperationLog;
-import cn.stylefeng.guns.base.core.constant.state.LogSucceed;
-import cn.stylefeng.guns.base.core.constant.state.LogType;
+import cn.stylefeng.guns.sys.modular.system.entity.LoginLog;
+import cn.stylefeng.guns.sys.modular.system.entity.OperationLog;
+import cn.stylefeng.guns.sys.core.constant.state.LogSucceed;
+import cn.stylefeng.guns.sys.core.constant.state.LogType;
 
 import java.util.Date;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/factory/LogTaskFactory.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/log/factory/LogTaskFactory.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.log.factory;
+package cn.stylefeng.guns.sys.core.log.factory;
 
-import cn.stylefeng.guns.base.core.log.LogManager;
-import cn.stylefeng.guns.base.modular.system.entity.LoginLog;
-import cn.stylefeng.guns.base.modular.system.entity.OperationLog;
-import cn.stylefeng.guns.base.core.constant.state.LogSucceed;
-import cn.stylefeng.guns.base.core.constant.state.LogType;
-import cn.stylefeng.guns.base.modular.system.mapper.LoginLogMapper;
-import cn.stylefeng.guns.base.modular.system.mapper.OperationLogMapper;
+import cn.stylefeng.guns.sys.core.log.LogManager;
+import cn.stylefeng.guns.sys.modular.system.entity.LoginLog;
+import cn.stylefeng.guns.sys.modular.system.entity.OperationLog;
+import cn.stylefeng.guns.sys.core.constant.state.LogSucceed;
+import cn.stylefeng.guns.sys.core.constant.state.LogType;
+import cn.stylefeng.guns.sys.modular.system.mapper.LoginLogMapper;
+import cn.stylefeng.guns.sys.modular.system.mapper.OperationLogMapper;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import org.slf4j.Logger;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/properties/BeetlProperties.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/properties/BeetlProperties.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.config.properties;
+package cn.stylefeng.guns.sys.core.properties;
 
 import cn.stylefeng.roses.core.util.ToolUtil;
 import lombok.Data;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/properties/GunsProperties.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/properties/GunsProperties.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.config.properties;
+package cn.stylefeng.guns.sys.core.properties;
 
 import cn.stylefeng.roses.core.util.ToolUtil;
 import lombok.Data;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/GunsUserFilter.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/shiro/GunsUserFilter.java

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

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/ShiroDbRealm.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/shiro/ShiroDbRealm.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.shiro;
+package cn.stylefeng.guns.sys.core.shiro;
 
-import cn.stylefeng.guns.base.modular.system.entity.User;
-import cn.stylefeng.guns.base.core.shiro.service.UserAuthService;
-import cn.stylefeng.guns.base.core.shiro.service.impl.UserAuthServiceServiceImpl;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.modular.system.entity.User;
+import cn.stylefeng.guns.sys.core.shiro.service.UserAuthService;
+import cn.stylefeng.guns.sys.core.shiro.service.impl.UserAuthServiceServiceImpl;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/ShiroKit.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/shiro/ShiroKit.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.shiro;
+package cn.stylefeng.guns.sys.core.shiro;
 
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
-import cn.stylefeng.guns.base.modular.system.entity.User;
-import cn.stylefeng.guns.base.core.constant.Const;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.sys.modular.system.entity.User;
+import cn.stylefeng.guns.sys.core.constant.Const;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import org.apache.shiro.SecurityUtils;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/aop/PermissionAop.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/shiro/aop/PermissionAop.java

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

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/service/PermissionCheckService.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/shiro/service/PermissionCheckService.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.shiro.service;
+package cn.stylefeng.guns.sys.core.shiro.service;
 
 /**
  * 检查用接口

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/service/UserAuthService.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/shiro/service/UserAuthService.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.shiro.service;
+package cn.stylefeng.guns.sys.core.shiro.service;
 
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
-import cn.stylefeng.guns.base.modular.system.entity.User;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.modular.system.entity.User;
 import org.apache.shiro.authc.SimpleAuthenticationInfo;
 
 import java.util.List;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/service/impl/PermissionCheckServiceServiceImpl.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/shiro/service/impl/PermissionCheckServiceServiceImpl.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.shiro.service.impl;
+package cn.stylefeng.guns.sys.core.shiro.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.stylefeng.guns.base.core.listener.ConfigListener;
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
-import cn.stylefeng.guns.base.core.shiro.service.PermissionCheckService;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.core.listener.ConfigListener;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.core.shiro.service.PermissionCheckService;
 import cn.stylefeng.roses.core.util.HttpContext;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Service;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/service/impl/UserAuthServiceServiceImpl.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/shiro/service/impl/UserAuthServiceServiceImpl.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.shiro.service.impl;
+package cn.stylefeng.guns.sys.core.shiro.service.impl;
 
 import cn.hutool.core.convert.Convert;
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
-import cn.stylefeng.guns.base.core.shiro.service.UserAuthService;
-import cn.stylefeng.guns.base.modular.system.entity.User;
-import cn.stylefeng.guns.base.modular.system.mapper.MenuMapper;
-import cn.stylefeng.guns.base.core.constant.state.ManagerStatus;
-import cn.stylefeng.guns.base.modular.system.mapper.UserMapper;
-import cn.stylefeng.guns.base.modular.system.service.UserService;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.constant.state.ManagerStatus;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.core.shiro.service.UserAuthService;
+import cn.stylefeng.guns.sys.modular.system.entity.User;
+import cn.stylefeng.guns.sys.modular.system.mapper.MenuMapper;
+import cn.stylefeng.guns.sys.modular.system.mapper.UserMapper;
+import cn.stylefeng.guns.sys.modular.system.service.UserService;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import org.apache.shiro.authc.CredentialsException;
 import org.apache.shiro.authc.LockedAccountException;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/ApiMenuFilter.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/util/ApiMenuFilter.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.util;
+package cn.stylefeng.guns.sys.core.util;
 
-import cn.stylefeng.guns.base.config.properties.GunsProperties;
-import cn.stylefeng.guns.base.core.pojo.node.MenuNode;
-import cn.stylefeng.guns.base.core.constant.Const;
+import cn.stylefeng.guns.base.pojo.node.MenuNode;
+import cn.stylefeng.guns.sys.core.constant.Const;
+import cn.stylefeng.guns.sys.core.properties.GunsProperties;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 
 import java.util.ArrayList;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/CacheUtil.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/util/CacheUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.util;
+package cn.stylefeng.guns.sys.core.util;
 
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import lombok.extern.slf4j.Slf4j;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/Contrast.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/util/Contrast.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.util;
+package cn.stylefeng.guns.sys.core.util;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
-import cn.stylefeng.guns.base.core.constant.dictmap.factory.DictFieldWarpperFactory;
+import cn.stylefeng.guns.base.dict.AbstractDictMap;
+import cn.stylefeng.guns.sys.core.constant.dictmap.factory.DictFieldWarpperFactory;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/DecimalUtil.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/util/DecimalUtil.java

-package cn.stylefeng.guns.base.core.util;
+package cn.stylefeng.guns.sys.core.util;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/DefaultImages.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/util/DefaultImages.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.util;
+package cn.stylefeng.guns.sys.core.util;
 
-import cn.stylefeng.guns.base.core.listener.ConfigListener;
+import cn.stylefeng.guns.sys.core.listener.ConfigListener;
 
 /**
  * 获取默认图片地址

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/JwtTokenUtil.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/util/JwtTokenUtil.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.util;
+package cn.stylefeng.guns.sys.core.util;
 
-import cn.stylefeng.guns.base.core.constant.JwtConstants;
+import cn.stylefeng.guns.sys.core.constant.JwtConstants;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import io.jsonwebtoken.*;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/KaptchaUtil.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/core/util/KaptchaUtil.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.core.util;
+package cn.stylefeng.guns.sys.core.util;
 
-import cn.stylefeng.guns.base.config.properties.GunsProperties;
+import cn.stylefeng.guns.sys.core.properties.GunsProperties;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 
 /**

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/api/aop/RestApiInteceptor.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/api/aop/RestApiInteceptor.java

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

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/api/controller/ApiController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/api/controller/ApiController.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.api.controller;
+package cn.stylefeng.guns.sys.modular.api.controller;
 
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
-import cn.stylefeng.guns.base.core.util.JwtTokenUtil;
-import cn.stylefeng.guns.base.modular.system.entity.User;
-import cn.stylefeng.guns.base.modular.system.mapper.UserMapper;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.core.util.JwtTokenUtil;
+import cn.stylefeng.guns.sys.modular.system.entity.User;
+import cn.stylefeng.guns.sys.modular.system.mapper.UserMapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import org.apache.shiro.authc.SimpleAuthenticationInfo;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/DeptController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/DeptController.java

@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
-import cn.stylefeng.guns.base.modular.system.entity.Dept;
-import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
-import cn.stylefeng.guns.base.core.constant.dictmap.DeptDict;
-import cn.stylefeng.guns.base.core.pojo.node.TreeviewNode;
-import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
-import cn.stylefeng.guns.base.modular.system.model.DeptDto;
-import cn.stylefeng.guns.base.modular.system.service.DeptService;
-import cn.stylefeng.guns.base.modular.system.warpper.DeptTreeWrapper;
-import cn.stylefeng.guns.base.modular.system.warpper.DeptWrapper;
+import cn.stylefeng.guns.base.log.BussinessLog;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
+import cn.stylefeng.guns.sys.modular.system.entity.Dept;
+import cn.stylefeng.guns.base.shiro.annotion.Permission;
+import cn.stylefeng.guns.sys.core.constant.dictmap.DeptDict;
+import cn.stylefeng.guns.base.pojo.node.TreeviewNode;
+import cn.stylefeng.guns.base.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.sys.modular.system.model.DeptDto;
+import cn.stylefeng.guns.sys.modular.system.service.DeptService;
+import cn.stylefeng.guns.sys.modular.system.warpper.DeptTreeWrapper;
+import cn.stylefeng.guns.sys.modular.system.warpper.DeptWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.treebuild.DefaultTreeBuildFactory;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/DictController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/DictController.java

-package cn.stylefeng.guns.base.modular.system.controller;
-
-import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
-import cn.stylefeng.guns.base.modular.system.entity.Dict;
-import cn.stylefeng.guns.base.modular.system.entity.DictType;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
-import cn.stylefeng.guns.base.modular.system.model.params.DictParam;
-import cn.stylefeng.guns.base.modular.system.model.result.DictResult;
-import cn.stylefeng.guns.base.modular.system.service.DictService;
-import cn.stylefeng.guns.base.modular.system.service.DictTypeService;
+package cn.stylefeng.guns.sys.modular.system.controller;
+
+import cn.stylefeng.guns.base.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
+import cn.stylefeng.guns.sys.modular.system.entity.Dict;
+import cn.stylefeng.guns.sys.modular.system.entity.DictType;
+import cn.stylefeng.guns.sys.modular.system.model.params.DictParam;
+import cn.stylefeng.guns.sys.modular.system.model.result.DictResult;
+import cn.stylefeng.guns.sys.modular.system.service.DictService;
+import cn.stylefeng.guns.sys.modular.system.service.DictTypeService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/DictTypeController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/DictTypeController.java

-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
-import cn.stylefeng.guns.base.modular.system.entity.DictType;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
-import cn.stylefeng.guns.base.modular.system.model.params.DictTypeParam;
-import cn.stylefeng.guns.base.modular.system.service.DictTypeService;
+import cn.stylefeng.guns.sys.modular.system.entity.DictType;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
+import cn.stylefeng.guns.sys.modular.system.model.params.DictTypeParam;
+import cn.stylefeng.guns.sys.modular.system.service.DictTypeService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import org.springframework.beans.factory.annotation.Autowired;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/KaptchaController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/KaptchaController.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
-import cn.stylefeng.guns.base.config.properties.GunsProperties;
+import cn.stylefeng.guns.sys.core.properties.GunsProperties;
 import cn.stylefeng.roses.core.util.FileUtil;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/LogController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/LogController.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
-import cn.stylefeng.guns.base.modular.system.entity.OperationLog;
-import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
-import cn.stylefeng.guns.base.core.constant.Const;
-import cn.stylefeng.guns.base.core.constant.state.BizLogType;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
-import cn.stylefeng.guns.base.modular.system.service.OperationLogService;
-import cn.stylefeng.guns.base.modular.system.warpper.LogWrapper;
+import cn.stylefeng.guns.base.log.BussinessLog;
+import cn.stylefeng.guns.sys.modular.system.entity.OperationLog;
+import cn.stylefeng.guns.base.shiro.annotion.Permission;
+import cn.stylefeng.guns.sys.core.constant.Const;
+import cn.stylefeng.guns.sys.core.constant.state.BizLogType;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.sys.modular.system.service.OperationLogService;
+import cn.stylefeng.guns.sys.modular.system.warpper.LogWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/LoginController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/LoginController.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
-
-import cn.stylefeng.guns.base.core.log.LogManager;
-import cn.stylefeng.guns.base.core.pojo.node.MenuNode;
-import cn.stylefeng.guns.base.core.log.factory.LogTaskFactory;
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
-import cn.stylefeng.guns.base.modular.system.service.UserService;
+package cn.stylefeng.guns.sys.modular.system.controller;
+
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.core.log.LogManager;
+import cn.stylefeng.guns.base.pojo.node.MenuNode;
+import cn.stylefeng.guns.sys.core.log.factory.LogTaskFactory;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.modular.system.service.UserService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/LoginLogController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/LoginLogController.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
-import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
-import cn.stylefeng.guns.base.modular.system.service.LoginLogService;
-import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
-import cn.stylefeng.guns.base.core.constant.Const;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
-import cn.stylefeng.guns.base.modular.system.warpper.LogWrapper;
+import cn.stylefeng.guns.base.log.BussinessLog;
+import cn.stylefeng.guns.sys.modular.system.service.LoginLogService;
+import cn.stylefeng.guns.base.shiro.annotion.Permission;
+import cn.stylefeng.guns.sys.core.constant.Const;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.sys.modular.system.warpper.LogWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/MenuController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/MenuController.java

@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.modular.system.entity.Menu;
-import cn.stylefeng.guns.base.modular.system.service.MenuService;
-import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
-import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
-import cn.stylefeng.guns.base.core.constant.Const;
-import cn.stylefeng.guns.base.core.constant.dictmap.DeleteDict;
-import cn.stylefeng.guns.base.core.constant.dictmap.MenuDict;
-import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
-import cn.stylefeng.guns.base.modular.system.model.MenuDto;
-import cn.stylefeng.guns.base.modular.system.service.UserService;
-import cn.stylefeng.guns.base.modular.system.warpper.MenuWrapper;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
+import cn.stylefeng.guns.sys.modular.system.entity.Menu;
+import cn.stylefeng.guns.sys.modular.system.service.MenuService;
+import cn.stylefeng.guns.base.log.BussinessLog;
+import cn.stylefeng.guns.base.shiro.annotion.Permission;
+import cn.stylefeng.guns.sys.core.constant.Const;
+import cn.stylefeng.guns.sys.core.constant.dictmap.DeleteDict;
+import cn.stylefeng.guns.sys.core.constant.dictmap.MenuDict;
+import cn.stylefeng.guns.base.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
+import cn.stylefeng.guns.sys.modular.system.model.MenuDto;
+import cn.stylefeng.guns.sys.modular.system.service.UserService;
+import cn.stylefeng.guns.sys.modular.system.warpper.MenuWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/NoticeController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/NoticeController.java

@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.base.core.constant.dictmap.NoticeMap;
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
-import cn.stylefeng.guns.base.modular.system.entity.Notice;
-import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
-import cn.stylefeng.guns.base.core.constant.dictmap.DeleteDict;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.modular.system.service.NoticeService;
-import cn.stylefeng.guns.base.modular.system.warpper.NoticeWrapper;
+import cn.stylefeng.guns.sys.core.constant.dictmap.NoticeMap;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.sys.modular.system.entity.Notice;
+import cn.stylefeng.guns.base.log.BussinessLog;
+import cn.stylefeng.guns.sys.core.constant.dictmap.DeleteDict;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.modular.system.service.NoticeService;
+import cn.stylefeng.guns.sys.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;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/RoleController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/RoleController.java

@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
-import cn.stylefeng.guns.base.modular.system.entity.Role;
-import cn.stylefeng.guns.base.modular.system.entity.User;
-import cn.stylefeng.guns.base.modular.system.service.RoleService;
-import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
-import cn.stylefeng.guns.base.core.constant.Const;
-import cn.stylefeng.guns.base.core.constant.dictmap.DeleteDict;
-import cn.stylefeng.guns.base.core.constant.dictmap.RoleDict;
-import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
-import cn.stylefeng.guns.base.modular.system.model.RoleDto;
-import cn.stylefeng.guns.base.modular.system.service.UserService;
-import cn.stylefeng.guns.base.modular.system.warpper.RoleWrapper;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
+import cn.stylefeng.guns.base.log.BussinessLog;
+import cn.stylefeng.guns.sys.modular.system.entity.Role;
+import cn.stylefeng.guns.sys.modular.system.entity.User;
+import cn.stylefeng.guns.sys.modular.system.service.RoleService;
+import cn.stylefeng.guns.base.shiro.annotion.Permission;
+import cn.stylefeng.guns.sys.core.constant.Const;
+import cn.stylefeng.guns.sys.core.constant.dictmap.DeleteDict;
+import cn.stylefeng.guns.sys.core.constant.dictmap.RoleDict;
+import cn.stylefeng.guns.base.pojo.node.ZTreeNode;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.sys.modular.system.model.RoleDto;
+import cn.stylefeng.guns.sys.modular.system.service.UserService;
+import cn.stylefeng.guns.sys.modular.system.warpper.RoleWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/SystemController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/SystemController.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.stylefeng.guns.base.config.properties.GunsProperties;
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.modular.system.entity.Notice;
-import cn.stylefeng.guns.base.modular.system.entity.User;
-import cn.stylefeng.guns.base.modular.system.service.FileInfoService;
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.core.shiro.ShiroUser;
-import cn.stylefeng.guns.base.modular.system.service.NoticeService;
-import cn.stylefeng.guns.base.modular.system.service.UserService;
+import cn.stylefeng.guns.base.shiro.ShiroUser;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
+import cn.stylefeng.guns.sys.core.properties.GunsProperties;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.modular.system.entity.Notice;
+import cn.stylefeng.guns.sys.modular.system.entity.User;
+import cn.stylefeng.guns.sys.modular.system.service.FileInfoService;
+import cn.stylefeng.guns.sys.modular.system.service.NoticeService;
+import cn.stylefeng.guns.sys.modular.system.service.UserService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/UserMgrController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/UserMgrController.java

@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.stylefeng.guns.base.modular.system.controller;
+package cn.stylefeng.guns.sys.modular.system.controller;
 
-import cn.stylefeng.guns.base.config.properties.GunsProperties;
-import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
-import cn.stylefeng.guns.base.modular.system.entity.User;
-import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
-import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
-import cn.stylefeng.guns.base.core.constant.Const;
-import cn.stylefeng.guns.base.core.constant.dictmap.UserDict;
-import cn.stylefeng.guns.base.core.constant.state.ManagerStatus;
-import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.core.shiro.ShiroKit;
-import cn.stylefeng.guns.base.modular.system.model.UserDto;
-import cn.stylefeng.guns.base.modular.system.service.UserService;
-import cn.stylefeng.guns.base.modular.system.warpper.UserWrapper;
+import cn.stylefeng.guns.base.log.BussinessLog;
+import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.base.shiro.annotion.Permission;
+import cn.stylefeng.guns.sys.core.constant.Const;
+import cn.stylefeng.guns.sys.core.constant.dictmap.UserDict;
+import cn.stylefeng.guns.sys.core.constant.state.ManagerStatus;
+import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
+import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
+import cn.stylefeng.guns.sys.core.properties.GunsProperties;
+import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
+import cn.stylefeng.guns.sys.modular.system.entity.User;
+import cn.stylefeng.guns.sys.modular.system.model.UserDto;
+import cn.stylefeng.guns.sys.modular.system.service.UserService;
+import cn.stylefeng.guns.sys.modular.system.warpper.UserWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Dept.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/Dept.java

-package cn.stylefeng.guns.base.modular.system.entity;
+package cn.stylefeng.guns.sys.modular.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Dict.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/Dict.java

-package cn.stylefeng.guns.base.modular.system.entity;
+package cn.stylefeng.guns.sys.modular.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/DictType.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/DictType.java

-package cn.stylefeng.guns.base.modular.system.entity;
+package cn.stylefeng.guns.sys.modular.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/FileInfo.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/FileInfo.java

-package cn.stylefeng.guns.base.modular.system.entity;
+package cn.stylefeng.guns.sys.modular.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/LoginLog.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/LoginLog.java

-package cn.stylefeng.guns.base.modular.system.entity;
+package cn.stylefeng.guns.sys.modular.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Menu.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/Menu.java

-package cn.stylefeng.guns.base.modular.system.entity;
+package cn.stylefeng.guns.sys.modular.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Notice.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/Notice.java

-package cn.stylefeng.guns.base.modular.system.entity;
+package cn.stylefeng.guns.sys.modular.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/OperationLog.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/entity/OperationLog.java

-package cn.stylefeng.guns.base.modular.system.entity;
+package cn.stylefeng.guns.sys.modular.system.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;