From d9fa2fb9045b4825c3b15c26d06369ab060991ae Mon Sep 17 00:00:00 2001 From: niushuai233 Date: Thu, 29 Dec 2022 10:37:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/annotation/RabbitComponent.java | 5 +- .../bastionserver/common/api/vo/Result.java | 24 +-- .../common/aspect/AutoLogAspect.java | 2 +- .../common/aspect/DictAspect.java | 3 +- .../common/aspect/PermissionDataAspect.java | 8 +- .../common/aspect/UrlMatchEnum.java | 3 +- .../base/controller/BaseController.java | 5 +- .../common/base/entity/BaseEntity.java | 3 +- .../common/base/service/BaseService.java | 3 +- .../base/service/impl/BaseServiceImpl.java | 3 +- .../common/constant/CacheConstant.java | 3 +- .../common/constant/CommonConstant.java | 9 +- .../common/constant/GlobalConstants.java | 5 +- .../common/constant/SymbolConstant.java | 3 +- .../common/constant/WebsocketConst.java | 3 +- .../common/constant/enums/CgformEnum.java | 167 ------------------ .../constant/enums/OperateTypeEnum.java | 3 +- .../common/enums/SentinelErrorInfoEnum.java | 3 +- .../common/exception/BusinessException.java | 3 +- .../exception/GlobalExceptionHandler.java | 2 - ...JeecgRedisClient.java => RedisClient.java} | 5 +- .../modules/redis/config/RedisConfig.java | 3 - ...disListener.java => AppRedisListener.java} | 5 +- .../modules/redis/receiver/RedisReceiver.java | 4 +- .../common/system/query/QueryCondition.java | 3 +- .../common/system/query/QueryGenerator.java | 15 +- ...utorUtils.java => PermissionDataUtil.java} | 6 +- .../common/system/vo/ComboModel.java | 3 +- .../common/system/vo/DictModel.java | 4 +- .../system/vo/DynamicDataSourceModel.java | 4 +- .../common/system/vo/SysCategoryModel.java | 1 - .../common/system/vo/SysFilesModel.java | 3 +- .../common/system/vo/SysUserCacheInfo.java | 3 +- .../common/util/CommonUtils.java | 3 +- .../bastionserver/common/util/DySmsEnum.java | 9 +- .../bastionserver/common/util/JwtUtil.java | 4 +- .../bastionserver/common/util/Md5Util.java | 3 +- .../common/util/PasswordUtil.java | 3 +- .../bastionserver/common/util/PmsUtil.java | 5 +- .../common/util/ResourceUtil.java | 1 - .../bastionserver/common/util/RestUtil.java | 6 +- .../common/util/SpringContextUtils.java | 3 +- .../bastionserver/common/util/TokenUtils.java | 12 +- .../dynamic/db/FreemarkerParseFactory.java | 3 +- .../util/encryption/AesEncryptUtil.java | 3 +- .../util/encryption/EncryptedString.java | 3 +- .../common/util/filter/FileTypeFilter.java | 3 +- .../common/util/oss/OssBootUtil.java | 3 +- .../common/util/security/SecurityTools.java | 3 +- .../util/security/entity/MyKeyPair.java | 3 +- .../util/security/entity/SecurityReq.java | 3 +- .../util/security/entity/SecurityResp.java | 3 +- .../util/security/entity/SecuritySignReq.java | 3 +- .../security/entity/SecuritySignResp.java | 3 +- .../common/util/superSearch/QueryRuleVo.java | 2 +- .../{JeecgBaseConfig.java => AppConfig.java} | 6 +- .../bastionserver/config/AutoPoiConfig.java | 2 +- .../bastionserver/config/DruidConfig.java | 3 +- .../bastionserver/config/StaticConfig.java | 6 +- .../bastionserver/config/Swagger2Config.java | 2 - .../config/WebMvcConfiguration.java | 10 +- .../bastionserver/config/WebSocketConfig.java | 3 +- .../config/init/TomcatFactoryConfig.java | 3 +- .../config/mybatis/MybatisPlusSaasConfig.java | 2 +- .../config/mybatis/ThreadLocalDataHelper.java | 3 +- .../mybatis/aspect/DynamicTableAspect.java | 2 - .../bastionserver/config/oss/MinioConfig.java | 8 +- .../config/oss/OssConfiguration.java | 10 +- .../config/shiro/ShiroConfig.java | 10 +- .../config/shiro/ShiroRealm.java | 9 +- .../config/shiro/filters/JwtFilter.java | 3 +- .../interceptor/SignAuthConfiguration.java | 8 +- .../config/sign/util/SignUtil.java | 8 +- .../bastionserver/config/vo/Shiro.java | 3 +- .../modules/base/mapper/BaseCommonMapper.java | 3 +- .../service/impl/BaseCommonServiceImpl.java | 3 +- .../modules/demo/mock/MockController.java | 3 +- .../vxe/controller/VxeMockController.java | 3 +- .../test/controller/BaseDemoController.java | 5 +- .../controller/BaseDynamicDataController.java | 3 +- .../controller/BaseOrderMainController.java | 3 +- .../BigScreenTemplatController.java | 3 +- .../JeecgOrderErpMainController.java | 3 +- .../modules/demo/test/entity/BaseDemo.java | 3 +- .../demo/test/entity/JeecgOrderCustomer.java | 3 +- .../demo/test/entity/JeecgOrderMain.java | 3 +- .../demo/test/entity/JeecgOrderTicket.java | 3 +- .../demo/test/mapper/JeecgDemoMapper.java | 3 +- .../test/mapper/JeecgOrderCustomerMapper.java | 3 +- .../test/mapper/JeecgOrderMainMapper.java | 3 +- .../test/mapper/JeecgOrderTicketMapper.java | 3 +- .../demo/test/service/IBaseDemoService.java | 3 +- .../test/service/IBaseDynamicDataService.java | 3 +- .../service/IJeecgOrderCustomerService.java | 3 +- .../test/service/IJeecgOrderMainService.java | 3 +- .../service/IJeecgOrderTicketService.java | 3 +- .../service/impl/BaseDemoServiceImpl.java | 3 +- .../impl/BaseDynamicDataServiceImpl.java | 3 +- .../impl/JeecgOrderCustomerServiceImpl.java | 3 +- .../impl/JeecgOrderMainServiceImpl.java | 3 +- .../impl/JeecgOrderTicketServiceImpl.java | 3 +- .../demo/test/vo/JeecgOrderMainPage.java | 3 +- .../controller/SysMessageController.java | 3 +- .../SysMessageTemplateController.java | 5 +- .../controller/TestSocketController.java | 3 +- .../modules/message/entity/SysMessage.java | 3 +- .../message/entity/SysMessageTemplate.java | 3 +- .../message/handle/ISendMsgHandle.java | 3 +- .../message/handle/impl/DdSendMsgHandle.java | 3 +- .../handle/impl/EmailSendMsgHandle.java | 5 +- .../handle/impl/QywxSendMsgHandle.java | 3 +- .../message/handle/impl/SmsSendMsgHandle.java | 3 +- .../handle/impl/SystemSendMsgHandle.java | 3 +- .../message/handle/impl/WxSendMsgHandle.java | 3 +- .../message/mapper/SysMessageMapper.java | 3 +- .../mapper/SysMessageTemplateMapper.java | 3 +- .../message/service/ISysMessageService.java | 3 +- .../service/ISysMessageTemplateService.java | 3 +- .../service/impl/SysMessageServiceImpl.java | 3 +- .../impl/SysMessageTemplateServiceImpl.java | 3 +- .../message/websocket/SocketHandler.java | 4 +- .../modules/message/websocket/WebSocket.java | 10 +- .../controller/ActuatorRedisController.java | 3 +- .../modules/monitor/domain/RedisInfo.java | 3 +- .../modules/monitor/service/RedisService.java | 3 +- .../modules/oss/entity/OssFile.java | 3 +- .../modules/oss/mapper/OssFileMapper.java | 3 +- .../modules/oss/service/IOssFileService.java | 3 +- .../oss/service/impl/OssFileServiceImpl.java | 3 +- .../controller/QuartzJobController.java | 3 +- .../modules/quartz/entity/QuartzJob.java | 3 +- .../modules/quartz/job/AsyncJob.java | 3 +- .../quartz/mapper/QuartzJobMapper.java | 3 +- .../quartz/service/IQuartzJobService.java | 3 +- .../service/impl/QuartzJobServiceImpl.java | 3 +- .../system/controller/CommonController.java | 6 +- .../controller/DuplicateCheckController.java | 2 +- .../system/controller/LoginController.java | 9 +- .../controller/SysAnnouncementController.java | 8 +- .../SysAnnouncementSendController.java | 2 +- .../controller/SysCategoryController.java | 3 +- .../controller/SysCheckRuleController.java | 3 +- .../controller/SysCommentController.java | 7 +- .../controller/SysDataLogController.java | 3 +- .../controller/SysDataSourceController.java | 5 +- .../controller/SysDepartController.java | 4 +- .../SysDepartPermissionController.java | 5 +- .../controller/SysDepartRoleController.java | 5 +- .../system/controller/SysFilesController.java | 3 +- .../controller/SysFillRuleController.java | 3 +- .../controller/SysFormFileController.java | 3 +- .../controller/SysGatewayRouteController.java | 3 +- .../controller/SysPermissionController.java | 8 +- .../controller/SysPositionController.java | 3 +- .../controller/SysRoleIndexController.java | 3 +- .../controller/SysTenantController.java | 2 +- .../controller/SysUserAgentController.java | 4 +- .../system/controller/SysUserController.java | 7 +- .../controller/SysUserOnlineController.java | 5 +- .../controller/ThirdLoginController.java | 6 +- .../system/entity/SysAnnouncement.java | 3 +- .../system/entity/SysAnnouncementSend.java | 3 +- .../modules/system/entity/SysCategory.java | 3 +- .../modules/system/entity/SysCheckRule.java | 3 +- .../modules/system/entity/SysComment.java | 3 +- .../modules/system/entity/SysDataLog.java | 3 +- .../modules/system/entity/SysDataSource.java | 3 +- .../system/entity/SysDepartPermission.java | 3 +- .../modules/system/entity/SysDepartRole.java | 3 +- .../entity/SysDepartRolePermission.java | 3 +- .../system/entity/SysDepartRoleUser.java | 3 +- .../modules/system/entity/SysFiles.java | 3 +- .../modules/system/entity/SysFillRule.java | 3 +- .../modules/system/entity/SysFormFile.java | 3 +- .../system/entity/SysGatewayRoute.java | 3 +- .../modules/system/entity/SysPosition.java | 3 +- .../modules/system/entity/SysRoleIndex.java | 3 +- .../system/entity/SysThirdAccount.java | 3 +- .../modules/system/entity/SysUserAgent.java | 3 +- .../modules/system/entity/SysUserDepart.java | 3 +- .../system/mapper/SysAnnouncementMapper.java | 3 +- .../mapper/SysAnnouncementSendMapper.java | 3 +- .../system/mapper/SysCategoryMapper.java | 3 +- .../system/mapper/SysCheckRuleMapper.java | 3 +- .../system/mapper/SysCommentMapper.java | 3 +- .../system/mapper/SysDataLogMapper.java | 3 +- .../system/mapper/SysDataSourceMapper.java | 3 +- .../mapper/SysDepartPermissionMapper.java | 3 +- .../system/mapper/SysDepartRoleMapper.java | 3 +- .../mapper/SysDepartRolePermissionMapper.java | 3 +- .../mapper/SysDepartRoleUserMapper.java | 3 +- .../modules/system/mapper/SysFilesMapper.java | 3 +- .../system/mapper/SysFillRuleMapper.java | 3 +- .../system/mapper/SysFormFileMapper.java | 3 +- .../system/mapper/SysGatewayRouteMapper.java | 3 +- .../system/mapper/SysPositionMapper.java | 3 +- .../system/mapper/SysRoleIndexMapper.java | 3 +- .../system/mapper/SysTenantMapper.java | 3 +- .../system/mapper/SysThirdAccountMapper.java | 3 +- .../system/mapper/SysUserAgentMapper.java | 3 +- .../system/mapper/SysUserDepartMapper.java | 3 +- .../system/model/AnnouncementSendModel.java | 3 +- .../system/model/DuplicateCheckVo.java | 2 +- .../system/model/SysPermissionTree.java | 3 +- .../modules/system/rule/CategoryCodeRule.java | 2 +- .../modules/system/rule/OrgCodeRule.java | 2 +- .../service/ISysAnnouncementSendService.java | 3 +- .../service/ISysAnnouncementService.java | 3 +- .../system/service/ISysCategoryService.java | 3 +- .../system/service/ISysCheckRuleService.java | 3 +- .../system/service/ISysCommentService.java | 3 +- .../system/service/ISysDataLogService.java | 3 +- .../system/service/ISysDataSourceService.java | 3 +- .../service/ISysDepartPermissionService.java | 3 +- .../ISysDepartRolePermissionService.java | 3 +- .../system/service/ISysDepartRoleService.java | 3 +- .../service/ISysDepartRoleUserService.java | 3 +- .../system/service/ISysFilesService.java | 3 +- .../system/service/ISysFillRuleService.java | 3 +- .../system/service/ISysFormFileService.java | 3 +- .../service/ISysGatewayRouteService.java | 3 +- .../system/service/ISysPositionService.java | 3 +- .../system/service/ISysRoleIndexService.java | 3 +- .../system/service/ISysTenantService.java | 3 +- .../service/ISysThirdAccountService.java | 3 +- .../system/service/ISysUserAgentService.java | 3 +- .../service/impl/ImportFileServiceImpl.java | 4 +- .../impl/SysAnnouncementSendServiceImpl.java | 3 +- .../impl/SysAnnouncementServiceImpl.java | 3 +- .../system/service/impl/SysBaseApiImpl.java | 11 +- .../service/impl/SysCategoryServiceImpl.java | 3 +- .../service/impl/SysCheckRuleServiceImpl.java | 3 +- .../service/impl/SysCommentServiceImpl.java | 7 +- .../service/impl/SysDataLogServiceImpl.java | 3 +- .../impl/SysDataSourceServiceImpl.java | 3 +- .../impl/SysDepartPermissionServiceImpl.java | 3 +- .../SysDepartRolePermissionServiceImpl.java | 3 +- .../impl/SysDepartRoleServiceImpl.java | 3 +- .../impl/SysDepartRoleUserServiceImpl.java | 3 +- .../service/impl/SysDepartServiceImpl.java | 6 +- .../service/impl/SysDictServiceImpl.java | 2 +- .../service/impl/SysFilesServiceImpl.java | 3 +- .../service/impl/SysFillRuleServiceImpl.java | 3 +- .../service/impl/SysFormFileServiceImpl.java | 3 +- .../impl/SysGatewayRouteServiceImpl.java | 3 +- .../service/impl/SysPositionServiceImpl.java | 3 +- .../service/impl/SysRoleIndexServiceImpl.java | 3 +- .../service/impl/SysTenantServiceImpl.java | 3 +- .../impl/SysThirdAccountServiceImpl.java | 3 +- .../service/impl/SysUserAgentServiceImpl.java | 3 +- .../impl/ThirdAppDingtalkServiceImpl.java | 8 +- .../ThirdAppWechatEnterpriseServiceImpl.java | 16 +- .../modules/system/util/SecurityUtil.java | 3 +- .../modules/system/util/XssUtils.java | 3 +- .../modules/system/vo/SysCommentFileVo.java | 3 +- .../modules/system/vo/SysCommentVO.java | 3 +- .../modules/system/vo/SysDepartUsersVO.java | 3 +- .../modules/system/vo/SysDictPage.java | 3 +- .../modules/system/vo/SysUserDepVo.java | 1 - .../modules/system/vo/SysUserRoleVO.java | 3 +- src/main/resources/application-dev.yml | 108 +++++++++++ src/main/resources/application.yml | 3 - .../resources/config/application-jeecg.yml | 34 ---- .../resources/config/application-mail.yml | 12 -- .../resources/config/application-other.yml | 58 ------ src/main/resources/logback-spring.xml | 77 -------- 266 files changed, 682 insertions(+), 751 deletions(-) delete mode 100644 src/main/java/cc/niushuai/bastionserver/common/constant/enums/CgformEnum.java rename src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/{JeecgRedisClient.java => RedisClient.java} (92%) rename src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/{JeecgRedisListener.java => AppRedisListener.java} (78%) rename src/main/java/cc/niushuai/bastionserver/common/system/util/{JeecgDataAutorUtils.java => PermissionDataUtil.java} (96%) rename src/main/java/cc/niushuai/bastionserver/config/{JeecgBaseConfig.java => AppConfig.java} (95%) delete mode 100644 src/main/resources/config/application-jeecg.yml delete mode 100644 src/main/resources/config/application-mail.yml delete mode 100644 src/main/resources/config/application-other.yml delete mode 100644 src/main/resources/logback-spring.xml diff --git a/src/main/java/cc/niushuai/bastionserver/common/annotation/RabbitComponent.java b/src/main/java/cc/niushuai/bastionserver/common/annotation/RabbitComponent.java index 5c75a88..171e51e 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/annotation/RabbitComponent.java +++ b/src/main/java/cc/niushuai/bastionserver/common/annotation/RabbitComponent.java @@ -6,10 +6,11 @@ import org.springframework.stereotype.Component; import java.lang.annotation.*; /** + * 消息队列初始化注解 + * * @Author:zyf * @Date:2019-07-31 10:43 - * @Description: 消息队列初始化注解 - **/ + */ @Documented @Inherited @Target({ElementType.TYPE}) diff --git a/src/main/java/cc/niushuai/bastionserver/common/api/vo/Result.java b/src/main/java/cc/niushuai/bastionserver/common/api/vo/Result.java index 447ae5f..ee7d362 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/api/vo/Result.java +++ b/src/main/java/cc/niushuai/bastionserver/common/api/vo/Result.java @@ -70,14 +70,14 @@ public class Result implements Serializable { public static Result ok() { Result r = new Result(); r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); + r.setCode(CommonConstant.OK_200); return r; } public static Result ok(String msg) { Result r = new Result(); r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); + r.setCode(CommonConstant.OK_200); //Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D r.setResult((T) msg); r.setMessage(msg); @@ -87,7 +87,7 @@ public class Result implements Serializable { public static Result ok(T data) { Result r = new Result(); r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); + r.setCode(CommonConstant.OK_200); r.setResult(data); return r; } @@ -95,7 +95,7 @@ public class Result implements Serializable { public static Result OK() { Result r = new Result(); r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); + r.setCode(CommonConstant.OK_200); return r; } @@ -109,7 +109,7 @@ public class Result implements Serializable { public static Result OK(String msg) { Result r = new Result(); r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); + r.setCode(CommonConstant.OK_200); r.setMessage(msg); //Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D r.setResult((T) msg); @@ -119,7 +119,7 @@ public class Result implements Serializable { public static Result OK(T data) { Result r = new Result(); r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); + r.setCode(CommonConstant.OK_200); r.setResult(data); return r; } @@ -127,7 +127,7 @@ public class Result implements Serializable { public static Result OK(String msg, T data) { Result r = new Result(); r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); + r.setCode(CommonConstant.OK_200); r.setMessage(msg); r.setResult(data); return r; @@ -136,14 +136,14 @@ public class Result implements Serializable { public static Result error(String msg, T data) { Result r = new Result(); r.setSuccess(false); - r.setCode(CommonConstant.SC_INTERNAL_SERVER_ERROR_500); + r.setCode(CommonConstant.INTERNAL_SERVER_ERROR_500); r.setMessage(msg); r.setResult(data); return r; } public static Result error(String msg) { - return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg); + return error(CommonConstant.INTERNAL_SERVER_ERROR_500, msg); } public static Result error(int code, String msg) { @@ -158,19 +158,19 @@ public class Result implements Serializable { * 无权限访问返回结果 */ public static Result noauth(String msg) { - return error(CommonConstant.SC_JEECG_NO_AUTHZ, msg); + return error(CommonConstant.NO_AUTHZ, msg); } public Result success(String message) { this.message = message; - this.code = CommonConstant.SC_OK_200; + this.code = CommonConstant.OK_200; this.success = true; return this; } public Result error500(String message) { this.message = message; - this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500; + this.code = CommonConstant.INTERNAL_SERVER_ERROR_500; this.success = false; return this; } diff --git a/src/main/java/cc/niushuai/bastionserver/common/aspect/AutoLogAspect.java b/src/main/java/cc/niushuai/bastionserver/common/aspect/AutoLogAspect.java index cf7cd57..7871607 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/aspect/AutoLogAspect.java +++ b/src/main/java/cc/niushuai/bastionserver/common/aspect/AutoLogAspect.java @@ -130,7 +130,7 @@ public class AutoLogAspect { /** * @param request: request * @param joinPoint: joinPoint - * @Description: 获取请求参数 + * 获取请求参数 * @author: scott * @date: 2020/4/16 0:10 * @Return: java.lang.String diff --git a/src/main/java/cc/niushuai/bastionserver/common/aspect/DictAspect.java b/src/main/java/cc/niushuai/bastionserver/common/aspect/DictAspect.java index 9e772bf..57088f0 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/aspect/DictAspect.java +++ b/src/main/java/cc/niushuai/bastionserver/common/aspect/DictAspect.java @@ -29,7 +29,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** - * @Description: 字典aop类 + * 字典aop类 + * * @Author: dangzhenghui * @Date: 2019-3-17 21:50 * @Version: 1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/common/aspect/PermissionDataAspect.java b/src/main/java/cc/niushuai/bastionserver/common/aspect/PermissionDataAspect.java index 8d2a94d..88b0aa3 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/aspect/PermissionDataAspect.java +++ b/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.SymbolConstant; import cc.niushuai.bastionserver.common.system.query.QueryRuleEnum; -import cc.niushuai.bastionserver.common.system.util.JeecgDataAutorUtils; -import cc.niushuai.bastionserver.common.util.JwtUtil; +import cc.niushuai.bastionserver.common.system.util.PermissionDataUtil; import cc.niushuai.bastionserver.common.system.vo.SysPermissionDataRuleModel; 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.oConvertUtils; import lombok.extern.slf4j.Slf4j; @@ -75,10 +75,10 @@ public class PermissionDataAspect { List dataRules = commonApi.queryPermissionDataRule(component, requestPath, username); if (dataRules != null && dataRules.size() > 0) { //临时存储 - JeecgDataAutorUtils.installDataSearchConditon(request, dataRules); + PermissionDataUtil.installDataSearchConditon(request, dataRules); //TODO 微服务情况下也得支持缓存机制 SysUserCacheInfo userinfo = commonApi.getCacheUser(username); - JeecgDataAutorUtils.installUserInfo(request, userinfo); + PermissionDataUtil.installUserInfo(request, userinfo); } return point.proceed(); } diff --git a/src/main/java/cc/niushuai/bastionserver/common/aspect/UrlMatchEnum.java b/src/main/java/cc/niushuai/bastionserver/common/aspect/UrlMatchEnum.java index 13790d5..210bf5e 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/aspect/UrlMatchEnum.java +++ b/src/main/java/cc/niushuai/bastionserver/common/aspect/UrlMatchEnum.java @@ -3,7 +3,7 @@ package cc.niushuai.bastionserver.common.aspect; /** * @Author scott * @Date 2020/1/14 13:36 - * @Description: 请求URL与菜单路由URL转换规则（方便于采用菜单路由URL来配置数据权限规则） + * 请求URL与菜单路由URL转换规则（方便于采用菜单路由URL来配置数据权限规则） */ public enum UrlMatchEnum { /** @@ -39,6 +39,7 @@ public enum UrlMatchEnum { * 菜单路由 URL前缀 (对应菜单路径) */ private String matchUrl; + UrlMatchEnum(String url, String matchUrl) { this.url = url; this.matchUrl = matchUrl; diff --git a/src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java b/src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java index c59ef94..72a210f 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java +++ b/src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java @@ -29,7 +29,8 @@ import java.io.IOException; import java.util.*; /** - * @Description: Controller基类 + * Controller基类 + * * @Author: dangzhenghui@163.com * @Date: 2019-4-21 8:13 * @Version: 1.0 @@ -42,7 +43,7 @@ public class BaseController> { @Autowired protected S service; - @Value("${jeecg.path.upload}") + @Value("${app.path.upload}") private String upLoadPath; /** diff --git a/src/main/java/cc/niushuai/bastionserver/common/base/entity/BaseEntity.java b/src/main/java/cc/niushuai/bastionserver/common/base/entity/BaseEntity.java index eadf7a1..286c82e 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/base/entity/BaseEntity.java +++ b/src/main/java/cc/niushuai/bastionserver/common/base/entity/BaseEntity.java @@ -14,7 +14,8 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: Entity基类 + * Entity基类 + * * @Author: dangzhenghui@163.com * @Date: 2019-4-28 * @Version: 1.1 diff --git a/src/main/java/cc/niushuai/bastionserver/common/base/service/BaseService.java b/src/main/java/cc/niushuai/bastionserver/common/base/service/BaseService.java index 17acde5..095016b 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/base/service/BaseService.java +++ b/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; /** - * @Description: Service基类 + * Service基类 + * * @Author: dangzhenghui@163.com * @Date: 2019-4-21 8:13 * @Version: 1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/common/base/service/impl/BaseServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/common/base/service/impl/BaseServiceImpl.java index 489efa5..40c1167 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/base/service/impl/BaseServiceImpl.java +++ b/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; /** - * @Description: ServiceImpl基类 + * ServiceImpl基类 + * * @Author: dangzhenghui@163.com * @Date: 2019-4-21 8:13 * @Version: 1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/common/constant/CacheConstant.java b/src/main/java/cc/niushuai/bastionserver/common/constant/CacheConstant.java index 368ffa2..8d7d1f0 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/constant/CacheConstant.java +++ b/src/main/java/cc/niushuai/bastionserver/common/constant/CacheConstant.java @@ -1,9 +1,10 @@ package cc.niushuai.bastionserver.common.constant; /** + * 缓存常量 + * * @author: huangxutao * @date: 2019-06-14 - * @description: 缓存常量 */ public interface CacheConstant { diff --git a/src/main/java/cc/niushuai/bastionserver/common/constant/CommonConstant.java b/src/main/java/cc/niushuai/bastionserver/common/constant/CommonConstant.java index 4d04f0e..79146c1 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/constant/CommonConstant.java +++ b/src/main/java/cc/niushuai/bastionserver/common/constant/CommonConstant.java @@ -1,7 +1,8 @@ package cc.niushuai.bastionserver.common.constant; /** - * @Description: 通用常量 + * 通用常量 + * * @author: jeecg-boot */ public interface CommonConstant { @@ -70,16 +71,16 @@ public interface CommonConstant { /** * {@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) */ - Integer SC_OK_200 = 200; + Integer OK_200 = 200; /** * 访问权限认证未通过 510 */ - Integer SC_JEECG_NO_AUTHZ = 510; + Integer NO_AUTHZ = 510; /** * 登录用户Shiro权限缓存KEY前缀 diff --git a/src/main/java/cc/niushuai/bastionserver/common/constant/GlobalConstants.java b/src/main/java/cc/niushuai/bastionserver/common/constant/GlobalConstants.java index d878fc4..1168960 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/constant/GlobalConstants.java +++ b/src/main/java/cc/niushuai/bastionserver/common/constant/GlobalConstants.java @@ -1,7 +1,8 @@ package cc.niushuai.bastionserver.common.constant; /** - * @Description: GlobalConstants + * GlobalConstants + * * @author: scott * @date: 2020/01/01 16:01 */ @@ -19,5 +20,5 @@ public class GlobalConstants { /** * redis消息通道名称 */ - public static final String REDIS_TOPIC_NAME = "jeecg_redis_topic"; + public static final String REDIS_TOPIC_NAME = "app_redis_topic"; } diff --git a/src/main/java/cc/niushuai/bastionserver/common/constant/SymbolConstant.java b/src/main/java/cc/niushuai/bastionserver/common/constant/SymbolConstant.java index 9021d88..4166885 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/constant/SymbolConstant.java +++ b/src/main/java/cc/niushuai/bastionserver/common/constant/SymbolConstant.java @@ -1,7 +1,8 @@ package cc.niushuai.bastionserver.common.constant; /** - * @Description: 符号和特殊符号常用类 + * 符号和特殊符号常用类 + * * @author: wangshuai * @date: 2022年03月30日 17:44 */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/constant/WebsocketConst.java b/src/main/java/cc/niushuai/bastionserver/common/constant/WebsocketConst.java index 64dd91d..db2f5ea 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/constant/WebsocketConst.java +++ b/src/main/java/cc/niushuai/bastionserver/common/constant/WebsocketConst.java @@ -1,7 +1,8 @@ package cc.niushuai.bastionserver.common.constant; /** - * @Description: Websocket常量类 + * Websocket常量类 + * * @author: taoyan * @date: 2020年03月23日 */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/constant/enums/CgformEnum.java b/src/main/java/cc/niushuai/bastionserver/common/constant/enums/CgformEnum.java deleted file mode 100644 index ba26734..0000000 --- a/src/main/java/cc/niushuai/bastionserver/common/constant/enums/CgformEnum.java +++ /dev/null @@ -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> getJspModelList(int type) { - List> ls = new ArrayList>(); - for (CgformEnum e : CgformEnum.values()) { - if (e.type == type) { - Map map = new HashMap(); - 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; - } - - -} diff --git a/src/main/java/cc/niushuai/bastionserver/common/constant/enums/OperateTypeEnum.java b/src/main/java/cc/niushuai/bastionserver/common/constant/enums/OperateTypeEnum.java index 2e59f87..0272677 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/constant/enums/OperateTypeEnum.java +++ b/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; /** - * @Description: 操作类型 + * 操作类型 + * * @author: jeecg-boot * @date: 2022/3/31 10:05 */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/enums/SentinelErrorInfoEnum.java b/src/main/java/cc/niushuai/bastionserver/common/enums/SentinelErrorInfoEnum.java index 5ed7677..a33630d 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/enums/SentinelErrorInfoEnum.java +++ b/src/main/java/cc/niushuai/bastionserver/common/enums/SentinelErrorInfoEnum.java @@ -1,7 +1,8 @@ package cc.niushuai.bastionserver.common.enums; /** - * @Description: 异常错误信息定义 + * 异常错误信息定义 + * * @author: zyf * @date: 2022/4/14 10:05 */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/exception/BusinessException.java b/src/main/java/cc/niushuai/bastionserver/common/exception/BusinessException.java index 2472b6a..f6b1acd 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/exception/BusinessException.java +++ b/src/main/java/cc/niushuai/bastionserver/common/exception/BusinessException.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; /** * Business自定义异常 + * * @author: niushuai233 */ @Data @@ -34,7 +35,7 @@ public class BusinessException extends RuntimeException { public BusinessException(String message, Object... params) { super(message); - this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500; + this.code = CommonConstant.INTERNAL_SERVER_ERROR_500; this.params = params; this.message = StrUtil.format(message, params); } diff --git a/src/main/java/cc/niushuai/bastionserver/common/exception/GlobalExceptionHandler.java b/src/main/java/cc/niushuai/bastionserver/common/exception/GlobalExceptionHandler.java index b56b12b..6ee2c75 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/cc/niushuai/bastionserver/common/exception/GlobalExceptionHandler.java @@ -1,8 +1,6 @@ package cc.niushuai.bastionserver.common.exception; 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 org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.UnauthorizedException; diff --git a/src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/JeecgRedisClient.java b/src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/RedisClient.java similarity index 92% rename from src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/JeecgRedisClient.java rename to src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/RedisClient.java index 240e135..f0454fe 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/modules/redis/client/JeecgRedisClient.java +++ b/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; /** - * @Description: redis客户端 + * redis客户端 + * * @author: scott * @date: 2020/01/01 16:01 */ @Configuration -public class JeecgRedisClient { +public class RedisClient { @Resource private RedisTemplate redisTemplate; diff --git a/src/main/java/cc/niushuai/bastionserver/common/modules/redis/config/RedisConfig.java b/src/main/java/cc/niushuai/bastionserver/common/modules/redis/config/RedisConfig.java index f1fac7b..4980b35 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/modules/redis/config/RedisConfig.java +++ b/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.databind.ObjectMapper; 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 lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; diff --git a/src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/JeecgRedisListener.java b/src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/AppRedisListener.java similarity index 78% rename from src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/JeecgRedisListener.java rename to src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/AppRedisListener.java index db1934c..16d3aa3 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/modules/redis/listener/JeecgRedisListener.java +++ b/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; /** - * @Description: 自定义消息监听 + * 自定义消息监听 + * * @author: scott * @date: 2020/01/01 16:02 */ -public interface JeecgRedisListener { +public interface AppRedisListener { /** * 接受消息 * diff --git a/src/main/java/cc/niushuai/bastionserver/common/modules/redis/receiver/RedisReceiver.java b/src/main/java/cc/niushuai/bastionserver/common/modules/redis/receiver/RedisReceiver.java index e898790..6869387 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/modules/redis/receiver/RedisReceiver.java +++ b/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.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 cn.hutool.core.util.ObjectUtil; import lombok.Data; @@ -24,7 +24,7 @@ public class RedisReceiver { */ public void onMessage(BaseMap params) { 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)) { messageListener.onMessage(params); } diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/query/QueryCondition.java b/src/main/java/cc/niushuai/bastionserver/common/system/query/QueryCondition.java index 125e019..d9d38a4 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/query/QueryCondition.java +++ b/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; /** - * @Description: QueryCondition + * QueryCondition + * * @author: jeecg-boot */ public class QueryCondition implements Serializable { diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/query/QueryGenerator.java b/src/main/java/cc/niushuai/bastionserver/common/system/query/QueryGenerator.java index 83c8335..74b4168 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/query/QueryGenerator.java +++ b/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.SymbolConstant; import cc.niushuai.bastionserver.common.exception.BusinessException; -import cc.niushuai.bastionserver.common.system.util.JeecgDataAutorUtils; -import cc.niushuai.bastionserver.common.util.JwtUtil; +import cc.niushuai.bastionserver.common.system.util.PermissionDataUtil; import cc.niushuai.bastionserver.common.system.vo.SysPermissionDataRuleModel; -import cc.niushuai.bastionserver.common.util.CommonUtils; -import cc.niushuai.bastionserver.common.util.DateUtils; -import cc.niushuai.bastionserver.common.util.SqlInjectionUtil; -import cc.niushuai.bastionserver.common.util.oConvertUtils; +import cc.niushuai.bastionserver.common.util.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -31,7 +27,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; /** - * @Description: 查询生成器 + * 查询生成器 + * * @author: jeecg-boot */ @Slf4j @@ -737,7 +734,7 @@ public class QueryGenerator { */ public static Map getRuleMap() { Map ruleMap = new HashMap<>(5); - List list = JeecgDataAutorUtils.loadDataSearchConditon(); + List list = PermissionDataUtil.loadDataSearchConditon(); if (list != null && list.size() > 0) { if (list.get(0) == null) { return ruleMap; @@ -787,7 +784,7 @@ public class QueryGenerator { /** * @param ruleValue: * @author: scott - * @Description: 去掉值前后单引号 + * 去掉值前后单引号 * @date: 2020/3/19 21:26 * @Return: java.lang.String */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/util/JeecgDataAutorUtils.java b/src/main/java/cc/niushuai/bastionserver/common/system/util/PermissionDataUtil.java similarity index 96% rename from src/main/java/cc/niushuai/bastionserver/common/system/util/JeecgDataAutorUtils.java rename to src/main/java/cc/niushuai/bastionserver/common/system/util/PermissionDataUtil.java index 2e81f25..1349d7d 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/util/JeecgDataAutorUtils.java +++ b/src/main/java/cc/niushuai/bastionserver/common/system/util/PermissionDataUtil.java @@ -10,12 +10,12 @@ import java.util.ArrayList; import java.util.List; /** - * @ClassName: JeecgDataAutorUtils - * @Description: 数据权限查询规则容器工具类 + * @ClassName: PermissionDataUtil + * 数据权限查询规则容器工具类 * @Author: 张代浩 * @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"; diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/vo/ComboModel.java b/src/main/java/cc/niushuai/bastionserver/common/system/vo/ComboModel.java index 31a2b58..3e8d101 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/vo/ComboModel.java +++ b/src/main/java/cc/niushuai/bastionserver/common/system/vo/ComboModel.java @@ -8,7 +8,8 @@ import lombok.experimental.Accessors; import java.io.Serializable; /** - * @Description: 文档管理 + * 文档管理 + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/vo/DictModel.java b/src/main/java/cc/niushuai/bastionserver/common/system/vo/DictModel.java index f7bfb16..d97de24 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/vo/DictModel.java +++ b/src/main/java/cc/niushuai/bastionserver/common/system/vo/DictModel.java @@ -8,7 +8,8 @@ import lombok.experimental.Accessors; import java.io.Serializable; /** - * @Description: 字典类 + * 字典类 + * * @author: jeecg-boot */ @Data @@ -28,6 +29,7 @@ public class DictModel implements Serializable { public DictModel() { } + public DictModel(String value, String text) { this.value = value; this.text = text; diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/vo/DynamicDataSourceModel.java b/src/main/java/cc/niushuai/bastionserver/common/system/vo/DynamicDataSourceModel.java index 6304f6c..2170abf 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/vo/DynamicDataSourceModel.java +++ b/src/main/java/cc/niushuai/bastionserver/common/system/vo/DynamicDataSourceModel.java @@ -4,7 +4,8 @@ import lombok.Data; import org.springframework.beans.BeanUtils; /** - * @Description: 数据源 + * 数据源 + * * @author: jeecg-boot */ @Data @@ -47,6 +48,7 @@ public class DynamicDataSourceModel { public DynamicDataSourceModel() { } + public DynamicDataSourceModel(Object dbSource) { if (dbSource != null) { BeanUtils.copyProperties(dbSource, this); diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysCategoryModel.java b/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysCategoryModel.java index dc0661f..c41ef90 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysCategoryModel.java +++ b/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysCategoryModel.java @@ -3,7 +3,6 @@ package cc.niushuai.bastionserver.common.system.vo; /** * @Author qinfeng * @Date 2020/2/19 12:01 - * @Description: * @Version 1.0 */ public class SysCategoryModel { diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysFilesModel.java b/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysFilesModel.java index 2cb5869..6d8388a 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysFilesModel.java +++ b/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 * @date: 2022年08月11日 9:48 */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysUserCacheInfo.java b/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysUserCacheInfo.java index 47280f8..5b0766f 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/system/vo/SysUserCacheInfo.java +++ b/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; /** - * @Description: 用户缓存信息 + * 用户缓存信息 + * * @author: jeecg-boot */ public class SysUserCacheInfo { diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/CommonUtils.java b/src/main/java/cc/niushuai/bastionserver/common/util/CommonUtils.java index 33847b1..f6e5920 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/CommonUtils.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/CommonUtils.java @@ -30,7 +30,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * @Description: 通用工具 + * 通用工具 + * * @author: jeecg-boot */ @Slf4j diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/DySmsEnum.java b/src/main/java/cc/niushuai/bastionserver/common/util/DySmsEnum.java index 04bea98..7ebbbdb 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/DySmsEnum.java +++ b/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; /** - * @Description: 短信枚举类 + * 短信枚举类 + * * @author: jeecg-boot */ 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("", "", ""), /** * 会议通知 */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/JwtUtil.java b/src/main/java/cc/niushuai/bastionserver/common/util/JwtUtil.java index 1a56dde..6c4077a 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/JwtUtil.java +++ b/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.SymbolConstant; 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.SysUserCacheInfo; import com.auth0.jwt.JWT; @@ -165,7 +165,7 @@ public class JwtUtil { */ public static String getUserSystemData(String key, SysUserCacheInfo user) { if (user == null) { - user = JeecgDataAutorUtils.loadUserInfo(); + user = PermissionDataUtil.loadUserInfo(); } //#{sys_user_code}% diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/Md5Util.java b/src/main/java/cc/niushuai/bastionserver/common/util/Md5Util.java index 2c79404..484e1a6 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/Md5Util.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/Md5Util.java @@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.common.util; import java.security.MessageDigest; /** - * @Description: 加密工具 + * 加密工具 + * * @author: jeecg-boot */ public class Md5Util { diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/PasswordUtil.java b/src/main/java/cc/niushuai/bastionserver/common/util/PasswordUtil.java index 29054d1..2191cdb 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/PasswordUtil.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/PasswordUtil.java @@ -9,7 +9,8 @@ import java.security.Key; import java.security.SecureRandom; /** - * @Description: 密码工具类 + * 密码工具类 + * * @author: jeecg-boot */ public class PasswordUtil { diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/PmsUtil.java b/src/main/java/cc/niushuai/bastionserver/common/util/PmsUtil.java index 2db1a56..5f278ea 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/PmsUtil.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/PmsUtil.java @@ -11,7 +11,8 @@ import java.util.Date; import java.util.List; /** - * @Description: PmsUtil + * PmsUtil + * * @author: jeecg-boot */ @Slf4j @@ -57,7 +58,7 @@ public class PmsUtil { return saveDir + name + ".txt"; } - @Value("${jeecg.path.upload}") + @Value("${app.path.upload}") public void setUploadPath(String uploadPath) { PmsUtil.uploadPath = uploadPath; } diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/ResourceUtil.java b/src/main/java/cc/niushuai/bastionserver/common/util/ResourceUtil.java index f0258e8..6a09f01 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/ResourceUtil.java +++ b/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.vo.DictModel; -import cc.niushuai.bastionserver.common.util.oConvertUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/RestUtil.java b/src/main/java/cc/niushuai/bastionserver/common/util/RestUtil.java index 5e14372..169dea4 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/RestUtil.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/RestUtil.java @@ -1,6 +1,6 @@ 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 com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; @@ -68,8 +68,8 @@ public class RestUtil { //定时任务情况下，通过request是获取不到domain的，这种情况下通过配置获取pc后台域名 if (oConvertUtils.isEmpty(basepath)) { - JeecgBaseConfig jeecgBaseConfig = SpringContextUtils.getBean(JeecgBaseConfig.class); - basepath = jeecgBaseConfig.getDomainUrl().getPc(); + AppConfig appConfig = SpringContextUtils.getBean(AppConfig.class); + basepath = appConfig.getDomainUrl().getPc(); } log.info(" RestUtil.getBaseUrl: " + basepath); return basepath; diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/SpringContextUtils.java b/src/main/java/cc/niushuai/bastionserver/common/util/SpringContextUtils.java index 6837e53..6f762f0 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/SpringContextUtils.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/SpringContextUtils.java @@ -13,7 +13,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** - * @Description: spring上下文工具类 + * spring上下文工具类 + * * @author: jeecg-boot */ @Component diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/TokenUtils.java b/src/main/java/cc/niushuai/bastionserver/common/util/TokenUtils.java index 2fa2531..57c0cc1 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/TokenUtils.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/TokenUtils.java @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletRequest; /** * @Author scott * @Date 2019/9/23 14:12 - * @Description: 编程校验token有效性 + * 编程校验token有效性 */ @Slf4j public class TokenUtils { @@ -47,28 +47,28 @@ public class TokenUtils { */ public static boolean verifyToken(String token, CommonAPI commonApi, RedisUtil redisUtil) { if (StrUtil.isEmpty(token)) { - throw new BusinessException(401,"token不能为空!"); + throw new BusinessException(401, "token不能为空!"); } // 解密获得username，用于和数据库进行对比 String username = JwtUtil.getUsername(token); if (username == null) { - throw new BusinessException(401,"token非法无效!"); + throw new BusinessException(401, "token非法无效!"); } // 查询用户信息 LoginUser user = TokenUtils.getLoginUser(username, commonApi, redisUtil); //LoginUser user = commonApi.getUserByName(username); if (user == null) { - throw new BusinessException(401,"用户不存在!"); + throw new BusinessException(401, "用户不存在!"); } // 判断用户状态 if (user.getStatus() != 1) { - throw new BusinessException(401,"账号已被锁定,请联系管理员!"); + throw new BusinessException(401, "账号已被锁定,请联系管理员!"); } // 校验token是否超时失效 & 或者账号密码是否错误 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; } diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/dynamic/db/FreemarkerParseFactory.java b/src/main/java/cc/niushuai/bastionserver/common/util/dynamic/db/FreemarkerParseFactory.java index c6286e2..25e9d86 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/dynamic/db/FreemarkerParseFactory.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/dynamic/db/FreemarkerParseFactory.java @@ -17,8 +17,7 @@ import java.util.regex.Pattern; /** * @author 赵俊夫 * @version V1.0 - * @Title:FreemarkerHelper - * @description:Freemarker引擎协助类 + * @Title:FreemarkerHelper Freemarker引擎协助类 * @date Jul 5, 2013 2:58:29 PM */ @Slf4j diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/encryption/AesEncryptUtil.java b/src/main/java/cc/niushuai/bastionserver/common/util/encryption/AesEncryptUtil.java index d7a8f12..ec220a3 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/encryption/AesEncryptUtil.java +++ b/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; /** - * @Description: AES 加密 + * AES 加密 + * * @author: jeecg-boot * @date: 2022/3/30 11:48 */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/encryption/EncryptedString.java b/src/main/java/cc/niushuai/bastionserver/common/util/encryption/EncryptedString.java index 7cfec46..af3049e 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/encryption/EncryptedString.java +++ b/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; /** - * @Description: EncryptedString + * EncryptedString + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/filter/FileTypeFilter.java b/src/main/java/cc/niushuai/bastionserver/common/util/filter/FileTypeFilter.java index 0e77db9..70fd822 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/filter/FileTypeFilter.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/filter/FileTypeFilter.java @@ -8,7 +8,8 @@ import java.util.HashMap; import java.util.Iterator; /** - * @Description: 校验上传文件敏感后缀 + * 校验上传文件敏感后缀 + * * @author: lsq * @date: 2021年08月09日 15:29 */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/oss/OssBootUtil.java b/src/main/java/cc/niushuai/bastionserver/common/util/oss/OssBootUtil.java index fe3e41a..049e0e8 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/oss/OssBootUtil.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/oss/OssBootUtil.java @@ -24,7 +24,8 @@ import java.util.Date; import java.util.UUID; /** - * @Description: 阿里云 oss 上传工具类(高依赖版) + * 阿里云 oss 上传工具类(高依赖版) + * * @Date: 2019/5/10 * @author: jeecg-boot */ diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/security/SecurityTools.java b/src/main/java/cc/niushuai/bastionserver/common/util/security/SecurityTools.java index 3b4591e..4f84337 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/security/SecurityTools.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/security/SecurityTools.java @@ -15,7 +15,8 @@ import javax.crypto.SecretKey; import java.security.KeyPair; /** - * @Description: SecurityTools + * SecurityTools + * * @author: jeecg-boot */ public class SecurityTools { diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/MyKeyPair.java b/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/MyKeyPair.java index b404b92..32e11d8 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/MyKeyPair.java +++ b/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; /** - * @Description: MyKeyPair + * MyKeyPair + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityReq.java b/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityReq.java index 6404363..e877423 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityReq.java +++ b/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; /** - * @Description: SecurityReq + * SecurityReq + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityResp.java b/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityResp.java index aa52bfa..050be28 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityResp.java +++ b/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecurityResp.java @@ -4,7 +4,8 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; /** - * @Description: SecurityResp + * SecurityResp + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignReq.java b/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignReq.java index 6437538..28a1a84 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignReq.java +++ b/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; /** - * @Description: SecuritySignReq + * SecuritySignReq + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignResp.java b/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignResp.java index 1520253..08ced7f 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/security/entity/SecuritySignResp.java +++ b/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; /** - * @Description: SecuritySignResp + * SecuritySignResp + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/common/util/superSearch/QueryRuleVo.java b/src/main/java/cc/niushuai/bastionserver/common/util/superSearch/QueryRuleVo.java index 0ae04ba..b8394e5 100644 --- a/src/main/java/cc/niushuai/bastionserver/common/util/superSearch/QueryRuleVo.java +++ b/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; // ///** -// * @Description: QueryRuleVo +// * QueryRuleVo // * @author: jeecg-boot // */ //@Data diff --git a/src/main/java/cc/niushuai/bastionserver/config/JeecgBaseConfig.java b/src/main/java/cc/niushuai/bastionserver/config/AppConfig.java similarity index 95% rename from src/main/java/cc/niushuai/bastionserver/config/JeecgBaseConfig.java rename to src/main/java/cc/niushuai/bastionserver/config/AppConfig.java index 5012ef1..b946d3a 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/JeecgBaseConfig.java +++ b/src/main/java/cc/niushuai/bastionserver/config/AppConfig.java @@ -12,9 +12,9 @@ import org.springframework.stereotype.Component; * * @author: jeecg-boot */ -@Component("jeecgBaseConfig") -@ConfigurationProperties(prefix = "jeecg") -public class JeecgBaseConfig { +@Component +@ConfigurationProperties(prefix = "app") +public class AppConfig { /** * 签名密钥串(字典等敏感接口) * diff --git a/src/main/java/cc/niushuai/bastionserver/config/AutoPoiConfig.java b/src/main/java/cc/niushuai/bastionserver/config/AutoPoiConfig.java index 0b69480..1f4b796 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/AutoPoiConfig.java +++ b/src/main/java/cc/niushuai/bastionserver/config/AutoPoiConfig.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; /** * @Author: Scott * @Date: 2018/2/7 - * @description: autopoi 配置类 + * autopoi 配置类 */ @Configuration diff --git a/src/main/java/cc/niushuai/bastionserver/config/DruidConfig.java b/src/main/java/cc/niushuai/bastionserver/config/DruidConfig.java index e8cff90..dab867c 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/DruidConfig.java +++ b/src/main/java/cc/niushuai/bastionserver/config/DruidConfig.java @@ -14,7 +14,8 @@ import javax.servlet.*; import java.io.IOException; /** - * @Description: DruidConfig配置类 + * DruidConfig配置类 + * * @author: jeecg-boot */ @Configuration diff --git a/src/main/java/cc/niushuai/bastionserver/config/StaticConfig.java b/src/main/java/cc/niushuai/bastionserver/config/StaticConfig.java index 9c168e1..522fbe9 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/StaticConfig.java +++ b/src/main/java/cc/niushuai/bastionserver/config/StaticConfig.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Data public class StaticConfig { - @Value("${jeecg.oss.accessKey}") + @Value("${app.oss.accessKey}") private String accessKeyId; - @Value("${jeecg.oss.secretKey}") + @Value("${app.oss.secretKey}") private String accessKeySecret; @Value(value = "${spring.mail.username}") @@ -25,7 +25,7 @@ public class StaticConfig { // /** // * 签名密钥串 // */ -// @Value(value = "${jeecg.signatureSecret}") +// @Value(value = "${app.signatureSecret}") // private String signatureSecret; diff --git a/src/main/java/cc/niushuai/bastionserver/config/Swagger2Config.java b/src/main/java/cc/niushuai/bastionserver/config/Swagger2Config.java index 7d5a822..aeeefe9 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/Swagger2Config.java +++ b/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.service.*; import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.OperationContext; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider; @@ -33,7 +32,6 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.function.Predicate; import java.util.stream.Collectors; /** diff --git a/src/main/java/cc/niushuai/bastionserver/config/WebMvcConfiguration.java b/src/main/java/cc/niushuai/bastionserver/config/WebMvcConfiguration.java index e2950e0..a8437d4 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/WebMvcConfiguration.java +++ b/src/main/java/cc/niushuai/bastionserver/config/WebMvcConfiguration.java @@ -46,7 +46,7 @@ import java.util.List; public class WebMvcConfiguration implements WebMvcConfigurer { @Resource - JeecgBaseConfig jeecgBaseConfig; + AppConfig appConfig; @Value("${spring.resource.static-locations:}") private String staticLocations; @@ -59,10 +59,10 @@ public class WebMvcConfiguration implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/**") - //update-begin-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 - .addResourceLocations("file:" + jeecgBaseConfig.getPath().getUpload() + "//") - .addResourceLocations("file:" + jeecgBaseConfig.getPath().getWebapp() + "//") - //update-end-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 + //update-begin-author:taoyan date:20211116 for: app.path.webapp配置无效 #3126 + .addResourceLocations("file:" + appConfig.getPath().getUpload() + "//") + .addResourceLocations("file:" + appConfig.getPath().getWebapp() + "//") + //update-end-author:taoyan date:20211116 for: app.path.webapp配置无效 #3126 .addResourceLocations(staticLocations.split(",")); } diff --git a/src/main/java/cc/niushuai/bastionserver/config/WebSocketConfig.java b/src/main/java/cc/niushuai/bastionserver/config/WebSocketConfig.java index 525080e..c239a5a 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/WebSocketConfig.java +++ b/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; /** - * @Description: WebSocketConfig + * WebSocketConfig + * * @author: jeecg-boot */ @Configuration diff --git a/src/main/java/cc/niushuai/bastionserver/config/init/TomcatFactoryConfig.java b/src/main/java/cc/niushuai/bastionserver/config/init/TomcatFactoryConfig.java index 350772c..06c5aba 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/init/TomcatFactoryConfig.java +++ b/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; /** - * @Description: TomcatFactoryConfig + * TomcatFactoryConfig + * * @author: scott * @date: 2021年01月25日 11:40 */ diff --git a/src/main/java/cc/niushuai/bastionserver/config/mybatis/MybatisPlusSaasConfig.java b/src/main/java/cc/niushuai/bastionserver/config/mybatis/MybatisPlusSaasConfig.java index 2bf0b31..7d4c8ba 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/mybatis/MybatisPlusSaasConfig.java +++ b/src/main/java/cc/niushuai/bastionserver/config/mybatis/MybatisPlusSaasConfig.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; /** - * 单数据源配置（jeecg.datasource.open = false时生效） + * 单数据源配置（app.datasource.open = false时生效） * * @Author zhoujf */ diff --git a/src/main/java/cc/niushuai/bastionserver/config/mybatis/ThreadLocalDataHelper.java b/src/main/java/cc/niushuai/bastionserver/config/mybatis/ThreadLocalDataHelper.java index 69c654c..971fac2 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/mybatis/ThreadLocalDataHelper.java +++ b/src/main/java/cc/niushuai/bastionserver/config/mybatis/ThreadLocalDataHelper.java @@ -7,7 +7,8 @@ import java.util.concurrent.ConcurrentHashMap; /** - * @Description: 本地线程变量存储工具类 + * 本地线程变量存储工具类 + * * @author: lsq * @date: 2022年03月25日 11:42 */ diff --git a/src/main/java/cc/niushuai/bastionserver/config/mybatis/aspect/DynamicTableAspect.java b/src/main/java/cc/niushuai/bastionserver/config/mybatis/aspect/DynamicTableAspect.java index df210b8..dfa05ea 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/mybatis/aspect/DynamicTableAspect.java +++ b/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 org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; diff --git a/src/main/java/cc/niushuai/bastionserver/config/oss/MinioConfig.java b/src/main/java/cc/niushuai/bastionserver/config/oss/MinioConfig.java index 63efa8d..1207b4e 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/oss/MinioConfig.java +++ b/src/main/java/cc/niushuai/bastionserver/config/oss/MinioConfig.java @@ -16,13 +16,13 @@ import org.springframework.context.annotation.Configuration; @Slf4j @Configuration public class MinioConfig { - @Value(value = "${jeecg.minio.minio_url}") + @Value(value = "${app.minio.minio_url}") private String minioUrl; - @Value(value = "${jeecg.minio.minio_name}") + @Value(value = "${app.minio.minio_name}") private String minioName; - @Value(value = "${jeecg.minio.minio_pass}") + @Value(value = "${app.minio.minio_pass}") private String minioPass; - @Value(value = "${jeecg.minio.bucketName}") + @Value(value = "${app.minio.bucketName}") private String bucketName; @Bean diff --git a/src/main/java/cc/niushuai/bastionserver/config/oss/OssConfiguration.java b/src/main/java/cc/niushuai/bastionserver/config/oss/OssConfiguration.java index 9a5f796..a91216d 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/oss/OssConfiguration.java +++ b/src/main/java/cc/niushuai/bastionserver/config/oss/OssConfiguration.java @@ -13,15 +13,15 @@ import org.springframework.context.annotation.Configuration; @Configuration public class OssConfiguration { - @Value("${jeecg.oss.endpoint}") + @Value("${app.oss.endpoint}") private String endpoint; - @Value("${jeecg.oss.accessKey}") + @Value("${app.oss.accessKey}") private String accessKeyId; - @Value("${jeecg.oss.secretKey}") + @Value("${app.oss.secretKey}") private String accessKeySecret; - @Value("${jeecg.oss.bucketName}") + @Value("${app.oss.bucketName}") private String bucketName; - @Value("${jeecg.oss.staticDomain:}") + @Value("${app.oss.staticDomain:}") private String staticDomain; @Bean diff --git a/src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroConfig.java b/src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroConfig.java index 1071d52..ddb3181 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroConfig.java +++ b/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.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.JwtFilter; import cn.hutool.core.util.StrUtil; @@ -36,7 +36,7 @@ import java.util.*; /** * @author: Scott * @date: 2018/2/7 - * @description: shiro 配置类 + * shiro 配置类 */ @Slf4j @@ -48,7 +48,7 @@ public class ShiroConfig { @Autowired private Environment env; @Resource - private JeecgBaseConfig jeecgBaseConfig; + private AppConfig appConfig; @Bean public static LifecycleBeanPostProcessor lifecycleBeanPostProcessor() { @@ -70,8 +70,8 @@ public class ShiroConfig { Map filterChainDefinitionMap = new LinkedHashMap(); //支持yml方式，配置拦截排除 - if (jeecgBaseConfig != null && jeecgBaseConfig.getShiro() != null) { - String shiroExcludeUrls = jeecgBaseConfig.getShiro().getExcludeUrls(); + if (appConfig != null && appConfig.getShiro() != null) { + String shiroExcludeUrls = appConfig.getShiro().getExcludeUrls(); if (oConvertUtils.isNotEmpty(shiroExcludeUrls)) { String[] permissionUrl = shiroExcludeUrls.split(","); for (String url : permissionUrl) { diff --git a/src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroRealm.java b/src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroRealm.java index 0118c99..9babc4e 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/shiro/ShiroRealm.java +++ b/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.config.TenantContext; 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.util.RedisUtil; -import cc.niushuai.bastionserver.common.util.SpringContextUtils; -import cc.niushuai.bastionserver.common.util.TokenUtils; -import cc.niushuai.bastionserver.common.util.oConvertUtils; +import cc.niushuai.bastionserver.common.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; @@ -26,7 +22,8 @@ import javax.servlet.http.HttpServletRequest; import java.util.Set; /** - * @Description: 用户登录鉴权和获取用户授权 + * 用户登录鉴权和获取用户授权 + * * @Author: Scott * @Date: 2019-4-23 8:13 * @Version: 1.1 diff --git a/src/main/java/cc/niushuai/bastionserver/config/shiro/filters/JwtFilter.java b/src/main/java/cc/niushuai/bastionserver/config/shiro/filters/JwtFilter.java index c5a291e..640c41e 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/shiro/filters/JwtFilter.java +++ b/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; /** - * @Description: 鉴权登录拦截器 + * 鉴权登录拦截器 + * * @Author: Scott * @Date: 2018/10/7 **/ diff --git a/src/main/java/cc/niushuai/bastionserver/config/sign/interceptor/SignAuthConfiguration.java b/src/main/java/cc/niushuai/bastionserver/config/sign/interceptor/SignAuthConfiguration.java index 45cfab0..c1b1c4a 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/sign/interceptor/SignAuthConfiguration.java +++ b/src/main/java/cc/niushuai/bastionserver/config/sign/interceptor/SignAuthConfiguration.java @@ -1,7 +1,7 @@ package cc.niushuai.bastionserver.config.sign.interceptor; 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 cn.hutool.core.util.StrUtil; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -20,7 +20,7 @@ import javax.annotation.Resource; @Configuration public class SignAuthConfiguration implements WebMvcConfigurer { @Resource - JeecgBaseConfig jeecgBaseConfig; + AppConfig appConfig; @Bean public SignAuthInterceptor signAuthInterceptor() { @@ -31,7 +31,7 @@ public class SignAuthConfiguration implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { //------------------------------------------------------------ //查询需要进行签名拦截的接口 signUrls - String signUrls = jeecgBaseConfig.getSignUrls(); + String signUrls = appConfig.getSignUrls(); String[] signUrlsArray = null; if (StrUtil.isNotBlank(signUrls)) { signUrlsArray = signUrls.split(","); @@ -55,7 +55,7 @@ public class SignAuthConfiguration implements WebMvcConfigurer { registration.setName("requestBodyReserveFilter"); //------------------------------------------------------------ //查询需要进行签名拦截的接口 signUrls - String signUrls = jeecgBaseConfig.getSignUrls(); + String signUrls = appConfig.getSignUrls(); String[] signUrlsArray = null; if (StrUtil.isNotBlank(signUrls)) { signUrlsArray = signUrls.split(","); diff --git a/src/main/java/cc/niushuai/bastionserver/config/sign/util/SignUtil.java b/src/main/java/cc/niushuai/bastionserver/config/sign/util/SignUtil.java index 6ce500c..4ee1a2d 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/sign/util/SignUtil.java +++ b/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.util.SpringContextUtils; 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 com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; @@ -47,11 +47,11 @@ public class SignUtil { String paramsJsonStr = JSONObject.toJSONString(params); log.info("Param paramsJsonStr : {}", paramsJsonStr); //设置签名秘钥 - JeecgBaseConfig jeecgBaseConfig = SpringContextUtils.getBean(JeecgBaseConfig.class); - String signatureSecret = jeecgBaseConfig.getSignatureSecret(); + AppConfig appConfig = SpringContextUtils.getBean(AppConfig.class); + String signatureSecret = appConfig.getSignatureSecret(); String curlyBracket = SymbolConstant.DOLLAR + SymbolConstant.LEFT_CURLY_BRACKET; if (oConvertUtils.isEmpty(signatureSecret) || signatureSecret.contains(curlyBracket)) { - throw new BusinessException("签名密钥 ${jeecg.signatureSecret} 缺少配置 ！！"); + throw new BusinessException("签名密钥 ${app.signatureSecret} 缺少配置 ！！"); } try { //【issues/I484RW】2.4.6部署后，下拉搜索框提示“sign签名检验失败” diff --git a/src/main/java/cc/niushuai/bastionserver/config/vo/Shiro.java b/src/main/java/cc/niushuai/bastionserver/config/vo/Shiro.java index 967a672..716a38e 100644 --- a/src/main/java/cc/niushuai/bastionserver/config/vo/Shiro.java +++ b/src/main/java/cc/niushuai/bastionserver/config/vo/Shiro.java @@ -1,7 +1,8 @@ package cc.niushuai.bastionserver.config.vo; /** - * @Description: TODO + * TODO + * * @author: scott * @date: 2022年01月21日 14:23 */ diff --git a/src/main/java/cc/niushuai/bastionserver/modules/base/mapper/BaseCommonMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/base/mapper/BaseCommonMapper.java index 045d24a..d011104 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/base/mapper/BaseCommonMapper.java +++ b/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; /** - * @Description: BaseCommonMapper + * BaseCommonMapper + * * @author: jeecg-boot */ public interface BaseCommonMapper { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/base/service/impl/BaseCommonServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/base/service/impl/BaseCommonServiceImpl.java index 92a60d2..4c95873 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/base/service/impl/BaseCommonServiceImpl.java +++ b/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; /** - * @Description: common实现类 + * common实现类 + * * @author: jeecg-boot */ @Service diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/mock/MockController.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/mock/MockController.java index b4201fa..594bed0 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/mock/MockController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/demo/mock/MockController.java @@ -18,7 +18,8 @@ import java.util.List; import java.util.Map; /** - * @Description: MockController + * MockController + * * @author: jeecg-boot */ @RestController diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/mock/vxe/controller/VxeMockController.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/mock/vxe/controller/VxeMockController.java index 47a639d..508841e 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/mock/vxe/controller/VxeMockController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/demo/mock/vxe/controller/VxeMockController.java @@ -25,7 +25,8 @@ import java.net.URLDecoder; import java.util.*; /** - * @Description: VxeMockController + * VxeMockController + * * @author: jeecg-boot */ @RestController diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDemoController.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDemoController.java index cffa582..585d370 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDemoController.java +++ b/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.aspect.annotation.AutoLog; 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.constant.CommonConstant; import cc.niushuai.bastionserver.common.system.query.QueryGenerator; import cc.niushuai.bastionserver.common.util.DateUtils; import cc.niushuai.bastionserver.common.util.RedisUtil; @@ -33,7 +33,8 @@ import java.util.Date; import java.util.List; /** - * @Description: 单表示例 + * 单表示例 + * * @Author: jeecg-boot * @Date:2018-12-29 * @Version:V2.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDynamicDataController.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDynamicDataController.java index 08c1aad..7ff5bee 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseDynamicDataController.java +++ b/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; /** - * @Description: 动态数据源测试 + * 动态数据源测试 + * * @Author: zyf * @Date:2020-04-21 */ diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseOrderMainController.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseOrderMainController.java index e9f1183..04510f4 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseOrderMainController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BaseOrderMainController.java @@ -36,7 +36,8 @@ import java.util.List; import java.util.Map; /** - * @Description: 一对多示例（JEditableTable行编辑） + * 一对多示例（JEditableTable行编辑） + * * @Author: jeecg-boot * @Date:2019-02-15 * @Version: V2.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BigScreenTemplatController.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BigScreenTemplatController.java index aae332b..e555346 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BigScreenTemplatController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/BigScreenTemplatController.java @@ -12,7 +12,8 @@ import java.util.ArrayList; import java.util.List; /** - * @Description: 大屏预览入口 + * 大屏预览入口 + * * @Author: scott * @Date:2019-12-12 * @Version:V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/JeecgOrderErpMainController.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/JeecgOrderErpMainController.java index a0aba6c..ac4500c 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/controller/JeecgOrderErpMainController.java +++ b/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; /** - * @Description: 一对多示例（ERP TAB风格） + * 一对多示例（ERP TAB风格） + * * @Author: ZhiLin * @Date: 2019-02-20 * @Version: v2.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/BaseDemo.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/BaseDemo.java index 29c939d..4b1ba35 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/BaseDemo.java +++ b/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; /** - * @Description: jeecg 测试demo + * jeecg 测试demo + * * @Author: jeecg-boot * @Date: 2018-12-29 * @Version:V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderCustomer.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderCustomer.java index 19d61d6..e31f6ee 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderCustomer.java +++ b/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; /** - * @Description: 订单客户 + * 订单客户 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderMain.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderMain.java index 0bd9568..707f1c6 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderMain.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderMain.java @@ -11,7 +11,8 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 订单 + * 订单 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderTicket.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderTicket.java index fdfc7be..84fbc2d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/entity/JeecgOrderTicket.java +++ b/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; /** - * @Description: 订单机票 + * 订单机票 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgDemoMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgDemoMapper.java index a3c04ee..d89621f 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgDemoMapper.java +++ b/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; /** - * @Description: jeecg 测试demo + * jeecg 测试demo + * * @Author: jeecg-boot * @Date: 2018-12-29 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderCustomerMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderCustomerMapper.java index 584e18c..685f890 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderCustomerMapper.java +++ b/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; /** - * @Description: 订单客户 + * 订单客户 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderMainMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderMainMapper.java index 212f28d..8641c37 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderMainMapper.java +++ b/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; /** - * @Description: 订单 + * 订单 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderTicketMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderTicketMapper.java index c9beb32..ec3b885 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/mapper/JeecgOrderTicketMapper.java +++ b/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; /** - * @Description: 订单机票 + * 订单机票 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDemoService.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDemoService.java index 7b0352e..0f37f5a 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDemoService.java +++ b/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; /** - * @Description: jeecg 测试demo + * jeecg 测试demo + * * @Author: jeecg-boot * @Date: 2018-12-29 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDynamicDataService.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDynamicDataService.java index 3fbbced..903671e 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IBaseDynamicDataService.java +++ b/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; /** - * @Description: 动态数据源测试 + * 动态数据源测试 + * * @Author: zyf * @Date:2020-04-21 */ diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderCustomerService.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderCustomerService.java index bf5e5ff..e067760 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderCustomerService.java +++ b/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; /** - * @Description: 订单客户 + * 订单客户 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderMainService.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderMainService.java index dddad1d..ca5a679 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderMainService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderMainService.java @@ -10,7 +10,8 @@ import java.util.Collection; import java.util.List; /** - * @Description: 订单 + * 订单 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderTicketService.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderTicketService.java index e15dfcb..b6c661b 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/IJeecgOrderTicketService.java +++ b/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; /** - * @Description: 订单机票 + * 订单机票 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDemoServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDemoServiceImpl.java index 7daec24..e4224a8 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDemoServiceImpl.java +++ b/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; /** - * @Description: jeecg 测试demo + * jeecg 测试demo + * * @Author: jeecg-boot * @Date: 2018-12-29 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDynamicDataServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDynamicDataServiceImpl.java index c47f6f8..4ca7d6c 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/BaseDynamicDataServiceImpl.java +++ b/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; /** - * @Description: 动态数据源测试 + * 动态数据源测试 + * * @Author: zyf * @Date:2020-04-21 */ diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java index 84623c1..12de526 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java +++ b/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; /** - * @Description: 订单客户 + * 订单客户 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java index 91e8afe..ad6b8db 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java +++ b/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; /** - * @Description: 订单 + * 订单 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java index 6e52bdf..7279e4e 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java @@ -10,7 +10,8 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * @Description: 订单机票 + * 订单机票 + * * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/vo/JeecgOrderMainPage.java b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/vo/JeecgOrderMainPage.java index 14cce11..49fd57b 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/demo/test/vo/JeecgOrderMainPage.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/demo/test/vo/JeecgOrderMainPage.java @@ -9,7 +9,8 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection; import java.util.List; /** - * @Description: 一对多示例 + * 一对多示例 + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/controller/SysMessageController.java b/src/main/java/cc/niushuai/bastionserver/modules/message/controller/SysMessageController.java index a78237d..bdaf517 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/controller/SysMessageController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/controller/SysMessageController.java @@ -18,7 +18,8 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** - * @Description: 消息 + * 消息 + * * @author: jeecg-boot * @date: 2019-04-09 * @version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/controller/SysMessageTemplateController.java b/src/main/java/cc/niushuai/bastionserver/modules/message/controller/SysMessageTemplateController.java index 8af9942..7eef8ef 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/controller/SysMessageTemplateController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/controller/SysMessageTemplateController.java @@ -2,8 +2,8 @@ package cc.niushuai.bastionserver.modules.message.controller; import cc.niushuai.bastionserver.common.api.dto.message.MessageDTO; import cc.niushuai.bastionserver.common.api.vo.Result; -import cc.niushuai.bastionserver.common.system.api.ISysBaseAPI; import cc.niushuai.bastionserver.common.base.controller.BaseController; +import cc.niushuai.bastionserver.common.system.api.ISysBaseAPI; import cc.niushuai.bastionserver.common.system.query.QueryGenerator; import cc.niushuai.bastionserver.common.util.oConvertUtils; import cc.niushuai.bastionserver.modules.message.entity.MsgParams; @@ -25,7 +25,8 @@ import java.util.Arrays; import java.util.Map; /** - * @Description: 消息模板 + * 消息模板 + * * @Author: jeecg-boot * @Sate: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/controller/TestSocketController.java b/src/main/java/cc/niushuai/bastionserver/modules/message/controller/TestSocketController.java index 920c063..e012eed 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/controller/TestSocketController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/controller/TestSocketController.java @@ -11,7 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @Description: TestSocketController + * TestSocketController + * * @author: jeecg-boot */ @RestController diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessage.java b/src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessage.java index 289835e..f383fcd 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessage.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessage.java @@ -11,7 +11,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** - * @Description: 消息 + * 消息 + * * @Author: jeecg-boot * @Date: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessageTemplate.java b/src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessageTemplate.java index 4568ade..1d6dc6a 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessageTemplate.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/entity/SysMessageTemplate.java @@ -8,7 +8,8 @@ import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; /** - * @Description: 消息模板 + * 消息模板 + * * @Author: jeecg-boot * @Date: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/ISendMsgHandle.java b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/ISendMsgHandle.java index 5ed376e..642f01d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/ISendMsgHandle.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/ISendMsgHandle.java @@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.modules.message.handle; import cc.niushuai.bastionserver.common.api.dto.message.MessageDTO; /** - * @Description: 发送信息接口 + * 发送信息接口 + * * @author: jeecg-boot */ public interface ISendMsgHandle { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/DdSendMsgHandle.java b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/DdSendMsgHandle.java index 8e24bed..a0505c0 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/DdSendMsgHandle.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/DdSendMsgHandle.java @@ -8,7 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** - * @Description: 发钉钉消息模板 + * 发钉钉消息模板 + * * @author: jeecg-boot */ @Slf4j diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/EmailSendMsgHandle.java b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/EmailSendMsgHandle.java index f97b6d5..e253e51 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/EmailSendMsgHandle.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/EmailSendMsgHandle.java @@ -24,7 +24,8 @@ import java.net.URLEncoder; import java.util.List; /** - * @Description: 邮箱发送信息 + * 邮箱发送信息 + * * @author: jeecg-boot */ @Slf4j @@ -68,7 +69,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle { @Override public void sendMessage(MessageDTO messageDTO) { String[] arr = messageDTO.getToUser().split(","); - LambdaQueryWrapper query = new LambdaQueryWrapper().in(SysUser::getUsername, (Object[])arr); + LambdaQueryWrapper query = new LambdaQueryWrapper().in(SysUser::getUsername, (Object[]) arr); List list = sysUserMapper.selectList(query); String content = messageDTO.getContent(); String title = messageDTO.getTitle(); diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/QywxSendMsgHandle.java b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/QywxSendMsgHandle.java index 7a6e730..29330b4 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/QywxSendMsgHandle.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/QywxSendMsgHandle.java @@ -8,7 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** - * @Description: 发企业微信消息模板 + * 发企业微信消息模板 + * * @author: jeecg-boot */ @Slf4j diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/SmsSendMsgHandle.java b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/SmsSendMsgHandle.java index 9be4218..3adbcbb 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/SmsSendMsgHandle.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/SmsSendMsgHandle.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.message.handle.ISendMsgHandle; import lombok.extern.slf4j.Slf4j; /** - * @Description: 短信发送 + * 短信发送 + * * @author: jeecg-boot */ @Slf4j diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/SystemSendMsgHandle.java b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/SystemSendMsgHandle.java index 2ee8e9f..eac76fd 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/SystemSendMsgHandle.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/SystemSendMsgHandle.java @@ -24,7 +24,8 @@ import java.util.Date; import java.util.Map; /** - * @Description: 发送系统消息 + * 发送系统消息 + * * @Author: wangshuai * @Date: 2022年3月22日 18:48:20 */ diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/WxSendMsgHandle.java b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/WxSendMsgHandle.java index 1f0c967..20634bb 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/WxSendMsgHandle.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/handle/impl/WxSendMsgHandle.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.message.handle.ISendMsgHandle; import lombok.extern.slf4j.Slf4j; /** - * @Description: 发微信消息模板 + * 发微信消息模板 + * * @author: jeecg-boot */ @Slf4j diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/mapper/SysMessageMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/message/mapper/SysMessageMapper.java index 0c90a40..c751371 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/mapper/SysMessageMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/mapper/SysMessageMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.message.entity.SysMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 消息 + * 消息 + * * @Author: jeecg-boot * @Date: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/mapper/SysMessageTemplateMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/message/mapper/SysMessageTemplateMapper.java index 1f4e3f7..d8ef9a3 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/mapper/SysMessageTemplateMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/mapper/SysMessageTemplateMapper.java @@ -7,7 +7,8 @@ import org.apache.ibatis.annotations.Select; import java.util.List; /** - * @Description: 消息模板 + * 消息模板 + * * @Author: jeecg-boot * @Date: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/service/ISysMessageService.java b/src/main/java/cc/niushuai/bastionserver/modules/message/service/ISysMessageService.java index 8ff0324..6cdd82e 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/service/ISysMessageService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/service/ISysMessageService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.common.base.service.BaseService; import cc.niushuai.bastionserver.modules.message.entity.SysMessage; /** - * @Description: 消息 + * 消息 + * * @Author: jeecg-boot * @Date: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/service/ISysMessageTemplateService.java b/src/main/java/cc/niushuai/bastionserver/modules/message/service/ISysMessageTemplateService.java index cdfe7b4..c427fdc 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/service/ISysMessageTemplateService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/service/ISysMessageTemplateService.java @@ -6,7 +6,8 @@ import cc.niushuai.bastionserver.modules.message.entity.SysMessageTemplate; import java.util.List; /** - * @Description: 消息模板 + * 消息模板 + * * @Author: jeecg-boot * @Date: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/service/impl/SysMessageServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/message/service/impl/SysMessageServiceImpl.java index ba833ad..ebb4425 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/service/impl/SysMessageServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/service/impl/SysMessageServiceImpl.java @@ -7,7 +7,8 @@ import cc.niushuai.bastionserver.modules.message.service.ISysMessageService; import org.springframework.stereotype.Service; /** - * @Description: 消息 + * 消息 + * * @Author: jeecg-boot * @Date: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/service/impl/SysMessageTemplateServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/message/service/impl/SysMessageTemplateServiceImpl.java index 32c9963..a5ce6f7 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/service/impl/SysMessageTemplateServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/service/impl/SysMessageTemplateServiceImpl.java @@ -10,7 +10,8 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * @Description: 消息模板 + * 消息模板 + * * @Author: jeecg-boot * @Date: 2019-04-09 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/websocket/SocketHandler.java b/src/main/java/cc/niushuai/bastionserver/modules/message/websocket/SocketHandler.java index 54b553b..1a53c0d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/websocket/SocketHandler.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/websocket/SocketHandler.java @@ -2,7 +2,7 @@ package cc.niushuai.bastionserver.modules.message.websocket; import cc.niushuai.bastionserver.common.base.BaseMap; import cc.niushuai.bastionserver.common.constant.CommonSendStatus; -import cc.niushuai.bastionserver.common.modules.redis.listener.JeecgRedisListener; +import cc.niushuai.bastionserver.common.modules.redis.listener.AppRedisListener; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component(WebSocket.REDIS_TOPIC_NAME) -public class SocketHandler implements JeecgRedisListener { +public class SocketHandler implements AppRedisListener { @Autowired private WebSocket webSocket; diff --git a/src/main/java/cc/niushuai/bastionserver/modules/message/websocket/WebSocket.java b/src/main/java/cc/niushuai/bastionserver/modules/message/websocket/WebSocket.java index f76316c..510eca6 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/message/websocket/WebSocket.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/message/websocket/WebSocket.java @@ -2,7 +2,7 @@ package cc.niushuai.bastionserver.modules.message.websocket; import cc.niushuai.bastionserver.common.base.BaseMap; import cc.niushuai.bastionserver.common.constant.WebsocketConst; -import cc.niushuai.bastionserver.common.modules.redis.client.JeecgRedisClient; +import cc.niushuai.bastionserver.common.modules.redis.client.RedisClient; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * @Author scott * @Date 2019/11/29 9:41 - * @Description: 此注解相当于设置访问URL + * 此注解相当于设置访问URL */ @Component @Slf4j @@ -33,7 +33,7 @@ public class WebSocket { */ private static ConcurrentHashMap sessionPool = new ConcurrentHashMap<>(); @Resource - private JeecgRedisClient jeecgRedisClient; + private RedisClient redisClient; //==========【websocket接受、推送消息等方法 —— 具体服务节点推送ws消息】======================================================================================== @@ -148,7 +148,7 @@ public class WebSocket { BaseMap baseMap = new BaseMap(); baseMap.put("userId", ""); baseMap.put("message", message); - jeecgRedisClient.sendMessage(REDIS_TOPIC_NAME, baseMap); + redisClient.sendMessage(REDIS_TOPIC_NAME, baseMap); } /** @@ -161,7 +161,7 @@ public class WebSocket { BaseMap baseMap = new BaseMap(); baseMap.put("userId", userId); baseMap.put("message", message); - jeecgRedisClient.sendMessage(REDIS_TOPIC_NAME, baseMap); + redisClient.sendMessage(REDIS_TOPIC_NAME, baseMap); } /** diff --git a/src/main/java/cc/niushuai/bastionserver/modules/monitor/controller/ActuatorRedisController.java b/src/main/java/cc/niushuai/bastionserver/modules/monitor/controller/ActuatorRedisController.java index 1b6a618..dbb4f52 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/monitor/controller/ActuatorRedisController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/monitor/controller/ActuatorRedisController.java @@ -20,7 +20,8 @@ import java.util.List; import java.util.Map; /** - * @Description: ActuatorRedisController + * ActuatorRedisController + * * @author: jeecg-boot */ @Slf4j diff --git a/src/main/java/cc/niushuai/bastionserver/modules/monitor/domain/RedisInfo.java b/src/main/java/cc/niushuai/bastionserver/modules/monitor/domain/RedisInfo.java index ab32411..4ee0040 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/monitor/domain/RedisInfo.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/monitor/domain/RedisInfo.java @@ -4,7 +4,8 @@ import java.util.HashMap; import java.util.Map; /** - * @Description: redis信息 + * redis信息 + * * @author: jeecg-boot */ public class RedisInfo { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/monitor/service/RedisService.java b/src/main/java/cc/niushuai/bastionserver/modules/monitor/service/RedisService.java index 83eef07..02dca59 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/monitor/service/RedisService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/monitor/service/RedisService.java @@ -8,7 +8,8 @@ import java.util.List; import java.util.Map; /** - * @Description: redis信息service接口 + * redis信息service接口 + * * @author: jeecg-boot */ public interface RedisService { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/oss/entity/OssFile.java b/src/main/java/cc/niushuai/bastionserver/modules/oss/entity/OssFile.java index aa5cdc1..c2e262b 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/oss/entity/OssFile.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/oss/entity/OssFile.java @@ -8,7 +8,8 @@ import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; /** - * @Description: oss云存储实体类 + * oss云存储实体类 + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/modules/oss/mapper/OssFileMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/oss/mapper/OssFileMapper.java index 170e021..bad8a64 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/oss/mapper/OssFileMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/oss/mapper/OssFileMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.oss.entity.OssFile; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: oss云存储Mapper + * oss云存储Mapper + * * @author: jeecg-boot */ public interface OssFileMapper extends BaseMapper { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/oss/service/IOssFileService.java b/src/main/java/cc/niushuai/bastionserver/modules/oss/service/IOssFileService.java index f41f79e..351b7c5 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/oss/service/IOssFileService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/oss/service/IOssFileService.java @@ -7,7 +7,8 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; /** - * @Description: OOS云存储service接口 + * OOS云存储service接口 + * * @author: jeecg-boot */ public interface IOssFileService extends IService { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/oss/service/impl/OssFileServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/oss/service/impl/OssFileServiceImpl.java index bdc1308..29e2577 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/oss/service/impl/OssFileServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/oss/service/impl/OssFileServiceImpl.java @@ -10,7 +10,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; /** - * @Description: OSS云存储实现类 + * OSS云存储实现类 + * * @author: jeecg-boot */ @Service("ossFileService") diff --git a/src/main/java/cc/niushuai/bastionserver/modules/quartz/controller/QuartzJobController.java b/src/main/java/cc/niushuai/bastionserver/modules/quartz/controller/QuartzJobController.java index 2d79c8c..7c7d273 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/quartz/controller/QuartzJobController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/quartz/controller/QuartzJobController.java @@ -37,7 +37,8 @@ import java.util.List; import java.util.Map; /** - * @Description: 定时任务在线管理 + * 定时任务在线管理 + * * @Author: jeecg-boot * @Date: 2019-01-02 * @Version:V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/quartz/entity/QuartzJob.java b/src/main/java/cc/niushuai/bastionserver/modules/quartz/entity/QuartzJob.java index 295a884..f6e4b50 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/quartz/entity/QuartzJob.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/quartz/entity/QuartzJob.java @@ -12,7 +12,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** - * @Description: 定时任务在线管理 + * 定时任务在线管理 + * * @Author: jeecg-boot * @Date: 2019-01-02 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/quartz/job/AsyncJob.java b/src/main/java/cc/niushuai/bastionserver/modules/quartz/job/AsyncJob.java index 4cb03a1..cc2d8bf 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/quartz/job/AsyncJob.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/quartz/job/AsyncJob.java @@ -5,10 +5,11 @@ import lombok.extern.slf4j.Slf4j; import org.quartz.*; /** - * @Description: 同步定时任务测试 + * 同步定时任务测试 *

