Chopper
|
62804941c2
|
Merge remote-tracking branch 'origin/feature/pg' into test
# Conflicts:
# framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
|
2022-01-11 17:39:46 +08:00 |
|
Chopper
|
05818baf7a
|
优化一些配置项，优化部分路基
|
2022-01-11 17:34:48 +08:00 |
|
paulGao
|
1c28e0bd5f
|
优化结算时获取用户优惠券信息（增加redis存储）
|
2022-01-11 17:34:00 +08:00 |
|
Chopper
|
0460e219f9
|
购物车创建时减少一次redis的读写
|
2022-01-11 16:34:18 +08:00 |
|
Chopper
|
eec3611218
|
优化sql
|
2022-01-11 15:16:02 +08:00 |
|
fengtianyangyang
|
87f637099c
|
'合并master'
|
2022-01-11 14:50:06 +08:00 |
|
Chopper
|
5f0241768d
|
去除事务注解
|
2022-01-11 14:48:11 +08:00 |
|
fengtianyangyang
|
60b4ab5c5b
|
'路径问题'
|
2022-01-11 14:32:01 +08:00 |
|
OceansDeep
|
bbed7afdcb
|
!113 修复商品审核和编辑商品缺失对es操作问题
Merge pull request !113 from OceansDeep/feature/pg
|
2022-01-11 04:11:31 +00:00 |
|
paulGao
|
459a736ebc
|
修复商品审核和编辑商品缺失对es操作问题
|
2022-01-11 12:10:54 +08:00 |
|
OceansDeep
|
bdbc620515
|
!112 优化es商品索引的mapping的促销存储结构
Merge pull request !112 from OceansDeep/feature/pg
|
2022-01-11 03:39:13 +00:00 |
|
paulGao
|
3c905ffd8b
|
优化es商品索引的mapping的促销存储结构（解决促销过多时，mapping explosion问题）
|
2022-01-11 11:38:30 +08:00 |
|
OceansDeep
|
20d32b1f8f
|
!111 优化es商品索引的mapping的促销存储结构,增加自定义xss过滤策略
Merge pull request !111 from OceansDeep/feature/pg
|
2022-01-11 03:27:44 +00:00 |
|
paulGao
|
f57a373d47
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-01-11 11:26:28 +08:00 |
|
paulGao
|
77a714e64c
|
优化es商品索引的mapping的促销存储结构（解决促销过多时，mapping explosion问题）
|
2022-01-11 11:25:56 +08:00 |
|
Chopper
|
4a3c978e07
|
用户校验问题处理
|
2022-01-11 11:23:38 +08:00 |
|
paulGao
|
a4d458bace
|
增加自定义xss过滤策略（可保存iframe）
|
2022-01-11 11:20:54 +08:00 |
|
Chopper
|
b0843aa744
|
token相关类使用泛型，优化代码
|
2022-01-11 11:16:17 +08:00 |
|
Chopper
|
eddcbc2ecb
|
增加会员登录事件，对token处理优化
|
2022-01-11 11:12:19 +08:00 |
|
OceansDeep
|
62fd1f3012
|
!110 优化编辑商品时的生成索引，修复店铺结算单结算金额对于积分商品和砍价商品重复计算问题
Merge pull request !110 from OceansDeep/feature/pg
|
2022-01-10 11:46:18 +00:00 |
|
paulGao
|
23264d5d9b
|
merge conflict origin/master
|
2022-01-10 19:10:42 +08:00 |
|
Chopper
|
cc7d2c0c82
|
地址问题处理
|
2022-01-10 18:55:37 +08:00 |
|
Chopper
|
9bed8e57df
|
代码处理
|
2022-01-10 18:34:23 +08:00 |
|
paulGao
|
ad35168876
|
优化编辑商品时的生成索引，增加事务监听在提交后发送mq信息
|
2022-01-10 18:05:53 +08:00 |
|
paulGao
|
ec8d511e9e
|
修复店铺结算单结算金额对于积分商品和砍价商品重复计算问题
|
2022-01-10 18:04:38 +08:00 |
|
paulGao
|
d2cab9f4a1
|
修复店铺结算单结算金额对于积分商品和砍价商品重复计算问题
|
2022-01-10 18:04:21 +08:00 |
|
Chopper
|
c1ca4764f0
|
短信验证码验证暂时关闭
|
2022-01-10 17:15:53 +08:00 |
|
Chopper
|
366d1b8846
|
对限流暂时关闭
|
2022-01-10 17:10:19 +08:00 |
|
Chopper
|
7a8dd54e5c
|
给予测试环境默认收货地址
|
2022-01-10 17:01:28 +08:00 |
|
Chopper
|
37393bb7f8
|
修改api下单时的提交参数类型
|
2022-01-10 16:55:06 +08:00 |
|
Chopper
|
3904bfd91d
|
自动登录成功
|
2022-01-10 15:53:17 +08:00 |
|
Chopper
|
f720e00132
|
验证码验证默认通过
|
2022-01-10 15:42:32 +08:00 |
|
Chopper
|
f723c11a84
|
测试
|
2022-01-10 14:48:05 +08:00 |
|
Chopper
|
643e8c8157
|
连续加减方法运用
|
2022-01-10 09:48:44 +08:00 |
|
Chopper
|
11f9ddaeb6
|
更优雅的实现价格加减法运算
|
2022-01-10 09:41:07 +08:00 |
|
OceansDeep
|
5d96d434d6
|
!109 优化生成索引
Merge pull request !109 from OceansDeep/feature/pg
|
2022-01-07 10:24:02 +00:00 |
|
paulGao
|
ad1f086e4d
|
优化生成索引
|
2022-01-07 18:23:14 +08:00 |
|
OceansDeep
|
3fa3991cfa
|
!108 优化xss过滤，使用owasp的预设规则过滤。优化代码
Merge pull request !108 from OceansDeep/feature/pg
|
2022-01-07 09:48:07 +00:00 |
|
paulGao
|
9a6102e887
|
优化xss过滤，使用owasp的预设规则过滤。优化代码
|
2022-01-07 17:46:42 +08:00 |
|
OceansDeep
|
e23d3a48cc
|
!107 优化代码修复bug
Merge pull request !107 from OceansDeep/feature/pg
|
2022-01-04 11:56:40 +00:00 |
|
paulGao
|
ddd7c336cf
|
优化代码修复bug
|
2022-01-04 19:55:51 +08:00 |
|
OceansDeep
|
ee79b19d20
|
!106 修复部分查询，时间查询问题
Merge pull request !106 from OceansDeep/feature/pg
|
2022-01-04 01:13:18 +00:00 |
|
paulGao
|
383cbc0b53
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2022-01-04 09:06:32 +08:00 |
|
paulGao
|
e8d9556a4b
|
修复部分查询，时间查询问题
|
2022-01-04 09:06:23 +08:00 |
|
OceansDeep
|
5958f06986
|
!105 修复拼团商品使用优惠券无效问题，修复拼团活动延时任务无效问题
Merge pull request !105 from OceansDeep/feature/pg
|
2021-12-31 07:20:54 +00:00 |
|
paulGao
|
0c4aef307a
|
修复拼团商品使用优惠券无效问题，修复拼团活动延时任务无效问题
|
2021-12-31 15:19:17 +08:00 |
|
OceansDeep
|
20436653af
|
!104 优化代码，修复bug
Merge pull request !104 from OceansDeep/feature/pg
|
2021-12-30 09:02:56 +00:00 |
|
paulGao
|
814533a2c2
|
修复分销商品佣金提现参数校验无效问题
|
2021-12-30 17:01:32 +08:00 |
|
paulGao
|
d4ca3d5817
|
修复秒杀库存前后端显示不一致问题
|
2021-12-30 17:00:32 +08:00 |
|
paulGao
|
194d0b6ac2
|
优化es索引更新，把单次更新优化为批量更新
|
2021-12-30 16:59:45 +08:00 |
|