huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-30 03:01:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,243 Commits 1 Branch 0 Tags 176 MiB
2c429263d0
Commit Graph

494 Commits

Author SHA1 Message Date
cherishsince
8e7fc1ff96 【优化】数据库增加 mjNonce 更新，生成好、或异常的图片信息 2024-05-10 15:29:11 +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
YunaiV
52c86cd290 【优化】CRM：员工业绩统计的实现 2024-05-07 23:08:38 +08:00
cherishsince
5579620140 【优化】聊天 event stream 改为 flex 返回更加的优雅 2024-05-07 17:22:23 +08:00
YunaiV
213a6aa0fc Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db 
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
 2024-05-04 09:15:58 +08:00
dhb52
774082509b feat: 达梦DM8 2024-05-03 23:22:53 +08:00
YunaiV
29746d1459 【修复】MySQL jdbc 连接 5.7 示例不正确 2024-05-03 09:04:47 +08:00
YunaiV
6ba73e60f0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db 2024-05-02 18:16:11 +08:00
dhb52
fd8889e76a wip: SQLServer数据库更新, 代码生成注释乱码 2024-05-02 15:30:33 +08:00
YunaiV
ab00986a1d Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-05-01 08:37:56 +08:00
YunaiV
c0722b3a19 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2024-05-01 08:05:18 +08:00
dhb52
06dacb747b feat: Oracle数据 DDL 适配 2024-04-30 23:41:25 +08:00
dhb52
4f3aaa124c feat: 测试数据库docker-compose, postgres DDL初稿 2024-04-29 23:41:33 +08:00
cherishsince
cf3c145867 【增加】提价 midjourney 配置 2024-04-29 14:54:11 +08:00
cherishsince
d14c13b2fc 【增加】midjourney 自动配置。 2024-04-29 10:59:26 +08:00
YunaiV
cd5e6319d9 【增强】一键改包：支持 site、org 等包 2024-04-29 00:13:04 +08:00
cherishsince
ad46eb57a5 【增加】增加open ai dall_e_2 配置 2024-04-28 16:40:42 +08:00
cherishsince
d37c1c4ecc 【优化】配置文件统一增加 max-tokens配置 和 topP topK 配置 2024-04-27 18:31:31 +08:00
cherishsince
63c5f90596 【优化】兼容阿里云千问开源模型，和付费模型 2024-04-27 16:51:41 +08:00
cherishsince
2adb5accc4 【优化】ai chat client自动配置和初始化。 2024-04-25 18:05:08 +08:00
YunaiV
da5425da2f 【修复】pay：PayWalletServiceImpl 可能存在的循环依赖问题 
【修复】system：dev 配置文件，缺少 WECHAT_MINI_APP 配置项~
 2024-04-24 12:53:30 +08:00
YunaiV
fd832e23fd bugfix：非 json 请求（文件上传）时，token 过期时，错误读取 request body 问题 2024-04-22 23:31:50 +08:00
YunaiV
9a31613e5b 【移除】敏感词的管理，简化项目的复杂度 2024-04-22 19:53:01 +08:00
YunaiV
8093ef3b96 【移除】错误码的管理，简化项目的复杂度 2024-04-22 19:42:45 +08:00
cherishsince
27bfb0d25d 关闭租户 2024-04-18 17:37:28 +08:00
cherishsince
7c8ec404db 优化，增加模型版本号 2024-04-14 17:31:54 +08:00
cherishsince
ac0de5d485 优化自动注入，可以创建多个 client 2024-04-13 18:23:50 +08:00
cherishsince
17f7970259 增加自动配置 2024-04-13 18:23:50 +08:00
YunaiV
62c6c4b9bd 同步 develop 最新代码 2024-04-12 19:17:49 +08:00
YunaiV
9cba258d8f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-04-12 19:14:56 +08:00
YunaiV
2e03dcba69 移除 resilience4j 组件 2024-04-10 20:57:44 +08:00
YunaiV
9b9f54bb03 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
 2024-04-05 13:32:17 +08:00
