huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,239 Commits 1 Branch 0 Tags 176 MiB
55eed1377a
Commit Graph

343 Commits

Author SHA1 Message Date
puhui999
55eed1377a 营销活动: 新增文章管理 2023-10-15 16:16:41 +08:00
owen
df16278a03 统计：会员统计 2023-10-09 23:27:10 +08:00
YunaiV
ac55a9657c promotion：完善秒杀模块 2023-10-03 18:41:41 +08:00
YunaiV
c66b4e7bc0 code review：日志清理 Job 2023-10-03 11:02:33 +08:00
YunaiV
1bc1be14fb Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
 2023-10-03 10:33:22 +08:00
YunaiV
1f910992d6 trade：新增是否自提的配置项 2023-10-02 21:18:52 +08:00
j-sentinel
2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2023-10-02 19:18:36 +08:00
j-sentinel
11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2023-10-01 16:53:17 +08:00
owen
929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-29 21:08:49 +08:00
owen
171161e6c7 统计：交易统计 2023-09-29 21:08:15 +08:00
YunaiV
666ba351a2 trade：退款理由的维护 2023-09-29 13:35:40 +08:00
YunaiV
f9bf41d773 code review：分佣剩余部分的 review 2023-09-28 22:22:38 +08:00
YunaiV
9cd36abf10 同步 master 分支代码 2023-09-28 15:28:40 +08:00
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
 2023-09-28 15:18:59 +08:00
YunaiV
26dfbfb2ac trade：发货逻辑，增加订单日志 2023-09-27 09:55:04 +08:00
YunaiV
53bd1b9ec1 trade：订单评论超时时，自动评论 2023-09-26 23:50:54 +08:00
YunaiV
a8c78f3097 trade：增加自动收货的 job 2023-09-26 19:27:37 +08:00
YunaiV
1b154699c6 code review：处理错误的 mysql 连接 2023-09-20 00:10:18 +08:00
YunaiV
ab800aa891 1. 简化 JsonUtils 初始化方式，去掉 BeanPostProcessor 
2. 减少日志打印

目的：优化启动速度
 2023-09-16 18:05:50 +08:00
YunaiV
50371b3676 1. 禁用 member 模块 
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的：提升项目的启动速度
 2023-09-16 17:04:59 +08:00
YunaiV
62c4838ba7 默认禁用 spring boot admin 的启动 2023-09-16 15:30:02 +08:00
YunaiV
6a371f06b0 默认禁用 spring data redis repositories，一方面没用到，一方面提高启动速度 2023-09-16 13:29:47 +08:00
YunaiV
f0f5b52150 默认禁用 quartz 依赖，保证启动速度 2023-09-16 12:50:36 +08:00
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
 2023-09-15 15:27:59 +08:00
xiaqing
9d262e8e7f 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2023-09-15 15:20:39 +08:00
YunaiV
f2ee213caa 更新商城的演示地址 2023-09-11 16:42:38 +08:00
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
 2023-09-11 16:19:55 +08:00
YunaiV
314dee430e bugfix：微信公众号登录报 access token 的问题 2023-09-11 11:06:42 +08:00
YunaiV
40e1a879e3 登录：社交登录时，额外返回 openid 2023-09-10 18:01:53 +08:00
YunaiV
5a940b1d2c 修复 knife4j get 参数无法正确展示的问题 2023-09-09 15:04:22 +08:00
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
 2023-09-06 21:40:53 +08:00
YunaiV
fcca69d243 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:41:52 +08:00
zhijiantianya@gmail.com
beb385aab4 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:04:29 +08:00
YunaiV
6a819da0b6 分佣：增加用户分销统计 API mock 2023-09-03 21:21:33 +08:00
YunaiV
d82729e4c6 同步最新会员中心 SQL 2023-08-27 21:15:44 +08:00
YunaiV
0d1fc1138a 增加 app 的签到 mock 接口、积分记录分页、签到记录分页 2023-08-21 22:20:59 +08:00
YunaiV
c3e4e23459 同步最新 Member 菜单 2023-08-20 20:01:18 +08:00
xiaqing
db1f44305d 会员积分和会员签到模块todo修改 2023-08-19 14:09:47 +08:00
xiaqing
2e9dfac9ab 会员积分和会员签到模块todo修改 2023-08-19 14:09:22 +08:00
YunaiV
e4a2c738b2 订单： 
1. 增加查询物流接口
 2023-08-15 20:18:22 +08:00
YunaiV
be2ee905df code review：积分模块的实现 2023-08-11 23:49:20 +08:00
芋道源码
4177071758
!560 todo修改 
Merge pull request !560 from QingX/feature/mall_product
 2023-08-11 14:44:52 +00:00
YunaiV
5fcd0a21da Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-08-11 22:44:20 +08:00
YunaiV
9ff67b479f !562 优化 redisCache 2023-08-11 21:46:53 +08:00
芋道源码
8960a82978
!562 优化 redisCache 
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
 2023-08-11 12:09:10 +00:00
YunaiV
b53bfb0976 Merge branch 'feature/deps' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-11 19:21:44 +08:00
wanwan
134e5ca20f feat: 将 redisCache 的扫描策略设置成 scan 2023-08-10 15:27:19 +08:00
wanwan
e1fe21f24c Revert "feat: 将 redisCache 的扫描策略设置成 scan" 
This reverts commit 72d2dcc68f.
 2023-08-10 15:26:25 +08:00
jlc@yoc.tech
72d2dcc68f feat: 将 redisCache 的扫描策略设置成 scan 2023-08-10 11:26:44 +08:00
xiaqing
d397758dd1 还原配置文件 2023-08-09 22:39:12 +08:00