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
|
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
|
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
|
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
|
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 |
|
芋道源码
|
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 |
|
芋道源码
|
90fa7be660
|
!1006 AI 大模型的草稿提交（code review 代码）
Merge pull request !1006 from 芋道源码/master-jdk21-ai
|
2024-07-12 01:29:43 +00:00 |
|
YunaiV
|
a19bd126e1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-07 17:00:16 +08:00 |
|
YunaiV
|
6e64ae774e
|
【代码新增】AI：接入智谱 GLM-4 模型
|
2024-07-06 18:16:47 +08:00 |
|
YunaiV
|
59c853b54d
|
【代码优化】AI：完善 DeepSeekChatTests、XingHuoChatModelTests 单测，方便大家快速体验
|
2024-07-06 17:37:17 +08:00 |
|
YunaiV
|
2d36ec4858
|
【代码优化】AI：优化 xinghuo 的接入，复用 OpenAI，同时将 ws 替换成 htt 调用
|
2024-07-06 08:56:36 +08:00 |
|
YunaiV
|
2e73959a2c
|
【代码新增】AI：开启 AI 租户的能力
|
2024-07-05 09:42:36 +08:00 |
|
YunaiV
|
246c233253
|
【优化】AI：通义千问的集成，从自己集成，换成 spring cloud alibaba ai 库
|
2024-06-29 19:00:09 +08:00 |
|
YunaiV
|
c5db930603
|
【优化】AI：依赖从文心一言，使用 spring ai 替代接入
|
2024-06-29 18:33:16 +08:00 |
|
YunaiV
|
949d5a1815
|
【新增】AI：音乐接入 API KEY 管理
|
2024-06-29 09:29:37 +08:00 |
|
xiaoxin
|
94460008c4
|
【增加】AI：我的音乐
|
2024-06-28 14:40:57 +08:00 |
|
YunaiV
|
9d6b615f10
|
【功能新增】AI：音乐管理 50%
|
2024-06-27 23:09:17 +08:00 |
cherishsince
|
dcab49bb78
|
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
|
2024-06-27 17:14:46 +08:00 |
|
cherishsince
|
6633bf002d
|
【解决todo】增加模型设置
|
2024-06-27 17:13:15 +08:00 |
|
xiaoxin
|
8bbd2257f2
|
【解决todo】AI：音乐接入
|
2024-06-26 17:01:56 +08:00 |
|
YunaiV
|
b4eed07d61
|
【代码优化】AI：MJ 配置类的简化
|
2024-06-25 21:27:59 +08:00 |
|
YunaiV
|
098483d2be
|
【代码优化】AI：MJ 生成图片的优化
|
2024-06-25 19:57:37 +08:00 |
|
xiaoxin
|
abd80fe390
|
【解决todo】AI Music: 结构优化，task状态同步使用统一标准Job
|
2024-06-19 12:21:01 +08:00 |
|
cherishsince
|
70cbab9aeb
|
【增加】增加 midjourney-proxy 配置
|
2024-06-17 21:37:49 +08:00 |
|
芋道源码
|
5fabb0b757
|
!3 接入suno-api
Merge pull request !3 from 小新/master-jdk21-ai
|
2024-06-17 12:08:09 +00:00 |
|
puhui999
|
285a431616
|
MALL-KEFU: 根据代码评审完善相关方法
|
2024-06-17 10:17:46 +08:00 |
|
xiaoxin
|
f1292fb7fe
|
【增加】AI Music支持描述模式、歌词模式生成音乐
|
2024-06-07 14:51:45 +08:00 |
dhb52
|
ba40c1f699
|
fix: 改用kingbase8官方驱动,jdbc-url
|
2024-06-06 23:30:40 +08:00 |