YunaiV
beea186507 全局：增加 VO 数据翻译的支持 2024-04-01 12:42:27 +08:00
YunaiV
dcf6cc293e BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差 2024-03-30 20:44:45 +08:00
YunaiV
3b379d8cc0 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
 2024-03-30 11:54:27 +08:00
YunaiV
907f3a58ba Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2024-03-28 18:53:54 +08:00
puhui999
ce013a2562 CRM: 新增客户行业、来源、级别统计数据统计 2024-03-24 17:15:56 +08:00
YunaiV
cc27652f86 最新菜单 SQL 的同步 2024-03-24 10:43:37 +08:00
YunaiV
e5444c5d47 BPM：优化 convert 的逻辑 2024-03-20 21:32:01 +08:00
YunaiV
797fddfb3d BPM：新增 flowable expression 表达式，替代现有 BpmTaskAssignScript，更加灵活 2024-03-14 12:54:16 +08:00
YunaiV
8dcc12f215 CRM：code review 客户总量统计 2024-03-09 16:32:18 +08:00
cherishsince
33d77b9b16 配置 yudao-dependencies spring-ai依赖 2024-03-03 20:19:06 +08:00
YunaiV
31e8777a7b ✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能 2024-02-26 13:09:51 +08:00
YunaiV
a390fb4519 ✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能 2024-02-26 12:55:58 +08:00
YunaiV
088fbb2096 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-02-26 12:25:55 +08:00
YunaiV
9ea7bde751 📖 ERP：增加 ERP 首页的统计 2024-02-18 19:05:40 +08:00
YunaiV
20f8cb1606 ✨ 2.0.1 版本发布准备 2024-02-17 21:01:59 +08:00
YunaiV
94153cb59e ✨ 增加 ERP 系统的介绍 2024-02-17 10:10:09 +08:00
YunaiV
bfe3dc95fe ✨ ERP：增加供应商的实现 2024-02-06 17:59:44 +08:00
YunaiV
e9a29e6dd4 CRM：优化合同金额排行、回款金额排行 2024-02-03 01:14:35 +08:00
安浩浩
46e01e07a8 修改：CRM 商业智能，合并模块到 crm，优化查询 2024-01-31 23:35:27 +08:00
anhaohao
fdd5d55fc8 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:11:00 +08:00
anhaohao
65d7f8c4ab 新增：CRM 商业智能，合同金额排行榜和回款金额排行榜 2024-01-28 20:06:56 +08:00
YunaiV
ebd9222764 ✨ ERP：初始化模块，立个 2024 年的 flag 2024-01-27 17:25:07 +08:00
YunaiV
5b69df074c ✨ 全局：将 banner、error-code、desensitize 融合到 web 组件里，减少 starter 2024-01-27 10:25:25 +08:00
YunaiV
6a6e95fcb6 ✨ 对齐 BOOT 与 CLOUD 的代码 2024-01-19 22:13:55 +08:00
YunaiV
f4a55d3e26 🙂 同步 develop 最新开发代码 2024-01-19 09:10:26 +08:00
YunaiV
290f45dd6e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
 2023-12-30 20:11:07 +08:00
