lijiahuan
|
0624bfcaf5
|
修复新建跟进记录bug
|
2024-04-09 11:57:26 +08:00 |
|
YunaiV
|
81100929dd
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 19:47:54 +08:00 |
|
YunaiV
|
159de065ff
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
|
2024-04-07 19:40:07 +08:00 |
|
YunaiV
|
909d3309d2
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 19:39:32 +08:00 |
|
YunaiV
|
9ade9686f3
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:59:33 +08:00 |
|
YunaiV
|
a1fb3cf6ed
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-04 09:59:01 +08:00 |
|
YunaiV
|
f869a5718d
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:57:06 +08:00 |
|
YunaiV
|
1aa8e173b1
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2024-04-04 09:49:14 +08:00 |
|
YunaiV
|
87c7b3fac2
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:42:03 +08:00 |
|
YunaiV
|
83623a024f
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 02:21:03 +08:00 |
|
YunaiV
|
01cfa60a64
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2CreateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
|
2024-04-04 02:14:02 +08:00 |
|
YunaiV
|
20583417a4
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 01:49:49 +08:00 |
|
YunaiV
|
000b6cf47f
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 01:21:08 +08:00 |
|
YunaiV
|
1761495bce
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 20:02:05 +08:00 |
|
YunaiV
|
790f3dc99b
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java
|
2024-04-03 19:56:19 +08:00 |
|
YunaiV
|
22a170ee62
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 19:55:14 +08:00 |
|
YunaiV
|
132c1cc828
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 19:52:52 +08:00 |
|
YunaiV
|
cfe9c327c5
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-02 20:35:09 +08:00 |
|
芋道源码
|
9fac998a14
|
!930 全局：增加 VO 数据翻译的支持
Merge pull request !930 from 芋道源码/feature/easy-trans
|
2024-04-02 12:05:01 +00:00 |
|
YunaiV
|
594eb0ccc2
|
全局：增加 VO 数据翻译的支持
|
2024-04-01 21:46:57 +08:00 |
|
YunaiV
|
b4e602bbd4
|
全局：增加 VO 数据翻译的支持
|
2024-04-01 12:51:45 +08:00 |
|
YunaiV
|
398e2a225a
|
Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java
|
2024-04-01 12:44:59 +08:00 |
|
YunaiV
|
beea186507
|
全局：增加 VO 数据翻译的支持
|
2024-04-01 12:42:27 +08:00 |
|
YunaiV
|
c0b1bb0d3f
|
BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差
|
2024-03-30 20:49:11 +08:00 |
|
YunaiV
|
dc466d2286
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/UReportDataController.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UReportDataSaveReqVO.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDataSource.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDatabaseProvider.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportFilter.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImplTest.java
|
2024-03-30 20:45:11 +08:00 |
|
YunaiV
|
dcf6cc293e
|
BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差
|
2024-03-30 20:44:45 +08:00 |
|
YunaiV
|
fd42257ed0
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-30 20:02:33 +08:00 |
|
YunaiV
|
c9b3cf9ed4
|
MP：增加 unionid
|
2024-03-30 19:57:46 +08:00 |
|
YunaiV
|
0b91603652
|
Member：会员等级变更修复
|
2024-03-30 19:48:41 +08:00 |
|
YunaiV
|
a0c065fe73
|
Merge remote-tracking branch 'origin/master'
|
2024-03-30 18:05:45 +08:00 |
|
YunaiV
|
423fc9227c
|
bugfix：修复 Xss 开启时，忽略的 URL 针对 RequestBody 还是会 XSS 过滤的问题
|
2024-03-30 18:05:39 +08:00 |
|
YunaiV
|
6b79058417
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-03-30 18:03:14 +08:00 |
|
YunaiV
|
81bcf718cd
|
BPM：解决租户关闭时，Flowable 查询会报错的问题
|
2024-03-30 18:02:25 +08:00 |
|
YunaiV
|
0917b621e6
|
BPM：解决租户关闭时，Flowable 查询会报错的问题
|
2024-03-30 18:02:12 +08:00 |
|
芋道源码
|
a09b46217b
|
!912 解决退款失败时返回退款订单号错误的问题
Merge pull request !912 from 杨宇庆/N/A
|
2024-03-30 09:45:37 +00:00 |
|
YunaiV
|
f265762f22
|
修复 jdk8版本下docker-compose中Redis Host参数名称不正确的问题
|
2024-03-30 17:44:24 +08:00 |
|
YunaiV
|
3b7a1b55b9
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-30 17:43:31 +08:00 |
|
芋道源码
|
59a63911fb
|
!901 修复 jdk21版本下docker-compose中Redis Host参数名称不正确的问题
Merge pull request !901 from E1/master-jdk21
|
2024-03-30 09:43:05 +00:00 |
|
YunaiV
|
c943233ee5
|
bugfix：修复 Xss 开启时，忽略的 URL 针对 RequestBody 还是会 XSS 过滤的问题
|
2024-03-30 17:39:56 +08:00 |
|
YunaiV
|
e48240a192
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-30 17:09:26 +08:00 |
|
YunaiV
|
6cf7e60893
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2024-03-30 17:09:14 +08:00 |
|
芋道源码
|
c3184d70ac
|
Merge pull request #462 from cheng102e/fix/issue-401
fix: [issue-401]修复中山市
|
2024-03-30 17:07:51 +08:00 |
|
YunaiV
|
d636391a50
|
bugfix：修复中山市缺少
|
2024-03-30 17:07:36 +08:00 |
|
YunaiV
|
a68abc43ae
|
CRM：修复 @RequestBody 和 Multipart 不能同时存在的异常和导入客户后序列化产生的异常
|
2024-03-30 17:06:13 +08:00 |
|
YunaiV
|
ba50e62af9
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
|
2024-03-30 17:00:16 +08:00 |
|
YunaiV
|
c78519c6aa
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
|
2024-03-30 16:59:46 +08:00 |
|
YunaiV
|
544d9030e6
|
pay：后台支付应用信息列表关闭某一渠道，但是任然显示为开启状态
|
2024-03-30 16:59:05 +08:00 |
|
jiejc1
|
7d26d63dba
|
fix: [issue-401]修复中山市
|
2024-03-28 20:06:31 +08:00 |
|
芋道源码
|
9b85a9617d
|
!915 添加加入购物车商品数量不可为0或更低数量的限制
Merge pull request !915 from 风狗/N/A
|
2024-03-28 10:58:24 +00:00 |
|
芋道源码
|
6c12e68a0a
|
!908 解决查看未上架的商品时，报错缺少商品名称问题
Merge pull request !908 from 杨宇庆/N/A
|
2024-03-28 10:55:59 +00:00 |
|