Commit Graph

Select branches

Hide Pull Requests

b2c

dev

master

pg

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#19

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#218

#219

#219

#22

#22

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#288

#289

#289

#29

#29

#290

#290

#291

#291

#292

#292

#293

#293

#294

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#3

#3

#30

#30

#300

#300

#301

#301

#302

#302

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#31

#310

#310

#311

#311

#312

#312

#313

#313

#314

#314

#315

#315

#316

#316

#317

#317

#318

#318

#319

#319

#32

#320

#320

#321

#322

#322

#323

#323

#324

#324

#325

#325

#326

#326

#327

#327

#328

#328

#329

#329

#33

#33

#330

#330

#331

#331

#332

#332

#333

#333

#334

#334

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#34

#340

#340

#341

#341

#342

#342

#343

#343

#344

#344

#345

#345

#346

#346

#347

#347

#348

#348

#349

#349

#35

#35

#350

#350

#351

#351

#352

#352

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#36

#360

#360

#361

#361

#362

#362

#363

#363

#364

#364

#365

#365

#366

#366

#367

#367

#368

#368

#37

#37

#38

#38

#39

#39

#4

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#46

#46

#47

#47

#48

#48

#49

#49

#5

#5

#50

#50

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#75

#75

#76

#76

#77

#77

#78

#78

#79

#79

#8

#8

#80

#80

#81

#81

#82

#82

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

v4.1

v4.2

v4.2.0

v4.2.1

v4.2.2

v4.2.3

v4.2.4

v4.2.5

v4.3

v4.4

Mono Color

