YunaiV
|
d100093be1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2024-09-17 17:26:01 +08:00 |
|
YunaiV
|
c71182dda9
|
【功能优化】定时任务的 Bean 不存在时，进行报错提示
|
2024-09-12 13:44:13 +08:00 |
|
YunaiV
|
a6338b8635
|
【代码优化】增强 JDK17、JDK8 之间的兼容性
|
2024-09-07 20:52:28 +08:00 |
|
YunaiV
|
8024d0af3f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/dto/CouponValidReqDTO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/RewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
|
2024-09-07 20:45:32 +08:00 |
|
YunaiV
|
30fd7996f6
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-09-07 08:47:56 +08:00 |
|
YunaiV
|
2759a32331
|
【功能移除】INFRA：移除 Vue3 + Element Plus schema 模式
|
2024-09-07 08:30:29 +08:00 |
|
YunaiV
|
54956fcbb9
|
【功能优化】INFRA：VBEN 的 dict 下拉类型不精准的问题
|
2024-09-07 08:25:51 +08:00 |
|
YunaiV
|
2f9d9723b3
|
【代码优化】框架：简化 api 访问日志、错误日志的记录逻辑
|
2024-09-06 22:38:42 +08:00 |
|
YunaiV
|
9fbc953dd1
|
【功能修复】INFRA：代码生成在 ERP 模式时，updateTime 无法被正确更新
|
2024-09-03 08:54:56 +08:00 |
|
YunaiV
|
aaee3216f7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-08-31 09:38:52 +08:00 |
|
YunaiV
|
f00b3005c7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java
|
2024-08-31 08:53:45 +08:00 |
LAPTOP-00JMG2HE\George Wei
|
45a4108138
|
添加忽略expiresTime、createTime和updateTime的TODO提示
|
2024-08-24 22:05:41 +08:00 |
|
YunaiV
|
02562cb77d
|
bugfix: S3 客服端 VirtualStyle 判断逻辑错误
|
2024-08-23 20:01:32 +08:00 |
|
YunaiV
|
4e1d7d0877
|
【优化】代码生成：针对 element-plus 的 checkbox、radio 的 label => value 的调整
|
2024-08-23 19:49:40 +08:00 |
|
LAPTOP-00JMG2HE\George Wei
|
e36671255a
|
修复执行mvn test时多个TestCase失败的问题。失败原因：1)使用断言比较POJO对象时未忽略expiresTime、createTime、updateTime属性；2)初始化测试数据库时未以UTF8编码读取脚本
|
2024-08-23 18:41:28 +08:00 |
cpp009
|
d23279994b
|
bugfix: S3 客服端 VirtualStyle 判断逻辑错误
|
2024-08-22 21:49:31 +08:00 |
|
YunaiV
|
7c54204716
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
|
2024-07-28 20:44:58 +08:00 |
|
YunaiV
|
668870d052
|
【同步】BOOT 和 CLOUD 的功能
|
2024-07-27 15:41:23 +08:00 |
|
YunaiV
|
4386c7018c
|
【功能优化】全局：文件存储 S3 兼容腾讯云、火山云的 VirtualStyle 模式
|
2024-07-27 10:23:24 +08:00 |
|
YunaiV
|
39c0652c43
|
【功能优化】全局：代码生成字段过多时，操作栏设置 min-width 保证宽度
|
2024-07-26 22:08:57 +08:00 |
|
YunaiV
|
6325ff1144
|
【功能修复】全局：代码生成器的 `tenant_id` 字段增加 default 0 值不正确的问题
|
2024-07-26 21:59:44 +08:00 |
|
YunaiV
|
63dd0905d3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-26 21:07:50 +08:00 |
|
YunaiV
|
9eeaa11520
|
【功能修复】全局：vben 前端代码生成后列表页面是空的问题
|
2024-07-26 21:07:40 +08:00 |
|
YunaiV
|
d608974c17
|
【功能新增】INFRA：增加 ConfigApi，支持参数配置的读取
|
2024-07-20 17:56:29 +08:00 |
|
YunaiV
|
2c9866b551
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-20 17:55:17 +08:00 |
|
YunaiV
|
9f86ef862d
|
【功能新增】INFRA：增加 ConfigApi，支持参数配置的读取
|
2024-07-20 17:55:06 +08:00 |
|
YunaiV
|
d156742fce
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-19 23:03:16 +08:00 |
|
YunaiV
|
bbdf9e9b2e
|
【功能修复】全局：请求租户不存在时，记录访问日志、操作日志异常的问题
|
2024-07-19 22:54:38 +08:00 |
|
YunaiV
|
85848f0830
|
【代码优化】调整 swagger 的安全配置
|
2024-07-16 00:32:17 +08:00 |
|
YunaiV
|
28d74d07ac
|
【代码优化】调整 swagger 的安全配置
|
2024-07-16 00:30:54 +08:00 |
|
YunaiV
|
0566f5fa93
|
【依赖】mybatis-plus from 3.5.5 to 3.5.7
|
2024-07-13 22:52:23 +08:00 |
|
YunaiV
|
3e3407eb99
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java
|
2024-07-13 22:43:33 +08:00 |
|
YunaiV
|
2b39b434fa
|
【依赖】mybatis-plus from 3.5.5 to 3.5.7
|
2024-07-13 22:42:54 +08:00 |
|
YunaiV
|
f1f2e24cde
|
FIX_BUG controller.vm模版中的export-excel引用的Vo类没有加上sceneEnum.prefixClass前缀导致报错
|
2024-07-07 09:26:28 +08:00 |
|
YunaiV
|
0fa5cf1db6
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-07 09:24:46 +08:00 |
|
YunaiV
|
a0020f0339
|
修复主子表ERP模式下代码自动生成不全问题 #583
|
2024-07-07 09:13:42 +08:00 |
|
YunaiV
|
8d138cd1e9
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2024-07-07 09:11:46 +08:00 |
Syriana_Zh
|
5e8348dfca
|
FIX_BUG controller.vm模版中的export-excel引用的Vo类没有加上sceneEnum.prefixClass前缀导致报错
Signed-off-by: Syriana_Zh <4916681+sairupe@user.noreply.gitee.com>
|
2024-06-27 10:01:24 +00:00 |
就是那棵菜
|
7a42b3fab7
|
测试
test
|
2024-06-27 17:15:11 +08:00 |
|
就是那棵菜
|
47c8035dbc
|
Update mapper_sub.vm
在“基础设施-代码生成”模块中，当选主子表ERP模式时，补充主表与子表一对一情况下需要生成的接口：default ${subTable.className}DO selectBy${SubJoinColumnName}
|
2024-06-27 16:10:09 +08:00 |
|
YunaiV
|
90ea7b951c
|
【修复】代码生成，Remove duplicate package imports
|
2024-06-22 08:48:25 +08:00 |
dengyumin
|
60bdb178a8
|
fix: Remove duplicate package imports
|
2024-06-17 23:08:14 +08:00 |
|
YunaiV
|
9a9d95f045
|
模块名称和表名称一样时，代码生成存在问题，如“shop”模块的“shop”表生成代码时shop都被移除了
|
2024-06-15 18:04:02 +08:00 |
山野羡民
|
ff461ea9d6
|
update CodegenEngine.java.
模块名称和表名称一样时，代码生成存在问题，如“shop”模块的“shop”表生成代码时shop都被移除了
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
|
2024-06-14 06:27:42 +00:00 |
|
YunaiV
|
41ea482f8d
|
同步 HTTP 请求签名
|
2024-06-04 21:32:49 +08:00 |
|
YunaiV
|
5b1287ad41
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
|
2024-06-04 21:20:26 +08:00 |
|
YunaiV
|
f091727ad3
|
【新增】framework：针对大金的适配
|
2024-06-04 19:32:06 +08:00 |
|
YunaiV
|
1e391d626e
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
|
2024-06-03 21:45:03 +08:00 |
高高
|
6a6c30c375
|
修改文案描述错误
修改文案描述错误
Signed-off-by: 高高 <171376172@qq.com>
|
2024-05-20 01:43:30 +00:00 |
orchidblessing
|
9cc6528eba
|
fix：上传文件测试时pg数据库字段类型不一致报错
错误详情：Caused by: org.postgresql.util.PSQLException: ERROR: column "id" is of type bigint but expression is of type character varying
|
2024-05-19 18:05:38 +08:00 |