YunaiV
|
7e3f92c3a3
|
【优化】忽略多租户的表，兼容表名带有包裹符号的情况
|
2024-10-12 19:55:13 +08:00 |
zoemak
|
acc20af6ad
|
【优化】忽略多租户的表，兼容表名带有包裹符号的情况
利用SqlParserUtils.removeWrapperSymbol(tableName)去掉表名前后的引用符号，比如MySQL的反引号或者SQLServer的中括号
Signed-off-by: zoemak <58775+zoemak@user.noreply.gitee.com>
|
2024-10-10 08:40:10 +00:00 |
|
YunaiV
|
eaa22e7a56
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptLeaderStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptMemberStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateGroupStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidatePostStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserSelectStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
# yudao-server/pom.xml
|
2024-10-04 17:16:23 +08:00 |
|
YunaiV
|
9334edc9ea
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-10-03 11:28:22 +08:00 |
|
YunaiV
|
a9928fa227
|
【功能优化】SYSTEM：支持通过 refreshToken 认证，解决部分场景不方便刷新访问令牌场景
|
2024-10-02 14:54:00 +08:00 |
|
YunaiV
|
44b466c678
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-server/pom.xml
|
2024-10-01 19:54:22 +08:00 |
|
YunaiV
|
5e9bdcb21f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2024-10-01 16:11:13 +08:00 |
|
YunaiV
|
eae97e1b33
|
【功能优化】spring security：antMatchers 替换成 requestMatchers
|
2024-10-01 15:13:01 +08:00 |
|
YunaiV
|
2bbb7f86fe
|
【同步】BOOT 和 CLOUD 的功能
|
2024-10-01 14:39:30 +08:00 |
|
YunaiV
|
2ca4f1fb9b
|
【功能调整】全局：默认 /app-api/* 需要登录，和 /admin-api/* 保持一致，降低大家理解成本
|
2024-10-01 11:45:00 +08:00 |
|
YunaiV
|
3affec34d8
|
【功能调整】全局：默认 /app-api/* 需要登录，和 /admin-api/* 保持一致，降低大家理解成本
|
2024-10-01 11:34:48 +08:00 |
|
YunaiV
|
3d3b2cd6d5
|
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/controller/app/file/AppFileController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/AppFavoriteController.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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.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/combination/AppCombinationRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyPageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/reward/AppRewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/AppCartController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/AppMemberPointRecordController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInRecordController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/channel/AppPayChannelController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
|
2024-10-01 11:33:41 +08:00 |
|
YunaiV
|
8fd0f72925
|
【功能调整】全局：默认 /app-api/* 需要登录，和 /admin-api/* 保持一致，降低大家理解成本
|
2024-10-01 11:33:18 +08:00 |
|
YunaiV
|
2299a326b5
|
Merge branch 'master-jdk17' 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-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/DiscountActivityApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/reward/RewardActivityApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/DiscountActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityUpdateReqVO.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/service/bargain/BargainActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.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-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
|
2024-10-01 11:29:32 +08:00 |
|
YunaiV
|
caf49aae35
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
|
2024-09-30 09:04:03 +08:00 |
|
YunaiV
|
123347b036
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-09-29 21:40:59 +08:00 |
|
YunaiV
|
3278d38cbe
|
【依赖升级】easyexcel from 3.3.4 to 4.0.3
|
2024-09-29 21:40:31 +08:00 |
|
YunaiV
|
eec41f99f2
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-09-29 21:02:06 +08:00 |
|
YunaiV
|
21cb53bfca
|
【依赖升级】mybatis-plus from 3.5.7 to 3.5.8
|
2024-09-29 21:01:42 +08:00 |
|
YunaiV
|
9f676fecfa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java
|
2024-09-29 12:58:49 +08:00 |
|
YunaiV
|
42b7946685
|
【功能修复】代码生成：代同步数据库结构之后字段顺序混乱的问题
|
2024-09-29 07:41:35 +08:00 |
|
YunaiV
|
f6a6a1ff88
|
【代码评审】商城：积分商城的 review
|
2024-09-29 07:28:04 +08:00 |
puhui999
|
dd82f13c03
|
【功能完善】商城: APP 积分商城活动完善 app-api 接口
|
2024-09-28 11:32:11 +08:00 |
|
YunaiV
|
9a885639ae
|
【功能修复】单测执行报错的问题
|
2024-09-22 12:10:57 +08:00 |
|
YunaiV
|
674e7520cc
|
【功能优化】信创数据库：大金数据库支持 Quartz 的兼容
|
2024-09-21 20:39:53 +08:00 |
|
YunaiV
|
2c67bd3a09
|
【功能优化】信创数据库：移除 SqlConstants 类，完善 limit 的适配
|
2024-09-21 20:04:22 +08:00 |
|
YunaiV
|
b13dc10062
|
【功能优化】信创数据库：增加 Quartz 适配
|
2024-09-21 19:48:37 +08:00 |
|
YunaiV
|
af5520db46
|
【缺陷修复】全局：完善对 SQLServer 2015 的兼容性
|
2024-09-17 20:39:34 +08:00 |
|
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
|
15fba0ecc9
|
【代码优化】YudaoWebSocketAutoConfiguration 去除多余的 matchIfMissing
|
2024-09-17 16:56:49 +08:00 |
|
YunaiV
|
4e8e491035
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
|
2024-09-17 15:34:30 +08:00 |
|
YunaiV
|
c0e2bdbdd4
|
【代码评审】IOT：物模型的 review
|
2024-09-16 20:00:47 +08:00 |
|
YunaiV
|
222aa33f3e
|
【代码优化】商城：完善满减送的计算逻辑
|
2024-09-15 20:04:40 +08:00 |
|
YunaiV
|
01660355cc
|
【功能优化】websocket 允许不传递 token 连接
|
2024-09-12 13:59:42 +08:00 |
|
YunaiV
|
d8d385e489
|
【功能修复】定时任务在多租户下，没有记录执行的日志结果
|
2024-09-12 13:39:19 +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
|
7c79aae2b4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
|
2024-09-07 20:37:57 +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
|
2f9d9723b3
|
【代码优化】框架：简化 api 访问日志、错误日志的记录逻辑
|
2024-09-06 22:38:42 +08:00 |
|
YunaiV
|
12ce87b305
|
【功能修复】框架：操作日志异步记录时，丢失 request 的问题
|
2024-09-06 21:43:59 +08:00 |
|
YunaiV
|
39f71168eb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-09-02 12:27:03 +08:00 |
|
YunaiV
|
ea75cf8502
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-08-31 13:31:11 +08:00 |
|
YunaiV
|
56ae4503a6
|
【代码优化】SYSTEM：操作日志，增加异步记录
|
2024-08-31 13:28:30 +08:00 |
|
YunaiV
|
09551193b0
|
【代码修复】SYSTEM：角色标识的提示不正确问题
|
2024-08-31 10:16:17 +08:00 |
|
YunaiV
|
8829abe740
|
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/web/core/handler/GlobalExceptionHandler.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java
|
2024-08-31 10:05:52 +08:00 |
|
YunaiV
|
a677e98de0
|
【代码修复】SYSTEM：角色标识的提示不正确问题
|
2024-08-31 10:05:33 +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 |
|
YunaiV
|
d745a1832d
|
Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
# 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:23:51 +08:00 |
|
YunaiV
|
39ec137047
|
【代码优化】apiErrorLogFrameworkService 变量名小写
|
2024-08-31 08:18:24 +08:00 |
|
YunaiV
|
86a413f57d
|
1059 【轻量级 PR】：日志记录租户Job错误信息
|
2024-08-30 23:19:00 +08:00 |
杨宇庆
|
10c0b86f9b
|
日志记录租户Job错误信息
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-08-28 05:58:19 +00:00 |
scholar
|
1c1abae5bb
|
七牛云短信实现，评审意见修改
|
2024-08-28 10:51:19 +08:00 |
|
YunaiV
|
ff6bee964b
|
【功能新增】工作流：BPM Model 增加 type 标记是 BPMN 设计器，还是 SIMPLE 钉钉设计器
|
2024-08-26 18:38:32 +08:00 |
|
scholar
|
4f7ac969fe
|
增加七牛云短信实现
|
2024-08-26 15:52:41 +08:00 |
|
YunaiV
|
ae7323cbe0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.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/price/calculator/TradePointUsePriceCalculator.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java
|
2024-08-09 21:52:44 +08:00 |
|
YunaiV
|
5071194501
|
Merge branch 'develop' of https://github.com/YunaiV/ruoyi-vue-pro into develop
|
2024-08-09 21:45:31 +08:00 |
|
YunaiV
|
22686bafa2
|
【代码优化】SYSTEM：增加新阿里云 SmsClient 的单测
|
2024-08-09 20:41:35 +08:00 |
brook
|
fd42e1711d
|
fix: insertOrUpdate死循环问题
|
2024-08-09 11:31:14 +08:00 |
安浩浩
|
b47176c96e
|
新增：iot 模块 集成 emqx 接收 mqtt 接收消息
|
2024-08-06 22:17:29 +08:00 |
|
YunaiV
|
7ba3b12313
|
【优化】数据脱敏支持 Spring el 表达式，支持根据权限控制脱敏
|
2024-08-03 18:48:06 +08:00 |
|
YunaiV
|
760b4c147d
|
Merge branch 'dev-0712-sensitive' of https://github.com/craftsman4j/ruoyi-vue-pro into develop
|
2024-08-03 16:54:17 +08:00 |
|
YunaiV
|
f3a8d6f06c
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2024-07-31 23:49:21 +08:00 |
zhougang
|
08e1c69d10
|
【优化】数据脱敏支持 Spring el 表达式，支持根据权限控制脱敏
|
2024-07-31 22:43:48 +08:00 |
|
芋道源码
|
36765d53a1
|
!1017 bugfix-导入系统用户时，增加注解校验过程，与界面添加和修改用户保持一致
Merge pull request !1017 from 尹先生/master-jdk17
|
2024-07-29 11:36:45 +00:00 |
常柯柯
|
18cf9e55e1
|
【代码优化】全局：Area 在 IDEA debug 时 toString 方法报错StackOverflowError、指定 jackson 默认序列化时双向引用的前向、后向出口避免死循环报错
Signed-off-by: 常柯柯 <88455621@qq.com>
|
2024-07-29 09:40:13 +00: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
|
ad22a9d516
|
【代码优化】全局：Area 在 IDEA debug 时 toString 方法报错StackOverflowError、指定 jackson 默认序列化时双向引用的前向、后向出口避免死循环报错
|
2024-07-28 19:34:38 +08:00 |
|
YunaiV
|
d9b913a7dd
|
【功能修复】全局：访问日志的 query 查询未记录到的问题
|
2024-07-26 22:48:20 +08:00 |
|
YunaiV
|
c660833697
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceImpl.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPayClientConfig.java
|
2024-07-26 09:17:51 +08:00 |
|
YunaiV
|
41ee237161
|
【代码优化】全局：DeptDataPermissionRule 的 ExpressionList 泛型 Long，解决部分 IDEA 的 jdk 编译存在问题
|
2024-07-26 09:17:33 +08:00 |
|
YunaiV
|
55e1bca3c0
|
【代码修复】PAY：微信扫码支付 v2 版本，缺少 product_id 的报错
|
2024-07-24 21:35:37 +08:00 |
|
YunaiV
|
625265b11d
|
【同步】BOOT 和 CLOUD 的功能
|
2024-07-24 19:05:30 +08:00 |
|
YunaiV
|
a131434f94
|
【同步】jdk21 和 jdk8 的代码
|
2024-07-24 18:55:24 +08:00 |
|
YunaiV
|
257acba31e
|
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/core/interceptor/ApiAccessLogInterceptor.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
|
2024-07-24 18:46:33 +08:00 |
|
YunaiV
|
d87d51b701
|
【功能优化】全局：ApiAccessLogInterceptor 额外打印 Controller 地址，基于 https://t.zsxq.com/Z70Sl 建议
|
2024-07-24 13:30:02 +08:00 |
|
YunaiV
|
ebe3cc727b
|
【功能新增】全局：多租户缓存，增加忽略的 Spring Cache 配置
|
2024-07-23 23:25:56 +08:00 |
|
YunaiV
|
aef833fb9f
|
【代码优化】全局：userId 为空时，直接校验权限不通过
|
2024-07-23 22:40:33 +08:00 |
yinyilong
|
878b56a7d6
|
bugfix-导入系统用户时，增加注解校验过程，与界面添加和修改用户保持一致
|
2024-07-23 14:43:57 +08:00 |
|
YunaiV
|
743383faf2
|
【代码修复】全局：BaseMapperX 的分页 pageSize 不分页判断不对的问题
|
2024-07-21 18:03:16 +08:00 |
|
YunaiV
|
a210210b20
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletController.java
|
2024-07-21 11:15:04 +08:00 |
|
YunaiV
|
2c429263d0
|
【功能修复】全局：SelectSheetWriteHandler 在没有任何 SelectSheetWriteHandler 的情况下，导致 Excel 导入不解析下拉框的问题
|
2024-07-20 18:58:42 +08:00 |
|
YunaiV
|
a31dd24399
|
【功能优化】全局：LoginUser 新增过期时间，方便判断 token 过期
|
2024-07-20 18:42:19 +08:00 |
|
YunaiV
|
c5689b4625
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-19 23:36:43 +08:00 |
|
YunaiV
|
a8fc7982ff
|
【功能优化】全局：简化 GlobalExceptionHandler 对 ServiceException 的打印
|
2024-07-19 23:36:34 +08:00 |
|
YunaiV
|
6aac058be7
|
【功能优化】全局：处理 HttpRequestMethodNotSupportedException 异常
|
2024-07-19 23:12:41 +08:00 |
|
YunaiV
|
9f94ddf93a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-19 23:12:06 +08:00 |
|
YunaiV
|
047051e008
|
【功能优化】全局：处理 HttpRequestMethodNotSupportedException 异常
|
2024-07-19 23:11:56 +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
|
193c358f3e
|
【依赖】解决 redisson-spring-boot-starter 升级到 3.32.0 后的 Tuple NoClassDefFoundError 报错
|
2024-07-17 19:24:34 +08:00 |
|
YunaiV
|
85090b8224
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-13 23:35:55 +08:00 |
|
YunaiV
|
bea66e5c6f
|
【代码优化】全局：复用 MyBatis Plus 数据权限插件，简化项目的数据权限实现
|
2024-07-13 23:35:39 +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
|
ce1940e4f3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
|
2024-07-13 12:14:46 +08:00 |
|
YunaiV
|
8d1d0c15f7
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:03:26 +08:00 |
|
YunaiV
|
88b897ca13
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-12 09:34:44 +08:00 |
|
芋道源码
|
90fa7be660
|
!1006 AI 大模型的草稿提交（code review 代码）
Merge pull request !1006 from 芋道源码/master-jdk21-ai
|
2024-07-12 01:29:43 +00:00 |
|
YunaiV
|
a19bd126e1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-07 17:00:16 +08:00 |
|
芋道源码
|
3d44c2f9e3
|
!1009 数据库 findInSet 兼容
Merge pull request !1009 from 芋道源码/feature/db
|
2024-07-07 01:32:51 +00:00 |
|
YunaiV
|
f5ed040943
|
【代码优化】全局：数据库 findInSet 兼容
|
2024-07-07 09:31:27 +08:00 |
|
YunaiV
|
5d3bb791fd
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-07-07 09:14:36 +08:00 |
|
YunaiV
|
8d138cd1e9
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2024-07-07 09:11:46 +08:00 |
|
YunaiV
|
6a24025afa
|
fix: 修复区域工具类单元测试 #585
|
2024-07-07 09:08:33 +08:00 |
胡闹
|
167e4153fb
|
fix: 修复区域工具类单元测试
|
2024-07-02 10:58:46 +08:00 |
dhb52
|
cc73fc8a91
|
fix: 调整 DbTypeEnum 字段顺序
|
2024-06-23 14:59:16 +08:00 |
|
dhb52
|
3c5309b14e
|
feat: FindInSetEnum、NameToTypeEnum 融合为DbTypeEnum
|
2024-06-22 16:56:23 +08:00 |
|
YunaiV
|
355e47c371
|
【代码评审】Framework：find in set 代码
|
2024-06-22 10:52:42 +08:00 |
|
dhb52
|
d49db8eaa8
|
feat: find_in_set函数的跨数据库实现
|
2024-06-18 16:59:54 +08:00 |
|
dhb52
|
27e2996c5d
|
Merge branch 'master-jdk17' into feature/db
# Conflicts:
# sql/tools/README.md
|
2024-06-17 23:58:36 +08:00 |
|
YunaiV
|
088871d083
|
bugfix: 导入微信地址的时候无法获取areaId（只针对四个直辖市）
|
2024-06-15 18:00:46 +08:00 |
|
YunaiV
|
7eaddd16f9
|
【修复】定时任务指定某一年执行时，只会执行一次，后台查看任务详细会报错
|
2024-06-15 17:57:13 +08:00 |
SuperHao
|
8a5d39c2a2
|
update yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/area.csv.
bugfix: 导入微信地址的时候无法获取areaId（只针对四个直辖市）
Signed-off-by: SuperHao <jacky.jihao@gmail.com>
|
2024-06-07 08:40:04 +00:00 |
|
dhb52
|
ba40c1f699
|
fix: 改用kingbase8官方驱动,jdbc-url
|
2024-06-06 23:30:40 +08:00 |
|
dhb52
|
0ae11e0eb8
|
fix: JdbcUtils.getDbType 使用MyBatis-Plus工具
|
2024-06-06 23:28:55 +08:00 |
高高
|
5e0a8b44c4
|
【修复】定时任务指定某一年执行时，只会执行一次，后台查看任务详细会报错
Signed-off-by: 高高 <171376172@qq.com>
|
2024-06-06 10:01:47 +00:00 |
|
dhb52
|
a5081b94f5
|
feat: 华为opengauss支持
|
2024-06-05 23:05:58 +08: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
|
e0a6e3988b
|
【代码优化】framework：优化 HTTP 请求签名的实现
1、单测从集成测试，改成单元测试
2、SignatureAspect 调整代码，提升易读性
3、sign 算法调整，使用 querystring + body + header + appsecret 更容易理解
|
2024-06-04 19:10:48 +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 |
zhougang
|
5f278ac23b
|
【新增】优化部分代码风格
|
2024-05-28 15:09:01 +08:00 |
|
zhougang
|
5bc0190194
|
【优化】 格式化
|
2024-05-19 15:39:22 +08:00 |
|
zhougang
|
8e5584821e
|
【新增】 protection 模块新增 signature 实现 API 签名
|
2024-05-19 15:34:45 +08:00 |
|
YunaiV
|
423f6cc9da
|
【修复】全局：@PermitAll 未处理 RequestMappingInfo.getPatternsCondition 的问题
|
2024-05-18 21:02:26 +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
|
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
|
ffac294fbd
|
【优化】全局：兼容 MyBatis Plus 针对 SQL Server 的 saveBatch 不兼容的兼容
|
2024-05-03 22:11:22 +08:00 |
|
YunaiV
|
290a981cae
|
【修复】全局：移除 Druid 广告逻辑未按照期望执行
|
2024-05-03 10:38:05 +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
|
ab00986a1d
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-05-01 08:37:56 +08:00 |
|
YunaiV
|
1c9b5ddae9
|
【优化】降低 JDK 21 最低到 17 版本
|
2024-05-01 01:21:34 +08:00 |
|
YunaiV
|
0520f572e8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-example/yudao-sso-demo-by-code/pom.xml
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
# yudao-example/yudao-sso-demo-by-password/pom.xml
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
|
2024-04-30 22:50:07 +08:00 |
|
YunaiV
|
ff891d1a14
|
Merge branch 'master-jdk21' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk21
|
2024-04-29 20:54:44 +08:00 |
|
YunaiV
|
4d45e3ace9
|
【增强】一键改包：支持 site、org 等包
|
2024-04-29 00:18:39 +08:00 |
|
YunaiV
|
853db724ec
|
Merge branch 'master-jdk21' 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/YudaoSecurityAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
|
2024-04-29 00:14:06 +08:00 |
|
YunaiV
|
cd5e6319d9
|
【增强】一键改包：支持 site、org 等包
|
2024-04-29 00:13:04 +08:00 |
DevDengChao
|
bc6775d64b
|
修复错误拼写的注释
"Redisson 自动高配置类" 改为 "Redisson 自动配置类"
|
2024-04-25 15:35:44 +08:00 |
|
YunaiV
|
af621cb03f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java
|
2024-04-23 22:38:17 +08:00 |
|
YunaiV
|
7f0485e872
|
【修复】解决视频地址在移动端播放的兼容性问题
|
2024-04-23 09:41:10 +08:00 |
|
YunaiV
|
fd832e23fd
|
bugfix：非 json 请求（文件上传）时，token 过期时，错误读取 request body 问题
|
2024-04-22 23:31:50 +08:00 |
|
YunaiV
|
5d935d0ffd
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/job/SchedulerManagerTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/mq/RedisStreamTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml
|
2024-04-22 21:00:21 +08:00 |
|
YunaiV
|
075157417c
|
清理代码：无用的 test-integration 目录，暂时不考虑集成测试
|
2024-04-22 21:00:02 +08:00 |
|
YunaiV
|
a27c040a8f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordSaveVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
|
2024-04-22 19:56:17 +08:00 |
|
YunaiV
|
8093ef3b96
|
【移除】错误码的管理，简化项目的复杂度
|
2024-04-22 19:42:45 +08:00 |
|
YunaiV
|
6c3f88bacd
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
|
2024-04-22 19:02:13 +08:00 |