Commit Graph

240 Commits

Author SHA1 Message Date
weiweiw 511fc3e312 将所有delete 方法修改为post 2024-11-08 15:15:11 +08:00
jiang 2a8f87024b 用户登录问题修改 2024-11-07 16:52:26 +08:00
jiang b428ef318e 用户登录问题修改 2024-11-07 15:04:22 +08:00
weiweiw 59dc67b8d4 完善日志备份功能 2024-11-07 15:00:44 +08:00
weiweiw 7addd31f7a Merge branch 'refs/heads/dev'
# Conflicts:
#	bonus-auth/src/main/java/com/bonus/auth/service/SysPasswordService.java
2024-11-07 09:11:04 +08:00
weiweiw 8a123a2549 增加登录成功和注册成功及登出成功的日志,修复 2024-11-07 09:01:17 +08:00
jiang a39bc3dff2 用户登录问题修改 2024-11-06 20:57:00 +08:00
jiang d2e68d6228 Merge remote-tracking branch 'origin/main' 2024-11-06 20:56:40 +08:00
jiang 4311a41e50 用户登录问题修改 2024-11-06 20:56:19 +08:00
weiweiw c43a4fbf98 将所有PUT 方法修改为post,并对部门实体里的邮箱和电话号码进行加密存储 2024-11-06 13:45:53 +08:00
weiweiw 23beb395b3 将所有delete 方法修改为post 2024-11-06 12:00:41 +08:00
weiweiw 08712930c4 merge 2024-11-06 10:13:15 +08:00
jiang d57ab0ea5c 用户登录问题修改 2024-11-06 09:06:56 +08:00
weiweiw 4437989842 增加用户邮箱和手机号码加密存储功能 2024-11-06 08:45:37 +08:00
jiang 52b76ca87e Merge remote-tracking branch 'origin/main' 2024-11-05 14:44:58 +08:00
jiang 6561e01856 用户登录问题修改 2024-11-05 14:44:39 +08:00
sxu 5fcd300883 优化组织人员树 2024-11-04 15:39:32 +08:00
weiweiw ca002de02b 提交漏交的文件 2024-11-04 10:14:32 +08:00
weiweiw c3786088c1 提交漏交的文件 2024-11-04 10:05:43 +08:00
sxu c21bed507d 优化组织人员树 2024-11-01 16:13:34 +08:00
sxu 1fa5d82fda 优化组织人员树 2024-11-01 16:05:57 +08:00
weiweiw 5a17972438 提交漏交的文件 2024-10-31 11:30:53 +08:00
weiweiw 4a776d2002 提交漏交的文件 2024-10-31 10:16:31 +08:00
weiweiw 16065505da 文件存储服务传入的url要先base64编码再URI编码 2024-10-31 08:52:07 +08:00
weiweiw 6534f80958 Merge remote-tracking branch 'origin/main' 2024-10-29 15:52:29 +08:00
weiweiw 29f7b885da 提交漏交的文件 2024-10-29 15:52:21 +08:00
sxu e5d97e1a1f Merge remote-tracking branch 'origin/main' 2024-10-29 15:00:50 +08:00
sxu 46320ff428 配置文件 2024-10-29 15:00:28 +08:00
jiang 1c04ab1602 用户登录问题修改 2024-10-29 14:17:22 +08:00
weiweiw 48d410a8b7 解决前两次的提交冲突 2024-10-28 11:29:39 +08:00
lizhenhua 5f786cd3db Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
2024-10-28 10:59:07 +08:00
lizhenhua 68662e56e1 漏洞修复 2024-10-28 10:55:53 +08:00
sxu cffcc9e372 数据字典重复值问题 2024-10-25 13:15:46 +08:00
mashuai ac50102555 组织人员树修改 2024-10-24 18:07:54 +08:00
mashuai b555eb2773 组织人员树修改 2024-10-24 15:31:46 +08:00
sxu 57b2a2f880 根据用户编号列表获取用户列表 2024-10-23 11:22:53 +08:00
sxu 1c836296c7 根据用户编号列表获取用户列表 2024-10-23 10:44:28 +08:00
sxu 39b236b6de 数据字典重复值问题 2024-10-21 19:45:05 +08:00
sxu e5b11cb932 数据字典重复值问题 2024-10-17 11:53:43 +08:00
sxu 40931cd52b 部门人员树 2024-10-16 17:46:19 +08:00
sxu 7a11f91e0d 部门人员树 2024-10-16 17:34:11 +08:00
sxu e7ac7bdae0 24.10.0-SNAPSHOT 2024-10-16 15:07:11 +08:00
sxu a45180e16d 数据字典重复值问题 2024-10-16 15:03:48 +08:00
sxu c2bee1ceb9 部门人员树 2024-10-16 12:48:29 +08:00
weiweiw 2173dbfb42 Merge remote-tracking branch 'origin/main' 2024-10-16 09:55:55 +08:00
jiang aa83d449fb 用户登录问题修改 2024-10-16 09:25:31 +08:00
weiweiw 4063d1c3c7 给菜单增加系统类型,并增加根据用户和系统类型返回菜单树的接口 2024-10-16 08:07:20 +08:00
weiweiw cc0f108d2b 升级版本至24.9.0 2024-10-08 13:09:01 +08:00
weiweiw 12a7c2638a 提交漏交的文件 2024-09-29 13:42:24 +08:00
weiweiw fc121c14db 解决本地服务器上传包括空格的文件上传后下载不了的问题 2024-09-27 18:23:18 +08:00
weiweiw 689f0a5155 delete unused file 2024-09-27 18:00:05 +08:00
weiweiw bf283bff4e 完善文件上传服务 2024-09-27 17:44:36 +08:00
sxu b2832a55f2 增加仓储管理配置文件 2024-09-27 14:08:56 +08:00
weiweiw 25872802bc 将本地启动配置文件拆分,方便各环境参数维护,同时增加knife4j的支持 2024-09-27 13:26:44 +08:00
weiweiw 28103703fe 修复本地服务上传中文名下载不了的问题 2024-09-26 13:00:45 +08:00
weiweiw a10cd6db85 完善内部接口 2024-09-25 14:25:46 +08:00
weiweiw ba5616e5c8 完善文件上传存储服务 2024-09-25 09:02:22 +08:00
weiweiw e59cffb388 update version to 24.9.0-snapshot 2024-09-24 08:31:20 +08:00
weiweiw dc7a51eba6 提交漏交的文件 2024-09-20 17:54:47 +08:00
weiweiw bb7a21a8c0 增加javaDoc注释 2024-09-20 16:07:43 +08:00
weiweiw c436674445 修改增加顶级公司 不校验部门名称唯一性的问题 2024-09-20 09:23:40 +08:00
weiweiw 7adc846c3a 重构文件存储服务 2024-09-19 16:54:13 +08:00
weiweiw 2bcedea253 修复漏洞问题 2024-09-19 16:53:25 +08:00
jiang 12bd9c20c3 用户登录问题修改 2024-09-13 15:58:13 +08:00
weiweiw 6c44d9db05 增加bonus-system内部接口 2024-09-12 18:01:29 +08:00
jiang 2de7f812ce 用户登录问题修改 2024-09-10 18:02:03 +08:00
weiweiw 9fb868b93b 配置文件加密 2024-09-09 11:29:24 +08:00
jiang 485cca00c5 用户登录问题修改 2024-09-09 09:32:10 +08:00
jiang d192646d04 用户登录问题修改 2024-09-08 20:12:44 +08:00
weiweiw b200f2a4b4 修复UT问题和回滚bonus_system的logback文件 2024-09-03 07:59:02 +08:00
weiweiw 7ca683ab04 根据评审意见完善excel,word 和pdf的工具类 2024-08-27 14:10:55 +08:00
weiweiw ae35f350bf 去掉人工智能平台的代码 2024-08-16 16:28:05 +08:00
weiweiw 76d3f3083d 修复漏洞问题 2024-08-16 16:26:59 +08:00
weiweiw b7b93e7d7b 修改bonus-cloud版本为24.7.1 2024-08-13 17:09:43 +08:00
jiang b0cdb30386 Merge remote-tracking branch 'origin/main' 2024-08-09 17:40:13 +08:00
jiang e3fa18fbcd 数据加密和完整性校验 2024-08-09 17:40:00 +08:00
lizhenhua 61f8f72ebd 漏洞修复 2024-08-09 17:29:43 +08:00
lizhenhua d9c7e7bcd4 漏洞修复 2024-08-09 15:48:22 +08:00
lizhenhua 7fe2bce7dd 漏洞修复 2024-08-09 15:37:06 +08:00
jiang 10612821d4 数据加密和完整性校验 2024-08-08 15:10:36 +08:00
weiweiw 00a653222a 解决安全漏洞 2024-08-01 13:30:44 +08:00
jiang d991c59ba7 bug 修改 2024-07-31 15:06:34 +08:00
jiang fb226e657a bug 修改 2024-07-29 19:22:17 +08:00
lizhenhua 5f53206f33 日志备份功能 2024-07-29 19:20:13 +08:00
lizhenhua 58043280ee 日志备份功能 2024-07-29 11:22:18 +08:00
lizhenhua 0b379e05b1 日志备份功能 2024-07-28 13:22:44 +08:00
weiweiw a911e8b162 rollback 'system_type' from menu class 2024-07-26 14:57:42 +08:00
lizhenhua 08148ce5f2 日志备份功能 2024-07-25 14:32:23 +08:00
lizhenhua 954452de23 日志备份功能 2024-07-25 12:08:22 +08:00
lizhenhua 50eb6fc523 日志备份功能 2024-07-24 20:03:48 +08:00
lizhenhua 9bbf314865 Merge remote-tracking branch 'origin/main' into main 2024-07-24 19:26:42 +08:00
lizhenhua 27960bf472 日志备份功能 2024-07-24 19:26:35 +08:00
jiang 043286a981 数据加解密和完整性校验 2024-07-24 18:07:12 +08:00
lizhenhua 998a4a0ee8 Merge remote-tracking branch 'origin/main' into main 2024-07-24 16:08:03 +08:00
lizhenhua 4c25f7d7fa 日志备份功能 2024-07-24 16:07:12 +08:00
jiang 5edaf204f6 数据加解密和完整性校验 2024-07-24 10:50:53 +08:00
lizhenhua 9d567dea7a Merge remote-tracking branch 'origin/main' into main 2024-07-22 17:30:24 +08:00
jiang edbf8a0a37 web端登录 2024-07-22 15:31:52 +08:00
lizhenhua 8751556797 日志备份功能 2024-07-22 14:07:22 +08:00
lizhenhua fdb511e9f5 日志备份功能 2024-07-22 14:07:16 +08:00
weiweiw e5e6235bae swagger and encrypt 2024-07-19 18:36:01 +08:00
lizhenhua 0022bd1b3a 日志功能 2024-07-18 20:36:05 +08:00
weiweiw 57616bce02 swagger for bonus-auth 2024-07-17 20:18:11 +08:00
weiweiw 4a3213cd5f update log management 2024-07-17 16:21:40 +08:00
tjxt 93a4b26947 '修改日志管理的operType和fruit字段' 2024-07-17 14:29:23 +08:00
weiweiw 90f8a73100 Merge remote-tracking branch 'origin/main' 2024-07-16 19:21:56 +08:00
weiweiw 7591ed081c add log management 2024-07-16 19:21:50 +08:00
jiang 45417dd0ec 文件存储服务 2024-07-16 16:15:33 +08:00
weiweiw c22819d863 fix sonar issue 2024-07-09 14:01:35 +08:00
tjxt 4500ae3dac "fix__修复不符合阿里代码规范的相关代码" 2024-07-09 13:02:42 +08:00
weiweiw 719ea193df update database 2024-07-05 17:11:20 +08:00
jiang bbf47b7043 文件存储服务 2024-07-05 10:35:30 +08:00
jiang d5acac245a 文件存储服务 2024-07-05 10:29:09 +08:00
jiang f3f36e4be7 Merge remote-tracking branch 'origin/main' 2024-07-05 10:16:42 +08:00
weiweiw 3179cc57ee fix the error of ali coding specification 2024-07-05 09:13:22 +08:00
weiweiw 65f2afd201 remove bonus-ui to http://192.168.0.56:3000/bonus/bonus-ui.git 2024-07-04 13:36:21 +08:00
weiweiw 5dc80ec2a6 merge code for log and encryption and desccryption 2024-07-04 13:29:29 +08:00
weiweiw bf7a3e2750 merge code for log and encryption and desccryption 2024-07-03 19:12:06 +08:00
jiang e4ede36d6e obs文件存储服务 2024-06-28 10:07:14 +08:00
jiang 8d9fd8020f obs文件存储服务 2024-06-28 10:06:47 +08:00
paulch c58ef815f3 rename module names 2024-06-26 14:54:46 +08:00
paulch bbf7e9e320 add <distributionManagement> 2024-06-26 12:51:41 +08:00
jiang 166a36c7b6 文件存储服务 2024-06-26 10:42:08 +08:00
jiang b5f03d1c1a MongoDB文件存储服务 2024-06-21 13:17:46 +08:00
jiang ea9b998c46 Obs文件存储服务 2024-06-21 13:16:40 +08:00
jiang f9b6ffa9cc oss文件存储服务 2024-06-21 13:16:11 +08:00
weiweiw d86ddfaefe Delete bonus-modules/bonus-file/src/main/java/com/bonus/file/.DS_Store 2024-06-17 18:13:03 +08:00
weiweiw 54edf89ce4 Delete bonus-modules/bonus-file/src/main/java/com/bonus/.DS_Store 2024-06-17 18:12:56 +08:00
weiweiw 3a068abcff Delete bonus-modules/bonus-file/src/main/java/com/.DS_Store 2024-06-17 18:12:50 +08:00
weiweiw 2b463fe960 Delete bonus-modules/bonus-file/src/main/java/.DS_Store 2024-06-17 18:12:39 +08:00
weiweiw 3e384e5dc0 Delete bonus-modules/bonus-file/src/main/.DS_Store 2024-06-17 18:12:23 +08:00
weiweiw 3e1a018415 Delete bonus-modules/bonus-file/src/.DS_Store 2024-06-17 18:11:26 +08:00
weiweiw 3b59974bd5 文件存储服务下载和删除 2024-06-17 18:08:00 +08:00
weiweiw 2fc7032a79 Merge remote-tracking branch 'origin/main' 2024-06-17 18:04:44 +08:00
weiweiw ff14f6f573 增加本地服务器文件上传和下载接口 2024-06-17 18:04:38 +08:00
jiang 7f7cee2453 oss文件存储服务 2024-06-17 17:49:44 +08:00
weiweiw ca1f727bf1 修改配置为内网的nacos,redis,mysql和sentinel配置 2024-06-11 11:08:45 +08:00
weiweiw e7a0e376ac 修改配置为内网的nacos,redis,mysql和sentinel配置 2024-06-05 09:07:02 +08:00
paulch 935f2cbfab rename ruoyi to bonus for packages 2024-06-04 14:45:40 +08:00
paulch f2d97ae08d Init version 2024-06-04 14:16:31 +08:00