cherishsince
|
198dae62c0
|
【优化】处理 CommonResult Void 情况
|
2024-04-28 17:41:49 +08:00 |
|
cherishsince
|
99d477ac0a
|
【增加】图片绘画增加 绘画失败状态，并保存绘画错误信息，同时可以将错误信息返回给前端
|
2024-04-28 17:26:31 +08:00 |
|
cherishsince
|
0311c77e7b
|
【优化】处理 openAi image 返回错误信息
|
2024-04-28 17:25:47 +08:00 |
|
cherishsince
|
ad46eb57a5
|
【增加】增加open ai dall_e_2 配置
|
2024-04-28 16:40:42 +08:00 |
|
cherishsince
|
c6a029ff8d
|
【优化】测试 open ai image
|
2024-04-28 16:38:59 +08:00 |
|
cherishsince
|
401a83b7a9
|
【优化】增加 login.http
|
2024-04-28 16:38:42 +08:00 |
|
cherishsince
|
9ff36e5167
|
【优化】open ai image 测试
|
2024-04-28 16:38:23 +08:00 |
|
cherishsince
|
067fc58147
|
【优化】解决调用openai image 生成，user不能为空情况，固定设置UID 客户端
|
2024-04-28 16:37:27 +08:00 |
|
cherishsince
|
2cbb6ac8d5
|
【优化】修复imageSize不生效问题，增加modal、style、size 适配
|
2024-04-28 16:36:35 +08:00 |
|
cherishsince
|
330696fb90
|
【增加】autoconfig自动配置 增加 style 适配。
|
2024-04-28 16:34:55 +08:00 |
|
cherishsince
|
7467c241f3
|
【增加】aiImage 增加 dall-e-2、dall-e-3
|
2024-04-28 16:33:45 +08:00 |
|
cherishsince
|
844ae285e1
|
【增加】openai image 增加 style 生成风格
|
2024-04-28 16:29:59 +08:00 |
|
DevDengChao
|
e133c28da5
|
修复短信回执外部文档的链接
|
2024-04-28 14:57:46 +08:00 |
|
cherishsince
|
307e08435d
|
【优化】调整imageSize
|
2024-04-28 14:38:25 +08:00 |
|
cherishsince
|
7d3ed1fef3
|
【新增】增加open ai image 模型类型
|
2024-04-28 14:38:07 +08:00 |
|
cherishsince
|
ca0024988c
|
【优化】模型enum统一交 model
|
2024-04-28 14:37:31 +08:00 |
|
DevDengChao
|
af597f2329
|
补充短信渠道与短信模板的启用状态示例值
|
2024-04-28 14:23:02 +08:00 |
|
DevDengChao
|
fc0a1f669d
|
fix: 修复短信模板中关于 type 字段的描述
|
2024-04-28 13:48:45 +08:00 |
|
芋道源码
|
e0652831a6
|
!957 fix: CRM 管理员数据权限 bug
Merge pull request !957 from puhui999/develop
|
2024-04-28 04:49:11 +00:00 |
|
cherishsince
|
a34d925973
|
【更新】sql文件
|
2024-04-28 11:51:22 +08:00 |
|
cherishsince
|
d37c1c4ecc
|
【优化】配置文件统一增加 max-tokens配置 和 topP topK 配置
|
2024-04-27 18:31:31 +08:00 |
|
cherishsince
|
10a94c3ef2
|
【优化】处理百度 system 角色定制失效问题。
|
2024-04-27 18:29:58 +08:00 |
|
cherishsince
|
c811f3a4c2
|
【优化】抽离 maxTokens 作为公共参数
|
2024-04-27 17:23:52 +08:00 |
|
cherishsince
|
e4bb7262c3
|
【优化】星火兼容 ChatOptions 配置
|
2024-04-27 17:23:15 +08:00 |
|
cherishsince
|
eef9ed1b3e
|
【优化】自动配置优化，星火、一言 增加 topK topP maxToken Temperature 参数转换
|
2024-04-27 17:22:40 +08:00 |
|
cherishsince
|
8b2dcaf910
|
【优化】讯飞星火兼容 system、assistant、user
|
2024-04-27 16:59:15 +08:00 |
|
cherishsince
|
63c5f90596
|
【优化】兼容阿里云千问开源模型，和付费模型
|
2024-04-27 16:51:41 +08:00 |
|
jason
|
e4fbc11dc4
|
仿钉钉流程设计- 前端重构调整, 新增多人审批方式
|
2024-04-27 09:30:14 +08:00 |
|
cherishsince
|
2ef64a0a50
|
【优化】自动配置，适配新的千问
|
2024-04-26 18:24:57 +08:00 |
|
cherishsince
|
be8d9c1a5f
|
【通义千问】重新对接阿里云通义前文。
|
2024-04-26 18:05:14 +08:00 |
|
cherishsince
|
64b6b45bc6
|
【优化】千问大模型定义，
|
2024-04-26 13:42:50 +08:00 |
|
puhui999
|
9a2eb2d02c
|
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
|
2024-04-25 23:16:52 +08:00 |
|
puhui999
|
0808bdaa41
|
fix: CRM 管理员数据权限 bug
|
2024-04-25 23:16:34 +08:00 |
|
cherishsince
|
2adb5accc4
|
【优化】ai chat client自动配置和初始化。
|
2024-04-25 18:05:08 +08:00 |
|
cherishsince
|
44f7c841de
|
【修改】增加 dall2\dall3 绘画方法，还未实现
|
2024-04-25 16:56:54 +08:00 |
|
cherishsince
|
edb2a844cc
|
【优化】优化 yudao client 代码格式
|
2024-04-25 16:32:19 +08:00 |
|
cherishsince
|
4a6b4e5f65
|
【优化】优化 chat 初始化
|
2024-04-25 16:31:02 +08:00 |
|
cherishsince
|
4db96fa361
|
【新增】初始化 ai 绘画，需要的类
|
2024-04-25 16:17:33 +08:00 |
|
cherishsince
|
71e3240af6
|
【优化】代码优化，统一增加ai前缀
|
2024-04-25 15:48:48 +08:00 |
|
cherishsince
|
5cec6d52e0
|
【优化】modal 增加config 可能考虑数据库来初始化 ai modal
|
2024-04-25 15:42:30 +08:00 |
|
cherishsince
|
1673081b7d
|
【优化】modal 中的 config 没有什么作用
|
2024-04-25 15:38:08 +08:00 |
|
DevDengChao
|
bc6775d64b
|
修复错误拼写的注释
"Redisson 自动高配置类" 改为 "Redisson 自动配置类"
|
2024-04-25 15:35:44 +08:00 |
|
cherishsince
|
f85c89a405
|
modal 增加删除
|
2024-04-25 15:15:33 +08:00 |
|
cherishsince
|
faade05528
|
【优化】ai modal 注释
|
2024-04-25 15:00:42 +08:00 |
|
YunaiV
|
35dd0a8c14
|
同步最新代码到简化分支
|
2024-04-24 22:31:25 +08:00 |
|
YunaiV
|
c2c7eb0084
|
同步最新代码到简化分支
|
2024-04-24 22:29:27 +08:00 |
|
YunaiV
|
8252abe3ef
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateExpressionStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/LogRecordConstants.java
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/permission/CrmPermissionLevelEnum.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
# 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/clue/CrmClueController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.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/CrmContractController.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/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.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/followup/CrmFollowUpRecordController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.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/controller/admin/permission/vo/CrmPermissionRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsRankController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/rank/CrmStatisticsRankReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/rank/CrmStatisticsRankRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contact/CrmContactMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/permission/CrmPermissionMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/statistics/CrmStatisticsRankMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/package-info.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/package-info.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/web/package-info.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionService.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/product/CrmProductCategoryServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsRankService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsRankServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsRankMapper.xml
# yudao-module-crm/yudao-module-crm-biz/src/test/resources/application-unit-test.yaml
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java
# yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml
# yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/category.json
# yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/contact.json
# yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/student.json
# yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/teacher.json
# yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/clean.sql
# yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml
# 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/test/resources/application-unit-test.yaml
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStorePageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageRecordMapper.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBrokerageOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
# yudao-module-mall/yudao-module-trade-biz/src/test/resources/application-unit-test.yaml
# yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml
# 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-pay/yudao-module-pay-biz/src/test-integration/resources/application-integration-test.yaml
# yudao-module-pay/yudao-module-pay-biz/src/test/resources/application-unit-test.yaml
# yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml
# yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
# yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
|
2024-04-24 22:24:36 +08:00 |
|
YunaiV
|
53db8309e9
|
【修复】CRM 分类删除时，判断商品数量是否为空不正确的问题，导致无法删除分类
|
2024-04-24 21:08:53 +08:00 |
|
cherishsince
|
d6a8ec6bd2
|
优化：modal 默认查询的都是未禁用的modal
|
2024-04-24 20:26:12 +08:00 |
|
cherishsince
|
e4eadd8c99
|
增加 modal 更新
|
2024-04-24 20:25:46 +08:00 |
|