疯狂的狮子li
|
568e2a9337
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
2022-02-24 15:30:20 +08:00 |
|
疯狂的狮子Li
|
77756eb08d
|
!146 无符号算数验证码两个随机数生成相同概率较高问题
Merge pull request !146 from tmjAccount/dev
|
2022-02-24 05:09:37 +00:00 |
|
佟明键
|
8b097af195
|
update 优化随机数生成方式 避免容易生成两个相同随机数的问题
|
2022-02-24 12:39:28 +08:00 |
|
疯狂的狮子li
|
81ff77c2d5
|
update 调整用户登录 将日志调整到最后 防止获取不到用户警告
|
2022-02-24 10:02:47 +08:00 |
|
RuoYi
|
bb65cd1976
|
代码生成子表支持日期/字典配置
|
2022-02-24 09:28:51 +08:00 |
|
若依
|
1086c00929
|
!436 优化部门管理页面email字段的表单验证多余的单引号
Merge pull request !436 from lu_ming/master
|
2022-02-23 12:46:09 +00:00 |
|
“lumingsyc”
|
9aaa9ce8aa
|
优化部门管理页面email字段的表单验证多余的单引号
|
2022-02-23 20:00:47 +08:00 |
|
RuoYi
|
cb5a6d29e2
|
页面若未匹配到字典标签则返回原字典值
|
2022-02-23 16:55:09 +08:00 |
|
RuoYi
|
4d8bd8805b
|
优化个人中心页面email字段的表单验证多余的单引号
|
2022-02-23 16:54:59 +08:00 |
|
疯狂的狮子Li
|
d9b9f0b3d3
|
fix 修复测试账号 邮箱重复导致的问题
|
2022-02-22 21:37:48 +08:00 |
|
RuoYi
|
c8c57b545a
|
优化菜单关键字导致的插件报错问题
|
2022-02-22 19:10:34 +08:00 |
|
RuoYi
|
d0f7a317e4
|
定时任务默认保存到内存中执行
|
2022-02-22 19:10:21 +08:00 |
|
疯狂的狮子li
|
3517a8f494
|
update 优化 R 默认返回 msg
|
2022-02-22 14:03:53 +08:00 |
|
RuoYi
|
aa9ed2e863
|
修复分页组件请求两次问题
|
2022-02-21 15:21:16 +08:00 |
|
疯狂的狮子li
|
075f7fc19e
|
update 增加 用户注册 用户类型默认值
|
2022-02-21 10:53:59 +08:00 |
|
疯狂的狮子li
|
ea7ea2ec59
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-02-21 10:40:35 +08:00 |
|
疯狂的狮子li
|
64b183da36
|
update 增加用户登出日志
|
2022-02-21 10:40:28 +08:00 |
|
RuoYi
|
54c6c4e547
|
服务监控新增运行参数信息显示
|
2022-02-20 16:06:33 +08:00 |
|
RuoYi
|
986b48cf36
|
升级pagehelper到最新版1.4.1
|
2022-02-20 16:05:04 +08:00 |
|
RuoYi
|
3bb9b03add
|
升级spring-boot-mybatis到最新版2.2.2
|
2022-02-20 16:04:40 +08:00 |
|
RuoYi
|
f05aa674ab
|
升级oshi到最新版本6.1.2
|
2022-02-20 16:04:25 +08:00 |
|
若依
|
965bdc9986
|
!431 修改登录超时刷新页面跳转登录页面还提示重新登录问题
Merge pull request !431 from 也曾为你、像超人/master
|
2022-02-19 09:08:50 +00:00 |
|
疯狂的狮子Li
|
edce19e406
|
update 更新 多用户多设备的注释说明
|
2022-02-19 16:16:48 +08:00 |
|
疯狂的狮子Li
|
1687f20760
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-02-19 16:16:20 +08:00 |
|
konbai
|
2917d335bc
|
update 优化 是否为管理员的判断
|
2022-02-19 16:15:44 +08:00 |
|
疯狂的狮子Li
|
30e90619f5
|
update 更新微信商家二维码
|
2022-02-18 13:39:02 +00:00 |
|
疯狂的狮子Li
|
d53dc28b83
|
!141 修正 StringUtils.format() 注释错误问题
Merge pull request !141 from KonBAI/fix_StringUtils_Note
|
2022-02-18 08:49:34 +00:00 |
|
hewenqiang
|
3446b38cbb
|
update 修正 StringUtils.format() 注释错误问题
|
2022-02-18 16:18:38 +08:00 |
|
疯狂的狮子li
|
bb793d71e7
|
fix 修复 minio 适配 https 导致的问题
|
2022-02-18 14:05:32 +08:00 |
|
疯狂的狮子li
|
587fb27484
|
add 增加页面更新说明
|
2022-02-18 10:38:03 +08:00 |
|
疯狂的狮子li
|
7f305962f2
|
发布 4.0.0
|
2022-02-18 10:31:13 +08:00 |
|
疯狂的狮子li
|
f6edb48df9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-ui/src/components/Pagination/index.vue
|
2022-02-18 09:57:51 +08:00 |
|
积硅步，至千里
|
e793138031
|
修改登录超时刷新页面跳转登录页面还提示重新登录问题
|
2022-02-17 17:16:11 +08:00 |
|
疯狂的狮子li
|
5c2992ef16
|
update 去除编译器警告 规范写法
|
2022-02-17 14:02:06 +08:00 |
|
RuoYi
|
d734bfc34f
|
修复分页组件请求两次问题(I4SQOR)
|
2022-02-17 11:56:11 +08:00 |
|
疯狂的狮子li
|
86d5a1d190
|
update 更新 所有 oss 均支持 https 配置
|
2022-02-17 10:31:52 +08:00 |
|
疯狂的狮子li
|
cb713e32d3
|
fix 修复 insertOrUpdateBatch 获取模板错误
|
2022-02-16 16:54:19 +08:00 |
|
疯狂的狮子Li
|
84fe0737de
|
update 更新uuid去除默认值 漏改
|
2022-02-16 08:53:11 +00:00 |
|
疯狂的狮子li
|
4ea636366d
|
update 优化代码生成 使用新 JsonUtils.parseMap 方法
|
2022-02-15 17:32:33 +08:00 |
|
疯狂的狮子li
|
54f5b59c8c
|
update 优化代码生成 使用新 JsonUtils.parseMap 方法
|
2022-02-15 12:07:56 +08:00 |
|
疯狂的狮子li
|
657b6a9fae
|
update 使用 hutool Dict 优化 JsonUtils 防止类型解析异常
|
2022-02-15 12:07:20 +08:00 |
|
疯狂的狮子li
|
6c01241b96
|
fix 回滚代码生成部分优化 修复优化导致的问题
|
2022-02-15 11:07:50 +08:00 |
|
疯狂的狮子li
|
961073ec96
|
update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id
|
2022-02-15 10:45:04 +08:00 |
|
疯狂的狮子li
|
e2b786d97b
|
update 更新 swagger 配置类错误注释
|
2022-02-14 18:30:26 +08:00 |
|
疯狂的狮子li
|
2fbf9ab7be
|
fix 修复因升级 sa-token 导致 doLogin 无法获取 token 问题
|
2022-02-14 17:29:43 +08:00 |
|
疯狂的狮子li
|
68a23c4918
|
update 优化代码生成
|
2022-02-14 16:02:22 +08:00 |
|
疯狂的狮子li
|
b49dbcdbbe
|
update 修改验证码校验 增加 uuid 空判断
|
2022-02-14 14:31:57 +08:00 |
|
疯狂的狮子li
|
ee2f74dc5e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
.gitignore
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.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/SysDictDataServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.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/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/components/FileUpload/index.vue
ruoyi-ui/src/views/tool/build/index.vue
|
2022-02-14 14:27:13 +08:00 |
|
RuoYi
|
81630a096f
|
代码生成同步保留必填/类型选项
|
2022-02-13 21:06:28 +08:00 |
|
RuoYi
|
21780d8106
|
优化代码
|
2022-02-13 21:06:18 +08:00 |
|