修改包名为cn

src/main/java/com/stylefeng/guns/config/EhCacheConfig.java → src/main/java/cn/stylefeng/guns/config/EhCacheConfig.java

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

src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java → src/main/java/cn/stylefeng/guns/config/SpringSessionConfig.java

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

src/main/java/com/stylefeng/guns/config/SwaggerConfig.java → src/main/java/cn/stylefeng/guns/config/SwaggerConfig.java

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

src/main/java/com/stylefeng/guns/config/datasource/MultiDataSourceConfig.java → src/main/java/cn/stylefeng/guns/config/datasource/MultiDataSourceConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.config.datasource;
+package cn.stylefeng.guns.config.datasource;
 
 
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.MutiDataSourceProperties;
 import cn.stylefeng.roses.core.config.properties.MutiDataSourceProperties;

src/main/java/com/stylefeng/guns/config/datasource/SingleDataSourceConfig.java → src/main/java/cn/stylefeng/guns/config/datasource/SingleDataSourceConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.config.datasource;
+package cn.stylefeng.guns.config.datasource;
 
 
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.datascope.DataScopeInterceptor;
 import cn.stylefeng.roses.core.datascope.DataScopeInterceptor;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.config.properties;
+package cn.stylefeng.guns.config.properties;
 
 
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.config.properties;
+package cn.stylefeng.guns.config.properties;
 
 
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;

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

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

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

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.config.web;
+package cn.stylefeng.guns.config.web;
 
 
-import com.stylefeng.guns.config.properties.GunsProperties;
-import com.stylefeng.guns.core.intercept.GunsUserFilter;
-import com.stylefeng.guns.core.shiro.ShiroDbRealm;
+import cn.stylefeng.guns.config.properties.GunsProperties;
+import cn.stylefeng.guns.core.shiro.ShiroDbRealm;
+import cn.stylefeng.guns.core.intercept.GunsUserFilter;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.cache.ehcache.EhCacheManager;
 import org.apache.shiro.cache.ehcache.EhCacheManager;
 import org.apache.shiro.codec.Base64;
 import org.apache.shiro.codec.Base64;

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

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.config.web;
+package cn.stylefeng.guns.config.web;
 
 
+import cn.stylefeng.guns.config.properties.GunsProperties;
 import cn.stylefeng.roses.core.xss.XssFilter;
 import cn.stylefeng.roses.core.xss.XssFilter;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.support.http.StatViewServlet;
 import com.alibaba.druid.support.http.StatViewServlet;
@@ -23,9 +24,8 @@ import com.alibaba.druid.support.spring.stat.BeanTypeAutoProxyCreator;
 import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
 import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;
 import com.google.code.kaptcha.util.Config;
-import com.stylefeng.guns.config.properties.GunsProperties;
-import com.stylefeng.guns.core.intercept.RestApiInteceptor;
-import com.stylefeng.guns.core.listener.ConfigListener;
+import cn.stylefeng.guns.core.intercept.RestApiInteceptor;
+import cn.stylefeng.guns.core.listener.ConfigListener;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.JdkRegexpMethodPointcut;
 import org.springframework.aop.support.JdkRegexpMethodPointcut;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.common.constant;
