YunaiV
|
06394b2091
|
【同步】最新精简版本！
|
2024-07-14 22:37:13 +08:00 |
|
YunaiV
|
e0d8a94bf6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionRuleHandlerTest.java
# yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/performance/CrmStatisticsPerformanceReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusDO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
# yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/common/ErpBizTypeEnum.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/pay/PayWalletStatisticsMapper.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/TradeOrderStatisticsMapper.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/PayWalletStatisticsServiceImpl.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsServiceImpl.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/controller/app/brokerage/vo/user/AppBrokerageUserBindReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/aftersale/AfterSaleDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.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-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
# yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessageRespVO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/menu/MpMenuDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpAutoReplyDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java
# yudao-module-report/yudao-module-report-biz/pom.xml
|
2024-07-14 22:33:57 +08:00 |
|
YunaiV
|
211e196fce
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 21:57:52 +08:00 |
|
YunaiV
|
bea66e5c6f
|
【代码优化】全局：复用 MyBatis Plus 数据权限插件，简化项目的数据权限实现
|
2024-07-13 23:35:39 +08:00 |
|
YunaiV
|
2b39b434fa
|
【依赖】mybatis-plus from 3.5.5 to 3.5.7
|
2024-07-13 22:42:54 +08:00 |
|
YunaiV
|
40deb00a00
|
【依赖】工具类升级
|
2024-07-13 17:33:15 +08:00 |
|
YunaiV
|
f1c654f5a4
|
【依赖】podam from 8.0.1 to 8.0.2
|
2024-07-13 17:07:18 +08:00 |
|
YunaiV
|
782f3337dd
|
【依赖】spring boot admin from 3.2.1 to 3.3.2
|
2024-07-13 16:58:36 +08:00 |
|
YunaiV
|
45805aa761
|
【依赖】spring boot from 3.2.2 to 3.3.1
|
2024-07-13 16:38:26 +08:00 |
|
YunaiV
|
aff7919780
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:55:56 +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
|
e95f69b683
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:03:44 +08:00 |
|
YunaiV
|
8d1d0c15f7
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:03:26 +08:00 |
|
芋道源码
|
3aad33c3cd
|
!1013 新增文心一言、智谱 AI 的绘图能力
Merge pull request !1013 from 芋道源码/master-jdk21-ai
|
2024-07-13 02:47:49 +00:00 |
|
YunaiV
|
a18682e874
|
README：新增关于 AI 大模型的介绍
|
2024-07-13 10:18:08 +08:00 |
|
YunaiV
|
73502d565f
|
【代码优化】AI：ChatGlm 替换成 ZhiPuAiImage 实现
|
2024-07-13 00:06:48 +08:00 |
|
YunaiV
|
8da0807242
|
【代码评审】SYSTEM：华为云 client 的 review
|
2024-07-12 23:16:34 +08:00 |
|
芋道源码
|
af5be1bcb2
|
!1012 【修复】恢复 websocket path
Merge pull request !1012 from puhui999/develop
|
2024-07-12 11:56:52 +00:00 |
|
puhui999
|
ec5a209eed
|
【修复】恢复 websocket path
|
2024-07-12 18:01:30 +08:00 |
|
cherishsince
|
4311fe4517
|
【增加】image 对接 Chatglm 模型
|
2024-07-12 15:44:59 +08:00 |
|
cherishsince
|
2ae90b9edc
|
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
|
2024-07-12 15:03:41 +08:00 |
|
cherishsince
|
d865cc293b
|
【增加】chatglm 实现 spring ai 标准
|
2024-07-12 15:03:34 +08:00 |
|
芋道源码
|
528200f326
|
!997 华为短信client实现，基于API方式
Merge pull request !997 from scholarli/develop
|
2024-07-12 05:07:01 +00:00 |
|
YunaiV
|
c3af08900c
|
【模块新增】AI：支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力
|
2024-07-12 09:32:17 +08:00 |
|
芋道源码
|
90fa7be660
|
!1006 AI 大模型的草稿提交（code review 代码）
Merge pull request !1006 from 芋道源码/master-jdk21-ai
|
2024-07-12 01:29:43 +00:00 |
|
YunaiV
|
68ed8cd6f8
|
【代码优化】AI：思维导入、写作的生成
|
2024-07-12 09:26:32 +08:00 |
|
芋道源码
|
ecb50c6511
|
!14 【解决todo】AI 写作、脑图：model、systemMessage获取逻辑调整
Merge pull request !14 from 小新/master-jdk21-ai
|
2024-07-12 00:48:48 +00:00 |
|
YunaiV
|
698b2b24ae
|
【代码优化】AI：文心一言的 tests 类
|
2024-07-11 22:15:44 +08:00 |
|
cherishsince
|
abc51c670a
|
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
|
2024-07-11 21:46:19 +08:00 |
|
cherishsince
|
18aeb072a6
|
【优化】buildImageOptions 支持千帆
|
2024-07-11 21:46:09 +08:00 |
|
YunaiV
|
c6c003707e
|
【代码优化】AI：通义千问的 tests 类
|
2024-07-11 21:37:45 +08:00 |
|
cherishsince
|
db7315b8cd
|
【增加】百度千帆
|
2024-07-11 17:48:18 +08:00 |
|
cherishsince
|
88d7c90c98
|
【添加todo】@芋艿 千帆sdk image 生成有错误
|
2024-07-11 16:33:15 +08:00 |
|
cherishsince
|
6b7238a79d
|
【增加】百度千帆 image tests
|
2024-07-11 16:32:15 +08:00 |
|
xiaoxin
|
29e421432d
|
【解决todo】AI 写作、脑图：model、systemMessage获取逻辑调整
|
2024-07-11 10:14:59 +08:00 |
|
芋道源码
|
7a0a5f0f9a
|
!1010 MALL-KEFU: 发送消息通知所有管理员更新对话
Merge pull request !1010 from puhui999/develop
|
2024-07-10 15:05:08 +00:00 |
|
YunaiV
|
e39a6c3467
|
【代码新增】AI：写作管理界面
|
2024-07-10 23:01:24 +08:00 |
|
cherishsince
|
d6b3b5e9bd
|
【增加】ai image对接通义
|
2024-07-10 21:34:42 +08:00 |
|
YunaiV
|
28018b1f7f
|
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
|
2024-07-10 18:57:18 +08:00 |
|
YunaiV
|
b4014bf2df
|
【代码评审】AI：写作部分的建议
|
2024-07-10 18:57:12 +08:00 |
|
cherishsince
|
f25c7c4b86
|
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
|
2024-07-10 18:53:46 +08:00 |
|
cherishsince
|
b6fead81f2
|
【增加】增加通义万相
|
2024-07-10 18:53:39 +08:00 |
|
芋道源码
|
b8a443fbe0
|
!13 【AI 】1.支持脑图内容生成 2.AI 写作：做角色设定，提高准确率
Merge pull request !13 from 小新/master-jdk21-ai
|
2024-07-10 10:43:16 +00:00 |
|
xiaoxin
|
bcdb23b89d
|
【优化】AI 写作：做角色设定，提高准确率
|
2024-07-10 14:28:31 +08:00 |
|
xiaoxin
|
7cd16ffbf3
|
Merge branch 'refs/heads/upstrem-master-jdk21-ai' into master-jdk21-ai
|
2024-07-10 13:27:08 +08:00 |
|
xiaoxin
|
ababc914bd
|
【新增】AI 脑图
|
2024-07-10 13:18:17 +08:00 |
|
YunaiV
|
4c21ae32fe
|
【代码评审】AI：写作部分的建议
|
2024-07-10 12:59:21 +08:00 |
|
芋道源码
|
f3a6ba8349
|
!12 【优化】AI 写作：1. 优先获取写作角色；2. 优化写作提示词
Merge pull request !12 from 小新/master-jdk21-ai
|
2024-07-10 04:53:42 +00:00 |
|
cherishsince
|
870b1bf369
|
【增加】增加通义万象 test
|
2024-07-10 10:27:46 +08:00 |
|