• 3c905ffd8b 优化es商品索引的mapping的促销存储结构（解决促销过多时，mapping explosion问题） paulGao 2022-01-11 11:38:30 +08:00
• 20d32b1f8f !111 优化es商品索引的mapping的促销存储结构,增加自定义xss过滤策略 Merge pull request !111 from OceansDeep/feature/pg OceansDeep 2022-01-11 03:27:44 +00:00
• f57a373d47 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-01-11 11:26:28 +08:00
• 77a714e64c 优化es商品索引的mapping的促销存储结构（解决促销过多时，mapping explosion问题） paulGao 2022-01-11 11:25:56 +08:00
• 4a3c978e07 用户校验问题处理 Chopper 2022-01-11 11:23:38 +08:00
• a4d458bace 增加自定义xss过滤策略（可保存iframe） paulGao 2022-01-11 11:20:54 +08:00
• b0843aa744 token相关类使用泛型，优化代码 Chopper 2022-01-11 11:16:17 +08:00
• eddcbc2ecb 增加会员登录事件，对token处理优化 Chopper 2022-01-11 11:12:19 +08:00
• 62fd1f3012 !110 优化编辑商品时的生成索引，修复店铺结算单结算金额对于积分商品和砍价商品重复计算问题 Merge pull request !110 from OceansDeep/feature/pg OceansDeep 2022-01-10 11:46:18 +00:00
• 23264d5d9b merge conflict origin/master paulGao 2022-01-10 19:10:42 +08:00
• cc7d2c0c82 地址问题处理 Chopper 2022-01-10 18:55:37 +08:00
• 9bed8e57df 代码处理 Chopper 2022-01-10 18:34:23 +08:00
• ad35168876 优化编辑商品时的生成索引，增加事务监听在提交后发送mq信息 paulGao 2022-01-10 18:05:53 +08:00
• ec8d511e9e 修复店铺结算单结算金额对于积分商品和砍价商品重复计算问题 paulGao 2022-01-10 18:04:38 +08:00
• d2cab9f4a1 修复店铺结算单结算金额对于积分商品和砍价商品重复计算问题 paulGao 2022-01-10 18:04:21 +08:00
• c1ca4764f0 短信验证码验证暂时关闭 Chopper 2022-01-10 17:15:53 +08:00
• 366d1b8846 对限流暂时关闭 Chopper 2022-01-10 17:10:19 +08:00
• 7a8dd54e5c 给予测试环境默认收货地址 Chopper 2022-01-10 17:01:28 +08:00
• 37393bb7f8 修改api下单时的提交参数类型 Chopper 2022-01-10 16:55:06 +08:00
• 3904bfd91d 自动登录成功 Chopper 2022-01-10 15:53:17 +08:00
• f720e00132 验证码验证默认通过 Chopper 2022-01-10 15:42:32 +08:00
• f723c11a84 测试 Chopper 2022-01-10 14:48:05 +08:00
• 643e8c8157 连续加减方法运用 Chopper 2022-01-10 09:48:44 +08:00
• 11f9ddaeb6 更优雅的实现价格加减法运算 Chopper 2022-01-10 09:41:07 +08:00
• 5d96d434d6 !109 优化生成索引 Merge pull request !109 from OceansDeep/feature/pg OceansDeep 2022-01-07 10:24:02 +00:00
• ad1f086e4d 优化生成索引 paulGao 2022-01-07 18:23:14 +08:00
• 3fa3991cfa !108 优化xss过滤，使用owasp的预设规则过滤。优化代码 Merge pull request !108 from OceansDeep/feature/pg OceansDeep 2022-01-07 09:48:07 +00:00
• 9a6102e887 优化xss过滤，使用owasp的预设规则过滤。优化代码 paulGao 2022-01-07 17:46:42 +08:00
• e23d3a48cc !107 优化代码修复bug Merge pull request !107 from OceansDeep/feature/pg OceansDeep 2022-01-04 11:56:40 +00:00
• ddd7c336cf 优化代码修复bug paulGao 2022-01-04 19:55:51 +08:00
• ee79b19d20 !106 修复部分查询，时间查询问题 Merge pull request !106 from OceansDeep/feature/pg OceansDeep 2022-01-04 01:13:18 +00:00
• 383cbc0b53 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-01-04 09:06:32 +08:00
• e8d9556a4b 修复部分查询，时间查询问题 paulGao 2022-01-04 09:06:23 +08:00
• 5958f06986 !105 修复拼团商品使用优惠券无效问题，修复拼团活动延时任务无效问题 Merge pull request !105 from OceansDeep/feature/pg OceansDeep 2021-12-31 07:20:54 +00:00
• 0c4aef307a 修复拼团商品使用优惠券无效问题，修复拼团活动延时任务无效问题 paulGao 2021-12-31 15:19:17 +08:00
• 20436653af !104 优化代码，修复bug Merge pull request !104 from OceansDeep/feature/pg OceansDeep 2021-12-30 09:02:56 +00:00
• 814533a2c2 修复分销商品佣金提现参数校验无效问题 paulGao 2021-12-30 17:01:32 +08:00
• d4ca3d5817 修复秒杀库存前后端显示不一致问题 paulGao 2021-12-30 17:00:32 +08:00
• 194d0b6ac2 优化es索引更新，把单次更新优化为批量更新 paulGao 2021-12-30 16:59:45 +08:00
• 832b065a46 密码重置可以被多次调用问题处理 Chopper 2021-12-30 16:49:55 +08:00
• fa443a091f 短信验证码验证结果未生效问题处理 Chopper 2021-12-30 16:44:50 +08:00
• 31c2f555fc !103 修复扣减商品库存问题 Merge pull request !103 from OceansDeep/feature/pg OceansDeep 2021-12-30 02:32:54 +00:00
• 74e5e86eff 修复扣减商品库存问题 paulGao 2021-12-30 10:31:56 +08:00
• a318eb82c7 !102 适配优化更新索引促销方式的结算 Merge pull request !102 from OceansDeep/feature/pg OceansDeep 2021-12-30 01:53:48 +00:00
• 6465dc2b73 适配优化更新索引促销方式的结算。 paulGao 2021-12-30 09:52:54 +08:00
• 082d241c8f !101 适配优化更新索引促销方式的结算。 Merge pull request !101 from OceansDeep/feature/pg OceansDeep 2021-12-29 18:30:22 +00:00
• 5a6012530e 适配优化更新索引促销方式的结算。 paulGao 2021-12-30 02:28:27 +08:00
• 35e4538160 !100 增加索引时间格式化格式 Merge pull request !100 from OceansDeep/feature/pg OceansDeep 2021-12-29 12:16:06 +00:00
• 125bb372ed 增加索引时间格式化格式 paulGao 2021-12-29 20:15:36 +08:00
• 92e56d7153 !99 优化更新索引失败异常信息 Merge pull request !99 from OceansDeep/feature/pg OceansDeep 2021-12-29 12:07:16 +00:00
• c8272ec90d 优化更新索引失败异常信息 paulGao 2021-12-29 20:06:20 +08:00
• b6d01cb850 !98 优化更新索引促销方式，以更新部分字段的方式更新。不在以刷新索引的方式更新。 Merge pull request !98 from OceansDeep/feature/pg OceansDeep 2021-12-29 11:48:56 +00:00
• 5e1eb3e03b 优化更新索引促销方式，以更新部分字段的方式更新。不在以刷新索引的方式更新。 paulGao 2021-12-29 19:48:09 +08:00
• f4c94bd8d6 !92 修复店铺列表永远查询到禁用店铺的bug Merge pull request !92 from ray/master Merge pull request !92 from ray/master chopper711 2021-12-29 10:18:46 +00:00
• 8484d3f810 !97 修改异步更新日志显示级别 Merge pull request !97 from OceansDeep/feature/pg OceansDeep 2021-12-29 10:16:22 +00:00
• 07f5fbca47 修改异步更新日志显示级别 paulGao 2021-12-29 18:11:28 +08:00
• 68d03196af !96 优化更新索引促销方式，以更新部分字段的方式更新。不在以刷新索引的方式更新。 Merge pull request !96 from OceansDeep/feature/pg OceansDeep 2021-12-29 09:55:05 +00:00
• a9ef62dfb0 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-12-29 17:54:23 +08:00
• 9f6d33f6e8 优化更新索引促销方式，以更新部分字段的方式更新。不在以刷新索引的方式更新。 paulGao 2021-12-29 17:53:40 +08:00
• ff158fd0e4 token中增加头像 Chopper 2021-12-29 17:45:31 +08:00
• 4de5e616e5 !95 优化促销更新 Merge pull request !95 from OceansDeep/feature/pg OceansDeep 2021-12-29 04:22:43 +00:00
• b6db829b04 优化促销更新 paulGao 2021-12-29 12:19:17 +08:00
• 821aa74669 !94 优化代码结构 Merge pull request !94 from OceansDeep/feature/pg OceansDeep 2021-12-29 03:54:59 +00:00
• c3221a6fff 优化代码结构。优化促销更新。 paulGao 2021-12-29 11:53:46 +08:00
• cbbfbae772 !93 fix bugs Merge pull request !93 from OceansDeep/feature/pg OceansDeep 2021-12-28 12:02:05 +00:00
• c65fd99b15 优化更新商品索引促销信息时为异步执行。 paulGao 2021-12-28 19:59:52 +08:00
• 4d49d3c77a 修复订单收货时，更新订单完成时间。 paulGao 2021-12-28 19:59:00 +08:00
• aad32a4a1f 修复满额活动赠品订单错误问题 paulGao 2021-12-28 19:58:20 +08:00
• ec912efa01 fix bug zhanglei829 2021-12-28 15:18:13 +08:00
• bf2fdc2761 !91 修复下架商品没有删除商品索引问题。修复下单使用优惠券使金额变为0元时消费服务获取数据不正确。 Merge pull request !91 from OceansDeep/feature/pg OceansDeep 2021-12-27 10:03:12 +00:00
• 168c630a13 修复下架商品没有删除商品索引问题。修复下单使用优惠券使金额变为0元时消费服务获取数据不正确导致没有及时更新订单状态问题。 paulGao 2021-12-27 18:01:58 +08:00
• e7563203fe Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-12-27 14:39:19 +08:00
• 9bf1dbe030 修复清除无效索引时的异常。某些情况下新建用户会创建两条member_wallet数据。优化代码。 paulGao 2021-12-27 14:38:45 +08:00
• dbcee40b93 !90 修复优化促销 Merge pull request !90 from OceansDeep/feature/pg OceansDeep 2021-12-25 11:08:54 +00:00
• 2af334d793 merge branch "master" paulGao 2021-12-25 19:08:18 +08:00
• f9a8675942 修复优化促销 paulGao 2021-12-25 18:35:44 +08:00
• 521a6174fe '修改路径' fengtianyangyang 2021-12-25 15:38:02 +08:00
• c85bc7b8ea Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-25 09:32:00 +08:00
• 825e44b353 !89 修复首次发布商品不会生成商品索引问题 Merge pull request !89 from OceansDeep/feature/pg OceansDeep 2021-12-24 08:21:02 +00:00
• ed840a95a1 优化搜索热词管理，增加搜索热词删除 paulGao 2021-12-24 16:11:53 +08:00
• ef31d6af83 砍价商品获取错误问题处理 Chopper 2021-12-24 15:56:41 +08:00
• b1e70ebf12 促销金额大于商品金额的极端情况显示问题处理 Chopper 2021-12-24 15:46:25 +08:00
• 3af0031214 注册赠券功能bug修复 Chopper 2021-12-24 15:45:48 +08:00
• b648aa94b3 修复首次发布商品不会生成商品索引问题；代码优化；修复bug； paulGao 2021-12-24 14:59:38 +08:00
• 0e864043a6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-24 11:13:42 +08:00
• eb25827937 !88 修复文章内容编辑无格式问题 Merge pull request !88 from OceansDeep/feature/pg OceansDeep 2021-12-23 11:23:18 +00:00
• f4a07b2911 修复文章内容编辑无格式问题 paulGao 2021-12-23 19:22:00 +08:00
• cdfeb5dbdc 修复更新订单的售后商品数量时，传递goodsId改成goodsSkuId paulGao 2021-12-23 17:17:31 +08:00
• 40bc890870 空品牌问题处理 Chopper 2021-12-23 15:27:06 +08:00
• 18874e3755 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-12-23 13:59:56 +08:00
• a3d2b84ecb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-23 11:58:53 +08:00
• 5f16a5c791 各个应用微信支付配置分开 Chopper 2021-12-23 11:58:47 +08:00
• f086a58096 添加xss过滤sell关键字 paulGao 2021-12-23 10:58:19 +08:00
• dfcf71aec7 移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题 paulGao 2021-12-23 10:55:43 +08:00
• f2e8d03f80 !87 修复管理员上下架商品报错问题 Merge pull request !87 from OceansDeep/feature/pg OceansDeep 2021-12-23 00:37:38 +00:00
• 0736f1c550 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-12-23 08:17:50 +08:00
• bdd1195d20 修复管理员上下架商品报错问题 paulGao 2021-12-23 08:17:45 +08:00
• e5511d5c09 订单联合查询将innerjoin 修改为 left join Chopper 2021-12-22 17:57:49 +08:00
• 7634801f7c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-22 17:04:12 +08:00
• 1db86f2865 es中商品索引信息，以及虚拟商品会携带大量优惠券信息下单问题处理 Chopper 2021-12-22 17:00:30 +08:00