485 Commits (main)

Author SHA1 Message Date
owen 929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
owen 171161e6c7 统计:交易统计 2 years ago
YunaiV 666ba351a2 trade:退款理由的维护 2 years ago
YunaiV f9bf41d773 code review:分佣剩余部分的 review 2 years ago
YunaiV 9cd36abf10 同步 master 分支代码 2 years ago
YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.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/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
2 years ago
YunaiV 26dfbfb2ac trade:发货逻辑,增加订单日志 2 years ago
YunaiV 53bd1b9ec1 trade:订单评论超时时,自动评论 2 years ago
YunaiV a8c78f3097 trade:增加自动收货的 job 2 years ago
YunaiV 1b154699c6 code review:处理错误的 mysql 连接 2 years ago
YunaiV ab800aa891 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
2. 减少日志打印

目的:优化启动速度
2 years ago
YunaiV 50371b3676 1. 禁用 member 模块
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的:提升项目的启动速度
2 years ago
YunaiV 62c4838ba7 默认禁用 spring boot admin 的启动 2 years ago
YunaiV 6a371f06b0 默认禁用 spring data redis repositories,一方面没用到,一方面提高启动速度 2 years ago
YunaiV f0f5b52150 默认禁用 quartz 依赖,保证启动速度 2 years ago
xiaqing e893cfd757 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
2 years ago
xiaqing 9d262e8e7f 新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
2 years ago
YunaiV f2ee213caa 更新商城的演示地址 2 years ago
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	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/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
2 years ago
YunaiV 314dee430e bugfix:微信公众号登录报 access token 的问题 2 years ago
YunaiV 40e1a879e3 登录:社交登录时,额外返回 openid 2 years ago
YunaiV 5a940b1d2c 修复 knife4j get 参数无法正确展示的问题 2 years ago
YunaiV bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
2 years ago
YunaiV fcca69d243 修复 revision 在 Maven install、deploy 时,不替换为版本号的问题 2 years ago
zhijiantianya@gmail.com beb385aab4 修复 revision 在 Maven install、deploy 时,不替换为版本号的问题 2 years ago
YunaiV 6a819da0b6 分佣:增加用户分销统计 API mock 2 years ago
YunaiV d82729e4c6 同步最新会员中心 SQL 2 years ago
YunaiV 0d1fc1138a 增加 app 的签到 mock 接口、积分记录分页、签到记录分页 2 years ago
YunaiV c3e4e23459 同步最新 Member 菜单 2 years ago
xiaqing db1f44305d 会员积分和会员签到模块todo修改 3 years ago
xiaqing 2e9dfac9ab 会员积分和会员签到模块todo修改 3 years ago
YunaiV e4a2c738b2 订单:
1. 增加查询物流接口
3 years ago
YunaiV be2ee905df code review:积分模块的实现 3 years ago
芋道源码 4177071758
!560 todo修改
Merge pull request !560 from QingX/feature/mall_product
3 years ago
YunaiV 5fcd0a21da Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
YunaiV 9ff67b479f !562 优化 redisCache 3 years ago
芋道源码 8960a82978
!562 优化 redisCache
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
3 years ago
YunaiV b53bfb0976 Merge branch 'feature/deps' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 3 years ago
wanwan 134e5ca20f feat: 将 redisCache 的扫描策略设置成 scan 3 years ago
wanwan e1fe21f24c Revert "feat: 将 redisCache 的扫描策略设置成 scan"
This reverts commit 72d2dcc68f.
3 years ago
jlc@yoc.tech 72d2dcc68f feat: 将 redisCache 的扫描策略设置成 scan 3 years ago
xiaqing d397758dd1 还原配置文件 3 years ago
xiaqing 33323c1483 会员签到针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
3 years ago
芋道源码 7a7ae3b8ec
!545 完善 review 拼团、秒杀活动的实现提到的问题
Merge pull request !545 from puhui999/feature/mall_product
3 years ago
puhui999 92b10e2ecf Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
YunaiV 68049b85b9 基于 Redis 实现的 pubsub、stream 消息队列,支持开启或关闭。默认为关闭状态,项目启动更快 3 years ago
xingyu 402a3809a3 chore: up springboot 2.7.14 3 years ago
puhui999 446951bd11 fix:封装函数 convertCDUMap 作用:数据划分为需要新增的、还是删除的、还是更新的。 3 years ago
YunaiV 7f657ee931 优化 mp-java 库的依赖管理 3 years ago
YunaiV c33186569d 优化 mp 账号的刷新机制,使用 Job 轮询,替换 MQ 广播 3 years ago
YunaiV 91aacefc3d Merge branch 'master-cq' of https://gitee.com/congqinggit/ruoyi-vue-pro
 Conflicts:
	sql/postgresql/ruoyi-vue-pro.sql
