疯狂的狮子li
|
24ebc73ee5
|
Merge remote-tracking branch 'origin/dev' into satoken
|
2021-10-29 09:15:31 +08:00 |
|
疯狂的狮子li
|
d6e080d546
|
发布 v3.3.0
|
2021-10-29 09:14:49 +08:00 |
|
疯狂的狮子li
|
f5f16aac96
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-common/pom.xml
|
2021-10-28 10:56:21 +08:00 |
|
疯狂的狮子li
|
3353ead5d3
|
update 搜索框 更新文本域生成 用于模糊查询
|
2021-10-28 09:45: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
|
b47f8fd784
|
update 代码生成 改为生成抽象实体
|
2021-10-15 16:19:42 +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
|
76a2e7f8e5
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.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-09-28 09:46:56 +08:00 |
|
疯狂的狮子li
|
3f142dd0fa
|
发布 v3.2.0
|
2021-09-28 09:41:37 +08:00 |
|
疯狂的狮子li
|
b082da73a1
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
|
2021-09-27 17:27:32 +08:00 |
|
疯狂的狮子li
|
99dcbe0207
|
update 封装通用下载方法简化下载使用
|
2021-09-27 17:24:37 +08:00 |
|
疯狂的狮子li
|
6f6a3566ac
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# pom.xml
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
|
2021-09-26 17:15:40 +08:00 |
|
疯狂的狮子li
|
125547f08f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
ruoyi-ui/src/views/monitor/server/index.vue
|
2021-09-26 10:05:29 +08:00 |
|
疯狂的狮子Li
|
02ce9868a7
|
fix 自动生成代码漏掉 this.#[[$modal]]#.msgError
|
2021-09-24 05:41:55 +00:00 |
|
疯狂的狮子li
|
553c29ab8a
|
update 整合 satoken 权限、鉴权一体化框架
|
2021-09-23 19:13:58 +08:00 |
|
疯狂的狮子li
|
03b31652a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.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
ruoyi-ui/src/views/tool/gen/importTable.vue
|
2021-09-23 18:53:17 +08:00 |
|
RuoYi
|
fa124aeb8b
|
新增通用方法简化模态/缓存使用
|
2021-09-23 09:57:29 +08:00 |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
2021-09-23 09:38:16 +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 |
|
疯狂的狮子Li
|
9342bbef56
|
fix 修复合并错误
|
2021-09-17 15:39:27 +00:00 |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
2021-09-17 15:36:54 +08:00 |
|
疯狂的狮子li
|
2b53e9d86a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
|
2021-09-17 11:12:43 +08:00 |
|
稚屿
|
dbe3446b63
|
修复后端主子表代码模板方法名生成错误问题
|
2021-09-14 13:53:32 +00:00 |
|
疯狂的狮子li
|
b27a8afc3b
|
fix 修复多主键代码生成bug
|
2021-09-14 12:03:58 +08:00 |
|
hebo
|
c604c2de98
|
fix 代码生成-当表未设置主键时第一个字段重复生成
|
2021-09-13 21:21:19 +08:00 |
|
RuoYi
|
db193a46e8
|
若依 3.7.0
|
2021-09-13 09:36:38 +08:00 |
|
疯狂的狮子li
|
5bb7b0dda5
|
update 优化代码生成 insertByBo 方法 针对返回主键优化
|
2021-09-09 15:24:33 +08:00 |
|
疯狂的狮子li
|
ddf8d6ad6b
|
发布 v3.1.0
|
2021-09-07 13:48:22 +08:00 |
|
疯狂的狮子li
|
36b0ebf54c
|
update 代码生成 查询数据库列表 按照时间倒序
|
2021-09-06 11:08:09 +08:00 |
|
疯狂的狮子li
|
f566c39026
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/views/monitor/job/index.vue
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
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-09-03 10:55:58 +08:00 |
|
xiaoshitou
|
a56bc47a81
|
代码生成: 导入表时查询 新创建表的优先排序在前面
|
2021-09-02 20:01:25 +00:00 |
|
疯狂的狮子li
|
80784433b8
|
remove 移除分页合理化参数 使用 MP 全局配置分页溢出
|
2021-09-02 15:59:42 +08:00 |
|
疯狂的狮子li
|
ab9bc35f9f
|
update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理
|
2021-09-02 15:45:57 +08:00 |
|
疯狂的狮子li
|
76710e453e
|
update 分页合理化
|
2021-09-02 13:46:11 +08:00 |
|
疯狂的狮子li
|
adb31b71f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/notice/index.vue
ruoyi-ui/src/views/system/post/index.vue
|
2021-09-01 09:40:36 +08:00 |
|
马小法
|
c628aa5be8
|
修改代码生成字典回显样式
|
2021-08-30 16:49:30 +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
|
bf86e5979b
|
update 重构 将下载excel工具提取到全局
|
2021-08-24 14:28:20 +08:00 |
|
疯狂的狮子li
|
5f2f4bb7ef
|
add 增加查询校验组
|
2021-08-23 18:17:45 +08:00 |
|
疯狂的狮子li
|
a937e3f268
|
发布 v3.0.0
|
2021-08-18 11:09:14 +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 |
|