YunaiV
|
9f676fecfa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java
|
2024-09-29 12:58:49 +08:00 |
|
YunaiV
|
805f80c36a
|
【功能优化】INFRA：代码生成时，默认禁用单元测试的生成，更符合大家的习惯
|
2024-09-19 13:10:23 +08:00 |
|
YunaiV
|
8024d0af3f
|
Merge branch 'master-jdk17' 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/web/config/YudaoWebAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/dto/CouponValidReqDTO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/RewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.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-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/framework/sms/core/client/impl/TencentSmsClient.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
|
2024-09-07 20:45:32 +08:00 |
|
YunaiV
|
74492d65f0
|
【功能优化】AI：model-uri、tokenizer 地址调整
|
2024-09-07 14:57:36 +08:00 |
|
YunaiV
|
840cfad84a
|
【功能优化】商城：价格计算时，返回可用 + 不可用的优惠劵
|
2024-09-07 12:05:42 +08:00 |
|
YunaiV
|
30fd7996f6
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-09-07 08:47:56 +08:00 |
|
YunaiV
|
2759a32331
|
【功能移除】INFRA：移除 Vue3 + Element Plus schema 模式
|
2024-09-07 08:30:29 +08:00 |
|
YunaiV
|
15f46db7ac
|
【代码优化】全局：MySQL JDBC 增加 rewriteBatchedStatements 批量插入
|
2024-09-04 09:08:12 +08:00 |
|
YunaiV
|
ae9ff74e23
|
【代码优化】全局：MySQL JDBC 增加 rewriteBatchedStatements 批量插入
|
2024-09-04 09:07:16 +08:00 |
|
YunaiV
|
acf0e401d3
|
【代码优化】SYSTEM：user_role_ids 忽略多租户
|
2024-09-03 16:11:08 +08:00 |
|
YunaiV
|
d3f28b92a7
|
【代码优化】SYSTEM：认证令牌的操作，增加 @Transactional 注解
|
2024-09-03 10:34:44 +08:00 |
|
YunaiV
|
608af2ed69
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-09-01 09:02:04 +08:00 |
|
YunaiV
|
2578ca7311
|
Merge branch 'master-jdk21-ai' of https://gitee.com/cherishsince/ruoyi-vue-pro into master-jdk17
|
2024-09-01 09:01:04 +08:00 |
|
YunaiV
|
34231bc5f8
|
【代码优化】AI 大模型：transformer 的 onnx、tokenizer 走 CDN，避免 github
|
2024-09-01 08:55:58 +08:00 |
|
YunaiV
|
e2197551ec
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/job/product/ProductStatisticsJob.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/config/TradeOrderProperties.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/app/PayAppService.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java
|
2024-08-18 17:22:47 +08:00 |
|
YunaiV
|
b632726a69
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
|
2024-08-18 16:33:55 +08:00 |
|
YunaiV
|
1dadfb8fba
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
|
2024-08-18 15:30:35 +08:00 |
|
陈玄礼
|
6eb40aa544
|
!1041 支付应用，增加 appKey 标识，用于不同接入方的标识
* feat[yudao-module-pay]: 更新新增和更新支付应用时校验逻辑
* fix[yudao-module-trade]: 为支付应用标识提供缺省值
* fix[yudao-module-pay]: appKey注释应用编码更新为应用标识
* feat[yudao-module-pay]: 为支付应用新增支付编码属性
|
2024-08-18 07:02:09 +00:00 |
|
YunaiV
|
7288e6c980
|
Merge branch 'master-jdk21-ai' of https://gitee.com/cherishsince/ruoyi-vue-pro into develop
|
2024-08-10 18:41:48 +08:00 |
|
YunaiV
|
83bd96d672
|
【功能新增】AI：集成 Azure 的 OpenAI 模型
|
2024-08-10 14:34:57 +08:00 |
|
YunaiV
|
b453856864
|
【代码优化】AI：向量化的集成
|
2024-08-09 00:09:19 +08:00 |
|
xiaoxin
|
2a984504d9
|
【新增】AI 知识库：文档向量化 demo
|
2024-08-05 13:53:50 +08:00 |
|
YunaiV
|
f3a8d6f06c
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2024-07-31 23:49:21 +08:00 |
|
YunaiV
|
ba18788517
|
【代码优化】SYSTEM：微信小程序的订阅
|
2024-07-31 19:48:02 +08:00 |
|
puhui999
|
2bc96fe521
|
【代码优化】SYSTEM：订阅消息跳转小程序类型
|
2024-07-31 12:58:06 +08:00 |
|
YunaiV
|
0e24994c92
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-07-30 23:12:18 +08:00 |
|
YunaiV
|
7782b36f90
|
【代码优化】SYSTEM：微信小程序的订阅
|
2024-07-30 23:12:06 +08:00 |
|
YunaiV
|
29ade63f87
|
【代码优化】AI：image 作品中心的代码
|
2024-07-30 00:01:08 +08:00 |
|
YunaiV
|
257acba31e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
|
2024-07-24 18:46:33 +08:00 |
|
YunaiV
|
ebe3cc727b
|
【功能新增】全局：多租户缓存，增加忽略的 Spring Cache 配置
|
2024-07-23 23:25:56 +08:00 |
|
YunaiV
|
68dd270258
|
【代码修复】MALL：更新库存时，同时更新销量，和 taobao 保持一致的逻辑
|
2024-07-23 12:44:57 +08:00 |
|
YunaiV
|
e2f3491295
|
【代码修复】MALL：更新库存时，同时更新销量，和 taobao 保持一致的逻辑
|
2024-07-23 12:43:49 +08:00 |
|
YunaiV
|
198c374a6f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-20 16:35:22 +08:00 |
|
YunaiV
|
70663af4cb
|
【代码优化】全局：去除 application.yaml 相关配置文件的冗余
|
2024-07-20 16:35:11 +08:00 |
|
YunaiV
|
bc365800b5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-07-15 12:38:42 +08:00 |
|
YunaiV
|
4de27eb12d
|
【依赖】easy-trans from 1.6.6 to 1.7.8
|
2024-07-15 12:38:23 +08:00 |
|
YunaiV
|
eca0a0422b
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 22:01:20 +08:00 |
|
YunaiV
|
2e3f998ee7
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 22:01:03 +08:00 |
|
YunaiV
|
438078d28f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-report/yudao-module-report-biz/pom.xml
|
2024-07-14 21:58:59 +08:00 |
|
YunaiV
|
211e196fce
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 21:57:52 +08:00 |
|
YunaiV
|
375745828b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2024-07-13 16:39:15 +08:00 |
|
YunaiV
|
45805aa761
|
【依赖】spring boot from 3.2.2 to 3.3.1
|
2024-07-13 16:38:26 +08:00 |
|
YunaiV
|
dee820b8fd
|
【功能新增】MALL：新增 mall 客服
|
2024-07-13 12:25:55 +08:00 |
|
YunaiV
|
03e07a2902
|
【功能新增】MALL：新增 mall 客服
|
2024-07-13 12:24:49 +08:00 |
|
YunaiV
|
ce1940e4f3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
|
2024-07-13 12:14:46 +08:00 |
|
YunaiV
|
41afea6818
|
【功能新增】MALL：新增 mall 客服
|
2024-07-13 12:14:07 +08:00 |
|
芋道源码
|
b586a09b90
|
!1011 新增 mall 客服
Merge pull request !1011 from 芋道源码/develop
|
2024-07-13 04:11:46 +00:00 |
|
YunaiV
|
8d1d0c15f7
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:03:26 +08:00 |
|
puhui999
|
ec5a209eed
|
【修复】恢复 websocket path
|
2024-07-12 18:01:30 +08:00 |
|
YunaiV
|
88b897ca13
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-12 09:34:44 +08:00 |