From bc1247453d622ba9bc5d75d46556de3d4946151e Mon Sep 17 00:00:00 2001 From: liuyusheng Date: Tue, 19 Nov 2024 16:57:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=9F=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zemi-master/.github/FUNDING.yml | 2 +- zemi-master/LICENSE | 2 +- zemi-master/README.md | 96 ------------------ zemi-master/ry.sh | 2 +- zemi-master/sql/ry_20240629.sql | 30 +++--- .../main/java/com/inspur/ZemiApplication.java | 4 +- .../com/inspur/ZemiServletInitializer.java | 2 +- .../controller/common/CaptchaController.java | 6 +- .../controller/common/CommonController.java | 12 +-- .../controller/monitor/CacheController.java | 2 +- .../controller/monitor/ServerController.java | 2 +- .../monitor/SysLogininforController.java | 2 +- .../monitor/SysOperlogController.java | 2 +- .../monitor/SysUserOnlineController.java | 2 +- .../system/SysConfigController.java | 2 +- .../controller/system/SysDeptController.java | 2 +- .../system/SysDictDataController.java | 2 +- .../system/SysDictTypeController.java | 2 +- .../controller/system/SysIndexController.java | 8 +- .../controller/system/SysLoginController.java | 2 +- .../controller/system/SysMenuController.java | 2 +- .../system/SysNoticeController.java | 2 +- .../controller/system/SysPostController.java | 2 +- .../system/SysProfileController.java | 6 +- .../system/SysRegisterController.java | 2 +- .../controller/system/SysRoleController.java | 2 +- .../controller/system/SysUserController.java | 2 +- .../web/controller/tool/TestController.java | 2 +- .../inspur/web/core/config/SwaggerConfig.java | 14 +-- .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../zemi-admin/src/main/resources/banner.txt | 2 +- .../zemi-admin/src/main/resources/logback.xml | 2 +- .../inspur/common/annotation/Anonymous.java | 2 +- .../inspur/common/annotation/DataScope.java | 2 +- .../inspur/common/annotation/DataSource.java | 2 +- .../com/inspur/common/annotation/Excel.java | 2 +- .../com/inspur/common/annotation/Excels.java | 2 +- .../com/inspur/common/annotation/Log.java | 2 +- .../inspur/common/annotation/RateLimiter.java | 2 +- .../common/annotation/RepeatSubmit.java | 2 +- .../inspur/common/annotation/Sensitive.java | 2 +- .../{RuoYiConfig.java => ZemiConfig.java} | 10 +- .../serializer/SensitiveJsonSerializer.java | 2 +- .../common/constant/CacheConstants.java | 2 +- .../com/inspur/common/constant/Constants.java | 2 +- .../inspur/common/constant/GenConstants.java | 2 +- .../inspur/common/constant/HttpStatus.java | 2 +- .../common/constant/ScheduleConstants.java | 2 +- .../inspur/common/constant/UserConstants.java | 2 +- .../core/controller/BaseController.java | 2 +- .../inspur/common/core/domain/AjaxResult.java | 2 +- .../inspur/common/core/domain/BaseEntity.java | 2 +- .../java/com/inspur/common/core/domain/R.java | 2 +- .../inspur/common/core/domain/TreeEntity.java | 2 +- .../inspur/common/core/domain/TreeSelect.java | 2 +- .../common/core/domain/entity/SysDept.java | 2 +- .../core/domain/entity/SysDictData.java | 2 +- .../core/domain/entity/SysDictType.java | 2 +- .../common/core/domain/entity/SysMenu.java | 2 +- .../common/core/domain/entity/SysRole.java | 2 +- .../common/core/domain/entity/SysUser.java | 2 +- .../common/core/domain/model/LoginBody.java | 2 +- .../common/core/domain/model/LoginUser.java | 2 +- .../core/domain/model/RegisterBody.java | 2 +- .../inspur/common/core/page/PageDomain.java | 2 +- .../common/core/page/TableDataInfo.java | 2 +- .../inspur/common/core/page/TableSupport.java | 2 +- .../inspur/common/core/redis/RedisCache.java | 2 +- .../inspur/common/core/text/CharsetKit.java | 2 +- .../com/inspur/common/core/text/Convert.java | 2 +- .../inspur/common/core/text/StrFormatter.java | 2 +- .../inspur/common/enums/BusinessStatus.java | 2 +- .../com/inspur/common/enums/BusinessType.java | 2 +- .../inspur/common/enums/DataSourceType.java | 2 +- .../inspur/common/enums/DesensitizedType.java | 2 +- .../com/inspur/common/enums/HttpMethod.java | 2 +- .../com/inspur/common/enums/LimitType.java | 2 +- .../com/inspur/common/enums/OperatorType.java | 2 +- .../com/inspur/common/enums/UserStatus.java | 2 +- .../common/exception/DemoModeException.java | 2 +- .../common/exception/GlobalException.java | 2 +- .../common/exception/ServiceException.java | 2 +- .../common/exception/UtilException.java | 2 +- .../common/exception/base/BaseException.java | 2 +- .../common/exception/file/FileException.java | 2 +- .../FileNameLengthLimitExceededException.java | 2 +- .../file/FileSizeLimitExceededException.java | 2 +- .../exception/file/FileUploadException.java | 2 +- .../file/InvalidExtensionException.java | 2 +- .../common/exception/job/TaskException.java | 2 +- .../exception/user/BlackListException.java | 2 +- .../exception/user/CaptchaException.java | 2 +- .../user/CaptchaExpireException.java | 2 +- .../common/exception/user/UserException.java | 2 +- .../user/UserNotExistsException.java | 2 +- .../user/UserPasswordNotMatchException.java | 2 +- ...UserPasswordRetryLimitExceedException.java | 2 +- .../filter/PropertyPreExcludeFilter.java | 2 +- .../common/filter/RepeatableFilter.java | 2 +- .../filter/RepeatedlyRequestWrapper.java | 2 +- .../com/inspur/common/filter/XssFilter.java | 2 +- .../filter/XssHttpServletRequestWrapper.java | 2 +- .../java/com/inspur/common/utils/Arith.java | 2 +- .../com/inspur/common/utils/DateUtils.java | 2 +- .../inspur/common/utils/DesensitizedUtil.java | 2 +- .../com/inspur/common/utils/DictUtils.java | 2 +- .../inspur/common/utils/ExceptionUtil.java | 2 +- .../com/inspur/common/utils/LogUtils.java | 2 +- .../com/inspur/common/utils/MessageUtils.java | 2 +- .../com/inspur/common/utils/PageUtils.java | 2 +- .../inspur/common/utils/SecurityUtils.java | 2 +- .../com/inspur/common/utils/ServletUtils.java | 2 +- .../com/inspur/common/utils/StringUtils.java | 2 +- .../java/com/inspur/common/utils/Threads.java | 2 +- .../inspur/common/utils/bean/BeanUtils.java | 2 +- .../common/utils/bean/BeanValidators.java | 2 +- .../common/utils/file/FileTypeUtils.java | 6 +- .../common/utils/file/FileUploadUtils.java | 8 +- .../inspur/common/utils/file/FileUtils.java | 10 +- .../inspur/common/utils/file/ImageUtils.java | 6 +- .../common/utils/file/MimeTypeUtils.java | 2 +- .../inspur/common/utils/html/EscapeUtil.java | 2 +- .../inspur/common/utils/html/HTMLFilter.java | 2 +- .../inspur/common/utils/http/HttpHelper.java | 2 +- .../inspur/common/utils/http/HttpUtils.java | 2 +- .../inspur/common/utils/ip/AddressUtils.java | 6 +- .../com/inspur/common/utils/ip/IpUtils.java | 2 +- .../common/utils/poi/ExcelHandlerAdapter.java | 2 +- .../inspur/common/utils/poi/ExcelUtil.java | 6 +- .../common/utils/reflect/ReflectUtils.java | 2 +- .../com/inspur/common/utils/sign/Base64.java | 2 +- .../inspur/common/utils/sign/Md5Utils.java | 2 +- .../common/utils/spring/SpringUtils.java | 2 +- .../com/inspur/common/utils/sql/SqlUtil.java | 2 +- .../com/inspur/common/utils/uuid/IdUtils.java | 2 +- .../com/inspur/common/utils/uuid/Seq.java | 2 +- .../com/inspur/common/utils/uuid/UUID.java | 2 +- .../main/java/com/inspur/common/xss/Xss.java | 2 +- .../com/inspur/common/xss/XssValidator.java | 2 +- .../framework/aspectj/DataScopeAspect.java | 2 +- .../framework/aspectj/DataSourceAspect.java | 2 +- .../inspur/framework/aspectj/LogAspect.java | 2 +- .../framework/aspectj/RateLimiterAspect.java | 2 +- .../framework/config/ApplicationConfig.java | 2 +- .../framework/config/CaptchaConfig.java | 2 +- .../inspur/framework/config/DruidConfig.java | 2 +- .../config/FastJson2JsonRedisSerializer.java | 2 +- .../inspur/framework/config/FilterConfig.java | 2 +- .../inspur/framework/config/I18nConfig.java | 2 +- .../framework/config/KaptchaTextCreator.java | 2 +- .../framework/config/MyBatisConfig.java | 2 +- .../inspur/framework/config/RedisConfig.java | 2 +- .../framework/config/ResourcesConfig.java | 6 +- .../framework/config/SecurityConfig.java | 2 +- .../inspur/framework/config/ServerConfig.java | 2 +- .../framework/config/ThreadPoolConfig.java | 2 +- .../config/properties/DruidProperties.java | 2 +- .../properties/PermitAllUrlProperties.java | 2 +- .../datasource/DynamicDataSource.java | 2 +- .../DynamicDataSourceContextHolder.java | 2 +- .../interceptor/RepeatSubmitInterceptor.java | 2 +- .../impl/SameUrlDataInterceptor.java | 2 +- .../framework/manager/AsyncManager.java | 2 +- .../framework/manager/ShutdownManager.java | 2 +- .../manager/factory/AsyncFactory.java | 2 +- .../context/AuthenticationContextHolder.java | 2 +- .../context/PermissionContextHolder.java | 2 +- .../filter/JwtAuthenticationTokenFilter.java | 2 +- .../handle/AuthenticationEntryPointImpl.java | 2 +- .../handle/LogoutSuccessHandlerImpl.java | 2 +- .../inspur/framework/web/domain/Server.java | 2 +- .../framework/web/domain/server/Cpu.java | 2 +- .../framework/web/domain/server/Jvm.java | 2 +- .../framework/web/domain/server/Mem.java | 2 +- .../framework/web/domain/server/Sys.java | 2 +- .../framework/web/domain/server/SysFile.java | 2 +- .../web/exception/GlobalExceptionHandler.java | 2 +- .../web/service/PermissionService.java | 4 +- .../web/service/SysLoginService.java | 2 +- .../web/service/SysPasswordService.java | 2 +- .../web/service/SysPermissionService.java | 2 +- .../web/service/SysRegisterService.java | 2 +- .../framework/web/service/TokenService.java | 2 +- .../web/service/UserDetailsServiceImpl.java | 2 +- .../inspur/generator/config/GenConfig.java | 2 +- .../generator/controller/GenController.java | 4 +- .../com/inspur/generator/domain/GenTable.java | 2 +- .../generator/domain/GenTableColumn.java | 2 +- .../mapper/GenTableColumnMapper.java | 2 +- .../generator/mapper/GenTableMapper.java | 2 +- .../service/GenTableColumnServiceImpl.java | 2 +- .../service/GenTableServiceImpl.java | 2 +- .../service/IGenTableColumnService.java | 2 +- .../generator/service/IGenTableService.java | 2 +- .../com/inspur/generator/util/GenUtils.java | 4 +- .../generator/util/VelocityInitializer.java | 2 +- .../inspur/generator/util/VelocityUtils.java | 2 +- .../inspur/quartz/config/ScheduleConfig.java | 8 +- .../quartz/controller/SysJobController.java | 2 +- .../controller/SysJobLogController.java | 2 +- .../java/com/inspur/quartz/domain/SysJob.java | 2 +- .../com/inspur/quartz/domain/SysJobLog.java | 2 +- .../inspur/quartz/mapper/SysJobLogMapper.java | 2 +- .../inspur/quartz/mapper/SysJobMapper.java | 2 +- .../quartz/service/ISysJobLogService.java | 2 +- .../inspur/quartz/service/ISysJobService.java | 2 +- .../service/impl/SysJobLogServiceImpl.java | 2 +- .../service/impl/SysJobServiceImpl.java | 2 +- .../java/com/inspur/quartz/task/RyTask.java | 2 +- .../inspur/quartz/util/AbstractQuartzJob.java | 2 +- .../com/inspur/quartz/util/CronUtils.java | 2 +- .../com/inspur/quartz/util/JobInvokeUtil.java | 2 +- .../QuartzDisallowConcurrentExecution.java | 2 +- .../quartz/util/QuartzJobExecution.java | 2 +- .../com/inspur/quartz/util/ScheduleUtils.java | 2 +- .../com/inspur/system/domain/SysCache.java | 2 +- .../com/inspur/system/domain/SysConfig.java | 2 +- .../inspur/system/domain/SysLogininfor.java | 2 +- .../com/inspur/system/domain/SysNotice.java | 2 +- .../com/inspur/system/domain/SysOperLog.java | 2 +- .../com/inspur/system/domain/SysPost.java | 2 +- .../com/inspur/system/domain/SysRoleDept.java | 2 +- .../com/inspur/system/domain/SysRoleMenu.java | 2 +- .../inspur/system/domain/SysUserOnline.java | 2 +- .../com/inspur/system/domain/SysUserPost.java | 2 +- .../com/inspur/system/domain/SysUserRole.java | 2 +- .../com/inspur/system/domain/vo/MetaVo.java | 2 +- .../com/inspur/system/domain/vo/RouterVo.java | 2 +- .../inspur/system/mapper/SysConfigMapper.java | 2 +- .../inspur/system/mapper/SysDeptMapper.java | 2 +- .../system/mapper/SysDictDataMapper.java | 2 +- .../system/mapper/SysDictTypeMapper.java | 2 +- .../system/mapper/SysLogininforMapper.java | 2 +- .../inspur/system/mapper/SysMenuMapper.java | 2 +- .../inspur/system/mapper/SysNoticeMapper.java | 2 +- .../system/mapper/SysOperLogMapper.java | 2 +- .../inspur/system/mapper/SysPostMapper.java | 2 +- .../system/mapper/SysRoleDeptMapper.java | 2 +- .../inspur/system/mapper/SysRoleMapper.java | 2 +- .../system/mapper/SysRoleMenuMapper.java | 2 +- .../inspur/system/mapper/SysUserMapper.java | 2 +- .../system/mapper/SysUserPostMapper.java | 2 +- .../system/mapper/SysUserRoleMapper.java | 2 +- .../system/service/ISysConfigService.java | 2 +- .../system/service/ISysDeptService.java | 2 +- .../system/service/ISysDictDataService.java | 2 +- .../system/service/ISysDictTypeService.java | 2 +- .../system/service/ISysLogininforService.java | 2 +- .../system/service/ISysMenuService.java | 2 +- .../system/service/ISysNoticeService.java | 2 +- .../system/service/ISysOperLogService.java | 2 +- .../system/service/ISysPostService.java | 2 +- .../system/service/ISysRoleService.java | 2 +- .../system/service/ISysUserOnlineService.java | 2 +- .../system/service/ISysUserService.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 2 +- .../service/impl/SysDictDataServiceImpl.java | 2 +- .../service/impl/SysDictTypeServiceImpl.java | 2 +- .../impl/SysLogininforServiceImpl.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 2 +- .../service/impl/SysNoticeServiceImpl.java | 2 +- .../service/impl/SysOperLogServiceImpl.java | 2 +- .../service/impl/SysPostServiceImpl.java | 2 +- .../service/impl/SysRoleServiceImpl.java | 2 +- .../impl/SysUserOnlineServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 2 +- zemi-ui/README.md | 4 +- zemi-ui/package.json | 8 +- zemi-ui/public/cse.png | Bin 0 -> 44671 bytes zemi-ui/public/favicon.ico | Bin 5663 -> 0 bytes zemi-ui/public/index.html | 2 +- zemi-ui/src/api/system/user.js | 2 +- .../assets/styles/{ruoyi.scss => zemi.scss} | 2 +- zemi-ui/src/components/RuoYi/Doc/index.vue | 21 ---- zemi-ui/src/components/RuoYi/Git/index.vue | 21 ---- zemi-ui/src/directive/dialog/drag.js | 4 +- zemi-ui/src/directive/dialog/dragHeight.js | 2 +- zemi-ui/src/directive/dialog/dragWidth.js | 2 +- zemi-ui/src/directive/module/clipboard.js | 2 +- zemi-ui/src/directive/permission/hasPermi.js | 2 +- zemi-ui/src/directive/permission/hasRole.js | 2 +- zemi-ui/src/layout/components/Navbar.vue | 20 +--- zemi-ui/src/main.js | 4 +- zemi-ui/src/plugins/download.js | 2 +- zemi-ui/src/utils/dict/Dict.js | 2 +- zemi-ui/src/utils/dict/DictMeta.js | 2 +- zemi-ui/src/utils/dict/DictOptions.js | 2 +- zemi-ui/src/utils/index.js | 2 +- zemi-ui/src/utils/request.js | 2 +- zemi-ui/src/utils/{ruoyi.js => zemi.js} | 2 +- zemi-ui/src/views/login.vue | 2 +- zemi-ui/src/views/monitor/job/index.vue | 2 +- zemi-ui/src/views/register.vue | 2 +- zemi-ui/src/views/tool/gen/genInfoForm.vue | 2 +- zemi-ui/src/views/tool/gen/index.vue | 2 +- zemi-ui/vue.config.js | 3 +- 298 files changed, 359 insertions(+), 516 deletions(-) rename zemi-master/zemi-common/src/main/java/com/inspur/common/config/{RuoYiConfig.java => ZemiConfig.java} (92%) create mode 100644 zemi-ui/public/cse.png delete mode 100644 zemi-ui/public/favicon.ico rename zemi-ui/src/assets/styles/{ruoyi.scss => zemi.scss} (99%) delete mode 100644 zemi-ui/src/components/RuoYi/Doc/index.vue delete mode 100644 zemi-ui/src/components/RuoYi/Git/index.vue rename zemi-ui/src/utils/{ruoyi.js => zemi.js} (99%) diff --git a/zemi-master/.github/FUNDING.yml b/zemi-master/.github/FUNDING.yml index fbcab77..d03d7f0 100644 --- a/zemi-master/.github/FUNDING.yml +++ b/zemi-master/.github/FUNDING.yml @@ -1 +1 @@ -custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html +custom: diff --git a/zemi-master/LICENSE b/zemi-master/LICENSE index 8564f29..461d959 100644 --- a/zemi-master/LICENSE +++ b/zemi-master/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018 RuoYi +Copyright (c) 2018 inspur Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/zemi-master/README.md b/zemi-master/README.md index e5a47b8..e69de29 100644 --- a/zemi-master/README.md +++ b/zemi-master/README.md @@ -1,96 +0,0 @@ -

