From dca0031ad5552679d6dfbb80d6edd7adbfc7ec2c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 30 四月 2023 16:27:51 +0800
Subject: [PATCH] 分服务
---
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 95 +-
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/RuoYiSystemApplication.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMenuMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMapper.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysNotice.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysConfigMapper.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java | 2
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java | 35 +
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 52 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysConfig.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleMenu.java | 2
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 32
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java | 20
ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java | 24
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java | 2
ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysFile.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPermissionService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysNoticeController.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 14
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysNoticeService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictTypeController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java | 36 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java | 5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysPost.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysOperlogController.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java | 9
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java | 2
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictType.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java | 20
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysLogininforService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysOperLogService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserPost.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 54 -
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java | 5
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java | 20
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysTag.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysClassification.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java | 144 ++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserRoleMapper.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java | 4
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java | 20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysLogininforController.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysOperLogMapper.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictDataServiceImpl.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysMenuMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDeptService.java | 2
ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDeptMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictDataMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysRoleService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java | 24
ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysNoticeServiceImpl.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictTypeMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserOnlineService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysTagMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysRoleController.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictTypeServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysRoleServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java | 11
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictDataService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysRole.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java | 123 ---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysNoticeMapper.java | 2
ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleDept.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserOnlineServiceImpl.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java | 69 -
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java | 10
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ActivityController.java | 32
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysClassificationService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserOnlineController.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysLogininforServiceImpl.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysPostController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysTagService.java | 2
ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysConfigController.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysMenu.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleDeptMapper.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java | 8
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java | 30
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysConfigServiceImpl.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java | 2
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java | 2
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysClassificationMapper.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserOnline.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java | 7
ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPostService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysLogininforMapper.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPostServiceImpl.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java | 21
ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java | 2
ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java | 2
ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java | 36
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysPostMapper.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiSystemApplication.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserRole.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java | 2
ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml | 10
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java | 93 --
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictTypeService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictData.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysOperLogServiceImpl.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java | 20
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java | 20
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java | 41 +
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java | 2
ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/RuoYiSystemApplication.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 14
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java | 2
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserPostMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictDataController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 20
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPermissionServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java | 8
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java | 2
/dev/null | 98 --
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java | 95 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/activity/ActivityGoods.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java | 4
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysConfigService.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java | 2
ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java | 2
310 files changed, 1,178 insertions(+), 793 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java
new file mode 100644
index 0000000..28e7323
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.system.api;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.api.factory.RemoteActivityFallbackFactory;
+import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname RemoteActivityService
+ * @description: TODO
+ * @date 2023 2023/4/30 15:12
+ */
+@FeignClient(contextId = "remoteActivityService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteActivityFallbackFactory.class)
+public interface RemoteActivityService {
+
+ @PostMapping("/activity/getActivityGoods")
+ public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId);
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java
new file mode 100644
index 0000000..bd54743
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.system.api;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
+import com.ruoyi.system.api.factory.RemoteActivityFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname RemoteConfigService
+ * @description: TODO
+ * @date 2023 2023/4/30 15:58
+ */
+@FeignClient(contextId = "remoteConfigService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteActivityFallbackFactory.class)
+public interface RemoteConfigService {
+
+ @PostMapping("/config/getSysTag")
+ public R<SysTag> getSysTag(@RequestBody Long sysTagId);
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
index 4d5238e..fb3b7ff 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
@@ -13,7 +13,7 @@
/**
* 文件服务
*
- * @author ruoyi
+ * @author jqs
*/
@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
public interface RemoteFileService
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
index 46dc8c5..6cdfb55 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
@@ -14,7 +14,7 @@
/**
* 日志服务
*
- * @author ruoyi
+ * @author jqs
*/
@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
public interface RemoteLogService
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java
index da3ac6d..44c8f33 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java
@@ -16,4 +16,12 @@
@PostMapping("/member/getMember")
public R<Member> getMember(@RequestBody Long userId);
+ /**
+ * 小程序登录
+ * @param appMiniLoginDto
+ * @return
+ */
+ @PostMapping("/user/miniLogin")
+ public R<AppMiniLoginVo> miniLogin(@RequestBody AppMiniLoginDto appMiniLoginDto);
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
index 572aa83..91ff842 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
@@ -18,7 +18,7 @@
/**
* 用户服务
*
- * @author ruoyi
+ * @author jqs
*/
@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
public interface RemoteUserService
@@ -43,12 +43,36 @@
@PostMapping("/user/register")
public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+
/**
- * 小程序登录
- * @param appMiniLoginDto
- * @return
+ * @description: TODO
+ * @author jqs34
+ * @date 2023/4/30 15:36
+ * @version 1.0
+ */
+ @PostMapping("/user/getSysUser")
+ public R<SysUser> getSysUser(@RequestBody Long userId);
+
+ /**
+ * @description: 更新用户手机
+ * @author jqs34
+ * @date 2023/4/30 15:32
+ * @version 1.0
*/
- @PostMapping("/user/miniLogin")
- public R<AppMiniLoginVo> miniLogin(@RequestBody AppMiniLoginDto appMiniLoginDto);
+ @PostMapping("/user/registerUser")
+ public R registerUser(@RequestBody SysUser sysUser);
+
+
+
+ /**
+ * @description: 更新用户手机
+ * @author jqs34
+ * @date 2023/4/30 15:32
+ * @version 1.0
+ */
+ @PostMapping("/user/updateUserMobile")
+ public R updateUserMobile(@RequestBody SysUser sysUser);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/activity/ActivityGoods.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/activity/ActivityGoods.java
similarity index 96%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/activity/ActivityGoods.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/activity/ActivityGoods.java
index 8b39ee8..258c895 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/activity/ActivityGoods.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/activity/ActivityGoods.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.pojo.activity;
+package com.ruoyi.system.api.domain.poji.activity;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/SysClassification.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysClassification.java
similarity index 96%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/SysClassification.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysClassification.java
index 08f81ca..7b2d4cf 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/SysClassification.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysClassification.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.pojo.config;
+package com.ruoyi.system.api.domain.poji.config;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/SysTag.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysTag.java
similarity index 96%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/SysTag.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysTag.java
index aa332fe..e8d0ddf 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/SysTag.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/config/SysTag.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.pojo.config;
+package com.ruoyi.system.api.domain.poji.config;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java
index 26b8219..d07797a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java
@@ -13,7 +13,7 @@
/**
* 部门表 sys_dept
*
- * @author ruoyi
+ * @author jqs
*/
public class SysDept extends BaseEntity
{
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictData.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictData.java
index cd68424..7849116 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictData.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictData.java
@@ -12,7 +12,7 @@
/**
* 字典数据表 sys_dict_data
*
- * @author ruoyi
+ * @author jqs
*/
public class SysDictData extends BaseEntity
{
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictType.java
index 3e8f7e8..0d2a238 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictType.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDictType.java
@@ -12,7 +12,7 @@
/**
* 字典类型表 sys_dict_type
*
- * @author ruoyi
+ * @author jqs
*/
public class SysDictType extends BaseEntity
{
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysFile.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysFile.java
index 693f5a2..0d0b3e9 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysFile.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysFile.java
@@ -6,7 +6,7 @@
/**
* 文件信息
*
- * @author ruoyi
+ * @author jqs
*/
public class SysFile
{
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java
index 9869b71..a72f252 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java
@@ -9,7 +9,7 @@
/**
* 系统访问记录表 sys_logininfor
*
- * @author ruoyi
+ * @author jqs
*/
public class SysLogininfor extends BaseEntity
{
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java
index b210ef8..d504007 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java
@@ -9,7 +9,7 @@
/**
* 操作日志记录表 oper_log
*
- * @author ruoyi
+ * @author jqs
*/
public class SysOperLog extends BaseEntity
{
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysRole.java
index e8ee5b9..587240c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysRole.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysRole.java
@@ -13,7 +13,7 @@
/**
* 角色表 sys_role
*
- * @author ruoyi
+ * @author jqs
*/
public class SysRole extends BaseEntity
{
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
index a977989..7d64237 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
@@ -15,7 +15,7 @@
/**
* 用户对象 sys_user
*
- * @author ruoyi
+ * @author jqs
*/
public class SysUser extends BaseEntity
{
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java
new file mode 100644
index 0000000..9ef9fe1
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java
@@ -0,0 +1,41 @@
+package com.ruoyi.system.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.RemoteActivityService;
+import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.model.AppMiniLoginDto;
+import com.ruoyi.system.api.model.AppMiniLoginVo;
+import com.ruoyi.system.api.model.LoginUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 活动服务
+ *
+ * @author jqs
+ */
+@Component
+public class RemoteActivityFallbackFactory implements FallbackFactory<RemoteActivityService>
+{
+ private static final Logger log = LoggerFactory.getLogger(RemoteActivityFallbackFactory.class);
+
+ @Override
+ public RemoteActivityService create(Throwable throwable)
+ {
+ log.error("活动服务调用失败:{}", throwable.getMessage());
+ return new RemoteActivityService()
+ {
+
+ @Override
+ public R<ActivityGoods> getActivityGoods(String goodsId) {
+ return R.fail("获取活动商品失败:" + throwable.getMessage());
+ }
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java
new file mode 100644
index 0000000..2b7d11e
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java
@@ -0,0 +1,36 @@
+package com.ruoyi.system.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.RemoteActivityService;
+import com.ruoyi.system.api.RemoteConfigService;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 系统配置服务
+ *
+ * @author jqs
+ */
+@Component
+public class RemoteConfigFallbackFactory implements FallbackFactory<RemoteConfigService>
+{
+ private static final Logger log = LoggerFactory.getLogger(RemoteConfigFallbackFactory.class);
+
+ @Override
+ public RemoteConfigService create(Throwable throwable)
+ {
+ log.error("系统配置服务调用失败:{}", throwable.getMessage());
+ return new RemoteConfigService()
+ {
+
+ @Override
+ public R<SysTag> getSysTag(Long sysTagId) {
+ return R.fail("获取系统标签失败:" + throwable.getMessage());
+ }
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
index a087efc..0457d5c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
@@ -12,7 +12,7 @@
/**
* 文件服务降级处理
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
index c609f4a..359ea15 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
@@ -12,7 +12,7 @@
/**
* 日志服务降级处理
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
index 21a4ec5..002019c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
@@ -16,9 +16,9 @@
import org.springframework.web.multipart.MultipartFile;
/**
- * 用户服务降级处理
+ * 会员服务
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class RemoteMemberFallbackFactory implements FallbackFactory<RemoteMemberService>
@@ -36,6 +36,12 @@
{
return R.fail("获取会员失败:" + throwable.getMessage());
}
+
+ @Override
+ public R<AppMiniLoginVo> miniLogin(AppMiniLoginDto appMiniLoginDto)
+ {
+ return R.fail("登录用户失败:" + throwable.getMessage());
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
index ce629b1..f12b82d 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
@@ -8,9 +8,9 @@
import org.springframework.stereotype.Component;
/**
- * 用户服务降级处理
+ * 订单服务
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class RemoteOrderFallbackFactory implements FallbackFactory<RemoteOrderService>
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
index 549a5e6..769f77f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
@@ -8,9 +8,9 @@
import org.springframework.stereotype.Component;
/**
- * 用户服务降级处理
+ * 商户服务
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class RemoteShopFallbackFactory implements FallbackFactory<RemoteShopService>
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
index b82649b..9583067 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -12,9 +12,9 @@
import com.ruoyi.system.api.model.LoginUser;
/**
- * 用户服务降级处理
+ * 用户服务
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
@@ -39,10 +39,21 @@
return R.fail("注册用户失败:" + throwable.getMessage());
}
+
+
@Override
- public R<AppMiniLoginVo> miniLogin(AppMiniLoginDto appMiniLoginDto)
- {
- return R.fail("登录用户失败:" + throwable.getMessage());
+ public R<SysUser> getSysUser(Long userId) {
+ return R.fail("获取用户失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R registerUser(SysUser sysUser) {
+ return R.fail("注册用户失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R updateUserMobile(SysUser sysUser) {
+ return R.fail("更新用户手机失败:" + throwable.getMessage());
}
};
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
index f4b7f65..96f133d 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
@@ -7,7 +7,7 @@
/**
* 用户信息
*
- * @author ruoyi
+ * @author jqs
*/
public class LoginUser implements Serializable
{
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
index 1e3a087..abf65fd 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
@@ -8,7 +8,7 @@
/**
* 认证授权中心
*
- * @author ruoyi
+ * @author jqs
*/
@EnableRyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index b9ced50..4459cb0 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -24,7 +24,7 @@
/**
* token 控制
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
public class TokenController
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
index b12fb31..6f64c7c 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
@@ -3,7 +3,7 @@
/**
* 用户登录对象
*
- * @author ruoyi
+ * @author jqs
*/
public class LoginBody
{
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java
index 9741507..e500e82 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java
@@ -3,7 +3,7 @@
/**
* 用户注册对象
*
- * @author ruoyi
+ * @author jqs
*/
public class RegisterBody extends LoginBody
{
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index f393e56..1d4a931 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -1,5 +1,6 @@
package com.ruoyi.auth.service;
+import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,13 +24,16 @@
/**
* 登录校验方法
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class SysLoginService
{
@Autowired
private RemoteUserService remoteUserService;
+
+ @Autowired
+ private RemoteMemberService remoteMemberService;
@Autowired
private SysPasswordService passwordService;
@@ -109,7 +113,7 @@
public AppMiniLoginVo miniLogin(AppMiniLoginDto appMiniLoginDto)
{
// 查询用户信息
- R<AppMiniLoginVo> userResult = remoteUserService.miniLogin(appMiniLoginDto);
+ R<AppMiniLoginVo> userResult = remoteMemberService.miniLogin(appMiniLoginDto);
if (R.FAIL == userResult.getCode())
{
throw new ServiceException(userResult.getMsg());
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
index 886926b..d23403a 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
@@ -13,7 +13,7 @@
/**
* 登录密码方法
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class SysPasswordService
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
index 4024cb8..2c6748f 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
@@ -12,7 +12,7 @@
/**
* 记录日志方法
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class SysRecordLogService
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
index f77183a..e024f79 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
@@ -12,7 +12,7 @@
/**
* 自定义导出Excel数据注解
*
- * @author ruoyi
+ * @author jqs
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
index 38135e7..9413833 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
@@ -8,7 +8,7 @@
/**
* Excel注解集
*
- * @author ruoyi
+ * @author jqs
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
index 1d2510e..e2ce07e 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
@@ -3,7 +3,7 @@
/**
* 缓存常量信息
*
- * @author ruoyi
+ * @author jqs
*/
public class CacheConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index 5f7b06f..1f01333 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -3,7 +3,7 @@
/**
* 通用常量信息
*
- * @author ruoyi
+ * @author jqs
*/
public class Constants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
index ac2f930..ba64060 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
@@ -3,7 +3,7 @@
/**
* 代码生成通用常量
*
- * @author ruoyi
+ * @author jqs
*/
public class GenConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java
index 220a21f..c2eeaec 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java
@@ -3,7 +3,7 @@
/**
* 返回状态码
*
- * @author ruoyi
+ * @author jqs
*/
public class HttpStatus
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java
index b264a07..98c7560 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java
@@ -3,7 +3,7 @@
/**
* 任务调度通用常量
*
- * @author ruoyi
+ * @author jqs
*/
public class ScheduleConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
index 75a6090..8be8151 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
@@ -3,7 +3,7 @@
/**
* 权限相关通用常量
*
- * @author ruoyi
+ * @author jqs
*/
public class SecurityConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
index 95660e8..3677ffc 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
@@ -3,7 +3,7 @@
/**
* 服务名称
*
- * @author ruoyi
+ * @author jqs
*/
public class ServiceNameConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java
index e1e5c2f..4358eb3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java
@@ -3,7 +3,7 @@
/**
* Token的Key常量
*
- * @author ruoyi
+ * @author jqs
*/
public class TokenConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
index 5d02f38..bd1f4a8 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
@@ -3,7 +3,7 @@
/**
* 用户常量信息
*
- * @author ruoyi
+ * @author jqs
*/
public class UserConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
index d7e94ec..f4b3907 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
@@ -11,7 +11,7 @@
* 获取当前线程变量中的 用户id、用户名称、Token等信息
* 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
*
- * @author ruoyi
+ * @author jqs
*/
public class SecurityContextHolder
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
index 0003b19..b75a9d0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -6,7 +6,7 @@
/**
* 响应信息主体
*
- * @author ruoyi
+ * @author jqs
*/
public class R<T> implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
index 65a8cd8..a268032 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
@@ -3,7 +3,7 @@
/**
* 用户状态
*
- * @author ruoyi
+ * @author jqs
*/
public enum UserStatus
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
index 8fa2ec0..ddaf3d4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
@@ -3,7 +3,7 @@
/**
* 验证码错误异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class CaptchaException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
index c7f74cb..5763317 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
@@ -3,7 +3,7 @@
/**
* 检查异常
*
- * @author ruoyi
+ * @author jqs
*/
public class CheckedException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java
index 6197e98..67694d4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java
@@ -3,7 +3,7 @@
/**
* 演示模式异常
*
- * @author ruoyi
+ * @author jqs
*/
public class DemoModeException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
index b55c7cd..fa483aa 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
@@ -3,7 +3,7 @@
/**
* 全局异常
*
- * @author ruoyi
+ * @author jqs
*/
public class GlobalException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java
index 96f825d..d698f21 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java
@@ -3,7 +3,7 @@
/**
* 内部认证异常
*
- * @author ruoyi
+ * @author jqs
*/
public class InnerAuthException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java
index 3d420c4..3fc3b57 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java
@@ -3,7 +3,7 @@
/**
* 权限异常
*
- * @author ruoyi
+ * @author jqs
*/
public class PreAuthorizeException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
index 4983866..99ccf4a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
@@ -3,7 +3,7 @@
/**
* 业务异常
*
- * @author ruoyi
+ * @author jqs
*/
public final class ServiceException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java
index 18c7be8..2afe53a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java
@@ -3,7 +3,7 @@
/**
* 工具类异常
*
- * @author ruoyi
+ * @author jqs
*/
public class UtilException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java
index 01e5771..159f5cd 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java
@@ -3,7 +3,7 @@
/**
* 未能通过的登录认证异常
*
- * @author ruoyi
+ * @author jqs
*/
public class NotLoginException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
index 6e9d3db..79726d0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
@@ -5,7 +5,7 @@
/**
* 未能通过的权限认证异常
*
- * @author ruoyi
+ * @author jqs
*/
public class NotPermissionException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
index 686374a..2f29800 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
@@ -5,7 +5,7 @@
/**
* 未能通过的角色认证异常
*
- * @author ruoyi
+ * @author jqs
*/
public class NotRoleException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java
index 3d2fa10..230d500 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java
@@ -3,7 +3,7 @@
/**
* 基础异常
*
- * @author ruoyi
+ * @author jqs
*/
public class BaseException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
index a156b7b..96d8357 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
@@ -5,7 +5,7 @@
/**
* 文件信息异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class FileException extends BaseException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
index e8a4199..2f6186a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
@@ -3,7 +3,7 @@
/**
* 文件名称超长限制异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class FileNameLengthLimitExceededException extends FileException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
index b592b6f..b94d7f9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
@@ -3,7 +3,7 @@
/**
* 文件名大小限制异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class FileSizeLimitExceededException extends FileException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java
index c0f57cb..73d5d70 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java
@@ -6,7 +6,7 @@
/**
* 文件上传异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class FileUploadException extends Exception
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
index 2a0b906..ee6b3c7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
@@ -5,7 +5,7 @@
/**
* 文件上传 误异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class InvalidExtensionException extends FileUploadException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
index 6cc3e58..3aa7651 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
@@ -3,7 +3,7 @@
/**
* 计划策略异常
*
- * @author ruoyi
+ * @author jqs
*/
public class TaskException extends Exception
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
index ec68864..c16af9d 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
@@ -3,7 +3,7 @@
/**
* 验证码失效异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class CaptchaExpireException extends UserException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java
index 8ae8ea3..b4f83e2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java
@@ -5,7 +5,7 @@
/**
* 用户信息异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class UserException extends BaseException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java
index 2e1a6b1..3094899 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java
@@ -3,7 +3,7 @@
/**
* 用户密码不正确或不符合规范异常类
*
- * @author ruoyi
+ * @author jqs
*/
public class UserPasswordNotMatchException extends UserException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 06fbcd5..bfb36f9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
@@ -7,7 +7,7 @@
/**
* 字符集工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class CharsetKit
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
index 2b18eb1..b56bf89 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -11,7 +11,7 @@
/**
* 类型转换器
*
- * @author ruoyi
+ * @author jqs
*/
public class Convert
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
index cf366ea..e743799 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
@@ -5,7 +5,7 @@
/**
* 字符串格式化
*
- * @author ruoyi
+ * @author jqs
*/
public class StrFormatter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
index e948ad4..571b7e2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -14,7 +14,7 @@
/**
* 时间工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
index 12f6c72..e680b93 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
@@ -7,7 +7,7 @@
/**
* 错误信息处理类。
*
- * @author ruoyi
+ * @author jqs
*/
public class ExceptionUtil
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java
index d984892..d6f6f7b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java
@@ -11,7 +11,7 @@
/**
* Jwt工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class JwtUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
index 95ee25b..6043e24 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
@@ -8,7 +8,7 @@
/**
* 分页工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class PageUtils extends PageHelper
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
index 350c9a3..260c283 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
@@ -30,7 +30,7 @@
/**
* 客户端工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class ServletUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
index e4ec3bc..3a1c03b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
@@ -10,7 +10,7 @@
/**
* spring工具类 方便在非spring管理环境中获取bean
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public final class SpringUtils implements BeanFactoryPostProcessor
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
index 2d0ec81..56c8175 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
@@ -10,7 +10,7 @@
/**
* 字符串工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
index fba6032..7eec5ed 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
@@ -9,7 +9,7 @@
/**
* Bean 工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class BeanUtils extends org.springframework.beans.BeanUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
index 18dccfa..ad42d9f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
@@ -8,7 +8,7 @@
/**
* bean对象属性验证
*
- * @author ruoyi
+ * @author jqs
*/
public class BeanValidators
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
index c36c306..b059fcd 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
@@ -9,7 +9,7 @@
/**
* 文件类型工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class FileTypeUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
index 61af137..d17b5e3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
@@ -16,7 +16,7 @@
/**
* 文件处理工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class FileUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
index 940bff7..a2c685c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
@@ -12,7 +12,7 @@
/**
* 图片处理工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class ImageUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java
index 63385e0..4b71f90 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java
@@ -3,7 +3,7 @@
/**
* 媒体类型工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class MimeTypeUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
index 75716fb..8c54ed2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
@@ -5,7 +5,7 @@
/**
* 转义和反转义工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class EscapeUtil
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
index 4d72b27..eacfa96 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
@@ -13,7 +13,7 @@
/**
* HTML过滤器，用于去除XSS漏洞隐患。
*
- * @author ruoyi
+ * @author jqs
*/
public final class HTMLFilter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
index cf5108b..b7e86ae 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
@@ -9,7 +9,7 @@
/**
* 获取IP方法
*
- * @author ruoyi
+ * @author jqs
*/
public class IpUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
index ef51756..3f7f2d7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
@@ -3,7 +3,7 @@
/**
* Excel数据格式处理适配器
*
- * @author ruoyi
+ * @author jqs
*/
public interface ExcelHandlerAdapter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
index b0533b4..3daaafa 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@@ -65,7 +65,7 @@
/**
* Excel相关处理
*
- * @author ruoyi
+ * @author jqs
*/
public class ExcelUtil<T>
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
index 5f1979b..c7a232c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
@@ -18,7 +18,7 @@
/**
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
*
- * @author ruoyi
+ * @author jqs
*/
@SuppressWarnings("rawtypes")
public class ReflectUtils
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java
index 7599bc0..8872934 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java
@@ -3,7 +3,7 @@
/**
* Base64工具类
*
- * @author ruoyi
+ * @author jqs
*/
public final class Base64
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
index 1e58c91..e294faf 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
@@ -6,7 +6,7 @@
/**
* sql操作工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class SqlUtil
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
index 32bb12d..25fa3a3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
@@ -3,7 +3,7 @@
/**
* ID生成器工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class IdUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
index e226834..b4c0b61 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
@@ -5,7 +5,7 @@
import com.ruoyi.common.core.utils.StringUtils;
/**
- * @author ruoyi 序列生成类
+ * @author jqs 序列生成类
*/
public class Seq
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
index 8f7323d..49b2eba 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
@@ -10,7 +10,7 @@
/**
* 提供通用唯一识别码（universally unique identifier）（UUID）实现
*
- * @author ruoyi
+ * @author jqs
*/
public final class UUID implements java.io.Serializable, Comparable<UUID>
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
index 2bfd8cb..0040a3a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
@@ -17,7 +17,7 @@
/**
* web层通用数据处理
*
- * @author ruoyi
+ * @author jqs
*/
public class BaseController
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
index 3442f9c..498e6a0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
@@ -8,7 +8,7 @@
/**
* 操作消息提醒
*
- * @author ruoyi
+ * @author jqs
*/
public class AjaxResult extends HashMap<String, Object>
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
index eb9f783..f9459d2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
@@ -11,7 +11,7 @@
/**
* Entity基类
*
- * @author ruoyi
+ * @author jqs
*/
public class BaseEntity implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
index 0481ced..42b3ce8 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
@@ -6,7 +6,7 @@
/**
* Tree基类
*
- * @author ruoyi
+ * @author jqs
*/
public class TreeEntity extends BaseEntity
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
index 31365c3..fe10fed 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
@@ -5,7 +5,7 @@
/**
* 分页数据
*
- * @author ruoyi
+ * @author jqs
*/
public class PageDomain
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
index c294089..9bd65ab 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
@@ -6,7 +6,7 @@
/**
* 表格分页数据对象
*
- * @author ruoyi
+ * @author jqs
*/
public class TableDataInfo implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
index 404be08..bca7305 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
@@ -6,7 +6,7 @@
/**
* 表格数据处理
*
- * @author ruoyi
+ * @author jqs
*/
public class TableSupport
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java
index 28fc30b..e8c8119 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java
@@ -10,7 +10,7 @@
/**
* 自定义xss校验注解
*
- * @author ruoyi
+ * @author jqs
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER })
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
index a0b1861..c32eb5e 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
@@ -9,7 +9,7 @@
/**
* 自定义xss校验注解实现
*
- * @author ruoyi
+ * @author jqs
*/
public class XssValidator implements ConstraintValidator<Xss, String>
{
diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
index 3834657..e495040 100644
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
@@ -9,7 +9,7 @@
/**
* 数据权限过滤注解
*
- * @author ruoyi
+ * @author jqs
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
index cb9a7c2..9afba7a 100644
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
@@ -19,7 +19,7 @@
/**
* 数据过滤处理
*
- * @author ruoyi
+ * @author jqs
*/
@Aspect
@Component
diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java
index c71c105..b747821 100644
--- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java
+++ b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java
@@ -10,7 +10,7 @@
/**
* 主库数据源
*
- * @author ruoyi
+ * @author jqs
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
index bc45f6f..03740df 100644
--- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
+++ b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
@@ -10,7 +10,7 @@
/**
* 从库数据源
*
- * @author ruoyi
+ * @author jqs
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java
index 4497ce6..6152ee1 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java
@@ -11,7 +11,7 @@
/**
* 自定义操作日志记录注解
*
- * @author ruoyi
+ * @author jqs
*
*/
@Target({ ElementType.PARAMETER, ElementType.METHOD })
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
index 4f3482a..f0fcdbe 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
@@ -32,7 +32,7 @@
/**
* 操作日志记录处理
*
- * @author ruoyi
+ * @author jqs
*/
@Aspect
@Component
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java
index a2a3926..52aedda 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java
@@ -3,7 +3,7 @@
/**
* 操作状态
*
- * @author ruoyi
+ * @author jqs
*
*/
public enum BusinessStatus
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java
index 0b18de8..4c0619a 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java
@@ -3,7 +3,7 @@
/**
* 业务操作类型
*
- * @author ruoyi
+ * @author jqs
*/
public enum BusinessType
{
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java
index 2a041a0..a48ba14 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java
@@ -3,7 +3,7 @@
/**
* 操作人类别
*
- * @author ruoyi
+ * @author jqs
*/
public enum OperatorType
{
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
index 0327a24..00cea6e 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
@@ -5,7 +5,7 @@
/**
* 排除JSON敏感属性
*
- * @author ruoyi
+ * @author jqs
*/
public class PropertyPreExcludeFilter extends SimplePropertyPreFilter
{
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
index bc5e80c..c23a030 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
@@ -10,7 +10,7 @@
/**
* 异步调用日志服务
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class AsyncLogService
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
index 80e1be4..509b3a5 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
@@ -10,7 +10,7 @@
/**
* Redis使用FastJson序列化
*
- * @author ruoyi
+ * @author jqs
*/
public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
{
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
index 6e1ec8a..0fd5e0f 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
@@ -13,7 +13,7 @@
/**
* redis配置
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
@EnableCaching
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
index 435cb6e..f558984 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
@@ -16,7 +16,7 @@
/**
* spring redis 工具类
*
- * @author ruoyi
+ * @author jqs
**/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
index 4eb416e..23bd902 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
@@ -7,7 +7,7 @@
* 自定义feign注解
* 添加basePackages路径
*
- * @author ruoyi
+ * @author jqs
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java
index 6eada07..556877a 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java
@@ -5,7 +5,7 @@
/**
* 内部认证注解
*
- * @author ruoyi
+ * @author jqs
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
index 4b787a0..a7a3c78 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
@@ -3,7 +3,7 @@
/**
* 权限注解的验证模式
*
- * @author ruoyi
+ * @author jqs
*
*/
public enum Logical
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
index f196ff5..44e7bb9 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
@@ -8,7 +8,7 @@
/**
* 登录认证：只有登录之后才能进入该方法
*
- * @author ruoyi
+ * @author jqs
*
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
index aef624d..cb5a0e3 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
@@ -8,7 +8,7 @@
/**
* 权限认证：必须具有指定权限才能进入该方法
*
- * @author ruoyi
+ * @author jqs
*
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
index 042e4c2..56f5999 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
@@ -8,7 +8,7 @@
/**
* 角色认证：必须具有指定角色标识才能进入该方法
*
- * @author ruoyi
+ * @author jqs
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java
index 82d8b03..3f4778d 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java
@@ -14,7 +14,7 @@
/**
* 内部服务调用验证处理
*
- * @author ruoyi
+ * @author jqs
*/
@Aspect
@Component
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
index fa04637..90d8a72 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
@@ -21,7 +21,7 @@
/**
* Token 权限验证，逻辑实现类
*
- * @author ruoyi
+ * @author jqs
*/
public class AuthLogic
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
index 8b0d86c..9924643 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
@@ -7,7 +7,7 @@
/**
* Token 权限验证工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class AuthUtil
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
index 5ae8d14..20dab65 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
@@ -7,7 +7,7 @@
/**
* 系统配置
*
- * @author ruoyi
+ * @author jqs
*/
public class ApplicationConfig
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
index 46adfd9..52776a8 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
@@ -7,7 +7,7 @@
/**
* 拦截器配置
*
- * @author ruoyi
+ * @author jqs
*/
public class WebMvcConfig implements WebMvcConfigurer
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
index 304798d..2ee1aa9 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
@@ -7,7 +7,7 @@
/**
* Feign 配置注册
*
- * @author ruoyi
+ * @author jqs
**/
@Configuration
public class FeignAutoConfiguration
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
index 33e12c6..79e12b5 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
@@ -13,7 +13,7 @@
/**
* feign 请求拦截器
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class FeignRequestInterceptor implements RequestInterceptor
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
index 159cfce..1a91442 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
@@ -20,7 +20,7 @@
/**
* 全局异常处理器
*
- * @author ruoyi
+ * @author jqs
*/
@RestControllerAdvice
public class GlobalExceptionHandler
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
index 18c8d2b..29b8535 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
@@ -16,7 +16,7 @@
* 自定义请求头拦截器，将Header数据封装到线程变量中方便获取
* 注意：此拦截器会同时验证当前用户有效期自动刷新有效期
*
- * @author ruoyi
+ * @author jqs
*/
public class HeaderInterceptor implements AsyncHandlerInterceptor
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
index 84dd257..4f24165 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -22,7 +22,7 @@
/**
* token验证处理
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class TokenService
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
index 1815bc1..ab64c1b 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
@@ -12,7 +12,7 @@
/**
* 字典工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class DictUtils
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
index 78a5393..8171709 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -12,7 +12,7 @@
/**
* 权限获取工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class SecurityUtils
{
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java
index aa223b2..1295b38 100644
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java
+++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java
@@ -13,7 +13,7 @@
/**
* swagger 在 springboot 2.6.x 不兼容问题的处理
*
- * @author ruoyi
+ * @author jqs
*/
public class SwaggerBeanPostProcessor implements BeanPostProcessor
{
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
index 28556b5..2ab37c0 100644
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
+++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
@@ -6,7 +6,7 @@
/**
* swagger 资源映射路径
*
- * @author ruoyi
+ * @author jqs
*/
public class SwaggerWebConfiguration implements WebMvcConfigurer
{
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
index 3c54b77..b4e916d 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
@@ -7,7 +7,7 @@
/**
* 网关启动程序
*
- * @author ruoyi
+ * @author jqs
*/
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
public class RuoYiGatewayApplication
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java
index e6c6d9d..5f41454 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java
@@ -10,7 +10,7 @@
/**
* 验证码配置
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
public class CaptchaConfig
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index 3bb6d8e..d560642 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -9,7 +9,7 @@
/**
* 网关限流配置
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
public class GatewayConfig
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
index f68e0fa..24065a3 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
@@ -6,7 +6,7 @@
/**
* 验证码文本生成器
*
- * @author ruoyi
+ * @author jqs
*/
public class KaptchaTextCreator extends DefaultTextCreator
{
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
index db3c94e..ed21aac 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
@@ -12,7 +12,7 @@
/**
* 路由配置信息
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
public class RouterFunctionConfiguration
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
index ae22264..48cee9c 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
@@ -16,7 +16,7 @@
/**
* 聚合系统接口
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java
index f6bb000..6b19169 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java
@@ -7,7 +7,7 @@
/**
* 验证码配置
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
@RefreshScope
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
index 1d2c56a..cd29ed9 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
@@ -9,7 +9,7 @@
/**
* 放行白名单配置
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
@RefreshScope
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java
index 891679e..c9ed847 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java
@@ -9,7 +9,7 @@
/**
* XSS跨站脚本配置
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
@RefreshScope
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
index 101de63..6de0ec3 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
@@ -24,7 +24,7 @@
/**
* 网关鉴权
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class AuthFilter implements GlobalFilter, Ordered
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
index 343bd01..98f11ee 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
@@ -11,7 +11,7 @@
/**
* 黑名单过滤器
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class BlackListUrlFilter extends AbstractGatewayFilterFactory<BlackListUrlFilter.Config>
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java
index 94c6cb5..14cffa2 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java
@@ -15,7 +15,7 @@
/**
* 获取body请求数据（解决流不能重复读取问题）
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class CacheRequestFilter extends AbstractGatewayFilterFactory<CacheRequestFilter.Config>
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
index d5b75fd..28d60a3 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
@@ -21,7 +21,7 @@
/**
* 验证码过滤器
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
index 6fe6285..068ba89 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
@@ -28,7 +28,7 @@
/**
* 跨站脚本过滤器
*
- * @author ruoyi
+ * @author jqs
*/
@Component
@ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true")
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java
index 29ea5e3..bf91980 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java
@@ -15,7 +15,7 @@
/**
* 网关统一异常处理
*
- * @author ruoyi
+ * @author jqs
*/
@Order(-1)
@Configuration
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java
index 86abf88..b24524c 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java
@@ -11,7 +11,7 @@
/**
* 自定义限流异常处理
*
- * @author ruoyi
+ * @author jqs
*/
public class SentinelFallbackHandler implements WebExceptionHandler
{
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
index 45e7b15..fb78086 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
@@ -16,7 +16,7 @@
/**
* 验证码获取
*
- * @author ruoyi
+ * @author jqs
*/
@Component
public class ValidateCodeHandler implements HandlerFunction<ServerResponse>
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
index 8a74aeb..101cfac 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
@@ -7,7 +7,7 @@
/**
* 验证码处理
*
- * @author ruoyi
+ * @author jqs
*/
public interface ValidateCodeService
{
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
index 2ae87bd..d2cbab5 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
@@ -23,7 +23,7 @@
/**
* 验证码实现处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class ValidateCodeServiceImpl implements ValidateCodeService
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java
index 1f320da..7aa3acc 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java
@@ -8,7 +8,7 @@
/**
* 文件服务
*
- * @author ruoyi
+ * @author jqs
*/
@EnableCustomSwagger2
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
index 29beea0..fba8054 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
@@ -8,7 +8,7 @@
/**
* Minio 配置信息
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
@ConfigurationProperties(prefix = "minio")
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
index 8003670..a26a958 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
@@ -10,7 +10,7 @@
/**
* 通用映射配置
*
- * @author ruoyi
+ * @author jqs
*/
@Configuration
public class ResourcesConfig implements WebMvcConfigurer
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
index 4f7bfa8..2a0bbcc 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
@@ -14,7 +14,7 @@
/**
* 文件请求处理
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
public class SysFileController
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
index 0f85449..66d6b30 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
@@ -13,7 +13,7 @@
/**
* FastDFS 文件存储
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class FastDfsSysFileServiceImpl implements ISysFileService
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
index c95e6f2..a0ab787 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
@@ -5,7 +5,7 @@
/**
* 文件上传接口
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysFileService
{
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
index 3247e9b..afe1065 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
@@ -9,7 +9,7 @@
/**
* 本地文件存储
*
- * @author ruoyi
+ * @author jqs
*/
@Primary
@Service
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
index f53d86f..15b7376 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
@@ -13,7 +13,7 @@
/**
* Minio 文件存储
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class MinioSysFileServiceImpl implements ISysFileService
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
index 8109d34..3e61766 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
@@ -19,7 +19,7 @@
/**
* 文件上传工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class FileUploadUtils
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
index ba6bdf1..02cfcd7 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
@@ -9,7 +9,7 @@
/**
* 代码生成
*
- * @author ruoyi
+ * @author jqs
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java
index ee7161b..4d9ac2a 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java
@@ -6,7 +6,7 @@
/**
* 代码生成相关配置
*
- * @author ruoyi
+ * @author jqs
*/
@Component
@ConfigurationProperties(prefix = "gen")
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
index 72f8489..4b0e53f 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
@@ -31,7 +31,7 @@
/**
* 代码生成 操作处理
*
- * @author ruoyi
+ * @author jqs
*/
@RequestMapping("/gen")
@RestController
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
index dac28dc..04b6646 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
@@ -11,7 +11,7 @@
/**
* 业务表 gen_table
*
- * @author ruoyi
+ * @author jqs
*/
public class GenTable extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
index e53eff5..9731d10 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
@@ -8,7 +8,7 @@
/**
* 代码生成业务字段表 gen_table_column
*
- * @author ruoyi
+ * @author jqs
*/
public class GenTableColumn extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java
index 0be7cc0..b3fb0db 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java
@@ -6,7 +6,7 @@
/**
* 业务字段 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface GenTableColumnMapper
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java
index 3487d6a..2f78d5f 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java
@@ -6,7 +6,7 @@
/**
* 业务 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface GenTableMapper
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java
index f009c4b..4f0784b 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java
@@ -10,7 +10,7 @@
/**
* 业务字段 服务层实现
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class GenTableColumnServiceImpl implements IGenTableColumnService
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
index 11e2a23..2b46052 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
@@ -40,7 +40,7 @@
/**
* 业务 服务层实现
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class GenTableServiceImpl implements IGenTableService
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java
index 1f23685..9eb2850 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java
@@ -6,7 +6,7 @@
/**
* 业务字段 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface IGenTableColumnService
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java
index 0da8af7..6c9f931 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java
@@ -7,7 +7,7 @@
/**
* 业务 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface IGenTableService
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
index 3dae786..95ca4fb 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
@@ -11,7 +11,7 @@
/**
* 代码生成器 工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class GenUtils
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java
index d6f0160..a47cb48 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java
@@ -7,7 +7,7 @@
/**
* VelocityEngine工厂
*
- * @author ruoyi
+ * @author jqs
*/
public class VelocityInitializer
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
index 0db5f9c..3350011 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
@@ -16,7 +16,7 @@
/**
* 模板工具类
*
- * @author ruoyi
+ * @author jqs
*/
public class VelocityUtils
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
index fcd1963..8dba171 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
@@ -9,7 +9,7 @@
/**
* 定时任务
*
- * @author ruoyi
+ * @author jqs
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java
index 1c02b0c..9ccb1da 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java
@@ -9,7 +9,7 @@
///**
// * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效）
// *
-// * @author ruoyi
+// * @author jqs
// */
//@Configuration
//public class ScheduleConfig
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
index 7625e88..aa7a0a7 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
@@ -31,7 +31,7 @@
/**
* 调度任务信息操作处理
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/job")
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java
index caf7451..00ca62c 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java
@@ -22,7 +22,7 @@
/**
* 调度日志操作处理
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/job/log")
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
index dd630ba..38bbc3f 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
@@ -16,7 +16,7 @@
/**
* 定时任务调度表 sys_job
*
- * @author ruoyi
+ * @author jqs
*/
public class SysJob extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java
index 6c2c7ed..67f72c2 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java
@@ -9,7 +9,7 @@
/**
* 定时任务调度日志表 sys_job_log
*
- * @author ruoyi
+ * @author jqs
*/
public class SysJobLog extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java
index 80f0716..1b56f97 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java
@@ -6,7 +6,7 @@
/**
* 调度任务日志信息 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysJobLogMapper
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java
index d7e499e..b7222e9 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java
@@ -6,7 +6,7 @@
/**
* 调度任务信息 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysJobMapper
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java
index 75b3dc5..332b592 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java
@@ -6,7 +6,7 @@
/**
* 定时任务调度日志信息信息 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysJobLogService
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java
index 5270b34..03adb50 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java
@@ -8,7 +8,7 @@
/**
* 定时任务调度信息信息 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysJobService
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java
index 41bdcca..ade3c48 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java
@@ -9,7 +9,7 @@
/**
* 定时任务调度日志信息 服务层
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysJobLogServiceImpl implements ISysJobLogService
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java
index 8936b9c..05f6378 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 定时任务调度信息 服务层
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysJobServiceImpl implements ISysJobService
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java
index 3a127ef..286a112 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java
@@ -6,7 +6,7 @@
/**
* 定时任务调度测试
*
- * @author ruoyi
+ * @author jqs
*/
@Component("ryTask")
public class RyTask
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java
index 55ff671..f635c53 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java
@@ -18,7 +18,7 @@
/**
* 抽象quartz调用
*
- * @author ruoyi
+ * @author jqs
*/
public abstract class AbstractQuartzJob implements Job
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java
index 9fc6c9f..84794eb 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java
@@ -7,7 +7,7 @@
/**
* cron表达式工具类
*
- * @author ruoyi
+ * @author jqs
*
*/
public class CronUtils
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
index 1f2c8d3..775ee9f 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
@@ -11,7 +11,7 @@
/**
* 任务执行工具
*
- * @author ruoyi
+ * @author jqs
*/
public class JobInvokeUtil
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java
index 325bd93..ecf37a4 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java
@@ -8,7 +8,7 @@
/**
* 定时任务处理（禁止并发执行）
*
- * @author ruoyi
+ * @author jqs
*
*/
@DisallowConcurrentExecution
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java
index bab4ee9..4cc97cf 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java
@@ -7,7 +7,7 @@
/**
* 定时任务处理（允许并发执行）
*
- * @author ruoyi
+ * @author jqs
*
*/
public class QuartzJobExecution extends AbstractQuartzJob
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
index 4140140..68395d0 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
@@ -21,7 +21,7 @@
/**
* 定时任务工具类
*
- * @author ruoyi
+ * @author jqs
*
*/
public class ScheduleUtils
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/RuoYiSystemApplication.java
index 2039f3b..d466584 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/RuoYiSystemApplication.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/RuoYiSystemApplication.java
@@ -9,7 +9,7 @@
/**
* 系统模块
*
- * @author ruoyi
+ * @author jqs
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index e1cb20a..551f484 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -9,10 +9,7 @@
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/member")
@@ -38,4 +35,19 @@
}
return R.ok(member);
}
+
+ /**
+ * 小程序登录
+ */
+ @InnerAuth
+ @PostMapping("/miniLogin")
+ @ApiOperation("小程序登录")
+ public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
+ {
+ AppMiniLoginVo appMiniLoginVo = memberService.getMemberByCode(appMiniLoginDto);
+ if(appMiniLoginVo ==null){
+ return R.fail("登录失败！");
+ }
+ return R.ok(appMiniLoginVo);
+ }
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MetaVo.java
deleted file mode 100644
index 1437123..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MetaVo.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 路由显示信息
- *
- * @author ruoyi
- */
-public class MetaVo
-{
- /**
- * 设置该路由在侧边栏和面包屑中展示的名字
- */
- private String title;
-
- /**
- * 设置该路由的图标，对应路径src/assets/icons/svg
- */
- private String icon;
-
- /**
- * 设置为true，则不会被 <keep-alive>缓存
- */
- private boolean noCache;
-
- /**
- * 内链地址（http(s)://开头）
- */
- private String link;
-
- public MetaVo()
- {
- }
-
- public MetaVo(String title, String icon)
- {
- this.title = title;
- this.icon = icon;
- }
-
- public MetaVo(String title, String icon, boolean noCache)
- {
- this.title = title;
- this.icon = icon;
- this.noCache = noCache;
- }
-
- public MetaVo(String title, String icon, String link)
- {
- this.title = title;
- this.icon = icon;
- this.link = link;
- }
-
- public MetaVo(String title, String icon, boolean noCache, String link)
- {
- this.title = title;
- this.icon = icon;
- this.noCache = noCache;
- if (StringUtils.ishttp(link))
- {
- this.link = link;
- }
- }
-
- public boolean isNoCache()
- {
- return noCache;
- }
-
- public void setNoCache(boolean noCache)
- {
- this.noCache = noCache;
- }
-
- public String getTitle()
- {
- return title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-
- public String getIcon()
- {
- return icon;
- }
-
- public void setIcon(String icon)
- {
- this.icon = icon;
- }
-
- public String getLink()
- {
- return link;
- }
-
- public void setLink(String link)
- {
- this.link = link;
- }
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/RouterVo.java
deleted file mode 100644
index 7d9048e..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/RouterVo.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import java.util.List;
-
-/**
- * 路由配置信息
- *
- * @author ruoyi
- */
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo
-{
- /**
- * 路由名字
- */
- private String name;
-
- /**
- * 路由地址
- */
- private String path;
-
- /**
- * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
- */
- private boolean hidden;
-
- /**
- * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- */
- private String redirect;
-
- /**
- * 组件地址
- */
- private String component;
-
- /**
- * 路由参数：如 {"id": 1, "name": "ry"}
- */
- private String query;
-
- /**
- * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- */
- private Boolean alwaysShow;
-
- /**
- * 其他元素
- */
- private MetaVo meta;
-
- /**
- * 子路由
- */
- private List<RouterVo> children;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getPath()
- {
- return path;
- }
-
- public void setPath(String path)
- {
- this.path = path;
- }
-
- public boolean getHidden()
- {
- return hidden;
- }
-
- public void setHidden(boolean hidden)
- {
- this.hidden = hidden;
- }
-
- public String getRedirect()
- {
- return redirect;
- }
-
- public void setRedirect(String redirect)
- {
- this.redirect = redirect;
- }
-
- public String getComponent()
- {
- return component;
- }
-
- public void setComponent(String component)
- {
- this.component = component;
- }
-
- public String getQuery()
- {
- return query;
- }
-
- public void setQuery(String query)
- {
- this.query = query;
- }
-
- public Boolean getAlwaysShow()
- {
- return alwaysShow;
- }
-
- public void setAlwaysShow(Boolean alwaysShow)
- {
- this.alwaysShow = alwaysShow;
- }
-
- public MetaVo getMeta()
- {
- return meta;
- }
-
- public void setMeta(MetaVo meta)
- {
- this.meta = meta;
- }
-
- public List<RouterVo> getChildren()
- {
- return children;
- }
-
- public void setChildren(List<RouterVo> children)
- {
- this.children = children;
- }
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/TreeSelect.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/TreeSelect.java
deleted file mode 100644
index c9e582c..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/TreeSelect.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.stream.Collectors;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.system.api.domain.poji.sys.SysDept;
-import com.ruoyi.system.domain.pojo.sys.SysMenu;
-
-/**
- * Treeselect树结构实体类
- *
- * @author ruoyi
- */
-public class TreeSelect implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /** 节点ID */
- private Long id;
-
- /** 节点名称 */
- private String label;
-
- /** 子节点 */
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List<TreeSelect> children;
-
- public TreeSelect()
- {
-
- }
-
- public TreeSelect(SysDept dept)
- {
- this.id = dept.getDeptId();
- this.label = dept.getDeptName();
- this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
- }
-
- public TreeSelect(SysMenu menu)
- {
- this.id = menu.getMenuId();
- this.label = menu.getMenuName();
- this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public String getLabel()
- {
- return label;
- }
-
- public void setLabel(String label)
- {
- this.label = label;
- }
-
- public List<TreeSelect> getChildren()
- {
- return children;
- }
-
- public void setChildren(List<TreeSelect> children)
- {
- this.children = children;
- }
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 175c08c..587c7f7 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -3,24 +3,20 @@
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.AppNearbyShopDto;
import com.ruoyi.member.domain.dto.AppUserAuthorizeDto;
-import com.ruoyi.member.domain.vo.AppNearbyShopVo;
import com.ruoyi.member.domain.vo.AppUserAuthorizeVo;
import com.ruoyi.member.mapper.member.MemberMapper;
import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
-import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.constant.SecurityConstant;
-import com.ruoyi.system.domain.pojo.shop.Shop;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.service.shop.ShopService;
-import com.ruoyi.system.service.sys.ISysUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -39,17 +35,15 @@
*/
@Service
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
+
+ @Resource
+ private RemoteUserService sysUserService;
+
@Resource
private WxMaService wxMaService;
@Resource
- private ISysUserService sysUserService;
-
- @Resource
private MemberMapper memberMapper;
-
- @Resource
- private ShopService shopService;
@Resource
private StringRedisTemplate stringRedisTemplate;
@@ -111,7 +105,7 @@
member.setCreateTime(new Date());
this.save(member);
}else{
- sysUser = sysUserService.selectUserById(member.getUserId());
+ sysUser = sysUserService.getSysUser(member.getUserId()).getData();
}
appMiniLoginVo.setMiniOpenid(openid);
appMiniLoginVo.setWxUnionid(unionid);
@@ -156,9 +150,10 @@
e.printStackTrace();
}
//更新用户手机信息
- SysUser sysUser = sysUserService.selectUserById(appUserAuthorizeDto.getUserId());
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(appUserAuthorizeDto.getUserId());
sysUser.setPhonenumber(mobile);
- sysUserService.updateUser(sysUser);
+ sysUserService.updateUserMobile(sysUser);
member.setMobile(mobile);
this.saveOrUpdate(member);
appUserAuthorizeVo.setMobile(mobile);
@@ -168,28 +163,5 @@
return appUserAuthorizeVo;
}
- /**
- * 获取附近门店
- * @param appNearbyShopDto
- * @return
- */
- @Override
- public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto){
- Member member = this.getById(appNearbyShopDto.getUserId());
- AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
- Shop shop = null;
- if(member.getRealtionShopId()!=null){
- //获取绑定商户
- shop = shopService.getById(member.getRealtionShopId());
- }else{
- //获取附近商户
- shop = shopService.getById(1L);
- }
- appNearbyShopVo.setShopId(shop.getShopId());
- appNearbyShopVo.setShopName(shop.getShopName());
- appNearbyShopVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
- appNearbyShopVo.setShopLatitude(shop.getShopLatitude());
- appNearbyShopVo.setShopLongitude(shop.getShopLongitude());
- return appNearbyShopVo;
- }
+
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
index ca6cea3..8f8d60d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
@@ -40,10 +40,5 @@
*/
AppUserAuthorizeVo getAppUserAuthorize(AppUserAuthorizeDto appUserAuthorizeDto);
- /**
- * 获取附近门店
- * @param appNearbyShopDto
- * @return
- */
- AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto);
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiSystemApplication.java
index c04a3b4..8c7b25b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiSystemApplication.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiSystemApplication.java
@@ -9,7 +9,7 @@
/**
* 系统模块
*
- * @author ruoyi
+ * @author jqs
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java
new file mode 100644
index 0000000..30ecf9c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java
@@ -0,0 +1,35 @@
+package com.ruoyi.order.controller.concole;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.order.service.activity.ActivityGoodsService;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname ActivityController
+ * @description: TODO
+ * @date 2023 2023/4/30 15:17
+ */
+@RestController
+@RequestMapping("/activity")
+public class ActivityController {
+
+
+ @Autowired
+ private ActivityGoodsService activityGoodsService;
+
+ @InnerAuth
+ @PostMapping("/getActivityGoods")
+ public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId)
+ {
+ ActivityGoods activityGoods = activityGoodsService.getByGoodsId(goodsId);
+ return R.ok(activityGoods);
+ }
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
similarity index 78%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppGoodsController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
index 73d48a1..cb12e94 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppGoodsController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
@@ -1,16 +1,17 @@
-package com.ruoyi.member.controller.miniapp;
+package com.ruoyi.order.controller.miniapp;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.AppBaseBathDto;
-import com.ruoyi.member.domain.dto.AppGoodsInfoGetDto;
-import com.ruoyi.member.domain.dto.AppShoppingCartAddDto;
-import com.ruoyi.member.domain.dto.AppShoppingCartChangeDto;
-import com.ruoyi.member.domain.vo.AppGoodsInfoVo;
-import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.order.domain.dto.AppBaseBathDto;
+import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
+import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
+import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
+import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
+import com.ruoyi.order.service.goods.GoodsService;
+import com.ruoyi.order.service.goods.ShopGoodsService;
+import com.ruoyi.order.service.order.ShoppingCartService;
+import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.service.goods.GoodsService;
-import com.ruoyi.system.service.order.ShoppingCartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,18 +36,17 @@
private GoodsService goodsService;
@Autowired
- private MemberService memberService;
+ private RemoteMemberService memberService;
@Autowired
private ShoppingCartService shoppingCartService;
@RequestMapping(value = "/getGoodsInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取商品详情")
-
public R<AppGoodsInfoVo> getGoodsInfo(@RequestBody AppGoodsInfoGetDto appGoodsInfoGetDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
appGoodsInfoGetDto.setShopId(member.getRealtionShopId());
}
@@ -60,7 +60,7 @@
public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = memberService.getById(userId);
+ Member member = memberService.getMember(userId).getData();
appShoppingCartAddDto.setUserId(userId);
if(member!=null&&member.getRealtionShopId()!=null){
appShoppingCartAddDto.setShopId(member.getRealtionShopId());
@@ -75,7 +75,7 @@
public R changeShoppingCart(@RequestBody AppShoppingCartChangeDto appShoppingCartChangeDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = memberService.getById(userId);
+ Member member = memberService.getMember(userId).getData();
appShoppingCartChangeDto.setUserId(userId);
if(member!=null&&member.getRealtionShopId()!=null){
appShoppingCartChangeDto.setShopId(member.getRealtionShopId());
@@ -90,7 +90,7 @@
public R changeShoppingCart(@RequestBody AppBaseBathDto appBaseBathDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = memberService.getById(userId);
+ Member member = memberService.getMember(userId).getData();
appBaseBathDto.setUserId(userId);
}
shoppingCartService.deleteShoppingCart(appBaseBathDto);
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
similarity index 63%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppHomeController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
index c22fe44..66e954c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
@@ -1,15 +1,16 @@
-package com.ruoyi.member.controller.miniapp;
+package com.ruoyi.order.controller.miniapp;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.*;
-import com.ruoyi.member.domain.vo.*;
-import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.order.domain.dto.AppPageDto;
+import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
+import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
+import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
+import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
+import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.domain.dto.*;
-import com.ruoyi.system.domain.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,52 +35,12 @@
@Autowired
- private RemoteMemberService remoteMemberService;
-
- @Autowired
- private BannerService bannerService;
-
- @Autowired
- private QuickEntryService quickEntryService;
-
- @Autowired
- private AdvertService advertService;
+ private RemoteMemberService memberService;
@Autowired
private GoodsService goodsService;
- @Autowired
- private ShopService shopService;
- @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
- @ApiOperation(value = "获取最近商户")
- public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
- Long userId = SecurityUtils.getUserId();
- appNearbyShopDto.setUserId(userId);
- AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
- return R.ok(appNearbyShopVo);
- }
-
- @RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页banner")
- public R<List<AppBannerVo>> getHomeBanner() {
- List<AppBannerVo> appBannerVoList = bannerService.listHomeBannerVo();
- return R.ok(appBannerVoList);
- }
-
- @RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页快速入口")
- public R<List<AppQuickEntryVo>> getQuickEntry() {
- List<AppQuickEntryVo> appQuickEntryVoList = quickEntryService.listQuickEntryVo();
- return R.ok(appQuickEntryVoList);
- }
-
- @RequestMapping(value = "/getAdvert", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页广告")
- public R<AppAdvertVo> getAdvert() {
- AppAdvertVo appAdvertVo = advertService.getAdvertVo();
- return R.ok(appAdvertVo);
- }
@RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
@ApiOperation(value = "推荐商品")
@@ -87,7 +48,7 @@
Long userId = SecurityUtils.getUserId();
Long shopId = null;
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
shopId = member.getRealtionShopId();
}
@@ -104,7 +65,7 @@
public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
appShopGoodsPageDto.setShopId(member.getRealtionShopId());
}
@@ -121,7 +82,7 @@
public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
}
@@ -138,7 +99,7 @@
public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
}
@@ -150,12 +111,6 @@
return R.ok(page.setRecords(appSimpleGoodsVoList));
}
- @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户详情")
- public R<AppShopInfoVo> getShopInfo(@RequestBody AppBaseGetDto appBaseGetDto) {
- AppShopInfoVo appShopInfoVo = shopService.getAppShopInfo(Long.valueOf(appBaseGetDto.getId()));
- return R.ok(appShopInfoVo);
- }
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopGoods.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java
similarity index 96%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopGoods.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java
index 8dd9690..c185060 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopGoods.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java
@@ -1,4 +1,4 @@
-package com.ruoyi.shop.domain.pojo.shop;
+package com.ruoyi.order.domain.pojo.goods;
import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MetaVo.java
deleted file mode 100644
index 2732acb..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MetaVo.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 路由显示信息
- *
- * @author ruoyi
- */
-public class MetaVo
-{
- /**
- * 设置该路由在侧边栏和面包屑中展示的名字
- */
- private String title;
-
- /**
- * 设置该路由的图标，对应路径src/assets/icons/svg
- */
- private String icon;
-
- /**
- * 设置为true，则不会被 <keep-alive>缓存
- */
- private boolean noCache;
-
- /**
- * 内链地址（http(s)://开头）
- */
- private String link;
-
- public MetaVo()
- {
- }
-
- public MetaVo(String title, String icon)
- {
- this.title = title;
- this.icon = icon;
- }
-
- public MetaVo(String title, String icon, boolean noCache)
- {
- this.title = title;
- this.icon = icon;
- this.noCache = noCache;
- }
-
- public MetaVo(String title, String icon, String link)
- {
- this.title = title;
- this.icon = icon;
- this.link = link;
- }
-
- public MetaVo(String title, String icon, boolean noCache, String link)
- {
- this.title = title;
- this.icon = icon;
- this.noCache = noCache;
- if (StringUtils.ishttp(link))
- {
- this.link = link;
- }
- }
-
- public boolean isNoCache()
- {
- return noCache;
- }
-
- public void setNoCache(boolean noCache)
- {
- this.noCache = noCache;
- }
-
- public String getTitle()
- {
- return title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-
- public String getIcon()
- {
- return icon;
- }
-
- public void setIcon(String icon)
- {
- this.icon = icon;
- }
-
- public String getLink()
- {
- return link;
- }
-
- public void setLink(String link)
- {
- this.link = link;
- }
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/RouterVo.java
deleted file mode 100644
index 9e2c2b3..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/RouterVo.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import java.util.List;
-
-/**
- * 路由配置信息
- *
- * @author ruoyi
- */
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo
-{
- /**
- * 路由名字
- */
- private String name;
-
- /**
- * 路由地址
- */
- private String path;
-
- /**
- * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
- */
- private boolean hidden;
-
- /**
- * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- */
- private String redirect;
-
- /**
- * 组件地址
- */
- private String component;
-
- /**
- * 路由参数：如 {"id": 1, "name": "ry"}
- */
- private String query;
-
- /**
- * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- */
- private Boolean alwaysShow;
-
- /**
- * 其他元素
- */
- private MetaVo meta;
-
- /**
- * 子路由
- */
- private List<RouterVo> children;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getPath()
- {
- return path;
- }
-
- public void setPath(String path)
- {
- this.path = path;
- }
-
- public boolean getHidden()
- {
- return hidden;
- }
-
- public void setHidden(boolean hidden)
- {
- this.hidden = hidden;
- }
-
- public String getRedirect()
- {
- return redirect;
- }
-
- public void setRedirect(String redirect)
- {
- this.redirect = redirect;
- }
-
- public String getComponent()
- {
- return component;
- }
-
- public void setComponent(String component)
- {
- this.component = component;
- }
-
- public String getQuery()
- {
- return query;
- }
-
- public void setQuery(String query)
- {
- this.query = query;
- }
-
- public Boolean getAlwaysShow()
- {
- return alwaysShow;
- }
-
- public void setAlwaysShow(Boolean alwaysShow)
- {
- this.alwaysShow = alwaysShow;
- }
-
- public MetaVo getMeta()
- {
- return meta;
- }
-
- public void setMeta(MetaVo meta)
- {
- this.meta = meta;
- }
-
- public List<RouterVo> getChildren()
- {
- return children;
- }
-
- public void setChildren(List<RouterVo> children)
- {
- this.children = children;
- }
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/TreeSelect.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/TreeSelect.java
deleted file mode 100644
index 807ebb2..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/TreeSelect.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.stream.Collectors;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.system.api.domain.poji.sys.SysDept;
-import com.ruoyi.system.domain.pojo.sys.SysMenu;
-
-/**
- * Treeselect树结构实体类
- *
- * @author ruoyi
- */
-public class TreeSelect implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /** 节点ID */
- private Long id;
-
- /** 节点名称 */
- private String label;
-
- /** 子节点 */
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List<TreeSelect> children;
-
- public TreeSelect()
- {
-
- }
-
- public TreeSelect(SysDept dept)
- {
- this.id = dept.getDeptId();
- this.label = dept.getDeptName();
- this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
- }
-
- public TreeSelect(SysMenu menu)
- {
- this.id = menu.getMenuId();
- this.label = menu.getMenuName();
- this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public String getLabel()
- {
- return label;
- }
-
- public void setLabel(String label)
- {
- this.label = label;
- }
-
- public List<TreeSelect> getChildren()
- {
- return children;
- }
-
- public void setChildren(List<TreeSelect> children)
- {
- this.children = children;
- }
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/activity/ActivityGoodsMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java
similarity index 67%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/activity/ActivityGoodsMapper.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java
index d481075..8c44b4a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/activity/ActivityGoodsMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java
@@ -1,7 +1,7 @@
-package com.ruoyi.system.mapper.activity;
+package com.ruoyi.order.mapper.activity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.domain.pojo.activity.ActivityGoods;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopGoodsMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopGoodsMapper.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java
index 1d24338..928fb16 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopGoodsMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java
@@ -1,7 +1,8 @@
-package com.ruoyi.shop.mapper.shop;
+package com.ruoyi.order.mapper.goods;
-import com.ruoyi.shop.domain.pojo.shop.ShopGoods;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.domain.pojo.goods.ShopGoods;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/activity/ActivityGoodsService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java
similarity index 76%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/activity/ActivityGoodsService.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java
index ced4bc0..4671c44 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/activity/ActivityGoodsService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.system.service.activity;
+package com.ruoyi.order.service.activity;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.domain.pojo.activity.ActivityGoods;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopGoodsService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java
similarity index 81%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopGoodsService.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java
index 7b0bfef..7e40646 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopGoodsService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java
@@ -1,7 +1,8 @@
-package com.ruoyi.shop.service.shop;
+package com.ruoyi.order.service.goods;
-import com.ruoyi.shop.domain.pojo.shop.ShopGoods;
+
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.domain.pojo.goods.ShopGoods;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/activity/ActivityGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java
similarity index 79%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/activity/ActivityGoodsServiceImpl.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java
index 8ed5849..b402518 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/activity/ActivityGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java
@@ -1,11 +1,12 @@
-package com.ruoyi.system.service.impl.activity;
+package com.ruoyi.order.service.impl.activity;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.domain.pojo.activity.ActivityGoods;
-import com.ruoyi.system.mapper.activity.ActivityGoodsMapper;
-import com.ruoyi.system.service.activity.ActivityGoodsService;
+import com.ruoyi.order.mapper.activity.ActivityGoodsMapper;
+import com.ruoyi.order.service.activity.ActivityGoodsService;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java
new file mode 100644
index 0000000..e58fda8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl.goods;
+
+import com.ruoyi.system.domain.pojo.goods.GoodsFile;
+import com.ruoyi.system.mapper.goods.GoodsFileMapper;
+import com.ruoyi.system.service.goods.GoodsFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商品图片 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class GoodsFileServiceImpl extends ServiceImpl<GoodsFileMapper, GoodsFile> implements GoodsFileService {
+
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java
new file mode 100644
index 0000000..8809ee1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl.goods;
+
+import com.ruoyi.system.domain.pojo.goods.GoodsRelNurse;
+import com.ruoyi.system.mapper.goods.GoodsRelNurseMapper;
+import com.ruoyi.system.service.goods.GoodsRelNurseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商品调理问题 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class GoodsRelNurseServiceImpl extends ServiceImpl<GoodsRelNurseMapper, GoodsRelNurse> implements GoodsRelNurseService {
+
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java
new file mode 100644
index 0000000..4199440
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl.goods;
+
+import com.ruoyi.system.domain.pojo.goods.GoodsRelTag;
+import com.ruoyi.system.mapper.goods.GoodsRelTagMapper;
+import com.ruoyi.system.service.goods.GoodsRelTagService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商品标签 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class GoodsRelTagServiceImpl extends ServiceImpl<GoodsRelTagMapper, GoodsRelTag> implements GoodsRelTagService {
+
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java
new file mode 100644
index 0000000..ee749d1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java
@@ -0,0 +1,144 @@
+package com.ruoyi.order.service.impl.goods;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
+import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
+import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
+import com.ruoyi.order.domain.pojo.goods.Goods;
+import com.ruoyi.order.domain.pojo.goods.ShopGoods;
+import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
+import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
+import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
+import com.ruoyi.order.mapper.goods.GoodsMapper;
+import com.ruoyi.order.service.activity.ActivityGoodsService;
+import com.ruoyi.order.service.goods.GoodsService;
+import com.ruoyi.order.service.goods.ShopGoodsService;
+import com.ruoyi.system.api.RemoteActivityService;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 商品表 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
+
+ @Resource
+ private GoodsMapper goodsMapper;
+
+ @Resource
+ private ActivityGoodsService activityGoodsService;
+
+ @Resource
+ private ShopGoodsService shopGoodsService;
+
+ /**
+ * 获取推荐商品列表
+ * @param page
+ * @return
+ */
+ @Override
+ public List<AppSimpleGoodsVo> pageRecommendGoods(Page page, Long shopId){
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageRecommendGoods(page,shopId);
+ return appSimpleGoodsVoList;
+ }
+
+ /**
+ * 获取商城商品列表
+ * @param page
+ * @param appShopGoodsPageDto
+ * @return
+ */
+ @Override
+ public List<AppSimpleGoodsVo> pageShopGoods(Page page, AppShopGoodsPageDto appShopGoodsPageDto){
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageShopGoods(page,appShopGoodsPageDto);
+ return appSimpleGoodsVoList;
+ }
+
+ /**
+ * 获取搜索商品列表
+ * @param page
+ * @param appSearchGoodsPageDto
+ * @return
+ */
+ @Override
+ public List<AppSimpleGoodsVo> pageSearchGoods(Page page, AppSearchGoodsPageDto appSearchGoodsPageDto){
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageSearchGoods(page,appSearchGoodsPageDto);
+ return appSimpleGoodsVoList;
+ }
+
+ /**
+ * 获取搜索商品列表
+ * @param page
+ * @param appSearchGoodsPageDto
+ * @return
+ */
+ @Override
+ public List<AppSimpleActivityGoodsVo> pageSearchActivityGoods(Page page, AppSearchGoodsPageDto appSearchGoodsPageDto){
+ List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsMapper.pageSearchActivityGoods(page,appSearchGoodsPageDto);
+ Integer activityNumber;
+ BigDecimal activityNumberBig;
+ Integer salesNumber;
+ BigDecimal salesNumberBig;
+ BigDecimal salesPercent;
+ for(AppSimpleActivityGoodsVo appSimpleActivityGoodsVo : appSimpleGoodsVoList){
+ activityNumber = appSimpleActivityGoodsVo.getActivityNumber();
+ salesNumber = appSimpleActivityGoodsVo.getSalesNumber();
+ activityNumberBig = BigDecimal.valueOf(activityNumber);
+ salesNumberBig = BigDecimal.valueOf(salesNumber);
+ salesPercent = salesNumberBig.divide(activityNumberBig,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00"));
+ appSimpleActivityGoodsVo.setSalesPercent(salesPercent);
+ }
+ return appSimpleGoodsVoList;
+ }
+
+ /**
+ * 获取商品详情
+ * @param appGoodsInfoGetDto
+ * @return
+ */
+ @Override
+ public AppGoodsInfoVo getGoodsInfo(AppGoodsInfoGetDto appGoodsInfoGetDto){
+ AppGoodsInfoVo appGoodsInfoVo = new AppGoodsInfoVo();
+ Goods goods = this.getById(appGoodsInfoGetDto.getId());
+ BeanUtils.copyProperties(goods, appGoodsInfoVo);
+ //商户定制价格
+ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appGoodsInfoGetDto.getShopId(),goods.getGoodsId());
+ if(shopGoods!=null){
+ appGoodsInfoVo.setSalesPrice(shopGoods.getSalesPrice());
+ appGoodsInfoVo.setSalesNum(shopGoods.getServiceNum());
+ }
+ //活动商品判断
+ if(appGoodsInfoGetDto.getActivityFlag()==1){
+ ActivityGoods activityGoods = activityGoodsService.getByGoodsId(goods.getGoodsId());
+ //原价取较大值
+ if(shopGoods!=null&&goods.getSalesPrice().compareTo(shopGoods.getSalesPrice())>0){
+ appGoodsInfoVo.setSalesPrice(goods.getSalesPrice());
+ }
+ appGoodsInfoVo.setActivityFlag(1);
+ appGoodsInfoVo.setActivityPrice(activityGoods.getActivityPrice());
+ appGoodsInfoVo.setSalesNum(activityGoods.getSalesNumber());
+ appGoodsInfoVo.setActivityDeadline(activityGoods.getActivityDeadline());
+ //售罄判断
+ if(activityGoods.getActivityNumber()==activityGoods.getSalesNumber()){
+ appGoodsInfoVo.setSellOutFlag(1);
+ }else{
+ appGoodsInfoVo.setSellOutFlag(0);
+ }
+ }else{
+ appGoodsInfoVo.setActivityFlag(0);
+ }
+ return appGoodsInfoVo;
+ }
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java
new file mode 100644
index 0000000..71e184e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl.goods;
+
+import com.ruoyi.system.domain.pojo.goods.GoodsTotal;
+import com.ruoyi.system.mapper.goods.GoodsTotalMapper;
+import com.ruoyi.system.service.goods.GoodsTotalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商品统计 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class GoodsTotalServiceImpl extends ServiceImpl<GoodsTotalMapper, GoodsTotal> implements GoodsTotalService {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java
similarity index 82%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopGoodsServiceImpl.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java
index 33fac3d..8c6c1ad 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ruoyi.shop.service.impl.shop;
+package com.ruoyi.order.service.impl.goods;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.shop.domain.pojo.shop.ShopGoods;
-import com.ruoyi.shop.mapper.shop.ShopGoodsMapper;
-import com.ruoyi.shop.service.shop.ShopGoodsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.goods.ShopGoods;
+import com.ruoyi.order.mapper.goods.ShopGoodsMapper;
+import com.ruoyi.order.service.goods.ShopGoodsService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
new file mode 100644
index 0000000..11d6138
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl.order;
+
+import com.ruoyi.system.domain.pojo.order.ConsumerGoods;
+import com.ruoyi.system.mapper.order.ConsumerGoodsMapper;
+import com.ruoyi.system.service.order.ConsumerGoodsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class ConsumerGoodsServiceImpl extends ServiceImpl<ConsumerGoodsMapper, ConsumerGoods> implements ConsumerGoodsService {
+
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
new file mode 100644
index 0000000..5f84b8a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl.order;
+
+import com.ruoyi.system.domain.pojo.order.OrderGoods;
+import com.ruoyi.system.mapper.order.OrderGoodsMapper;
+import com.ruoyi.system.service.order.OrderGoodsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 订单商品 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGoods> implements OrderGoodsService {
+
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
new file mode 100644
index 0000000..db89aa6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl.order;
+
+import com.ruoyi.system.domain.pojo.order.Order;
+import com.ruoyi.system.mapper.order.OrderMapper;
+import com.ruoyi.system.service.order.OrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 订单 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java
new file mode 100644
index 0000000..03fbe99
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java
@@ -0,0 +1,95 @@
+package com.ruoyi.order.service.impl.order;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.dto.AppBaseBathDto;
+import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
+import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
+import com.ruoyi.order.domain.pojo.goods.Goods;
+import com.ruoyi.order.domain.pojo.order.ShoppingCart;
+import com.ruoyi.order.mapper.order.ShoppingCartMapper;
+import com.ruoyi.order.service.goods.GoodsService;
+import com.ruoyi.order.service.order.ShoppingCartService;
+import com.ruoyi.system.api.constant.AppErrorConstant;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * <p>
+ * 购物车 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, ShoppingCart> implements ShoppingCartService {
+
+ @Resource
+ private GoodsService goodsService;
+
+ @Resource
+ private ShoppingCartMapper shoppingCartMapper;
+
+ /**
+ * 添加购物车
+ * @param appShoppingCartAddDto
+ */
+ @Override
+ public void addShoppingCart(AppShoppingCartAddDto appShoppingCartAddDto){
+ Long goodsId = appShoppingCartAddDto.getGoodsId();
+ Goods goods = goodsService.getById(goodsId);
+ if(goods.getGoodsStatus()!=1){
+ throw new ServiceException(AppErrorConstant.GOODS_DOWN);
+ }
+ LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
+ ShoppingCart shoppingCart = this.getOne(queryWrapper);
+ if(shoppingCart==null){
+ shoppingCart = new ShoppingCart();
+ shoppingCart.setUserId(appShoppingCartAddDto.getUserId());
+ shoppingCart.setShopId(appShoppingCartAddDto.getShopId());
+ shoppingCart.setBuyNum(appShoppingCartAddDto.getBuyNum());
+ shoppingCart.setDelFlag(0);
+ shoppingCart.setCreateTime(new Date());
+ this.save(shoppingCart);
+ }else{
+ shoppingCart.setBuyNum(shoppingCart.getBuyNum()+appShoppingCartAddDto.getBuyNum());
+ shoppingCart.setUpdateTime(new Date());
+ this.saveOrUpdate(shoppingCart);
+ }
+ }
+
+ /**
+ * 修改购物车数量
+ * @param appShoppingCartChangeDto
+ */
+ @Override
+ public void changeShoppingCart(AppShoppingCartChangeDto appShoppingCartChangeDto){
+ Long goodsId = appShoppingCartChangeDto.getGoodsId();
+ Goods goods = goodsService.getById(goodsId);
+ if(goods.getGoodsStatus()!=1){
+ throw new ServiceException(AppErrorConstant.GOODS_DOWN);
+ }
+ LambdaQueryWrapper<ShoppingCart> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(ShoppingCart::getDelFlag, 0).eq(ShoppingCart::getGoodsId, goodsId);
+ ShoppingCart shoppingCart = this.getOne(queryWrapper);
+ shoppingCart.setBuyNum(appShoppingCartChangeDto.getBuyNum());
+ shoppingCart.setUpdateTime(new Date());
+ this.saveOrUpdate(shoppingCart);
+ }
+
+ /**
+ * 删除购物车
+ * @param appBaseBathDto
+ */
+ @Override
+ public void deleteShoppingCart(AppBaseBathDto appBaseBathDto){
+ String ids = appBaseBathDto.getIds();
+ shoppingCartMapper.deleteShoppingCartByIds(ids);
+ }
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java
new file mode 100644
index 0000000..1c77604
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl.order;
+
+import com.ruoyi.system.domain.pojo.order.UserServiceRecord;
+import com.ruoyi.system.mapper.order.UserServiceRecordMapper;
+import com.ruoyi.system.service.order.UserServiceRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务记录 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class UserServiceRecordServiceImpl extends ServiceImpl<UserServiceRecordMapper, UserServiceRecord> implements UserServiceRecordService {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/activity/ActivityGoodsMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
similarity index 91%
rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
rename to ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
index 3f27fba..b09def9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.activity.ActivityGoodsMapper">
+<mapper namespace="com.ruoyi.order.mapper.activity.ActivityGoodsMapper">
- <resultMap type="com.ruoyi.system.domain.pojo.activity.ActivityGoods" id="ActivityGoodsResult">
+ <resultMap type="com.ruoyi.system.api.domain.poji.activity.ActivityGoods" id="ActivityGoodsResult">
<result property="agId" column="ag_id" />
<result property="delFlag" column="del_flag" />
<result property="goodsId" column="goods_id" />
@@ -17,7 +17,7 @@
select ag_id, del_flag, goods_id, activity_id, activity_price, activity_number, sales_number, activity_deadline from t_activity_goods
</sql>
- <select id="selectActivityGoodsList" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods" resultMap="ActivityGoodsResult">
+ <select id="selectActivityGoodsList" parameterType="com.ruoyi.system.api.domain.poji.activity.ActivityGoods" resultMap="ActivityGoodsResult">
<include refid="selectActivityGoodsVo"/>
<where>
<if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
@@ -34,7 +34,7 @@
where ag_id = #{agId}
</select>
- <insert id="insertActivityGoods" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods" useGeneratedKeys="true" keyProperty="agId">
+ <insert id="insertActivityGoods" parameterType="com.ruoyi.system.api.domain.poji.activity.ActivityGoods" useGeneratedKeys="true" keyProperty="agId">
insert into t_activity_goods
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="delFlag != null">del_flag,</if>
@@ -56,7 +56,7 @@
</trim>
</insert>
- <update id="updateActivityGoods" parameterType="com.ruoyi.system.domain.pojo.activity.ActivityGoods">
+ <update id="updateActivityGoods" parameterType="com.ruoyi.system.api.domain.poji.activity.ActivityGoods">
update t_activity_goods
<trim prefix="SET" suffixOverrides=",">
<if test="delFlag != null">del_flag = #{delFlag},</if>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopGoodsMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopGoodsMapper.xml
rename to ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml
index 9d53508..8f7af31 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopGoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.shop.mapper.shop.ShopGoodsMapper">
+<mapper namespace="com.ruoyi.order.mapper.goods.ShopGoodsMapper">
<resultMap type="ShopGoods" id="ShopGoodsResult">
<result property="id" column="id" />
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/RuoYiSystemApplication.java
index 27903ad..3f8d140 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/RuoYiSystemApplication.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/RuoYiSystemApplication.java
@@ -9,7 +9,7 @@
/**
* 系统模块
*
- * @author ruoyi
+ * @author jqs
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppGoodsController.java
deleted file mode 100644
index c15276e..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppGoodsController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.ruoyi.shop.controller.miniapp;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.AppBaseBathDto;
-import com.ruoyi.member.domain.dto.AppGoodsInfoGetDto;
-import com.ruoyi.member.domain.dto.AppShoppingCartAddDto;
-import com.ruoyi.member.domain.dto.AppShoppingCartChangeDto;
-import com.ruoyi.member.domain.pojo.member.Member;
-import com.ruoyi.member.domain.vo.AppGoodsInfoVo;
-import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.system.service.goods.GoodsService;
-import com.ruoyi.system.service.order.ShoppingCartService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author jqs34
- * @ClassName AppGoodsController
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Api(value = "小程序商品相关接口", tags = "小程序商品相关接口", description = "小程序商品相关接口")
-@RestController
-@RequestMapping("/app/home")
-public class AppGoodsController {
-
- @Autowired
- private GoodsService goodsService;
-
- @Autowired
- private MemberService memberService;
-
- @Autowired
- private ShoppingCartService shoppingCartService;
-
- @RequestMapping(value = "/getGoodsInfo", method = RequestMethod.POST)
- @ApiOperation(value = "获取商品详情")
- public R<AppGoodsInfoVo> getGoodsInfo(@RequestBody AppGoodsInfoGetDto appGoodsInfoGetDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appGoodsInfoGetDto.setShopId(member.getRealtionShopId());
- }
- }
- AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
- return R.ok(appGoodsInfoVo);
- }
-
- @RequestMapping(value = "/addShoppingCart", method = RequestMethod.POST)
- @ApiOperation(value = "添加购物车")
- public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- appShoppingCartAddDto.setUserId(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShoppingCartAddDto.setShopId(member.getRealtionShopId());
- }
- }
- shoppingCartService.addShoppingCart(appShoppingCartAddDto);
- return R.ok();
- }
-
- @RequestMapping(value = "/changeShoppingCart", method = RequestMethod.POST)
- @ApiOperation(value = "修改购物车")
- public R changeShoppingCart(@RequestBody AppShoppingCartChangeDto appShoppingCartChangeDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- appShoppingCartChangeDto.setUserId(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShoppingCartChangeDto.setShopId(member.getRealtionShopId());
- }
- }
- shoppingCartService.changeShoppingCart(appShoppingCartChangeDto);
- return R.ok();
- }
-
- @RequestMapping(value = "/deleteShoppingCart", method = RequestMethod.POST)
- @ApiOperation(value = "删除购物车")
- public R changeShoppingCart(@RequestBody AppBaseBathDto appBaseBathDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- appBaseBathDto.setUserId(userId);
- }
- shoppingCartService.deleteShoppingCart(appBaseBathDto);
- return R.ok();
- }
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
index e7580a4..88cec68 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -1,15 +1,14 @@
package com.ruoyi.shop.controller.miniapp;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.pojo.member.Member;
-import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.system.service.config.AdvertService;
-import com.ruoyi.system.service.config.BannerService;
-import com.ruoyi.system.service.config.QuickEntryService;
-import com.ruoyi.system.service.goods.GoodsService;
-import com.ruoyi.system.service.shop.ShopService;
+import com.ruoyi.shop.domain.dto.AppBaseGetDto;
+import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
+import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
+import com.ruoyi.shop.domain.vo.AppShopInfoVo;
+import com.ruoyi.shop.service.shop.ShopService;
+import com.ruoyi.system.api.RemoteMemberService;
+import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,8 +16,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
/**
* @author jqs34
@@ -34,19 +31,7 @@
@Autowired
- private MemberService memberService;
-
- @Autowired
- private BannerService bannerService;
-
- @Autowired
- private QuickEntryService quickEntryService;
-
- @Autowired
- private AdvertService advertService;
-
- @Autowired
- private GoodsService goodsService;
+ private RemoteMemberService memberService;
@Autowired
private ShopService shopService;
@@ -55,100 +40,12 @@
@ApiOperation(value = "获取最近商户")
public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
Long userId = SecurityUtils.getUserId();
+ Member member = memberService.getMember(userId).getData();
appNearbyShopDto.setUserId(userId);
- AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
+ AppNearbyShopVo appNearbyShopVo = shopService.getNearbyShop(appNearbyShopDto,member);
return R.ok(appNearbyShopVo);
}
- @RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页banner")
- public R<List<AppBannerVo>> getHomeBanner() {
- List<AppBannerVo> appBannerVoList = bannerService.listHomeBannerVo();
- return R.ok(appBannerVoList);
- }
-
- @RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页快速入口")
- public R<List<AppQuickEntryVo>> getQuickEntry() {
- List<AppQuickEntryVo> appQuickEntryVoList = quickEntryService.listQuickEntryVo();
- return R.ok(appQuickEntryVoList);
- }
-
- @RequestMapping(value = "/getAdvert", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页广告")
- public R<AppAdvertVo> getAdvert() {
- AppAdvertVo appAdvertVo = advertService.getAdvertVo();
- return R.ok(appAdvertVo);
- }
-
- @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
- @ApiOperation(value = "推荐商品")
- public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
- Long userId = SecurityUtils.getUserId();
- Long shopId = null;
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- shopId = member.getRealtionShopId();
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appPageDto.getPageSize());
- page.setCurrent(appPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
-
- @RequestMapping(value = "/pageShopGoods", method = RequestMethod.POST)
- @ApiOperation(value = "商城商品")
- public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShopGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appShopGoodsPageDto.getPageSize());
- page.setCurrent(appShopGoodsPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageShopGoods(page,appShopGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
-
- @RequestMapping(value = "/pageSearchGoods", method = RequestMethod.POST)
- @ApiOperation(value = "搜索商品")
- public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appSearchGoodsPageDto.getPageSize());
- page.setCurrent(appSearchGoodsPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchGoods(page,appSearchGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
-
- @RequestMapping(value = "/pageSearchActivityGoods", method = RequestMethod.POST)
- @ApiOperation(value = "搜索活动商品")
- public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleActivityGoodsVo> page = new Page<>();
- page.setSize(appSearchGoodsPageDto.getPageSize());
- page.setCurrent(appSearchGoodsPageDto.getPageNum());
- List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchActivityGoods(page,appSearchGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
@RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取商户详情")
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MetaVo.java
deleted file mode 100644
index 77096e3..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MetaVo.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 路由显示信息
- *
- * @author ruoyi
- */
-public class MetaVo
-{
- /**
- * 设置该路由在侧边栏和面包屑中展示的名字
- */
- private String title;
-
- /**
- * 设置该路由的图标，对应路径src/assets/icons/svg
- */
- private String icon;
-
- /**
- * 设置为true，则不会被 <keep-alive>缓存
- */
- private boolean noCache;
-
- /**
- * 内链地址（http(s)://开头）
- */
- private String link;
-
- public MetaVo()
- {
- }
-
- public MetaVo(String title, String icon)
- {
- this.title = title;
- this.icon = icon;
- }
-
- public MetaVo(String title, String icon, boolean noCache)
- {
- this.title = title;
- this.icon = icon;
- this.noCache = noCache;
- }
-
- public MetaVo(String title, String icon, String link)
- {
- this.title = title;
- this.icon = icon;
- this.link = link;
- }
-
- public MetaVo(String title, String icon, boolean noCache, String link)
- {
- this.title = title;
- this.icon = icon;
- this.noCache = noCache;
- if (StringUtils.ishttp(link))
- {
- this.link = link;
- }
- }
-
- public boolean isNoCache()
- {
- return noCache;
- }
-
- public void setNoCache(boolean noCache)
- {
- this.noCache = noCache;
- }
-
- public String getTitle()
- {
- return title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-
- public String getIcon()
- {
- return icon;
- }
-
- public void setIcon(String icon)
- {
- this.icon = icon;
- }
-
- public String getLink()
- {
- return link;
- }
-
- public void setLink(String link)
- {
- this.link = link;
- }
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/RouterVo.java
deleted file mode 100644
index 0b99817..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/RouterVo.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import java.util.List;
-
-/**
- * 路由配置信息
- *
- * @author ruoyi
- */
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo
-{
- /**
- * 路由名字
- */
- private String name;
-
- /**
- * 路由地址
- */
- private String path;
-
- /**
- * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
- */
- private boolean hidden;
-
- /**
- * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- */
- private String redirect;
-
- /**
- * 组件地址
- */
- private String component;
-
- /**
- * 路由参数：如 {"id": 1, "name": "ry"}
- */
- private String query;
-
- /**
- * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- */
- private Boolean alwaysShow;
-
- /**
- * 其他元素
- */
- private MetaVo meta;
-
- /**
- * 子路由
- */
- private List<RouterVo> children;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getPath()
- {
- return path;
- }
-
- public void setPath(String path)
- {
- this.path = path;
- }
-
- public boolean getHidden()
- {
- return hidden;
- }
-
- public void setHidden(boolean hidden)
- {
- this.hidden = hidden;
- }
-
- public String getRedirect()
- {
- return redirect;
- }
-
- public void setRedirect(String redirect)
- {
- this.redirect = redirect;
- }
-
- public String getComponent()
- {
- return component;
- }
-
- public void setComponent(String component)
- {
- this.component = component;
- }
-
- public String getQuery()
- {
- return query;
- }
-
- public void setQuery(String query)
- {
- this.query = query;
- }
-
- public Boolean getAlwaysShow()
- {
- return alwaysShow;
- }
-
- public void setAlwaysShow(Boolean alwaysShow)
- {
- this.alwaysShow = alwaysShow;
- }
-
- public MetaVo getMeta()
- {
- return meta;
- }
-
- public void setMeta(MetaVo meta)
- {
- this.meta = meta;
- }
-
- public List<RouterVo> getChildren()
- {
- return children;
- }
-
- public void setChildren(List<RouterVo> children)
- {
- this.children = children;
- }
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/TreeSelect.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/TreeSelect.java
deleted file mode 100644
index 2849373..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/TreeSelect.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.stream.Collectors;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.system.api.domain.poji.sys.SysDept;
-import com.ruoyi.system.domain.pojo.sys.SysMenu;
-
-/**
- * Treeselect树结构实体类
- *
- * @author ruoyi
- */
-public class TreeSelect implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /** 节点ID */
- private Long id;
-
- /** 节点名称 */
- private String label;
-
- /** 子节点 */
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List<TreeSelect> children;
-
- public TreeSelect()
- {
-
- }
-
- public TreeSelect(SysDept dept)
- {
- this.id = dept.getDeptId();
- this.label = dept.getDeptName();
- this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
- }
-
- public TreeSelect(SysMenu menu)
- {
- this.id = menu.getMenuId();
- this.label = menu.getMenuName();
- this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public String getLabel()
- {
- return label;
- }
-
- public void setLabel(String label)
- {
- this.label = label;
- }
-
- public List<TreeSelect> getChildren()
- {
- return children;
- }
-
- public void setChildren(List<TreeSelect> children)
- {
- this.children = children;
- }
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index e448515..78b40a9 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -1,24 +1,22 @@
package com.ruoyi.shop.service.impl.shop;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
+import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.util.CodeFactoryUtil;
+import com.ruoyi.system.api.RemoteActivityService;
+import com.ruoyi.system.api.RemoteConfigService;
+import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
+import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.shop.domain.dto.MgtChangeCoopDto;
-import com.ruoyi.shop.domain.dto.MgtEditShopDto;
-import com.ruoyi.shop.domain.dto.MgtEditShopTagDto;
-import com.ruoyi.shop.domain.dto.MgtShopPageDto;
-import com.ruoyi.system.domain.pojo.config.SysTag;
-import com.ruoyi.system.domain.pojo.shop.*;
import com.ruoyi.shop.domain.vo.AppShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
-import com.ruoyi.system.service.config.SysTagService;
-import com.ruoyi.system.service.shop.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.service.sys.ISysUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -51,7 +49,10 @@
private ShopCertificateService shopCertificateService;
@Resource
- private SysTagService sysTagService;
+ private RemoteConfigService configService;
+
+ @Resource
+ private RemoteUserService sysUserService;
@Resource
private ShopRelTagService shopRelTagService;
@@ -59,8 +60,6 @@
@Resource
private ShopRelUserService shopRelUserService;
- @Resource
- private ISysUserService sysUserService;
/**
* 获取商户详情
@@ -136,7 +135,7 @@
for(String str : shopTagIdArray){
shopRelTag = new ShopRelTag();
tagid = Long.valueOf(str);
- sysTag = sysTagService.getById(tagid);
+ sysTag = configService.getSysTag(tagid).getData();
shopRelTag.setDelFlag(0);
shopRelTag.setShopId(shop.getShopId());
shopRelTag.setTagId(tagid);
@@ -156,7 +155,7 @@
for(String str : relUserIdArray){
shopRelUser = new ShopRelUser();
userId = Long.valueOf(str);
- sysUser = sysUserService.selectUserById(userId);
+ sysUser = sysUserService.getSysUser(userId).getData();
shopRelUser.setDelFlag(0);
shopRelUser.setShopId(shop.getShopId());
shopRelUser.setUserId(userId);
@@ -301,7 +300,7 @@
StringJoiner shopTagSj = new StringJoiner(",");
for(String str : shopTagIdArray){
tagId = Long.valueOf(str);
- sysTag = sysTagService.getById(tagId);
+ sysTag = configService.getSysTag(tagId).getData();
shopRelTag = new ShopRelTag();
shopRelTag.setDelFlag(0);
shopRelTag.setShopId(shopId);
@@ -316,4 +315,27 @@
this.saveOrUpdate(shop);
}
+ /**
+ * 获取附近门店
+ * @param appNearbyShopDto
+ * @return
+ */
+ @Override
+ public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto,Member member){
+ AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
+ Shop shop = null;
+ if(member.getRealtionShopId()!=null){
+ //获取绑定商户
+ shop = this.getById(member.getRealtionShopId());
+ }else{
+ //获取附近商户
+ shop = this.getById(1L);
+ }
+ appNearbyShopVo.setShopId(shop.getShopId());
+ appNearbyShopVo.setShopName(shop.getShopName());
+ appNearbyShopVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
+ appNearbyShopVo.setShopLatitude(shop.getShopLatitude());
+ appNearbyShopVo.setShopLongitude(shop.getShopLongitude());
+ return appNearbyShopVo;
+ }
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
index e7162e5..677b884 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
@@ -1,15 +1,14 @@
package com.ruoyi.shop.service.shop;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.shop.domain.dto.MgtChangeCoopDto;
-import com.ruoyi.shop.domain.dto.MgtEditShopDto;
-import com.ruoyi.shop.domain.dto.MgtEditShopTagDto;
-import com.ruoyi.shop.domain.dto.MgtShopPageDto;
+import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.Shop;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
import com.ruoyi.shop.domain.vo.AppShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
+import com.ruoyi.system.api.domain.poji.member.Member;
import java.util.List;
@@ -64,6 +63,13 @@
void editShopTag(MgtEditShopTagDto mgtEditShopTagDto);
/**
+ * 获取附近门店
+ * @param appNearbyShopDto
+ * @return
+ */
+ AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto, Member member);
+
+ /**
* 获取商户详情
* @param userId
* @return
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
index 93d47ef..942c70a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
@@ -9,7 +9,7 @@
/**
* 系统模块
*
- * @author ruoyi
+ * @author jqs
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ActivityController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ActivityController.java
new file mode 100644
index 0000000..aaff49a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ActivityController.java
@@ -0,0 +1,32 @@
+package com.ruoyi.system.controller.conslole;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.service.activity.ActivityGoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname ActivityController
+ * @description: TODO
+ * @date 2023 2023/4/30 15:17
+ */
+@RestController
+@RequestMapping("/activity")
+public class ActivityController {
+
+
+ @Autowired
+ private ActivityGoodsService activityGoodsService;
+
+ @InnerAuth
+ @PostMapping("/getActivityGoods")
+ public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId)
+ {
+ ActivityGoods activityGoods = activityGoodsService.getByGoodsId(goodsId);
+ return R.ok(activityGoods);
+ }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
new file mode 100644
index 0000000..9fe89c8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
@@ -0,0 +1,32 @@
+package com.ruoyi.system.controller.conslole;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
+import com.ruoyi.system.service.config.SysTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname ConfigController
+ * @description: TODO
+ * @date 2023 2023/4/30 15:53
+ */
+@RestController
+@RequestMapping("/config")
+public class ConfigController {
+
+ @Autowired
+ private SysTagService sysTagService;
+
+ @InnerAuth
+ @PostMapping("/getSysTag")
+ public R<SysTag> getSysTag(@RequestBody Long sysTagId)
+ {
+ SysTag sysTag = sysTagService.getById(sysTagId);
+ return R.ok(sysTag);
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppGoodsController.java
deleted file mode 100644
index d89bc68..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppGoodsController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.ruoyi.system.controller.miniapp;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.AppBaseBathDto;
-import com.ruoyi.member.domain.dto.AppGoodsInfoGetDto;
-import com.ruoyi.member.domain.dto.AppShoppingCartAddDto;
-import com.ruoyi.member.domain.dto.AppShoppingCartChangeDto;
-import com.ruoyi.member.domain.pojo.member.Member;
-import com.ruoyi.member.domain.vo.AppGoodsInfoVo;
-import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.system.service.goods.GoodsService;
-import com.ruoyi.system.service.order.ShoppingCartService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author jqs34
- * @ClassName AppGoodsController
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Api(value = "小程序商品相关接口", tags = "小程序商品相关接口", description = "小程序商品相关接口")
-@RestController
-@RequestMapping("/app/home")
-public class AppGoodsController {
-
- @Autowired
- private GoodsService goodsService;
-
- @Autowired
- private MemberService memberService;
-
- @Autowired
- private ShoppingCartService shoppingCartService;
-
- @RequestMapping(value = "/getGoodsInfo", method = RequestMethod.POST)
- @ApiOperation(value = "获取商品详情")
- public R<AppGoodsInfoVo> getGoodsInfo(@RequestBody AppGoodsInfoGetDto appGoodsInfoGetDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appGoodsInfoGetDto.setShopId(member.getRealtionShopId());
- }
- }
- AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
- return R.ok(appGoodsInfoVo);
- }
-
- @RequestMapping(value = "/addShoppingCart", method = RequestMethod.POST)
- @ApiOperation(value = "添加购物车")
- public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- appShoppingCartAddDto.setUserId(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShoppingCartAddDto.setShopId(member.getRealtionShopId());
- }
- }
- shoppingCartService.addShoppingCart(appShoppingCartAddDto);
- return R.ok();
- }
-
- @RequestMapping(value = "/changeShoppingCart", method = RequestMethod.POST)
- @ApiOperation(value = "修改购物车")
- public R changeShoppingCart(@RequestBody AppShoppingCartChangeDto appShoppingCartChangeDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- appShoppingCartChangeDto.setUserId(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShoppingCartChangeDto.setShopId(member.getRealtionShopId());
- }
- }
- shoppingCartService.changeShoppingCart(appShoppingCartChangeDto);
- return R.ok();
- }
-
- @RequestMapping(value = "/deleteShoppingCart", method = RequestMethod.POST)
- @ApiOperation(value = "删除购物车")
- public R changeShoppingCart(@RequestBody AppBaseBathDto appBaseBathDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- appBaseBathDto.setUserId(userId);
- }
- shoppingCartService.deleteShoppingCart(appBaseBathDto);
- return R.ok();
- }
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
index 726d81a..0285510 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
@@ -1,21 +1,15 @@
package com.ruoyi.system.controller.miniapp;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.pojo.member.Member;
-import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.system.domain.dto.*;
-import com.ruoyi.system.domain.vo.*;
+import com.ruoyi.system.domain.vo.AppAdvertVo;
+import com.ruoyi.system.domain.vo.AppBannerVo;
+import com.ruoyi.system.domain.vo.AppQuickEntryVo;
import com.ruoyi.system.service.config.AdvertService;
import com.ruoyi.system.service.config.BannerService;
import com.ruoyi.system.service.config.QuickEntryService;
-import com.ruoyi.system.service.goods.GoodsService;
-import com.ruoyi.system.service.shop.ShopService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -46,14 +40,6 @@
private AdvertService advertService;
- @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
- @ApiOperation(value = "获取最近商户")
- public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
- Long userId = SecurityUtils.getUserId();
- appNearbyShopDto.setUserId(userId);
- AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
- return R.ok(appNearbyShopVo);
- }
@RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
@ApiOperation(value = "获取首页banner")
@@ -76,81 +62,8 @@
return R.ok(appAdvertVo);
}
- @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
- @ApiOperation(value = "推荐商品")
- public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
- Long userId = SecurityUtils.getUserId();
- Long shopId = null;
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- shopId = member.getRealtionShopId();
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appPageDto.getPageSize());
- page.setCurrent(appPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
- @RequestMapping(value = "/pageShopGoods", method = RequestMethod.POST)
- @ApiOperation(value = "商城商品")
- public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appShopGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appShopGoodsPageDto.getPageSize());
- page.setCurrent(appShopGoodsPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageShopGoods(page,appShopGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
- @RequestMapping(value = "/pageSearchGoods", method = RequestMethod.POST)
- @ApiOperation(value = "搜索商品")
- public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appSearchGoodsPageDto.getPageSize());
- page.setCurrent(appSearchGoodsPageDto.getPageNum());
- List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchGoods(page,appSearchGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
-
- @RequestMapping(value = "/pageSearchActivityGoods", method = RequestMethod.POST)
- @ApiOperation(value = "搜索活动商品")
- public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getById(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
- }
- }
- Page<AppSimpleActivityGoodsVo> page = new Page<>();
- page.setSize(appSearchGoodsPageDto.getPageSize());
- page.setCurrent(appSearchGoodsPageDto.getPageNum());
- List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchActivityGoods(page,appSearchGoodsPageDto);
- return R.ok(page.setRecords(appSimpleGoodsVoList));
- }
-
- @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户详情")
- public R<AppShopInfoVo> getShopInfo(@RequestBody AppBaseGetDto appBaseGetDto) {
- AppShopInfoVo appShopInfoVo = shopService.getAppShopInfo(Long.valueOf(appBaseGetDto.getId()));
- return R.ok(appShopInfoVo);
- }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysConfigController.java
index efd0602..8361bcd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysConfigController.java
@@ -26,7 +26,7 @@
/**
* 参数配置 信息操作处理
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/config")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
index d2fe3a8..f0c63cd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
@@ -26,7 +26,7 @@
/**
* 部门信息
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/dept")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictDataController.java
index 09da49d..79ec8b6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictDataController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictDataController.java
@@ -29,7 +29,7 @@
/**
* 数据字典信息
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/dict/data")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictTypeController.java
index 5a451d9..9ec8c61 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictTypeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDictTypeController.java
@@ -26,7 +26,7 @@
/**
* 数据字典信息
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/dict/type")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysLogininforController.java
index 8e2b0dd..0d0e348 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysLogininforController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysLogininforController.java
@@ -26,7 +26,7 @@
/**
* 系统访问记录
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/logininfor")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
index 8112097..8fc718f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
@@ -25,7 +25,7 @@
/**
* 菜单信息
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/menu")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysNoticeController.java
index 1ad7c75..56d9c01 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysNoticeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysNoticeController.java
@@ -24,7 +24,7 @@
/**
* 公告 信息操作处理
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/notice")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysOperlogController.java
index 3f105bb..f41dbbf 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysOperlogController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysOperlogController.java
@@ -24,7 +24,7 @@
/**
* 操作日志记录
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/operlog")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysPostController.java
index 309275a..f1ab05f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysPostController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysPostController.java
@@ -26,7 +26,7 @@
/**
* 岗位信息操作处理
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/post")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java
index 8d3fc75..e5f3716 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java
@@ -29,7 +29,7 @@
/**
* 个人信息 业务处理
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/user/profile")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysRoleController.java
index 94f092d..5a5e3e9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysRoleController.java
@@ -31,7 +31,7 @@
/**
* 角色信息
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/role")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index 3635585..a3079a2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -1,27 +1,5 @@
package com.ruoyi.system.controller.sys;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.system.api.model.AppMiniLoginDto;
-import com.ruoyi.system.api.model.AppMiniLoginVo;
-import com.ruoyi.system.service.member.MemberService;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -37,17 +15,23 @@
import com.ruoyi.system.api.domain.poji.sys.SysRole;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.service.sys.ISysConfigService;
-import com.ruoyi.system.service.sys.ISysDeptService;
-import com.ruoyi.system.service.sys.ISysPermissionService;
-import com.ruoyi.system.service.sys.ISysPostService;
-import com.ruoyi.system.service.sys.ISysRoleService;
-import com.ruoyi.system.service.sys.ISysUserService;
+import com.ruoyi.system.service.sys.*;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* 用户信息
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/user")
@@ -70,9 +54,6 @@
@Autowired
private ISysConfigService configService;
-
- @Autowired
- private MemberService memberService;
/**
* 获取用户列表
@@ -332,18 +313,48 @@
return success(deptService.selectDeptTreeList(dept));
}
+
/**
- * 小程序登录
+ * @description: TODO
+ * @author jqs34
+ * @date 2023/4/30 15:36
+ * @version 1.0
*/
@InnerAuth
- @GetMapping("/miniLogin")
- @ApiOperation("小程序登录")
- public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
- {
- AppMiniLoginVo appMiniLoginVo = memberService.getMemberByCode(appMiniLoginDto);
- if(appMiniLoginVo ==null){
- return R.fail("登录失败！");
- }
- return R.ok(appMiniLoginVo);
+ @PostMapping("/user/getSysUser")
+ public R<SysUser> getSysUser(@RequestBody Long userId){
+ SysUser sysUser = userService.selectUserById(userId);
+ return R.ok(sysUser);
}
+
+ /**
+ * @description: 更新用户手机
+ * @author jqs34
+ * @date 2023/4/30 15:32
+ * @version 1.0
+ */
+ @InnerAuth
+ @PostMapping("/user/registerUser")
+ public R registerUser(@RequestBody SysUser sysUser){
+ userService.registerUser(sysUser);
+ return R.ok();
+ }
+
+
+
+ /**
+ * @description: 更新用户手机
+ * @author jqs34
+ * @date 2023/4/30 15:32
+ * @version 1.0
+ */
+ @InnerAuth
+ @PostMapping("/user/updateUserMobile")
+ public R updateUserMobile(@RequestBody SysUser sysUser){
+ userService.updateUserMobile(sysUser);
+ return R.ok();
+ }
+
+
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserOnlineController.java
index 429dda2..db3e1d5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserOnlineController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserOnlineController.java
@@ -26,7 +26,7 @@
/**
* 在线用户监控
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
@RequestMapping("/online")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysConfig.java
index 59af63c..5f71fa8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysConfig.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysConfig.java
@@ -11,7 +11,7 @@
/**
* 参数配置表 sys_config
*
- * @author ruoyi
+ * @author jqs
*/
public class SysConfig extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysMenu.java
index 7e78d11..189db7d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysMenu.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysMenu.java
@@ -12,7 +12,7 @@
/**
* 菜单权限表 sys_menu
*
- * @author ruoyi
+ * @author jqs
*/
public class SysMenu extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysNotice.java
index 0019049..1dd3c00 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysNotice.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysNotice.java
@@ -10,7 +10,7 @@
/**
* 通知公告表 sys_notice
*
- * @author ruoyi
+ * @author jqs
*/
public class SysNotice extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysPost.java
index 5e169af..3d0ee9b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysPost.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysPost.java
@@ -12,7 +12,7 @@
/**
* 岗位表 sys_post
*
- * @author ruoyi
+ * @author jqs
*/
public class SysPost extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleDept.java
index ea3ecb7..8ba48e2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleDept.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleDept.java
@@ -6,7 +6,7 @@
/**
* 角色和部门关联 sys_role_dept
*
- * @author ruoyi
+ * @author jqs
*/
public class SysRoleDept
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleMenu.java
index 0916dd9..efa8beb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleMenu.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysRoleMenu.java
@@ -6,7 +6,7 @@
/**
* 角色和菜单关联 sys_role_menu
*
- * @author ruoyi
+ * @author jqs
*/
public class SysRoleMenu
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserOnline.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserOnline.java
index 7504630..e27dbe6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserOnline.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserOnline.java
@@ -3,7 +3,7 @@
/**
* 当前在线会话
*
- * @author ruoyi
+ * @author jqs
*/
public class SysUserOnline
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserPost.java
index 0d83403..327c900 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserPost.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserPost.java
@@ -6,7 +6,7 @@
/**
* 用户和岗位关联 sys_user_post
*
- * @author ruoyi
+ * @author jqs
*/
public class SysUserPost
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserRole.java
index d3c8a0b..2c7d22e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserRole.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/sys/SysUserRole.java
@@ -6,7 +6,7 @@
/**
* 用户和角色关联 sys_user_role
*
- * @author ruoyi
+ * @author jqs
*/
public class SysUserRole
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
index 53bb9f6..87d96cc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@@ -5,7 +5,7 @@
/**
* 路由显示信息
*
- * @author ruoyi
+ * @author jqs
*/
public class MetaVo
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
index afff8c9..91b10b5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
@@ -6,7 +6,7 @@
/**
* 路由配置信息
*
- * @author ruoyi
+ * @author jqs
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class RouterVo
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java
index c58ec97..35e987e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java
@@ -10,7 +10,7 @@
/**
* Treeselect树结构实体类
*
- * @author ruoyi
+ * @author jqs
*/
public class TreeSelect implements Serializable
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysClassificationMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysClassificationMapper.java
index 1d74448..82ad32b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysClassificationMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysClassificationMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper.config;
-import com.ruoyi.system.domain.pojo.config.SysClassification;
+import com.ruoyi.system.api.domain.poji.config.SysClassification;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysTagMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysTagMapper.java
index 8fb5a08..1909d2b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysTagMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/SysTagMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper.config;
-import com.ruoyi.system.domain.pojo.config.SysTag;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysConfigMapper.java
index 354073a..aef74f9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysConfigMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysConfigMapper.java
@@ -6,7 +6,7 @@
/**
* 参数配置 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysConfigMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDeptMapper.java
index 6f66dba..7bb1b1e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDeptMapper.java
@@ -7,7 +7,7 @@
/**
* 部门管理 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysDeptMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictDataMapper.java
index 5020334..e7dbe38 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictDataMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictDataMapper.java
@@ -7,7 +7,7 @@
/**
* 字典表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysDictDataMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictTypeMapper.java
index 9d85431..36584e1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictTypeMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysDictTypeMapper.java
@@ -6,7 +6,7 @@
/**
* 字典表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysDictTypeMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysLogininforMapper.java
index 2d0c393..0c8feba 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysLogininforMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysLogininforMapper.java
@@ -6,7 +6,7 @@
/**
* 系统访问日志情况信息 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysLogininforMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysMenuMapper.java
index b28e70b..c6c18c4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysMenuMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysMenuMapper.java
@@ -7,7 +7,7 @@
/**
* 菜单表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysMenuMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysNoticeMapper.java
index 66d71fb..73d360f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysNoticeMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysNoticeMapper.java
@@ -6,7 +6,7 @@
/**
* 通知公告表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysNoticeMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysOperLogMapper.java
index 7938a34..dd207c1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysOperLogMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysOperLogMapper.java
@@ -6,7 +6,7 @@
/**
* 操作日志 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysOperLogMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysPostMapper.java
index fa2c818..20bec32 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysPostMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysPostMapper.java
@@ -6,7 +6,7 @@
/**
* 岗位信息 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysPostMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleDeptMapper.java
index 3c03022..d3e7049 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleDeptMapper.java
@@ -6,7 +6,7 @@
/**
* 角色与部门关联表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysRoleDeptMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMapper.java
index 38463df..2f6aba9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMapper.java
@@ -6,7 +6,7 @@
/**
* 角色表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysRoleMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMenuMapper.java
index 7ef39b2..a790304 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMenuMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysRoleMenuMapper.java
@@ -6,7 +6,7 @@
/**
* 角色与菜单关联表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysRoleMenuMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java
index 55de9c0..e874e26 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java
@@ -7,7 +7,7 @@
/**
* 用户表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysUserMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserPostMapper.java
index f9c28c8..f7d52a5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserPostMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserPostMapper.java
@@ -6,7 +6,7 @@
/**
* 用户与岗位关联表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysUserPostMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserRoleMapper.java
index 22baa55..1841b69 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserRoleMapper.java
@@ -7,7 +7,7 @@
/**
* 用户与角色关联表 数据层
*
- * @author ruoyi
+ * @author jqs
*/
public interface SysUserRoleMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysClassificationService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysClassificationService.java
index d8ce5bd..f3b5944 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysClassificationService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysClassificationService.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.service.config;
-import com.ruoyi.system.domain.pojo.config.SysClassification;
+import com.ruoyi.system.api.domain.poji.config.SysClassification;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysTagService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysTagService.java
index 983e9cc..ae70e65 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysTagService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/SysTagService.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.service.config;
-import com.ruoyi.system.domain.pojo.config.SysTag;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java
index 846c323..80a7d48 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.service.impl.config;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.system.constant.AppErrorConstant;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.domain.dto.AppAgreementDto;
import com.ruoyi.system.domain.pojo.config.Agreement;
import com.ruoyi.system.domain.vo.AppAgreementVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java
index d98b076..dc3de20 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl.config;
-import com.ruoyi.system.domain.pojo.config.SysClassification;
+import com.ruoyi.system.api.domain.poji.config.SysClassification;
import com.ruoyi.system.mapper.config.SysClassificationMapper;
import com.ruoyi.system.service.config.SysClassificationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java
index e9aa211..9e46a03 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl.config;
-import com.ruoyi.system.domain.pojo.config.SysTag;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.mapper.config.SysTagMapper;
import com.ruoyi.system.service.config.SysTagService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysConfigServiceImpl.java
index 50b6aee..b626b02 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysConfigServiceImpl.java
@@ -18,7 +18,7 @@
/**
* 参数配置 服务层实现
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysConfigServiceImpl implements ISysConfigService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
index 811b866..bd80525 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
@@ -24,7 +24,7 @@
/**
* 部门管理 服务实现
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysDeptServiceImpl implements ISysDeptService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictDataServiceImpl.java
index 66995a6..92f3755 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictDataServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictDataServiceImpl.java
@@ -11,7 +11,7 @@
/**
* 字典 业务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysDictDataServiceImpl implements ISysDictDataService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictTypeServiceImpl.java
index acb45d3..9bb94d8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDictTypeServiceImpl.java
@@ -21,7 +21,7 @@
/**
* 字典 业务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysDictTypeServiceImpl implements ISysDictTypeService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysLogininforServiceImpl.java
index 28380b3..38397b2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysLogininforServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysLogininforServiceImpl.java
@@ -10,7 +10,7 @@
/**
* 系统访问日志情况信息 服务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysLogininforServiceImpl implements ISysLogininforService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java
index 46b5491..c759eae 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java
@@ -28,7 +28,7 @@
/**
* 菜单 业务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysMenuServiceImpl implements ISysMenuService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysNoticeServiceImpl.java
index 44896f9..a9b0abc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysNoticeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysNoticeServiceImpl.java
@@ -10,7 +10,7 @@
/**
* 公告 服务层实现
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysNoticeServiceImpl implements ISysNoticeService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysOperLogServiceImpl.java
index 91198d1..100fa80 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysOperLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysOperLogServiceImpl.java
@@ -10,7 +10,7 @@
/**
* 操作日志 服务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysOperLogServiceImpl implements ISysOperLogService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPermissionServiceImpl.java
index 360dc64..6942fcd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPermissionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPermissionServiceImpl.java
@@ -14,7 +14,7 @@
/**
* 用户权限处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysPermissionServiceImpl implements ISysPermissionService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPostServiceImpl.java
index 768f9ab..fb88c4b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPostServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysPostServiceImpl.java
@@ -14,7 +14,7 @@
/**
* 岗位信息 服务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysPostServiceImpl implements ISysPostService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysRoleServiceImpl.java
index c9fc186..0ac6c0a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysRoleServiceImpl.java
@@ -28,7 +28,7 @@
/**
* 角色 业务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysRoleServiceImpl implements ISysRoleService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserOnlineServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserOnlineServiceImpl.java
index 6ae88a9..6c3e122 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserOnlineServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserOnlineServiceImpl.java
@@ -9,7 +9,7 @@
/**
* 在线用户 服务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysUserOnlineServiceImpl implements ISysUserOnlineService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
index edc6392..50974a7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
@@ -33,7 +33,7 @@
/**
* 用户 业务层处理
*
- * @author ruoyi
+ * @author jqs
*/
@Service
public class SysUserServiceImpl implements ISysUserService
@@ -542,4 +542,16 @@
return successMsg.toString();
}
+ /**
+ * @description: updateUserMobile
+ * @param: sysUser
+ * @return: null
+ * @author jqs34
+ * @date: 2023/4/30 15:43
+ */
+ public void updateUserMobile(SysUser sysUser){
+ SysUser oldSysUser = this.selectUserById(sysUser.getUserId());
+ oldSysUser.setPhonenumber(sysUser.getPhonenumber());
+ userMapper.updateUser(oldSysUser);
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysConfigService.java
index 87118eb..cc4efed 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysConfigService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysConfigService.java
@@ -6,7 +6,7 @@
/**
* 参数配置 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysConfigService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDeptService.java
index fe1fdf5..788a8e6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDeptService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDeptService.java
@@ -7,7 +7,7 @@
/**
* 部门管理 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysDeptService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictDataService.java
index af90a91..37d18bb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictDataService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictDataService.java
@@ -6,7 +6,7 @@
/**
* 字典 业务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysDictDataService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictTypeService.java
index 20222f6..76f134f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictTypeService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysDictTypeService.java
@@ -7,7 +7,7 @@
/**
* 字典 业务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysDictTypeService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysLogininforService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysLogininforService.java
index bfb3e0f..211d2f1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysLogininforService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysLogininforService.java
@@ -6,7 +6,7 @@
/**
* 系统访问日志情况信息 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysLogininforService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java
index 109dd00..eeddf67 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java
@@ -9,7 +9,7 @@
/**
* 菜单 业务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysMenuService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysNoticeService.java
index 80dfd0f..44374d5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysNoticeService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysNoticeService.java
@@ -6,7 +6,7 @@
/**
* 公告 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysNoticeService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysOperLogService.java
index 2b2b049..a3ae199 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysOperLogService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysOperLogService.java
@@ -6,7 +6,7 @@
/**
* 操作日志 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysOperLogService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPermissionService.java
index d270a3c..516a81a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPermissionService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPermissionService.java
@@ -7,7 +7,7 @@
/**
* 权限信息 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysPermissionService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPostService.java
index 90a1f22..15fc404 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPostService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysPostService.java
@@ -6,7 +6,7 @@
/**
* 岗位信息 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysPostService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysRoleService.java
index 30023ac..5a1d0b8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysRoleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysRoleService.java
@@ -8,7 +8,7 @@
/**
* 角色业务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysRoleService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserOnlineService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserOnlineService.java
index 0b19796..e7df5fa 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserOnlineService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserOnlineService.java
@@ -6,7 +6,7 @@
/**
* 在线用户 服务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysUserOnlineService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
index 9b4fb3b..1a5ec48 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
@@ -6,7 +6,7 @@
/**
* 用户 业务层
*
- * @author ruoyi
+ * @author jqs
*/
public interface ISysUserService
{
@@ -203,4 +203,13 @@
* @return 结果
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+ /**
+ * @description: updateUserMobile
+ * @param: sysUser
+ * @return: null
+ * @author jqs34
+ * @date: 2023/4/30 15:43
+ */
+ public void updateUserMobile(SysUser sysUser);
}
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java
index 4ea0533..082834a 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java
+++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java
@@ -7,7 +7,7 @@
/**
* 监控中心
*
- * @author ruoyi
+ * @author jqs
*/
@EnableAdminServer
@SpringBootApplication
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
index 9560204..9992160 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
+++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
@@ -10,7 +10,7 @@
/**
* 监控权限配置
*
- * @author ruoyi
+ * @author jqs
*/
@EnableWebSecurity
public class WebSecurityConfigurer
--
Gitblit v1.7.1