Commit Graph

143 Commits

Author SHA1 Message Date
zyj
80b44576be Merge remote-tracking branch 'upstream/master' 2024-06-19 18:13:26 +08:00
RuoYi
cc0efa3330 优化代码 2024-05-29 14:48:23 +08:00
RuoYi
f46b1bbebd 限制用户操作数据权限范围 2024-05-29 14:48:03 +08:00
zyj
a2120cd938 Merge remote-tracking branch 'upstream/master' 2024-03-22 14:13:11 +08:00
RuoYi
50339c6f73 update copyright 2024 2024-03-11 10:47:55 +08:00
zyj
029826308b Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
#	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
#	sql/ry_20231130.sql
2023-12-13 15:31:38 +08:00
RuoYi
36b900cef8 若依 3.8.7 2023-12-08 09:03:30 +08:00
RuoYi
2253a146b3 update fastjson2 2023-12-05 10:48:22 +08:00
RuoYi
f74454b61a 删除无用的实例演示开关配置 2023-12-05 10:44:50 +08:00
RuoYi
e6d0599b25 优化个人中心/基本资料修改时数据显示问题 2023-11-28 12:36:30 +08:00
张利
fbab383bd7
update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java.
此处新密码加密了两次,多余的操作,且会导致新生成的数据库密码与缓存中的密码不同,如果修改的不对还请讲解回复下,谢谢。

Signed-off-by: 张利 <zhangli_wei555@163.com>
2023-11-02 02:57:04 +00:00
zyj
d78982d162 Merge remote-tracking branch 'upstream/master' 2023-08-17 14:23:09 +08:00
RuoYi
c5e4459bb8 优化代码 2023-08-15 11:30:49 +08:00
RuoYi
ab99a72b65 优化代码 2023-08-14 19:11:13 +08:00
RuoYi
68ac40eda9 update maven-plugin 2023-08-14 17:41:52 +08:00
zyj
b9ddcac8f5 Merge remote-tracking branch 'upstream/master' 2023-07-05 09:56:16 +08:00
RuoYi
6a811d9824 若依 3.8.6 2023-06-30 08:43:54 +08:00
zyj
3f0824bd0f Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
2023-06-29 10:15:37 +08:00
RuoYi
5db610d16f optimized code 2023-06-28 21:31:25 +08:00
RuoYi
afe2852bbb update banner.txt 2023-06-24 14:48:54 +08:00
若依
51990695f5
!729 update ruoyi-admin/src/main/resources/application.yml.
Merge pull request !729 from WhiskyZulu/N/A
2023-06-24 02:15:34 +00:00
WhiskyZulu
67ba621db6
update ruoyi-admin/src/main/resources/application.yml.
注释不太对,“数组计算”改为“数字计算”

Signed-off-by: WhiskyZulu <a913681304@qq.com>
2023-06-05 01:44:12 +00:00
万河
05feef34c7
update ruoyi-admin/src/main/resources/banner.txt.
线条填歪了,看着难受

Signed-off-by: 万河 <12894283+science-01@user.noreply.gitee.com>
2023-05-18 08:53:14 +00:00
zyj
ec79ceb1dc Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
2023-02-23 10:37:42 +08:00
RuoYi
96ba768f50 优化代码 2023-02-21 18:02:00 +08:00
RuoYi
1268637e58 支持登录IP黑名单限制 2023-02-21 09:00:44 +08:00
zyj
a6b68784ee Merge remote-tracking branch 'upstream/master' 2023-02-09 19:34:31 +08:00
RuoYi
eb96afee64 连接池Druid支持新的配置connectTimeout和socketTimeout 2023-02-04 22:25:49 +08:00
“zyj”
6e2d5a8cc8 Merge remote-tracking branch 'upstream/master' 2023-01-03 11:29:30 +08:00
RuoYi
c3a727b2fd 若依 3.8.5 2023-01-01 09:09:25 +08:00
“zyj”
b3cbcead9e Merge remote-tracking branch 'upstream/master' 2022-12-13 16:39:16 +08:00
RuoYi
9748e10339 升级druid到最新版本1.2.15 2022-12-07 11:41:44 +08:00
“zyj”
64b8ca3b49 Merge remote-tracking branch 'upstream/master' 2022-11-07 12:42:36 +08:00
RuoYi
ebb9f15a75 新增返回警告消息提示 2022-10-30 12:02:06 +08:00
“zyj”
04ed7db8f4 Merge remote-tracking branch 'upstream/master' 2022-09-28 17:24:25 +08:00
RuoYi
e95a1245c5 若依 3.8.4 2022-09-26 08:29:03 +08:00
“zyj”
1bb3a55333 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
2022-09-21 15:16:47 +08:00
RuoYi
854b405d89 修改用户登录账号重复验证 2022-09-18 11:26:03 +08:00
“zyj”
8a9acb3509 Merge remote-tracking branch 'upstream/master' 2022-08-24 13:40:35 +08:00
RuoYi
99d1760b98 优化代码 2022-08-22 15:27:58 +08:00
“zyj”
51d4457dab Merge remote-tracking branch 'upstream/master' 2022-08-22 14:06:09 +08:00
RuoYi
aadb7a41cb 优化Context信息,防止泄漏问题 2022-08-22 10:24:20 +08:00
RuoYi
9b3767a954 优化多角色数据权限匹配规则 2022-08-21 22:53:57 +08:00
“zyj”
0be84af484 Merge remote-tracking branch 'upstream/master' 2022-08-17 16:31:58 +08:00
RuoYi
893ef39401 防止用户个人信息修改部门 2022-08-12 12:16:30 +08:00
RuoYi
890ad682d7 优化修改资料头像被覆盖的问题(I5LK04) 2022-08-11 13:22:55 +08:00
iacker
3f7bf545b5
fix: 账户解锁接口去掉多余的 / 2022-08-08 13:55:08 +00:00
“zyj”
7badeaf476 Merge remote-tracking branch 'upstream/master' 2022-08-08 15:40:24 +08:00
RuoYi
cbedec7ca6 登录日志新增解锁账户功能 2022-08-08 09:23:52 +08:00
“zyj”
39e7f7f735 Merge remote-tracking branch 'upstream/master' 2022-08-03 16:04:44 +08:00