YunaiV
|
a5c76f6e0d
|
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
|
2024-10-01 11:35:03 +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
|
e8e1f14c7c
|
【功能修改】工作流：流程实例列表，使用 processDefinitionKey 检索
|
2024-09-30 19:45:33 +08:00 |
|
安浩浩
|
5a456a95e7
|
【优化功能】 新增产品物模型，校验优化
|
2024-09-30 12:21:53 +08:00 |
|
YunaiV
|
9ae3682b2d
|
【功能修复】商城：秒杀活动的活动排重校验不正确的问题
|
2024-09-30 09:55:45 +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
|
05a9083d00
|
【依赖升级】easyexcel from 3.3.4 to 4.0.3
|
2024-09-29 21:42:38 +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 |
|
安浩浩
|
1995c322e7
|
【新增】 产品物模型分页
|
2024-09-29 21:37:40 +08:00 |
|
YunaiV
|
c9c311f9cc
|
【依赖降级】mybatis-plus from 3.5.8 to 3.5.7（MyBatis Plus 3.5.8 需要最低 JDK11 版本，无法升级）
|
2024-09-29 21:04:53 +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
|
af2ad46be4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-09-29 20:51:30 +08:00 |
|
YunaiV
|
49b883f0d7
|
【依赖升级】redisson from 3.32.0 to 3.36.0
|
2024-09-29 20:51:16 +08:00 |
|
YunaiV
|
a1d3885921
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-09-29 20:48:50 +08:00 |
|
YunaiV
|
87cb2b784b
|
【依赖升级】easy-trans from 3.0.5 to 3.0.6
|
2024-09-29 20:48:42 +08:00 |
|
YunaiV
|
2a97f7a81b
|
【依赖升级】dm8 from 8.1.3.62 to 8.1.3.140
【依赖升级】opengauss from 5.0.2 to 5.1.0
|
2024-09-29 20:43:32 +08:00 |
|
YunaiV
|
4324d6378c
|
【移除依赖】weixin-java from 4.6.0 to 4.6.5.B
|
2024-09-29 20:37:09 +08:00 |
|
YunaiV
|
e0acd5fac3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-09-29 20:36:37 +08:00 |
|
YunaiV
|
8a7ed5ffbf
|
【移除依赖】weixin-java from 4.6.0 to 4.6.5.B
|
2024-09-29 20:36:16 +08:00 |
|
YunaiV
|
593421dcca
|
【移除依赖】xercesImpl
|
2024-09-29 20:31:05 +08:00 |
|
YunaiV
|
1fa091c724
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-09-29 20:30:38 +08:00 |
|
YunaiV
|
d588ecb2ae
|
【移除依赖】xercesImpl
|
2024-09-29 20:30:15 +08:00 |
|
YunaiV
|
a12133d880
|
【依赖升级】guava from 33.2.1-jre to 33.3.1-jre
|
2024-09-29 20:24:36 +08:00 |
|
YunaiV
|
69bb1b517b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-09-29 20:18:00 +08:00 |
|
YunaiV
|
58085eedc4
|
【依赖升级】velocity from 2.3 to 2.4
|
2024-09-29 20:17:50 +08:00 |
|
YunaiV
|
fedc42f6f0
|
【依赖升级】hutool from 5.8.29 to 5.8.32
|
2024-09-29 20:14:29 +08:00 |
|
YunaiV
|
375aab2f63
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-09-29 20:13:47 +08:00 |
|
YunaiV
|
ab1b2afad6
|
【依赖升级】hutool from 5.8.29 to 5.8.32
|
2024-09-29 20:13:13 +08:00 |
|
YunaiV
|
8f69f88b87
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
|
2024-09-29 13:24:38 +08:00 |
|
YunaiV
|
f2ebb2a199
|
【依赖升级】mapstruct from 1.5.5 to 1.6.2
|
2024-09-29 13:22:22 +08:00 |
|
YunaiV
|
95e59ea4c3
|
【依赖升级】jedis-mock from 1.1.2 to 1.1.4
|
2024-09-29 13:15:10 +08:00 |
|
YunaiV
|
bf0fb8ae22
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-09-29 13:10:11 +08:00 |
|
YunaiV
|
af22a97df3
|
【依赖升级】rocketmq-spring from 2.3.0 to 2.3.1
|
2024-09-29 13:10:04 +08:00 |
|
YunaiV
|
2cbc6aeef5
|
【代码优化】增强 JDK17、JDK8 之间的兼容性
|
2024-09-29 13:01:23 +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
|
319646a8a1
|
【依赖升级】spring boot from 3.3.1 to 3.3.4
【依赖升级】spring boot admin from 3.3.2 to 3.3.3
|
2024-09-29 12:57:57 +08:00 |
|
xiaoxin
|
1de70eeeb3
|
【优化】AI知识库：visibilityPermissions 使用 list
|
2024-09-29 10:01:49 +08:00 |
|
YunaiV
|
42b7946685
|
【功能修复】代码生成：代同步数据库结构之后字段顺序混乱的问题
|
2024-09-29 07:41:35 +08:00 |
|
YunaiV
|
f6a6a1ff88
|
【代码评审】商城：积分商城的 review
|
2024-09-29 07:28:04 +08:00 |
|
芋道源码
|
b849194d82
|
!1094 【功能完善】商城: APP 积分商城活动完善 app-api 接口
Merge pull request !1094 from puhui999/develop
|
2024-09-28 12:48:56 +00:00 |
|
puhui999
|
14d239f2de
|
【功能完善】商城: 完善积分商城装修
|
2024-09-28 13:44:04 +08:00 |
|
puhui999
|
dd82f13c03
|
【功能完善】商城: APP 积分商城活动完善 app-api 接口
|
2024-09-28 11:32:11 +08:00 |
|
puhui999
|
e251f2f543
|
【代码优化】商城: 完善前端返回所需字段
|
2024-09-28 10:02:14 +08:00 |
|
jason
|
e85385d123
|
【代码审计】 code review 注释修改
|
2024-09-27 12:37:09 +08:00 |
|
jason
|
d42c63e8fd
|
【功能修改】任务的候选人的策略, 增加移除被禁用的用户接口
|
2024-09-26 23:45:04 +08:00 |