疯狂的狮子li
|
b87aeb9b95
|
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
|
2022-01-21 10:30:39 +08:00 |
|
疯狂的狮子li
|
3600875707
|
update 优化 代码生成 字段更新未同步
|
2022-01-17 15:49:34 +08:00 |
|
疯狂的狮子li
|
8052d75957
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-admin/src/main/resources/application.yml
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/register.vue
|
2022-01-17 15:48:09 +08:00 |
|
疯狂的狮子li
|
a43e6e06e0
|
update 优化多用户体系处理 更名 LoginUtils 为 LoginHelper 支持 LoginUser 多级缓存
|
2022-01-17 12:03:15 +08:00 |
|
phanes
|
868942e202
|
update 格式化代码结构 统一编码格式
|
2022-01-16 17:46:24 +08:00 |
|
RuoYi
|
b1b82857ba
|
优化字段更新未同步
|
2022-01-14 11:46:05 +08:00 |
|
疯狂的狮子li
|
f9129bd54e
|
update 代码生成调整 删除无用导报与逻辑
|
2022-01-13 15:23:17 +08:00 |
|
疯狂的狮子li
|
6ca8535166
|
Merge remote-tracking branch 'origin/satoken' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
# ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
2022-01-13 11:14:33 +08:00 |
|
疯狂的狮子li
|
8f6484e470
|
[重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖
|
2022-01-12 21:22:26 +08:00 |
|
疯狂的狮子li
|
dd37247e65
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
# ruoyi-common/pom.xml
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
# ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
|
2021-12-27 09:50:42 +08:00 |
|
疯狂的狮子li
|
295cd3670f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
|
2021-12-27 09:30:12 +08:00 |
|
RuoYi
|
e4df0c6da1
|
优化代码生成字典组重复问题
|
2021-12-24 14:51:33 +08:00 |
|
疯狂的狮子li
|
3f97d19381
|
update [重磅更新] 重构分页 简化使用
|
2021-12-15 13:29:54 +08:00 |
|
疯狂的狮子Li
|
317f6d5c87
|
fix 修复代码生成 sql异常 屏蔽代码生成数据权限过滤
|
2021-12-14 23:47:59 +08:00 |
|
疯狂的狮子li
|
e763381186
|
update [重磅更新] 登录流程升级 支持缓存
|
2021-12-03 18:46:49 +08:00 |
|
疯狂的狮子li
|
5ba39c0086
|
update 重构分页 基于 分页新方法
|
2021-12-03 15:57:58 +08:00 |
|
疯狂的狮子li
|
7eedf37149
|
update 优化 pr !118 代码结构
|
2021-12-02 18:47:18 +08:00 |
|
zendwang
|
ac38f7b909
|
fix 为Transactional注解设置rollback属性
|
2021-12-02 18:34:49 +08:00 |
|
疯狂的狮子li
|
42295ef2ac
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
# ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
# ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
|
2021-11-29 13:56:25 +08:00 |
|
疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
# ruoyi-generator/src/main/resources/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.js
# ruoyi-ui/src/store/modules/permission.js
# ruoyi-ui/src/store/modules/settings.js
# ruoyi-ui/src/store/modules/tagsView.js
# ruoyi-ui/src/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.vue
# ruoyi-ui/src/views/system/user/index.vue
# ruoyi-ui/src/views/system/user/profile/resetPwd.vue
# ruoyi-ui/src/views/system/user/profile/userAvatar.vue
# ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
2021-11-25 19:39:53 +08:00 |
|
Ricky
|
64f6a69d9a
|
修复代码生成复选框字典遗漏问题
|
2021-11-25 13:54:49 +08:00 |
|
RuoYi
|
16734b1d88
|
升级velocity到最新版本2.3
|
2021-11-24 15:03:04 +08:00 |
|
疯狂的狮子li
|
8a93371baa
|
remove 移除 feign 相关代码与依赖
|
2021-11-03 15:02:29 +08:00 |
|
疯狂的狮子li
|
695cb6d76b
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
# ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
|
2021-10-27 13:16:19 +08:00 |
|
疯狂的狮子li
|
284f47e76c
|
update 代码生成 改为生成抽象实体
|
2021-10-15 16:19:51 +08:00 |
|
疯狂的狮子li
|
a6fb88d74c
|
update [重大更新]全业务 增加 接口文档注解 格式化代码
|
2021-10-15 15:19:42 +08:00 |
|
疯狂的狮子li
|
f38d7811e3
|
update 优化 代码生成常量 关于 BO VO 注释
|
2021-09-28 18:26:32 +08:00 |
|
疯狂的狮子li
|
c7071752a7
|
update 优化代码生成 导入表 列表返回 主键默认选中
|
2021-09-28 18:26:30 +08:00 |
|
疯狂的狮子li
|
e2de22bdce
|
update 优化 代码生成常量 关于 BO VO 注释
|
2021-09-28 18:26:08 +08:00 |
|
疯狂的狮子li
|
5382a2a15e
|
update 优化代码生成 导入表 列表返回 主键默认选中
|
2021-09-28 18:23:43 +08:00 |
|
疯狂的狮子li
|
553c29ab8a
|
update 整合 satoken 权限、鉴权一体化框架
|
2021-09-23 19:13:58 +08:00 |
|
疯狂的狮子li
|
e9b0289eff
|
update 优化代码生成 根据MP生成特性 调整导入表结构默认值合理化
|
2021-09-22 11:09:42 +08:00 |
|
疯狂的狮子li
|
2f18d0d709
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-09-18 16:01:52 +08:00 |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
2021-09-17 15:36:54 +08:00 |
|
疯狂的狮子li
|
ab9bc35f9f
|
update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理
|
2021-09-02 15:45:57 +08:00 |
|
youjie
|
b71e8970fe
|
update 优化生成的业务名
|
2021-08-26 11:59:05 +08:00 |
|
疯狂的狮子li
|
0014be5242
|
update 优化代码生成 导入与同步 批处理效率
|
2021-08-26 10:23:01 +08:00 |
|
疯狂的狮子li
|
52d0d62c35
|
update 同步 ruoyi 适配改动
|
2021-08-17 10:45:01 +08:00 |
|
疯狂的狮子li
|
d3abd6c96e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/components/Breadcrumb/index.vue
|
2021-08-17 10:38:07 +08:00 |
|
RuoYi
|
03cf98d3c9
|
优化异常信息
|
2021-08-16 16:25:25 +08:00 |
|
疯狂的狮子li
|
c813046594
|
update 日常校验 统一重构到 StringUtils 便于维护扩展
|
2021-08-02 19:28:41 +08:00 |
|
疯狂的狮子li
|
f8ab5663ef
|
update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
|
2021-08-02 12:15:14 +08:00 |
|
疯狂的狮子li
|
cfdeada3fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/i18n/messages.properties
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/service.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/utils/zipdownload.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-08-02 11:21:09 +08:00 |
|
RuoYi
|
a1cc346aca
|
优化代码生成模板
|
2021-07-30 21:50:47 +08:00 |
|
疯狂的狮子li
|
5dbf39beee
|
update service 统一使用 ServicePlusImpl
|
2021-07-28 14:22:58 +08:00 |
|
疯狂的狮子li
|
83cc800e97
|
update 多bo合并 使用分组校验 生成bo代码
|
2021-07-26 13:12:56 +08:00 |
|
疯狂的狮子li
|
90d4fd8cf1
|
update [重大改动] 重写VO转换 支持深拷贝 将VO类抽象到 ServicePlus 泛型处理
|
2021-07-24 21:19:05 +08:00 |
|
疯狂的狮子li
|
3aaf4e2384
|
fix 回滚代码生成器 批处理优化(字段内容不一致, 不适合批处理)
|
2021-07-19 14:18:38 +08:00 |
|
疯狂的狮子li
|
1891dbc566
|
fix 代码生成 queryType 重复勾选数据库无默认值问题
|
2021-07-19 10:04:56 +08:00 |
|
疯狂的狮子li
|
15c45eae11
|
fix 修复代码生成同步表结构id冲突问题
|
2021-07-13 13:08:47 +08:00 |
|