puhui999
|
1ecc50b3c9
|
mall: 完善管理端获得商品浏览记录分页接口
|
2024-07-17 18:36:48 +08:00 |
|
YunaiV
|
cb59a61a04
|
【代码优化】AI：获取公开的分页
|
2024-07-17 08:50:30 +08:00 |
|
YunaiV
|
3eb414caf6
|
【依赖】解决 redisson-spring-boot-starter 升级到 3.32.0 后的 Tuple NoClassDefFoundError 报错
|
2024-07-16 23:29:52 +08:00 |
|
YunaiV
|
6a13f88076
|
【依赖】maven-compiler-plugin from 3.11.0 to 3.13.0
【依赖】flatten-maven-plugin from 1.5.0 to 1.6.0
|
2024-07-16 12:37:05 +08:00 |
|
YunaiV
|
36c2673697
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2024-07-16 12:33:07 +08:00 |
|
YunaiV
|
38d5013da8
|
【依赖】maven-compiler-plugin from 3.11.0 to 3.13.0
【依赖】flatten-maven-plugin from 1.5.0 to 1.6.0
|
2024-07-16 12:32:50 +08:00 |
|
YunaiV
|
85848f0830
|
【代码优化】调整 swagger 的安全配置
|
2024-07-16 00:32:17 +08:00 |
|
YunaiV
|
1c139ca6bc
|
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/framework/security/config/SecurityConfiguration.java
|
2024-07-16 00:31:24 +08:00 |
|
YunaiV
|
28d74d07ac
|
【代码优化】调整 swagger 的安全配置
|
2024-07-16 00:30:54 +08:00 |
|
YunaiV
|
916384248a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-07-16 00:02:14 +08:00 |
|
YunaiV
|
8f6be354f9
|
【依赖】knife4j from 4.3.0 to 4.5.0
|
2024-07-16 00:02:04 +08:00 |
|
YunaiV
|
c64ba58cd0
|
【依赖】knife4j from 4.3.0 to 4.5.0
|
2024-07-16 00:01:24 +08:00 |
|
YunaiV
|
15e704d2d1
|
【依赖】rocketmq from 2.2.3 to 2.3.0
|
2024-07-15 22:57:56 +08:00 |
|
YunaiV
|
c081591403
|
【依赖】redisson from 3.26.0 to 3.32.0
|
2024-07-15 22:48:03 +08:00 |
|
YunaiV
|
1df7d2cc52
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-07-15 22:30:29 +08:00 |
|
YunaiV
|
968009cb5e
|
【依赖】redisson from 3.26.0 to 3.32.0
|
2024-07-15 22:30:17 +08:00 |
|
cherishsince
|
ef4fb7ec05
|
【优化】重命名 publicList
|
2024-07-15 16:15:06 +08:00 |
|
cherishsince
|
6b69dd74d4
|
【增加】ai image 增加release 列表(画廊、广场使用)
|
2024-07-15 15:32:04 +08:00 |
|
YunaiV
|
c3a3bf028c
|
【依赖】easy-trans from 1.6.6 to 1.7.8
|
2024-07-15 12:41:01 +08:00 |
|
YunaiV
|
bc365800b5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-07-15 12:38:42 +08:00 |
|
YunaiV
|
4de27eb12d
|
【依赖】easy-trans from 1.6.6 to 1.7.8
|
2024-07-15 12:38:23 +08:00 |
|
YunaiV
|
7693badb4e
|
【同步】最新精简版本！
|
2024-07-14 22:42:15 +08:00 |
|
YunaiV
|
510ac63614
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionRuleHandlerTest.java
# yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.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-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/performance/CrmStatisticsPerformanceReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusDO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
# yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/common/ErpBizTypeEnum.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/pay/PayWalletStatisticsMapper.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/TradeOrderStatisticsMapper.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/PayWalletStatisticsServiceImpl.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsServiceImpl.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/controller/app/brokerage/vo/user/AppBrokerageUserBindReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/aftersale/AfterSaleDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.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-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
# yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.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/vo/AppMemberUserInfoRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessageRespVO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/menu/MpMenuDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpAutoReplyDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java
|
2024-07-14 22:39:50 +08:00 |
|
YunaiV
|
eca0a0422b
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 22:01:20 +08:00 |
|
YunaiV
|
2e3f998ee7
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 22:01:03 +08:00 |
|
YunaiV
|
438078d28f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-report/yudao-module-report-biz/pom.xml
|
2024-07-14 21:58:59 +08:00 |
|
YunaiV
|
211e196fce
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 21:57:52 +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
|
0566f5fa93
|
【依赖】mybatis-plus from 3.5.5 to 3.5.7
|
2024-07-13 22:52:23 +08:00 |
|
YunaiV
|
3e3407eb99
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java
|
2024-07-13 22:43:33 +08:00 |
|
YunaiV
|
2b39b434fa
|
【依赖】mybatis-plus from 3.5.5 to 3.5.7
|
2024-07-13 22:42:54 +08:00 |
|
YunaiV
|
ff0c1cfd7f
|
【依赖】工具类升级
|
2024-07-13 17:37:45 +08:00 |
|
YunaiV
|
d0d951fd48
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2024-07-13 17:33:33 +08:00 |
|
YunaiV
|
40deb00a00
|
【依赖】工具类升级
|
2024-07-13 17:33:15 +08:00 |
|
YunaiV
|
a85c29d642
|
【升级】podam from 8.0.1 to 8.0.2
|
2024-07-13 17:09:47 +08:00 |
|
YunaiV
|
477c5d6ab3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-07-13 17:07:59 +08:00 |
|
YunaiV
|
f1c654f5a4
|
【依赖】podam from 8.0.1 to 8.0.2
|
2024-07-13 17:07:18 +08:00 |
|
YunaiV
|
d71bac7138
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-07-13 16:58:54 +08:00 |
|
YunaiV
|
782f3337dd
|
【依赖】spring boot admin from 3.2.1 to 3.3.2
|
2024-07-13 16:58:36 +08:00 |
|
YunaiV
|
da4679e247
|
【依赖】druid from 1.2.21 to 1.2.23
|
2024-07-13 16:48:16 +08:00 |
|
YunaiV
|
375745828b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2024-07-13 16:39:15 +08:00 |
|
YunaiV
|
45805aa761
|
【依赖】spring boot from 3.2.2 to 3.3.1
|
2024-07-13 16:38:26 +08:00 |
|
YunaiV
|
e591c1869a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationServiceImpl.java
|
2024-07-13 16:31:40 +08:00 |
|
jason
|
58e250c4eb
|
仿钉钉流程设计- 操作按钮权限设置
|
2024-07-13 14:34:07 +08:00 |
|
YunaiV
|
aff7919780
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:55:56 +08:00 |
|
YunaiV
|
dee820b8fd
|
【功能新增】MALL：新增 mall 客服
|
2024-07-13 12:25:55 +08:00 |
|
YunaiV
|
03e07a2902
|
【功能新增】MALL：新增 mall 客服
|
2024-07-13 12:24:49 +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
|
41afea6818
|
【功能新增】MALL：新增 mall 客服
|
2024-07-13 12:14:07 +08:00 |
|