YunaiV
|
0520f572e8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-example/yudao-sso-demo-by-code/pom.xml
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
# yudao-example/yudao-sso-demo-by-password/pom.xml
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
|
2024-04-30 22:50:07 +08:00 |
|
YunaiV
|
1d00261c77
|
【优化】demo 功能，使用 yudao 作为表前缀，避免影响理解
|
2024-04-30 10:00:22 +08:00 |
|
YunaiV
|
853db724ec
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
|
2024-04-29 00:14:06 +08:00 |
|
YunaiV
|
c1df35d305
|
【修复】商城：取消订单，返回优惠劵时，状态校验不正确的问题
|
2024-04-28 20:06:42 +08:00 |
|
YunaiV
|
4ede173b27
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
|
2024-04-24 20:55:30 +08:00 |
|
YunaiV
|
6f42da1b77
|
【修复】部分菜单，确实 menu.sql 配置的权限标识
|
2024-04-24 20:11:11 +08:00 |
|
芋道源码
|
7f8d3b31d8
|
!939 updateCommentVisible 应该用前端传入的显示值
Merge pull request !939 from 云扬四海/fix_comment_bug
|
2024-04-14 13:58:26 +00:00 |
|
YunaiV
|
8e86706d50
|
同步 develop 最新代码
|
2024-04-12 20:31:33 +08:00 |
|
YunaiV
|
b44eab7f93
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
|
2024-04-12 19:18:30 +08:00 |
|
YunaiV
|
9cba258d8f
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2024-04-12 19:14:56 +08:00 |
|
YunaiV
|
1904f8ca88
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-11 22:52:53 +08:00 |
|
YunaiV
|
1e348dbf83
|
【优化】将项目的 annotations 统一修改成 annotation 包
|
2024-04-11 22:52:34 +08:00 |
|
YunaiV
|
cc9b2e86b6
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2024-04-10 20:58:35 +08:00 |
|
YunaiV
|
2e03dcba69
|
移除 resilience4j 组件
|
2024-04-10 20:57:44 +08:00 |
|
yunlongn
|
325c03dfd4
|
updateCommentVisible 应该用前端传入的显示值
|
2024-04-09 16:35:41 +08:00 |
|
YunaiV
|
9b9f54bb03
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
|
2024-04-05 13:32:17 +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
|
1761495bce
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 20:02:05 +08:00 |
|
YunaiV
|
5faa006dd0
|
bugfix：修复拼团详情错误传递 groupon_id 的问题
|
2024-03-30 15:28:46 +08:00 |
|
YunaiV
|
3b379d8cc0
|
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
|
2024-03-30 11:54:27 +08:00 |
|
YunaiV
|
a80ba48889
|
bugfix：同步 master 修改的 bug
|
2024-03-28 19:05:16 +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 |
|
芋道源码
|
830485911b
|
!924 取消订单同步取消分销问题
Merge pull request !924 from wangxiaorui/N/A
|
2024-03-28 10:53:06 +00:00 |
|
wangxiaorui
|
85f994f643
|
取消订单同步取消分销问题
创建分销单的时候是按照OrderItem的主键来创建，取消的时候应该按照OrderItem的主键来取消，否则会导致无法取消分销单
Signed-off-by: wangxiaorui <742397974@qq.com>
|
2024-03-26 01:19:48 +00:00 |
|
liyujiang
|
53f2d4cfd1
|
fix(trade): 发货日志无需发货时的描述改为“已发货，快递公司：无，快递单号：无”
|
2024-03-23 10:16:47 +08:00 |
|
liyujiang
|
10bfbc9e6e
|
fix(trade): 发货日志物流公司名称不显示问题，参见 TradeOrderUpdateServiceImpl 类中调用TradeOrderLogUtils.setOrderInfo传递的参数“expressName”
|
2024-03-21 18:07:12 +08:00 |
|
风狗
|
c4dedf4d48
|
添加加入购物车商品数量不可为0或更低数量的限制
Signed-off-by: 风狗 <909275705@qq.com>
|
2024-03-15 02:22:39 +00:00 |
|
puhui999
|
0dd36f6c5c
|
MALL: fix 订单价格分摊
|
2024-03-10 19:07:24 +08:00 |
|
杨宇庆
|
1794a7c230
|
解决查看未上架的商品时，报错缺少商品名称问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-03-09 13:27:06 +00:00 |
|
YunaiV
|
d556b29214
|
CRM：code review 权限的优化
|
2024-03-09 18:27:58 +08:00 |
|
YunaiV
|
e091b077a8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-01 20:01:38 +08:00 |
|
YunaiV
|
dda0909843
|
🎉 2.0.1 版本发布！
|
2024-03-01 20:01:16 +08:00 |
|
YunaiV
|
d3f3584132
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-01 19:40:52 +08:00 |
|
YunaiV
|
7ef7228f65
|
MALL：增加返回 vipPrice 减免金额
|
2024-03-01 19:21:03 +08:00 |
|
YunaiV
|
6b06bf8a3d
|
bugfix MALL：已过期的优惠劵，还显示可以使用
|
2024-03-01 13:55:37 +08:00 |
|
YunaiV
|
f1ff656282
|
bugfix：运行失败的单测
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
|
2024-03-01 12:35:00 +08:00 |
|
YunaiV
|
831cf33e95
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
|
2024-03-01 12:26:40 +08:00 |
|
YunaiV
|
da6e01f6b5
|
bugfix：运行失败的单测
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
|
2024-03-01 12:26:05 +08:00 |
|
YunaiV
|
8ff710e49d
|
✨ 同步 master 的一些 pr 代码变更
|
2024-03-01 09:00:43 +08:00 |
|
芋道源码
|
556e3786a8
|
!892 修补会员取消售后接口中未校验用户ID的安全漏洞
Merge pull request !892 from 杨宇庆/N/A
|
2024-02-29 13:03:22 +00:00 |
|
杨宇庆
|
5849f99d23
|
修补会员取消售后接口中未校验用户ID的安全漏洞
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-02-28 19:35:07 +00:00 |
|
杨宇庆
|
9c4d373f81
|
修补会员退货接口中未校验用户ID的安全漏洞
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-02-28 18:23:54 +00:00 |
|
YunaiV
|
c3717b68c8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-02-28 21:42:48 +08:00 |
|
YunaiV
|
1f4889c68e
|
✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter
|
2024-02-28 21:42:32 +08:00 |
|
YunaiV
|
91b3c16a90
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-02-28 21:04:19 +08:00 |
|
YunaiV
|
6dcb1277b3
|
✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块
|
2024-02-28 21:03:40 +08:00 |
|
YunaiV
|
067ff6cc4d
|
✨ bugfix master 的一些 pr
|
2024-02-27 21:01:02 +08:00 |