101 Commits (2f0483ce9f113082ede1cc2d7499025302f91925)

Author SHA1 Message Date
j-sentinel 2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 3 years ago
j-sentinel 11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 3 years ago
YunaiV 666ba351a2 trade:退款理由的维护 3 years ago
YunaiV f9bf41d773 code review:分佣剩余部分的 review 3 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
3 years ago
YunaiV 26dfbfb2ac trade:发货逻辑,增加订单日志 3 years ago
YunaiV 1b154699c6 code review:处理错误的 mysql 连接 3 years ago
YunaiV ab800aa891 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
2. 减少日志打印

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

目的:提升项目的启动速度
3 years ago
YunaiV 62c4838ba7 默认禁用 spring boot admin 的启动 3 years ago
YunaiV f0f5b52150 默认禁用 quartz 依赖,保证启动速度 3 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
3 years ago
xiaqing 9d262e8e7f 新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
3 years ago
YunaiV 314dee430e bugfix:微信公众号登录报 access token 的问题 3 years ago
YunaiV 40e1a879e3 登录:社交登录时,额外返回 openid 3 years ago
xiaqing db1f44305d 会员积分和会员签到模块todo修改 3 years ago
xiaqing 2e9dfac9ab 会员积分和会员签到模块todo修改 3 years ago
YunaiV be2ee905df code review:积分模块的实现 3 years ago
xiaqing d397758dd1 还原配置文件 3 years ago
xiaqing 33323c1483 会员签到针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
3 years ago
YunaiV 7f657ee931 优化 mp-java 库的依赖管理 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
YunaiV 68a4ef98ca mall + pay:
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
3 years ago
YunaiV e615be971e mall + pay:
1、测试通过微信小程序支付
3 years ago
YunaiV 20eb0a2a88 mall + pay:
1、调整 returnUrl 的实现
3 years ago
YunaiV 040a66965c mall + member:
1、review 积分
3 years ago
congqing c1e020a286 将master数据库中pg数据库的引用数据库名称变量改为master 3 years ago
xiaqing 8e3a65d84c 本地连接修改 3 years ago
xingyuv 5aff120d77 chore: reset 3 years ago
xingyuv 01902c4345 chore: up minio 8.5.2 3 years ago
weicong.li 0751e57dd8 fix: 若同个服务器内其他数据库有相同的工作流表,flowable不会建表的问题 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 96ecd5028d 1. 优化支付订单回调任务,避免重复打 SQL 查询日志
2. 修复定时任务的回调,回调成功未更新状态的问题。
3 years ago
YunaiV eb660ca619 pay:示例订单,增加发起退款的操作 3 years ago
小桂子 79c8fd7855
去除重复内容,并改时区为本地时区
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
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 2706463e49 修复 local 环境的配置文件 4 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
4 years ago
YunaiV ffab0b1d6a 1. 优化 menu 本地缓存的刷新策略,在修改或删除菜单时,强制刷新缓存
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出,避免一直打印
4 years ago
YunaiV 0b9ddddd18 promotion:code review 秒杀的代码 4 years ago
YunaiV 07f1681b50 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 4 years ago
YunaiV 2d78b02086 移除云片短信渠道,解决云片的安全风险 4 years ago
YunaiV 8798944069 优化 pay 支付成功后的回调逻辑 4 years ago
YunaiV f6420e301e 修复部分单元测试报错的问题 4 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 4 years ago
YunaiV a543b8c67a 同步商城的最新代码 4 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
4 years ago
YunaiV 4807854df6 默认不引入 mall 模块,保证启动速度 4 years ago
YunaiV 1819e0e1d6 异步化 Redis MQ 的初始化,提升启动速度 4 years ago