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

• 87c82ce4d3 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 合并之前代码，解决部分参数校验问题，解决消息发送加入到两个mq队列通道问题，取消两个无效maven依赖 Chopper 2021-09-27 14:31:25 +08:00
• bdf0f65963 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-27 10:06:30 +08:00
• 794a932340 删除管理端自定义分词Controller重复问题。限时抢购活动，修改时增加检查秒杀参数校验 paulGao 2021-09-27 10:06:19 +08:00
• 504941eafb 文章展示内容问题处理 Chopper 2021-09-26 17:46:49 +08:00
• 7fafdc087e !35 修复支付宝支付回调转义问题；修复限时抢购时，结束时间为空的问题 Merge pull request !35 from OceansDeep/feature/pg OceansDeep 2021-09-26 09:15:30 +00:00
• c8b2e87570 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-26 17:13:54 +08:00
• 81ce0f4682 修复支付宝支付回调转义问题；修复限时抢购时，结束时间为空的问题 paulGao 2021-09-26 17:13:50 +08:00
• 87e5404aa8 文章分类参数校验问题 Chopper 2021-09-26 16:12:59 +08:00
• 2f31946a17 增加字段，标识客服，提供im服务 Chopper 2021-09-26 15:44:36 +08:00
• a23b8ac642 商品发布，参数校验调整，分类校验调整 Chopper 2021-09-26 14:40:22 +08:00
• 071f8c9d56 优惠券查询接口替换为lambda Chopper 2021-09-26 10:19:45 +08:00
• 76fcf84043 Merge branch 'liushuai' 解决积分商品购买问题，部分参数校验问题，等各种问题优化 Chopper 2021-09-24 18:17:59 +08:00
• d9b1d78c61 积分赠送以及返还问题处理。 积分购买时预校验，以免下单后取消订单，积分返还无效操作 额外的一些代码完善问题处理 Chopper 2021-09-24 18:15:29 +08:00
• c8de423e7c !34 DraftGoods get intro and mobileIntro method by HTML unescape Merge pull request !34 from OceansDeep/feature/pg OceansDeep 2021-09-24 08:20:58 +00:00
• a4648ac40f DraftGoods get intro and mobileIntro method by HTML unescape paulGao 2021-09-24 16:20:01 +08:00
• af5c0a4641 商品添加校验完善 pikachu 2021-09-23 23:38:11 +08:00
• ff24c95d02 连续签到积分无法正常获取问题。 Chopper 2021-09-23 11:42:03 +08:00
• ac936caf17 sql状态判定处理 Chopper 2021-09-23 09:34:19 +08:00
• be1c9772ad 参数校验问题处理 Chopper 2021-09-23 09:27:22 +08:00
• 50b52f07c6 分类绑定品牌规范问题处理 Chopper 2021-09-22 12:13:04 +08:00
• 57a5c5a0f1 分类绑定品牌问题处理 Chopper 2021-09-22 11:19:28 +08:00
• 4f4704ab50 分类与各个参数绑定后，删除关系未清理干净问题处理。 品牌删除时，与分类发生绑定，则返回分类信息，协助解除绑定。 Chopper 2021-09-22 11:10:34 +08:00
• 505366d9bc Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-09-22 09:56:47 +08:00
• c5e8afd841 时间查询问题处理 Chopper 2021-09-22 09:56:14 +08:00
• 1de4dea1fb !33 修复文章获取内容转义，限时抢购无参加商品不开启，商品搜索报错 Merge pull request !33 from OceansDeep/feature/pg OceansDeep 2021-09-22 01:51:12 +00:00
• 6fb9afd411 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-22 09:50:42 +08:00
• a2d896c9b2 移动端无法展示优惠券问题处理 Chopper 2021-09-22 09:46:43 +08:00
• e5e809ed72 fix es goods search category name length does not match category path length paulGao 2021-09-22 09:45:51 +08:00
• d4c9b0f147 fix promotion seckill for no join goods is not autostart paulGao 2021-09-22 09:43:11 +08:00
• ac60f27814 Article get content method by HTML unescape paulGao 2021-09-22 09:40:05 +08:00
• 42ce0814ae Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-09-22 09:19:14 +08:00
• f3f3d3f936 分类API接口代码完善 Chopper 2021-09-22 09:17:59 +08:00
• 8c3bc6e06e !31 fix member wallet insert db duplication Merge pull request !31 from OceansDeep/feature/pg OceansDeep 2021-09-18 07:05:20 +00:00
• 6dfde467b4 fix member wallet insert db duplication add store goods label order by field sort paulGao 2021-09-18 11:43:00 +08:00
• e0e5106eed Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-09-17 14:47:27 +08:00
• 9cee1093f4 IM完善 Chopper 2021-09-17 14:47:25 +08:00
• a3d73bf7ad !30 unescape to goods get the intro Merge pull request !30 from OceansDeep/feature/pg OceansDeep 2021-09-17 06:28:25 +00:00
• 1f7dff38fc unescape to goods get the intro paulGao 2021-09-17 14:27:20 +08:00
• f7fc9a1299 !29 improved Broken Access Control check of goods Merge pull request !29 from OceansDeep/feature/pg OceansDeep 2021-09-16 09:19:38 +00:00
• 6ef7a98d81 improved Broken Access Control check of goods paulGao 2021-09-16 17:02:20 +08:00
• 31a16b77df Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-16 16:54:02 +08:00
• 3459169885 IM 相关配置提交 Chopper 2021-09-16 15:32:09 +08:00
• 8ae04e7ee6 fix manager api calling updateGoodsMarketAble error fix manager api es generator get progress error info paulGao 2021-09-16 11:55:58 +08:00
• a3564c746c 镜像配置相关提交 Chopper 2021-09-15 17:20:01 +08:00
• b0dc4db48a !28 fix xss filter parse array error Merge pull request !28 from OceansDeep/feature/pg v4.2.2 OceansDeep 2021-09-14 10:27:42 +00:00
• 471b128f22 fix xss filter parse array error paulGao 2021-09-14 18:26:12 +08:00
• 7727c1a45b 调整验证码模块，对演示站点做权限处理 Chopper 2021-09-14 16:43:48 +08:00
• 2bc381dad5 楼层装修转译导致无法正常展示问题处理 Chopper 2021-09-14 10:03:34 +08:00
• 13c5ceea96 !27 fix seckill error Merge pull request !27 from OceansDeep/feature/pg OceansDeep 2021-09-13 07:24:49 +00:00
• 5ce5384230 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-13 15:22:59 +08:00
• 36528ae416 fix seckill error paulGao 2021-09-13 15:22:38 +08:00
• 327926adb9 脱敏配置注释补充。 Chopper 2021-09-13 10:32:30 +08:00
• a210565387 增加脱敏配置。 lili: system: sensitiveLevel: 2 Chopper 2021-09-13 10:30:56 +08:00
• d1d91b78fc 手机号脱敏处理暂时还原，找其他方式解决 Chopper 2021-09-10 16:15:51 +08:00
• 6006c3eeff Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-09-10 15:54:36 +08:00
• 7c2234b1a9 售后注解问题； 微信支付退款错误日志记录。 Chopper 2021-09-10 15:54:26 +08:00
• 3f92034dd1 !26 fix coupon get error Merge pull request !26 from OceansDeep/feature/pg OceansDeep 2021-09-10 02:58:35 +00:00
• f99b65b2e6 fix coupon get error paulGao 2021-09-10 10:57:34 +08:00
• 19ab3789e5 !25 fix seckill get error Merge pull request !25 from OceansDeep/feature/pg OceansDeep 2021-09-10 02:50:09 +00:00
• 0bbefb516d fix seckill get error paulGao 2021-09-10 10:49:27 +08:00
• 48a2502467 !24 fix seckill abnormal open Merge pull request !24 from OceansDeep/feature/pg OceansDeep 2021-09-10 02:38:13 +00:00
• 47620a61ef Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-10 10:37:49 +08:00
• f44e787f72 fix seckill abnormal open paulGao 2021-09-10 10:36:27 +08:00
• ae745ef518 手机号敏感信息过滤 lifenlong 2021-09-09 17:01:26 +08:00
• 11baa30a9a !23 fix XSS and BAC, improve code style Merge pull request !23 from OceansDeep/feature/pg OceansDeep 2021-09-09 08:50:37 +00:00
• 9b7be69c6c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-09 16:47:43 +08:00
• d3e1de5620 fix XSS and BAC, improve code style paulGao 2021-09-09 16:47:14 +08:00
• 8784da3449 h5 微信登录后支付问题。 Chopper 2021-09-09 14:01:42 +08:00
• 006218e15a 活动判定问题，暂时注释处理 Chopper 2021-09-08 15:15:25 +08:00
• d470192ac6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-08 11:29:19 +08:00
• 97cac9916d !22 improve and fix Merge pull request !22 from OceansDeep/feature/pg OceansDeep 2021-09-06 18:06:36 +00:00
• cf6b1a60f4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-07 02:05:14 +08:00
• 5fcdbe8df9 fix settlement seckill promotion is not punctuality paulGao 2021-09-07 02:04:31 +08:00
• 4063c8b063 improve esGoods parameter selector buckets(not get category and brand from db, add EsGoodsIndex Field BrandName,BrandUrl,CategoryNamePath) paulGao 2021-09-07 01:55:58 +08:00
• d84f3b547b 订单取消会员积分返回判定问题处理 Chopper 2021-09-06 15:11:39 +08:00
• 80492903ae 修改数据库文件夹名称 Chopper 2021-09-03 16:13:59 +08:00
• 3c6d7162e8 增加一个sql的readme文件 Chopper 2021-09-03 16:13:16 +08:00
• daa0320d78 尝试解决最新版本打包报错问题 Chopper 2021-09-02 15:18:11 +08:00
• 82d7ab1440 代码错误补充 Chopper 2021-09-02 15:05:45 +08:00
• 315ab4d132 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-09-02 14:47:47 +08:00
• a08373d6a8 使用绑定满减活动的优惠券无法正常使用问题处理 Chopper 2021-09-02 14:38:16 +08:00
• 7ac15d1abe !21 升级spring boot 版本，完善Elasticsearch搜索 Merge pull request !21 from OceansDeep/feature/pg OceansDeep 2021-09-02 03:44:14 +00:00
• 8f10b6b2a6 improvement generator goods index to asynchronization paulGao 2021-09-02 11:40:26 +08:00
• a9f0eac6f7 默认收货地址代码优化。 积分商品/砍价商品库存问题处理 Chopper 2021-09-02 10:00:57 +08:00
• fe675d6ac4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-02 09:07:07 +08:00
• fb006e13a0 拼团活动同一店铺同一时间限制一个活动取消。 积分订单库存扣减，积分返还处理。 其他促销相关优化 Chopper 2021-09-01 19:10:16 +08:00
• 318cc04566 add order by goods parameters field sort to aggregation elasticsearch paulGao 2021-09-01 19:07:30 +08:00
• 2e80478203 upgrade spring boot 2.3 to 2.4 paulGao 2021-09-01 19:03:36 +08:00
• 42e9ee06f4 优惠券获取，超出当前时间被渲染问题处理，增加状态和时间判定 Chopper 2021-09-01 14:49:59 +08:00
• 88109995bb 打折券计算方式调整 Chopper 2021-09-01 11:35:32 +08:00
• 3c9c3c2c17 店铺商品数量变更问题处理。 Chopper 2021-09-01 10:42:47 +08:00
• b78f1e512e 下方qq群问题处理 Chopper 2021-09-01 09:40:18 +08:00
• 7492abf4a3 增加qq1群已满提示。 Chopper 2021-09-01 09:39:36 +08:00
• 2973bcdc7a 商品审核后，消费者类型转换异常问题处理 Chopper 2021-09-01 09:37:27 +08:00
• 98df40a9a1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-09-01 09:15:40 +08:00
• e35eb6961d fix elasticseach config injection to @Autowried paulGao 2021-09-01 09:15:35 +08:00
• 36beadbc03 sql 查询参数问题处理 Chopper 2021-08-31 17:56:14 +08:00
• e9075a94f3 秒杀活动自动创建调整为7天 Chopper 2021-08-31 17:42:27 +08:00
• c12dd02f8a 秒杀注释增加，秒杀设置天数变为常量设置 Chopper 2021-08-31 17:20:49 +08:00
• eb19b8f218 打折优惠券计算错误问题处理 Chopper 2021-08-31 14:55:41 +08:00