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

• 06ee6d6359 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-06 09:29:38 +08:00
• a988dedfbf 增加根据名称获取地址信息 paulGao 2022-04-02 18:42:03 +08:00
• f90c6fb27d 注释 fengtianyangyang 2022-04-01 21:59:44 +08:00
• 5292d6ef90 !145 fix bugs and improve code Merge pull request !145 from OceansDeep/feature/pg OceansDeep 2022-04-01 07:25:20 +00:00
• e760af7216 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-01 15:21:55 +08:00
• e4889d82f2 替换弃用的hutool的SSLSocketFactoryBuilder paulGao 2022-04-01 15:21:28 +08:00
• 9d170ecc30 修复获取店铺分类缓存key错误问题 paulGao 2022-04-01 15:18:35 +08:00
• cf01011504 注销功能接口提供完善 Chopper 2022-03-31 16:49:12 +08:00
• b1291d3c43 文件内容错误，恢复内容 Chopper 2022-03-31 14:04:56 +08:00
• 82546eed06 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-03-31 09:21:23 +08:00
• bf667e2aa6 签到问题处理 Chopper 2022-03-31 09:21:18 +08:00
• 5b6f208f53 !144 修复更新商品索引促销时，更新的促销信息不正确问题 Merge pull request !144 from OceansDeep/feature/pg OceansDeep 2022-03-30 09:24:23 +00:00
• 210d56447c 优化更新全部商品索引时的性能 paulGao 2022-03-30 17:21:57 +08:00
• c093261369 修复更新商品索引促销时，更新的促销信息不正确问题 paulGao 2022-03-30 17:17:09 +08:00
• ee4f87d12d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-03-30 14:27:29 +08:00
• 74b0a5b081 修复一个搜索es商品时可能会发生的date格式转换问题 paulGao 2022-03-30 14:27:12 +08:00
• f51774c077 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-03-30 11:54:58 +08:00
• bd9f7b8b9f 收款单创建时间字段问题处理 Chopper 2022-03-30 11:54:56 +08:00
• dc55bd63f5 !141 ResultCode虚拟商品无需配送模板提示更正 from @Assure Merge pull request !141 from Assure/master chopper711 2022-03-29 09:05:26 +00:00
• 07ce947f78 !142 优化CommonUtil.getRandomNum() 提升随机数性能。 from @原批王 Merge pull request !142 from 原批王/master chopper711 2022-03-29 09:02:36 +00:00
• 0f6cc70f66 !143 修复秒杀活动时间段为一个时。不显示问题。修复可能会出现的es代码编译问题。improve code Merge pull request !143 from OceansDeep/feature/pg OceansDeep 2022-03-29 06:16:14 +00:00
• 6d014a01bc 修复秒杀活动时间段为一个时。不显示问题。修复可能会出现的es代码编译问题。improve code paulGao 2022-03-29 10:04:36 +08:00
• de5e97ac3a 优化cn.lili.common.utils.CommonUtil.getRandomNum方法逻辑 *** 2022-03-27 07:41:34 +08:00
• 40e866aadd fix:修复配虚拟商品送模板提示 胡程 2022-03-25 18:12:40 +08:00
• 36ce7593a9 由于铭感信息过滤手机号，导致管理端无法修改会员问题处理 Chopper 2022-03-18 17:41:05 +08:00
• a2a28af41d 微信消息删除调用时，微信返回参数无法解析，尝试解决此问题。 Chopper 2022-03-15 17:16:24 +08:00
• 203a30a236 商品评价问题处理 Chopper 2022-03-14 15:50:55 +08:00
• b7d418b5b7 修复虚拟订单核销校验问题 Chopper 2022-03-14 10:44:06 +08:00
• 1625f7ca76 自动关闭售后字段读取错误，修正 Chopper 2022-03-10 15:52:12 +08:00
• 8a67b905fc Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-03-10 15:31:39 +08:00
• 9ee76b5328 取消一个无实际作用的限流注解 订单买家端可以查询到别人的订单问题处理 Chopper 2022-03-10 15:31:23 +08:00
• df9dd7f435 merge conflict origin/master paulGao 2022-03-09 18:39:48 +08:00
• 9d0d318d66 优化更新es商品促销流程 paulGao 2022-03-09 18:39:04 +08:00
• ee1723a76b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-03-08 20:37:17 +08:00
• c715422814 会员签到接口限制问题 Chopper 2022-03-08 20:37:12 +08:00
• 72e7941230 '权限修改' fengtianyangyang 2022-03-08 14:19:22 +08:00
• ac475ca456 增加促销活动更新日志 paulGao 2022-03-08 12:08:12 +08:00
• ee5355668d 创建时间字段自动插入问题处理，签到增加访问限制 Chopper 2022-03-08 11:57:48 +08:00
• 1b30f0ad31 优化代码，修复编辑秒杀活动时执行顺序问题 paulGao 2022-03-07 14:54:15 +08:00
• 348f362b30 优化代码，修复编辑秒杀活动时执行顺序问题 paulGao 2022-03-07 14:43:17 +08:00
• 6bef12b91b '合并' fengtianyangyang 2022-03-03 18:36:42 +08:00
• 5b4113be4d Merge branch 'clerk' of https://gitee.com/beijing_hongye_huicheng/lilishop fengtianyangyang 2022-03-03 18:05:32 +08:00
• a82d3fe57c '店员权限bug处理合并' fengtianyangyang 2022-03-03 18:03:04 +08:00
• 4d551366ed Merge branches 'clerk' and 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into clerk fengtianyangyang 2022-03-03 17:44:53 +08:00
• 441cb6ddcb '代码合并' fengtianyangyang 2022-03-03 17:22:13 +08:00
• f14efa2612 BUG修改 itheinjury@163.com 2022-03-03 16:11:08 +08:00
• f4d7c07f57 !137 修复更新秒杀活动时间，秒杀活动商品更新数据问题 Merge pull request !137 from OceansDeep/feature/pg OceansDeep 2022-03-03 03:27:08 +00:00
• 66b2f1f55d 修复更新秒杀活动时间，秒杀活动商品更新数据问题 paulGao 2022-03-03 11:22:20 +08:00
• b9b2c10ca0 !136 增加检测促销商品库存 Merge pull request !136 from OceansDeep/feature/pg OceansDeep 2022-03-02 12:41:01 +00:00
• 0d5f871da7 增加检测促销商品库存 paulGao 2022-03-02 20:39:17 +08:00
• 1688a7ba15 修复秒杀活动 paulGao 2022-03-02 20:33:45 +08:00
• 3506e1c738 增加检测促销商品库存 paulGao 2022-03-02 20:26:50 +08:00
• ae0c4aea12 展示店铺设置 lifenlong 2022-03-02 18:42:56 +08:00
• a52b672e9b 更新,BUG修改 itheinjury@163.com 2022-03-02 15:17:06 +08:00
• c4307aa821 修复秒杀商品下单时，不会更新秒杀商品的出售数量问题 paulGao 2022-03-02 11:49:41 +08:00
• a2c32009f5 !135 修复未开始的秒杀活动修改时，先添加秒杀商品后修改时间时，秒杀活动商品时间没有改变问题 Merge pull request !135 from OceansDeep/feature/pg OceansDeep 2022-03-01 03:50:15 +00:00
• e27185d424 修复未开始的秒杀活动修改时，先添加秒杀商品后修改时间时，秒杀活动商品时间没有改变问题 paulGao 2022-03-01 11:49:35 +08:00
• 0714480e01 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-03-01 09:12:02 +08:00
• 504ee766f8 店铺楼层装修 lifenlong 2022-02-28 09:08:43 +08:00
• 7358fd0c23 增加搜索商品时，无商品索引时初始化索引 paulGao 2022-02-25 16:23:35 +08:00
• 25be7094a2 !134 优化代码 Merge pull request !134 from OceansDeep/feature/pg OceansDeep 2022-02-24 02:17:05 +00:00
• 627a1d7d5a 优化代码 paulGao 2022-02-24 09:33:36 +08:00
• 63b84ee69d 敏感词为空极端情况处理 Chopper 2022-02-23 16:23:00 +08:00
• 5eb76176ab Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-02-23 14:38:29 +08:00
• 6115ecf673 秒杀活动自动新增bug处理 Chopper 2022-02-23 14:38:23 +08:00
• d1a112d3a3 !133 修复秒杀活动 Merge pull request !133 from OceansDeep/feature/pg OceansDeep 2022-02-22 14:46:15 +00:00
• 7d67e6a007 修复秒杀活动 paulGao 2022-02-22 22:37:51 +08:00
• b824ee625e Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-02-21 22:59:59 +08:00
• 961ac20213 更新IM相关 Chopper 2022-02-21 22:59:55 +08:00
• f213b6f53f !132 优化rocketmq日志到logback Merge pull request !132 from OceansDeep/feature/pg OceansDeep 2022-02-21 04:04:15 +00:00
• 631600ab3f 优化rocketmq日志到logback paulGao 2022-02-21 12:03:07 +08:00
• d95fce2efb 注解日志异常问题处理 Chopper 2022-02-21 10:57:57 +08:00
• 1c6c009f14 !131 优化自动生成秒杀活动 Merge pull request !131 from OceansDeep/feature/pg OceansDeep 2022-02-18 12:27:53 +00:00
• f555f6423a 优化自动生成秒杀活动 paulGao 2022-02-18 20:26:35 +08:00
• cd374f2d98 关闭consumer spring security身份验证页面 paulGao 2022-02-18 15:38:58 +08:00
• c62f31c387 更新 itheinjury@163.com 2022-02-18 11:14:01 +08:00
• 87ccad6ec7 更新 itheinjury@163.com 2022-02-18 11:04:56 +08:00
• 1600f7cdab 更新 itheinjury@163.com 2022-02-18 10:52:03 +08:00
• dc3256566b 更新 itheinjury@163.com 2022-02-18 00:09:09 +08:00
• b0858429fb 更新 itheinjury@163.com 2022-02-17 13:58:46 +08:00
• 2f3e2a5ae8 更新 itheinjury@163.com 2022-02-17 13:58:16 +08:00
• f280ab88ec 更新 itheinjury@163.com 2022-02-17 13:57:43 +08:00
• 9616c27efa Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop v4.2.4 Chopper 2022-02-16 17:54:46 +08:00
• 0b5f830d7c 删除模版缓存注解问题处理 Chopper 2022-02-16 17:54:40 +08:00
• d0f952bd68 !130 修复秒杀每日清除无效活动错误 Merge pull request !130 from OceansDeep/feature/pg OceansDeep 2022-02-16 09:49:38 +00:00
• 2876a39ff5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-02-16 17:48:46 +08:00
• 6bcf6da165 修复秒杀每日清除无效活动错误 paulGao 2022-02-16 17:48:29 +08:00
• 9fe633d228 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-02-16 17:42:18 +08:00
• b32bf41443 消费者执行异常问题处理：包含系统自动评价问题，和自动新增秒杀活动问题 Chopper 2022-02-16 17:42:12 +08:00
• e4e073b6f0 修复满优惠活动搜索名称问题 paulGao 2022-02-15 16:51:40 +08:00
• e960ee2f40 Merge branch 'master' of github.com:lilishop/lilishop paulGao 2022-02-15 15:30:38 +08:00
• 5b1b75cbbe 更新 itheinjury@163.com 2022-02-15 15:30:33 +08:00
• a689bb83ee Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop paulGao 2022-02-15 15:29:59 +08:00
• 0940d9aec8 增加刷新token白名单 paulGao 2022-02-15 15:29:32 +08:00
• b5e709f5e5 更新 itheinjury@163.com 2022-02-15 15:29:09 +08:00
• c5da640432 昵称和用户名如果用手机号，也进行脱敏 Chopper 2022-02-15 14:51:15 +08:00
• a5f924841a 会员用户名脱敏 Chopper 2022-02-15 11:38:41 +08:00
• fda3b5b1cc 会员脱敏处理，之前有人恶意联系注册用户。 管理平台用户返回VO格式化一下 Chopper 2022-02-15 11:24:52 +08:00
• 10b8f83737 Merge pull request #38 Hacker_Lei 2022-02-15 11:05:41 +08:00
• ea5da365c7 !129 更新配置文件 Merge pull request !129 from OceansDeep/feature/pg OceansDeep 2022-02-15 03:01:01 +00:00