ady/ruoyi-vue-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,653 Commits 32 Branches 42 Tags
6cbcf1344792df6f9096f1c742e3c3b6e3eceea1
Commit Graph

1205 Commits

Author SHA1 Message Date
MentatBot
6cbcf13447 Fix: Skip execution of scheduled tasks for disabled tenants 
This update addresses the issue where scheduled tasks were being executed for disabled tenants. The `TenantJobAspect` class has been modified to check the status of each tenant before executing the task. If a tenant is disabled, the task will be skipped for that tenant.

Changes:
- Added a check in `TenantJobAspect` to verify tenant status before task execution.
- Introduced a new test `testTenantJobAspect_skipDisabledTenants` in `TenantServiceImplTest` to ensure the aspect correctly skips disabled tenants.
 2024-08-16 07:24:48 +00: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
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