Browse Source

feat: 重构部分代码

master
niushuai233 2 years ago
parent
commit
d9fa2fb904
  1. 5
      src/main/java/cc/niushuai/bastionserver/common/annotation/RabbitComponent.java
  2. 24
      src/main/java/cc/niushuai/bastionserver/common/api/vo/Result.java
  3. 2
      src/main/java/cc/niushuai/bastionserver/common/aspect/AutoLogAspect.java
  4. 3
      src/main/java/cc/niushuai/bastionserver/common/aspect/DictAspect.java
  5. 8
      src/main/java/cc/niushuai/bastionserver/common/aspect/PermissionDataAspect.java
  6. 3
      src/main/java/cc/niushuai/bastionserver/common/aspect/UrlMatchEnum.java
  7. 5
      src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java
  8. 3
      src/main/java/cc/niushuai/bastionserver/common/base/entity/BaseEntity.java
  9. 3
      src/main/java/cc/niushuai/bastionserver/common/base/service/BaseService.java
  10. 3
      src/main/java/cc/niushuai/bastionserver/common/base/service/impl/BaseServiceImpl.java
  11. 3
      src/main/java/cc/niushuai/bastionserver/common/constant/CacheConstant.java
  12. 9
      src/main/java/cc/niushuai/bastionserver/common/constant/CommonConstant.java
  13. 5
      src/main/java/cc/niushuai/bastionserver/common/constant/GlobalConstants.java
  14. 3
      src/main/java/cc/niushuai/bastionserver/common/constant/SymbolConstant.java
  15. 3
      src/main/java/cc/niushuai/bastionserver/common/constant/WebsocketConst.java
  16. 167
      src/main/java/cc/niushuai/bastionserver/common/constant/enums/CgformEnum.java
  17. 3
      src/main/java/cc/niushuai/bastionserver/common/constant/enums/OperateTypeEnum.java
  18. 3
      src/main/java/cc/niushuai/bastionserver/common/enums/SentinelErrorInfoEnum.java
  19. 3
      src/main/java/cc/niushuai/bastionserver/common/exception/BusinessException.java
  20. 2
      src/main/java/cc/niushuai/bastionserver/common/exception/GlobalExceptionHandler.java
  21. 5
      src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/RedisClient.java
  22. 3
      src/main/java/cc/niushuai/bastionserver/common/modules/redis/config/RedisConfig.java
  23. 5
      src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/AppRedisListener.java
  24. 4
      src/main/java/cc/niushuai/bastionserver/common/modules/redis/receiver/RedisReceiver.java
  25. 3
      src/main/java/cc/niushuai/bastionserver/common/system/query/QueryCondition.java
  26. 15
      src/main/java/cc/niushuai/bastionserver/common/system/query/QueryGenerator.java
  27. 6
      src/main/java/cc/niushuai/bastionserver/common/system/util/PermissionDataUtil.java
  28. 3
      src/main/java/cc/niushuai/bastionserver/common/system/vo/ComboModel.java
  29. 4
      src/main/java/cc/niushuai/bastionserver/common/system/vo/DictModel.java
  30. 4
      src/main/java/cc/niushuai/bastionserver/common/system/vo/DynamicDataSourceModel.java
  31. 1
      src/main/java/cc/niushuai/bastionserver/common/system/vo/SysCategoryModel.java
  32. 3
      src/main/java/cc/niushuai/bastionserver/common/system/vo/SysFilesModel.java
  33. 3
      src/main/java/cc/niushuai/bastionserver/common/system/vo/SysUserCacheInfo.java
  34. 3
      src/main/java/cc/niushuai/bastionserver/common/util/CommonUtils.java
  35. 9
      src/main/java/cc/niushuai/bastionserver/common/util/DySmsEnum.java
  36. 4
      src/main/java/cc/niushuai/bastionserver/common/util/JwtUtil.java
  37. 3
      src/main/java/cc/niushuai/bastionserver/common/util/Md5Util.java
  38. 3
      src/main/java/cc/niushuai/bastionserver/common/util/PasswordUtil.java
  39. 5
      src/main/java/cc/niushuai/bastionserver/common/util/PmsUtil.java
  40. 1
      src/main/java/cc/niushuai/bastionserver/common/util/ResourceUtil.java
  41. 6
      src/main/java/cc/niushuai/bastionserver/common/util/RestUtil.java
  42. 3
      src/main/java/cc/niushuai/bastionserver/common/util/SpringContextUtils.java
  43. 12
      src/main/java/cc/niushuai/bastionserver/common/util/TokenUtils.java
  44. 3
      src/main/java/cc/niushuai/bastionserver/common/util/dynamic/db/FreemarkerParseFactory.java
  45. 3
      src/main/java/cc/niushuai/bastionserver/common/util/encryption/AesEncryptUtil.java
  46. 3
      src/main/java/cc/niushuai/bastionserver/common/util/encryption/EncryptedString.java
  47. 3
      src/main/java/cc/niushuai/bastionserver/common/util/filter/FileTypeFilter.java
  48. 3
      src/main/java/cc/niushuai/bastionserver/common/util/oss/OssBootUtil.java
  49. 3
      src/main/java/cc/niushuai/bastionserver/common/util/security/SecurityTools.java
  50. 3
      src/main/java/cc/niushuai/bastionserver/common/util/security/entity/MyKeyPair.java
  51. 3
      src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityReq.java
  52. 3
      src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityResp.java
  53. 3
      src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignReq.java
  54. 3
      src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignResp.java
  55. 2
      src/main/java/cc/niushuai/bastionserver/common/util/superSearch/QueryRuleVo.java
  56. 6
      src/main/java/cc/niushuai/bastionserver/config/AppConfig.java
  57. 2
      src/main/java/cc/niushuai/bastionserver/config/AutoPoiConfig.java
  58. 3
      src/main/java/cc/niushuai/bastionserver/config/DruidConfig.java
  59. 6
      src/main/java/cc/niushuai/bastionserver/config/StaticConfig.java
  60. 2
      src/main/java/cc/niushuai/bastionserver/config/Swagger2Config.java
  61. 10
      src/main/java/cc/niushuai/bastionserver/config/WebMvcConfiguration.java
  62. 3
      src/main/java/cc/niushuai/bastionserver/config/WebSocketConfig.java
  63. 3
      src/main/java/cc/niushuai/bastionserver/config/init/TomcatFactoryConfig.java
  64. 2
      src/main/java/cc/niushuai/bastionserver/config/mybatis/MybatisPlusSaasConfig.java
  65. 3
      src/main/java/cc/niushuai/bastionserver/config/mybatis/ThreadLocalDataHelper.java
  66. 2
      src/main/java/cc/niushuai/bastionserver/config/mybatis/aspect/DynamicTableAspect.java
  67. 8
      src/main/java/cc/niushuai/bastionserver/config/oss/MinioConfig.java
  68. 10
      src/main/java/cc/niushuai/bastionserver/config/oss/OssConfiguration.java
  69. 10
      src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroConfig.java
  70. 9
      src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroRealm.java
  71. 3
      src/main/java/cc/niushuai/bastionserver/config/shiro/filters/JwtFilter.java
  72. 8
      src/main/java/cc/niushuai/bastionserver/config/sign/interceptor/SignAuthConfiguration.java
  73. 8
      src/main/java/cc/niushuai/bastionserver/config/sign/util/SignUtil.java
  74. 3
      src/main/java/cc/niushuai/bastionserver/config/vo/Shiro.java
  75. 3
      src/main/java/cc/niushuai/bastionserver/modules/base/mapper/BaseCommonMapper.java
  76. 3
      src/main/java/cc/niushuai/bastionserver/modules/base/service/impl/BaseCommonServiceImpl.java
  77. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/mock/MockController.java
  78. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/mock/vxe/controller/VxeMockController.java
  79. 5
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDemoController.java
  80. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDynamicDataController.java
  81. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseOrderMainController.java
  82. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BigScreenTemplatController.java
  83. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/JeecgOrderErpMainController.java
  84. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/BaseDemo.java
  85. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderCustomer.java
  86. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderMain.java
  87. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderTicket.java
  88. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgDemoMapper.java
  89. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderCustomerMapper.java
  90. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderMainMapper.java
  91. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderTicketMapper.java
  92. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDemoService.java
  93. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDynamicDataService.java
  94. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderCustomerService.java
  95. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderMainService.java
  96. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderTicketService.java
  97. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDemoServiceImpl.java
  98. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDynamicDataServiceImpl.java
  99. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java
  100. 3
      src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
  101. Some files were not shown because too many files have changed in this diff Show More

5
src/main/java/cc/niushuai/bastionserver/common/annotation/RabbitComponent.java

@ -6,10 +6,11 @@ import org.springframework.stereotype.Component;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* 消息队列初始化注解
*
* @Author:zyf * @Author:zyf
* @Date:2019-07-31 10:43 * @Date:2019-07-31 10:43
* @Description: 消息队列初始化注解 */
**/
@Documented @Documented
@Inherited @Inherited
@Target({ElementType.TYPE}) @Target({ElementType.TYPE})