3 years ago
芋道源码 870873e480
!540 修复部分问题,升级依赖
Merge pull request !540 from xingyu/feature/captcha
3 years ago
YunaiV 7f0901e0bb 优化项目启动速度, 3 years ago
YunaiV 3a24d05bdc mall + pay:
1. 修复单元测试的报错
3 years ago
xingyu c95a1d0a7d chore: up springboot 2.10.13 3 years ago
YunaiV 68a4ef98ca mall + pay:
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
3 years ago
YunaiV 2485a5ebc9 mall + pay:
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
3 years ago
YunaiV e615be971e mall + pay:
1、测试通过微信小程序支付
3 years ago
YunaiV 67d60e32f8 mall + pay:
1、调整微信支付,修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
3 years ago
YunaiV 20eb0a2a88 mall + pay:
1、调整 returnUrl 的实现
3 years ago
YunaiV 23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
芋道源码 11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 3 years ago
YunaiV 040a66965c mall + member:
1、review 积分
3 years ago
congqing c1e020a286 将master数据库中pg数据库的引用数据库名称变量改为master 3 years ago
xingyu bdb18b4ced chore: up springboot 2.7.13 3 years ago
xiaqing e5c556f106 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 3 years ago
YunaiV 6573849f56 mall + promotion:mock 拼团列表 3 years ago
芋道源码 798e322f08
!506 积分模块
Merge pull request !506 from QingX/feature/mall_product
3 years ago
xiaqing 8e3a65d84c 本地连接修改 3 years ago
xingyu 25df1e2ecd revert: config 3 years ago
xingyu cd33f68e2b chore: up springboot 2.10.12 3 years ago
xingyu 573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.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/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
3 years ago
xiaqing 73d0e9d08a 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
3 years ago
YunaiV dd93215139 mall + trade:review 商品管理 3 years ago
芋道源码 12d6c14b1c
!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性
Merge pull request !469 from xingyu/fix/vue3_codegen
3 years ago
芋道源码 dbdf1d9fb0
!468 feat: Docker最简支持
Merge pull request !468 from dhb52/master
3 years ago
xingyu 5b13c07e01 chore: up springboot 2.7.11 3 years ago
dhb52 c139be1966 perf: yudao-server/Dockerfile添加$ARGS参数 3 years ago
YunaiV 711a2763ed 修复 ProjectReactor 一键改包的报错 3 years ago
YunaiV 502fa11f1d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
YunaiV b30fc28021 商城:product:完善 ProductSpuDO 表 3 years ago
YunaiV 8eac97ae12 移除 Vue3 专属菜单,统一菜单! 3 years ago
xingyuv e3d74b1713 chore: 升级最新依赖 3 years ago
xingyuv 5aff120d77 chore: reset 3 years ago
xingyuv 01902c4345 chore: up minio 8.5.2 3 years ago
芋道源码 ce80c6f9d8
!453 代码生成时,增加 UI 类型的选择,可生成 Vue2、Vue3 多种管理后台的代码,支持 CRUD Schema 模式
Merge pull request !453 from 芋道源码/feature/codegen-front
3 years ago
YunaiV d500332a18 代码生成,支持配置前端 UI 类型 3 years ago
YunaiV de782479be 优化 ProjectReactor 提示 3 years ago
YunaiV 5c0161d762 修复租户名的重复问题 3 years ago
YunaiV f07191437e 改造代码生成器,支持多种前端模版 3 years ago
weicong.li 0751e57dd8 fix: 若同个服务器内其他数据库有相同的工作流表,flowable不会建表的问题 3 years ago
YunaiV 6115a1ee34 admin-ui 演示环境,迁移到 https://gitee.com/yudaocode/yudao-ui-static 地址 3 years ago
芋道源码 c419c1e107
!417 支付收银台,接入支付宝的 PC、Wap、二维码、条码、App 等支付方式
Merge pull request !417 from 芋道源码/feature/dev-yunai
3 years ago
YunaiV eefd9a71fc pay:默认禁用 pay 模块,进一步提升启动速度 3 years ago
YunaiV 14893c4cff pay: 优化回调的逻辑 3 years ago
芋道源码 3dba944d5f
!410 去除重复内容并更换为本地化时区
Merge pull request !410 from 小桂子/N/A
3 years ago
YunaiV 96ecd5028d 1. 优化支付订单回调任务,避免重复打 SQL 查询日志
2. 修复定时任务的回调,回调成功未更新状态的问题。
3 years ago
YunaiV eb660ca619 pay:示例订单,增加发起退款的操作 3 years ago
小桂子 96282abca0
去除重复内容并更换为本地化时区
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
3 years ago
小桂子 79c8fd7855
去除重复内容,并改时区为本地时区
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
3 years ago
芋道源码 877e2376be
!404 修复项目启动,链接数据查询时控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt
Merge pull request !404 from zhang/master
3 years ago
YunaiV b7198bd373 修复 jimu 报表的样式问题 3 years ago
okill.cn 13c60e8352 修复启动项目时查询数据,控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt
Signed-off-by: okill.cn <2029364173@qq.com>
3 years ago
YunaiV fb45a70bce 集成 Go-View 大屏设计器 3 years ago
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 3 years ago
YunaiV 53767614fe 增加商城的提示 3 years ago
YunaiV 6bf5eb0133 适配 mall 模块的 openapi 3 years ago
YunaiV c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.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/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
3 years ago
YunaiV 3aeebef036 完善 MenuServiceImplTest 单元测试 3 years ago
xingyu c6f880bfc1 up springboot 2.7.8 3 years ago
xingyu 08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
3 years ago
YunaiV ca8bb72417 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 3 years ago
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 3 years ago
YunaiV ae3ee95cdd 站内信模块:整体功能实现 3 years ago
YunaiV ea39dcc5c8 邮箱模块:完善 template 模版的增删改查功能 3 years ago
YunaiV 6b1f3140b8 spring doc:移除多余字段~ 3 years ago
YunaiV d193d2dd4a spring doc:支持通过 springdoc.api-docs 禁用 3 years ago
YunaiV 711a39b8e9 spring doc:增加模块分组 3 years ago
xingyu fa32611fe7 revert: file 3 years ago
xingyu be9d670bee feat: mp springdoc 3 years ago
xingyu f2adb441cd Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java
3 years ago
YunaiV 3166cd7063 mp:同步 mp 公众号 SQL 3 years ago
xingyu 3d390d0d8f feat: knife4j 3 years ago
xingyu 4d35bcef65 feat: springdoc success 3 years ago
xingyu cba69e94df revert: file 3 years ago
xingyu 1c0d8fc1eb Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
3 years ago
xingyu d77e5b07c7 revert: file 3 years ago
xingyu 216fbeeffd chore: update deps 3 years ago
YunaiV b9246d1543 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
#	yudao-server/src/main/resources/application.yaml
3 years ago
xingyu 6954150fcb feat: websocket init 3 years ago
xingyu 97330fd7b1 chore: 升级springboot 2.7.7 3 years ago
xingyu 7b98a3f3f3 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.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-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.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/AppTradeOrderPageReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
#	yudao-server/pom.xml
#	yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
3 years ago
YunaiV c671b01b0a mp:增加公众号的校验签名回调 3 years ago
YunaiV 48520a456b Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
#	pom.xml
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/admin-ui/static/js/4.js
#	yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-ui-admin/yarn.lock
3 years ago
YunaiV 2706463e49 修复 local 环境的配置文件 3 years ago
YunaiV 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
3 years ago
xingyu 683b49a8a4 feat: springdoc 开启认证 3 years ago
xingyu cacefb4eea feat: knife4j springdoc 3 years ago
xingyu4j 9fc6e0f00b refactor: springdoc 替换 springfox 3 years ago
xingyu4j 9315ac0bec Revert "feat: add search slots"
This reverts commit 078249677b.
3 years ago
xingyu4j 078249677b feat: add search slots 3 years ago
YunaiV ffab0b1d6a 1. 优化 menu 本地缓存的刷新策略,在修改或删除菜单时,强制刷新缓存
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出,避免一直打印
3 years ago
YunaiV 0b9ddddd18 promotion:code review 秒杀的代码 3 years ago
xingyu b079513dc8 chore: 升级springboot 2.7.6 3 years ago
YunaiV 07f1681b50 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
xingyu 693288d33d Merge remote-tracking branch 'origin/master' into feature/vue3
# Conflicts:
#	yudao-dependencies/pom.xml
3 years ago
YunaiV 2d78b02086 移除云片短信渠道,解决云片的安全风险 3 years ago
YunaiV 1cd9085c59 pay: PayNotifyJob 增加多租户的支持 3 years ago
YunaiV 8798944069 优化 pay 支付成功后的回调逻辑 3 years ago
YunaiV 73d847ae2e 调整支付模块的回调地址 3 years ago
xingyu4j b081bb8e71 chore: devs 3 years ago
xingyu 7df72c4d85 fix 3 years ago
xingyu 6291a3d7d8 refactor: dictData ==> dictClass 3 years ago
YunaiV 969b9c3458 修复 swagger 404 的问题 3 years ago
YunaiV f6420e301e 修复部分单元测试报错的问题 3 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 3 years ago
YunaiV 12d045ea58 修复部分单元测试报错的问题 3 years ago
YunaiV a543b8c67a 同步商城的最新代码 3 years ago
YunaiV afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.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-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/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
3 years ago
YunaiV 4807854df6 默认不引入 mall 模块,保证启动速度 3 years ago
YunaiV 1819e0e1d6 异步化 Redis MQ 的初始化,提升启动速度 3 years ago
YunaiV c5b547e0f3 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV f5ef87094d 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV 92ace031fe 【修复】访问数据库存储的文件,path 多层级时,无法访问的问题 3 years ago
YunaiV 3310b766bc 【修复】工作流程-流程管理-流程模型,在发布完流程后,点击激活状态的按钮,显示“是否确认挂起流程名字为‘xxx’‘的数据项“,点击取消,前端显示的激活状态改变,但是数据库没有更新,报错 3 years ago
YunaiV ff1379d454 优化 README 说明~ 3 years ago
YunaiV a8cdf74120 【移除】Apollo 配置中心,简化学习成本 3 years ago
YunaiV ce3aefadd7 移除 jasypt-spring-boot-starter 依赖,使用 hutool AES 替代 3 years ago
YunaiV 3fbb0b4c54 修复滑块验证码,存在失败的情况 3 years ago
YunaiV 93b8a2b6c1 1. 修复滑块验证码,存在失败的情况
2. 重新构建 demo 预览项目
3 years ago
YunaiV 40ba456fde 1. 修复 MenuServiceTest 单元测试 3 years ago
YunaiV 5934d6b029 trade:完成下单时,创建支付单逻辑 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
YunaiV 873b530652 promotion:增加优惠劵的回收操作 3 years ago
YunaiV e6acdf7098 将 market 模块,调整成 promotion 模块 3 years ago
YunaiV 829bbf58b5 price:完成优惠劵的价格计算~ 3 years ago
YunaiV c00ded3ed3 优化商品的 index 界面 3 years ago
YunaiV 2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
3 years ago
YunaiV dc8eb8e362 修复 Redis 地址不正确的问题 3 years ago
YunaiV f634ecf7c3 完善 pom.xml 的注释 3 years ago
芋道源码 952e6aa4a8
!266 接口实现-交易订单 单元测试
Merge pull request !266 from LeeYan9/ly_uniapp
3 years ago
YunaiV d26c78a0df Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
YunaiV 1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 3 years ago
ex_yang.li@ca-nio.com f21ce954ec Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp
# Conflicts:
#	yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
#	yudao-server/src/main/resources/application.yaml
3 years ago
ex_yang.li@ca-nio.com 5889093a64 创建交易订单-单元测试 3 years ago
YunaiV 15798cea10 mall:价格计算的 API 简单实现 3 years ago
YunaiV 9632c33d27 mall:优化商品的分类、品牌的代码 3 years ago
YunaiV 37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 3 years ago
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 3 years ago
YunaiV 833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	sql/optional/mall/mall.sql
3 years ago
芋道源码 dd6dc2ac3d
!246 集成aj-captcha
Merge pull request !246 from xingyu/master
3 years ago
YunaiV 926c75d29a 优化图片验证码的后端实现 3 years ago
GuoLei c4f416c7cd 修复dev环境WxMaService 报错 3 years ago
xingyu 020535ab3a Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
4 years ago
芋道源码 83dc4047a9
!229 关于 一键改包 目录问题
Merge pull request !229 from @C/master
4 years ago
YunaiV face9cae76 mall:调整 trade 的接口 4 years ago
xingyu da0ab98fae revert 4 years ago
xingyu e477179cd5 refactor: store action name 4 years ago
xingyu a8ea50a059 update hutool 5.8.5 4 years ago
xingyu 85e21092b8 删除文件 yudao-server/src/main/resources/application-local.yaml 4 years ago