* 此处的同步是指 当定时任务的执行时间大于任务的时间间隔时 * 会等待第一个任务执行完成才会走第二个任务 + * * @author: taoyan * @date: 2020年06月19日 */ diff --git a/src/main/java/cc/niushuai/bastionserver/modules/quartz/mapper/QuartzJobMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/quartz/mapper/QuartzJobMapper.java index 1957c15..263021d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/quartz/mapper/QuartzJobMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/quartz/mapper/QuartzJobMapper.java @@ -7,7 +7,8 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Description: 定时任务在线管理 + * 定时任务在线管理 + * * @Author: jeecg-boot * @Date: 2019-01-02 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/quartz/service/IQuartzJobService.java b/src/main/java/cc/niushuai/bastionserver/modules/quartz/service/IQuartzJobService.java index 0e14fe2..2230a9c 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/quartz/service/IQuartzJobService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/quartz/service/IQuartzJobService.java @@ -7,7 +7,8 @@ import org.quartz.SchedulerException; import java.util.List; /** - * @Description: 定时任务在线管理 + * 定时任务在线管理 + * * @Author: jeecg-boot * @Date: 2019-04-28 * @Version: V1.1 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/quartz/service/impl/QuartzJobServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/quartz/service/impl/QuartzJobServiceImpl.java index 4ca2177..ab30076 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -17,7 +17,8 @@ import java.util.Date; import java.util.List; /** - * @Description: 定时任务在线管理 + * 定时任务在线管理 + * * @Author: jeecg-boot * @Date: 2019-04-28 * @Version: V1.1 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/CommonController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/CommonController.java index ec4604b..a0d6b2b 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/CommonController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/CommonController.java @@ -37,13 +37,13 @@ import java.io.*; @RequestMapping("/sys/common") public class CommonController { - @Value(value = "${jeecg.path.upload}") + @Value(value = "${app.path.upload}") private String uploadpath; /** - * 本地：local minio：minio 阿里：alioss + * 本地：local minio：minio 阿里：ali oss */ - @Value(value = "${jeecg.uploadType}") + @Value(value = "${app.uploadType}") private String uploadType; /** diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/DuplicateCheckController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/DuplicateCheckController.java index 2527583..c009c1d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/DuplicateCheckController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/DuplicateCheckController.java @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest; /** * @Title: DuplicateCheckAction - * @Description: 重复校验工具 + * 重复校验工具 * @Author 张代浩 * @Date 2019-03-25 * @Version V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/LoginController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/LoginController.java index a7ab749..1584a63 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/LoginController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/LoginController.java @@ -4,11 +4,10 @@ import cc.niushuai.bastionserver.common.api.vo.Result; import cc.niushuai.bastionserver.common.constant.CacheConstant; import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.constant.SymbolConstant; -import cc.niushuai.bastionserver.common.util.JwtUtil; import cc.niushuai.bastionserver.common.system.vo.LoginUser; import cc.niushuai.bastionserver.common.util.*; import cc.niushuai.bastionserver.common.util.encryption.EncryptedString; -import cc.niushuai.bastionserver.config.JeecgBaseConfig; +import cc.niushuai.bastionserver.config.AppConfig; import cc.niushuai.bastionserver.modules.base.service.BaseCommonService; import cc.niushuai.bastionserver.modules.system.entity.SysDepart; import cc.niushuai.bastionserver.modules.system.entity.SysRoleIndex; @@ -66,7 +65,7 @@ public class LoginController { @Resource private BaseCommonService baseCommonService; @Autowired - private JeecgBaseConfig jeecgBaseConfig; + private AppConfig appConfig; @ApiOperation("登录接口") @RequestMapping(value = "/login", method = RequestMethod.POST) @@ -88,7 +87,7 @@ public class LoginController { String lowerCaseCaptcha = captcha.toLowerCase(); //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 // 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可 - String origin = lowerCaseCaptcha + sysLoginModel.getCheckKey() + jeecgBaseConfig.getSignatureSecret(); + String origin = lowerCaseCaptcha + sysLoginModel.getCheckKey() + appConfig.getSignatureSecret(); String realKey = Md5Util.md5Encode(origin, "utf-8"); //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 Object checkCode = redisUtil.get(realKey); @@ -512,7 +511,7 @@ public class LoginController { //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 // 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可 - String origin = lowerCaseCode + key + jeecgBaseConfig.getSignatureSecret(); + String origin = lowerCaseCode + key + appConfig.getSignatureSecret(); String realKey = Md5Util.md5Encode(origin, "utf-8"); //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysAnnouncementController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysAnnouncementController.java index 23e6eaa..29f2b8f 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysAnnouncementController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysAnnouncementController.java @@ -5,12 +5,8 @@ import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.constant.CommonSendStatus; import cc.niushuai.bastionserver.common.constant.WebsocketConst; import cc.niushuai.bastionserver.common.system.query.QueryGenerator; -import cc.niushuai.bastionserver.common.util.JwtUtil; import cc.niushuai.bastionserver.common.system.vo.LoginUser; -import cc.niushuai.bastionserver.common.util.DateUtils; -import cc.niushuai.bastionserver.common.util.RedisUtil; -import cc.niushuai.bastionserver.common.util.TokenUtils; -import cc.niushuai.bastionserver.common.util.oConvertUtils; +import cc.niushuai.bastionserver.common.util.*; import cc.niushuai.bastionserver.modules.message.enums.RangeDateEnum; import cc.niushuai.bastionserver.modules.message.websocket.WebSocket; import cc.niushuai.bastionserver.modules.system.entity.SysAnnouncement; @@ -57,7 +53,7 @@ import static cc.niushuai.bastionserver.common.constant.CommonConstant.ANNOUNCEM /** * @Title: Controller - * @Description: 系统通告表 + * 系统通告表 * @Author: jeecg-boot * @Date: 2019-01-02 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysAnnouncementSendController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysAnnouncementSendController.java index 82e540a..f7d11fd 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysAnnouncementSendController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysAnnouncementSendController.java @@ -28,7 +28,7 @@ import java.util.Date; /** * @Title: Controller - * @Description: 用户通告阅读标记表 + * 用户通告阅读标记表 * @Author: jeecg-boot * @Date: 2019-02-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCategoryController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCategoryController.java index 93a3daa..091466e 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCategoryController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCategoryController.java @@ -37,7 +37,8 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 分类字典 + * 分类字典 + * * @Author: jeecg-boot * @Date: 2019-05-29 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCheckRuleController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCheckRuleController.java index 35a6da1..068a289 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCheckRuleController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCheckRuleController.java @@ -24,7 +24,8 @@ import java.net.URLDecoder; import java.util.Arrays; /** - * @Description: 编码校验规则 + * 编码校验规则 + * * @Author: jeecg-boot * @Date: 2020-02-04 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCommentController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCommentController.java index 4cee91d..3f60e85 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCommentController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysCommentController.java @@ -2,9 +2,9 @@ package cc.niushuai.bastionserver.modules.system.controller; import cc.niushuai.bastionserver.common.api.dto.DataLogDTO; import cc.niushuai.bastionserver.common.api.vo.Result; +import cc.niushuai.bastionserver.common.base.controller.BaseController; import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.system.api.ISysBaseAPI; -import cc.niushuai.bastionserver.common.base.controller.BaseController; import cc.niushuai.bastionserver.common.system.query.QueryGenerator; import cc.niushuai.bastionserver.common.system.vo.LoginUser; import cc.niushuai.bastionserver.modules.system.entity.SysComment; @@ -29,7 +29,8 @@ import java.util.Arrays; import java.util.List; /** - * @Description: 系统评论回复表 + * 系统评论回复表 + * * @Author: jeecg-boot * @Date: 2022-07-19 * @Version: V1.0 @@ -50,7 +51,7 @@ public class SysCommentController extends BaseController ls = this.sysDepartService.list(query); result.setSuccess(true); diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysDepartPermissionController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysDepartPermissionController.java index 5a33ff0..e7f4d54 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysDepartPermissionController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysDepartPermissionController.java @@ -1,8 +1,8 @@ package cc.niushuai.bastionserver.modules.system.controller; import cc.niushuai.bastionserver.common.api.vo.Result; -import cc.niushuai.bastionserver.common.constant.CommonConstant; 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.vo.LoginUser; import cc.niushuai.bastionserver.common.util.oConvertUtils; @@ -35,7 +35,8 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 部门权限表 + * 部门权限表 + * * @Author: jeecg-boot * @Date: 2020-02-11 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysDepartRoleController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysDepartRoleController.java index c211359..7f3442d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysDepartRoleController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysDepartRoleController.java @@ -2,8 +2,8 @@ package cc.niushuai.bastionserver.modules.system.controller; import cc.niushuai.bastionserver.common.api.vo.Result; import cc.niushuai.bastionserver.common.aspect.annotation.AutoLog; -import cc.niushuai.bastionserver.common.constant.CommonConstant; 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.vo.LoginUser; import cc.niushuai.bastionserver.common.util.oConvertUtils; @@ -35,7 +35,8 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @Description: 部门角色 + * 部门角色 + * * @Author: jeecg-boot * @Date: 2020-02-12 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFilesController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFilesController.java index 49f98df..bbeb995 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFilesController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFilesController.java @@ -21,7 +21,8 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** - * @Description: 知识库-文档管理 + * 知识库-文档管理 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFillRuleController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFillRuleController.java index 286c1ad..a8bec48 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFillRuleController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFillRuleController.java @@ -24,7 +24,8 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** - * @Description: 填值规则 + * 填值规则 + * * @Author: jeecg-boot * @Date: 2019-11-07 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFormFileController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFormFileController.java index a362060..6da234b 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFormFileController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysFormFileController.java @@ -21,7 +21,8 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** - * @Description: 表单评论文件 + * 表单评论文件 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysGatewayRouteController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysGatewayRouteController.java index 5bb06a9..e6477e0 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysGatewayRouteController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysGatewayRouteController.java @@ -16,7 +16,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Description: gateway路由管理 + * gateway路由管理 + * * @Author: jeecg-boot * @Date: 2020-05-26 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysPermissionController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysPermissionController.java index ed95ef4..0489a5f 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysPermissionController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysPermissionController.java @@ -7,7 +7,7 @@ import cc.niushuai.bastionserver.common.exception.BusinessException; import cc.niushuai.bastionserver.common.system.vo.LoginUser; import cc.niushuai.bastionserver.common.util.Md5Util; import cc.niushuai.bastionserver.common.util.oConvertUtils; -import cc.niushuai.bastionserver.config.JeecgBaseConfig; +import cc.niushuai.bastionserver.config.AppConfig; import cc.niushuai.bastionserver.modules.base.service.BaseCommonService; import cc.niushuai.bastionserver.modules.system.entity.*; import cc.niushuai.bastionserver.modules.system.model.SysPermissionTree; @@ -55,7 +55,7 @@ public class SysPermissionController { @Autowired private ISysUserService sysUserService; @Autowired - private JeecgBaseConfig jeecgBaseConfig; + private AppConfig appConfig; @Autowired private BaseCommonService baseCommonService; @Autowired @@ -290,7 +290,7 @@ public class SysPermissionController { json.put("auth", authjsonArray); //全部权限配置集合（按钮权限，访问权限） json.put("allAuth", allAuthJsonArray); - json.put("sysSafeMode", jeecgBaseConfig.getSafeMode()); + json.put("sysSafeMode", appConfig.getSafeMode()); result.setResult(json); } catch (Exception e) { result.error500("查询失败:" + e.getMessage()); @@ -337,7 +337,7 @@ public class SysPermissionController { //全部权限配置集合（按钮权限，访问权限） result.put("allAuth", allAuthArray); // 系统安全模式 - result.put("sysSafeMode", jeecgBaseConfig.getSafeMode()); + result.put("sysSafeMode", appConfig.getSafeMode()); return Result.OK(result); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysPositionController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysPositionController.java index cadd38d..5583004 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysPositionController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysPositionController.java @@ -39,7 +39,8 @@ import java.util.List; import java.util.Map; /** - * @Description: 职务表 + * 职务表 + * * @Author: jeecg-boot * @Date: 2019-09-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysRoleIndexController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysRoleIndexController.java index 73e26f6..6b020d8 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysRoleIndexController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysRoleIndexController.java @@ -22,7 +22,8 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** - * @Description: 角色首页配置 + * 角色首页配置 + * * @Author: jeecg-boot * @Date: 2022-03-25 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysTenantController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysTenantController.java index 79c190e..ea6f087 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysTenantController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysTenantController.java @@ -192,7 +192,7 @@ public class SysTenantController { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysTenant::getStatus, 1); if (oConvertUtils.isNotEmpty(ids)) { - query.in(SysTenant::getId, (Object[])(ids.split(","))); + query.in(SysTenant::getId, (Object[]) (ids.split(","))); } //此处查询忽略时间条件 List ls = sysTenantService.list(query); diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserAgentController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserAgentController.java index ccbb407..f1cd6d6 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserAgentController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserAgentController.java @@ -32,7 +32,7 @@ import java.util.Map; /** * @Title: Controller - * @Description: 用户代理人设置 + * 用户代理人设置 * @Author: jeecg-boot * @Date: 2019-04-17 * @Version: V1.0 @@ -44,7 +44,7 @@ public class SysUserAgentController { @Autowired private ISysUserAgentService sysUserAgentService; - @Value("${jeecg.path.upload}") + @Value("${app.path.upload}") private String upLoadPath; /** diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserController.java index c630976..be8b871 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserController.java @@ -6,7 +6,6 @@ import cc.niushuai.bastionserver.common.aspect.annotation.PermissionData; import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.constant.SymbolConstant; import cc.niushuai.bastionserver.common.system.query.QueryGenerator; -import cc.niushuai.bastionserver.common.util.JwtUtil; import cc.niushuai.bastionserver.common.system.vo.LoginUser; import cc.niushuai.bastionserver.common.util.*; import cc.niushuai.bastionserver.modules.base.service.BaseCommonService; @@ -83,7 +82,7 @@ public class SysUserController { @Autowired private RedisUtil redisUtil; - @Value("${jeecg.path.upload}") + @Value("${app.path.upload}") private String upLoadPath; @Autowired @@ -471,7 +470,7 @@ public class SysUserController { //update-begin--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据-------------------- String selections = request.getParameter("selections"); if (!oConvertUtils.isEmpty(selections)) { - queryWrapper.in("id", (Object[])(selections.split(","))); + queryWrapper.in("id", (Object[]) (selections.split(","))); } //update-end--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据---------------------- List pageList = sysUserService.list(queryWrapper); @@ -1181,7 +1180,7 @@ public class SysUserController { query.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0); if (oConvertUtils.isNotEmpty(username)) { if (username.contains(",")) { - query.in(SysUser::getUsername, (Object[])(username.split(","))); + query.in(SysUser::getUsername, (Object[]) (username.split(","))); } else { query.eq(SysUser::getUsername, username); } diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserOnlineController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserOnlineController.java index 1e4ed1d..2ecfedf 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserOnlineController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/SysUserOnlineController.java @@ -3,8 +3,8 @@ package cc.niushuai.bastionserver.modules.system.controller; import cc.niushuai.bastionserver.common.api.vo.Result; import cc.niushuai.bastionserver.common.constant.CacheConstant; 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.util.JwtUtil; import cc.niushuai.bastionserver.common.util.RedisUtil; import cc.niushuai.bastionserver.common.util.oConvertUtils; import cc.niushuai.bastionserver.modules.base.service.BaseCommonService; @@ -27,7 +27,8 @@ import java.util.Collections; import java.util.List; /** - * @Description: 在线用户 + * 在线用户 + * * @Author: chenli * @Date: 2020-06-07 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/ThirdLoginController.java b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/ThirdLoginController.java index 5274329..2e3fd86 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/controller/ThirdLoginController.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/controller/ThirdLoginController.java @@ -2,11 +2,7 @@ package cc.niushuai.bastionserver.modules.system.controller; import cc.niushuai.bastionserver.common.api.vo.Result; import cc.niushuai.bastionserver.common.constant.CommonConstant; -import cc.niushuai.bastionserver.common.util.JwtUtil; -import cc.niushuai.bastionserver.common.util.PasswordUtil; -import cc.niushuai.bastionserver.common.util.RedisUtil; -import cc.niushuai.bastionserver.common.util.RestUtil; -import cc.niushuai.bastionserver.common.util.oConvertUtils; +import cc.niushuai.bastionserver.common.util.*; import cc.niushuai.bastionserver.config.thirdapp.ThirdAppConfig; import cc.niushuai.bastionserver.config.thirdapp.ThirdAppTypeItemVo; import cc.niushuai.bastionserver.modules.base.service.BaseCommonService; diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysAnnouncement.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysAnnouncement.java index 280757a..df0c344 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysAnnouncement.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysAnnouncement.java @@ -12,7 +12,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** - * @Description: 系统通告表 + * 系统通告表 + * * @Author: jeecg-boot * @Date: 2019-01-02 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysAnnouncementSend.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysAnnouncementSend.java index bfd3f51..af35d68 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysAnnouncementSend.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysAnnouncementSend.java @@ -11,7 +11,8 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 用户通告阅读标记表 + * 用户通告阅读标记表 + * * @Author: jeecg-boot * @Date: 2019-02-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysCategory.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysCategory.java index 8ba1725..3d17dc9 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysCategory.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysCategory.java @@ -11,7 +11,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** - * @Description: 分类字典 + * 分类字典 + * * @Author: jeecg-boot * @Date: 2019-05-29 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysCheckRule.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysCheckRule.java index c318be7..1994edb 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysCheckRule.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysCheckRule.java @@ -15,7 +15,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** - * @Description: 编码校验规则 + * 编码校验规则 + * * @Author: jeecg-boot * @Date: 2020-02-04 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysComment.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysComment.java index 22e3e44..e491abd 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysComment.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysComment.java @@ -17,7 +17,8 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 系统评论回复表 + * 系统评论回复表 + * * @Author: jeecg-boot * @Date: 2022-07-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDataLog.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDataLog.java index 09566ed..2a18fa6 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDataLog.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDataLog.java @@ -12,7 +12,8 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 系统数据日志 + * 系统数据日志 + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDataSource.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDataSource.java index be035a7..afa797e 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDataSource.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDataSource.java @@ -14,7 +14,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** - * @Description: 多数据源管理 + * 多数据源管理 + * * @Author: jeecg-boot * @Date: 2019-12-25 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartPermission.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartPermission.java index d913beb..dde1a18 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartPermission.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartPermission.java @@ -12,7 +12,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; /** - * @Description: 部门权限表 + * 部门权限表 + * * @Author: jeecg-boot * @Date: 2020-02-11 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRole.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRole.java index 2a4c89e..7b82f0c 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRole.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRole.java @@ -15,7 +15,8 @@ import org.springframework.format.annotation.DateTimeFormat; /** - * @Description: 部门角色 + * 部门角色 + * * @Author: jeecg-boot * @Date: 2020-02-12 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRolePermission.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRolePermission.java index cc4a19e..999d958 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRolePermission.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRolePermission.java @@ -16,7 +16,8 @@ import java.util.Date; /** - * @Description: 部门角色权限 + * 部门角色权限 + * * @Author: jeecg-boot * @Date: 2020-02-12 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRoleUser.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRoleUser.java index fe1b2b6..b722958 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRoleUser.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysDepartRoleUser.java @@ -12,7 +12,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; /** - * @Description: 部门角色人员信息 + * 部门角色人员信息 + * * @Author: jeecg-boot * @Date: 2020-02-13 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFiles.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFiles.java index 2cd9049..2d529d1 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFiles.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFiles.java @@ -15,7 +15,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** - * @Description: 知识库-文档管理 + * 知识库-文档管理 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFillRule.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFillRule.java index 6df94c9..71bf6bd 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFillRule.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFillRule.java @@ -13,7 +13,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** - * @Description: 填值规则 + * 填值规则 + * * @Author: jeecg-boot * @Date: 2019-11-07 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFormFile.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFormFile.java index 10203a6..5bcc256 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFormFile.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysFormFile.java @@ -15,7 +15,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** - * @Description: 表单评论文件 + * 表单评论文件 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysGatewayRoute.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysGatewayRoute.java index 82ae332..174f717 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysGatewayRoute.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysGatewayRoute.java @@ -17,7 +17,8 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: gateway路由管理 + * gateway路由管理 + * * @Author: jeecg-boot * @Date: 2020-05-26 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysPosition.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysPosition.java index f59c47e..5251fee 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysPosition.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysPosition.java @@ -14,7 +14,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** - * @Description: 职务表 + * 职务表 + * * @Author: jeecg-boot * @Date: 2019-09-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysRoleIndex.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysRoleIndex.java index 794c86c..efffca7 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysRoleIndex.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysRoleIndex.java @@ -17,7 +17,8 @@ import java.util.Date; /** - * @Description: 角色首页配置 + * 角色首页配置 + * * @Author: liusq * @Date: 2022-03-25 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysThirdAccount.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysThirdAccount.java index ec60894..a0afd2f 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysThirdAccount.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysThirdAccount.java @@ -13,7 +13,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** - * @Description: 第三方登录账号表 + * 第三方登录账号表 + * * @Author: jeecg-boot * @Date: 2020-11-17 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysUserAgent.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysUserAgent.java index e315cb6..ef100b7 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysUserAgent.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysUserAgent.java @@ -13,7 +13,8 @@ import java.util.Date; /** - * @Description: 用户代理人设置 + * 用户代理人设置 + * * @Author: jeecg-boot * @Date: 2019-04-17 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysUserDepart.java b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysUserDepart.java index 74a7b4e..10529b3 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysUserDepart.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/entity/SysUserDepart.java @@ -8,7 +8,8 @@ import lombok.Data; import java.io.Serializable; /** - * @Description: 用户部门 + * 用户部门 + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysAnnouncementMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysAnnouncementMapper.java index ab56935..08282dd 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysAnnouncementMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysAnnouncementMapper.java @@ -9,7 +9,8 @@ import java.util.Date; import java.util.List; /** - * @Description: 系统通告表 + * 系统通告表 + * * @Author: jeecg-boot * @Date: 2019-01-02 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysAnnouncementSendMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysAnnouncementSendMapper.java index 5eaaf85..6f7ea25 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysAnnouncementSendMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysAnnouncementSendMapper.java @@ -9,7 +9,8 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Description: 用户通告阅读标记表 + * 用户通告阅读标记表 + * * @Author: jeecg-boot * @Date: 2019-02-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCategoryMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCategoryMapper.java index a4bee0d..f7564a4 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCategoryMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCategoryMapper.java @@ -10,7 +10,8 @@ import java.util.List; import java.util.Map; /** - * @Description: 分类字典 + * 分类字典 + * * @Author: jeecg-boot * @Date: 2019-05-29 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCheckRuleMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCheckRuleMapper.java index 6075296..a4d06be 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCheckRuleMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCheckRuleMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysCheckRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 编码校验规则 + * 编码校验规则 + * * @Author: jeecg-boot * @Date: 2020-02-04 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCommentMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCommentMapper.java index d8c8c15..8ad8feb 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCommentMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysCommentMapper.java @@ -12,7 +12,8 @@ import java.util.List; import java.util.Set; /** - * @Description: 系统评论回复表 + * 系统评论回复表 + * * @Author: jeecg-boot * @Date: 2022-07-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDataLogMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDataLogMapper.java index 4caff8a..759903f 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDataLogMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDataLogMapper.java @@ -5,7 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; /** - * @Description: 系统数据日志Mapper接口 + * 系统数据日志Mapper接口 + * * @author: jeecg-boot */ public interface SysDataLogMapper extends BaseMapper { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDataSourceMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDataSourceMapper.java index 95344b9..40b6b73 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDataSourceMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDataSourceMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysDataSource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 多数据源管理 + * 多数据源管理 + * * @Author: jeecg-boot * @Date: 2019-12-25 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartPermissionMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartPermissionMapper.java index 14c36fc..2118152 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartPermissionMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartPermissionMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysDepartPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 部门权限表 + * 部门权限表 + * * @Author: jeecg-boot * @Date: 2020-02-11 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRoleMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRoleMapper.java index c4f9513..ec37409 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRoleMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRoleMapper.java @@ -7,7 +7,8 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Description: 部门角色 + * 部门角色 + * * @Author: jeecg-boot * @Date: 2020-02-12 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRolePermissionMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRolePermissionMapper.java index 658889e..7e98a51 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRolePermissionMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRolePermissionMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysDepartRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 部门角色权限 + * 部门角色权限 + * * @Author: jeecg-boot * @Date: 2020-02-12 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRoleUserMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRoleUserMapper.java index dfa0185..23c92a0 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRoleUserMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysDepartRoleUserMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysDepartRoleUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 部门角色人员信息 + * 部门角色人员信息 + * * @Author: jeecg-boot * @Date: 2020-02-13 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFilesMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFilesMapper.java index d99810c..8a99ba6 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFilesMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFilesMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysFiles; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 知识库-文档管理 + * 知识库-文档管理 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFillRuleMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFillRuleMapper.java index 3799b2b..13b6268 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFillRuleMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFillRuleMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysFillRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 填值规则 + * 填值规则 + * * @Author: jeecg-boot * @Date: 2019-11-07 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFormFileMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFormFileMapper.java index b895303..c27ea2f 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFormFileMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysFormFileMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysFormFile; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 表单评论文件 + * 表单评论文件 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysGatewayRouteMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysGatewayRouteMapper.java index d06e589..5772d2d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysGatewayRouteMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysGatewayRouteMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysGatewayRoute; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: gateway路由管理 + * gateway路由管理 + * * @Author: jeecg-boot * @Date: 2020-05-26 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysPositionMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysPositionMapper.java index 1f8a71f..64f24ba 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysPositionMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysPositionMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysPosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 职务表 + * 职务表 + * * @Author: jeecg-boot * @Date: 2019-09-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysRoleIndexMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysRoleIndexMapper.java index 8c613ed..2ce7350 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysRoleIndexMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysRoleIndexMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysRoleIndex; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 角色首页配置 + * 角色首页配置 + * * @Author: jeecg-boot * @Date: 2022-03-25 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysTenantMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysTenantMapper.java index f130db8..76e7286 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysTenantMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysTenantMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysTenant; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 租户mapper接口 + * 租户mapper接口 + * * @author: jeecg-boot */ public interface SysTenantMapper extends BaseMapper { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysThirdAccountMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysThirdAccountMapper.java index 778a94d..16248bc 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysThirdAccountMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysThirdAccountMapper.java @@ -7,7 +7,8 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Description: 第三方登录账号表 + * 第三方登录账号表 + * * @Author: jeecg-boot * @Date: 2020-11-17 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysUserAgentMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysUserAgentMapper.java index b9a7ae5..d0b16d3 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysUserAgentMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysUserAgentMapper.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysUserAgent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 用户代理人设置 + * 用户代理人设置 + * * @Author: jeecg-boot * @Date: 2019-04-17 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysUserDepartMapper.java b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysUserDepartMapper.java index ba7163b..a625953 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysUserDepartMapper.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/mapper/SysUserDepartMapper.java @@ -10,7 +10,8 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Description: 用户部门mapper接口 + * 用户部门mapper接口 + * * @author: jeecg-boot */ public interface SysUserDepartMapper extends BaseMapper { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/model/AnnouncementSendModel.java b/src/main/java/cc/niushuai/bastionserver/modules/system/model/AnnouncementSendModel.java index c4e0a30..4c57df7 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/model/AnnouncementSendModel.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/model/AnnouncementSendModel.java @@ -9,7 +9,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** - * @Description: 用户通告阅读标记表 + * 用户通告阅读标记表 + * * @Author: jeecg-boot * @Date: 2019-02-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/model/DuplicateCheckVo.java b/src/main/java/cc/niushuai/bastionserver/modules/system/model/DuplicateCheckVo.java index d8add7a..dfb7182 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/model/DuplicateCheckVo.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/model/DuplicateCheckVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @Title: DuplicateCheckVo - * @Description: 重复校验VO + * 重复校验VO * @Author 张代浩 * @Date 2019-03-25 * @Version V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/model/SysPermissionTree.java b/src/main/java/cc/niushuai/bastionserver/modules/system/model/SysPermissionTree.java index 700097a..cc2213f 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/model/SysPermissionTree.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/model/SysPermissionTree.java @@ -8,7 +8,8 @@ import java.util.Date; import java.util.List; /** - * @Description: 菜单树，封装树结构 + * 菜单树，封装树结构 + * * @author: jeecg-boot */ public class SysPermissionTree implements Serializable { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/rule/CategoryCodeRule.java b/src/main/java/cc/niushuai/bastionserver/modules/system/rule/CategoryCodeRule.java index 0e84e82..e349a06 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/rule/CategoryCodeRule.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/rule/CategoryCodeRule.java @@ -15,7 +15,7 @@ import java.util.List; /** * @Author scott * @Date 2019/12/9 11:32 - * @Description: 分类字典编码生成规则 + * 分类字典编码生成规则 */ @Slf4j public class CategoryCodeRule implements IFillRuleHandler { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/rule/OrgCodeRule.java b/src/main/java/cc/niushuai/bastionserver/modules/system/rule/OrgCodeRule.java index a3469c9..4eef090 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/rule/OrgCodeRule.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/rule/OrgCodeRule.java @@ -15,7 +15,7 @@ import java.util.List; /** * @Author scott * @Date 2019/12/9 11:33 - * @Description: 机构编码生成规则 + * 机构编码生成规则 */ public class OrgCodeRule implements IFillRuleHandler { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysAnnouncementSendService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysAnnouncementSendService.java index 3846140..f61278e 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysAnnouncementSendService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysAnnouncementSendService.java @@ -8,7 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * @Description: 用户通告阅读标记表 + * 用户通告阅读标记表 + * * @Author: jeecg-boot * @Date: 2019-02-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysAnnouncementService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysAnnouncementService.java index 38649e0..1a5179a 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysAnnouncementService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysAnnouncementService.java @@ -8,7 +8,8 @@ import java.util.Date; import java.util.List; /** - * @Description: 系统通告表 + * 系统通告表 + * * @Author: jeecg-boot * @Date: 2019-01-02 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCategoryService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCategoryService.java index 8a083d8..3e020d1 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCategoryService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCategoryService.java @@ -9,7 +9,8 @@ import java.util.List; import java.util.Map; /** - * @Description: 分类字典 + * 分类字典 + * * @Author: jeecg-boot * @Date: 2019-05-29 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCheckRuleService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCheckRuleService.java index 1946395..de5ddb6 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCheckRuleService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCheckRuleService.java @@ -5,7 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 编码校验规则 + * 编码校验规则 + * * @Author: jeecg-boot * @Date: 2020-02-04 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCommentService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCommentService.java index 18a30db..ef77395 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCommentService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysCommentService.java @@ -9,7 +9,8 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; /** - * @Description: 系统评论回复表 + * 系统评论回复表 + * * @Author: jeecg-boot * @Date: 2022-07-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDataLogService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDataLogService.java index 62d48f2..3a8bda7 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDataLogService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDataLogService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysDataLog; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 数据日志service接口 + * 数据日志service接口 + * * @author: jeecg-boot */ public interface ISysDataLogService extends IService { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDataSourceService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDataSourceService.java index cffeaff..09572fb 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDataSourceService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDataSourceService.java @@ -5,7 +5,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysDataSource; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 多数据源管理 + * 多数据源管理 + * * @Author: jeecg-boot * @Date: 2019-12-25 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartPermissionService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartPermissionService.java index 40fecf2..da1373d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartPermissionService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartPermissionService.java @@ -7,7 +7,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * @Description: 部门权限表 + * 部门权限表 + * * @Author: jeecg-boot * @Date: 2020-02-11 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRolePermissionService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRolePermissionService.java index 6a623ce..f1bef09 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRolePermissionService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRolePermissionService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysDepartRolePermission; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 部门角色权限 + * 部门角色权限 + * * @Author: jeecg-boot * @Date: 2020-02-12 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRoleService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRoleService.java index 809ebfa..d4dbec7 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRoleService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRoleService.java @@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * @Description: 部门角色 + * 部门角色 + * * @Author: jeecg-boot * @Date: 2020-02-12 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRoleUserService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRoleUserService.java index 7e37341..aeb0bac 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRoleUserService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysDepartRoleUserService.java @@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * @Description: 部门角色人员信息 + * 部门角色人员信息 + * * @Author: jeecg-boot * @Date: 2020-02-13 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFilesService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFilesService.java index efb93cd..1e692f8 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFilesService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFilesService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysFiles; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 知识库-文档管理 + * 知识库-文档管理 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFillRuleService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFillRuleService.java index 778adce..7342dca 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFillRuleService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFillRuleService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysFillRule; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 填值规则 + * 填值规则 + * * @Author: jeecg-boot * @Date: 2019-11-07 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFormFileService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFormFileService.java index 5e7cc79..b0f098d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFormFileService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysFormFileService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysFormFile; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 表单评论文件 + * 表单评论文件 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysGatewayRouteService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysGatewayRouteService.java index f715459..d593bb0 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysGatewayRouteService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysGatewayRouteService.java @@ -5,7 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: gateway路由管理 + * gateway路由管理 + * * @Author: jeecg-boot * @Date: 2020-05-26 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysPositionService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysPositionService.java index eadbc6a..1b68121 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysPositionService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysPositionService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysPosition; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 职务表 + * 职务表 + * * @Author: jeecg-boot * @Date: 2019-09-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysRoleIndexService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysRoleIndexService.java index c02ca8a..54279ff 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysRoleIndexService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysRoleIndexService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysRoleIndex; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 角色首页配置 + * 角色首页配置 + * * @Author: jeecg-boot * @Date: 2022-03-25 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysTenantService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysTenantService.java index 4e59ac3..692dc15 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysTenantService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysTenantService.java @@ -7,7 +7,8 @@ import java.util.Collection; import java.util.List; /** - * @Description: 租户service接口 + * 租户service接口 + * * @author: jeecg-boot */ public interface ISysTenantService extends IService { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysThirdAccountService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysThirdAccountService.java index 8b1c41d..a643f73 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysThirdAccountService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysThirdAccountService.java @@ -8,7 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * @Description: 第三方登录账号表 + * 第三方登录账号表 + * * @Author: jeecg-boot * @Date: 2020-11-17 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysUserAgentService.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysUserAgentService.java index 41f55e4..e225234 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysUserAgentService.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/ISysUserAgentService.java @@ -4,7 +4,8 @@ import cc.niushuai.bastionserver.modules.system.entity.SysUserAgent; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 用户代理人设置 + * 用户代理人设置 + * * @Author: jeecg-boot * @Date: 2019-04-17 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ImportFileServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ImportFileServiceImpl.java index d7ddb08..ccdeb2e 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ImportFileServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ImportFileServiceImpl.java @@ -15,10 +15,10 @@ import org.springframework.stereotype.Service; @Service public class ImportFileServiceImpl implements ImportFileServiceI { - @Value("${jeecg.path.upload}") + @Value("${app.path.upload}") private String upLoadPath; - @Value(value = "${jeecg.uploadType}") + @Value(value = "${app.uploadType}") private String uploadType; @Override diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysAnnouncementSendServiceImpl.java index e03738e..da264b9 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysAnnouncementSendServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysAnnouncementSendServiceImpl.java @@ -12,7 +12,8 @@ import javax.annotation.Resource; import java.util.List; /** - * @Description: 用户通告阅读标记表 + * 用户通告阅读标记表 + * * @Author: jeecg-boot * @Date: 2019-02-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysAnnouncementServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysAnnouncementServiceImpl.java index ffd0c90..7163bfa 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -23,7 +23,8 @@ import java.util.Date; import java.util.List; /** - * @Description: 系统通告表 + * 系统通告表 + * * @Author: jeecg-boot * @Date: 2019-01-02 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysBaseApiImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysBaseApiImpl.java index 39a49dc..87dc5f2 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysBaseApiImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysBaseApiImpl.java @@ -51,7 +51,8 @@ import java.sql.SQLException; import java.util.*; /** - * @Description: 底层共通业务API，提供其他独立模块调用 + * 底层共通业务API，提供其他独立模块调用 + * * @Author: scott * @Date:2019-4-20 * @Version:V1.0 @@ -944,14 +945,14 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public List queryUsersByUsernames(String usernames) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUser::getUsername, (Object[])usernames.split(",")); + queryWrapper.in(SysUser::getUsername, (Object[]) usernames.split(",")); return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class); } @Override public List queryUsersByIds(String ids) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUser::getId, (Object[])ids.split(",")); + queryWrapper.in(SysUser::getId, (Object[]) ids.split(",")); return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class); } @@ -964,14 +965,14 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public List queryDepartsByOrgcodes(String orgCodes) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysDepart::getOrgCode, (Object[])orgCodes.split(",")); + queryWrapper.in(SysDepart::getOrgCode, (Object[]) orgCodes.split(",")); return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class); } @Override public List queryDepartsByIds(String ids) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysDepart::getId, (Object[])ids.split(",")); + queryWrapper.in(SysDepart::getId, (Object[]) ids.split(",")); return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class); } diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCategoryServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCategoryServiceImpl.java index 20e4f75..2af535d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCategoryServiceImpl.java @@ -24,7 +24,8 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @Description: 分类字典 + * 分类字典 + * * @Author: jeecg-boot * @Date: 2019-05-29 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCheckRuleServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCheckRuleServiceImpl.java index 98b51b8..2440db9 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCheckRuleServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCheckRuleServiceImpl.java @@ -14,7 +14,8 @@ import org.springframework.stereotype.Service; import java.util.regex.Pattern; /** - * @Description: 编码校验规则 + * 编码校验规则 + * * @Author: jeecg-boot * @Date: 2020-02-04 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCommentServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCommentServiceImpl.java index adf8c9c..a86d878 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCommentServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysCommentServiceImpl.java @@ -39,7 +39,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * @Description: 系统评论回复表 + * 系统评论回复表 + * * @Author: jeecg-boot * @Date: 2022-07-19 * @Version: V1.0 @@ -59,9 +60,9 @@ public class SysCommentServiceImpl extends ServiceImpl query = new LambdaQueryWrapper(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); if (oConvertUtils.isNotEmpty(ids)) { - query.in(true, SysDepart::getId, (Object[])(ids.split(","))); + query.in(true, SysDepart::getId, (Object[]) (ids.split(","))); } query.orderByAsc(SysDepart::getDepartOrder); List list = this.list(query); @@ -522,9 +522,9 @@ public class SysDepartServiceImpl extends ServiceImpl> square = i -> { if (oConvertUtils.isNotEmpty(ids)) { if (CommonConstant.DEPART_KEY_ORG_CODE.equals(primaryKey)) { - i.in(SysDepart::getOrgCode, (Object[])(ids.split(SymbolConstant.COMMA))); + i.in(SysDepart::getOrgCode, (Object[]) (ids.split(SymbolConstant.COMMA))); } else { - i.in(SysDepart::getId, (Object[])(ids.split(SymbolConstant.COMMA))); + i.in(SysDepart::getId, (Object[]) (ids.split(SymbolConstant.COMMA))); } } else { if (oConvertUtils.isEmpty(parentId)) { diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysDictServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysDictServiceImpl.java index 92dfe23..dac6f70 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysDictServiceImpl.java @@ -5,10 +5,10 @@ import cc.niushuai.bastionserver.common.constant.CommonConstant; import cc.niushuai.bastionserver.common.constant.DataBaseConstant; import cc.niushuai.bastionserver.common.constant.SymbolConstant; import cc.niushuai.bastionserver.common.system.query.QueryGenerator; -import cc.niushuai.bastionserver.common.util.ResourceUtil; import cc.niushuai.bastionserver.common.system.vo.DictModel; import cc.niushuai.bastionserver.common.system.vo.DictModelMany; import cc.niushuai.bastionserver.common.system.vo.DictQuery; +import cc.niushuai.bastionserver.common.util.ResourceUtil; import cc.niushuai.bastionserver.common.util.SqlInjectionUtil; import cc.niushuai.bastionserver.common.util.oConvertUtils; import cc.niushuai.bastionserver.modules.system.entity.SysDict; diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFilesServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFilesServiceImpl.java index be4d464..81749fe 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFilesServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFilesServiceImpl.java @@ -8,7 +8,8 @@ import org.springframework.stereotype.Service; /** - * @Description: 知识库-文档管理 + * 知识库-文档管理 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFillRuleServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFillRuleServiceImpl.java index f093f89..3dfbfca 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFillRuleServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFillRuleServiceImpl.java @@ -7,7 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** - * @Description: 填值规则 + * 填值规则 + * * @Author: jeecg-boot * @Date: 2019-11-07 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFormFileServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFormFileServiceImpl.java index f2649ee..0fa31fb 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFormFileServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysFormFileServiceImpl.java @@ -8,7 +8,8 @@ import org.springframework.stereotype.Service; /** - * @Description: 表单评论文件 + * 表单评论文件 + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysGatewayRouteServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysGatewayRouteServiceImpl.java index 23d8f1e..9709081 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysGatewayRouteServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysGatewayRouteServiceImpl.java @@ -21,7 +21,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; /** - * @Description: gateway路由管理 + * gateway路由管理 + * * @Author: jeecg-boot * @Date: 2020-05-26 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysPositionServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysPositionServiceImpl.java index f10307f..a03c90b 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysPositionServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysPositionServiceImpl.java @@ -8,7 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** - * @Description: 职务表 + * 职务表 + * * @Author: jeecg-boot * @Date: 2019-09-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysRoleIndexServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysRoleIndexServiceImpl.java index 1f264df..9da6507 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysRoleIndexServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysRoleIndexServiceImpl.java @@ -7,7 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** - * @Description: 角色首页配置 + * 角色首页配置 + * * @Author: jeecg-boot * @Date: 2022-03-25 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysTenantServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysTenantServiceImpl.java index f82319c..a524915 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysTenantServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysTenantServiceImpl.java @@ -17,7 +17,8 @@ import java.util.Collection; import java.util.List; /** - * @Description: 租户实现类 + * 租户实现类 + * * @author: jeecg-boot */ @Service("sysTenantServiceImpl") diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysThirdAccountServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysThirdAccountServiceImpl.java index a5d4dc4..98bdf07 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysThirdAccountServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysThirdAccountServiceImpl.java @@ -25,7 +25,8 @@ import java.util.Date; import java.util.List; /** - * @Description: 第三方登录账号表 + * 第三方登录账号表 + * * @Author: jeecg-boot * @Date: 2020-11-17 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysUserAgentServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysUserAgentServiceImpl.java index 4efaa37..a8c7bea 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysUserAgentServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/SysUserAgentServiceImpl.java @@ -7,7 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** - * @Description: 用户代理人设置 + * 用户代理人设置 + * * @Author: jeecg-boot * @Date: 2019-04-17 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java index fcd8625..1a23bee 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java @@ -2,11 +2,7 @@ package cc.niushuai.bastionserver.modules.system.service.impl; import cc.niushuai.bastionserver.common.api.dto.message.MessageDTO; import cc.niushuai.bastionserver.common.constant.CommonConstant; -import cc.niushuai.bastionserver.common.util.JwtUtil; -import cc.niushuai.bastionserver.common.util.PasswordUtil; -import cc.niushuai.bastionserver.common.util.RestUtil; -import cc.niushuai.bastionserver.common.util.SpringContextUtils; -import cc.niushuai.bastionserver.common.util.oConvertUtils; +import cc.niushuai.bastionserver.common.util.*; import cc.niushuai.bastionserver.config.thirdapp.ThirdAppConfig; import cc.niushuai.bastionserver.config.thirdapp.ThirdAppTypeItemVo; import cc.niushuai.bastionserver.modules.system.entity.*; @@ -872,7 +868,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { if (userIds != null) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUser::getId, (Object[])userIds); + queryWrapper.in(SysUser::getId, (Object[]) userIds); List userList = userMapper.selectList(queryWrapper); String[] usernameList = userList.stream().map(SysUser::getUsername).toArray(String[]::new); diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java index 273b262..de610b3 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java @@ -2,12 +2,8 @@ package cc.niushuai.bastionserver.modules.system.service.impl; import cc.niushuai.bastionserver.common.api.dto.message.MessageDTO; import cc.niushuai.bastionserver.common.constant.CommonConstant; -import cc.niushuai.bastionserver.common.util.JwtUtil; -import cc.niushuai.bastionserver.common.util.PasswordUtil; -import cc.niushuai.bastionserver.common.util.RestUtil; -import cc.niushuai.bastionserver.common.util.SpringContextUtils; -import cc.niushuai.bastionserver.common.util.oConvertUtils; -import cc.niushuai.bastionserver.config.JeecgBaseConfig; +import cc.niushuai.bastionserver.common.util.*; +import cc.niushuai.bastionserver.config.AppConfig; import cc.niushuai.bastionserver.config.thirdapp.ThirdAppConfig; import cc.niushuai.bastionserver.modules.system.entity.*; import cc.niushuai.bastionserver.modules.system.mapper.SysAnnouncementSendMapper; @@ -62,7 +58,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { @Autowired ThirdAppConfig thirdAppConfig; @Autowired - JeecgBaseConfig jeecgBaseConfig; + AppConfig appConfig; @Autowired private ISysDepartService sysDepartService; @Autowired @@ -835,7 +831,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUser::getId, (Object[])userIds); + queryWrapper.in(SysUser::getId, (Object[]) userIds); List userList = userMapper.selectList(queryWrapper); List usernameList = userList.stream().map(SysUser::getUsername).collect(Collectors.toList()); usernameString = String.join(",", usernameList); @@ -847,12 +843,12 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { entity.setDescription(oConvertUtils.getString(announcement.getMsgAbstract(), "空")); String baseUrl = null; - //优先通过请求获取basepath，获取不到读取 jeecg.domainUrl.pc + //优先通过请求获取basepath，获取不到读取 app.domainUrl.pc try { baseUrl = RestUtil.getBaseUrl(); } catch (Exception e) { log.warn(e.getMessage()); - baseUrl = jeecgBaseConfig.getDomainUrl().getPc(); + baseUrl = appConfig.getDomainUrl().getPc(); //e.printStackTrace(); } diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/util/SecurityUtil.java b/src/main/java/cc/niushuai/bastionserver/modules/system/util/SecurityUtil.java index d147dfe..62017e9 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/util/SecurityUtil.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/util/SecurityUtil.java @@ -6,7 +6,8 @@ import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import cn.hutool.crypto.symmetric.SymmetricCrypto; /** - * @Description: 密码加密解密 + * 密码加密解密 + * * @author: lsq * @date: 2020年09月07日 14:26 */ diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/util/XssUtils.java b/src/main/java/cc/niushuai/bastionserver/modules/system/util/XssUtils.java index d643657..ccf6878 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/util/XssUtils.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/util/XssUtils.java @@ -5,7 +5,8 @@ import org.springframework.web.util.HtmlUtils; import java.util.regex.Pattern; /** - * @Description: 工具类XSSUtils，现在的做法是替换成空字符，CSDN的是进行转义，比如文字开头的"<"转成< + * 工具类XSSUtils，现在的做法是替换成空字符，CSDN的是进行转义，比如文字开头的"<"转成< + * * @author: lsq * @date: 2021年07月26日 19:13 */ diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysCommentFileVo.java b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysCommentFileVo.java index d81ac01..4c83043 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysCommentFileVo.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysCommentFileVo.java @@ -3,7 +3,8 @@ package cc.niushuai.bastionserver.modules.system.vo; import lombok.Data; /** - * @Description: 文档VO + * 文档VO + * * @Author: jeecg-boot * @Date: 2022-07-21 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysCommentVO.java b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysCommentVO.java index 23d2cb6..5a587af 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysCommentVO.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysCommentVO.java @@ -11,7 +11,8 @@ import java.util.Date; import java.util.List; /** - * @Description: VO 评论信息+文件信息 + * VO 评论信息+文件信息 + * * @Author: jeecg-boot * @Date: 2022-07-19 * @Version: V1.0 diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysDepartUsersVO.java b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysDepartUsersVO.java index 10950cb..2f6818f 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysDepartUsersVO.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysDepartUsersVO.java @@ -6,7 +6,8 @@ import java.io.Serializable; import java.util.List; /** - * @Description: 系统部门VO + * 系统部门VO + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysDictPage.java b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysDictPage.java index a65381e..e2aeebd 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysDictPage.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysDictPage.java @@ -8,7 +8,8 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection; import java.util.List; /** - * @Description: 系统字典分页 + * 系统字典分页 + * * @author: jeecg-boot */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysUserDepVo.java b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysUserDepVo.java index 3335da1..0421f5d 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysUserDepVo.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysUserDepVo.java @@ -5,7 +5,6 @@ import lombok.Data; /** * @Author qinfeng * @Date 2020/1/2 21:58 - * @Description: * @Version 1.0 */ @Data diff --git a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysUserRoleVO.java b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysUserRoleVO.java index 6be48e0..971db8a 100644 --- a/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysUserRoleVO.java +++ b/src/main/java/cc/niushuai/bastionserver/modules/system/vo/SysUserRoleVO.java @@ -6,7 +6,8 @@ import java.io.Serializable; import java.util.List; /** - * @Description: 用户角色vo + * 用户角色vo + * * @author: jeecg-boot */ @Data diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4b64cf2..4ac6180 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,2 +1,110 @@ server: port: ${SERVER_PORT:8080} + +spring: + mail: + host: smtp.163.com + username: ?? + password: ?? + properties: + mail: + smtp: + auth: true + starttls: + enable: true + required: true + +#swagger +knife4j: + #开启增强配置 + enable: true + #开启生产环境屏蔽 + production: false + basic: + enable: false + username: knife4j + password: knife4j +#第三方登录 +justauth: + enabled: true + type: + GITHUB: + client-id: ?? + client-secret: ?? + redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback + WECHAT_ENTERPRISE: + client-id: ?? + client-secret: ?? + redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback + agent-id: ?? + DINGTALK: + client-id: ?? + client-secret: ?? + redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback + WECHAT_OPEN: + client-id: ?? + client-secret: ?? + redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback + cache: + type: default + prefix: 'demo::' + timeout: 1h +#第三方APP对接 +third-app: + enabled: false + type: + #企业微信 + WECHAT_ENTERPRISE: + enabled: false + #CORP_ID + client-id: ?? + #SECRET + client-secret: ?? + #自建应用id + agent-id: ?? + #自建应用秘钥（新版企微需要配置） + # agent-app-secret: ?? + #钉钉 + DINGTALK: + enabled: false + # appKey + client-id: ?? + # appSecret + client-secret: ?? + agent-id: ?? + +# app 自定义设置 +app: + # 是否启用安全模式 + safeMode: false + # 签名密钥串(前后端要一致，正式发布请自行修改) + signatureSecret: CF51C335B38F48D3AC35DAFD92E81518 + # 签名拦截接口 + signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys + #local、minio、alioss + uploadType: local + # 前端访问地址 + domainUrl: + pc: http://localhost:3100 + app: http://localhost:8051 + path: + #文件上传根目录 设置 + upload: /opt/upFiles + #webapp文件路径 + webapp: /opt/webapp + shiro: + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + #阿里云oss存储和大鱼短信秘钥配置 + oss: + endpoint: ?? + accessKey: ?? + secretKey: ?? + bucketName: ?? + # 在线预览文件服务器地址配置 + file-view-domain: ?? + # minio文件上传 + minio: + minio_url: ?? + minio_name: ?? + minio_pass: ?? + bucketName: otatest \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7216b82..a312ec1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,10 +10,7 @@ spring: profiles: active: dev include: - - jeecg - web - db - quartz - - mail - log - - other \ No newline at end of file diff --git a/src/main/resources/config/application-jeecg.yml b/src/main/resources/config/application-jeecg.yml deleted file mode 100644 index 5d50a55..0000000 --- a/src/main/resources/config/application-jeecg.yml +++ /dev/null @@ -1,34 +0,0 @@ -jeecg: - # 是否启用安全模式 - safeMode: false - # 签名密钥串(前后端要一致，正式发布请自行修改) - signatureSecret: CF51C335B38F48D3AC35DAFD92E81518 - # 签名拦截接口 - signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys - #local、minio、alioss - uploadType: local - # 前端访问地址 - domainUrl: - pc: http://localhost:3100 - app: http://localhost:8051 - path: - #文件上传根目录 设置 - upload: /opt/upFiles - #webapp文件路径 - webapp: /opt/webapp - shiro: - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** - #阿里云oss存储和大鱼短信秘钥配置 - oss: - endpoint: ?? - accessKey: ?? - secretKey: ?? - bucketName: ?? - # 在线预览文件服务器地址配置 - file-view-domain: ?? - # minio文件上传 - minio: - minio_url: ?? - minio_name: ?? - minio_pass: ?? - bucketName: otatest diff --git a/src/main/resources/config/application-mail.yml b/src/main/resources/config/application-mail.yml deleted file mode 100644 index 17ecada..0000000 --- a/src/main/resources/config/application-mail.yml +++ /dev/null @@ -1,12 +0,0 @@ -spring: - mail: - host: smtp.163.com - username: ?? - password: ?? - properties: - mail: - smtp: - auth: true - starttls: - enable: true - required: true \ No newline at end of file diff --git a/src/main/resources/config/application-other.yml b/src/main/resources/config/application-other.yml deleted file mode 100644 index c4372be..0000000 --- a/src/main/resources/config/application-other.yml +++ /dev/null @@ -1,58 +0,0 @@ -#swagger -knife4j: - #开启增强配置 - enable: true - #开启生产环境屏蔽 - production: false - basic: - enable: false - username: knife4j - password: knife4j -#第三方登录 -justauth: - enabled: true - type: - GITHUB: - client-id: ?? - client-secret: ?? - redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback - WECHAT_ENTERPRISE: - client-id: ?? - client-secret: ?? - redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback - agent-id: ?? - DINGTALK: - client-id: ?? - client-secret: ?? - redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback - WECHAT_OPEN: - client-id: ?? - client-secret: ?? - redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback - cache: - type: default - prefix: 'demo::' - timeout: 1h -#第三方APP对接 -third-app: - enabled: false - type: - #企业微信 - WECHAT_ENTERPRISE: - enabled: false - #CORP_ID - client-id: ?? - #SECRET - client-secret: ?? - #自建应用id - agent-id: ?? - #自建应用秘钥（新版企微需要配置） - # agent-app-secret: ?? - #钉钉 - DINGTALK: - enabled: false - # appKey - client-id: ?? - # appSecret - client-secret: ?? - agent-id: ?? diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml deleted file mode 100644 index b8f0454..0000000 --- a/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n - - - - - - - - ${LOG_HOME}/%d{yyyy-MM-dd}.%i.log - - 30 - 10MB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n - - - - - - - - ERROR - - - - %p%d%msg%M%F{32}%L - - - ${LOG_HOME}/error-log.html - - - - - - - - ${LOG_HOME}/%d{yyyy-MM-dd}.%i.html - - 30 - 10MB - - - - %p%d%msg%M%F{32}%L - - - - - - - - - - - - - - - - - - - - \ No newline at end of file