+package cn.stylefeng.guns.core.common.constant;
 
 
 /**
 /**
  * 系统常量
  * 系统常量

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.common.constant.dictmap.factory;
+package cn.stylefeng.guns.core.common.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.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.core.common.constant.factory.IConstantFactory;
-import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
 
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Method;
 
 

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

@@ -13,19 +13,21 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.common.constant.factory;
+package cn.stylefeng.guns.core.common.constant.factory;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 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.log.LogObjectHolder;
+import cn.stylefeng.guns.modular.system.dao.*;
+import cn.stylefeng.guns.modular.system.model.*;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.stylefeng.guns.core.common.constant.cache.Cache;
-import com.stylefeng.guns.core.common.constant.cache.CacheKey;
-import com.stylefeng.guns.core.common.constant.state.ManagerStatus;
-import com.stylefeng.guns.core.common.constant.state.MenuStatus;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
+import cn.stylefeng.guns.core.common.constant.state.MenuStatus;
 import com.stylefeng.guns.modular.system.dao.*;
 import com.stylefeng.guns.modular.system.dao.*;
 import com.stylefeng.guns.modular.system.model.*;
 import com.stylefeng.guns.modular.system.model.*;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Cacheable;

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

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.common.constant.factory;
+package cn.stylefeng.guns.core.common.constant.factory;
 
 
-import com.stylefeng.guns.modular.system.model.Dict;
+import cn.stylefeng.guns.modular.system.model.Dict;
 
 
 import java.util.List;
 import java.util.List;
 
 

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.common.constant.factory;
+package cn.stylefeng.guns.core.common.constant.factory;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.common.constant.factory;
+package cn.stylefeng.guns.core.common.constant.factory;
 
 
 import cn.stylefeng.roses.core.util.HttpContext;
 import cn.stylefeng.roses.core.util.HttpContext;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.core.common.constant.state.Order;
+import cn.stylefeng.guns.core.common.constant.state.Order;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.common.constant.state;
+package cn.stylefeng.guns.core.common.constant.state;
 
 
 /**
 /**
  * 管理员的状态
  * 管理员的状态

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

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

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

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

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

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

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

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

src/main/java/com/stylefeng/guns/core/controller/GlobalController.java → src/main/java/cn/stylefeng/guns/core/controller/GlobalController.java

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

src/main/java/com/stylefeng/guns/core/controller/GunsErrorView.java → src/main/java/cn/stylefeng/guns/core/controller/GunsErrorView.java

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

src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java → src/main/java/cn/stylefeng/guns/core/intercept/GunsUserFilter.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * specific language governing permissions and limitations
  * under the License.
  * under the License.
  */
  */
-package com.stylefeng.guns.core.intercept;
+package cn.stylefeng.guns.core.intercept;
 
 
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import cn.stylefeng.guns.core.shiro.ShiroKit;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.AccessControlFilter;
 import org.apache.shiro.web.filter.AccessControlFilter;
 import org.apache.shiro.web.util.WebUtils;
 import org.apache.shiro.web.util.WebUtils;

src/main/java/com/stylefeng/guns/core/intercept/RestApiInteceptor.java → src/main/java/cn/stylefeng/guns/core/intercept/RestApiInteceptor.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.intercept;
+package cn.stylefeng.guns.core.intercept;
 
 
+import cn.stylefeng.guns.core.util.JwtTokenUtil;
 import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import cn.stylefeng.roses.core.util.RenderUtil;
 import cn.stylefeng.roses.core.util.RenderUtil;
-import com.stylefeng.guns.core.common.constant.JwtConstants;
-import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import com.stylefeng.guns.core.util.JwtTokenUtil;
+import cn.stylefeng.guns.core.common.constant.JwtConstants;
+import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.JwtException;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

src/main/java/com/stylefeng/guns/core/intercept/SessionHolderInterceptor.java → src/main/java/cn/stylefeng/guns/core/intercept/SessionHolderInterceptor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.core.intercept;
+package cn.stylefeng.guns.core.intercept;
 
 
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.util.HttpSessionContext;
 import cn.stylefeng.roses.core.util.HttpSessionContext;

src/main/java/com/stylefeng/guns/core/listener/ConfigListener.java → src/main/java/cn/stylefeng/guns/core/listener/ConfigListener.java

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

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

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

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

