Skip to content

G
guns-vip
Commit 423f0011 by fengshuonan
Options

更新包结构

parent 57c9435e
Showing with 540 additions and 538 deletions
guns-vip-base/src/main/java/cn/stylefeng/guns/config/EhCacheConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/EhCacheConfig.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.config;
package cn.stylefeng.guns.base.config;
import net.sf.ehcache.CacheManager;
import org.springframework.cache.annotation.EnableCaching;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/GunsConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/GunsConfig.java
package cn.stylefeng.guns.config;
package cn.stylefeng.guns.base.config;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.core.log.aop.LogAop;
import cn.stylefeng.guns.core.shiro.aop.PermissionAop;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.core.log.aop.LogAop;
import cn.stylefeng.guns.base.core.shiro.aop.PermissionAop;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/SwaggerConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/SwaggerConfig.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.config;
package cn.stylefeng.guns.base.config;
import io.swagger.annotations.ApiOperation;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/datasource/MpPluginsConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/datasource/MpPluginsConfig.java
package cn.stylefeng.guns.config.datasource;
package cn.stylefeng.guns.base.config.datasource;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.roses.core.metadata.CustomMetaObjectHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/datasource/SingleDataSourceConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/datasource/SingleDataSourceConfig.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.config.datasource;
package cn.stylefeng.guns.base.config.datasource;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
......@@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* 多数据源配置，多数据源配置因为和单数据源冲突，所以现在默认版本删除了多数据源配置
*
* <p>
* 可参考 https://gitee.com/stylefeng/guns/tree/multi-datasource/
*
* @author stylefeng
......@@ -31,7 +31,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration
@ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "false", matchIfMissing = true)
@EnableTransactionManagement(proxyTargetClass = true)
@MapperScan(basePackages = {"cn.stylefeng.guns.modular.*.mapper"})
@MapperScan(basePackages = {"cn.stylefeng.guns.base.modular.*.mapper", "cn.stylefeng.guns.modular.*.mapper"})
public class SingleDataSourceConfig {
}
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/properties/BeetlProperties.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/properties/BeetlProperties.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.config.properties;
package cn.stylefeng.guns.base.config.properties;
import cn.stylefeng.roses.core.util.ToolUtil;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/properties/GunsProperties.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/properties/GunsProperties.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.config.properties;
package cn.stylefeng.guns.base.config.properties;
import cn.stylefeng.roses.core.util.ToolUtil;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/properties/GunsPropertiesConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/properties/GunsPropertiesConfig.java
package cn.stylefeng.guns.config.properties;
package cn.stylefeng.guns.base.config.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/web/BeetlConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/web/BeetlConfig.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.config.web;
package cn.stylefeng.guns.base.config.web;
import cn.stylefeng.guns.config.properties.BeetlProperties;
import cn.stylefeng.guns.core.beetl.BeetlConfiguration;
import cn.stylefeng.guns.base.config.properties.BeetlProperties;
import cn.stylefeng.guns.base.core.beetl.BeetlConfiguration;
import org.beetl.core.resource.ClasspathResourceLoader;
import org.beetl.ext.spring.BeetlSpringViewResolver;
import org.springframework.beans.factory.annotation.Autowired;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/web/ShiroConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/web/ShiroConfig.java
......@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.config.web;
package cn.stylefeng.guns.base.config.web;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.core.shiro.GunsUserFilter;
import cn.stylefeng.guns.core.shiro.ShiroDbRealm;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.guns.base.core.shiro.GunsUserFilter;
import cn.stylefeng.guns.base.core.shiro.ShiroDbRealm;
import org.apache.shiro.cache.CacheManager;
import org.apache.shiro.cache.ehcache.EhCacheManager;
import org.apache.shiro.codec.Base64;
......@@ -43,7 +43,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import static cn.stylefeng.guns.core.constant.Const.NONE_PERMISSION_RES;
import static cn.stylefeng.guns.base.core.constant.Const.NONE_PERMISSION_RES;
/**
* shiro权限管理的配置
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/web/String2DateConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/web/String2DateConfig.java
package cn.stylefeng.guns.config.web;
package cn.stylefeng.guns.base.config.web;
import cn.hutool.core.date.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/config/web/WebConfig.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/web/WebConfig.java
......@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.config.web;
package cn.stylefeng.guns.base.config.web;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.core.attribute.AttributeSetInteceptor;
import cn.stylefeng.guns.core.exception.page.GunsErrorView;
import cn.stylefeng.guns.core.listener.ConfigListener;
import cn.stylefeng.guns.modular.api.aop.RestApiInteceptor;
import cn.stylefeng.guns.base.core.attribute.AttributeSetInteceptor;
import cn.stylefeng.guns.base.core.exception.page.GunsErrorView;
import cn.stylefeng.guns.base.core.listener.ConfigListener;
import cn.stylefeng.guns.base.modular.api.aop.RestApiInteceptor;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.roses.core.xss.XssFilter;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.http.StatViewServlet;
......@@ -44,7 +44,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.util.Properties;
import static cn.stylefeng.guns.core.constant.Const.NONE_PERMISSION_RES;
import static cn.stylefeng.guns.base.core.constant.Const.NONE_PERMISSION_RES;
/**
* web 配置类
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/attribute/AttributeSetInteceptor.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/attribute/AttributeSetInteceptor.java
......@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.attribute;
package cn.stylefeng.guns.base.core.attribute;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.core.util.DefaultImages;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.core.util.DefaultImages;
import org.apache.shiro.authc.AuthenticationException;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/beetl/BeetlConfiguration.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/beetl/BeetlConfiguration.java
......@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.beetl;
package cn.stylefeng.guns.base.core.beetl;
import cn.stylefeng.guns.core.util.KaptchaUtil;
import cn.stylefeng.guns.base.core.util.KaptchaUtil;
import cn.stylefeng.roses.core.util.ToolUtil;
import org.beetl.ext.spring.BeetlGroupUtilConfiguration;
import java.util.HashMap;
import java.util.Map;
import static cn.stylefeng.guns.core.constant.Const.DEFAULT_SYSTEM_NAME;
import static cn.stylefeng.guns.core.constant.Const.DEFAULT_WELCOME_TIP;
import static cn.stylefeng.guns.base.core.constant.Const.DEFAULT_SYSTEM_NAME;
import static cn.stylefeng.guns.base.core.constant.Const.DEFAULT_WELCOME_TIP;
/**
* beetl拓展配置,绑定一些工具类,方便在模板中直接调用
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/beetl/ShiroExt.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/beetl/ShiroExt.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.beetl;
package cn.stylefeng.guns.base.core.beetl;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/Const.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/Const.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant;
package cn.stylefeng.guns.base.core.constant;
import cn.hutool.core.collection.CollectionUtil;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/DatasourceEnum.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/DatasourceEnum.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant;
package cn.stylefeng.guns.base.core.constant;
/**
* 多数据源的枚举
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/DefaultAvatar.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/DefaultAvatar.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant;
package cn.stylefeng.guns.base.core.constant;
/**
* 默认的头像base64编码
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/JwtConstants.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/JwtConstants.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant;
package cn.stylefeng.guns.base.core.constant;
/**
* jwt相关配置
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/cache/Cache.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/cache/Cache.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.cache;
package cn.stylefeng.guns.base.core.constant.cache;
/**
* 所有缓存名称的集合
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/cache/CacheKey.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/cache/CacheKey.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.cache;
package cn.stylefeng.guns.base.core.constant.cache;
/**
* 缓存标识前缀集合,常用在ConstantFactory类中
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/DeleteDict.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/DeleteDict.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap;
package cn.stylefeng.guns.base.core.constant.dictmap;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
/**
* 用于删除业务的字典
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/DeptDict.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/DeptDict.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap;
package cn.stylefeng.guns.base.core.constant.dictmap;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
/**
* 部门的映射
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/DictMap.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/DictMap.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap;
package cn.stylefeng.guns.base.core.constant.dictmap;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
/**
* 字典map
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/MenuDict.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/MenuDict.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap;
package cn.stylefeng.guns.base.core.constant.dictmap;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
/**
* 菜单的字典
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/NoticeMap.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/NoticeMap.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap;
package cn.stylefeng.guns.base.core.constant.dictmap;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
/**
* 通知的映射
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/RoleDict.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/RoleDict.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap;
package cn.stylefeng.guns.base.core.constant.dictmap;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
/**
* 角色的字典
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/UserDict.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/UserDict.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap;
package cn.stylefeng.guns.base.core.constant.dictmap;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
/**
* 用户的字典
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/base/AbstractDictMap.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/base/AbstractDictMap.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap.base;
package cn.stylefeng.guns.base.core.constant.dictmap.base;
import java.util.HashMap;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/base/SystemDict.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/base/SystemDict.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap.base;
package cn.stylefeng.guns.base.core.constant.dictmap.base;
/**
* 系统相关的字典
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/dictmap/factory/DictFieldWarpperFactory.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/dictmap/factory/DictFieldWarpperFactory.java
......@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.dictmap.factory;
package cn.stylefeng.guns.base.core.constant.dictmap.factory;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.constant.factory.IConstantFactory;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.constant.factory.IConstantFactory;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import java.lang.reflect.Method;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/factory/ConstantFactory.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/factory/ConstantFactory.java
......@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.factory;
package cn.stylefeng.guns.base.core.constant.factory;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.core.constant.cache.Cache;
import cn.stylefeng.guns.core.constant.cache.CacheKey;
import cn.stylefeng.guns.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.core.constant.state.MenuStatus;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.modular.system.entity.*;
import cn.stylefeng.guns.modular.system.mapper.*;
import cn.stylefeng.guns.base.core.constant.cache.Cache;
import cn.stylefeng.guns.base.core.constant.cache.CacheKey;
import cn.stylefeng.guns.base.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.base.core.constant.state.MenuStatus;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.modular.system.entity.*;
import cn.stylefeng.guns.base.modular.system.mapper.*;
import cn.stylefeng.roses.core.util.SpringContextHolder;
import cn.stylefeng.roses.core.util.ToolUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/factory/IConstantFactory.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/factory/IConstantFactory.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.factory;
package cn.stylefeng.guns.base.core.constant.factory;
import cn.stylefeng.guns.modular.system.entity.Dict;
import cn.stylefeng.guns.modular.system.entity.Menu;
import cn.stylefeng.guns.base.modular.system.entity.Dict;
import cn.stylefeng.guns.base.modular.system.entity.Menu;
import java.util.List;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/BizLogType.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/BizLogType.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
/**
* 业务日志类型
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/CommonStatus.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/CommonStatus.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
import lombok.Getter;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/ExpenseState.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/ExpenseState.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
/**
* 是否是菜单的枚举
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/LogSucceed.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/LogSucceed.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
/**
* 业务是否成功的日志记录
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/LogType.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/LogType.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
/**
* 日志类型
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/ManagerStatus.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/ManagerStatus.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
import lombok.Getter;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/MenuOpenStatus.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/MenuOpenStatus.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
/**
* 菜单是否打开的状态
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/MenuStatus.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/MenuStatus.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
import lombok.Getter;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/constant/state/Order.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/state/Order.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.constant.state;
package cn.stylefeng.guns.base.core.constant.state;
/**
* 数据库排序
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/exception/InvalidKaptchaException.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/InvalidKaptchaException.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.exception;
package cn.stylefeng.guns.base.core.exception;
/**
* 验证码错误异常
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/exception/aop/GlobalExceptionHandler.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/aop/GlobalExceptionHandler.java
......@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.exception.aop;
package cn.stylefeng.guns.base.core.exception.aop;
import cn.stylefeng.guns.core.exception.InvalidKaptchaException;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.log.LogManager;
import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.exception.InvalidKaptchaException;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.log.LogManager;
import cn.stylefeng.guns.base.core.log.factory.LogTaskFactory;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import org.apache.shiro.authc.AuthenticationException;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/exception/enums/BizExceptionEnum.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/enums/BizExceptionEnum.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.exception.enums;
package cn.stylefeng.guns.base.core.exception.enums;
import cn.stylefeng.roses.kernel.model.exception.AbstractBaseExceptionEnum;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/exception/page/GlobalController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/page/GlobalController.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.exception.page;
package cn.stylefeng.guns.base.core.exception.page;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/exception/page/GunsErrorView.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/exception/page/GunsErrorView.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.exception.page;
package cn.stylefeng.guns.base.core.exception.page;
import org.springframework.web.servlet.View;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/listener/ConfigListener.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/listener/ConfigListener.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.listener;
package cn.stylefeng.guns.base.core.listener;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/log/LogManager.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/LogManager.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.log;
package cn.stylefeng.guns.base.core.log;
import java.util.TimerTask;
import java.util.concurrent.ScheduledThreadPoolExecutor;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/log/LogObjectHolder.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/LogObjectHolder.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.log;
package cn.stylefeng.guns.base.core.log;
import cn.stylefeng.roses.core.util.SpringContextHolder;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/log/annotion/BussinessLog.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/annotion/BussinessLog.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.log.annotion;
package cn.stylefeng.guns.base.core.log.annotion;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.core.constant.dictmap.base.SystemDict;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.base.SystemDict;
import java.lang.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/log/aop/LogAop.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/aop/LogAop.java
......@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.log.aop;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.core.log.LogManager;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.core.util.Contrast;
package cn.stylefeng.guns.base.core.log.aop;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.log.LogManager;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.base.core.log.factory.LogTaskFactory;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.core.util.Contrast;
import cn.stylefeng.roses.core.util.HttpContext;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
......@@ -47,7 +47,7 @@ public class LogAop {
private Logger log = LoggerFactory.getLogger(this.getClass());
@Pointcut(value = "@annotation(cn.stylefeng.guns.core.log.annotion.BussinessLog)")
@Pointcut(value = "@annotation(cn.stylefeng.guns.base.core.log.annotion.BussinessLog)")
public void cutService() {
}
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/log/factory/LogFactory.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/factory/LogFactory.java
......@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.log.factory;
package cn.stylefeng.guns.base.core.log.factory;
import cn.stylefeng.guns.core.constant.state.LogSucceed;
import cn.stylefeng.guns.core.constant.state.LogType;
import cn.stylefeng.guns.modular.system.entity.LoginLog;
import cn.stylefeng.guns.modular.system.entity.OperationLog;
import cn.stylefeng.guns.base.modular.system.entity.LoginLog;
import cn.stylefeng.guns.base.modular.system.entity.OperationLog;
import cn.stylefeng.guns.base.core.constant.state.LogSucceed;
import cn.stylefeng.guns.base.core.constant.state.LogType;
import java.util.Date;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/log/factory/LogTaskFactory.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/factory/LogTaskFactory.java
......@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.log.factory;
package cn.stylefeng.guns.base.core.log.factory;
import cn.stylefeng.guns.core.constant.state.LogSucceed;
import cn.stylefeng.guns.core.constant.state.LogType;
import cn.stylefeng.guns.core.log.LogManager;
import cn.stylefeng.guns.modular.system.entity.LoginLog;
import cn.stylefeng.guns.modular.system.entity.OperationLog;
import cn.stylefeng.guns.modular.system.mapper.LoginLogMapper;
import cn.stylefeng.guns.modular.system.mapper.OperationLogMapper;
import cn.stylefeng.guns.base.core.log.LogManager;
import cn.stylefeng.guns.base.modular.system.entity.LoginLog;
import cn.stylefeng.guns.base.modular.system.entity.OperationLog;
import cn.stylefeng.guns.base.core.constant.state.LogSucceed;
import cn.stylefeng.guns.base.core.constant.state.LogType;
import cn.stylefeng.guns.base.modular.system.mapper.LoginLogMapper;
import cn.stylefeng.guns.base.modular.system.mapper.OperationLogMapper;
import cn.stylefeng.roses.core.util.SpringContextHolder;
import cn.stylefeng.roses.core.util.ToolUtil;
import org.slf4j.Logger;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/pojo/node/MenuNode.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/node/MenuNode.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.pojo.node;
package cn.stylefeng.guns.base.core.pojo.node;
import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/pojo/node/TreeviewNode.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/node/TreeviewNode.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.pojo.node;
package cn.stylefeng.guns.base.core.pojo.node;
import cn.stylefeng.roses.kernel.model.tree.Tree;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/pojo/node/ZTreeNode.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/node/ZTreeNode.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.pojo.node;
package cn.stylefeng.guns.base.core.pojo.node;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/pojo/page/LayuiPageFactory.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/page/LayuiPageFactory.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.pojo.page;
package cn.stylefeng.guns.base.core.pojo.page;
import cn.stylefeng.roses.core.util.HttpContext;
import com.baomidou.mybatisplus.core.metadata.IPage;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/pojo/page/LayuiPageInfo.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/pojo/page/LayuiPageInfo.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.pojo.page;
package cn.stylefeng.guns.base.core.pojo.page;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/GunsUserFilter.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/GunsUserFilter.java
......@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package cn.stylefeng.guns.core.shiro;
package cn.stylefeng.guns.base.core.shiro;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.web.filter.AccessControlFilter;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/ShiroDbRealm.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/ShiroDbRealm.java
......@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro;
package cn.stylefeng.guns.base.core.shiro;
import cn.stylefeng.guns.core.shiro.service.UserAuthService;
import cn.stylefeng.guns.core.shiro.service.impl.UserAuthServiceServiceImpl;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.core.shiro.service.UserAuthService;
import cn.stylefeng.guns.base.core.shiro.service.impl.UserAuthServiceServiceImpl;
import cn.stylefeng.roses.core.util.ToolUtil;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/ShiroKit.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/ShiroKit.java
......@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro;
package cn.stylefeng.guns.base.core.shiro;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import org.apache.shiro.SecurityUtils;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/ShiroUser.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/ShiroUser.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro;
package cn.stylefeng.guns.base.core.shiro;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/annotion/Permission.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/annotion/Permission.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro.annotion;
package cn.stylefeng.guns.base.core.shiro.annotion;
import java.lang.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/aop/PermissionAop.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/aop/PermissionAop.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro.aop;
package cn.stylefeng.guns.base.core.shiro.aop;
import cn.stylefeng.guns.core.shiro.annotion.Permission;
import cn.stylefeng.guns.core.shiro.service.PermissionCheckService;
import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
import cn.stylefeng.guns.base.core.shiro.service.PermissionCheckService;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
......@@ -39,7 +39,7 @@ public class PermissionAop {
@Autowired
private PermissionCheckService check;
@Pointcut(value = "@annotation(cn.stylefeng.guns.core.shiro.annotion.Permission)")
@Pointcut(value = "@annotation(cn.stylefeng.guns.base.core.shiro.annotion.Permission)")
private void cutPermission() {
}
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/service/PermissionCheckService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/service/PermissionCheckService.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro.service;
package cn.stylefeng.guns.base.core.shiro.service;
/**
* 检查用接口
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/service/UserAuthService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/service/UserAuthService.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro.service;
package cn.stylefeng.guns.base.core.shiro.service;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.modular.system.entity.User;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import java.util.List;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/service/impl/PermissionCheckServiceServiceImpl.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/service/impl/PermissionCheckServiceServiceImpl.java
......@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro.service.impl;
package cn.stylefeng.guns.base.core.shiro.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.stylefeng.guns.core.listener.ConfigListener;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.core.shiro.service.PermissionCheckService;
import cn.stylefeng.guns.base.core.listener.ConfigListener;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.core.shiro.service.PermissionCheckService;
import cn.stylefeng.roses.core.util.HttpContext;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/shiro/service/impl/UserAuthServiceServiceImpl.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/service/impl/UserAuthServiceServiceImpl.java
......@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.shiro.service.impl;
package cn.stylefeng.guns.base.core.shiro.service.impl;
import cn.hutool.core.convert.Convert;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.core.shiro.service.UserAuthService;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.mapper.MenuMapper;
import cn.stylefeng.guns.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.core.shiro.service.UserAuthService;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.mapper.MenuMapper;
import cn.stylefeng.guns.base.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.base.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.roses.core.util.SpringContextHolder;
import org.apache.shiro.authc.CredentialsException;
import org.apache.shiro.authc.LockedAccountException;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/util/ApiMenuFilter.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/ApiMenuFilter.java
......@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.util;
package cn.stylefeng.guns.base.core.util;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.pojo.node.MenuNode;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.guns.base.core.pojo.node.MenuNode;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.roses.core.util.SpringContextHolder;
import java.util.ArrayList;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/util/CacheUtil.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/CacheUtil.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.util;
package cn.stylefeng.guns.base.core.util;
import cn.stylefeng.roses.core.util.SpringContextHolder;
import lombok.extern.slf4j.Slf4j;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/util/Contrast.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/Contrast.java
......@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.util;
package cn.stylefeng.guns.base.core.util;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.core.constant.dictmap.factory.DictFieldWarpperFactory;
import cn.stylefeng.guns.base.core.constant.dictmap.base.AbstractDictMap;
import cn.stylefeng.guns.base.core.constant.dictmap.factory.DictFieldWarpperFactory;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/util/DecimalUtil.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/DecimalUtil.java
package cn.stylefeng.guns.core.util;
package cn.stylefeng.guns.base.core.util;
import java.math.BigDecimal;
import java.math.BigInteger;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/util/DefaultImages.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/DefaultImages.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.util;
package cn.stylefeng.guns.base.core.util;
import cn.stylefeng.guns.core.listener.ConfigListener;
import cn.stylefeng.guns.base.core.listener.ConfigListener;
/**
* 获取默认图片地址
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/util/JwtTokenUtil.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/JwtTokenUtil.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.util;
package cn.stylefeng.guns.base.core.util;
import cn.stylefeng.guns.core.constant.JwtConstants;
import cn.stylefeng.guns.base.core.constant.JwtConstants;
import cn.stylefeng.roses.core.util.ToolUtil;
import io.jsonwebtoken.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/core/util/KaptchaUtil.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/util/KaptchaUtil.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.util;
package cn.stylefeng.guns.base.core.util;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.roses.core.util.SpringContextHolder;
/**
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/api/aop/RestApiInteceptor.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/api/aop/RestApiInteceptor.java
......@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.api.aop;
package cn.stylefeng.guns.base.modular.api.aop;
import cn.stylefeng.guns.core.constant.JwtConstants;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.util.JwtTokenUtil;
import cn.stylefeng.guns.base.core.constant.JwtConstants;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.util.JwtTokenUtil;
import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
import cn.stylefeng.roses.core.util.RenderUtil;
import io.jsonwebtoken.JwtException;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/api/controller/ApiController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/api/controller/ApiController.java
......@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.api.controller;
package cn.stylefeng.guns.base.modular.api.controller;
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.entity.User;
import cn.stylefeng.guns.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.core.util.JwtTokenUtil;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.mapper.UserMapper;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/DeptController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/DeptController.java
......@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.stylefeng.guns.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.core.shiro.annotion.Permission;
import cn.stylefeng.guns.core.constant.dictmap.DeptDict;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.pojo.node.TreeviewNode;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.modular.system.entity.Dept;
import cn.stylefeng.guns.modular.system.model.DeptDto;
import cn.stylefeng.guns.modular.system.service.DeptService;
import cn.stylefeng.guns.modular.system.warpper.DeptTreeWrapper;
import cn.stylefeng.guns.modular.system.warpper.DeptWrapper;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.base.modular.system.entity.Dept;
import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
import cn.stylefeng.guns.base.core.constant.dictmap.DeptDict;
import cn.stylefeng.guns.base.core.pojo.node.TreeviewNode;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.modular.system.model.DeptDto;
import cn.stylefeng.guns.base.modular.system.service.DeptService;
import cn.stylefeng.guns.base.modular.system.warpper.DeptTreeWrapper;
import cn.stylefeng.guns.base.modular.system.warpper.DeptWrapper;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
import cn.stylefeng.roses.core.treebuild.DefaultTreeBuildFactory;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/DictController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/DictController.java
package cn.stylefeng.guns.modular.system.controller;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.modular.system.entity.Dict;
import cn.stylefeng.guns.modular.system.entity.DictType;
import cn.stylefeng.guns.modular.system.model.params.DictParam;
import cn.stylefeng.guns.modular.system.model.result.DictResult;
import cn.stylefeng.guns.modular.system.service.DictService;
import cn.stylefeng.guns.modular.system.service.DictTypeService;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.modular.system.entity.Dict;
import cn.stylefeng.guns.base.modular.system.entity.DictType;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.base.modular.system.model.params.DictParam;
import cn.stylefeng.guns.base.modular.system.model.result.DictResult;
import cn.stylefeng.guns.base.modular.system.service.DictService;
import cn.stylefeng.guns.base.modular.system.service.DictTypeService;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/DictTypeController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/DictTypeController.java
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.modular.system.entity.DictType;
import cn.stylefeng.guns.modular.system.model.params.DictTypeParam;
import cn.stylefeng.guns.modular.system.service.DictTypeService;
import cn.stylefeng.guns.base.modular.system.entity.DictType;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.base.modular.system.model.params.DictTypeParam;
import cn.stylefeng.guns.base.modular.system.service.DictTypeService;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
import org.springframework.beans.factory.annotation.Autowired;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/KaptchaController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/KaptchaController.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.roses.core.util.FileUtil;
import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.Producer;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/LogController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/LogController.java
......@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.stylefeng.guns.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.core.shiro.annotion.Permission;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.constant.state.BizLogType;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.modular.system.entity.OperationLog;
import cn.stylefeng.guns.modular.system.service.OperationLogService;
import cn.stylefeng.guns.modular.system.warpper.LogWrapper;
import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.base.modular.system.entity.OperationLog;
import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.guns.base.core.constant.state.BizLogType;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.modular.system.service.OperationLogService;
import cn.stylefeng.guns.base.modular.system.warpper.LogWrapper;
import cn.stylefeng.roses.core.base.controller.BaseController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/LoginController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/LoginController.java
......@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
import cn.stylefeng.guns.core.pojo.node.MenuNode;
import cn.stylefeng.guns.core.log.LogManager;
import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.modular.system.service.UserService;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.stylefeng.guns.base.core.log.LogManager;
import cn.stylefeng.guns.base.core.pojo.node.MenuNode;
import cn.stylefeng.guns.base.core.log.factory.LogTaskFactory;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.roses.core.base.controller.BaseController;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/LoginLogController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/LoginLogController.java
......@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.stylefeng.guns.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.core.shiro.annotion.Permission;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.modular.system.service.LoginLogService;
import cn.stylefeng.guns.modular.system.warpper.LogWrapper;
import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.base.modular.system.service.LoginLogService;
import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.modular.system.warpper.LogWrapper;
import cn.stylefeng.roses.core.base.controller.BaseController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/MenuController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/MenuController.java
......@@ -13,25 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.stylefeng.guns.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.core.shiro.annotion.Permission;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.constant.dictmap.DeleteDict;
import cn.stylefeng.guns.core.constant.dictmap.MenuDict;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.modular.system.entity.Menu;
import cn.stylefeng.guns.modular.system.model.MenuDto;
import cn.stylefeng.guns.modular.system.service.MenuService;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.modular.system.warpper.MenuWrapper;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.modular.system.entity.Menu;
import cn.stylefeng.guns.base.modular.system.service.MenuService;
import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.guns.base.core.constant.dictmap.DeleteDict;
import cn.stylefeng.guns.base.core.constant.dictmap.MenuDict;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.base.modular.system.model.MenuDto;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.guns.base.modular.system.warpper.MenuWrapper;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
import cn.stylefeng.roses.core.util.ToolUtil;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/NoticeController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/NoticeController.java
......@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.stylefeng.guns.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.core.constant.dictmap.DeleteDict;
import cn.stylefeng.guns.core.constant.dictmap.NoticeMap;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.modular.system.entity.Notice;
import cn.stylefeng.guns.modular.system.service.NoticeService;
import cn.stylefeng.guns.modular.system.warpper.NoticeWrapper;
import cn.stylefeng.guns.base.core.constant.dictmap.NoticeMap;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.modular.system.entity.Notice;
import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.base.core.constant.dictmap.DeleteDict;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.modular.system.service.NoticeService;
import cn.stylefeng.guns.base.modular.system.warpper.NoticeWrapper;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/RoleController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/RoleController.java
......@@ -13,25 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.stylefeng.guns.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.core.shiro.annotion.Permission;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.constant.dictmap.DeleteDict;
import cn.stylefeng.guns.core.constant.dictmap.RoleDict;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.modular.system.entity.Role;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.model.RoleDto;
import cn.stylefeng.guns.modular.system.service.RoleService;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.modular.system.warpper.RoleWrapper;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.base.modular.system.entity.Role;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.service.RoleService;
import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.guns.base.core.constant.dictmap.DeleteDict;
import cn.stylefeng.guns.base.core.constant.dictmap.RoleDict;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.modular.system.model.RoleDto;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.guns.base.modular.system.warpper.RoleWrapper;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
import cn.stylefeng.roses.core.util.ToolUtil;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/SystemController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/SystemController.java
......@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.modular.system.entity.Notice;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.service.FileInfoService;
import cn.stylefeng.guns.modular.system.service.NoticeService;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.modular.system.entity.Notice;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.service.FileInfoService;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.modular.system.service.NoticeService;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/controller/UserMgrController.java
......@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.controller;
package cn.stylefeng.guns.base.modular.system.controller;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.core.shiro.annotion.Permission;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.constant.dictmap.UserDict;
import cn.stylefeng.guns.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.model.UserDto;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.modular.system.warpper.UserWrapper;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.core.log.annotion.BussinessLog;
import cn.stylefeng.guns.base.core.shiro.annotion.Permission;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.guns.base.core.constant.dictmap.UserDict;
import cn.stylefeng.guns.base.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.modular.system.model.UserDto;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.guns.base.modular.system.warpper.UserWrapper;
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.datascope.DataScope;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/Dept.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Dept.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/Dict.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Dict.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/DictType.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/DictType.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/FileInfo.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/FileInfo.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/LoginLog.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/LoginLog.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/Menu.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Menu.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/Notice.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Notice.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/OperationLog.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/OperationLog.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/Relation.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Relation.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/Role.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/Role.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/entity/User.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/entity/User.java
package cn.stylefeng.guns.modular.system.entity;
package cn.stylefeng.guns.base.modular.system.entity;
import com.baomidou.mybatisplus.annotation.*;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/factory/UserFactory.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/factory/UserFactory.java
......@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.factory;
package cn.stylefeng.guns.base.modular.system.factory;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.stylefeng.guns.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.model.UserDto;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.base.modular.system.model.UserDto;
import cn.stylefeng.roses.core.util.ToolUtil;
import org.springframework.beans.BeanUtils;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/DeptMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/DeptMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.core.pojo.node.TreeviewNode;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.modular.system.entity.Dept;
import cn.stylefeng.guns.base.core.pojo.node.TreeviewNode;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.modular.system.entity.Dept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/DictMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/DictMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.modular.system.entity.Dict;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.modular.system.entity.Dict;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/DictTypeMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/DictTypeMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.DictType;
import cn.stylefeng.guns.base.modular.system.entity.DictType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/FileInfoMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/FileInfoMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.FileInfo;
import cn.stylefeng.guns.base.modular.system.entity.FileInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/LoginLogMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/LoginLogMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.LoginLog;
import cn.stylefeng.guns.base.modular.system.entity.LoginLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/MenuMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/MenuMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.core.pojo.node.MenuNode;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.modular.system.entity.Menu;
import cn.stylefeng.guns.base.core.pojo.node.MenuNode;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.modular.system.entity.Menu;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/NoticeMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/NoticeMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.Notice;
import cn.stylefeng.guns.base.modular.system.entity.Notice;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/OperationLogMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/OperationLogMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.OperationLog;
import cn.stylefeng.guns.base.modular.system.entity.OperationLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/RelationMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/RelationMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.Relation;
import cn.stylefeng.guns.base.modular.system.entity.Relation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/RoleMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/RoleMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.modular.system.entity.Role;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.modular.system.entity.Role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/UserMapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/UserMapper.java
package cn.stylefeng.guns.modular.system.mapper;
package cn.stylefeng.guns.base.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.roses.core.datascope.DataScope;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/DeptMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/DeptMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.DeptMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.DeptMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.Dept">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.Dept">
<id column="dept_id" property="deptId" />
<result column="pid" property="pid" />
<result column="pids" property="pids" />
......@@ -23,7 +23,7 @@
dept_id AS "deptId", pid AS "pid", pids AS "pids", simple_name AS "simpleName", full_name AS "fullName", description AS "description", version AS "version", sort AS "sort", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
</sql>
<select id="tree" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
<select id="tree" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode">
select dept_id AS id, pid as "pId", simple_name as name,
(
CASE
......@@ -35,7 +35,7 @@
) as "open" from sys_dept
</select>
<select id="tree" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
<select id="tree" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode" databaseId="oracle">
select dept_id AS id, pid as "pId", simple_name as name,
(
CASE
......@@ -73,11 +73,11 @@
order by sort ASC
</select>
<select id="treeviewNodes" resultType="cn.stylefeng.guns.core.pojo.node.TreeviewNode">
<select id="treeviewNodes" resultType="cn.stylefeng.guns.base.core.pojo.node.TreeviewNode">
select dept_id AS tags, pid as "parentId", simple_name as text from sys_dept
</select>
<select id="likePids" resultType="cn.stylefeng.guns.modular.system.entity.Dept">
<select id="likePids" resultType="cn.stylefeng.guns.base.modular.system.entity.Dept">
select
<include refid="Base_Column_List"/>
from sys_dept where 1 = 1
......@@ -86,7 +86,7 @@
</if>
</select>
<select id="likePids" resultType="cn.stylefeng.guns.modular.system.entity.Dept" databaseId="oracle">
<select id="likePids" resultType="cn.stylefeng.guns.base.modular.system.entity.Dept" databaseId="oracle">
select
<include refid="Base_Column_List"/>
from sys_dept where 1 = 1
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/DictMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/DictMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.DictMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.DictMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.Dict">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.Dict">
<id column="dict_id" property="dictId" />
<result column="dict_type_id" property="dictTypeId" />
<result column="code" property="code" />
......@@ -24,7 +24,7 @@
dict_id AS "dictId", dict_type_id AS "dictTypeId", code AS "code", name AS "name", parent_id AS "parentId", parent_ids AS "parentIds", status AS "status", sort AS "sort", description AS "description", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
</sql>
<select id="dictTree" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
<select id="dictTree" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode">
select dict_id AS id, parent_id as "pId", name as name,
(
CASE
......@@ -36,7 +36,7 @@
) as "open" from sys_dict where dict_type_id = #{dictTypeId}
</select>
<select id="dictTree" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
<select id="dictTree" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode" databaseId="oracle">
select dict_id AS id, parent_id as "pId", name as name,
(
CASE
......@@ -48,7 +48,7 @@
) as "open" from sys_dict where dict_type_id = #{dictTypeId}
</select>
<select id="likeParentIds" resultType="cn.stylefeng.guns.modular.system.entity.Dict">
<select id="likeParentIds" resultType="cn.stylefeng.guns.base.modular.system.entity.Dict">
select
<include refid="Base_Column_List"></include>
from sys_dict where 1 = 1
......@@ -57,7 +57,7 @@
</if>
</select>
<select id="likeParentIds" resultType="cn.stylefeng.guns.modular.system.entity.Dict" databaseId="oracle">
<select id="likeParentIds" resultType="cn.stylefeng.guns.base.modular.system.entity.Dict" databaseId="oracle">
select
<include refid="Base_Column_List"></include>
from sys_dict where 1 = 1
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/DictTypeMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/DictTypeMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.DictTypeMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.DictTypeMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.DictType">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.DictType">
<id column="dict_type_id" property="dictTypeId" />
<result column="code" property="code" />
<result column="name" property="name" />
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/FileInfoMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/FileInfoMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.FileInfoMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.FileInfoMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.FileInfo">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.FileInfo">
<id column="file_id" property="fileId" />
<result column="file_bucket" property="fileBucket" />
<result column="file_name" property="fileName" />
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/LoginLogMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/LoginLogMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.LoginLogMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.LoginLogMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.LoginLog">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.LoginLog">
<id column="login_log_id" property="loginLogId" />
<result column="log_name" property="logName" />
<result column="user_id" property="userId" />
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/MenuMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/MenuMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.MenuMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.MenuMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.Menu">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.Menu">
<id column="menu_id" property="menuId" />
<result column="code" property="code" />
<result column="pcode" property="pcode" />
......@@ -66,7 +66,7 @@
sys_relation where role_id = #{roleId}
</select>
<select id="menuTreeList" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
<select id="menuTreeList" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode">
SELECT
m1.menu_id AS id,
(
......@@ -94,7 +94,7 @@
m1.menu_id ASC
</select>
<select id="menuTreeList" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
<select id="menuTreeList" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode" databaseId="oracle">
SELECT
m1.menu_id AS id,
(
......@@ -122,7 +122,7 @@
m1.menu_id ASC
</select>
<select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
<select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode">
SELECT
m1.menu_id AS id,
(
......@@ -173,7 +173,7 @@
m1.menu_id ASC
</select>
<select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
<select id="menuTreeListByMenuIds" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode" databaseId="oracle">
SELECT
m1.menu_id AS id,
(
......@@ -235,7 +235,7 @@
where rel.role_id = #{roleId}
</select>
<select id="getMenusByRoleIds" resultType="cn.stylefeng.guns.core.pojo.node.MenuNode">
<select id="getMenusByRoleIds" resultType="cn.stylefeng.guns.base.core.pojo.node.MenuNode">
SELECT
m1.menu_id AS id,
m1.icon AS icon,
......@@ -303,7 +303,7 @@
</if>
</select>
<select id="getMenusLikePcodes" resultType="cn.stylefeng.guns.modular.system.entity.Menu">
<select id="getMenusLikePcodes" resultType="cn.stylefeng.guns.base.modular.system.entity.Menu">
select
<include refid="Base_Column_List"></include>
from sys_menu where 1 = 1
......@@ -312,7 +312,7 @@
</if>
</select>
<select id="getMenusLikePcodes" resultType="cn.stylefeng.guns.modular.system.entity.Menu" databaseId="oracle">
<select id="getMenusLikePcodes" resultType="cn.stylefeng.guns.base.modular.system.entity.Menu" databaseId="oracle">
select
<include refid="Base_Column_List"></include>
from sys_menu where 1 = 1
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/NoticeMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/NoticeMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.NoticeMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.NoticeMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.Notice">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.Notice">
<id column="notice_id" property="noticeId" />
<result column="title" property="title" />
<result column="content" property="content" />
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/OperationLogMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/OperationLogMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.OperationLogMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.OperationLogMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.OperationLog">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.OperationLog">
<id column="operation_log_id" property="operationLogId" />
<result column="log_type" property="logType" />
<result column="log_name" property="logName" />
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/RelationMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/RelationMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.RelationMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.RelationMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.Relation">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.Relation">
<id column="relation_id" property="relationId" />
<result column="menu_id" property="menuId" />
<result column="role_id" property="roleId" />
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/RoleMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/RoleMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.RoleMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.RoleMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.Role">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.Role">
<id column="role_id" property="roleId" />
<result column="pid" property="pid" />
<result column="name" property="name" />
......@@ -45,19 +45,19 @@
delete from sys_relation where role_id = #{roleId}
</delete>
<select id="roleTreeList" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
<select id="roleTreeList" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode">
select role_id AS id, pid as "pId",
name as name, (case when (pid = 0 or pid is null) then 'true'
else 'false' end) as "open" from sys_role
</select>
<select id="roleTreeList" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
<select id="roleTreeList" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode" databaseId="oracle">
select role_id AS id, pid as "pId",
name as name, (case when (pid = 0 or pid is null) then '1'
else '0' end) as "open" from sys_role
</select>
<select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode">
<select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode">
SELECT
r.role_id as id,
pid as "pId",
......@@ -96,7 +96,7 @@
ORDER BY pid,sort ASC
</select>
<select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.pojo.node.ZTreeNode" databaseId="oracle">
<select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.base.core.pojo.node.ZTreeNode" databaseId="oracle">
SELECT
r.role_id as id,
pid as "pId",
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/UserMapper.xml → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/mapper/mapping/UserMapper.xml
<?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">
<mapper namespace="cn.stylefeng.guns.modular.system.mapper.UserMapper">
<mapper namespace="cn.stylefeng.guns.base.modular.system.mapper.UserMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.system.entity.User">
<resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.modular.system.entity.User">
<id column="user_id" property="userId" />
<result column="avatar" property="avatar" />
<result column="account" property="account" />
......@@ -83,7 +83,7 @@
#{userId}
</update>
<select id="getByAccount" resultType="cn.stylefeng.guns.modular.system.entity.User">
<select id="getByAccount" resultType="cn.stylefeng.guns.base.modular.system.entity.User">
select
<include refid="Base_Column_List_With_Pwd"/>
from sys_user where account = #{account} and status != 'DELETED'
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/model/DeptDto.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/model/DeptDto.java
package cn.stylefeng.guns.modular.system.model;
package cn.stylefeng.guns.base.modular.system.model;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/model/MenuDto.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/model/MenuDto.java
package cn.stylefeng.guns.modular.system.model;
package cn.stylefeng.guns.base.modular.system.model;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/model/RoleDto.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/model/RoleDto.java
package cn.stylefeng.guns.modular.system.model;
package cn.stylefeng.guns.base.modular.system.model;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/model/UserDto.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/model/UserDto.java
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.model;
package cn.stylefeng.guns.base.modular.system.model;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/model/params/DictParam.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/model/params/DictParam.java
package cn.stylefeng.guns.modular.system.model.params;
package cn.stylefeng.guns.base.modular.system.model.params;
import cn.stylefeng.roses.kernel.model.validator.BaseValidatingParam;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/model/params/DictTypeParam.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/model/params/DictTypeParam.java
package cn.stylefeng.guns.modular.system.model.params;
package cn.stylefeng.guns.base.modular.system.model.params;
import cn.stylefeng.roses.kernel.model.validator.BaseValidatingParam;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/model/result/DictResult.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/model/result/DictResult.java
package cn.stylefeng.guns.modular.system.model.result;
package cn.stylefeng.guns.base.modular.system.model.result;
import lombok.Data;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/DeptService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/DeptService.java
package cn.stylefeng.guns.modular.system.service;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.node.TreeviewNode;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.modular.system.entity.Dept;
import cn.stylefeng.guns.modular.system.mapper.DeptMapper;
package cn.stylefeng.guns.base.modular.system.service;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.modular.system.entity.Dept;
import cn.stylefeng.guns.base.core.pojo.node.TreeviewNode;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.modular.system.mapper.DeptMapper;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/DictService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/DictService.java
package cn.stylefeng.guns.modular.system.service;
import cn.stylefeng.guns.core.constant.state.CommonStatus;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.modular.system.entity.Dict;
import cn.stylefeng.guns.modular.system.mapper.DictMapper;
import cn.stylefeng.guns.modular.system.model.params.DictParam;
import cn.stylefeng.guns.modular.system.model.result.DictResult;
package cn.stylefeng.guns.base.modular.system.service;
import cn.stylefeng.guns.base.core.constant.state.CommonStatus;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.base.modular.system.entity.Dict;
import cn.stylefeng.guns.base.modular.system.mapper.DictMapper;
import cn.stylefeng.guns.base.modular.system.model.params.DictParam;
import cn.stylefeng.guns.base.modular.system.model.result.DictResult;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/DictTypeService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/DictTypeService.java
package cn.stylefeng.guns.modular.system.service;
import cn.stylefeng.guns.core.constant.state.CommonStatus;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.modular.system.entity.DictType;
import cn.stylefeng.guns.modular.system.mapper.DictTypeMapper;
import cn.stylefeng.guns.modular.system.model.params.DictTypeParam;
import cn.stylefeng.guns.modular.system.model.result.DictTypeResult;
package cn.stylefeng.guns.base.modular.system.service;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.base.modular.system.entity.DictType;
import cn.stylefeng.guns.base.modular.system.model.params.DictTypeParam;
import cn.stylefeng.guns.base.core.constant.state.CommonStatus;
import cn.stylefeng.guns.base.modular.system.mapper.DictTypeMapper;
import cn.stylefeng.guns.base.modular.system.model.result.DictTypeResult;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/FileInfoService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/FileInfoService.java
package cn.stylefeng.guns.modular.system.service;
package cn.stylefeng.guns.base.modular.system.service;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.IoUtil;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.core.constant.DefaultAvatar;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.modular.system.entity.FileInfo;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.mapper.FileInfoMapper;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.guns.base.core.constant.DefaultAvatar;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.modular.system.entity.FileInfo;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.mapper.FileInfoMapper;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import cn.stylefeng.roses.kernel.model.exception.enums.CoreExceptionEnum;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/LoginLogService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/LoginLogService.java
package cn.stylefeng.guns.modular.system.service;
package cn.stylefeng.guns.base.modular.system.service;
import cn.stylefeng.guns.modular.system.entity.LoginLog;
import cn.stylefeng.guns.modular.system.mapper.LoginLogMapper;
import cn.stylefeng.guns.base.modular.system.entity.LoginLog;
import cn.stylefeng.guns.base.modular.system.mapper.LoginLogMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/MenuService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/MenuService.java
package cn.stylefeng.guns.modular.system.service;
package cn.stylefeng.guns.base.modular.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.constant.state.MenuStatus;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.node.MenuNode;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.listener.ConfigListener;
import cn.stylefeng.guns.modular.system.entity.Menu;
import cn.stylefeng.guns.modular.system.mapper.MenuMapper;
import cn.stylefeng.guns.modular.system.model.MenuDto;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.constant.state.MenuStatus;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.pojo.node.MenuNode;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.listener.ConfigListener;
import cn.stylefeng.guns.base.modular.system.entity.Menu;
import cn.stylefeng.guns.base.modular.system.mapper.MenuMapper;
import cn.stylefeng.guns.base.modular.system.model.MenuDto;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/NoticeService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/NoticeService.java
package cn.stylefeng.guns.modular.system.service;
package cn.stylefeng.guns.base.modular.system.service;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.modular.system.entity.Notice;
import cn.stylefeng.guns.modular.system.mapper.NoticeMapper;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.modular.system.entity.Notice;
import cn.stylefeng.guns.base.modular.system.mapper.NoticeMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/OperationLogService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/OperationLogService.java
package cn.stylefeng.guns.modular.system.service;
package cn.stylefeng.guns.base.modular.system.service;
import cn.stylefeng.guns.modular.system.entity.OperationLog;
import cn.stylefeng.guns.modular.system.mapper.OperationLogMapper;
import cn.stylefeng.guns.base.modular.system.entity.OperationLog;
import cn.stylefeng.guns.base.modular.system.mapper.OperationLogMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/RelationService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/RelationService.java
package cn.stylefeng.guns.modular.system.service;
package cn.stylefeng.guns.base.modular.system.service;
import cn.stylefeng.guns.modular.system.entity.Relation;
import cn.stylefeng.guns.modular.system.mapper.RelationMapper;
import cn.stylefeng.guns.base.modular.system.entity.Relation;
import cn.stylefeng.guns.base.modular.system.mapper.RelationMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/RoleService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/RoleService.java
package cn.stylefeng.guns.modular.system.service;
package cn.stylefeng.guns.base.modular.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.constant.cache.Cache;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.core.util.CacheUtil;
import cn.stylefeng.guns.modular.system.entity.Relation;
import cn.stylefeng.guns.modular.system.entity.Role;
import cn.stylefeng.guns.modular.system.mapper.RelationMapper;
import cn.stylefeng.guns.modular.system.mapper.RoleMapper;
import cn.stylefeng.guns.modular.system.model.RoleDto;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.guns.base.core.constant.cache.Cache;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.pojo.node.ZTreeNode;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.log.LogObjectHolder;
import cn.stylefeng.guns.base.core.util.CacheUtil;
import cn.stylefeng.guns.base.modular.system.entity.Relation;
import cn.stylefeng.guns.base.modular.system.entity.Role;
import cn.stylefeng.guns.base.modular.system.mapper.RelationMapper;
import cn.stylefeng.guns.base.modular.system.mapper.RoleMapper;
import cn.stylefeng.guns.base.modular.system.model.RoleDto;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/service/UserService.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/service/UserService.java
package cn.stylefeng.guns.modular.system.service;
package cn.stylefeng.guns.base.modular.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.stylefeng.guns.core.constant.Const;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.constant.state.ManagerStatus;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.node.MenuNode;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.core.shiro.service.UserAuthService;
import cn.stylefeng.guns.core.util.ApiMenuFilter;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.factory.UserFactory;
import cn.stylefeng.guns.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.modular.system.model.UserDto;
import cn.stylefeng.guns.base.core.constant.Const;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.pojo.node.MenuNode;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.shiro.ShiroKit;
import cn.stylefeng.guns.base.core.shiro.ShiroUser;
import cn.stylefeng.guns.base.core.shiro.service.UserAuthService;
import cn.stylefeng.guns.base.core.util.ApiMenuFilter;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.factory.UserFactory;
import cn.stylefeng.guns.base.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.base.modular.system.model.UserDto;
import cn.stylefeng.guns.base.core.constant.state.ManagerStatus;
import cn.stylefeng.roses.core.datascope.DataScope;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptTreeWrapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/warpper/DeptTreeWrapper.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.warpper;
package cn.stylefeng.guns.base.modular.system.warpper;
import cn.stylefeng.guns.core.pojo.node.TreeviewNode;
import cn.stylefeng.guns.base.core.pojo.node.TreeviewNode;
import java.util.List;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWrapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/warpper/DeptWrapper.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.warpper;
package cn.stylefeng.guns.base.modular.system.warpper;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.util.DecimalUtil;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.util.DecimalUtil;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.page.PageResult;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWrapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/warpper/LogWrapper.java
......@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.warpper;
package cn.stylefeng.guns.base.modular.system.warpper;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.util.Contrast;
import cn.stylefeng.guns.core.util.DecimalUtil;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.util.Contrast;
import cn.stylefeng.guns.base.core.util.DecimalUtil;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.core.util.ToolUtil;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWrapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/warpper/MenuWrapper.java
......@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.warpper;
package cn.stylefeng.guns.base.modular.system.warpper;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
import cn.stylefeng.roses.kernel.model.page.PageResult;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/warpper/NoticeWrapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/warpper/NoticeWrapper.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.warpper;
package cn.stylefeng.guns.base.modular.system.warpper;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.util.DecimalUtil;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.util.DecimalUtil;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWrapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/warpper/RoleWrapper.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.warpper;
package cn.stylefeng.guns.base.modular.system.warpper;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.util.DecimalUtil;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.util.DecimalUtil;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......
guns-vip-base/src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWrapper.java → guns-vip-base/src/main/java/cn/stylefeng/guns/base/modular/system/warpper/UserWrapper.java
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.modular.system.warpper;
package cn.stylefeng.guns.base.modular.system.warpper;
import cn.stylefeng.guns.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.util.DecimalUtil;
import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
import cn.stylefeng.guns.base.core.util.DecimalUtil;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......
guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/controller/ExcelController.java
......@@ -7,11 +7,11 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.view.PoiBaseView;
import cn.stylefeng.guns.config.properties.GunsProperties;
import cn.stylefeng.guns.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.base.config.properties.GunsProperties;
import cn.stylefeng.guns.base.core.exception.enums.BizExceptionEnum;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.modular.demos.entity.ExcelItem;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.roses.core.reqres.response.ResponseData;
import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
......
guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/service/GunsDbService.java
package cn.stylefeng.guns.modular.demos.service;
import cn.hutool.core.util.RandomUtil;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.roses.core.mutidatasource.annotion.DataSource;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
......
guns-vip-master/src/main/java/cn/stylefeng/guns/modular/demos/service/OtherDbService.java
package cn.stylefeng.guns.modular.demos.service;
import cn.hutool.core.util.RandomUtil;
import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.base.modular.system.entity.User;
import cn.stylefeng.guns.base.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.base.modular.system.service.UserService;
import cn.stylefeng.roses.core.mutidatasource.annotion.DataSource;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
......
guns-vip-master/src/main/java/cn/stylefeng/guns/modular/form/controller/EgFormController.java
package cn.stylefeng.guns.modular.form.controller;
import cn.stylefeng.guns.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageFactory;
import cn.stylefeng.guns.base.core.pojo.page.LayuiPageInfo;
import cn.stylefeng.guns.modular.form.entity.EgForm;
import cn.stylefeng.guns.modular.form.model.EgFormParam;
import cn.stylefeng.roses.core.base.controller.BaseController;
......
guns-vip-master/src/main/resources/application.yml
......@@ -30,7 +30,9 @@ spring:
mybatis-plus:
typeAliasesPackage: cn.stylefeng.guns.modular.system.model
mapper-locations: classpath:cn/stylefeng/guns/modular/**/mapping/*.xml
mapper-locations:
- classpath*:cn/stylefeng/guns/base/modular/**/mapping/*.xml
- classpath*:cn/stylefeng/guns/modular/**/mapping/*.xml
log:
path: guns-logs
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment