aikai
|
6bf1f7da7f
|
缓存配置 - xxl-job配置 - 前端AGV地图png转base64
|
2025-01-13 16:23:11 +08:00 |
|
aikai
|
edbea240f8
|
Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai
|
2025-01-13 15:01:16 +08:00 |
|
aikai
|
627d5151ef
|
前端png文件下载改base64格式
|
2025-01-13 14:55:22 +08:00 |
|
aikai
|
e490462195
|
Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai
|
2025-01-13 14:54:47 +08:00 |
|
aikai
|
eb580beee0
|
前端png文件下载改base64格式
|
2025-01-13 14:54:35 +08:00 |
|
cbs
|
8ace49177c
|
xxl-job配置
|
2025-01-13 14:50:48 +08:00 |
|
cbs
|
c6afd8b4c4
|
Merge branch 'cbs' into dev
|
2025-01-13 13:54:35 +08:00 |
|
aikai
|
4fbd5f7dcb
|
点位表新增字段 库区id 巷道id
|
2025-01-13 11:58:46 +08:00 |
|
cbs
|
e0291782bc
|
添加机器人信息
|
2025-01-13 11:58:10 +08:00 |
|
aikai
|
281522adca
|
Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
|
2025-01-13 11:23:11 +08:00 |
|
aikai
|
f94062a262
|
地图相关
|
2025-01-13 11:19:36 +08:00 |
|
cbs
|
491250852b
|
搬运任务回传
|
2025-01-13 09:10:19 +08:00 |
|
cbs
|
89fa21411d
|
搬运任务校验
|
2025-01-09 13:59:39 +08:00 |
|
cbs
|
9fe8245ed5
|
下发搬运任务
|
2025-01-08 10:46:50 +08:00 |
|
cbs
|
84980c31f7
|
机器人任务
|
2025-01-07 10:39:14 +08:00 |
|
cbs
|
101be5a8ad
|
巷道、库区、库位、车辆、设备
|
2025-01-04 17:34:56 +08:00 |
|
cbs
|
bb03dd010f
|
wcs设备注册
|
2025-01-03 15:54:13 +08:00 |
|
YunaiV
|
6e85cf3c2e
|
V2.3.0 版本发布
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
|
2024-10-07 16:42:57 +08:00 |
|
YunaiV
|
c13424649b
|
【同步】新增 jdk8/11 精简版！
|
2024-10-07 16:41:16 +08:00 |
|
YunaiV
|
a452567318
|
【同步】对齐 boot 和 cloud 的逻辑
|
2024-10-07 16:41:10 +08:00 |
|
YunaiV
|
a05961139c
|
【功能新增】工作流：完善仿钉钉、飞书模式
|
2024-10-04 17:51:26 +08:00 |
|
YunaiV
|
d97f76cd8b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeSegmentServiceImpl.java
# 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/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-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/service/dept/DeptServiceImpl.java
|
2024-10-04 17:48:02 +08:00 |
|
YunaiV
|
6c325d99e7
|
【功能新增】工作流：完善仿钉钉、飞书模式
|
2024-10-04 17:47:28 +08:00 |
|
YunaiV
|
2344332b03
|
【功能优化】SYSTEM：支持通过 refreshToken 认证，解决部分场景不方便刷新访问令牌场景
|
2024-10-02 14:54:06 +08:00 |
|
YunaiV
|
5480caa3df
|
【功能优化】getUserList 查询时，默认禁用数据权限
|
2024-10-01 17:19:37 +08:00 |
|
YunaiV
|
ad2cc100d2
|
【功能优化】spring security：antMatchers 替换成 requestMatchers
|
2024-10-01 15:22:58 +08:00 |
|
YunaiV
|
058eef0942
|
【同步】BOOT 和 CLOUD 的功能
|
2024-10-01 15:00:11 +08:00 |
|
YunaiV
|
6a86386f60
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# 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-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/spu/AppProductSpuController.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/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/AppBannerController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.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/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/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/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
# 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/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/bo/TradePriceCalculateReqBO.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-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/service/demo/PayDemoOrderServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.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/controller/admin/auth/vo/AuthLoginReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.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
# 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-10-01 14:52:28 +08:00 |
|
YunaiV
|
4249528d0f
|
【同步】BOOT 和 CLOUD 的功能
|
2024-10-01 14:51:57 +08:00 |
|
YunaiV
|
edcb29d4c6
|
【同步】BOOT 和 CLOUD 的功能
|
2024-09-07 21:05:27 +08:00 |
|
YunaiV
|
7d9785ad79
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# 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/core/handler/GlobalExceptionHandler.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/dto/CombinationRecordCreateReqDTO.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-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/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/vo/coupon/AppCouponMatchReqVO.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-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/brokerage/BrokerageRecordService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.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-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
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
|
2024-09-07 20:57:15 +08:00 |
|
YunaiV
|
d2f0c00d8f
|
【同步】BOOT 和 CLOUD 的功能
|
2024-09-07 12:46:56 +08:00 |
|
YunaiV
|
975ed4ce10
|
【功能修复】框架：操作日志异步记录时，丢失 request 的问题
|
2024-09-06 21:44:17 +08:00 |
|
YunaiV
|
0081f07a6b
|
【代码优化】全局：MySQL JDBC 增加 rewriteBatchedStatements 批量插入
|
2024-09-04 09:17:47 +08:00 |
|
YunaiV
|
8ba1966181
|
【代码优化】SYSTEM：user_role_ids 忽略多租户
|
2024-09-03 16:11:41 +08:00 |
|
YunaiV
|
b35799b593
|
【功能修复】API 调用时，相关的 checkData 补充
|
2024-09-03 11:37:47 +08:00 |
|
YunaiV
|
7255d25681
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
|
2024-08-31 13:31:44 +08:00 |
|
YunaiV
|
d39681e98c
|
【代码修复】SYSTEM：角色标识的提示不正确问题
|
2024-08-31 10:15:04 +08:00 |
|
YunaiV
|
d97e54b5cd
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2024-08-31 09:57:59 +08:00 |
|
芋道源码
|
e893caf3ad
|
!131 bugfix
Merge pull request !131 from 尹先生/master-jdk17
|
2024-08-31 01:56:00 +00:00 |
|
YunaiV
|
4bcdfc07ec
|
【同步】BOOT 和 CLOUD 的功能
|
2024-08-31 09:53:49 +08:00 |
|
YunaiV
|
b160d409f3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# 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-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java
|
2024-08-31 09:51:54 +08:00 |
|
YunaiV
|
daef8d3b03
|
【同步】BOOT 和 CLOUD 的功能
|
2024-08-31 09:51:21 +08:00 |
|
YunaiV
|
51a37f885b
|
【代码优化】增强 JDK17、JDK8 之间的兼容性
|
2024-08-26 12:38:00 +08:00 |
|
yinyilong
|
532e8333f2
|
bugfix-去除RoleExportExcelVO
|
2024-08-26 09:28:17 +08:00 |
|
YunaiV
|
4e200c57f7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogRespDTO.java
|
2024-08-24 11:16:48 +08:00 |
|
YunaiV
|
87955a9751
|
【功能修复】系统：OperateLogRespDTO 的字段读取
|
2024-08-24 11:15:52 +08:00 |
|
口口口
|
a4abdefa60
|
翻译userName，RPC报错，修复
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogRespDTO.java
翻译userName，RPC报错，修复
Signed-off-by: 口口口 <17975121@qq.com>
|
2024-08-22 08:58:46 +00:00 |
|
YunaiV
|
a4ca9800a4
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
|
2024-08-18 17:30:56 +08:00 |
|
YunaiV
|
68f6270f6a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# 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-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/job/product/ProductStatisticsJob.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/config/TradeOrderProperties.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppBaseVO.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/order/PayOrderServiceImpl.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.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/framework/sms/core/property/SmsChannelProperties.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-18 17:25:08 +08:00 |
|
YunaiV
|
4ca68ff56a
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
【更多】同步 boot 最新代码到 cloud
|
2024-08-18 17:18:03 +08:00 |
|
yinyilong
|
59fc020616
|
bugfix-增加RoleExportExcelVO，数据范围导出字段从字典表中取值；RoleSaveReqVO中code字段名改为角色标识，保持提示文案一致
|
2024-08-13 15:35:13 +08:00 |
|
yinyilong
|
7a86121585
|
Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17
|
2024-08-12 14:09:44 +08:00 |
|
yinyilong
|
99a26defa2
|
bugfix-RoleSaveReqVO备注字段长度限制为500
|
2024-08-12 14:09:34 +08:00 |
|
yinyilong
|
2c1b6cd16f
|
bugfix-RoleSaveReqVO增加状态字段
|
2024-08-12 14:08:37 +08:00 |
|
YunaiV
|
373c780fee
|
【代码优化】SYSTEM：移除阿里云、腾讯云 maven 依赖，直接 HTTP 对接
|
2024-08-09 22:19:34 +08:00 |
|
YunaiV
|
cef4c14286
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# 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 22:13:34 +08:00 |
|
YunaiV
|
4139769131
|
【代码优化】SYSTEM：移除阿里云、腾讯云 maven 依赖，直接 HTTP 对接
|
2024-08-09 22:13:01 +08:00 |
|
YunaiV
|
bf08f746b3
|
【同步】BOOT 和 CLOUD 的功能
|
2024-08-02 09:40:21 +08:00 |
|
YunaiV
|
cce77b8add
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# 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-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApi.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-08-02 08:48:59 +08:00 |
|
YunaiV
|
45095b524f
|
【代码优化】SYSTEM：微信小程序的订阅
|
2024-08-01 23:21:24 +08:00 |
|
YunaiV
|
3ceb4d4685
|
【功能新增】微信小程序的订阅消息
|
2024-08-01 13:08:35 +08:00 |
|
YunaiV
|
0536fa3957
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
|
2024-07-24 19:05:47 +08:00 |
|
YunaiV
|
1c95e12aea
|
【功能新增】全局：多租户缓存，增加忽略的 Spring Cache 配置
|
2024-07-23 23:26:09 +08:00 |
|
YunaiV
|
be67194cfb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-20 22:36:42 +08:00 |
|
YunaiV
|
b0c2f75a3f
|
【功能优化】全局：LoginUser 新增过期时间，方便判断 token 过期
|
2024-07-20 18:42:26 +08:00 |
|
YunaiV
|
5bf8c47587
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-20 17:58:19 +08:00 |
|
YunaiV
|
b728e66282
|
【功能新增】INFRA：增加 ConfigApi，支持参数配置的读取
|
2024-07-20 17:57:31 +08:00 |
|
YunaiV
|
43363c1167
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-20 16:14:23 +08:00 |
|
YunaiV
|
7fbb96b0f0
|
【代码优化】全局：去除 application.yaml 相关配置文件的冗余
|
2024-07-20 16:14:15 +08:00 |
|
YunaiV
|
3ae388d886
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-local.yaml
|
2024-07-20 16:13:17 +08:00 |
|
YunaiV
|
a034b3d218
|
【代码优化】全局：去除 application.yaml 相关配置文件的冗余
|
2024-07-20 16:12:55 +08:00 |
|
YunaiV
|
ec33e42f2b
|
【功能修复】全局：请求租户不存在时，记录访问日志、操作日志异常的问题
|
2024-07-19 23:04:10 +08:00 |
|
YunaiV
|
906287be21
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
|
2024-07-19 19:30:37 +08:00 |
|
YunaiV
|
398171a402
|
【功能修复】CRM：操作日志读取不正确的问题
|
2024-07-19 19:27:33 +08:00 |
|
YunaiV
|
13c20c930a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# README.md
|
2024-07-17 19:57:56 +08:00 |
|
YunaiV
|
019d70e437
|
【依赖】更新 README 中的框架版本号
|
2024-07-17 19:57:24 +08:00 |
|
YunaiV
|
97563f1457
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-16 23:52:36 +08:00 |
|
YunaiV
|
369e6a009a
|
【升级】easy-trans from 2.2.11 to 3.0.5
|
2024-07-16 23:52:27 +08:00 |
|
YunaiV
|
8da3a97122
|
【依赖】knife4j from 4.3.0 to 4.5.0
|
2024-07-16 09:41:04 +08:00 |
|
YunaiV
|
503a6eecc5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/security/config/SecurityConfiguration.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/security/config/SecurityConfiguration.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/security/config/SecurityConfiguration.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/security/config/SecurityConfiguration.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/framework/security/config/SecurityConfiguration.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/framework/security/config/SecurityConfiguration.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/security/config/SecurityConfiguration.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/framework/security/config/SecurityConfiguration.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/security/config/SecurityConfiguration.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/security/config/SecurityConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
|
2024-07-16 00:44:24 +08:00 |
|
YunaiV
|
684c249d4b
|
【依赖】knife4j from 4.3.0 to 4.5.0
|
2024-07-16 00:44:02 +08:00 |
|
YunaiV
|
76a25f0283
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-16 00:16:38 +08:00 |
|
YunaiV
|
4961d26e14
|
【修复】easy-trans 的 @AutoTrans 存在冲突
|
2024-07-16 00:16:30 +08:00 |
|
YunaiV
|
d8941bc990
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-15 13:01:45 +08:00 |
|
YunaiV
|
e263468389
|
【依赖】easy-trans from 2.2.11 to 3.0.5
|
2024-07-15 13:01:35 +08:00 |
|
YunaiV
|
1da56a0b44
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-07-14 18:37:17 +08:00 |
|
YunaiV
|
cc6d0c00b7
|
【代码优化】MEMBER：移除 bootstrap.yaml，和 boot 保持一致
|
2024-07-14 18:37:06 +08:00 |
|
YunaiV
|
70b887e43f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-07-14 17:48:09 +08:00 |
|
YunaiV
|
4ae3ac0f6d
|
【代码优化】SYSTEM：移除 bootstrap.yaml，和 boot 保持一致
|
2024-07-14 17:47:44 +08:00 |
|
YunaiV
|
6a20f3cb89
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# 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-14 00:02:35 +08:00 |
|
YunaiV
|
76e4586e20
|
【依赖】mybatis-plus from 3.5.5 to 3.5.7
【代码优化】全局：复用 MyBatis Plus 数据权限插件，简化项目的数据权限实现
|
2024-07-14 00:01:39 +08:00 |
|
YunaiV
|
d9fca6334d
|
【依赖】jedis-mock from 1.0.13 to 1.1.2
|
2024-07-13 17:20:06 +08:00 |
|
YunaiV
|
58cc529c12
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-07-13 16:50:22 +08:00 |
|
YunaiV
|
7e3c290a2d
|
【依赖】spring boot from 3.2.2 to 3.3.1
|
2024-07-13 16:50:05 +08:00 |
|
YunaiV
|
69562e1463
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 15:59:52 +08:00 |
|
YunaiV
|
a9d91250f5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# 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-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
|
2024-07-13 12:57:43 +08:00 |
|
YunaiV
|
b8f1d01733
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:56:09 +08:00 |
|
YunaiV
|
63393108e9
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:10:05 +08:00 |
|
YunaiV
|
c0b196bd07
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-07-13 12:04:48 +08:00 |
|
YunaiV
|
3b8675dc6a
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:03:51 +08:00 |
|
YunaiV
|
700a0996c4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
|
2024-07-13 11:28:47 +08:00 |
|
YunaiV
|
c6937cf199
|
【模块新增】AI：支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力
|
2024-07-13 11:26:17 +08:00 |
|
YunaiV
|
0ee01346d0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/pom.xml
# 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
|
2024-06-04 21:34:48 +08:00 |
|
YunaiV
|
025857c9f2
|
【同步】对齐 boot 和 cloud 的逻辑
|
2024-06-04 19:23:20 +08:00 |
|
YunaiV
|
2bd9fd97bb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
|
2024-05-04 09:48:50 +08:00 |
|
YunaiV
|
1e106844e8
|
【同步】boot 和 cloud 版本
|
2024-05-04 09:45:51 +08:00 |
|
YunaiV
|
1e23316fb1
|
【修复】MySQL jdbc 连接 5.7 示例不正确
|
2024-05-03 09:11:22 +08:00 |
|
YunaiV
|
74bc3b3fd2
|
【同步】对齐 boot 和 cloud 的逻辑
|
2024-05-01 09:36:34 +08:00 |
|
YunaiV
|
9d8f924fec
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# 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-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSaveVO.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
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-05-01 09:32:36 +08:00 |
|
YunaiV
|
6d40550bbf
|
【同步】对齐 boot 和 cloud 的逻辑
|
2024-05-01 09:30:22 +08:00 |
|
YunaiV
|
a015b1e539
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-05-01 00:38:22 +08:00 |
|
YunaiV
|
f7b0618216
|
【修复】短信模板中关于 type 字段的描述
|
2024-04-29 20:51:46 +08:00 |
|
YunaiV
|
59dd0a3f5c
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
|
2024-04-24 20:55:04 +08:00 |
|
YunaiV
|
e618f833fd
|
【修复】部分菜单，确实 menu.sql 配置的权限标识
|
2024-04-24 20:11:19 +08:00 |
|
YunaiV
|
59178eca49
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
|
2024-04-24 09:45:10 +08:00 |
|
YunaiV
|
44055ba53f
|
【优化】新增 sslEnable 字段，支持 outlook 邮箱
|
2024-04-24 09:44:38 +08:00 |
|
YunaiV
|
5e3e68f7f5
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
|
2024-04-24 09:40:05 +08:00 |
|
YunaiV
|
b150605da9
|
【修复】角色管理页面-查询未按照排序字段排序的问题
|
2024-04-24 09:38:14 +08:00 |
|
芋道源码
|
961e3210c7
|
!112 bugfix：修复角色管理页面-查询未按照排序字段排序的问题
Merge pull request !112 from limz/bugfix-pull
|
2024-04-24 01:36:21 +00:00 |
|
YunaiV
|
ddafd44114
|
【完善】代码生成对 DM 达梦数据的兼容性
【优化】新增 sslEnable 字段，支持 outlook 邮箱
|
2024-04-24 09:35:51 +08:00 |
|
YunaiV
|
8e17192ad1
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# 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:42:53 +08:00 |
|
YunaiV
|
9164fa0ffb
|
bugfix：非 json 请求（文件上传）时，token 过期时，错误读取 request body 问题
|
2024-04-22 23:31:57 +08:00 |
|
YunaiV
|
ea4db88dab
|
Merge remote-tracking branch 'origin/master'
|
2024-04-22 21:10:49 +08:00 |
|
YunaiV
|
ce74fbca98
|
【同步】与 yudao-boot 版本保持一致！
|
2024-04-22 21:10:22 +08:00 |
|
YunaiV
|
38df9d3911
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.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/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/convert/mail/MailAccountConvert.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/mail/MailSendServiceImpl.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-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
# 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 21:02:10 +08:00 |
|
YunaiV
|
feb742e084
|
【同步】与 yudao-boot 版本保持一致！
|
2024-04-22 21:01:30 +08:00 |
|
limingz
|
4d069460cd
|
bugfix：修复角色管理页面-查询未按照排序字段排序的问题
|
2024-04-18 15:22:32 +08:00 |
|
lihaiyang
|
0703c8d154
|
bugfix：修复获取登录用户的权限信息接口在没有授权角色时，没有菜单列表导致报错的问题
|
2024-04-13 23:36:01 +08:00 |
|
YunaiV
|
3af7097f17
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-04-11 23:42:45 +08:00 |
|
YunaiV
|
a5aeca4d49
|
【优化】将项目的 annotations 统一修改成 annotation 包
|
2024-04-11 23:42:22 +08:00 |
|
YunaiV
|
b90ea83d2c
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2024-04-11 22:55:58 +08:00 |
|
YunaiV
|
bb5966f1b6
|
【新增】RateLimiter 限流器，支持全局、用户、IP 等级别的限流
|
2024-04-11 22:53:36 +08:00 |
|
YunaiV
|
3aa8d41fcd
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 20:02:22 +08:00 |
|
YunaiV
|
be6aaec818
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
|
2024-04-07 19:53:25 +08:00 |
|
YunaiV
|
e2c1c7d380
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 19:51:24 +08:00 |
|
YunaiV
|
60d56f0834
|
bugfix：easy-trans 在 FeignClient 无法启动的情况
|
2024-04-04 18:59:35 +08:00 |
|
YunaiV
|
9de92e730b
|
bugfix：easy-trans 在 FeignClient 无法启动的情况
|
2024-04-04 18:58:13 +08:00 |
|
YunaiV
|
9d6eca05dd
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 10:00:06 +08:00 |
|
YunaiV
|
0c2736399f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-04-04 09:59:18 +08:00 |
|
YunaiV
|
a6db89c9e3
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:58:41 +08:00 |
|
YunaiV
|
06bfe3335e
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2024-04-04 09:50:11 +08:00 |
|
YunaiV
|
911790ad16
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:48:29 +08:00 |
|
YunaiV
|
3192a252cd
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 02:38:15 +08:00 |
|
YunaiV
|
809e6961d6
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogRespDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.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/logger/LoginLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.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/sms/SmsLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
|
2024-04-04 02:32:36 +08:00 |
|
YunaiV
|
188f98eaa2
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 02:13:36 +08:00 |
|
YunaiV
|
e67f16e5bb
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 01:21:17 +08:00 |
|
YunaiV
|
38135a1792
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# 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/apilog/core/filter/ApiAccessLogFilter.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2024-04-03 20:02:53 +08:00 |
|
YunaiV
|
ec9f983f73
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 19:53:04 +08:00 |
|
YunaiV
|
c1b5670027
|
全局：增加 VO 数据翻译的支持
|
2024-04-02 19:57:29 +08:00 |
|