@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.controller;
+package cn.stylefeng.guns.modular.system.controller;
 
 
+import cn.stylefeng.guns.core.common.annotion.BussinessLog;
+import cn.stylefeng.guns.core.common.annotion.Permission;
+import cn.stylefeng.guns.core.log.LogObjectHolder;
+import cn.stylefeng.guns.core.node.ZTreeNode;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
-import com.stylefeng.guns.core.common.annotion.BussinessLog;
-import com.stylefeng.guns.core.common.annotion.Permission;
-import com.stylefeng.guns.core.common.constant.dictmap.DeptDict;
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import com.stylefeng.guns.core.log.LogObjectHolder;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.model.Dept;
-import com.stylefeng.guns.modular.system.service.IDeptService;
-import com.stylefeng.guns.modular.system.warpper.DeptWarpper;
+import cn.stylefeng.guns.core.common.constant.dictmap.DeptDict;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.modular.system.model.Dept;
+import cn.stylefeng.guns.modular.system.service.IDeptService;
+import cn.stylefeng.guns.modular.system.warpper.DeptWarpper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.Model;

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

@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.controller;
+package cn.stylefeng.guns.modular.system.controller;
 
 
+import cn.stylefeng.guns.core.common.annotion.BussinessLog;
+import cn.stylefeng.guns.core.common.annotion.Permission;
+import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.stylefeng.guns.core.common.annotion.BussinessLog;
-import com.stylefeng.guns.core.common.annotion.Permission;
-import com.stylefeng.guns.core.common.constant.Const;
-import com.stylefeng.guns.core.common.constant.dictmap.DictMap;
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import com.stylefeng.guns.core.log.LogObjectHolder;
-import com.stylefeng.guns.modular.system.model.Dict;
-import com.stylefeng.guns.modular.system.service.IDictService;
-import com.stylefeng.guns.modular.system.warpper.DictWarpper;
+import cn.stylefeng.guns.core.common.constant.Const;
+import cn.stylefeng.guns.core.common.constant.dictmap.DictMap;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.modular.system.model.Dict;
+import cn.stylefeng.guns.modular.system.service.IDictService;
+import cn.stylefeng.guns.modular.system.warpper.DictWarpper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.Model;

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

@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.controller;
+package cn.stylefeng.guns.modular.system.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;
 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.page.PageInfoBT;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import com.baomidou.mybatisplus.mapper.SqlRunner;
 import com.baomidou.mybatisplus.mapper.SqlRunner;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.core.common.annotion.BussinessLog;