24
src/main/java/cc/niushuai/bastionserver/common/api/vo/Result.java

@ -70,14 +70,14 @@ public class Result<T> implements Serializable {
public static <T> Result<T> ok() { public static <T> Result<T> ok() {
Result<T> r = new Result<T>(); Result<T> r = new Result<T>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.OK_200);
return r; return r;
} }
public static <T> Result<T> ok(String msg) { public static <T> Result<T> ok(String msg) {
Result<T> r = new Result<T>(); Result<T> r = new Result<T>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.OK_200);
//Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D //Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D
r.setResult((T) msg); r.setResult((T) msg);
r.setMessage(msg); r.setMessage(msg);
@ -87,7 +87,7 @@ public class Result<T> implements Serializable {
public static <T> Result<T> ok(T data) { public static <T> Result<T> ok(T data) {
Result<T> r = new Result<T>(); Result<T> r = new Result<T>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.OK_200);
r.setResult(data); r.setResult(data);
return r; return r;
} }
@ -95,7 +95,7 @@ public class Result<T> implements Serializable {
public static <T> Result<T> OK() { public static <T> Result<T> OK() {
Result<T> r = new Result<T>(); Result<T> r = new Result<T>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.OK_200);
return r; return r;
} }
@ -109,7 +109,7 @@ public class Result<T> implements Serializable {
public static <T> Result<T> OK(String msg) { public static <T> Result<T> OK(String msg) {
Result<T> r = new Result<T>(); Result<T> r = new Result<T>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.OK_200);
r.setMessage(msg); r.setMessage(msg);
//Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D //Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D
r.setResult((T) msg); r.setResult((T) msg);
@ -119,7 +119,7 @@ public class Result<T> implements Serializable {
public static <T> Result<T> OK(T data) { public static <T> Result<T> OK(T data) {
Result<T> r = new Result<T>(); Result<T> r = new Result<T>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.OK_200);
r.setResult(data); r.setResult(data);
return r; return r;
} }
@ -127,7 +127,7 @@ public class Result<T> implements Serializable {
public static <T> Result<T> OK(String msg, T data) { public static <T> Result<T> OK(String msg, T data) {
Result<T> r = new Result<T>(); Result<T> r = new Result<T>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.OK_200);
r.setMessage(msg); r.setMessage(msg);
r.setResult(data); r.setResult(data);
return r; return r;
@ -136,14 +136,14 @@ public class Result<T> implements Serializable {
public static <T> Result<T> error(String msg, T data) { public static <T> Result<T> error(String msg, T data) {
Result<T> r = new Result<T>(); Result<T> r = new Result<T>();
r.setSuccess(false); r.setSuccess(false);
r.setCode(CommonConstant.SC_INTERNAL_SERVER_ERROR_500); r.setCode(CommonConstant.INTERNAL_SERVER_ERROR_500);
r.setMessage(msg); r.setMessage(msg);
r.setResult(data); r.setResult(data);
return r; return r;
} }
public static <T> Result<T> error(String msg) { public static <T> Result<T> error(String msg) {
return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg); return error(CommonConstant.INTERNAL_SERVER_ERROR_500, msg);
} }
public static <T> Result<T> error(int code, String msg) { public static <T> Result<T> error(int code, String msg) {
@ -158,19 +158,19 @@ public class Result<T> implements Serializable {
* 无权限访问返回结果 * 无权限访问返回结果
*/ */
public static <T> Result<T> noauth(String msg) { public static <T> Result<T> noauth(String msg) {
return error(CommonConstant.SC_JEECG_NO_AUTHZ, msg); return error(CommonConstant.NO_AUTHZ, msg);
} }
public Result<T> success(String message) { public Result<T> success(String message) {
this.message = message; this.message = message;
this.code = CommonConstant.SC_OK_200; this.code = CommonConstant.OK_200;
this.success = true; this.success = true;
return this; return this;
} }
public Result<T> error500(String message) { public Result<T> error500(String message) {
this.message = message; this.message = message;
this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500; this.code = CommonConstant.INTERNAL_SERVER_ERROR_500;
this.success = false; this.success = false;
return this; return this;
} }

2
src/main/java/cc/niushuai/bastionserver/common/aspect/AutoLogAspect.java

@ -130,7 +130,7 @@ public class AutoLogAspect {
/** /**
* @param request: request * @param request: request
* @param joinPoint: joinPoint * @param joinPoint: joinPoint
* @Description: 获取请求参数 * 获取请求参数
* @author: scott * @author: scott
* @date: 2020/4/16 0:10 * @date: 2020/4/16 0:10
* @Return: java.lang.String * @Return: java.lang.String

3
src/main/java/cc/niushuai/bastionserver/common/aspect/DictAspect.java

@ -29,7 +29,8 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @Description: 字典aop类 * 字典aop类
*
* @Author: dangzhenghui * @Author: dangzhenghui
* @Date: 2019-3-17 21:50 * @Date: 2019-3-17 21:50
* @Version: 1.0 * @Version: 1.0

8
src/main/java/cc/niushuai/bastionserver/common/aspect/PermissionDataAspect.java

@ -5,10 +5,10 @@ import cc.niushuai.bastionserver.common.aspect.annotation.PermissionData;
import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.constant.CommonConstant;
import cc.niushuai.bastionserver.common.constant.SymbolConstant; import cc.niushuai.bastionserver.common.constant.SymbolConstant;
import cc.niushuai.bastionserver.common.system.query.QueryRuleEnum; import cc.niushuai.bastionserver.common.system.query.QueryRuleEnum;
import cc.niushuai.bastionserver.common.system.util.JeecgDataAutorUtils; import cc.niushuai.bastionserver.common.system.util.PermissionDataUtil;
import cc.niushuai.bastionserver.common.util.JwtUtil;
import cc.niushuai.bastionserver.common.system.vo.SysPermissionDataRuleModel; import cc.niushuai.bastionserver.common.system.vo.SysPermissionDataRuleModel;
import cc.niushuai.bastionserver.common.system.vo.SysUserCacheInfo; import cc.niushuai.bastionserver.common.system.vo.SysUserCacheInfo;
import cc.niushuai.bastionserver.common.util.JwtUtil;
import cc.niushuai.bastionserver.common.util.SpringContextUtils; import cc.niushuai.bastionserver.common.util.SpringContextUtils;
import cc.niushuai.bastionserver.common.util.oConvertUtils; import cc.niushuai.bastionserver.common.util.oConvertUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -75,10 +75,10 @@ public class PermissionDataAspect {
List<SysPermissionDataRuleModel> dataRules = commonApi.queryPermissionDataRule(component, requestPath, username); List<SysPermissionDataRuleModel> dataRules = commonApi.queryPermissionDataRule(component, requestPath, username);
if (dataRules != null && dataRules.size() > 0) { if (dataRules != null && dataRules.size() > 0) {
//临时存储 //临时存储
JeecgDataAutorUtils.installDataSearchConditon(request, dataRules); PermissionDataUtil.installDataSearchConditon(request, dataRules);
//TODO 微服务情况下也得支持缓存机制 //TODO 微服务情况下也得支持缓存机制
SysUserCacheInfo userinfo = commonApi.getCacheUser(username); SysUserCacheInfo userinfo = commonApi.getCacheUser(username);
JeecgDataAutorUtils.installUserInfo(request, userinfo); PermissionDataUtil.installUserInfo(request, userinfo);
} }
return point.proceed(); return point.proceed();
} }

3
src/main/java/cc/niushuai/bastionserver/common/aspect/UrlMatchEnum.java

@ -3,7 +3,7 @@ package cc.niushuai.bastionserver.common.aspect;
/** /**
* @Author scott * @Author scott
* @Date 2020/1/14 13:36 * @Date 2020/1/14 13:36
* @Description: 请求URL与菜单路由URL转换规则方便于采用菜单路由URL来配置数据权限规则 * 请求URL与菜单路由URL转换规则方便于采用菜单路由URL来配置数据权限规则
*/ */
public enum UrlMatchEnum { public enum UrlMatchEnum {
/** /**
@ -39,6 +39,7 @@ public enum UrlMatchEnum {
* 菜单路由 URL前缀 (对应菜单路径) * 菜单路由 URL前缀 (对应菜单路径)
*/ */
private String matchUrl; private String matchUrl;
UrlMatchEnum(String url, String matchUrl) { UrlMatchEnum(String url, String matchUrl) {
this.url = url; this.url = url;
this.matchUrl = matchUrl; this.matchUrl = matchUrl;

5
src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java

@ -29,7 +29,8 @@ import java.io.IOException;
import java.util.*; import java.util.*;
/** /**
* @Description: Controller基类 * Controller基类
*
* @Author: dangzhenghui@163.com * @Author: dangzhenghui@163.com
* @Date: 2019-4-21 8:13 * @Date: 2019-4-21 8:13
* @Version: 1.0 * @Version: 1.0
@ -42,7 +43,7 @@ public class BaseController<T, S extends IService<T>> {
@Autowired @Autowired
protected S service; protected S service;
@Value("${jeecg.path.upload}") @Value("${app.path.upload}")
private String upLoadPath; private String upLoadPath;
/** /**

3
src/main/java/cc/niushuai/bastionserver/common/base/entity/BaseEntity.java

@ -14,7 +14,8 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* @Description: Entity基类 * Entity基类
*
* @Author: dangzhenghui@163.com * @Author: dangzhenghui@163.com
* @Date: 2019-4-28 * @Date: 2019-4-28
* @Version: 1.1 * @Version: 1.1

3
src/main/java/cc/niushuai/bastionserver/common/base/service/BaseService.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.base.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* @Description: Service基类 * Service基类
*
* @Author: dangzhenghui@163.com * @Author: dangzhenghui@163.com
* @Date: 2019-4-21 8:13 * @Date: 2019-4-21 8:13
* @Version: 1.0 * @Version: 1.0

3
src/main/java/cc/niushuai/bastionserver/common/base/service/impl/BaseServiceImpl.java

@ -7,7 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
/** /**
* @Description: ServiceImpl基类 * ServiceImpl基类
*
* @Author: dangzhenghui@163.com * @Author: dangzhenghui@163.com
* @Date: 2019-4-21 8:13 * @Date: 2019-4-21 8:13
* @Version: 1.0 * @Version: 1.0

3
src/main/java/cc/niushuai/bastionserver/common/constant/CacheConstant.java

@ -1,9 +1,10 @@
package cc.niushuai.bastionserver.common.constant; package cc.niushuai.bastionserver.common.constant;
/** /**
* 缓存常量
*
* @author: huangxutao * @author: huangxutao
* @date: 2019-06-14 * @date: 2019-06-14
* @description: 缓存常量
*/ */
public interface CacheConstant { public interface CacheConstant {

9
src/main/java/cc/niushuai/bastionserver/common/constant/CommonConstant.java

@ -1,7 +1,8 @@
package cc.niushuai.bastionserver.common.constant; package cc.niushuai.bastionserver.common.constant;
/** /**
* @Description: 通用常量 * 通用常量
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
public interface CommonConstant { public interface CommonConstant {
@ -70,16 +71,16 @@ public interface CommonConstant {
/** /**
* {@code 500 Server Error} (HTTP/1.0 - RFC 1945) * {@code 500 Server Error} (HTTP/1.0 - RFC 1945)
*/ */
Integer SC_INTERNAL_SERVER_ERROR_500 = 500; Integer INTERNAL_SERVER_ERROR_500 = 500;
/** /**
* {@code 200 OK} (HTTP/1.0 - RFC 1945) * {@code 200 OK} (HTTP/1.0 - RFC 1945)
*/ */
Integer SC_OK_200 = 200; Integer OK_200 = 200;
/** /**
* 访问权限认证未通过 510 * 访问权限认证未通过 510
*/ */
Integer SC_JEECG_NO_AUTHZ = 510; Integer NO_AUTHZ = 510;
/** /**
* 登录用户Shiro权限缓存KEY前缀 * 登录用户Shiro权限缓存KEY前缀

5
src/main/java/cc/niushuai/bastionserver/common/constant/GlobalConstants.java

@ -1,7 +1,8 @@
package cc.niushuai.bastionserver.common.constant; package cc.niushuai.bastionserver.common.constant;
/** /**
* @Description: GlobalConstants * GlobalConstants
*
* @author: scott * @author: scott
* @date: 2020/01/01 16:01 * @date: 2020/01/01 16:01
*/ */
@ -19,5 +20,5 @@ public class GlobalConstants {
/** /**
* redis消息通道名称 * redis消息通道名称
*/ */
public static final String REDIS_TOPIC_NAME = "jeecg_redis_topic"; public static final String REDIS_TOPIC_NAME = "app_redis_topic";
} }

3
src/main/java/cc/niushuai/bastionserver/common/constant/SymbolConstant.java

@ -1,7 +1,8 @@
package cc.niushuai.bastionserver.common.constant; package cc.niushuai.bastionserver.common.constant;
/** /**
* @Description: 符号和特殊符号常用类 * 符号和特殊符号常用类
*
* @author: wangshuai * @author: wangshuai
* @date: 2022年03月30日 17:44 * @date: 2022年03月30日 17:44
*/ */

3
src/main/java/cc/niushuai/bastionserver/common/constant/WebsocketConst.java

@ -1,7 +1,8 @@
package cc.niushuai.bastionserver.common.constant; package cc.niushuai.bastionserver.common.constant;
/** /**
* @Description: Websocket常量类 * Websocket常量类
*
* @author: taoyan * @author: taoyan
* @date: 2020年03月23日 * @date: 2020年03月23日
*/ */

167
src/main/java/cc/niushuai/bastionserver/common/constant/enums/CgformEnum.java

@ -1,167 +0,0 @@
package cc.niushuai.bastionserver.common.constant.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* online表单枚举 代码生成器用到
*
* @author: jeecg-boot
*/
public enum CgformEnum {
/**
* 单表
*/
ONE(1, "one", "/jeecg/code-template-online", "default.one", "经典风格", new String[]{"vue3", "vue", "vue3Native"}),
/**
* 多表
*/
MANY(2, "many", "/jeecg/code-template-online", "default.onetomany", "经典风格", new String[]{"vue"}),
/**
* 多表jvxe风格
*/
JVXE_TABLE(2, "jvxe", "/jeecg/code-template-online", "jvxe.onetomany", "JVXE风格", new String[]{"vue3", "vue", "vue3Native"}),
/**
* 多表 (erp风格)
*/
ERP(2, "erp", "/jeecg/code-template-online", "erp.onetomany", "ERP风格", new String[]{"vue3", "vue"}),
/**
* 多表内嵌子表风格
*/
INNER_TABLE(2, "innerTable", "/jeecg/code-template-online", "inner-table.onetomany", "内嵌子表风格", new String[]{"vue3", "vue"}),
/**
* 多表tab风格
*/
TAB(2, "tab", "/jeecg/code-template-online", "tab.onetomany", "Tab风格", new String[]{"vue3", "vue"}),
/**
* 树形列表
*/
TREE(3, "tree", "/jeecg/code-template-online", "default.tree", "树形列表", new String[]{"vue3", "vue", "vue3Native"});
/**
* 类型 1/单表 2/一对多 3/
*/
int type;
/**
* 编码标识
*/
String code;
/**
* 代码生成器模板路径
*/
String templatePath;
/**
* 代码生成器模板路径
*/
String stylePath;
/**
* 模板风格名称
*/
String note;
/**
* 支持代码风格 vue3:vue3包装代码 vue3Native:vue3原生代码 vue:vue2代码
*/
String[] vueStyle;
/**
* 构造器
*
* @param type 类型 1/单表 2/一对多 3/
* @param code 模板编码
* @param templatePath 模板路径
* @param stylePath 模板子路径
* @param note
* @param vueStyle 支持代码风格
*/
CgformEnum(int type, String code, String templatePath, String stylePath, String note, String[] vueStyle) {
this.type = type;
this.code = code;
this.templatePath = templatePath;
this.stylePath = stylePath;
this.note = note;
this.vueStyle = vueStyle;
}
/**
* 根据code获取模板路径
*
* @param code
* @return
*/
public static String getTemplatePathByConfig(String code) {
return getCgformEnumByConfig(code).templatePath;
}
/**
* 根据code找枚举
*
* @param code
* @return
*/
public static CgformEnum getCgformEnumByConfig(String code) {
for (CgformEnum e : CgformEnum.values()) {
if (e.code.equals(code)) {
return e;
}
}
return null;
}
/**
* 根据类型找所有
*
* @param type
* @return
*/
public static List<Map<String, Object>> getJspModelList(int type) {
List<Map<String, Object>> ls = new ArrayList<Map<String, Object>>();
for (CgformEnum e : CgformEnum.values()) {
if (e.type == type) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("code", e.code);
map.put("note", e.note);
ls.add(map);
}
}
return ls;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getTemplatePath() {
return templatePath;
}
public void setTemplatePath(String templatePath) {
this.templatePath = templatePath;
}
public String getStylePath() {
return stylePath;
}
public void setStylePath(String stylePath) {
this.stylePath = stylePath;
}
public String[] getVueStyle() {
return vueStyle;
}
public void setVueStyle(String[] vueStyle) {
this.vueStyle = vueStyle;
}
}

3
src/main/java/cc/niushuai/bastionserver/common/constant/enums/OperateTypeEnum.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.constant.enums;
import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.constant.CommonConstant;
/** /**
* @Description: 操作类型 * 操作类型
*
* @author: jeecg-boot * @author: jeecg-boot
* @date: 2022/3/31 10:05 * @date: 2022/3/31 10:05
*/ */

3
src/main/java/cc/niushuai/bastionserver/common/enums/SentinelErrorInfoEnum.java

@ -1,7 +1,8 @@
package cc.niushuai.bastionserver.common.enums; package cc.niushuai.bastionserver.common.enums;
/** /**
* @Description: 异常错误信息定义 * 异常错误信息定义
*
* @author: zyf * @author: zyf
* @date: 2022/4/14 10:05 * @date: 2022/4/14 10:05
*/ */

3
src/main/java/cc/niushuai/bastionserver/common/exception/BusinessException.java

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
/** /**
* Business自定义异常 * Business自定义异常
*
* @author: niushuai233 * @author: niushuai233
*/ */
@Data @Data
@ -34,7 +35,7 @@ public class BusinessException extends RuntimeException {
public BusinessException(String message, Object... params) { public BusinessException(String message, Object... params) {
super(message); super(message);
this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500; this.code = CommonConstant.INTERNAL_SERVER_ERROR_500;
this.params = params; this.params = params;
this.message = StrUtil.format(message, params); this.message = StrUtil.format(message, params);
} }

2
src/main/java/cc/niushuai/bastionserver/common/exception/GlobalExceptionHandler.java

@ -1,8 +1,6 @@
package cc.niushuai.bastionserver.common.exception; package cc.niushuai.bastionserver.common.exception;
import cc.niushuai.bastionserver.common.api.vo.Result; import cc.niushuai.bastionserver.common.api.vo.Result;
import cc.niushuai.bastionserver.common.enums.SentinelErrorInfoEnum;
import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.AuthorizationException;
import org.apache.shiro.authz.UnauthorizedException; import org.apache.shiro.authz.UnauthorizedException;

5
src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/JeecgRedisClient.java → src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/RedisClient.java

@ -8,12 +8,13 @@ import org.springframework.data.redis.core.RedisTemplate;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* @Description: redis客户端 * redis客户端
*
* @author: scott * @author: scott
* @date: 2020/01/01 16:01 * @date: 2020/01/01 16:01
*/ */
@Configuration @Configuration
public class JeecgRedisClient { public class RedisClient {
@Resource @Resource
private RedisTemplate<String, Object> redisTemplate; private RedisTemplate<String, Object> redisTemplate;

3
src/main/java/cc/niushuai/bastionserver/common/modules/redis/config/RedisConfig.java

@ -9,11 +9,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping; import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
import com.fasterxml.jackson.databind.jsontype.DefaultBaseTypeLimitingValidator;
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;

5
src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/JeecgRedisListener.java → src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/AppRedisListener.java

@ -3,11 +3,12 @@ package cc.niushuai.bastionserver.common.modules.redis.listener;
import cc.niushuai.bastionserver.common.base.BaseMap; import cc.niushuai.bastionserver.common.base.BaseMap;
/** /**
* @Description: 自定义消息监听 * 自定义消息监听
*
* @author: scott * @author: scott
* @date: 2020/01/01 16:02 * @date: 2020/01/01 16:02
*/ */
public interface JeecgRedisListener { public interface AppRedisListener {
/** /**
* 接受消息 * 接受消息
* *

4
src/main/java/cc/niushuai/bastionserver/common/modules/redis/receiver/RedisReceiver.java

@ -3,7 +3,7 @@ package cc.niushuai.bastionserver.common.modules.redis.receiver;
import cc.niushuai.bastionserver.common.base.BaseMap; import cc.niushuai.bastionserver.common.base.BaseMap;
import cc.niushuai.bastionserver.common.constant.GlobalConstants; import cc.niushuai.bastionserver.common.constant.GlobalConstants;
import cc.niushuai.bastionserver.common.modules.redis.listener.JeecgRedisListener; import cc.niushuai.bastionserver.common.modules.redis.listener.AppRedisListener;
import cc.niushuai.bastionserver.common.util.SpringContextHolder; import cc.niushuai.bastionserver.common.util.SpringContextHolder;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import lombok.Data; import lombok.Data;
@ -24,7 +24,7 @@ public class RedisReceiver {
*/ */
public void onMessage(BaseMap params) { public void onMessage(BaseMap params) {
Object handlerName = params.get(GlobalConstants.HANDLER_NAME); Object handlerName = params.get(GlobalConstants.HANDLER_NAME);
JeecgRedisListener messageListener = SpringContextHolder.getHandler(handlerName.toString(), JeecgRedisListener.class); AppRedisListener messageListener = SpringContextHolder.getHandler(handlerName.toString(), AppRedisListener.class);
if (ObjectUtil.isNotEmpty(messageListener)) { if (ObjectUtil.isNotEmpty(messageListener)) {
messageListener.onMessage(params); messageListener.onMessage(params);
} }

3
src/main/java/cc/niushuai/bastionserver/common/system/query/QueryCondition.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.system.query;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Description: QueryCondition * QueryCondition
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
public class QueryCondition implements Serializable { public class QueryCondition implements Serializable {

15
src/main/java/cc/niushuai/bastionserver/common/system/query/QueryGenerator.java

@ -4,13 +4,9 @@ import cc.niushuai.bastionserver.common.constant.CommonConstant;
import cc.niushuai.bastionserver.common.constant.DataBaseConstant; import cc.niushuai.bastionserver.common.constant.DataBaseConstant;
import cc.niushuai.bastionserver.common.constant.SymbolConstant; import cc.niushuai.bastionserver.common.constant.SymbolConstant;
import cc.niushuai.bastionserver.common.exception.BusinessException; import cc.niushuai.bastionserver.common.exception.BusinessException;
import cc.niushuai.bastionserver.common.system.util.JeecgDataAutorUtils; import cc.niushuai.bastionserver.common.system.util.PermissionDataUtil;
import cc.niushuai.bastionserver.common.util.JwtUtil;
import cc.niushuai.bastionserver.common.system.vo.SysPermissionDataRuleModel; import cc.niushuai.bastionserver.common.system.vo.SysPermissionDataRuleModel;
import cc.niushuai.bastionserver.common.util.CommonUtils; import cc.niushuai.bastionserver.common.util.*;
import cc.niushuai.bastionserver.common.util.DateUtils;
import cc.niushuai.bastionserver.common.util.SqlInjectionUtil;
import cc.niushuai.bastionserver.common.util.oConvertUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -31,7 +27,8 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @Description: 查询生成器 * 查询生成器
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Slf4j @Slf4j
@ -737,7 +734,7 @@ public class QueryGenerator {
*/ */
public static Map<String, SysPermissionDataRuleModel> getRuleMap() { public static Map<String, SysPermissionDataRuleModel> getRuleMap() {
Map<String, SysPermissionDataRuleModel> ruleMap = new HashMap<>(5); Map<String, SysPermissionDataRuleModel> ruleMap = new HashMap<>(5);
List<SysPermissionDataRuleModel> list = JeecgDataAutorUtils.loadDataSearchConditon(); List<SysPermissionDataRuleModel> list = PermissionDataUtil.loadDataSearchConditon();
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
if (list.get(0) == null) { if (list.get(0) == null) {
return ruleMap; return ruleMap;
@ -787,7 +784,7 @@ public class QueryGenerator {
/** /**
* @param ruleValue: * @param ruleValue:
* @author: scott * @author: scott
* @Description: 去掉值前后单引号 * 去掉值前后单引号
* @date: 2020/3/19 21:26 * @date: 2020/3/19 21:26
* @Return: java.lang.String * @Return: java.lang.String
*/ */

6
src/main/java/cc/niushuai/bastionserver/common/system/util/JeecgDataAutorUtils.java → src/main/java/cc/niushuai/bastionserver/common/system/util/PermissionDataUtil.java

@ -10,12 +10,12 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* @ClassName: JeecgDataAutorUtils * @ClassName: PermissionDataUtil
* @Description: 数据权限查询规则容器工具类 * 数据权限查询规则容器工具类
* @Author: 张代浩 * @Author: 张代浩
* @Date: 2012-12-15 下午11:27:39 * @Date: 2012-12-15 下午11:27:39
*/ */
public class JeecgDataAutorUtils { public class PermissionDataUtil {
public static final String MENU_DATA_AUTHOR_RULES = "MENU_DATA_AUTHOR_RULES"; public static final String MENU_DATA_AUTHOR_RULES = "MENU_DATA_AUTHOR_RULES";

3
src/main/java/cc/niushuai/bastionserver/common/system/vo/ComboModel.java

@ -8,7 +8,8 @@ import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Description: 文档管理 * 文档管理
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data

4
src/main/java/cc/niushuai/bastionserver/common/system/vo/DictModel.java

@ -8,7 +8,8 @@ import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Description: 字典类 * 字典类
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data
@ -28,6 +29,7 @@ public class DictModel implements Serializable {
public DictModel() { public DictModel() {
} }
public DictModel(String value, String text) { public DictModel(String value, String text) {
this.value = value; this.value = value;
this.text = text; this.text = text;

4
src/main/java/cc/niushuai/bastionserver/common/system/vo/DynamicDataSourceModel.java

@ -4,7 +4,8 @@ import lombok.Data;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
/** /**
* @Description: 数据源 * 数据源
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data
@ -47,6 +48,7 @@ public class DynamicDataSourceModel {
public DynamicDataSourceModel() { public DynamicDataSourceModel() {
} }
public DynamicDataSourceModel(Object dbSource) { public DynamicDataSourceModel(Object dbSource) {
if (dbSource != null) { if (dbSource != null) {
BeanUtils.copyProperties(dbSource, this); BeanUtils.copyProperties(dbSource, this);

1
src/main/java/cc/niushuai/bastionserver/common/system/vo/SysCategoryModel.java

@ -3,7 +3,6 @@ package cc.niushuai.bastionserver.common.system.vo;
/** /**
* @Author qinfeng * @Author qinfeng
* @Date 2020/2/19 12:01 * @Date 2020/2/19 12:01
* @Description:
* @Version 1.0 * @Version 1.0
*/ */
public class SysCategoryModel { public class SysCategoryModel {

3
src/main/java/cc/niushuai/bastionserver/common/system/vo/SysFilesModel.java

@ -2,7 +2,8 @@ package cc.niushuai.bastionserver.common.system.vo;
/** /**
* @Description: 系统文件实体类 * 系统文件实体类
*
* @author: wangshuai * @author: wangshuai
* @date: 2022年08月11日 9:48 * @date: 2022年08月11日 9:48
*/ */

3
src/main/java/cc/niushuai/bastionserver/common/system/vo/SysUserCacheInfo.java

@ -5,7 +5,8 @@ import cc.niushuai.bastionserver.common.util.DateUtils;
import java.util.List; import java.util.List;
/** /**
* @Description: 用户缓存信息 * 用户缓存信息
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
public class SysUserCacheInfo { public class SysUserCacheInfo {

3
src/main/java/cc/niushuai/bastionserver/common/util/CommonUtils.java

@ -30,7 +30,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
* @Description: 通用工具 * 通用工具
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Slf4j @Slf4j

9
src/main/java/cc/niushuai/bastionserver/common/util/DySmsEnum.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.util;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
/** /**
* @Description: 短信枚举类 * 短信枚举类
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
public enum DySmsEnum { public enum DySmsEnum {
@ -11,15 +12,15 @@ public enum DySmsEnum {
/** /**
* 登录短信模板编码 * 登录短信模板编码
*/ */
LOGIN_TEMPLATE_CODE("SMS_175435174", "JEECG", "code"), LOGIN_TEMPLATE_CODE("", "", ""),
/** /**
* 忘记密码短信模板编码 * 忘记密码短信模板编码
*/ */
FORGET_PASSWORD_TEMPLATE_CODE("SMS_175435174", "JEECG", "code"), FORGET_PASSWORD_TEMPLATE_CODE("", "", ""),
/** /**
* 注册账号短信模板编码 * 注册账号短信模板编码
*/ */
REGISTER_TEMPLATE_CODE("SMS_175430166", "JEECG", "code"), REGISTER_TEMPLATE_CODE("", "", ""),
/** /**
* 会议通知 * 会议通知
*/ */

4
src/main/java/cc/niushuai/bastionserver/common/util/JwtUtil.java

@ -5,7 +5,7 @@ import cc.niushuai.bastionserver.common.constant.CommonConstant;
import cc.niushuai.bastionserver.common.constant.DataBaseConstant; import cc.niushuai.bastionserver.common.constant.DataBaseConstant;
import cc.niushuai.bastionserver.common.constant.SymbolConstant; import cc.niushuai.bastionserver.common.constant.SymbolConstant;
import cc.niushuai.bastionserver.common.exception.BusinessException; import cc.niushuai.bastionserver.common.exception.BusinessException;
import cc.niushuai.bastionserver.common.system.util.JeecgDataAutorUtils; import cc.niushuai.bastionserver.common.system.util.PermissionDataUtil;
import cc.niushuai.bastionserver.common.system.vo.LoginUser; import cc.niushuai.bastionserver.common.system.vo.LoginUser;
import cc.niushuai.bastionserver.common.system.vo.SysUserCacheInfo; import cc.niushuai.bastionserver.common.system.vo.SysUserCacheInfo;
import com.auth0.jwt.JWT; import com.auth0.jwt.JWT;
@ -165,7 +165,7 @@ public class JwtUtil {
*/ */
public static String getUserSystemData(String key, SysUserCacheInfo user) { public static String getUserSystemData(String key, SysUserCacheInfo user) {
if (user == null) { if (user == null) {
user = JeecgDataAutorUtils.loadUserInfo(); user = PermissionDataUtil.loadUserInfo();
} }
//#{sys_user_code}% //#{sys_user_code}%

3
src/main/java/cc/niushuai/bastionserver/common/util/Md5Util.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.util;
import java.security.MessageDigest; import java.security.MessageDigest;
/** /**
* @Description: 加密工具 * 加密工具
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
public class Md5Util { public class Md5Util {

3
src/main/java/cc/niushuai/bastionserver/common/util/PasswordUtil.java

@ -9,7 +9,8 @@ import java.security.Key;
import java.security.SecureRandom; import java.security.SecureRandom;
/** /**
* @Description: 密码工具类 * 密码工具类
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
public class PasswordUtil { public class PasswordUtil {

5
src/main/java/cc/niushuai/bastionserver/common/util/PmsUtil.java

@ -11,7 +11,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @Description: PmsUtil * PmsUtil
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Slf4j @Slf4j
@ -57,7 +58,7 @@ public class PmsUtil {
return saveDir + name + ".txt"; return saveDir + name + ".txt";
} }
@Value("${jeecg.path.upload}") @Value("${app.path.upload}")
public void setUploadPath(String uploadPath) { public void setUploadPath(String uploadPath) {
PmsUtil.uploadPath = uploadPath; PmsUtil.uploadPath = uploadPath;
} }

1
src/main/java/cc/niushuai/bastionserver/common/util/ResourceUtil.java

@ -2,7 +2,6 @@ package cc.niushuai.bastionserver.common.util;
import cc.niushuai.bastionserver.common.system.annotation.EnumDict; import cc.niushuai.bastionserver.common.system.annotation.EnumDict;
import cc.niushuai.bastionserver.common.system.vo.DictModel; import cc.niushuai.bastionserver.common.system.vo.DictModel;
import cc.niushuai.bastionserver.common.util.oConvertUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PathMatchingResourcePatternResolver;

6
src/main/java/cc/niushuai/bastionserver/common/util/RestUtil.java

@ -1,6 +1,6 @@
package cc.niushuai.bastionserver.common.util; package cc.niushuai.bastionserver.common.util;
import cc.niushuai.bastionserver.config.JeecgBaseConfig; import cc.niushuai.bastionserver.config.AppConfig;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -68,8 +68,8 @@ public class RestUtil {
//定时任务情况下,通过request是获取不到domain的,这种情况下通过配置获取pc后台域名 //定时任务情况下,通过request是获取不到domain的,这种情况下通过配置获取pc后台域名
if (oConvertUtils.isEmpty(basepath)) { if (oConvertUtils.isEmpty(basepath)) {
JeecgBaseConfig jeecgBaseConfig = SpringContextUtils.getBean(JeecgBaseConfig.class); AppConfig appConfig = SpringContextUtils.getBean(AppConfig.class);
basepath = jeecgBaseConfig.getDomainUrl().getPc(); basepath = appConfig.getDomainUrl().getPc();
} }
log.info(" RestUtil.getBaseUrl: " + basepath); log.info(" RestUtil.getBaseUrl: " + basepath);
return basepath; return basepath;

3
src/main/java/cc/niushuai/bastionserver/common/util/SpringContextUtils.java

@ -13,7 +13,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* @Description: spring上下文工具类 * spring上下文工具类
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Component @Component

12
src/main/java/cc/niushuai/bastionserver/common/util/TokenUtils.java

@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletRequest;
/** /**
* @Author scott * @Author scott
* @Date 2019/9/23 14:12 * @Date 2019/9/23 14:12
* @Description: 编程校验token有效性 * 编程校验token有效性
*/ */
@Slf4j @Slf4j
public class TokenUtils { public class TokenUtils {
@ -47,28 +47,28 @@ public class TokenUtils {
*/ */
public static boolean verifyToken(String token, CommonAPI commonApi, RedisUtil redisUtil) { public static boolean verifyToken(String token, CommonAPI commonApi, RedisUtil redisUtil) {
if (StrUtil.isEmpty(token)) { if (StrUtil.isEmpty(token)) {
throw new BusinessException(401,"token不能为空!"); throw new BusinessException(401, "token不能为空!");
} }
// 解密获得username,用于和数据库进行对比 // 解密获得username,用于和数据库进行对比
String username = JwtUtil.getUsername(token); String username = JwtUtil.getUsername(token);
if (username == null) { if (username == null) {
throw new BusinessException(401,"token非法无效!"); throw new BusinessException(401, "token非法无效!");
} }
// 查询用户信息 // 查询用户信息
LoginUser user = TokenUtils.getLoginUser(username, commonApi, redisUtil); LoginUser user = TokenUtils.getLoginUser(username, commonApi, redisUtil);
//LoginUser user = commonApi.getUserByName(username); //LoginUser user = commonApi.getUserByName(username);
if (user == null) { if (user == null) {
throw new BusinessException(401,"用户不存在!"); throw new BusinessException(401, "用户不存在!");
} }
// 判断用户状态 // 判断用户状态
if (user.getStatus() != 1) { if (user.getStatus() != 1) {
throw new BusinessException(401,"账号已被锁定,请联系管理员!"); throw new BusinessException(401, "账号已被锁定,请联系管理员!");
} }
// 校验token是否超时失效 & 或者账号密码是否错误 // 校验token是否超时失效 & 或者账号密码是否错误
if (!jwtTokenRefresh(token, username, user.getPassword(), redisUtil)) { if (!jwtTokenRefresh(token, username, user.getPassword(), redisUtil)) {
throw new BusinessException(401,CommonConstant.TOKEN_IS_INVALID_MSG); throw new BusinessException(401, CommonConstant.TOKEN_IS_INVALID_MSG);
} }
return true; return true;
} }

3
src/main/java/cc/niushuai/bastionserver/common/util/dynamic/db/FreemarkerParseFactory.java

@ -17,8 +17,7 @@ import java.util.regex.Pattern;
/** /**
* @author 赵俊夫 * @author 赵俊夫
* @version V1.0 * @version V1.0
* @Title:FreemarkerHelper * @Title:FreemarkerHelper Freemarker引擎协助类
* @description:Freemarker引擎协助类
* @date Jul 5, 2013 2:58:29 PM * @date Jul 5, 2013 2:58:29 PM
*/ */
@Slf4j @Slf4j

3
src/main/java/cc/niushuai/bastionserver/common/util/encryption/AesEncryptUtil.java

@ -7,7 +7,8 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
/** /**
* @Description: AES 加密 * AES 加密
*
* @author: jeecg-boot * @author: jeecg-boot
* @date: 2022/3/30 11:48 * @date: 2022/3/30 11:48
*/ */

3
src/main/java/cc/niushuai/bastionserver/common/util/encryption/EncryptedString.java

@ -4,7 +4,8 @@ package cc.niushuai.bastionserver.common.util.encryption;
import lombok.Data; import lombok.Data;
/** /**
* @Description: EncryptedString * EncryptedString
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data

3
src/main/java/cc/niushuai/bastionserver/common/util/filter/FileTypeFilter.java

@ -8,7 +8,8 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
/** /**
* @Description: 校验上传文件敏感后缀 * 校验上传文件敏感后缀
*
* @author: lsq * @author: lsq
* @date: 2021年08月09日 15:29 * @date: 2021年08月09日 15:29
*/ */

3
src/main/java/cc/niushuai/bastionserver/common/util/oss/OssBootUtil.java

@ -24,7 +24,8 @@ import java.util.Date;
import java.util.UUID; import java.util.UUID;
/** /**
* @Description: 阿里云 oss 上传工具类(高依赖版) * 阿里云 oss 上传工具类(高依赖版)
*
* @Date: 2019/5/10 * @Date: 2019/5/10
* @author: jeecg-boot * @author: jeecg-boot
*/ */

3
src/main/java/cc/niushuai/bastionserver/common/util/security/SecurityTools.java

@ -15,7 +15,8 @@ import javax.crypto.SecretKey;
import java.security.KeyPair; import java.security.KeyPair;
/** /**
* @Description: SecurityTools * SecurityTools
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
public class SecurityTools { public class SecurityTools {

3
src/main/java/cc/niushuai/bastionserver/common/util/security/entity/MyKeyPair.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.util.security.entity;
import lombok.Data; import lombok.Data;
/** /**
* @Description: MyKeyPair * MyKeyPair
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data

3
src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityReq.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.util.security.entity;
import lombok.Data; import lombok.Data;
/** /**
* @Description: SecurityReq * SecurityReq
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data

3
src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityResp.java

@ -4,7 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
/** /**
* @Description: SecurityResp * SecurityResp
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data

3
src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignReq.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.util.security.entity;
import lombok.Data; import lombok.Data;
/** /**
* @Description: SecuritySignReq * SecuritySignReq
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data

3
src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignResp.java

@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.util.security.entity;
import lombok.Data; import lombok.Data;
/** /**
* @Description: SecuritySignResp * SecuritySignResp
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Data @Data

2
src/main/java/cc/niushuai/bastionserver/common/util/superSearch/QueryRuleVo.java

@ -3,7 +3,7 @@ package cc.niushuai.bastionserver.common.util.superSearch;//package cc.niushuai.
//import lombok.Data; //import lombok.Data;
// //
///** ///**
// * @Description: QueryRuleVo // * QueryRuleVo
// * @author: jeecg-boot // * @author: jeecg-boot
// */ // */
//@Data //@Data

6
src/main/java/cc/niushuai/bastionserver/config/JeecgBaseConfig.java → src/main/java/cc/niushuai/bastionserver/config/AppConfig.java

@ -12,9 +12,9 @@ import org.springframework.stereotype.Component;
* *
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Component("jeecgBaseConfig") @Component
@ConfigurationProperties(prefix = "jeecg") @ConfigurationProperties(prefix = "app")
public class JeecgBaseConfig { public class AppConfig {
/** /**
* 签名密钥串(字典等敏感接口) * 签名密钥串(字典等敏感接口)
* *

2
src/main/java/cc/niushuai/bastionserver/config/AutoPoiConfig.java

@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
/** /**
* @Author: Scott * @Author: Scott
* @Date: 2018/2/7 * @Date: 2018/2/7
* @description: autopoi 配置类 * autopoi 配置类
*/ */
@Configuration @Configuration

3
src/main/java/cc/niushuai/bastionserver/config/DruidConfig.java

@ -14,7 +14,8 @@ import javax.servlet.*;
import java.io.IOException; import java.io.IOException;
/** /**
* @Description: DruidConfig配置类 * DruidConfig配置类
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Configuration @Configuration

6
src/main/java/cc/niushuai/bastionserver/config/StaticConfig.java

@ -13,10 +13,10 @@ import org.springframework.stereotype.Component;
@Data @Data
public class StaticConfig { public class StaticConfig {
@Value("${jeecg.oss.accessKey}") @Value("${app.oss.accessKey}")
private String accessKeyId; private String accessKeyId;
@Value("${jeecg.oss.secretKey}") @Value("${app.oss.secretKey}")
private String accessKeySecret; private String accessKeySecret;
@Value(value = "${spring.mail.username}") @Value(value = "${spring.mail.username}")
@ -25,7 +25,7 @@ public class StaticConfig {
// /** // /**
// * 签名密钥串 // * 签名密钥串
// */ // */
// @Value(value = "${jeecg.signatureSecret}") // @Value(value = "${app.signatureSecret}")
// private String signatureSecret; // private String signatureSecret;

2
src/main/java/cc/niushuai/bastionserver/config/Swagger2Config.java

@ -22,7 +22,6 @@ import springfox.documentation.builders.RequestParameterBuilder;
import springfox.documentation.schema.ScalarType; import springfox.documentation.schema.ScalarType;
import springfox.documentation.service.*; import springfox.documentation.service.*;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.OperationContext;
import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider; import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
@ -33,7 +32,6 @@ import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**

10
src/main/java/cc/niushuai/bastionserver/config/WebMvcConfiguration.java

@ -46,7 +46,7 @@ import java.util.List;
public class WebMvcConfiguration implements WebMvcConfigurer { public class WebMvcConfiguration implements WebMvcConfigurer {
@Resource @Resource
JeecgBaseConfig jeecgBaseConfig; AppConfig appConfig;
@Value("${spring.resource.static-locations:}") @Value("${spring.resource.static-locations:}")
private String staticLocations; private String staticLocations;
@ -59,10 +59,10 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/**") registry.addResourceHandler("/**")
//update-begin-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 //update-begin-author:taoyan date:20211116 for: app.path.webapp配置无效 #3126
.addResourceLocations("file:" + jeecgBaseConfig.getPath().getUpload() + "//") .addResourceLocations("file:" + appConfig.getPath().getUpload() + "//")
.addResourceLocations("file:" + jeecgBaseConfig.getPath().getWebapp() + "//") .addResourceLocations("file:" + appConfig.getPath().getWebapp() + "//")
//update-end-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 //update-end-author:taoyan date:20211116 for: app.path.webapp配置无效 #3126
.addResourceLocations(staticLocations.split(",")); .addResourceLocations(staticLocations.split(","));
} }

3
src/main/java/cc/niushuai/bastionserver/config/WebSocketConfig.java

@ -7,7 +7,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter; import org.springframework.web.socket.server.standard.ServerEndpointExporter;
/** /**
* @Description: WebSocketConfig * WebSocketConfig
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Configuration @Configuration

3
src/main/java/cc/niushuai/bastionserver/config/init/TomcatFactoryConfig.java

@ -7,7 +7,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
/** /**
* @Description: TomcatFactoryConfig * TomcatFactoryConfig
*
* @author: scott * @author: scott
* @date: 2021年01月25日 11:40 * @date: 2021年01月25日 11:40
*/ */

2
src/main/java/cc/niushuai/bastionserver/config/mybatis/MybatisPlusSaasConfig.java

@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* 单数据源配置jeecg.datasource.open = false时生效 * 单数据源配置app.datasource.open = false时生效
* *
* @Author zhoujf * @Author zhoujf
*/ */

3
src/main/java/cc/niushuai/bastionserver/config/mybatis/ThreadLocalDataHelper.java

@ -7,7 +7,8 @@ import java.util.concurrent.ConcurrentHashMap;
/** /**
* @Description: 本地线程变量存储工具类 * 本地线程变量存储工具类
*
* @author: lsq * @author: lsq
* @date: 2022年03月25日 11:42 * @date: 2022年03月25日 11:42
*/ */

2
src/main/java/cc/niushuai/bastionserver/config/mybatis/aspect/DynamicTableAspect.java

@ -6,10 +6,8 @@ import cc.niushuai.bastionserver.common.util.SpringContextUtils;
import cc.niushuai.bastionserver.config.mybatis.ThreadLocalDataHelper; import cc.niushuai.bastionserver.config.mybatis.ThreadLocalDataHelper;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method; import java.lang.reflect.Method;

8
src/main/java/cc/niushuai/bastionserver/config/oss/MinioConfig.java

@ -16,13 +16,13 @@ import org.springframework.context.annotation.Configuration;
@Slf4j @Slf4j
@Configuration @Configuration
public class MinioConfig { public class MinioConfig {
@Value(value = "${jeecg.minio.minio_url}") @Value(value = "${app.minio.minio_url}")
private String minioUrl; private String minioUrl;
@Value(value = "${jeecg.minio.minio_name}") @Value(value = "${app.minio.minio_name}")
private String minioName; private String minioName;
@Value(value = "${jeecg.minio.minio_pass}") @Value(value = "${app.minio.minio_pass}")
private String minioPass; private String minioPass;
@Value(value = "${jeecg.minio.bucketName}") @Value(value = "${app.minio.bucketName}")
private String bucketName; private String bucketName;
@Bean @Bean

10
src/main/java/cc/niushuai/bastionserver/config/oss/OssConfiguration.java

@ -13,15 +13,15 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class OssConfiguration { public class OssConfiguration {
@Value("${jeecg.oss.endpoint}") @Value("${app.oss.endpoint}")
private String endpoint; private String endpoint;
@Value("${jeecg.oss.accessKey}") @Value("${app.oss.accessKey}")
private String accessKeyId; private String accessKeyId;
@Value("${jeecg.oss.secretKey}") @Value("${app.oss.secretKey}")
private String accessKeySecret; private String accessKeySecret;
@Value("${jeecg.oss.bucketName}") @Value("${app.oss.bucketName}")
private String bucketName; private String bucketName;
@Value("${jeecg.oss.staticDomain:}") @Value("${app.oss.staticDomain:}")
private String staticDomain; private String staticDomain;
@Bean @Bean

10
src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroConfig.java

@ -2,7 +2,7 @@ package cc.niushuai.bastionserver.config.shiro;
import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.constant.CommonConstant;
import cc.niushuai.bastionserver.common.util.oConvertUtils; import cc.niushuai.bastionserver.common.util.oConvertUtils;
import cc.niushuai.bastionserver.config.JeecgBaseConfig; import cc.niushuai.bastionserver.config.AppConfig;
import cc.niushuai.bastionserver.config.shiro.filters.CustomShiroFilterFactoryBean; import cc.niushuai.bastionserver.config.shiro.filters.CustomShiroFilterFactoryBean;
import cc.niushuai.bastionserver.config.shiro.filters.JwtFilter; import cc.niushuai.bastionserver.config.shiro.filters.JwtFilter;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -36,7 +36,7 @@ import java.util.*;
/** /**
* @author: Scott * @author: Scott
* @date: 2018/2/7 * @date: 2018/2/7
* @description: shiro 配置类 * shiro 配置类
*/ */
@Slf4j @Slf4j
@ -48,7 +48,7 @@ public class ShiroConfig {
@Autowired @Autowired
private Environment env; private Environment env;
@Resource @Resource
private JeecgBaseConfig jeecgBaseConfig; private AppConfig appConfig;
@Bean @Bean
public static LifecycleBeanPostProcessor lifecycleBeanPostProcessor() { public static LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
@ -70,8 +70,8 @@ public class ShiroConfig {
Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>(); Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>();
//支持yml方式,配置拦截排除 //支持yml方式,配置拦截排除
if (jeecgBaseConfig != null && jeecgBaseConfig.getShiro() != null) { if (appConfig != null && appConfig.getShiro() != null) {
String shiroExcludeUrls = jeecgBaseConfig.getShiro().getExcludeUrls(); String shiroExcludeUrls = appConfig.getShiro().getExcludeUrls();
if (oConvertUtils.isNotEmpty(shiroExcludeUrls)) { if (oConvertUtils.isNotEmpty(shiroExcludeUrls)) {
String[] permissionUrl = shiroExcludeUrls.split(","); String[] permissionUrl = shiroExcludeUrls.split(",");
for (String url : permissionUrl) { for (String url : permissionUrl) {

9
src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroRealm.java

@ -3,12 +3,8 @@ package cc.niushuai.bastionserver.config.shiro;
import cc.niushuai.bastionserver.common.api.CommonAPI; import cc.niushuai.bastionserver.common.api.CommonAPI;
import cc.niushuai.bastionserver.common.config.TenantContext; import cc.niushuai.bastionserver.common.config.TenantContext;
import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.constant.CommonConstant;
import cc.niushuai.bastionserver.common.util.JwtUtil;
import cc.niushuai.bastionserver.common.system.vo.LoginUser; import cc.niushuai.bastionserver.common.system.vo.LoginUser;
import cc.niushuai.bastionserver.common.util.RedisUtil; import cc.niushuai.bastionserver.common.util.*;
import cc.niushuai.bastionserver.common.util.SpringContextUtils;
import cc.niushuai.bastionserver.common.util.TokenUtils;
import cc.niushuai.bastionserver.common.util.oConvertUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationInfo;
@ -26,7 +22,8 @@ import javax.servlet.http.HttpServletRequest;
import java.util.Set; import java.util.Set;
/** /**
* @Description: 用户登录鉴权和获取用户授权 * 用户登录鉴权和获取用户授权
*
* @Author: Scott * @Author: Scott
* @Date: 2019-4-23 8:13 * @Date: 2019-4-23 8:13
* @Version: 1.1 * @Version: 1.1

3
src/main/java/cc/niushuai/bastionserver/config/shiro/filters/JwtFilter.java

@ -18,7 +18,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* @Description: 鉴权登录拦截器 * 鉴权登录拦截器
*
* @Author: Scott * @Author: Scott
* @Date: 2018/10/7 * @Date: 2018/10/7
**/ **/

8
src/main/java/cc/niushuai/bastionserver/config/sign/interceptor/SignAuthConfiguration.java

@ -1,7 +1,7 @@
package cc.niushuai.bastionserver.config.sign.interceptor; package cc.niushuai.bastionserver.config.sign.interceptor;
import cc.niushuai.bastionserver.common.util.PathMatcherUtil; import cc.niushuai.bastionserver.common.util.PathMatcherUtil;
import cc.niushuai.bastionserver.config.JeecgBaseConfig; import cc.niushuai.bastionserver.config.AppConfig;
import cc.niushuai.bastionserver.config.filter.RequestBodyReserveFilter; import cc.niushuai.bastionserver.config.filter.RequestBodyReserveFilter;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
@ -20,7 +20,7 @@ import javax.annotation.Resource;
@Configuration @Configuration
public class SignAuthConfiguration implements WebMvcConfigurer { public class SignAuthConfiguration implements WebMvcConfigurer {
@Resource @Resource
JeecgBaseConfig jeecgBaseConfig; AppConfig appConfig;
@Bean @Bean
public SignAuthInterceptor signAuthInterceptor() { public SignAuthInterceptor signAuthInterceptor() {
@ -31,7 +31,7 @@ public class SignAuthConfiguration implements WebMvcConfigurer {
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
//------------------------------------------------------------ //------------------------------------------------------------
//查询需要进行签名拦截的接口 signUrls //查询需要进行签名拦截的接口 signUrls
String signUrls = jeecgBaseConfig.getSignUrls(); String signUrls = appConfig.getSignUrls();
String[] signUrlsArray = null; String[] signUrlsArray = null;
if (StrUtil.isNotBlank(signUrls)) { if (StrUtil.isNotBlank(signUrls)) {
signUrlsArray = signUrls.split(","); signUrlsArray = signUrls.split(",");
@ -55,7 +55,7 @@ public class SignAuthConfiguration implements WebMvcConfigurer {
registration.setName("requestBodyReserveFilter"); registration.setName("requestBodyReserveFilter");
//------------------------------------------------------------ //------------------------------------------------------------
//查询需要进行签名拦截的接口 signUrls //查询需要进行签名拦截的接口 signUrls
String signUrls = jeecgBaseConfig.getSignUrls(); String signUrls = appConfig.getSignUrls();
String[] signUrlsArray = null; String[] signUrlsArray = null;
if (StrUtil.isNotBlank(signUrls)) { if (StrUtil.isNotBlank(signUrls)) {
signUrlsArray = signUrls.split(","); signUrlsArray = signUrls.split(",");

8
src/main/java/cc/niushuai/bastionserver/config/sign/util/SignUtil.java

@ -4,7 +4,7 @@ import cc.niushuai.bastionserver.common.constant.SymbolConstant;
import cc.niushuai.bastionserver.common.exception.BusinessException; import cc.niushuai.bastionserver.common.exception.BusinessException;
import cc.niushuai.bastionserver.common.util.SpringContextUtils; import cc.niushuai.bastionserver.common.util.SpringContextUtils;
import cc.niushuai.bastionserver.common.util.oConvertUtils; import cc.niushuai.bastionserver.common.util.oConvertUtils;
import cc.niushuai.bastionserver.config.JeecgBaseConfig; import cc.niushuai.bastionserver.config.AppConfig;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -47,11 +47,11 @@ public class SignUtil {
String paramsJsonStr = JSONObject.toJSONString(params); String paramsJsonStr = JSONObject.toJSONString(params);
log.info("Param paramsJsonStr : {}", paramsJsonStr); log.info("Param paramsJsonStr : {}", paramsJsonStr);
//设置签名秘钥 //设置签名秘钥
JeecgBaseConfig jeecgBaseConfig = SpringContextUtils.getBean(JeecgBaseConfig.class); AppConfig appConfig = SpringContextUtils.getBean(AppConfig.class);
String signatureSecret = jeecgBaseConfig.getSignatureSecret(); String signatureSecret = appConfig.getSignatureSecret();
String curlyBracket = SymbolConstant.DOLLAR + SymbolConstant.LEFT_CURLY_BRACKET; String curlyBracket = SymbolConstant.DOLLAR + SymbolConstant.LEFT_CURLY_BRACKET;
if (oConvertUtils.isEmpty(signatureSecret) || signatureSecret.contains(curlyBracket)) { if (oConvertUtils.isEmpty(signatureSecret) || signatureSecret.contains(curlyBracket)) {
throw new BusinessException("签名密钥 ${jeecg.signatureSecret} 缺少配置 !!"); throw new BusinessException("签名密钥 ${app.signatureSecret} 缺少配置 !!");
} }
try { try {
//【issues/I484RW】2.4.6部署后,下拉搜索框提示“sign签名检验失败” //【issues/I484RW】2.4.6部署后,下拉搜索框提示“sign签名检验失败”

3
src/main/java/cc/niushuai/bastionserver/config/vo/Shiro.java

@ -1,7 +1,8 @@
package cc.niushuai.bastionserver.config.vo; package cc.niushuai.bastionserver.config.vo;
/** /**
* @Description: TODO * TODO
*
* @author: scott * @author: scott
* @date: 2022年01月21日 14:23 * @date: 2022年01月21日 14:23
*/ */

3
src/main/java/cc/niushuai/bastionserver/modules/base/mapper/BaseCommonMapper.java

@ -5,7 +5,8 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
* @Description: BaseCommonMapper * BaseCommonMapper
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
public interface BaseCommonMapper { public interface BaseCommonMapper {

3
src/main/java/cc/niushuai/bastionserver/modules/base/service/impl/BaseCommonServiceImpl.java

@ -17,7 +17,8 @@ import javax.servlet.http.HttpServletRequest;
import java.util.Date; import java.util.Date;
/** /**
* @Description: common实现类 * common实现类
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@Service @Service

3
src/main/java/cc/niushuai/bastionserver/modules/demo/mock/MockController.java

@ -18,7 +18,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @Description: MockController * MockController
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@RestController @RestController

3
src/main/java/cc/niushuai/bastionserver/modules/demo/mock/vxe/controller/VxeMockController.java

@ -25,7 +25,8 @@ import java.net.URLDecoder;
import java.util.*; import java.util.*;
/** /**
* @Description: VxeMockController * VxeMockController
*
* @author: jeecg-boot * @author: jeecg-boot
*/ */
@RestController @RestController

5
src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDemoController.java

@ -3,8 +3,8 @@ package cc.niushuai.bastionserver.modules.demo.test.controller;
import cc.niushuai.bastionserver.common.api.vo.Result; import cc.niushuai.bastionserver.common.api.vo.Result;
import cc.niushuai.bastionserver.common.aspect.annotation.AutoLog; import cc.niushuai.bastionserver.common.aspect.annotation.AutoLog;
import cc.niushuai.bastionserver.common.aspect.annotation.PermissionData; import cc.niushuai.bastionserver.common.aspect.annotation.PermissionData;
import cc.niushuai.bastionserver.common.constant.CommonConstant;
import cc.niushuai.bastionserver.common.base.controller.BaseController; import cc.niushuai.bastionserver.common.base.controller.BaseController;
import cc.niushuai.bastionserver.common.constant.CommonConstant;
import cc.niushuai.bastionserver.common.system.query.QueryGenerator; import cc.niushuai.bastionserver.common.system.query.QueryGenerator;
import cc.niushuai.bastionserver.common.util.DateUtils; import cc.niushuai.bastionserver.common.util.DateUtils;
import cc.niushuai.bastionserver.common.util.RedisUtil; import cc.niushuai.bastionserver.common.util.RedisUtil;
@ -33,7 +33,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @Description: 单表示例 * 单表示例
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date:2018-12-29 * @Date:2018-12-29
* @Version:V2.0 * @Version:V2.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDynamicDataController.java

@ -18,7 +18,8 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
/** /**
* @Description: 动态数据源测试 * 动态数据源测试
*
* @Author: zyf * @Author: zyf
* @Date:2020-04-21 * @Date:2020-04-21
*/ */

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseOrderMainController.java

@ -36,7 +36,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @Description: 一对多示例JEditableTable行编辑 * 一对多示例JEditableTable行编辑
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date:2019-02-15 * @Date:2019-02-15
* @Version: V2.0 * @Version: V2.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BigScreenTemplatController.java

@ -12,7 +12,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* @Description: 大屏预览入口 * 大屏预览入口
*
* @Author: scott * @Author: scott
* @Date:2019-12-12 * @Date:2019-12-12
* @Version:V1.0 * @Version:V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/JeecgOrderErpMainController.java

@ -21,7 +21,8 @@ import javax.servlet.http.HttpServletRequest;
import java.util.Arrays; import java.util.Arrays;
/** /**
* @Description: 一对多示例ERP TAB风格 * 一对多示例ERP TAB风格
*
* @Author: ZhiLin * @Author: ZhiLin
* @Date: 2019-02-20 * @Date: 2019-02-20
* @Version: v2.0 * @Version: v2.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/BaseDemo.java

@ -14,7 +14,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Description: jeecg 测试demo * jeecg 测试demo
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2018-12-29 * @Date: 2018-12-29
* @Version:V1.0 * @Version:V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderCustomer.java

@ -11,7 +11,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Description: 订单客户 * 订单客户
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderMain.java

@ -11,7 +11,8 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* @Description: 订单 * 订单
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderTicket.java

@ -11,7 +11,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Description: 订单机票 * 订单机票
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgDemoMapper.java

@ -9,7 +9,8 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
/** /**
* @Description: jeecg 测试demo * jeecg 测试demo
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2018-12-29 * @Date: 2018-12-29
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderCustomerMapper.java

@ -8,7 +8,8 @@ import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
/** /**
* @Description: 订单客户 * 订单客户
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderMainMapper.java

@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.demo.test.entity.JeecgOrderMain;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @Description: 订单 * 订单
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderTicketMapper.java

@ -8,7 +8,8 @@ import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
/** /**
* @Description: 订单机票 * 订单机票
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDemoService.java

@ -7,7 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List; import java.util.List;
/** /**
* @Description: jeecg 测试demo * jeecg 测试demo
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2018-12-29 * @Date: 2018-12-29
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDynamicDataService.java

@ -6,7 +6,8 @@ import cc.niushuai.bastionserver.modules.demo.test.entity.BaseDemo;
import java.util.List; import java.util.List;
/** /**
* @Description: 动态数据源测试 * 动态数据源测试
*
* @Author: zyf * @Author: zyf
* @Date:2020-04-21 * @Date:2020-04-21
*/ */

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderCustomerService.java

@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
/** /**
* @Description: 订单客户 * 订单客户
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderMainService.java

@ -10,7 +10,8 @@ import java.util.Collection;
import java.util.List; import java.util.List;
/** /**
* @Description: 订单 * 订单
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderTicketService.java

@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
/** /**
* @Description: 订单机票 * 订单机票
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDemoServiceImpl.java

@ -21,7 +21,8 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* @Description: jeecg 测试demo * jeecg 测试demo
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2018-12-29 * @Date: 2018-12-29
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDynamicDataServiceImpl.java

@ -9,7 +9,8 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* @Description: 动态数据源测试 * 动态数据源测试
*
* @Author: zyf * @Author: zyf
* @Date:2020-04-21 * @Date:2020-04-21
*/ */

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java

@ -10,7 +10,8 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* @Description: 订单客户 * 订单客户
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

3
src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java

@ -18,7 +18,8 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @Description: 订单 * 订单
*
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2019-02-15 * @Date: 2019-02-15
* @Version: V1.0 * @Version: V1.0

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save