huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-27 17:51:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,533 Commits 1 Branch 0 Tags 176 MiB
1f8576f643
Commit Graph

7533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
eb8cd3d736 Merge branch 'master-jdk21-ai' of https://gitee.com/cherishsince/ruoyi-vue-pro into master-jdk21-ai 
# Conflicts:
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/AiChatModelMapper.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelServiceImpl.java
 2024-05-12 19:10:33 +08:00
cherishsince
5a4162cdc1 【优化】优化 chat event stream 模式交互，增加 add message 优先记录 2024-05-12 19:04:58 +08:00
cherishsince
aaf1599f7a Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai 
# Conflicts:
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/AiChatModelMapper.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatModelService.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatModalServiceImpl.java
 2024-05-12 14:23:25 +08:00
cherishsince
79bd78998d 【增加】增加模型头像 2024-05-12 14:20:24 +08:00
YunaiV
d46097a658 【修复】SYSTEM：更新角色时，记录修改内容 2024-05-12 10:08:23 +08:00
YunaiV
d78b6d8b58 【修复】ERP：业务类型枚举中的销售出库 2024-05-11 23:52:54 +08:00
YunaiV
0ba98742be 【优化】SYSTEM：短信验证码前置补零对其endCode长度 2024-05-11 23:51:27 +08:00
YunaiV
4a0ad205ae 【代码评审】CRM：优化员工业绩统计的实现 2024-05-11 22:30:37 +08:00
YunaiV
95a8aa9ba9 Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop 
# Conflicts:
#	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
 2024-05-11 22:07:43 +08:00
YunaiV
e1a5302b25 【修复】商城：秒杀时间段配置的 URL simple-list 不正确的问题 2024-05-11 22:05:41 +08:00
YunaiV
0641f793a3 【代码评审】全局：微信小程序码 2024-05-11 21:51:59 +08:00
芋道源码
8e64de0ab2
!972 feat：新增获取小程序码相关接口 
Merge pull request !972 from puhui999/develop
 2024-05-11 13:27:30 +00:00
芋道源码
4a0f1463ef
!968 fix: pg,mssql dual表需要一条数据 
Merge pull request !968 from dhb52/master-jdk17
 2024-05-11 13:21:27 +00:00
芋道源码
64aab9ea1b
Merge pull request #518 from JJBoy1995/fix-jdk17 
【修复】商城首页销售额查询错误
 2024-05-11 21:11:25 +08:00
芋道源码
30941e3f3e
Merge pull request #509 from DevDengChao/fix/unspecified-sex 
修复性别未知时的枚举值与 member_user.sex 默认值不一致的问题
 2024-05-11 21:09:07 +08:00
YunaiV
9fbaada1be 【新增】AI：API 模型管理（完善） 2024-05-11 19:46:49 +08:00
puhui999
73ef9211f9 feat：新增获取小程序码相关接口 2024-05-11 17:55:36 +08:00
scholar
99ab07de69 完成todo xml部分 2024-05-11 11:35:27 +08:00
YunaiV
ba1333bdef Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai 2024-05-10 22:48:58 +08:00
YunaiV
b9deba889c 【新增】AI：API 模型管理 2024-05-10 22:48:49 +08:00
dhb52
0288309e3b fix: sqlserver DROP TABLE 使用GO替代分号 2024-05-10 22:12:26 +08:00
dhb52
9d102a1b72 style: mysql/quartz.sql 字段小写,格式化 2024-05-10 21:51:48 +08:00
cherishsince
c1e2ba9ed4 【todo】mj更新信息 增加 todo 2024-05-10 17:26:10 +08:00
cherishsince
8e7fc1ff96 【优化】数据库增加 mjNonce 更新，生成好、或异常的图片信息 2024-05-10 15:29:11 +08:00
DevDengChao
3da7885514 fix: 删除 SexEnum.UNSPECIFIED, 并将 UNKNOWN 的值同步为数据库中 member_user.sex 字段的默认值 0 2024-05-10 09:29:43 +08:00
YunaiV
caca47b6d7 【新增】AI：API 密钥管理 2024-05-09 23:03:10 +08:00
JJBoy
eac9d91a7f 【修复】商城首页销售额查询错误 2024-05-09 20:25:58 +08:00
cherishsince
04cb9bad5b 【修复】修复 imagine 版本过期，不能提交任务问题。 2024-05-09 16:40:28 +08:00
cherishsince
2734e54b0c 【测试】mj生成图片 2024-05-08 18:12:30 +08:00
cherishsince
84a3cd3a75 【优化】处理 nonce id 必须是一个长整型id问题 2024-05-08 18:12:12 +08:00
cherishsince
b058090a77 【更新】更新sql脚本 2024-05-08 18:11:18 +08:00
cherishsince
38a9c1a7ee 【增加】mj图片处理成功消息，增加component操作，处理error信息保存 2024-05-08 15:58:03 +08:00
cherishsince
b6096b76d2 【增加】ai image 生成记录删除 2024-05-08 15:10:57 +08:00
cherishsince
e8cf40a82a 【增加】1、mj components 相关操作任务提交 2、增加ai image 列表查询 2024-05-08 15:07:49 +08:00
YunaiV
16a47bde5b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21-ai 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
 2024-05-08 09:12:25 +08:00
dhb52
7d9e6f2184 fix: pg,mssql dual表需要一条数据 2024-05-08 00:28:11 +08:00
YunaiV
52c86cd290 【优化】CRM：员工业绩统计的实现 2024-05-07 23:08:38 +08:00
YunaiV
d0d1d6d208 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-05-07 22:48:39 +08:00
YunaiV
408378f5ab Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
 2024-05-07 22:32:12 +08:00
芋道源码
a8aead3049
Merge pull request #510 from DevDengChao/fix/member-sex-type 
修复 MemberUserBaseVO.sex 与 SexEnum.value 不一致的问题
 2024-05-07 22:23:41 +08:00
cherishsince
1a7446b914 【定义】定义 midjourney 相关功能操作api 2024-05-07 18:17:17 +08:00
cherishsince
6e3f34b0db 【优化】重新适配 dall2和dall3 2024-05-07 18:00:30 +08:00
cherishsince
5579620140 【优化】聊天 event stream 改为 flex 返回更加的优雅 2024-05-07 17:22:23 +08:00
cherishsince
708d66e8cf 【测试】chat 聊天(send、send-stream) 2024-05-07 16:47:25 +08:00
cherishsince
bd3e65898b 【测试】AI对话 2024-05-07 16:22:58 +08:00
cherishsince
9ad977bdb9 【调整】message 修改引入的modal改为model 2024-05-07 15:39:13 +08:00
cherishsince
fd6ce5a627 【优化】修改http 请求地址和请求内容 2024-05-07 15:38:47 +08:00
cherishsince
b091498040 【优化】优化AI 角色列表返回信息 和 修改模型id类型 2024-05-07 15:38:01 +08:00
cherishsince
3e91032eaf 【调整】AI 对话引入的 modal 修改为 model 2024-05-07 15:25:34 +08:00
cherishsince
a0e06cc0b7 【调整】调整modal list 返回信息，和update req 2024-05-07 15:24:18 +08:00