YunaiV
078ead536b 🐛 REPORT：支持 SaaS 租户模式 2023-12-30 10:30:47 +08:00
YunaiV
5de6a8bd23 📖 code review：操作日志的实现 2023-12-25 21:40:16 +08:00
YunaiV
82a25474f6 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 08:43:38 +08:00
YunaiV
7542b6a78d ✨ Member：完善微信相关配置 2023-12-25 08:43:32 +08:00
puhui999
3e91ac73c4 CRM：完善数据分页查询条件构造 CrmQueryWrapperUtils 2023-12-19 10:29:41 +08:00
YunaiV
23df8633f4 📖 CRM：code review 数据权限的实现 2023-12-09 10:50:47 +08:00
puhui999
5c395fc1c4 CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV
a9ae7b0865 ✅ 完善 UReport2 的集成 2023-12-07 07:37:32 +08:00
YunaiV
076bf13687 📈 REPORT：code review ureport2 实现 2023-12-06 21:02:26 +08:00
liuhongfeng
0d3efe4f80 【优化】ureport2菜单，初始化数据，按照规范重新进行命名处理 2023-12-06 21:02:26 +08:00
YunaiV
5e9cbb9cad report：code review ureport 的集成 2023-12-06 21:02:26 +08:00
liuhongfeng
5894d2be01 【修改】ureport2 集成的SQL语句，并适配数据库存储方式 2023-12-06 21:02:26 +08:00
liuhongfeng
8507fa9172 【新增】ureport2 集成 2023-12-06 21:02:25 +08:00
YunaiV
9451287264 ✨ CRM：同步最新功能，基本跑通客户信息的维护 2023-12-06 20:28:53 +08:00
YunaiV
c94f71a3df 🔨 CRM：优化产品分类代码的实现 2023-12-06 12:56:35 +08:00
芋道源码
7724d6e830
!765 Vue2 + Element UI 代码生成器 
Merge pull request !765 from 芋道源码/feature/sub-table
 2023-11-28 12:28:30 +00:00
puhui999
6d228828f4 application-local.yaml 恢复 2023-11-27 16:34:55 +08:00
YunaiV
0233b092b8 websocket：重新封装 websocket 组件，支持 sender 广播 2023-11-24 00:32:52 +08:00
YunaiV
1941a7b3e6 websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息 2023-11-22 23:17:50 +08:00
YunaiV
827897807f 提升启动速度 2023-11-19 18:46:16 +08:00
YunaiV
e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
 2023-11-19 18:39:55 +08:00
YunaiV
6270975902 优化启动速度 2023-11-19 00:37:30 +08:00
YunaiV
5122aee924 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/views/system/user/index.vue
 2023-11-18 20:44:06 +08:00
puhui999
df69fecbb4 代码生成：重构 vue2 模版，适配树表和主子表（80%） 2023-11-17 17:03:35 +08:00
YunaiV
feba904fd8 多租户：登录界面，根据 host 域名获取对应的租户编号 2023-11-06 19:47:21 +08:00
YunaiV
c162b39e1e 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
YunaiV
989d7c44d0 code review 店铺装修 2023-11-04 22:52:41 +08:00
YunaiV
5bb91f139e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-11-03 23:34:37 +08:00
YunaiV
456b0c8ddd mq：增加 kafka 配置项 2023-11-02 12:25:50 +08:00
YunaiV
20725e3dfd mq：增加 rabbitmq 配置项 2023-11-02 08:22:05 +08:00
YunaiV
b8d5a665be mq：增加 rocketmq 配置项 2023-11-02 00:07:38 +08:00
YunaiV
c066ea46f9 mq 重构：默认的 redis 实现： 
1）默认 channel 和 stream key
2）移除 enabled 开关，通过 listener 是否存在来实现
3）调整包名，为接入 rocketmq 作为 mq 实现做准备
 2023-10-30 21:15:22 +08:00
YunaiV
0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 14:25:38 +08:00
YunaiV
c11300d33a 解决启动问题 2023-10-24 19:54:49 +08:00
YunaiV
dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
YunaiV
fc2d30cfaf pay：修复单元测试报错 2023-10-24 08:09:47 +08:00
YunaiV
94c2ad5d1d 修复报错的单元测试 2023-10-22 08:55:27 +08:00
YunaiV
785fbeeb5b code review：限时折扣活动 2023-10-21 18:16:09 +08:00
芋道源码
90fb2c62b8
!683 mall模块 
Merge pull request !683 from zxiaoxiu/discount
 2023-10-21 09:23:50 +00:00
YunaiV
7e312aae02 初始化 crm 模块 2023-10-15 20:16:46 +08:00
puhui999
b009f0b058 application-local.yaml 恢复 2023-10-15 16:43:04 +08:00