Commit Graph

126 Commits (3374ec86868bdd8907d00c56efa793fb17ed87e6)

Author SHA1 Message Date
Tony 94eb038184 Merge remote-tracking branch 'refs/remotes/ruoyi/master'
# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
2025-04-17 06:32:26 +08:00
RuoYi 698a5198d9 copyright 2025 2025-01-07 10:43:54 +08:00
RuoYi 5e6c917ab0 若依 3.8.9 2024-12-30 08:49:55 +08:00
RuoYi 25fd29c5ea 优化特殊字符密码修改失败问题 2024-12-17 14:27:18 +08:00
RuoYi 52ba823328 优化无用户编号不校验数据权限 2024-11-05 16:23:42 +08:00
RuoYi 4358621473 优化权限更新后同步缓存 2024-10-21 10:24:45 +08:00
Tony a3caeeb2a2 Merge remote-tracking branch 'ruoyi/master' 2024-09-24 08:54:26 +08:00
RuoYi 22a795d041 优化代码 2024-09-08 10:29:41 +08:00
zhuyong 73acc6453c fate: 升级流程设计器,表单设计器 2024-09-05 23:51:27 +08:00
zhuyong 27b56d3a01 Merge remote-tracking branch 'refs/remotes/ruoyi/master'
# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
2024-09-05 22:35:52 +08:00
RuoYi 99e66bf11c 若依 3.8.8 2024-06-30 08:02:22 +08:00
RuoYi cc0efa3330 优化代码 2024-05-29 14:48:23 +08:00
RuoYi f46b1bbebd 限制用户操作数据权限范围 2024-05-29 14:48:03 +08:00
tony f4b69ac55a Merge remote-tracking branch 'ruoyi/master'
# Conflicts:
#	README.md
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
2024-03-12 08:10:01 +08:00
RuoYi 50339c6f73 update copyright 2024 2024-03-11 10:47:55 +08:00
tony 7752a502ac Merge remote-tracking branch 'ruoyi/master'
# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/utils/index.js
#	ruoyi-ui/src/views/index.vue
2023-12-12 16:16:57 +08:00
liming 904728ef59 支持附件上传 2023-12-10 20:46:37 +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
tony 84d107a4af Merge remote-tracking branch 'ruoyi/master'
# Conflicts:
#	README.md
#	ruoyi-ui/src/views/index.vue
2023-09-01 09:49:24 +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
tony c92a2f1c15 Merge remote-tracking branch 'ruoyi/master'
# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/assets/styles/index.scss
#	ruoyi-ui/src/utils/generator/js.js
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
2023-07-12 08:53:31 +08:00
RuoYi 6a811d9824 若依 3.8.6 2023-06-30 08:43:54 +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
tony b5fa2cd283 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2023-02-22 17:36:28 +08:00
RuoYi 96ba768f50 优化代码 2023-02-21 18:02:00 +08:00
RuoYi 1268637e58 支持登录IP黑名单限制 2023-02-21 09:00:44 +08:00
tony e080553f78 feat: 同步至若依最新版 2023-02-10 09:05:38 +08:00
RuoYi eb96afee64 连接池Druid支持新的配置connectTimeout和socketTimeout 2023-02-04 22:25:49 +08:00
tony eddbeefb40 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
2023-01-01 14:01:42 +08:00
RuoYi c3a727b2fd 若依 3.8.5 2023-01-01 09:09:25 +08:00
tony 532f791cc3 feat: 新增流程监听 2022-12-25 14:17:29 +08:00
tony e37577f7fb feat: 流程设计模块更新用户类型 2022-12-13 22:34:34 +08:00
tony 22de6bafc1 feat: 分组流程详情查看 2022-12-12 11:02:24 +08:00
tony ae0226a8f4 feat: flowable前端改造 2022-12-11 21:08:14 +08:00
zhuyong dcbef01709 feat: flowable后端改造 2022-12-11 17:43:31 +08:00
RuoYi 9748e10339 升级druid到最新版本1.2.15 2022-12-07 11:41:44 +08:00
RuoYi ebb9f15a75 新增返回警告消息提示 2022-10-30 12:02:06 +08:00
RuoYi e95a1245c5 若依 3.8.4 2022-09-26 08:29:03 +08:00
RuoYi 854b405d89 修改用户登录账号重复验证 2022-09-18 11:26:03 +08:00
RuoYi 99d1760b98 优化代码 2022-08-22 15:27:58 +08:00