-import com.stylefeng.guns.core.common.annotion.Permission;
-import com.stylefeng.guns.core.common.constant.Const;
-import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.common.constant.state.BizLogType;
-import com.stylefeng.guns.core.page.PageInfoBT;
-import com.stylefeng.guns.modular.system.model.OperationLog;
-import com.stylefeng.guns.modular.system.service.IOperationLogService;
-import com.stylefeng.guns.modular.system.warpper.LogWarpper;
+import cn.stylefeng.guns.core.common.constant.Const;
+import cn.stylefeng.guns.core.common.constant.factory.PageFactory;
+import cn.stylefeng.guns.core.common.constant.state.BizLogType;
+import cn.stylefeng.guns.modular.system.model.OperationLog;
+import cn.stylefeng.guns.modular.system.service.IOperationLogService;
+import cn.stylefeng.guns.modular.system.warpper.LogWarpper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/DeptMapper.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.core.node.ZTreeNode;
+import cn.stylefeng.guns.modular.system.model.Dept;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.model.Dept;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/DictMapper.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.modular.system.model.Dict;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.Dict;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/ExpenseMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/ExpenseMapper.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.modular.system.model.Expense;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.Expense;
 
 
 /**
 /**
  * <p>
  * <p>

src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/LoginLogMapper.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.modular.system.model.LoginLog;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.modular.system.model.LoginLog;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/MenuMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/MenuMapper.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.core.node.MenuNode;
+import cn.stylefeng.guns.core.node.ZTreeNode;
+import cn.stylefeng.guns.modular.system.model.Menu;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.core.node.MenuNode;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.model.Menu;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/NoticeMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/NoticeMapper.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.modular.system.model.Notice;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.Notice;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/OperationLogMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/OperationLogMapper.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.modular.system.model.OperationLog;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.modular.system.model.OperationLog;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/RelationMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/RelationMapper.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.modular.system.model.Relation;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.Relation;
 
 
 /**
 /**
  * <p>
  * <p>

src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/RoleMapper.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.core.node.ZTreeNode;
+import cn.stylefeng.guns.modular.system.model.Role;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.model.Role;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java → src/main/java/cn/stylefeng/guns/modular/system/dao/UserMapper.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.dao;
+package cn.stylefeng.guns.modular.system.dao;
 
 
+import cn.stylefeng.guns.modular.system.model.User;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.User;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.DeptMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.DeptMapper">
 
 
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dept">
+    <resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.Dept">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
         <result column="num" property="num"/>
         <result column="num" property="num"/>
         <result column="pid" property="pid"/>
         <result column="pid" property="pid"/>
@@ -14,7 +14,7 @@
         <result column="version" property="version"/>
         <result column="version" property="version"/>
     </resultMap>
     </resultMap>
 
 
-    <select id="tree" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+    <select id="tree" resultType="cn.stylefeng.guns.core.node.ZTreeNode">
 		select id,pid as pId,simplename as name,
 		select id,pid as pId,simplename as name,
 		(
 		(
 		CASE
 		CASE

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.DictMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.DictMapper">
 
 
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dict">
+    <resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.Dict">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
         <result column="num" property="num"/>
         <result column="num" property="num"/>
         <result column="pid" property="pid"/>
         <result column="pid" property="pid"/>

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ExpenseMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/ExpenseMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.ExpenseMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.ExpenseMapper">
 
 
 	<!-- 通用查询映射结果 -->
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Expense">
+	<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.Expense">
 		<id column="id" property="id" />
 		<id column="id" property="id" />
 		<result column="money" property="money" />
 		<result column="money" property="money" />
 		<result column="desc" property="desc" />
 		<result column="desc" property="desc" />

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.LoginLogMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.LoginLogMapper">
 
 
 	<!-- 通用查询映射结果 -->
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.LoginLog">
+	<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.LoginLog">
 		<id column="id" property="id" />
 		<id column="id" property="id" />
 		<result column="logname" property="logname" />
 		<result column="logname" property="logname" />
 		<result column="userid" property="userid" />
 		<result column="userid" property="userid" />

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.MenuMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.MenuMapper">
 
 
 	<!-- 通用查询映射结果 -->
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Menu">
+	<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.Menu">
 		<id column="id" property="id" />
 		<id column="id" property="id" />
 		<result column="code" property="code" />
 		<result column="code" property="code" />
 		<result column="pcode" property="pcode" />
 		<result column="pcode" property="pcode" />
@@ -42,7 +42,7 @@
         sys_relation where roleid = #{roleId}
         sys_relation where roleid = #{roleId}
     </select>
     </select>
 
 
-    <select id="menuTreeList" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+    <select id="menuTreeList" resultType="cn.stylefeng.guns.core.node.ZTreeNode">
         SELECT
         SELECT
         m1.id AS id,
         m1.id AS id,
         (
         (
@@ -70,7 +70,7 @@
         m1.id ASC
         m1.id ASC
     </select>
     </select>
 
 
-    <select id="menuTreeListByMenuIds" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+    <select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.core.node.ZTreeNode">
         SELECT
         SELECT
         m1.id AS id,
         m1.id AS id,
         (
         (
@@ -132,7 +132,7 @@
         where rel.roleid = #{roleId}
         where rel.roleid = #{roleId}
     </select>
     </select>
 
 
-    <select id="getMenusByRoleIds" resultType="com.stylefeng.guns.core.node.MenuNode">
+    <select id="getMenusByRoleIds" resultType="cn.stylefeng.guns.core.node.MenuNode">
         SELECT
         SELECT
         m1.id AS id,
         m1.id AS id,
         m1.icon AS icon,
         m1.icon AS icon,

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.NoticeMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.NoticeMapper">
 
 
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Notice">
+    <resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.Notice">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
         <result column="title" property="title"/>
         <result column="title" property="title"/>
         <result column="type" property="type"/>
         <result column="type" property="type"/>

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.OperationLogMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.OperationLogMapper">
 
 
 	<!-- 通用查询映射结果 -->
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.OperationLog">
+	<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.OperationLog">
 		<id column="id" property="id" />
 		<id column="id" property="id" />
 		<result column="logtype" property="logtype" />
 		<result column="logtype" property="logtype" />
 		<result column="logname" property="logname" />
 		<result column="logname" property="logname" />

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.RelationMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.RelationMapper">
 
 
 	<!-- 通用查询映射结果 -->
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Relation">
+	<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.Relation">
 		<id column="id" property="id" />
 		<id column="id" property="id" />
 		<result column="menuid" property="menuid" />
 		<result column="menuid" property="menuid" />
 		<result column="roleid" property="roleid" />
 		<result column="roleid" property="roleid" />

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.RoleMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.RoleMapper">
 
 
 	<!-- 通用查询映射结果 -->
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Role">
+	<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.Role">
 		<id column="id" property="id" />
 		<id column="id" property="id" />
 		<result column="num" property="num" />
 		<result column="num" property="num" />
 		<result column="pid" property="pid" />
 		<result column="pid" property="pid" />
@@ -30,13 +30,13 @@
 		delete from sys_relation where roleid = #{roleId}
 		delete from sys_relation where roleid = #{roleId}
 	</delete>
 	</delete>
 
 
-	<select id="roleTreeList" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+	<select id="roleTreeList" resultType="cn.stylefeng.guns.core.node.ZTreeNode">
 		select id "id",pId
 		select id "id",pId
 		"pId",name as "name",(case when (pId=0 or pId is null) then 'true'
 		"pId",name as "name",(case when (pId=0 or pId is null) then 'true'
 		else 'false' end) "open" from sys_role
 		else 'false' end) "open" from sys_role
 	</select>
 	</select>
 
 
-	<select id="roleTreeListByRoleId" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+	<select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.node.ZTreeNode">
 		SELECT
 		SELECT
 		r.id "id",
 		r.id "id",
 		pId "pId",
 		pId "pId",

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml → src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.UserMapper">
+<mapper namespace="cn.stylefeng.guns.modular.system.dao.UserMapper">
 
 
 	<!-- 通用查询映射结果 -->
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.User">
+	<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.model.User">
 		<id column="id" property="id" />
 		<id column="id" property="id" />
 		<result column="avatar" property="avatar" />
 		<result column="avatar" property="avatar" />
 		<result column="account" property="account" />
 		<result column="account" property="account" />

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

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.factory;
+package cn.stylefeng.guns.modular.system.factory;
 
 
+import cn.stylefeng.guns.modular.system.transfer.UserDto;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.model.User;
-import com.stylefeng.guns.modular.system.transfer.UserDto;
+import cn.stylefeng.guns.modular.system.model.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 
 
 /**
 /**

src/main/java/com/stylefeng/guns/modular/system/model/Dept.java → src/main/java/cn/stylefeng/guns/modular/system/model/Dept.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/model/Dict.java → src/main/java/cn/stylefeng/guns/modular/system/model/Dict.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/model/Expense.java → src/main/java/cn/stylefeng/guns/modular/system/model/Expense.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/model/LoginLog.java → src/main/java/cn/stylefeng/guns/modular/system/model/LoginLog.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/model/Menu.java → src/main/java/cn/stylefeng/guns/modular/system/model/Menu.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/model/Notice.java → src/main/java/cn/stylefeng/guns/modular/system/model/Notice.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/model/OperationLog.java → src/main/java/cn/stylefeng/guns/modular/system/model/OperationLog.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/model/Role.java → src/main/java/cn/stylefeng/guns/modular/system/model/Role.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/model/User.java → src/main/java/cn/stylefeng/guns/modular/system/model/User.java

-package com.stylefeng.guns.modular.system.model;
+package cn.stylefeng.guns.modular.system.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;

src/main/java/com/stylefeng/guns/modular/system/service/IDeptService.java → src/main/java/cn/stylefeng/guns/modular/system/service/IDeptService.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
+import cn.stylefeng.guns.core.node.ZTreeNode;
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.model.Dept;
+import cn.stylefeng.guns.modular.system.model.Dept;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/service/IDictService.java → src/main/java/cn/stylefeng/guns/modular/system/service/IDictService.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.Dict;
+import cn.stylefeng.guns.modular.system.model.Dict;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java → src/main/java/cn/stylefeng/guns/modular/system/service/ILoginLogService.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.LoginLog;
+import cn.stylefeng.guns.modular.system.model.LoginLog;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

src/main/java/com/stylefeng/guns/modular/system/service/IMenuService.java → src/main/java/cn/stylefeng/guns/modular/system/service/IMenuService.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
+import cn.stylefeng.guns.core.node.MenuNode;
+import cn.stylefeng.guns.core.node.ZTreeNode;
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.core.node.MenuNode;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.model.Menu;
+import cn.stylefeng.guns.modular.system.model.Menu;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/service/INoticeService.java → src/main/java/cn/stylefeng/guns/modular/system/service/INoticeService.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.Notice;
+import cn.stylefeng.guns.modular.system.model.Notice;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

src/main/java/com/stylefeng/guns/modular/system/service/IOperationLogService.java → src/main/java/cn/stylefeng/guns/modular/system/service/IOperationLogService.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.OperationLog;
+import cn.stylefeng.guns.modular.system.model.OperationLog;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

src/main/java/com/stylefeng/guns/modular/system/service/IRelationService.java → src/main/java/cn/stylefeng/guns/modular/system/service/IRelationService.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.Relation;
+import cn.stylefeng.guns.modular.system.model.Relation;
 
 
 /**
 /**
  * <p>
  * <p>

src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java → src/main/java/cn/stylefeng/guns/modular/system/service/IRoleService.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
+import cn.stylefeng.guns.core.node.ZTreeNode;
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.model.Role;
+import cn.stylefeng.guns.modular.system.model.Role;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java → src/main/java/cn/stylefeng/guns/modular/system/service/IUserService.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service;
+package cn.stylefeng.guns.modular.system.service;
 
 
 import cn.stylefeng.roses.core.datascope.DataScope;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.User;
+import cn.stylefeng.guns.modular.system.model.User;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
+import cn.stylefeng.guns.core.node.ZTreeNode;
+import cn.stylefeng.guns.modular.system.service.IDeptService;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.dao.DeptMapper;
-import com.stylefeng.guns.modular.system.model.Dept;
-import com.stylefeng.guns.modular.system.service.IDeptService;
+import cn.stylefeng.guns.modular.system.dao.DeptMapper;
+import cn.stylefeng.guns.modular.system.model.Dept;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 

src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
+import cn.stylefeng.guns.modular.system.service.IDictService;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
-import com.stylefeng.guns.modular.system.dao.DictMapper;
-import com.stylefeng.guns.modular.system.model.Dict;
-import com.stylefeng.guns.modular.system.service.IDictService;
+import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import cn.stylefeng.guns.modular.system.dao.DictMapper;
+import cn.stylefeng.guns.modular.system.model.Dict;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -30,7 +30,7 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
-import static com.stylefeng.guns.core.common.constant.factory.MutiStrFactory.*;
+import static cn.stylefeng.guns.core.common.constant.factory.MutiStrFactory.*;
 
 
 @Service
 @Service
 @Transactional
 @Transactional

src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
+import cn.stylefeng.guns.modular.system.service.ILoginLogService;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.LoginLogMapper;
-import com.stylefeng.guns.modular.system.model.LoginLog;
-import com.stylefeng.guns.modular.system.service.ILoginLogService;
+import cn.stylefeng.guns.modular.system.dao.LoginLogMapper;
+import cn.stylefeng.guns.modular.system.model.LoginLog;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
+import cn.stylefeng.guns.core.node.MenuNode;
+import cn.stylefeng.guns.core.node.ZTreeNode;
+import cn.stylefeng.guns.modular.system.service.IMenuService;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.core.node.MenuNode;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.dao.MenuMapper;
-import com.stylefeng.guns.modular.system.model.Menu;
-import com.stylefeng.guns.modular.system.service.IMenuService;
+import cn.stylefeng.guns.modular.system.dao.MenuMapper;
+import cn.stylefeng.guns.modular.system.model.Menu;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;

src/main/java/com/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
+import cn.stylefeng.guns.modular.system.service.INoticeService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.NoticeMapper;
-import com.stylefeng.guns.modular.system.model.Notice;
-import com.stylefeng.guns.modular.system.service.INoticeService;
+import cn.stylefeng.guns.modular.system.dao.NoticeMapper;
+import cn.stylefeng.guns.modular.system.model.Notice;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
+import cn.stylefeng.guns.modular.system.service.IOperationLogService;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.OperationLogMapper;
-import com.stylefeng.guns.modular.system.model.OperationLog;
-import com.stylefeng.guns.modular.system.service.IOperationLogService;
+import cn.stylefeng.guns.modular.system.dao.OperationLogMapper;
+import cn.stylefeng.guns.modular.system.model.OperationLog;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
+import cn.stylefeng.guns.modular.system.service.IRelationService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.RelationMapper;
-import com.stylefeng.guns.modular.system.model.Relation;
-import com.stylefeng.guns.modular.system.service.IRelationService;
+import cn.stylefeng.guns.modular.system.dao.RelationMapper;
+import cn.stylefeng.guns.modular.system.model.Relation;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 /**
 /**

src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
+import cn.stylefeng.guns.core.node.ZTreeNode;
+import cn.stylefeng.guns.modular.system.service.IRoleService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.core.node.ZTreeNode;
-import com.stylefeng.guns.modular.system.dao.RelationMapper;
-import com.stylefeng.guns.modular.system.dao.RoleMapper;
-import com.stylefeng.guns.modular.system.model.Relation;
-import com.stylefeng.guns.modular.system.model.Role;
-import com.stylefeng.guns.modular.system.service.IRoleService;
+import cn.stylefeng.guns.modular.system.dao.RelationMapper;
+import cn.stylefeng.guns.modular.system.dao.RoleMapper;
+import cn.stylefeng.guns.modular.system.model.Relation;
+import cn.stylefeng.guns.modular.system.model.Role;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 

src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java → src/main/java/cn/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.service.impl;
+package cn.stylefeng.guns.modular.system.service.impl;
 
 
+import cn.stylefeng.guns.modular.system.service.IUserService;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.UserMapper;
-import com.stylefeng.guns.modular.system.model.User;
-import com.stylefeng.guns.modular.system.service.IUserService;
+import cn.stylefeng.guns.modular.system.dao.UserMapper;
+import cn.stylefeng.guns.modular.system.model.User;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java → src/main/java/cn/stylefeng/guns/modular/system/transfer/UserDto.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.transfer;
+package cn.stylefeng.guns.modular.system.transfer;
 
 
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 

src/main/java/com/stylefeng/guns/modular/system/warpper/DeptWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWarpper.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.warpper;
+package cn.stylefeng.guns.modular.system.warpper;
 
 
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/DictWarpper.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.warpper;
+package cn.stylefeng.guns.modular.system.warpper;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.modular.system.model.Dict;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.modular.system.model.Dict;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

src/main/java/com/stylefeng/guns/modular/system/warpper/LogWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWarpper.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.warpper;
+package cn.stylefeng.guns.modular.system.warpper;
 
 
+import cn.stylefeng.guns.core.util.Contrast;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.core.util.Contrast;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWarpper.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.warpper;
+package cn.stylefeng.guns.modular.system.warpper;
 
 
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.stylefeng.guns.modular.system.warpper;
+package cn.stylefeng.guns.modular.system.warpper;
 
 
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;