|
|
79d02b5fdd
|
修改mysql地址密码
Java CI with Maven / build (11) (push) Waiting to run
Java CI with Maven / build (17) (push) Waiting to run
Java CI with Maven / build (8) (push) Waiting to run
yudao-ui-admin CI / build (14.x) (push) Waiting to run
yudao-ui-admin CI / build (16.x) (push) Waiting to run
|
2024-07-08 15:37:44 +08:00 |
|
YunaiV
|
1906557491
|
【移除】CRM 模块
Java CI with Maven / build (11) (push) Waiting to run
Java CI with Maven / build (17) (push) Waiting to run
Java CI with Maven / build (8) (push) Waiting to run
yudao-ui-admin CI / build (14.x) (push) Waiting to run
yudao-ui-admin CI / build (16.x) (push) Waiting to run
|
2024-05-04 09:54:39 +08:00 |
|
YunaiV
|
a46b86fa62
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.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/statistics/CrmStatisticsCustomerController.http
# 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/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.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/statistics/CrmStatisticsCustomerMapper.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/customer/CrmCustomerService.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/statistics/CrmStatisticsCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.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/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPortraitServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
# yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
# yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponTemplateMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.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/trade/TradeOrderStatisticsServiceImpl.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateServiceImpl.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/price/calculator/TradePriceCalculatorHelper.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
|
2024-05-04 09:53:54 +08:00 |
|
YunaiV
|
8428cc5b99
|
【发版】全局：2.1.0 发版
|
2024-05-04 09:44:20 +08:00 |
|
YunaiV
|
cec5c287f9
|
【同步】JDK17 和 JDK8 的代码
|
2024-05-04 09:42:16 +08:00 |
|
YunaiV
|
9f63e1e294
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-05-04 09:39:07 +08:00 |
|
YunaiV
|
c52ec92b05
|
【发版】全局：2.1.0 发版
|
2024-05-04 09:38:21 +08:00 |
|
YunaiV
|
ebd5ba02d2
|
【优化】CRM：增加对 JDK8 的兼容性，使用 ListUtil 替代 List of
|
2024-05-04 09:36:15 +08:00 |
|
芋道源码
|
b2da43f4c3
|
!965 同步 DB 转换
Merge pull request !965 from 芋道源码/feature/db
|
2024-05-04 01:21:06 +00:00 |
|
YunaiV
|
3eaa6287a0
|
【优化】全局：完善数据库转化的 README.md，清理 quartz 脚本里的无用数据
|
2024-05-04 09:19:32 +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 |
|
芋道源码
|
a70463b961
|
!964 feat: 达梦DM8
Merge pull request !964 from dhb52/feature/db
|
2024-05-04 00:57:27 +00:00 |
|
dhb52
|
c24fb20311
|
feat: 测试数据库docker容器的销毁重建说明
|
2024-05-04 00:20:23 +08:00 |
|
dhb52
|
65651fb1ed
|
feat: 创建虚拟dual表，达梦脚本优化
|
2024-05-04 00:05:42 +08:00 |
|
dhb52
|
774082509b
|
feat: 达梦DM8
|
2024-05-03 23:22:53 +08:00 |
|
YunaiV
|
93e8e9c7af
|
【优化】全局：JobController 增加 sync 接口，实现将 infra_job 同步到 Quartz 中
|
2024-05-03 22:37:15 +08:00 |
|
YunaiV
|
ffac294fbd
|
【优化】全局：兼容 MyBatis Plus 针对 SQL Server 的 saveBatch 不兼容的兼容
|
2024-05-03 22:11:22 +08:00 |
|
YunaiV
|
df08a2ecf0
|
【优化】新增 quartz.sql，完善 README.md
|
2024-05-03 11:28:04 +08:00 |
|
芋道源码
|
b4a867b89c
|
!963 feat: 脚本兼容Python 3.9, 抽取更多公共代码; 更新使用文档
Merge pull request !963 from dhb52/feature/db
|
2024-05-03 03:08:58 +00:00 |
|
YunaiV
|
290a981cae
|
【修复】全局：移除 Druid 广告逻辑未按照期望执行
|
2024-05-03 10:38:05 +08:00 |
|
YunaiV
|
f381568f6b
|
【修复】CRM：商机添加商品时，businessProducts 参数错误，应该是 products
|
2024-05-03 10:35:58 +08:00 |
|
YunaiV
|
022238758c
|
【完善】适配 jimu 报表的安全配置
|
2024-05-03 10:12:40 +08:00 |
|
YunaiV
|
ee3e507f07
|
【优化】GlobalExceptionHandler 新增 IGNORE_ERROR_MESSAGES，用于忽略“无效的刷新令牌”等非关键提示
|
2024-05-03 09:55:04 +08:00 |
|
YunaiV
|
88ac5be882
|
【修复】ApiAccessLogInterceptor 处理 request body 为 "" 空串的情况
|
2024-05-03 09:37:49 +08:00 |
|
YunaiV
|
29746d1459
|
【修复】MySQL jdbc 连接 5.7 示例不正确
|
2024-05-03 09:04:47 +08:00 |
|
dhb52
|
6d19690bea
|
feat: 脚本兼容Python 3.9, 抽取更多公共代码; 更新使用文档
|
2024-05-02 23:38:56 +08:00 |
|
YunaiV
|
d98419b03f
|
【完善】增加 sql-tools 的 README.md 文档，方便大家使用
|
2024-05-02 18:47:42 +08:00 |
|
YunaiV
|
877a12c832
|
Merge remote-tracking branch 'origin/feature/db' into feature/db
|
2024-05-02 18:16:22 +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 |
|
芋道源码
|
e08a103cbc
|
!962 feat: 添加自动转换py脚本
Merge pull request !962 from dhb52/feature/db
|
2024-05-02 10:05:03 +00:00 |
|
YunaiV
|
b0b8067629
|
【修复】代码生成：处理 SQLServer 数据库获取不到数据表结构注释
|
2024-05-02 18:03:34 +08:00 |
|
dhb52
|
1d4bb4d563
|
feat: 添加自动转换py脚本
|
2024-05-02 17:42:07 +08:00 |
|
芋道源码
|
9163ede8de
|
!961 wip: SQLServer数据库更新, 代码生成注释乱码
Merge pull request !961 from dhb52/feature/db
|
2024-05-02 07:42:05 +00:00 |
|
dhb52
|
fd8889e76a
|
wip: SQLServer数据库更新, 代码生成注释乱码
|
2024-05-02 15:30:33 +08:00 |
|
YunaiV
|
b7554e935c
|
【修复】商城系统：优惠活动中的限时活动，添加活动报错系统异常
|
2024-05-02 14:57:53 +08:00 |
|
芋道源码
|
5aca12e689
|
!960 fix: Postgres/Oracle部分字段注释缺失
Merge pull request !960 from dhb52/feature/db
|
2024-05-02 03:08:36 +00:00 |
|
YunaiV
|
3f7e99c938
|
【修复】商城系统：管理后台的商城订单统计数据有问题
|
2024-05-02 09:25:03 +08:00 |
|
YunaiV
|
f9a50116bc
|
【修复】商城系统：管理后台修改待支付订单，调整价格取值错误
|
2024-05-02 09:13:31 +08:00 |
|
dhb52
|
977a250f1a
|
fix: Postgres/Oracle部分字段注释缺失
|
2024-05-02 00:34:25 +08:00 |
|
dhb52
|
7e47d2efbb
|
feat: 将数据库工具迁移至sql/tools目录
|
2024-05-01 23:49:09 +08:00 |
|
YunaiV
|
dae4e64a64
|
【修复】商城系统：管理后台发放优惠劵时，只能发送未修改过有效期类型的优惠券
|
2024-05-01 23:36:44 +08:00 |
|
YunaiV
|
bbfff1bae3
|
【修复】商城系统：店铺装修时，商品列表组件返回的商品信息，按照选择的顺序返回
|
2024-05-01 19:09:12 +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
|
6f68834249
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
|
2024-05-01 08:34:33 +08:00 |
|
YunaiV
|
c6eed9a636
|
【修复】Oracle 自带系统表，影响代码生成
|
2024-05-01 08:17:23 +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 |
|
芋道源码
|
97fa3cbb80
|
!959 ✨Oracle数据库DDL更新适配
Merge pull request !959 from dhb52/feature/db
|
2024-04-30 22:29:06 +00:00 |
|
YunaiV
|
1df2fb3b85
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-05-01 01:56:10 +08:00 |
|
YunaiV
|
02e0f5d034
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
|
2024-05-01 01:22:06 +08:00 |
|
YunaiV
|
1c9b5ddae9
|
【优化】降低 JDK 21 最低到 17 版本
|
2024-05-01 01:21:34 +08:00 |
|