- logo -

-

RuoYi v3.8.8

-

基于SpringBoot+Vue前后端分离的Java快速开发框架

-

- - - -

- -## 平台简介 - -若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 - -* 前端采用Vue、Element UI。 -* 后端采用Spring Boot、Spring Security、Redis & Jwt。 -* 权限认证使用Jwt，支持多终端认证系统。 -* 支持加载动态权限菜单，多方式轻松权限控制。 -* 高效率开发，使用代码生成器可以一键生成前后端代码。 -* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3)，保持同步更新。 -* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。 -* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) -* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   -* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   - -## 内置功能 - -1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 -2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 -3. 岗位管理：配置系统用户所属担任职务。 -4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 -5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 -6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 -7. 参数管理：对系统动态配置常用参数。 -8. 通知公告：系统通知公告信息发布维护。 -9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 -10. 登录日志：系统登录日志记录查询包含登录异常。 -11. 在线用户：当前系统中活跃用户状态监控。 -12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 -13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。 -14. 系统接口：根据业务代码自动生成相关的api接口文档。 -15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。 -16. 缓存监控：对系统的缓存信息查询，命令统计等。 -17. 在线构建器：拖动表单元素生成相应的HTML代码。 -18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 - -## 在线体验 - -- admin/admin123 -- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 - -演示地址：http://vue.ruoyi.vip -文档地址：http://doc.ruoyi.vip - -## 演示图 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -## 若依前后端分离交流群 - -QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/已满-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![加入QQ群](https://img.shields.io/badge/151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) 点击按钮入群。 \ No newline at end of file diff --git a/zemi-master/ry.sh b/zemi-master/ry.sh index d6a9cf3..0b8a8a1 100644 --- a/zemi-master/ry.sh +++ b/zemi-master/ry.sh @@ -1,6 +1,6 @@ #!/bin/sh # ./ry.sh start 启动 stop 停止 restart 重启 status 状态 -AppName=ruoyi-admin.jar +AppName=zemi-admin.jar # JVM参数 JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" diff --git a/zemi-master/sql/ry_20240629.sql b/zemi-master/sql/ry_20240629.sql index a8647d2..b51bef0 100644 --- a/zemi-master/sql/ry_20240629.sql +++ b/zemi-master/sql/ry_20240629.sql @@ -23,16 +23,16 @@ create table sys_dept ( -- ---------------------------- -- 初始化-部门表数据 -- ---------------------------- -insert into sys_dept values(100, 0, '0', '若依科技', 0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(100, 0, '0', '浪潮科技', 0, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '浪潮', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -- ---------------------------- @@ -65,8 +65,8 @@ create table sys_user ( -- ---------------------------- -- 初始化-用户信息表数据 -- ---------------------------- -insert into sys_user values(1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); -insert into sys_user values(2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); +insert into sys_user values(1, 103, 'admin', '浪潮', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); +insert into sys_user values(2, 105, 'ry', '浪潮', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); -- ---------------------------- @@ -161,7 +161,7 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); -insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); +insert into sys_menu values('4', '浪潮官网', '0', '4', 'http://inspur.vip', null, '', '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '浪潮官网地址'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); @@ -636,8 +636,8 @@ create table sys_notice ( -- ---------------------------- -- 初始化-公告信息表数据 -- ---------------------------- -insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); -insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('1', '温馨提醒：2018-07-01 浪潮新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('2', '维护通知：2018-07-01 浪潮系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); -- ---------------------------- diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/ZemiApplication.java b/zemi-master/zemi-admin/src/main/java/com/inspur/ZemiApplication.java index 1c19f66..7070f58 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/ZemiApplication.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/ZemiApplication.java @@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 启动程序 * - * @author ruoyi + * @author inspur */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) public class ZemiApplication @@ -16,7 +16,7 @@ public class ZemiApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(ZemiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + + System.out.println("(♥◠‿◠)ﾉﾞ ZEMI启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/ZemiServletInitializer.java b/zemi-master/zemi-admin/src/main/java/com/inspur/ZemiServletInitializer.java index f1ed41e..ec8c902 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/ZemiServletInitializer.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/ZemiServletInitializer.java @@ -6,7 +6,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 * - * @author ruoyi + * @author inspur */ public class ZemiServletInitializer extends SpringBootServletInitializer { diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/common/CaptchaController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/common/CaptchaController.java index d8c0d28..9cd59c9 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/common/CaptchaController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/common/CaptchaController.java @@ -11,7 +11,7 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.constant.CacheConstants; import com.inspur.common.constant.Constants; import com.inspur.common.core.domain.AjaxResult; @@ -23,7 +23,7 @@ import com.inspur.system.service.ISysConfigService; /** * 验证码操作处理 * - * @author ruoyi + * @author inspur */ @RestController public class CaptchaController @@ -61,7 +61,7 @@ public class CaptchaController BufferedImage image = null; // 生成验证码 - String captchaType = RuoYiConfig.getCaptchaType(); + String captchaType = ZemiConfig.getCaptchaType(); if ("math".equals(captchaType)) { String capText = captchaProducerMath.createText(); diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/common/CommonController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/common/CommonController.java index be92b0f..be9c49f 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/common/CommonController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/common/CommonController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.constant.Constants; import com.inspur.common.core.domain.AjaxResult; import com.inspur.common.utils.StringUtils; @@ -24,7 +24,7 @@ import com.inspur.framework.config.ServerConfig; /** * 通用请求处理 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/common") @@ -53,7 +53,7 @@ public class CommonController throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; + String filePath = ZemiConfig.getDownloadPath() + fileName; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); @@ -78,7 +78,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = ZemiConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -104,7 +104,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = ZemiConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); @@ -146,7 +146,7 @@ public class CommonController throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); } // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); + String localPath = ZemiConfig.getProfile(); // 数据库资源地址 String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX); // 下载名称 diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/CacheController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/CacheController.java index d105e89..57d3116 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/CacheController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/CacheController.java @@ -25,7 +25,7 @@ import com.inspur.system.domain.SysCache; /** * 缓存监控 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/monitor/cache") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/ServerController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/ServerController.java index 340a9ae..dff35f0 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/ServerController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/ServerController.java @@ -10,7 +10,7 @@ import com.inspur.framework.web.domain.Server; /** * 服务器监控 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/monitor/server") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysLogininforController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysLogininforController.java index bbef62e..85a6e20 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysLogininforController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysLogininforController.java @@ -23,7 +23,7 @@ import com.inspur.system.service.ISysLogininforService; /** * 系统访问记录 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/monitor/logininfor") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysOperlogController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysOperlogController.java index 10143b7..9e213a2 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysOperlogController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysOperlogController.java @@ -22,7 +22,7 @@ import com.inspur.system.service.ISysOperLogService; /** * 操作日志记录 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/monitor/operlog") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysUserOnlineController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysUserOnlineController.java index 41bd724..2c64e9b 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysUserOnlineController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/monitor/SysUserOnlineController.java @@ -26,7 +26,7 @@ import com.inspur.system.service.ISysUserOnlineService; /** * 在线用户监控 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/monitor/online") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysConfigController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysConfigController.java index 8df12b7..b5de808 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysConfigController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysConfigController.java @@ -25,7 +25,7 @@ import com.inspur.system.service.ISysConfigService; /** * 参数配置 信息操作处理 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/config") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDeptController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDeptController.java index 8e623f0..0404266 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDeptController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDeptController.java @@ -25,7 +25,7 @@ import com.inspur.system.service.ISysDeptService; /** * 部门信息 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/dept") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDictDataController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDictDataController.java index 6fee3a9..774b352 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDictDataController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDictDataController.java @@ -28,7 +28,7 @@ import com.inspur.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/dict/data") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDictTypeController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDictTypeController.java index 2803891..cae7106 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDictTypeController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysDictTypeController.java @@ -25,7 +25,7 @@ import com.inspur.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/dict/type") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysIndexController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysIndexController.java index dccb3b5..87ea8d8 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysIndexController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysIndexController.java @@ -3,20 +3,20 @@ package com.inspur.web.controller.system; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.utils.StringUtils; /** * 首页 * - * @author ruoyi + * @author inspur */ @RestController public class SysIndexController { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private ZemiConfig zemiConfig; /** * 访问首页，提示语 @@ -24,6 +24,6 @@ public class SysIndexController @RequestMapping("/") public String index() { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", zemiConfig.getName(), zemiConfig.getVersion()); } } diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysLoginController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysLoginController.java index 294d15d..845f35e 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysLoginController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysLoginController.java @@ -22,7 +22,7 @@ import com.inspur.system.service.ISysMenuService; /** * 登录验证 * - * @author ruoyi + * @author inspur */ @RestController public class SysLoginController diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysMenuController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysMenuController.java index c6bac17..7470ffd 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysMenuController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysMenuController.java @@ -24,7 +24,7 @@ import com.inspur.system.service.ISysMenuService; /** * 菜单信息 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/menu") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysNoticeController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysNoticeController.java index 17d608e..6aa5c23 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysNoticeController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysNoticeController.java @@ -23,7 +23,7 @@ import com.inspur.system.service.ISysNoticeService; /** * 公告 信息操作处理 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/notice") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysPostController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysPostController.java index bbd0e44..d283415 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysPostController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysPostController.java @@ -25,7 +25,7 @@ import com.inspur.system.service.ISysPostService; /** * 岗位信息操作处理 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/post") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysProfileController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysProfileController.java index 203fdc8..3d66a2b 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysProfileController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysProfileController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.inspur.common.annotation.Log; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.core.controller.BaseController; import com.inspur.common.core.domain.AjaxResult; import com.inspur.common.core.domain.entity.SysUser; @@ -26,7 +26,7 @@ import com.inspur.system.service.ISysUserService; /** * 个人信息 业务处理 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/user/profile") @@ -121,7 +121,7 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); + String avatar = FileUploadUtils.upload(ZemiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) { AjaxResult ajax = AjaxResult.success(); diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysRegisterController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysRegisterController.java index e543805..c495744 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysRegisterController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysRegisterController.java @@ -14,7 +14,7 @@ import com.inspur.system.service.ISysConfigService; /** * 注册验证 * - * @author ruoyi + * @author inspur */ @RestController public class SysRegisterController extends BaseController diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysRoleController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysRoleController.java index b16f177..7e9044c 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysRoleController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysRoleController.java @@ -34,7 +34,7 @@ import com.inspur.system.service.ISysUserService; /** * 角色信息 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/role") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysUserController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysUserController.java index 167c887..b48dcbb 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysUserController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/system/SysUserController.java @@ -35,7 +35,7 @@ import com.inspur.system.service.ISysUserService; /** * 用户信息 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/system/user") diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/tool/TestController.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/tool/TestController.java index 72fc03b..f3094ba 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/tool/TestController.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/controller/tool/TestController.java @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; /** * swagger 用户测试方法 * - * @author ruoyi + * @author inspur */ @Api("用户信息管理") @RestController diff --git a/zemi-master/zemi-admin/src/main/java/com/inspur/web/core/config/SwaggerConfig.java b/zemi-master/zemi-admin/src/main/java/com/inspur/web/core/config/SwaggerConfig.java index af22cf1..b094426 100644 --- a/zemi-master/zemi-admin/src/main/java/com/inspur/web/core/config/SwaggerConfig.java +++ b/zemi-master/zemi-admin/src/main/java/com/inspur/web/core/config/SwaggerConfig.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; import springfox.documentation.builders.ApiInfoBuilder; @@ -25,14 +25,14 @@ import springfox.documentation.spring.web.plugins.Docket; /** * Swagger2的接口配置 * - * @author ruoyi + * @author inspur */ @Configuration public class SwaggerConfig { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private ZemiConfig zemiConfig; /** 是否开启swagger */ @Value("${swagger.enabled}") @@ -58,7 +58,7 @@ public class SwaggerConfig // 扫描所有有注解的api，用这种方式更灵活 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 扫描指定包中的swagger注解 - // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) + // .apis(RequestHandlerSelectors.basePackage("com.inspur.project.tool.swagger")) // 扫描所有 .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build() @@ -113,13 +113,13 @@ public class SwaggerConfig // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题：若依管理系统_接口文档") + .title("标题：管理系统_接口文档") // 描述 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 - .contact(new Contact(ruoyiConfig.getName(), null, null)) + .contact(new Contact(zemiConfig.getName(), null, null)) // 版本 - .version("版本号:" + ruoyiConfig.getVersion()) + .version("版本号:" + zemiConfig.getVersion()) .build(); } } diff --git a/zemi-master/zemi-admin/src/main/resources/application-druid.yml b/zemi-master/zemi-admin/src/main/resources/application-druid.yml index e509412..6cf6963 100644 --- a/zemi-master/zemi-admin/src/main/resources/application-druid.yml +++ b/zemi-master/zemi-admin/src/main/resources/application-druid.yml @@ -47,7 +47,7 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi + login-username: inspur login-password: 123456 filter: stat: diff --git a/zemi-master/zemi-admin/src/main/resources/application.yml b/zemi-master/zemi-admin/src/main/resources/application.yml index beff175..56ebd61 100644 --- a/zemi-master/zemi-admin/src/main/resources/application.yml +++ b/zemi-master/zemi-admin/src/main/resources/application.yml @@ -6,7 +6,7 @@ zemi: version: 3.8.8 # 版权年份 copyrightYear: 2024 - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + # 文件路径 示例（ Windows配置D:/inspur/uploadPath，Linux配置 /home/inspur/uploadPath） profile: D:/zemi/uploadPath # 获取ip地址开关 addressEnabled: false diff --git a/zemi-master/zemi-admin/src/main/resources/banner.txt b/zemi-master/zemi-admin/src/main/resources/banner.txt index 0931cb8..52fe891 100644 --- a/zemi-master/zemi-admin/src/main/resources/banner.txt +++ b/zemi-master/zemi-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi.version} +Application Version: ${inspur.version} Spring Boot Version: ${spring-boot.version} //////////////////////////////////////////////////////////////////// // _ooOoo_ // diff --git a/zemi-master/zemi-admin/src/main/resources/logback.xml b/zemi-master/zemi-admin/src/main/resources/logback.xml index 7eea94a..12ebfc2 100644 --- a/zemi-master/zemi-admin/src/main/resources/logback.xml +++ b/zemi-master/zemi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Anonymous.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Anonymous.java index bbfb1df..47a523f 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Anonymous.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Anonymous.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 匿名访问不鉴权注解 * - * @author ruoyi + * @author inspur */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/DataScope.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/DataScope.java index 345d8a8..e8e24c0 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/DataScope.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/DataScope.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 数据权限过滤注解 * - * @author ruoyi + * @author inspur */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/DataSource.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/DataSource.java index 57d4e4a..09d0af7 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/DataSource.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/DataSource.java @@ -13,7 +13,7 @@ import com.inspur.common.enums.DataSourceType; * * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准 * - * @author ruoyi + * @author inspur */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Excel.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Excel.java index 27ae9fd..1974f01 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Excel.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Excel.java @@ -12,7 +12,7 @@ import com.inspur.common.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 * - * @author ruoyi + * @author inspur */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Excels.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Excels.java index 5c32d93..75686dd 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Excels.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Excels.java @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * Excel注解集 * - * @author ruoyi + * @author inspur */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Log.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Log.java index 4426a71..55420cc 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Log.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Log.java @@ -11,7 +11,7 @@ import com.inspur.common.enums.OperatorType; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author inspur * */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/RateLimiter.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/RateLimiter.java index ba4f2fd..f5d64b3 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/RateLimiter.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/RateLimiter.java @@ -11,7 +11,7 @@ import com.inspur.common.enums.LimitType; /** * 限流注解 * - * @author ruoyi + * @author inspur */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/RepeatSubmit.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/RepeatSubmit.java index dbf31ed..e7fb439 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/RepeatSubmit.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/RepeatSubmit.java @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义注解防止表单重复提交 * - * @author ruoyi + * @author inspur * */ @Inherited diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Sensitive.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Sensitive.java index d55ae9d..42a3afc 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Sensitive.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/annotation/Sensitive.java @@ -12,7 +12,7 @@ import com.inspur.common.enums.DesensitizedType; /** * 数据脱敏注解 * - * @author ruoyi + * @author inspur */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/config/RuoYiConfig.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/config/ZemiConfig.java similarity index 92% rename from zemi-master/zemi-common/src/main/java/com/inspur/common/config/RuoYiConfig.java rename to zemi-master/zemi-common/src/main/java/com/inspur/common/config/ZemiConfig.java index f4a3b93..738d102 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/config/RuoYiConfig.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/config/ZemiConfig.java @@ -6,11 +6,11 @@ import org.springframework.stereotype.Component; /** * 读取项目相关配置 * - * @author ruoyi + * @author inspur */ @Component @ConfigurationProperties(prefix = "zemi") -public class RuoYiConfig +public class ZemiConfig { /** 项目名称 */ private String name; @@ -67,7 +67,7 @@ public class RuoYiConfig public void setProfile(String profile) { - RuoYiConfig.profile = profile; + ZemiConfig.profile = profile; } public static boolean isAddressEnabled() @@ -77,7 +77,7 @@ public class RuoYiConfig public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + ZemiConfig.addressEnabled = addressEnabled; } public static String getCaptchaType() { @@ -85,7 +85,7 @@ public class RuoYiConfig } public void setCaptchaType(String captchaType) { - RuoYiConfig.captchaType = captchaType; + ZemiConfig.captchaType = captchaType; } /** diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/config/serializer/SensitiveJsonSerializer.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/config/serializer/SensitiveJsonSerializer.java index 6b7613f..c299e48 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/config/serializer/SensitiveJsonSerializer.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/config/serializer/SensitiveJsonSerializer.java @@ -16,7 +16,7 @@ import com.inspur.common.utils.SecurityUtils; /** * 数据脱敏序列化过滤 * - * @author ruoyi + * @author inspur */ public class SensitiveJsonSerializer extends JsonSerializer implements ContextualSerializer { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/CacheConstants.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/CacheConstants.java index 6525fcb..40c054d 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/CacheConstants.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/CacheConstants.java @@ -3,7 +3,7 @@ package com.inspur.common.constant; /** * 缓存的key 常量 * - * @author ruoyi + * @author inspur */ public class CacheConstants { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/Constants.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/Constants.java index 9bfe963..7713e7d 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/Constants.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/Constants.java @@ -6,7 +6,7 @@ import io.jsonwebtoken.Claims; /** * 通用常量信息 * - * @author ruoyi + * @author inspur */ public class Constants { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/GenConstants.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/GenConstants.java index fc44c78..941c380 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/GenConstants.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/GenConstants.java @@ -3,7 +3,7 @@ package com.inspur.common.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author inspur */ public class GenConstants { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/HttpStatus.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/HttpStatus.java index 5efe549..35c8aa4 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/HttpStatus.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/HttpStatus.java @@ -3,7 +3,7 @@ package com.inspur.common.constant; /** * 返回状态码 * - * @author ruoyi + * @author inspur */ public class HttpStatus { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/ScheduleConstants.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/ScheduleConstants.java index d930d01..9278089 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/ScheduleConstants.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/ScheduleConstants.java @@ -3,7 +3,7 @@ package com.inspur.common.constant; /** * 任务调度通用常量 * - * @author ruoyi + * @author inspur */ public class ScheduleConstants { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/UserConstants.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/UserConstants.java index 58a0d5a..e00850e 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/UserConstants.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/constant/UserConstants.java @@ -3,7 +3,7 @@ package com.inspur.common.constant; /** * 用户常量信息 * - * @author ruoyi + * @author inspur */ public class UserConstants { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/controller/BaseController.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/controller/BaseController.java index 038330a..5ec5972 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/controller/BaseController.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/controller/BaseController.java @@ -24,7 +24,7 @@ import com.inspur.common.utils.sql.SqlUtil; /** * web层通用数据处理 * - * @author ruoyi + * @author inspur */ public class BaseController { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/AjaxResult.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/AjaxResult.java index 9df4d7a..d6a428d 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/AjaxResult.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/AjaxResult.java @@ -8,7 +8,7 @@ import com.inspur.common.utils.StringUtils; /** * 操作消息提醒 * - * @author ruoyi + * @author inspur */ public class AjaxResult extends HashMap { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/BaseEntity.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/BaseEntity.java index 7d0618b..b0218e2 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/BaseEntity.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/BaseEntity.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; /** * Entity基类 * - * @author ruoyi + * @author inspur */ public class BaseEntity implements Serializable { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/R.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/R.java index 071d94e..c1555ac 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/R.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/R.java @@ -6,7 +6,7 @@ import com.inspur.common.constant.HttpStatus; /** * 响应信息主体 * - * @author ruoyi + * @author inspur */ public class R implements Serializable { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/TreeEntity.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/TreeEntity.java index 544bf28..e06ae35 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/TreeEntity.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/TreeEntity.java @@ -6,7 +6,7 @@ import java.util.List; /** * Tree基类 * - * @author ruoyi + * @author inspur */ public class TreeEntity extends BaseEntity { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/TreeSelect.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/TreeSelect.java index d39329a..b8b2dc4 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/TreeSelect.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/TreeSelect.java @@ -10,7 +10,7 @@ import com.inspur.common.core.domain.entity.SysMenu; /** * Treeselect树结构实体类 * - * @author ruoyi + * @author inspur */ public class TreeSelect implements Serializable { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDept.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDept.java index 78e2ab9..1922250 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDept.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDept.java @@ -13,7 +13,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 部门表 sys_dept * - * @author ruoyi + * @author inspur */ public class SysDept extends BaseEntity { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDictData.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDictData.java index 4af76d9..7c40f73 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDictData.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDictData.java @@ -12,7 +12,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 字典数据表 sys_dict_data * - * @author ruoyi + * @author inspur */ public class SysDictData extends BaseEntity { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDictType.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDictType.java index 56b82dc..7fb9823 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDictType.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysDictType.java @@ -12,7 +12,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 字典类型表 sys_dict_type * - * @author ruoyi + * @author inspur */ public class SysDictType extends BaseEntity { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysMenu.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysMenu.java index 702c7a5..732ad36 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysMenu.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysMenu.java @@ -12,7 +12,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 菜单权限表 sys_menu * - * @author ruoyi + * @author inspur */ public class SysMenu extends BaseEntity { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysRole.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysRole.java index 704bdd0..b669be5 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysRole.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysRole.java @@ -13,7 +13,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 角色表 sys_role * - * @author ruoyi + * @author inspur */ public class SysRole extends BaseEntity { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysUser.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysUser.java index c3dbeb4..937308c 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysUser.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/entity/SysUser.java @@ -15,7 +15,7 @@ import com.inspur.common.xss.Xss; /** * 用户对象 sys_user * - * @author ruoyi + * @author inspur */ public class SysUser extends BaseEntity { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/LoginBody.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/LoginBody.java index 839be30..fa00c60 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/LoginBody.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/LoginBody.java @@ -3,7 +3,7 @@ package com.inspur.common.core.domain.model; /** * 用户登录对象 * - * @author ruoyi + * @author inspur */ public class LoginBody { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/LoginUser.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/LoginUser.java index 4d7082e..d8bf003 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/LoginUser.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/LoginUser.java @@ -10,7 +10,7 @@ import java.util.Set; /** * 登录用户身份权限 * - * @author ruoyi + * @author inspur */ public class LoginUser implements UserDetails { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/RegisterBody.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/RegisterBody.java index ed1574e..43ba7f3 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/RegisterBody.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/domain/model/RegisterBody.java @@ -3,7 +3,7 @@ package com.inspur.common.core.domain.model; /** * 用户注册对象 * - * @author ruoyi + * @author inspur */ public class RegisterBody extends LoginBody { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/PageDomain.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/PageDomain.java index c6bd035..28dd2fe 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/PageDomain.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/PageDomain.java @@ -5,7 +5,7 @@ import com.inspur.common.utils.StringUtils; /** * 分页数据 * - * @author ruoyi + * @author inspur */ public class PageDomain { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/TableDataInfo.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/TableDataInfo.java index 3831ccc..ca9a118 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/TableDataInfo.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/TableDataInfo.java @@ -6,7 +6,7 @@ import java.util.List; /** * 表格分页数据对象 * - * @author ruoyi + * @author inspur */ public class TableDataInfo implements Serializable { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/TableSupport.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/TableSupport.java index 33f99fc..fedde13 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/TableSupport.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/page/TableSupport.java @@ -6,7 +6,7 @@ import com.inspur.common.utils.ServletUtils; /** * 表格数据处理 * - * @author ruoyi + * @author inspur */ public class TableSupport { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/redis/RedisCache.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/redis/RedisCache.java index e0c4c8f..14bab61 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/redis/RedisCache.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/redis/RedisCache.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; /** * spring redis 工具类 * - * @author ruoyi + * @author inspur **/ @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/CharsetKit.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/CharsetKit.java index ada96f2..4b4caa7 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/CharsetKit.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/CharsetKit.java @@ -7,7 +7,7 @@ import com.inspur.common.utils.StringUtils; /** * 字符集工具类 * - * @author ruoyi + * @author inspur */ public class CharsetKit { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/Convert.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/Convert.java index d97865d..32928be 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/Convert.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/Convert.java @@ -13,7 +13,7 @@ import org.apache.commons.lang3.ArrayUtils; /** * 类型转换器 * - * @author ruoyi + * @author inspur */ public class Convert { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/StrFormatter.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/StrFormatter.java index 1a3cc8b..eaa8227 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/StrFormatter.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/core/text/StrFormatter.java @@ -5,7 +5,7 @@ import com.inspur.common.utils.StringUtils; /** * 字符串格式化 * - * @author ruoyi + * @author inspur */ public class StrFormatter { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/BusinessStatus.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/BusinessStatus.java index 215fe38..c3bce93 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/BusinessStatus.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/BusinessStatus.java @@ -3,7 +3,7 @@ package com.inspur.common.enums; /** * 操作状态 * - * @author ruoyi + * @author inspur * */ public enum BusinessStatus diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/BusinessType.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/BusinessType.java index 2863596..c830138 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/BusinessType.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/BusinessType.java @@ -3,7 +3,7 @@ package com.inspur.common.enums; /** * 业务操作类型 * - * @author ruoyi + * @author inspur */ public enum BusinessType { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/DataSourceType.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/DataSourceType.java index a38b551..07a6975 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/DataSourceType.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/DataSourceType.java @@ -3,7 +3,7 @@ package com.inspur.common.enums; /** * 数据源 * - * @author ruoyi + * @author inspur */ public enum DataSourceType { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/DesensitizedType.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/DesensitizedType.java index 1b837c3..0fcfa5e 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/DesensitizedType.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/DesensitizedType.java @@ -6,7 +6,7 @@ import com.inspur.common.utils.DesensitizedUtil; /** * 脱敏类型 * - * @author ruoyi + * @author inspur */ public enum DesensitizedType { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/HttpMethod.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/HttpMethod.java index 982f0db..f77d115 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/HttpMethod.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/HttpMethod.java @@ -7,7 +7,7 @@ import org.springframework.lang.Nullable; /** * 请求方式 * - * @author ruoyi + * @author inspur */ public enum HttpMethod { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/LimitType.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/LimitType.java index 4821995..68cc533 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/LimitType.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/LimitType.java @@ -3,7 +3,7 @@ package com.inspur.common.enums; /** * 限流类型 * - * @author ruoyi + * @author inspur */ public enum LimitType diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/OperatorType.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/OperatorType.java index ee5cd46..907efde 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/OperatorType.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/OperatorType.java @@ -3,7 +3,7 @@ package com.inspur.common.enums; /** * 操作人类别 * - * @author ruoyi + * @author inspur */ public enum OperatorType { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/UserStatus.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/UserStatus.java index a81db70..d5918e3 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/UserStatus.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/enums/UserStatus.java @@ -3,7 +3,7 @@ package com.inspur.common.enums; /** * 用户状态 * - * @author ruoyi + * @author inspur */ public enum UserStatus { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/DemoModeException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/DemoModeException.java index 1ef9642..ac3393e 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/DemoModeException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/DemoModeException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception; /** * 演示模式异常 * - * @author ruoyi + * @author inspur */ public class DemoModeException extends RuntimeException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/GlobalException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/GlobalException.java index ab3b74f..f2ef1c2 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/GlobalException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/GlobalException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception; /** * 全局异常 * - * @author ruoyi + * @author inspur */ public class GlobalException extends RuntimeException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/ServiceException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/ServiceException.java index e37c4b9..0a8687e 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/ServiceException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/ServiceException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception; /** * 业务异常 * - * @author ruoyi + * @author inspur */ public final class ServiceException extends RuntimeException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/UtilException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/UtilException.java index 216a356..5a63b31 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/UtilException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/UtilException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception; /** * 工具类异常 * - * @author ruoyi + * @author inspur */ public class UtilException extends RuntimeException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/base/BaseException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/base/BaseException.java index 479cd57..8ccf257 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/base/BaseException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/base/BaseException.java @@ -6,7 +6,7 @@ import com.inspur.common.utils.StringUtils; /** * 基础异常 * - * @author ruoyi + * @author inspur */ public class BaseException extends RuntimeException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileException.java index 852c422..b870af0 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileException.java @@ -5,7 +5,7 @@ import com.inspur.common.exception.base.BaseException; /** * 文件信息异常类 * - * @author ruoyi + * @author inspur */ public class FileException extends BaseException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileNameLengthLimitExceededException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileNameLengthLimitExceededException.java index d8fbc30..cdbd2e5 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileNameLengthLimitExceededException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileNameLengthLimitExceededException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.file; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author inspur */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileSizeLimitExceededException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileSizeLimitExceededException.java index a3b2c15..1fc34c4 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileSizeLimitExceededException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileSizeLimitExceededException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.file; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author inspur */ public class FileSizeLimitExceededException extends FileException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileUploadException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileUploadException.java index 363ba45..9a96260 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileUploadException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/FileUploadException.java @@ -6,7 +6,7 @@ import java.io.PrintWriter; /** * 文件上传异常类 * - * @author ruoyi + * @author inspur */ public class FileUploadException extends Exception { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/InvalidExtensionException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/InvalidExtensionException.java index a5cde03..5490f3f 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/InvalidExtensionException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/file/InvalidExtensionException.java @@ -5,7 +5,7 @@ import java.util.Arrays; /** * 文件上传 误异常类 * - * @author ruoyi + * @author inspur */ public class InvalidExtensionException extends FileUploadException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/job/TaskException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/job/TaskException.java index 3f05d36..21da6a9 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/job/TaskException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/job/TaskException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.job; /** * 计划策略异常 * - * @author ruoyi + * @author inspur */ public class TaskException extends Exception { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/BlackListException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/BlackListException.java index 477b25d..be8a052 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/BlackListException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/BlackListException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.user; /** * 黑名单IP异常类 * - * @author ruoyi + * @author inspur */ public class BlackListException extends UserException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/CaptchaException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/CaptchaException.java index 01033d4..fa8fed0 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/CaptchaException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/CaptchaException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.user; /** * 验证码错误异常类 * - * @author ruoyi + * @author inspur */ public class CaptchaException extends UserException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/CaptchaExpireException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/CaptchaExpireException.java index 2af96dc..c19e2fd 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/CaptchaExpireException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/CaptchaExpireException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.user; /** * 验证码失效异常类 * - * @author ruoyi + * @author inspur */ public class CaptchaExpireException extends UserException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserException.java index 70f8f73..8622642 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserException.java @@ -5,7 +5,7 @@ import com.inspur.common.exception.base.BaseException; /** * 用户信息异常类 * - * @author ruoyi + * @author inspur */ public class UserException extends BaseException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserNotExistsException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserNotExistsException.java index a8bf31b..2d743b7 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserNotExistsException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserNotExistsException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.user; /** * 用户不存在异常类 * - * @author ruoyi + * @author inspur */ public class UserNotExistsException extends UserException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserPasswordNotMatchException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserPasswordNotMatchException.java index 625cb56..4cfbb1f 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserPasswordNotMatchException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserPasswordNotMatchException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author ruoyi + * @author inspur */ public class UserPasswordNotMatchException extends UserException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserPasswordRetryLimitExceedException.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserPasswordRetryLimitExceedException.java index 38c9735..09e5916 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -3,7 +3,7 @@ package com.inspur.common.exception.user; /** * 用户错误最大次数异常类 * - * @author ruoyi + * @author inspur */ public class UserPasswordRetryLimitExceedException extends UserException { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/PropertyPreExcludeFilter.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/PropertyPreExcludeFilter.java index 62f1425..b98e659 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/PropertyPreExcludeFilter.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/PropertyPreExcludeFilter.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; /** * 排除JSON敏感属性 * - * @author ruoyi + * @author inspur */ public class PropertyPreExcludeFilter extends SimplePropertyPreFilter { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/RepeatableFilter.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/RepeatableFilter.java index d5348b4..e1359f0 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/RepeatableFilter.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/RepeatableFilter.java @@ -14,7 +14,7 @@ import com.inspur.common.utils.StringUtils; /** * Repeatable 过滤器 * - * @author ruoyi + * @author inspur */ public class RepeatableFilter implements Filter { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/RepeatedlyRequestWrapper.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/RepeatedlyRequestWrapper.java index 87056b0..1d59c8a 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/RepeatedlyRequestWrapper.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/RepeatedlyRequestWrapper.java @@ -15,7 +15,7 @@ import com.inspur.common.constant.Constants; /** * 构建可重复读取inputStream的request * - * @author ruoyi + * @author inspur */ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/XssFilter.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/XssFilter.java index d5a5f0b..13cf295 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/XssFilter.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/XssFilter.java @@ -17,7 +17,7 @@ import com.inspur.common.enums.HttpMethod; /** * 防止XSS攻击的过滤器 * - * @author ruoyi + * @author inspur */ public class XssFilter implements Filter { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/XssHttpServletRequestWrapper.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/XssHttpServletRequestWrapper.java index 1e78e29..4074231 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/XssHttpServletRequestWrapper.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/filter/XssHttpServletRequestWrapper.java @@ -15,7 +15,7 @@ import com.inspur.common.utils.html.EscapeUtil; /** * XSS过滤处理 * - * @author ruoyi + * @author inspur */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/Arith.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/Arith.java index 92355b1..eab3670 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/Arith.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/Arith.java @@ -6,7 +6,7 @@ import java.math.RoundingMode; /** * 精确的浮点数运算 * - * @author ruoyi + * @author inspur */ public class Arith { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DateUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DateUtils.java index dedb7e6..29953a3 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DateUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DateUtils.java @@ -14,7 +14,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; /** * 时间工具类 * - * @author ruoyi + * @author inspur */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DesensitizedUtil.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DesensitizedUtil.java index 391bfd7..dfee387 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DesensitizedUtil.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DesensitizedUtil.java @@ -3,7 +3,7 @@ package com.inspur.common.utils; /** * 脱敏工具类 * - * @author ruoyi + * @author inspur */ public class DesensitizedUtil { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DictUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DictUtils.java index 1e5e025..b5ceaf5 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DictUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/DictUtils.java @@ -11,7 +11,7 @@ import com.inspur.common.utils.spring.SpringUtils; /** * 字典工具类 * - * @author ruoyi + * @author inspur */ public class DictUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ExceptionUtil.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ExceptionUtil.java index d2796e4..fc6743f 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ExceptionUtil.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ExceptionUtil.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; /** * 错误信息处理类。 * - * @author ruoyi + * @author inspur */ public class ExceptionUtil { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/LogUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/LogUtils.java index a6f4b12..dad54f0 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/LogUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/LogUtils.java @@ -3,7 +3,7 @@ package com.inspur.common.utils; /** * 处理并记录日志文件 * - * @author ruoyi + * @author inspur */ public class LogUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/MessageUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/MessageUtils.java index de4f0d5..06ea434 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/MessageUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/MessageUtils.java @@ -7,7 +7,7 @@ import com.inspur.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 * - * @author ruoyi + * @author inspur */ public class MessageUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/PageUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/PageUtils.java index eafff5d..5a9673c 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/PageUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/PageUtils.java @@ -8,7 +8,7 @@ import com.inspur.common.utils.sql.SqlUtil; /** * 分页工具类 * - * @author ruoyi + * @author inspur */ public class PageUtils extends PageHelper { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/SecurityUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/SecurityUtils.java index b375d61..bb9757c 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/SecurityUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/SecurityUtils.java @@ -16,7 +16,7 @@ import com.inspur.common.exception.ServiceException; /** * 安全服务工具类 * - * @author ruoyi + * @author inspur */ public class SecurityUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ServletUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ServletUtils.java index 210a536..ae625e8 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ServletUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ServletUtils.java @@ -20,7 +20,7 @@ import com.inspur.common.core.text.Convert; /** * 客户端工具类 * - * @author ruoyi + * @author inspur */ public class ServletUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/StringUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/StringUtils.java index 82e3b88..0cbc859 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/StringUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/StringUtils.java @@ -13,7 +13,7 @@ import com.inspur.common.core.text.StrFormatter; /** * 字符串工具类 * - * @author ruoyi + * @author inspur */ public class StringUtils extends org.apache.commons.lang3.StringUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/Threads.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/Threads.java index 1a546e3..7fe783a 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/Threads.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/Threads.java @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; /** * 线程相关工具类. * - * @author ruoyi + * @author inspur */ public class Threads { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/bean/BeanUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/bean/BeanUtils.java index 88d7411..550293e 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/bean/BeanUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/bean/BeanUtils.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Bean 工具类 * - * @author ruoyi + * @author inspur */ public class BeanUtils extends org.springframework.beans.BeanUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/bean/BeanValidators.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/bean/BeanValidators.java index 68ad095..152d535 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/bean/BeanValidators.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/bean/BeanValidators.java @@ -8,7 +8,7 @@ import javax.validation.Validator; /** * bean对象属性验证 * - * @author ruoyi + * @author inspur */ public class BeanValidators { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileTypeUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileTypeUtils.java index d1522fb..82a6286 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileTypeUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileTypeUtils.java @@ -6,14 +6,14 @@ import org.apache.commons.lang3.StringUtils; /** * 文件类型工具类 * - * @author ruoyi + * @author inspur */ public class FileTypeUtils { /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: inspur.txt, 返回: txt * * @param file 文件名 * @return 后缀（不含".") @@ -30,7 +30,7 @@ public class FileTypeUtils /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: inspur.txt, 返回: txt * * @param fileName 文件名 * @return 后缀（不含".") diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileUploadUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileUploadUtils.java index 48ada59..b3f950f 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileUploadUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileUploadUtils.java @@ -6,7 +6,7 @@ import java.nio.file.Paths; import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.constant.Constants; import com.inspur.common.exception.file.FileNameLengthLimitExceededException; import com.inspur.common.exception.file.FileSizeLimitExceededException; @@ -18,7 +18,7 @@ import com.inspur.common.utils.uuid.Seq; /** * 文件上传工具类 * - * @author ruoyi + * @author inspur */ public class FileUploadUtils { @@ -35,7 +35,7 @@ public class FileUploadUtils /** * 默认上传的地址 */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); + private static String defaultBaseDir = ZemiConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { @@ -142,7 +142,7 @@ public class FileUploadUtils public static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + int dirLastIndex = ZemiConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileUtils.java index 3403b43..81b4ea3 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/FileUtils.java @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.utils.DateUtils; import com.inspur.common.utils.StringUtils; import com.inspur.common.utils.uuid.IdUtils; @@ -22,7 +22,7 @@ import org.apache.commons.io.FilenameUtils; /** * 文件处理工具类 * - * @author ruoyi + * @author inspur */ public class FileUtils { @@ -73,7 +73,7 @@ public class FileUtils */ public static String writeImportBytes(byte[] data) throws IOException { - return writeBytes(data, RuoYiConfig.getImportPath()); + return writeBytes(data, ZemiConfig.getImportPath()); } /** @@ -256,7 +256,7 @@ public class FileUtils } /** - * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png + * 获取文件名称 /profile/upload/2022/04/16/inspur.png -- inspur.png * * @param fileName 路径名称 * @return 没有文件路径的名称 @@ -274,7 +274,7 @@ public class FileUtils } /** - * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi + * 获取不带后缀文件名称 /profile/upload/2022/04/16/inspur.png -- inspur * * @param fileName 路径名称 * @return 没有文件路径和后缀的名称 diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/ImageUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/ImageUtils.java index d37212c..3df32cd 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/ImageUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/ImageUtils.java @@ -9,14 +9,14 @@ import java.util.Arrays; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.constant.Constants; import com.inspur.common.utils.StringUtils; /** * 图片处理工具类 * - * @author ruoyi + * @author inspur */ public class ImageUtils { @@ -79,7 +79,7 @@ public class ImageUtils else { // 本机地址 - String localPath = RuoYiConfig.getProfile(); + String localPath = ZemiConfig.getProfile(); String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); in = new FileInputStream(downloadPath); } diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/MimeTypeUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/MimeTypeUtils.java index 123c619..f3a3840 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/MimeTypeUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/file/MimeTypeUtils.java @@ -3,7 +3,7 @@ package com.inspur.common.utils.file; /** * 媒体类型工具类 * - * @author ruoyi + * @author inspur */ public class MimeTypeUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/html/EscapeUtil.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/html/EscapeUtil.java index 5ab5487..12ae52f 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/html/EscapeUtil.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/html/EscapeUtil.java @@ -5,7 +5,7 @@ import com.inspur.common.utils.StringUtils; /** * 转义和反转义工具类 * - * @author ruoyi + * @author inspur */ public class EscapeUtil { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/html/HTMLFilter.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/html/HTMLFilter.java index fc08404..0fdf493 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/html/HTMLFilter.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/html/HTMLFilter.java @@ -13,7 +13,7 @@ import java.util.regex.Pattern; /** * HTML过滤器，用于去除XSS漏洞隐患。 * - * @author ruoyi + * @author inspur */ public final class HTMLFilter { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/http/HttpHelper.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/http/HttpHelper.java index 1844e5e..fda3d67 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/http/HttpHelper.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/http/HttpHelper.java @@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory; /** * 通用http工具封装 * - * @author ruoyi + * @author inspur */ public class HttpHelper { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/http/HttpUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/http/HttpUtils.java index 26a02a0..dbadadb 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/http/HttpUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/http/HttpUtils.java @@ -25,7 +25,7 @@ import com.inspur.common.utils.StringUtils; /** * 通用http发送方法 * - * @author ruoyi + * @author inspur */ public class HttpUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ip/AddressUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ip/AddressUtils.java index a05488c..5559c92 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ip/AddressUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ip/AddressUtils.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.constant.Constants; import com.inspur.common.utils.StringUtils; import com.inspur.common.utils.http.HttpUtils; @@ -12,7 +12,7 @@ import com.inspur.common.utils.http.HttpUtils; /** * 获取地址类 * - * @author ruoyi + * @author inspur */ public class AddressUtils { @@ -31,7 +31,7 @@ public class AddressUtils { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) + if (ZemiConfig.isAddressEnabled()) { try { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ip/IpUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ip/IpUtils.java index 3e7cf17..a290647 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ip/IpUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/ip/IpUtils.java @@ -9,7 +9,7 @@ import com.inspur.common.utils.StringUtils; /** * 获取IP方法 * - * @author ruoyi + * @author inspur */ public class IpUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/poi/ExcelHandlerAdapter.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/poi/ExcelHandlerAdapter.java index 9a671bc..ba160b2 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/poi/ExcelHandlerAdapter.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/poi/ExcelHandlerAdapter.java @@ -6,7 +6,7 @@ import org.apache.poi.ss.usermodel.Workbook; /** * Excel数据格式处理适配器 * - * @author ruoyi + * @author inspur */ public interface ExcelHandlerAdapter { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/poi/ExcelUtil.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/poi/ExcelUtil.java index 1ad69a2..3ed1add 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/poi/ExcelUtil.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/poi/ExcelUtil.java @@ -74,7 +74,7 @@ import com.inspur.common.annotation.Excel; import com.inspur.common.annotation.Excel.ColumnType; import com.inspur.common.annotation.Excel.Type; import com.inspur.common.annotation.Excels; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.core.domain.AjaxResult; import com.inspur.common.core.text.Convert; import com.inspur.common.exception.UtilException; @@ -89,7 +89,7 @@ import com.inspur.common.utils.reflect.ReflectUtils; /** * Excel相关处理 * - * @author ruoyi + * @author inspur */ public class ExcelUtil { @@ -1423,7 +1423,7 @@ public class ExcelUtil */ public String getAbsoluteFile(String filename) { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; + String downloadPath = ZemiConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/reflect/ReflectUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/reflect/ReflectUtils.java index b61b476..62511de 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/reflect/ReflectUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/reflect/ReflectUtils.java @@ -18,7 +18,7 @@ import com.inspur.common.utils.DateUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * - * @author ruoyi + * @author inspur */ @SuppressWarnings("rawtypes") public class ReflectUtils diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sign/Base64.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sign/Base64.java index 943e5db..7ac2647 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sign/Base64.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sign/Base64.java @@ -3,7 +3,7 @@ package com.inspur.common.utils.sign; /** * Base64工具类 * - * @author ruoyi + * @author inspur */ public final class Base64 { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sign/Md5Utils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sign/Md5Utils.java index a6955d0..95ca353 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sign/Md5Utils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sign/Md5Utils.java @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; /** * Md5加密方法 * - * @author ruoyi + * @author inspur */ public class Md5Utils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/spring/SpringUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/spring/SpringUtils.java index c51f6e3..50006dc 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/spring/SpringUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/spring/SpringUtils.java @@ -13,7 +13,7 @@ import com.inspur.common.utils.StringUtils; /** * spring工具类 方便在非spring管理环境中获取bean * - * @author ruoyi + * @author inspur */ @Component public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sql/SqlUtil.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sql/SqlUtil.java index f6eace2..6a7267d 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sql/SqlUtil.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/sql/SqlUtil.java @@ -6,7 +6,7 @@ import com.inspur.common.utils.StringUtils; /** * sql操作工具类 * - * @author ruoyi + * @author inspur */ public class SqlUtil { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/IdUtils.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/IdUtils.java index 6cd28b1..0f95a9a 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/IdUtils.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/IdUtils.java @@ -3,7 +3,7 @@ package com.inspur.common.utils.uuid; /** * ID生成器工具类 * - * @author ruoyi + * @author inspur */ public class IdUtils { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/Seq.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/Seq.java index 06b88e6..c7ef89a 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/Seq.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/Seq.java @@ -5,7 +5,7 @@ import com.inspur.common.utils.DateUtils; import com.inspur.common.utils.StringUtils; /** - * @author ruoyi 序列生成类 + * @author inspur 序列生成类 */ public class Seq { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/UUID.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/UUID.java index e6b3685..62ec418 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/UUID.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/utils/uuid/UUID.java @@ -10,7 +10,7 @@ import com.inspur.common.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 * - * @author ruoyi + * @author inspur */ public final class UUID implements java.io.Serializable, Comparable { diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/xss/Xss.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/xss/Xss.java index 095eda5..0a25842 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/xss/Xss.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/xss/Xss.java @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义xss校验注解 * - * @author ruoyi + * @author inspur */ @Retention(RetentionPolicy.RUNTIME) @Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) diff --git a/zemi-master/zemi-common/src/main/java/com/inspur/common/xss/XssValidator.java b/zemi-master/zemi-common/src/main/java/com/inspur/common/xss/XssValidator.java index f3305f9..8dcb7d7 100644 --- a/zemi-master/zemi-common/src/main/java/com/inspur/common/xss/XssValidator.java +++ b/zemi-master/zemi-common/src/main/java/com/inspur/common/xss/XssValidator.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * 自定义xss校验注解实现 * - * @author ruoyi + * @author inspur */ public class XssValidator implements ConstraintValidator { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/DataScopeAspect.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/DataScopeAspect.java index cda2fb5..930bba4 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/DataScopeAspect.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/DataScopeAspect.java @@ -20,7 +20,7 @@ import com.inspur.framework.security.context.PermissionContextHolder; /** * 数据过滤处理 * - * @author ruoyi + * @author inspur */ @Aspect @Component diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/DataSourceAspect.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/DataSourceAspect.java index 4cc24b3..42dc5f6 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/DataSourceAspect.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/DataSourceAspect.java @@ -18,7 +18,7 @@ import com.inspur.framework.datasource.DynamicDataSourceContextHolder; /** * 多数据源处理 * - * @author ruoyi + * @author inspur */ @Aspect @Order(1) diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/LogAspect.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/LogAspect.java index 93c6597..3734179 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/LogAspect.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/LogAspect.java @@ -34,7 +34,7 @@ import com.inspur.system.domain.SysOperLog; /** * 操作日志记录处理 * - * @author ruoyi + * @author inspur */ @Aspect @Component diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/RateLimiterAspect.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/RateLimiterAspect.java index 06d69b7..3778a19 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/RateLimiterAspect.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/aspectj/RateLimiterAspect.java @@ -22,7 +22,7 @@ import com.inspur.common.utils.ip.IpUtils; /** * 限流处理 * - * @author ruoyi + * @author inspur */ @Aspect @Component diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ApplicationConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ApplicationConfig.java index 52084e5..1685fd1 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ApplicationConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ApplicationConfig.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * 程序注解配置 * - * @author ruoyi + * @author inspur */ @Configuration // 表示通过aop框架暴露该代理对象,AopContext能够访问 diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/CaptchaConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/CaptchaConfig.java index b5b7f3e..2b2932c 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/CaptchaConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/CaptchaConfig.java @@ -10,7 +10,7 @@ import static com.google.code.kaptcha.Constants.*; /** * 验证码配置 * - * @author ruoyi + * @author inspur */ @Configuration public class CaptchaConfig diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/DruidConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/DruidConfig.java index c1001e7..0864161 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/DruidConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/DruidConfig.java @@ -27,7 +27,7 @@ import com.inspur.framework.datasource.DynamicDataSource; /** * druid 配置多数据源 * - * @author ruoyi + * @author inspur */ @Configuration public class DruidConfig diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/FastJson2JsonRedisSerializer.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/FastJson2JsonRedisSerializer.java index ec769cf..90fbc48 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/FastJson2JsonRedisSerializer.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/FastJson2JsonRedisSerializer.java @@ -12,7 +12,7 @@ import com.inspur.common.constant.Constants; /** * Redis使用FastJson序列化 * - * @author ruoyi + * @author inspur */ public class FastJson2JsonRedisSerializer implements RedisSerializer { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/FilterConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/FilterConfig.java index 7eedd63..9ef48bc 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/FilterConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/FilterConfig.java @@ -15,7 +15,7 @@ import com.inspur.common.utils.StringUtils; /** * Filter配置 * - * @author ruoyi + * @author inspur */ @Configuration public class FilterConfig diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/I18nConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/I18nConfig.java index 69b8bf5..433fc04 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/I18nConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/I18nConfig.java @@ -12,7 +12,7 @@ import com.inspur.common.constant.Constants; /** * 资源文件配置加载 * - * @author ruoyi + * @author inspur */ @Configuration public class I18nConfig implements WebMvcConfigurer diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/KaptchaTextCreator.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/KaptchaTextCreator.java index 39295aa..c139c7b 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/KaptchaTextCreator.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/KaptchaTextCreator.java @@ -6,7 +6,7 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator; /** * 验证码文本生成器 * - * @author ruoyi + * @author inspur */ public class KaptchaTextCreator extends DefaultTextCreator { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/MyBatisConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/MyBatisConfig.java index dd04301..4409c32 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/MyBatisConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/MyBatisConfig.java @@ -27,7 +27,7 @@ import com.inspur.common.utils.StringUtils; /** * Mybatis支持*匹配扫描包 * - * @author ruoyi + * @author inspur */ @Configuration public class MyBatisConfig diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/RedisConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/RedisConfig.java index ad7ca4a..363f8d3 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/RedisConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/RedisConfig.java @@ -12,7 +12,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * redis配置 * - * @author ruoyi + * @author inspur */ @Configuration @EnableCaching diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ResourcesConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ResourcesConfig.java index ad6fbc6..4add8cb 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ResourcesConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ResourcesConfig.java @@ -11,14 +11,14 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.inspur.common.config.RuoYiConfig; +import com.inspur.common.config.ZemiConfig; import com.inspur.common.constant.Constants; import com.inspur.framework.interceptor.RepeatSubmitInterceptor; /** * 通用配置 * - * @author ruoyi + * @author inspur */ @Configuration public class ResourcesConfig implements WebMvcConfigurer @@ -31,7 +31,7 @@ public class ResourcesConfig implements WebMvcConfigurer { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") - .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); + .addResourceLocations("file:" + ZemiConfig.getProfile() + "/"); /** swagger配置 */ registry.addResourceHandler("/swagger-ui/**") diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/SecurityConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/SecurityConfig.java index 324ffd6..9e98180 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/SecurityConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/SecurityConfig.java @@ -24,7 +24,7 @@ import com.inspur.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security配置 * - * @author ruoyi + * @author inspur */ @EnableMethodSecurity(prePostEnabled = true, securedEnabled = true) @Configuration diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ServerConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ServerConfig.java index e45ece8..68d3f04 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ServerConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ServerConfig.java @@ -7,7 +7,7 @@ import com.inspur.common.utils.ServletUtils; /** * 服务相关配置 * - * @author ruoyi + * @author inspur */ @Component public class ServerConfig diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ThreadPoolConfig.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ThreadPoolConfig.java index 1621823..f69cab2 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ThreadPoolConfig.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/ThreadPoolConfig.java @@ -12,7 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor; /** * 线程池配置 * - * @author ruoyi + * @author inspur **/ @Configuration public class ThreadPoolConfig diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/properties/DruidProperties.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/properties/DruidProperties.java index bfc96ee..b6a6238 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/properties/DruidProperties.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/properties/DruidProperties.java @@ -7,7 +7,7 @@ import com.alibaba.druid.pool.DruidDataSource; /** * druid 配置属性 * - * @author ruoyi + * @author inspur */ @Configuration public class DruidProperties diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/properties/PermitAllUrlProperties.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/properties/PermitAllUrlProperties.java index 6e87f77..251137b 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/properties/PermitAllUrlProperties.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/config/properties/PermitAllUrlProperties.java @@ -21,7 +21,7 @@ import com.inspur.common.annotation.Anonymous; /** * 设置Anonymous注解允许匿名访问的url * - * @author ruoyi + * @author inspur */ @Configuration public class PermitAllUrlProperties implements InitializingBean, ApplicationContextAware diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/datasource/DynamicDataSource.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/datasource/DynamicDataSource.java index 62e4f34..a822025 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/datasource/DynamicDataSource.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/datasource/DynamicDataSource.java @@ -7,7 +7,7 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; /** * 动态数据源 * - * @author ruoyi + * @author inspur */ public class DynamicDataSource extends AbstractRoutingDataSource { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/datasource/DynamicDataSourceContextHolder.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/datasource/DynamicDataSourceContextHolder.java index f4b3d25..5c42d54 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/datasource/DynamicDataSourceContextHolder.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/datasource/DynamicDataSourceContextHolder.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; /** * 数据源切换处理 * - * @author ruoyi + * @author inspur */ public class DynamicDataSourceContextHolder { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/interceptor/RepeatSubmitInterceptor.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/interceptor/RepeatSubmitInterceptor.java index e127262..08b7df0 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/interceptor/RepeatSubmitInterceptor.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/interceptor/RepeatSubmitInterceptor.java @@ -14,7 +14,7 @@ import com.inspur.common.utils.ServletUtils; /** * 防止重复提交拦截器 * - * @author ruoyi + * @author inspur */ @Component public abstract class RepeatSubmitInterceptor implements HandlerInterceptor diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/interceptor/impl/SameUrlDataInterceptor.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/interceptor/impl/SameUrlDataInterceptor.java index 863dc57..5429c0b 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -20,7 +20,7 @@ import com.inspur.framework.interceptor.RepeatSubmitInterceptor; * 判断请求url和数据是否和上一次相同， * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。 * - * @author ruoyi + * @author inspur */ @Component public class SameUrlDataInterceptor extends RepeatSubmitInterceptor diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/AsyncManager.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/AsyncManager.java index c9f5abe..d8475e9 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/AsyncManager.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/AsyncManager.java @@ -9,7 +9,7 @@ import com.inspur.common.utils.spring.SpringUtils; /** * 异步任务管理器 * - * @author ruoyi + * @author inspur */ public class AsyncManager { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/ShutdownManager.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/ShutdownManager.java index 8673187..811ad40 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/ShutdownManager.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/ShutdownManager.java @@ -8,7 +8,7 @@ import javax.annotation.PreDestroy; /** * 确保应用退出时能关闭后台线程 * - * @author ruoyi + * @author inspur */ @Component public class ShutdownManager diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/factory/AsyncFactory.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/factory/AsyncFactory.java index 37318b4..c69f192 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/factory/AsyncFactory.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/manager/factory/AsyncFactory.java @@ -19,7 +19,7 @@ import eu.bitwalker.useragentutils.UserAgent; /** * 异步工厂（产生任务用） * - * @author ruoyi + * @author inspur */ public class AsyncFactory { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/context/AuthenticationContextHolder.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/context/AuthenticationContextHolder.java index 99ebf46..7b59796 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/context/AuthenticationContextHolder.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/context/AuthenticationContextHolder.java @@ -5,7 +5,7 @@ import org.springframework.security.core.Authentication; /** * 身份验证信息 * - * @author ruoyi + * @author inspur */ public class AuthenticationContextHolder { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/context/PermissionContextHolder.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/context/PermissionContextHolder.java index 991ff77..acc20e9 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/context/PermissionContextHolder.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/context/PermissionContextHolder.java @@ -7,7 +7,7 @@ import com.inspur.common.core.text.Convert; /** * 权限信息 * - * @author ruoyi + * @author inspur */ public class PermissionContextHolder { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/filter/JwtAuthenticationTokenFilter.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/filter/JwtAuthenticationTokenFilter.java index df3e308..fb3cf77 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -19,7 +19,7 @@ import com.inspur.framework.web.service.TokenService; /** * token过滤器 验证token有效性 * - * @author ruoyi + * @author inspur */ @Component public class JwtAuthenticationTokenFilter extends OncePerRequestFilter diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/handle/AuthenticationEntryPointImpl.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/handle/AuthenticationEntryPointImpl.java index 6d50afa..6bdf1bf 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/handle/AuthenticationEntryPointImpl.java @@ -16,7 +16,7 @@ import com.inspur.common.utils.StringUtils; /** * 认证失败处理类 返回未授权 * - * @author ruoyi + * @author inspur */ @Component public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/handle/LogoutSuccessHandlerImpl.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/handle/LogoutSuccessHandlerImpl.java index 423af82..be10ce7 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -22,7 +22,7 @@ import com.inspur.framework.web.service.TokenService; /** * 自定义退出处理类 返回成功 * - * @author ruoyi + * @author inspur */ @Configuration public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/Server.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/Server.java index ec46b76..5fc4ade 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/Server.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/Server.java @@ -24,7 +24,7 @@ import oshi.util.Util; /** * 服务器相关信息 * - * @author ruoyi + * @author inspur */ public class Server { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Cpu.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Cpu.java index b897330..599da9b 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Cpu.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Cpu.java @@ -5,7 +5,7 @@ import com.inspur.common.utils.Arith; /** * CPU相关信息 * - * @author ruoyi + * @author inspur */ public class Cpu { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Jvm.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Jvm.java index bb18067..c99d019 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Jvm.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Jvm.java @@ -7,7 +7,7 @@ import com.inspur.common.utils.DateUtils; /** * JVM相关信息 * - * @author ruoyi + * @author inspur */ public class Jvm { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Mem.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Mem.java index be8a8ce..59018c7 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Mem.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Mem.java @@ -5,7 +5,7 @@ import com.inspur.common.utils.Arith; /** * 內存相关信息 * - * @author ruoyi + * @author inspur */ public class Mem { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Sys.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Sys.java index 21e908e..a936291 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Sys.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/Sys.java @@ -3,7 +3,7 @@ package com.inspur.framework.web.domain.server; /** * 系统相关信息 * - * @author ruoyi + * @author inspur */ public class Sys { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/SysFile.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/SysFile.java index d5a0696..5de62af 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/SysFile.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/domain/server/SysFile.java @@ -3,7 +3,7 @@ package com.inspur.framework.web.domain.server; /** * 系统文件相关信息 * - * @author ruoyi + * @author inspur */ public class SysFile { diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/exception/GlobalExceptionHandler.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/exception/GlobalExceptionHandler.java index 7b3cb36..d2d053f 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/exception/GlobalExceptionHandler.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/exception/GlobalExceptionHandler.java @@ -22,7 +22,7 @@ import com.inspur.common.utils.html.EscapeUtil; /** * 全局异常处理器 * - * @author ruoyi + * @author inspur */ @RestControllerAdvice public class GlobalExceptionHandler diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/PermissionService.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/PermissionService.java index 9c27b16..56963fa 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/PermissionService.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/PermissionService.java @@ -11,9 +11,9 @@ import com.inspur.common.utils.StringUtils; import com.inspur.framework.security.context.PermissionContextHolder; /** - * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 + * 自定义权限实现，ss取自SpringSecurity首字母 * - * @author ruoyi + * @author inspur */ @Service("ss") public class PermissionService diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysLoginService.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysLoginService.java index 94dfd36..3220402 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysLoginService.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysLoginService.java @@ -32,7 +32,7 @@ import com.inspur.system.service.ISysUserService; /** * 登录校验方法 * - * @author ruoyi + * @author inspur */ @Component public class SysLoginService diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysPasswordService.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysPasswordService.java index 54e556f..c144362 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysPasswordService.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysPasswordService.java @@ -16,7 +16,7 @@ import com.inspur.framework.security.context.AuthenticationContextHolder; /** * 登录密码方法 * - * @author ruoyi + * @author inspur */ @Component public class SysPasswordService diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysPermissionService.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysPermissionService.java index 9f8ea47..ebcdd5c 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysPermissionService.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysPermissionService.java @@ -16,7 +16,7 @@ import com.inspur.system.service.ISysRoleService; /** * 用户权限处理 * - * @author ruoyi + * @author inspur */ @Component public class SysPermissionService diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysRegisterService.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysRegisterService.java index 9d01947..2f12078 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysRegisterService.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/SysRegisterService.java @@ -21,7 +21,7 @@ import com.inspur.system.service.ISysUserService; /** * 注册校验方法 * - * @author ruoyi + * @author inspur */ @Component public class SysRegisterService diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/TokenService.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/TokenService.java index 9e3a423..37b3281 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/TokenService.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/TokenService.java @@ -26,7 +26,7 @@ import io.jsonwebtoken.SignatureAlgorithm; /** * token验证处理 * - * @author ruoyi + * @author inspur */ @Component public class TokenService diff --git a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/UserDetailsServiceImpl.java b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/UserDetailsServiceImpl.java index cf2d7d8..47f1f45 100644 --- a/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/UserDetailsServiceImpl.java +++ b/zemi-master/zemi-framework/src/main/java/com/inspur/framework/web/service/UserDetailsServiceImpl.java @@ -18,7 +18,7 @@ import com.inspur.system.service.ISysUserService; /** * 用户验证处理 * - * @author ruoyi + * @author inspur */ @Service public class UserDetailsServiceImpl implements UserDetailsService diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/config/GenConfig.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/config/GenConfig.java index 3da64db..fcfda39 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/config/GenConfig.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/config/GenConfig.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi + * @author inspur */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/controller/GenController.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/controller/GenController.java index ddacaa3..8a30bdc 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/controller/GenController.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/controller/GenController.java @@ -38,7 +38,7 @@ import com.inspur.generator.service.IGenTableService; /** * 代码生成 操作处理 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/tool/gen") @@ -250,7 +250,7 @@ public class GenController extends BaseController response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"inspur.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/domain/GenTable.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/domain/GenTable.java index 3d46a87..a7d41e6 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/domain/GenTable.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/domain/GenTable.java @@ -11,7 +11,7 @@ import com.inspur.common.utils.StringUtils; /** * 业务表 gen_table * - * @author ruoyi + * @author inspur */ public class GenTable extends BaseEntity { diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/domain/GenTableColumn.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/domain/GenTableColumn.java index dbdbae7..4c19a2b 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/domain/GenTableColumn.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/domain/GenTableColumn.java @@ -7,7 +7,7 @@ import com.inspur.common.utils.StringUtils; /** * 代码生成业务字段表 gen_table_column * - * @author ruoyi + * @author inspur */ public class GenTableColumn extends BaseEntity { diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/mapper/GenTableColumnMapper.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/mapper/GenTableColumnMapper.java index f325ace..905044f 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/mapper/GenTableColumnMapper.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/mapper/GenTableColumnMapper.java @@ -6,7 +6,7 @@ import com.inspur.generator.domain.GenTableColumn; /** * 业务字段 数据层 * - * @author ruoyi + * @author inspur */ public interface GenTableColumnMapper { diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/mapper/GenTableMapper.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/mapper/GenTableMapper.java index 2e85b28..71f6fe5 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/mapper/GenTableMapper.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/mapper/GenTableMapper.java @@ -6,7 +6,7 @@ import com.inspur.generator.domain.GenTable; /** * 业务 数据层 * - * @author ruoyi + * @author inspur */ public interface GenTableMapper { diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/GenTableColumnServiceImpl.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/GenTableColumnServiceImpl.java index d164a38..1dfa8a1 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/GenTableColumnServiceImpl.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/GenTableColumnServiceImpl.java @@ -10,7 +10,7 @@ import com.inspur.generator.mapper.GenTableColumnMapper; /** * 业务字段 服务层实现 * - * @author ruoyi + * @author inspur */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/GenTableServiceImpl.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/GenTableServiceImpl.java index 883c516..d0ffbe2 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/GenTableServiceImpl.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/GenTableServiceImpl.java @@ -39,7 +39,7 @@ import com.inspur.generator.util.VelocityUtils; /** * 业务 服务层实现 * - * @author ruoyi + * @author inspur */ @Service public class GenTableServiceImpl implements IGenTableService diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/IGenTableColumnService.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/IGenTableColumnService.java index 5f3d6d3..89a3965 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/IGenTableColumnService.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/IGenTableColumnService.java @@ -6,7 +6,7 @@ import com.inspur.generator.domain.GenTableColumn; /** * 业务字段 服务层 * - * @author ruoyi + * @author inspur */ public interface IGenTableColumnService { diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/IGenTableService.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/IGenTableService.java index b2d2bed..3144a39 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/IGenTableService.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/service/IGenTableService.java @@ -7,7 +7,7 @@ import com.inspur.generator.domain.GenTable; /** * 业务 服务层 * - * @author ruoyi + * @author inspur */ public interface IGenTableService { diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/GenUtils.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/GenUtils.java index 717a6d2..8799119 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/GenUtils.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/GenUtils.java @@ -11,7 +11,7 @@ import com.inspur.generator.domain.GenTableColumn; /** * 代码生成器 工具类 * - * @author ruoyi + * @author inspur */ public class GenUtils { @@ -215,7 +215,7 @@ public class GenUtils */ public static String replaceText(String text) { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + return RegExUtils.replaceAll(text, "(?:表|浪潮)", ""); } /** diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/VelocityInitializer.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/VelocityInitializer.java index fac0fc5..89931e3 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/VelocityInitializer.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/VelocityInitializer.java @@ -7,7 +7,7 @@ import com.inspur.common.constant.Constants; /** * VelocityEngine工厂 * - * @author ruoyi + * @author inspur */ public class VelocityInitializer { diff --git a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/VelocityUtils.java b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/VelocityUtils.java index 9d37bb4..4943738 100644 --- a/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/VelocityUtils.java +++ b/zemi-master/zemi-generator/src/main/java/com/inspur/generator/util/VelocityUtils.java @@ -16,7 +16,7 @@ import com.inspur.generator.domain.GenTableColumn; /** * 模板处理工具类 * - * @author ruoyi + * @author inspur */ public class VelocityUtils { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/config/ScheduleConfig.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/config/ScheduleConfig.java index d4e065a..51ff56d 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/config/ScheduleConfig.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -//package com.ruoyi.quartz.config; +//package com.inspur.quartz.config; // //import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Configuration; @@ -9,7 +9,7 @@ ///** // * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效） // * -// * @author ruoyi +// * @author inspur // */ //@Configuration //public class ScheduleConfig @@ -22,7 +22,7 @@ // // // quartz参数 // Properties prop = new Properties(); -// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); +// prop.put("org.quartz.scheduler.instanceName", "inspurScheduler"); // prop.put("org.quartz.scheduler.instanceId", "AUTO"); // // 线程池配置 // prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); @@ -42,7 +42,7 @@ // prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); // factory.setQuartzProperties(prop); // -// factory.setSchedulerName("RuoyiScheduler"); +// factory.setSchedulerName("inspurScheduler"); // // 延时启动 // factory.setStartupDelay(1); // factory.setApplicationContextSchedulerContextKey("applicationContextKey"); diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/controller/SysJobController.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/controller/SysJobController.java index f547fa6..055909f 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/controller/SysJobController.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/controller/SysJobController.java @@ -30,7 +30,7 @@ import com.inspur.quartz.util.ScheduleUtils; /** * 调度任务信息操作处理 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/monitor/job") diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/controller/SysJobLogController.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/controller/SysJobLogController.java index 73aa9ca..97252d2 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/controller/SysJobLogController.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/controller/SysJobLogController.java @@ -22,7 +22,7 @@ import com.inspur.quartz.service.ISysJobLogService; /** * 调度日志操作处理 * - * @author ruoyi + * @author inspur */ @RestController @RequestMapping("/monitor/jobLog") diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/domain/SysJob.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/domain/SysJob.java index 7bdfdd4..fc230e5 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/domain/SysJob.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/domain/SysJob.java @@ -16,7 +16,7 @@ import com.inspur.quartz.util.CronUtils; /** * 定时任务调度表 sys_job * - * @author ruoyi + * @author inspur */ public class SysJob extends BaseEntity { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/domain/SysJobLog.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/domain/SysJobLog.java index 902cb88..7058298 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/domain/SysJobLog.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/domain/SysJobLog.java @@ -9,7 +9,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log * - * @author ruoyi + * @author inspur */ public class SysJobLog extends BaseEntity { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/mapper/SysJobLogMapper.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/mapper/SysJobLogMapper.java index b7b54df..f6930e3 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/mapper/SysJobLogMapper.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/mapper/SysJobLogMapper.java @@ -6,7 +6,7 @@ import com.inspur.quartz.domain.SysJobLog; /** * 调度任务日志信息 数据层 * - * @author ruoyi + * @author inspur */ public interface SysJobLogMapper { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/mapper/SysJobMapper.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/mapper/SysJobMapper.java index c7063f6..a745416 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/mapper/SysJobMapper.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/mapper/SysJobMapper.java @@ -6,7 +6,7 @@ import com.inspur.quartz.domain.SysJob; /** * 调度任务信息 数据层 * - * @author ruoyi + * @author inspur */ public interface SysJobMapper { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/ISysJobLogService.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/ISysJobLogService.java index 0c82421..97fa751 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/ISysJobLogService.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/ISysJobLogService.java @@ -6,7 +6,7 @@ import com.inspur.quartz.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysJobLogService { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/ISysJobService.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/ISysJobService.java index 7236fe9..e910bc1 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/ISysJobService.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/ISysJobService.java @@ -8,7 +8,7 @@ import com.inspur.quartz.domain.SysJob; /** * 定时任务调度信息信息 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysJobService { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/impl/SysJobLogServiceImpl.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/impl/SysJobLogServiceImpl.java index 6440436..af0e168 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/impl/SysJobLogServiceImpl.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/impl/SysJobLogServiceImpl.java @@ -10,7 +10,7 @@ import com.inspur.quartz.service.ISysJobLogService; /** * 定时任务调度日志信息 服务层 * - * @author ruoyi + * @author inspur */ @Service public class SysJobLogServiceImpl implements ISysJobLogService diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/impl/SysJobServiceImpl.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/impl/SysJobServiceImpl.java index b989bc1..dd22a1d 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/impl/SysJobServiceImpl.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/service/impl/SysJobServiceImpl.java @@ -20,7 +20,7 @@ import com.inspur.quartz.util.ScheduleUtils; /** * 定时任务调度信息 服务层 * - * @author ruoyi + * @author inspur */ @Service public class SysJobServiceImpl implements ISysJobService diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/task/RyTask.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/task/RyTask.java index 88f7489..dceb563 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/task/RyTask.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/task/RyTask.java @@ -6,7 +6,7 @@ import com.inspur.common.utils.StringUtils; /** * 定时任务调度测试 * - * @author ruoyi + * @author inspur */ @Component("ryTask") public class RyTask diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/AbstractQuartzJob.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/AbstractQuartzJob.java index 2f69b0f..b129baf 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/AbstractQuartzJob.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/AbstractQuartzJob.java @@ -19,7 +19,7 @@ import com.inspur.quartz.service.ISysJobLogService; /** * 抽象quartz调用 * - * @author ruoyi + * @author inspur */ public abstract class AbstractQuartzJob implements Job { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/CronUtils.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/CronUtils.java index 636d7eb..4541e78 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/CronUtils.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/CronUtils.java @@ -7,7 +7,7 @@ import org.quartz.CronExpression; /** * cron表达式工具类 * - * @author ruoyi + * @author inspur * */ public class CronUtils diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/JobInvokeUtil.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/JobInvokeUtil.java index cf4db50..9701e5a 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/JobInvokeUtil.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/JobInvokeUtil.java @@ -11,7 +11,7 @@ import com.inspur.quartz.domain.SysJob; /** * 任务执行工具 * - * @author ruoyi + * @author inspur */ public class JobInvokeUtil { diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/QuartzDisallowConcurrentExecution.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/QuartzDisallowConcurrentExecution.java index 8dfc55d..e2f44ea 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/QuartzDisallowConcurrentExecution.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/QuartzDisallowConcurrentExecution.java @@ -7,7 +7,7 @@ import com.inspur.quartz.domain.SysJob; /** * 定时任务处理（禁止并发执行） * - * @author ruoyi + * @author inspur * */ @DisallowConcurrentExecution diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/QuartzJobExecution.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/QuartzJobExecution.java index bed83be..c24e22d 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/QuartzJobExecution.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/QuartzJobExecution.java @@ -6,7 +6,7 @@ import com.inspur.quartz.domain.SysJob; /** * 定时任务处理（允许并发执行） * - * @author ruoyi + * @author inspur * */ public class QuartzJobExecution extends AbstractQuartzJob diff --git a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/ScheduleUtils.java b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/ScheduleUtils.java index cc2b295..2de4696 100644 --- a/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/ScheduleUtils.java +++ b/zemi-master/zemi-quartz/src/main/java/com/inspur/quartz/util/ScheduleUtils.java @@ -21,7 +21,7 @@ import com.inspur.quartz.domain.SysJob; /** * 定时任务工具类 * - * @author ruoyi + * @author inspur * */ public class ScheduleUtils diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysCache.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysCache.java index b19821e..6ab6a85 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysCache.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysCache.java @@ -5,7 +5,7 @@ import com.inspur.common.utils.StringUtils; /** * 缓存信息 * - * @author ruoyi + * @author inspur */ public class SysCache { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysConfig.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysConfig.java index 881d890..5c443e9 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysConfig.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysConfig.java @@ -11,7 +11,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 参数配置表 sys_config * - * @author ruoyi + * @author inspur */ public class SysConfig extends BaseEntity { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysLogininfor.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysLogininfor.java index 6c9753b..de8a151 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysLogininfor.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysLogininfor.java @@ -9,7 +9,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor * - * @author ruoyi + * @author inspur */ public class SysLogininfor extends BaseEntity { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysNotice.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysNotice.java index 25d7da9..03ee64a 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysNotice.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysNotice.java @@ -10,7 +10,7 @@ import com.inspur.common.xss.Xss; /** * 通知公告表 sys_notice * - * @author ruoyi + * @author inspur */ public class SysNotice extends BaseEntity { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysOperLog.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysOperLog.java index b11c449..d7dff12 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysOperLog.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysOperLog.java @@ -9,7 +9,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 操作日志记录表 oper_log * - * @author ruoyi + * @author inspur */ public class SysOperLog extends BaseEntity { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysPost.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysPost.java index 728f45e..3f7e1d0 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysPost.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysPost.java @@ -12,7 +12,7 @@ import com.inspur.common.core.domain.BaseEntity; /** * 岗位表 sys_post * - * @author ruoyi + * @author inspur */ public class SysPost extends BaseEntity { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysRoleDept.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysRoleDept.java index 1ca6a72..f950899 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysRoleDept.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysRoleDept.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept * - * @author ruoyi + * @author inspur */ public class SysRoleDept { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysRoleMenu.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysRoleMenu.java index 96031e9..26c6dd0 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysRoleMenu.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysRoleMenu.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和菜单关联 sys_role_menu * - * @author ruoyi + * @author inspur */ public class SysRoleMenu { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserOnline.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserOnline.java index 3f22e0f..aaf6bd4 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserOnline.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserOnline.java @@ -3,7 +3,7 @@ package com.inspur.system.domain; /** * 当前在线会话 * - * @author ruoyi + * @author inspur */ public class SysUserOnline { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserPost.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserPost.java index a266792..274f325 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserPost.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserPost.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post * - * @author ruoyi + * @author inspur */ public class SysUserPost { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserRole.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserRole.java index 92f64e0..8a5f383 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserRole.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/SysUserRole.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role * - * @author ruoyi + * @author inspur */ public class SysUserRole { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/vo/MetaVo.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/vo/MetaVo.java index 4e9b4c7..9750738 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/vo/MetaVo.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/vo/MetaVo.java @@ -5,7 +5,7 @@ import com.inspur.common.utils.StringUtils; /** * 路由显示信息 * - * @author ruoyi + * @author inspur */ public class MetaVo { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/vo/RouterVo.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/vo/RouterVo.java index e05d449..57746fa 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/vo/RouterVo.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/domain/vo/RouterVo.java @@ -6,7 +6,7 @@ import java.util.List; /** * 路由配置信息 * - * @author ruoyi + * @author inspur */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysConfigMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysConfigMapper.java index 72d790e..6820711 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysConfigMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysConfigMapper.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysConfig; /** * 参数配置 数据层 * - * @author ruoyi + * @author inspur */ public interface SysConfigMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDeptMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDeptMapper.java index eab74e7..65ae497 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDeptMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDeptMapper.java @@ -7,7 +7,7 @@ import com.inspur.common.core.domain.entity.SysDept; /** * 部门管理 数据层 * - * @author ruoyi + * @author inspur */ public interface SysDeptMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDictDataMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDictDataMapper.java index e4f3a30..c1bdc19 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDictDataMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDictDataMapper.java @@ -7,7 +7,7 @@ import com.inspur.common.core.domain.entity.SysDictData; /** * 字典表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysDictDataMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDictTypeMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDictTypeMapper.java index 58b3a21..75f515d 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDictTypeMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysDictTypeMapper.java @@ -6,7 +6,7 @@ import com.inspur.common.core.domain.entity.SysDictType; /** * 字典表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysDictTypeMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysLogininforMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysLogininforMapper.java index 477d1a7..6a88167 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysLogininforMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysLogininforMapper.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 * - * @author ruoyi + * @author inspur */ public interface SysLogininforMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysMenuMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysMenuMapper.java index 095b5c5..382b673 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysMenuMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysMenuMapper.java @@ -7,7 +7,7 @@ import com.inspur.common.core.domain.entity.SysMenu; /** * 菜单表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysMenuMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysNoticeMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysNoticeMapper.java index 9aa944b..4b3aaf7 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysNoticeMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysNoticeMapper.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysNotice; /** * 通知公告表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysNoticeMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysOperLogMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysOperLogMapper.java index 8d11d14..772a562 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysOperLogMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysOperLogMapper.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysOperLog; /** * 操作日志 数据层 * - * @author ruoyi + * @author inspur */ public interface SysOperLogMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysPostMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysPostMapper.java index 9616999..a1c1af5 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysPostMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysPostMapper.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysPost; /** * 岗位信息 数据层 * - * @author ruoyi + * @author inspur */ public interface SysPostMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleDeptMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleDeptMapper.java index 69df91c..1f3bbb1 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleDeptMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleDeptMapper.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysRoleDeptMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleMapper.java index dc205cc..1284f52 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleMapper.java @@ -6,7 +6,7 @@ import com.inspur.common.core.domain.entity.SysRole; /** * 角色表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysRoleMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleMenuMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleMenuMapper.java index 2dd3b80..c3ae2cd 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleMenuMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysRoleMenuMapper.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysRoleMenuMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserMapper.java index 9228efd..0ef7ba8 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserMapper.java @@ -7,7 +7,7 @@ import com.inspur.common.core.domain.entity.SysUser; /** * 用户表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysUserMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserPostMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserPostMapper.java index 91fa0b2..cb8855e 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserPostMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserPostMapper.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysUserPostMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserRoleMapper.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserRoleMapper.java index a193c78..20a0866 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserRoleMapper.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/mapper/SysUserRoleMapper.java @@ -7,7 +7,7 @@ import com.inspur.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 * - * @author ruoyi + * @author inspur */ public interface SysUserRoleMapper { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysConfigService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysConfigService.java index 3918a05..198df51 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysConfigService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysConfigService.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysConfig; /** * 参数配置 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysConfigService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDeptService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDeptService.java index c57a72d..d1dc639 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDeptService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDeptService.java @@ -7,7 +7,7 @@ import com.inspur.common.core.domain.entity.SysDept; /** * 部门管理 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysDeptService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDictDataService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDictDataService.java index 59e2578..2de0ed2 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDictDataService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDictDataService.java @@ -6,7 +6,7 @@ import com.inspur.common.core.domain.entity.SysDictData; /** * 字典 业务层 * - * @author ruoyi + * @author inspur */ public interface ISysDictDataService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDictTypeService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDictTypeService.java index 831e1ce..02a3245 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDictTypeService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysDictTypeService.java @@ -7,7 +7,7 @@ import com.inspur.common.core.domain.entity.SysDictType; /** * 字典 业务层 * - * @author ruoyi + * @author inspur */ public interface ISysDictTypeService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysLogininforService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysLogininforService.java index b985860..3abb344 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysLogininforService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysLogininforService.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysLogininforService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysMenuService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysMenuService.java index ccbff91..67a0a1a 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysMenuService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysMenuService.java @@ -9,7 +9,7 @@ import com.inspur.system.domain.vo.RouterVo; /** * 菜单 业务层 * - * @author ruoyi + * @author inspur */ public interface ISysMenuService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysNoticeService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysNoticeService.java index 341c8aa..c64be2b 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysNoticeService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysNoticeService.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysNotice; /** * 公告 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysNoticeService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysOperLogService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysOperLogService.java index ecc050f..7818aae 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysOperLogService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysOperLogService.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysOperLog; /** * 操作日志 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysOperLogService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysPostService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysPostService.java index d41538c..349b062 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysPostService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysPostService.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysPost; /** * 岗位信息 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysPostService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysRoleService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysRoleService.java index 81da5ff..e0e7a5e 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysRoleService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysRoleService.java @@ -8,7 +8,7 @@ import com.inspur.system.domain.SysUserRole; /** * 角色业务层 * - * @author ruoyi + * @author inspur */ public interface ISysRoleService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysUserOnlineService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysUserOnlineService.java index 57dbb74..0ea5e6d 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysUserOnlineService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysUserOnlineService.java @@ -6,7 +6,7 @@ import com.inspur.system.domain.SysUserOnline; /** * 在线用户 服务层 * - * @author ruoyi + * @author inspur */ public interface ISysUserOnlineService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysUserService.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysUserService.java index 1ebb187..bf33c90 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysUserService.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/ISysUserService.java @@ -6,7 +6,7 @@ import com.inspur.common.core.domain.entity.SysUser; /** * 用户 业务层 * - * @author ruoyi + * @author inspur */ public interface ISysUserService { diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysConfigServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysConfigServiceImpl.java index 2e235bc..cfc1a0b 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysConfigServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysConfigServiceImpl.java @@ -20,7 +20,7 @@ import com.inspur.system.service.ISysConfigService; /** * 参数配置 服务层实现 * - * @author ruoyi + * @author inspur */ @Service public class SysConfigServiceImpl implements ISysConfigService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDeptServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDeptServiceImpl.java index 74d215f..376d32f 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDeptServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDeptServiceImpl.java @@ -24,7 +24,7 @@ import com.inspur.system.service.ISysDeptService; /** * 部门管理 服务实现 * - * @author ruoyi + * @author inspur */ @Service public class SysDeptServiceImpl implements ISysDeptService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDictDataServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDictDataServiceImpl.java index 242112c..5f7cdf7 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDictDataServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDictDataServiceImpl.java @@ -11,7 +11,7 @@ import com.inspur.system.service.ISysDictDataService; /** * 字典 业务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysDictDataServiceImpl implements ISysDictDataService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDictTypeServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDictTypeServiceImpl.java index 9a7fa2e..9eec95c 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDictTypeServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysDictTypeServiceImpl.java @@ -21,7 +21,7 @@ import com.inspur.system.service.ISysDictTypeService; /** * 字典 业务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysDictTypeServiceImpl implements ISysDictTypeService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysLogininforServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysLogininforServiceImpl.java index 2b82613..bc55087 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysLogininforServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysLogininforServiceImpl.java @@ -10,7 +10,7 @@ import com.inspur.system.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysLogininforServiceImpl implements ISysLogininforService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysMenuServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysMenuServiceImpl.java index 6e45bed..70b8aea 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysMenuServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysMenuServiceImpl.java @@ -28,7 +28,7 @@ import com.inspur.system.service.ISysMenuService; /** * 菜单 业务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysMenuServiceImpl implements ISysMenuService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysNoticeServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysNoticeServiceImpl.java index 2b87735..2f96e6a 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysNoticeServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysNoticeServiceImpl.java @@ -10,7 +10,7 @@ import com.inspur.system.service.ISysNoticeService; /** * 公告 服务层实现 * - * @author ruoyi + * @author inspur */ @Service public class SysNoticeServiceImpl implements ISysNoticeService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysOperLogServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysOperLogServiceImpl.java index 7946c78..4d5605c 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysOperLogServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysOperLogServiceImpl.java @@ -10,7 +10,7 @@ import com.inspur.system.service.ISysOperLogService; /** * 操作日志 服务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysOperLogServiceImpl implements ISysOperLogService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysPostServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysPostServiceImpl.java index bc96770..e88d816 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysPostServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysPostServiceImpl.java @@ -14,7 +14,7 @@ import com.inspur.system.service.ISysPostService; /** * 岗位信息 服务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysPostServiceImpl implements ISysPostService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysRoleServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysRoleServiceImpl.java index 0c7f1d7..a4c0c5a 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysRoleServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysRoleServiceImpl.java @@ -28,7 +28,7 @@ import com.inspur.system.service.ISysRoleService; /** * 角色 业务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysRoleServiceImpl implements ISysRoleService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysUserOnlineServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysUserOnlineServiceImpl.java index 58a2d31..aba50e2 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysUserOnlineServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysUserOnlineServiceImpl.java @@ -9,7 +9,7 @@ import com.inspur.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysUserOnlineServiceImpl implements ISysUserOnlineService diff --git a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysUserServiceImpl.java b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysUserServiceImpl.java index f6aace5..3232ac6 100644 --- a/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysUserServiceImpl.java +++ b/zemi-master/zemi-system/src/main/java/com/inspur/system/service/impl/SysUserServiceImpl.java @@ -34,7 +34,7 @@ import com.inspur.system.service.ISysUserService; /** * 用户 业务层处理 * - * @author ruoyi + * @author inspur */ @Service public class SysUserServiceImpl implements ISysUserService diff --git a/zemi-ui/README.md b/zemi-ui/README.md index 00c0ab8..ca076e0 100644 --- a/zemi-ui/README.md +++ b/zemi-ui/README.md @@ -2,10 +2,10 @@ ```bash # 克隆项目 -git clone https://gitee.com/y_project/RuoYi-Vue +git clone http://117.73.12.23:43000/TuringsMachine/zemi.git # 进入项目目录 -cd ruoyi-ui +cd zemi-ui # 安装依赖 npm install diff --git a/zemi-ui/package.json b/zemi-ui/package.json index 963a734..0e0a9d1 100644 --- a/zemi-ui/package.json +++ b/zemi-ui/package.json @@ -1,8 +1,8 @@ { - "name": "ruoyi", + "name": "zemi", "version": "3.8.8", - "description": "若依管理系统", - "author": "若依", + "description": "ZEMI管理系统", + "author": "INSPUR", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", @@ -33,7 +33,7 @@ ], "repository": { "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Vue.git" + "url": "http://117.73.12.23:43000/TuringsMachine/zemi.git" }, "dependencies": { "@riophae/vue-treeselect": "0.4.0", diff --git a/zemi-ui/public/cse.png b/zemi-ui/public/cse.png new file mode 100644 index 0000000000000000000000000000000000000000..40de80557ad4f9b587edc4f773258d0c0c943784 GIT binary patch literal 44671 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�bdAm9y-9JpCu~D(#FCyzBTdVrg}kI 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%0Aw~Z^$THAZ*hzDox$PCpGaItc+op+Vh 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 z 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 - + <%= webpackConfig.name %>