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

• f6eb72332b 更新配置文件 paulGao 2022-02-15 11:00:15 +08:00
• fcb401c89b !128 更新版本号 Merge pull request !128 from OceansDeep/feature/pg OceansDeep 2022-02-15 02:52:36 +00:00
• 2b0dc1d0a3 Merge pull request #37 Hacker_Lei 2022-02-15 10:41:05 +08:00
• a0139b84e1 更新版本号 paulGao 2022-02-15 10:39:38 +08:00
• 65bd2ff35f 删除更新后文件 itheinjury@163.com 2022-02-14 20:01:44 +08:00
• 4468657030 删除更新后文件 itheinjury@163.com 2022-02-14 20:00:35 +08:00
• 4ad95a65cf 删除更新后文件 itheinjury@163.com 2022-02-14 19:57:32 +08:00
• 31f6c19e87 删除更新后文件 itheinjury@163.com 2022-02-14 19:55:43 +08:00
• 612d1d1646 删除更新后文件 itheinjury@163.com 2022-02-14 19:32:47 +08:00
• eddf3ecdeb 删除更新后文件 itheinjury@163.com 2022-02-14 19:27:45 +08:00
• 6cb511ba10 Merge pull request #36 Hacker_Lei 2022-02-14 18:33:46 +08:00
• 7483f19fc6 !127 适配修改的api Merge pull request !127 from OceansDeep/feature/pg OceansDeep 2022-02-14 10:33:07 +00:00
• f8d2ab5e17 适配修改的api paulGao 2022-02-14 18:32:28 +08:00
• 9cd591efe3 update README.md. chopper711 2022-02-14 10:09:37 +00:00
• e655fdf67f !126 适配优化的api地址，补充缺失的事务处理 Merge pull request !126 from OceansDeep/feature/pg OceansDeep 2022-02-14 06:19:45 +00:00
• 9aa253b56f 补充缺失的事务处理 paulGao 2022-02-14 14:17:19 +08:00
• 1d5a2008e1 适配优化的api地址 paulGao 2022-02-12 17:17:52 +08:00
• 1f1b534b13 适配优化的api地址 paulGao 2022-02-12 15:05:42 +08:00
• bf8f8d9382 初始化代码 2022-02-11前 最新版本 itheinjury@163.com 2022-02-11 19:30:50 +08:00
• 5c78711d8e merge conflict origin/master paulGao 2022-02-11 15:33:28 +08:00
• 191709e983 !125 优化redisson配置 Merge pull request !125 from OceansDeep/feature/pg OceansDeep 2022-02-11 06:57:37 +00:00
• da6a17cd61 优化代码 paulGao 2022-02-11 14:56:25 +08:00
• acb88a6b2a 优化redisson配置 paulGao 2022-02-11 14:54:56 +08:00
• d5091bf659 店员 zhenghao 2022-02-10 20:29:53 +08:00
• fd003eff8b 店员 zhenghao 2022-02-10 20:18:05 +08:00
• 4d1dfebacd 店员 zhenghao 2022-02-10 20:05:00 +08:00
• 96b5b50ee0 !124 优化代码，增加redisson配置 Merge pull request !124 from OceansDeep/feature/pg OceansDeep 2022-02-10 03:28:39 +00:00
• 6639ec8971 优化代码，增加redisson配置 paulGao 2022-02-10 11:27:20 +08:00
• 9aa7a6dcf3 优化代码，增加redisson配置 paulGao 2022-02-10 11:26:10 +08:00
• 4dc183cdf5 merge conflict origin/master paulGao 2022-02-09 16:52:28 +08:00
• bbe3399c90 升级项目依赖，解决安全问题 paulGao 2022-02-09 16:50:37 +08:00
• 29e43d299a 修复系统日志查询问题 paulGao 2022-02-09 16:49:14 +08:00
• a4ee4df71b 解决预存款事务问题 zhenghao 2022-02-09 12:56:38 +08:00
• 64dbe6708a 短信模版演示站点操作限制 Chopper 2022-02-08 16:11:27 +08:00
• f375a9f9db 库存扣减前，库存判定存在问题，进行处理 Chopper 2022-01-28 16:13:56 +08:00
• 15a8800b15 !123 修复微信支付配置报错 Merge pull request !123 from OceansDeep/feature/pg OceansDeep 2022-01-27 03:27:43 +00:00
• 77e526c22f 修复微信支付配置报错 paulGao 2022-01-27 11:26:17 +08:00
• f235f66c19 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-01-27 11:23:05 +08:00
• 1b44bedf42 merge conflict origin/master paulGao 2022-01-27 11:22:59 +08:00
• 40e16c4d1b 类名问题处理 Chopper 2022-01-27 11:22:22 +08:00
• 0c383ac7e9 优化自动生成限时抢购活动 paulGao 2022-01-27 11:20:25 +08:00
• 0ec2688f17 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-01-27 11:12:29 +08:00
• 346550182f 位置支付配置相关还原，之前的修改会导致支付无法配置 Chopper 2022-01-27 11:12:24 +08:00
• 24568e0f00 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-01-26 17:54:15 +08:00
• 64f2f4668b 优化代码 paulGao 2022-01-26 17:54:09 +08:00
• f4e1d891a7 !122 api端防重复提交 Merge pull request !122 from chopper711/liushuai chopper711 2022-01-25 02:24:25 +00:00
• 3972e0231c api端防重复提交 Chopper 2022-01-25 10:22:45 +08:00
• 039e85d5e5 update config/application.yml. OceansDeep 2022-01-24 11:30:35 +00:00
• 936397c59f 自动好评存在一个全线判定问题处理 Chopper 2022-01-24 18:11:10 +08:00
• 23ddca6f82 签到存在事务问题处理。优化这块逻辑相关 Chopper 2022-01-24 17:30:52 +08:00
• 286214d9c3 微信APP支付提示签名问题的情况，提供一个解决方案，验证无误 Chopper 2022-01-24 16:50:42 +08:00
• 6d0dd09b5b Merge pull request #35 Hacker_Lei 2022-01-21 19:05:22 +08:00
• 38469d42ef !120 修复促销优惠券获取时，活动优惠券查询问题;修复手机登录后，手机号为脱敏后问题 Merge pull request !120 from OceansDeep/feature/pg OceansDeep 2022-01-21 11:05:03 +00:00
• 696bfe0a2c 增加默认不脱敏 paulGao 2022-01-21 19:03:43 +08:00
• 3de2b9834d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-01-21 19:01:10 +08:00
• d5fdc47936 修复促销优惠券获取时，活动优惠券查询问题 paulGao 2022-01-21 19:01:02 +08:00
• 27e82423f0 修复手机登录后，手机号为脱敏后问题 paulGao 2022-01-21 19:00:20 +08:00
• 576b5b213e 调整图片地址 Chopper 2022-01-21 17:00:10 +08:00
• 145406be32 对商品名称包含逗号可能导致的问题处理 Chopper 2022-01-21 16:31:06 +08:00
• a65f0ad384 积分设置相关优化 Chopper 2022-01-21 16:18:16 +08:00
• 5051fc7b0b 赠品订单无法核销问题处理 Chopper 2022-01-21 15:39:18 +08:00
• 7164036d4c 修改订单价格时，订单update price字段问题处理 Chopper 2022-01-21 14:34:05 +08:00
• cb0a9121e5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-01-21 12:08:40 +08:00
• 96e779eb28 对交易状态的判定问题处理 Chopper 2022-01-21 12:07:16 +08:00
• 27397f1602 !119 优化consumer延时任务执行器（修复一个高版本的redis可能导致redis连接不上问题） Merge pull request !119 from OceansDeep/feature/pg OceansDeep 2022-01-20 08:22:33 +00:00
• 2d1cfde76b 优化consumer延时任务执行器（修复一个高版本的redis可能导致redis连接不上问题） paulGao 2022-01-20 16:19:52 +08:00
• 007d69a887 支付完成判定 Chopper 2022-01-20 15:59:26 +08:00
• f3965cecd5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-01-20 11:04:57 +08:00
• 4fb170e5c7 支付宝支付结果校验 Chopper 2022-01-20 11:01:24 +08:00
• 8e1ade5423 支付参数判定重复代码处理 Chopper 2022-01-20 09:27:07 +08:00
• 0b081c2d85 !118 优化编辑商品时的生成索引和操作促销活动时更新索引促销信息，增加事务监听在事务提交后发 Merge pull request !118 from OceansDeep/feature/pg OceansDeep 2022-01-19 06:17:35 +00:00
• ab1e9f806f 优化编辑商品时的生成索引和操作促销活动时更新索引促销信息，增加事务监听在事务提交后发送mq信息 paulGao 2022-01-19 14:16:02 +08:00
• e961711dcb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-01-19 10:21:19 +08:00
• 90185d8c32 优化编辑商品时的生成索引和操作促销活动时更新索引促销信息，增加事务监听在事务提交后发送mq信息 paulGao 2022-01-19 10:18:33 +08:00
• 68ef46195c 升级依赖包版本，解决安全问题 paulGao 2022-01-19 10:16:15 +08:00
• 0c234e78af !117 压测期间对代码进行性能优化，以及部分代码优化 Merge pull request !117 from chopper711/test chopper711 2022-01-19 02:03:47 +00:00
• ca1851570b 还原下单接口代码，这里存在规范问题日后与前端一起协调修改 Chopper 2022-01-19 10:02:22 +08:00
• cf0d1378c8 压测相关还原 Chopper 2022-01-18 11:03:15 +08:00
• b13a5d5f2a Merge branch 'master' into test Chopper 2022-01-18 09:51:09 +08:00
• 575458afb3 1、去除非必要事务 2、对分布式多节点并发时可能存在生成相同的雪花算法id问题进行处理 3、其他问题优化 Chopper 2022-01-18 09:50:26 +08:00
• b2d4b7bb23 !116 优化管理端登录和xss Merge pull request !116 from OceansDeep/feature/pg OceansDeep 2022-01-17 10:01:58 +00:00
• def6247e9f 优化管理端登录和xss paulGao 2022-01-17 17:42:42 +08:00
• 6409d0dc2d '更新' fengtianyangyang 2022-01-14 11:47:56 +08:00
• f253ae9c31 !115 修复店铺优惠券为部分商品分类。部分商品分类使用优惠券无效 Merge pull request !115 from OceansDeep/feature/pg OceansDeep 2022-01-13 09:39:10 +00:00
• b93d10eeea 修复店铺优惠券为部分商品分类。部分商品分类使用优惠券无效 paulGao 2022-01-13 17:38:36 +08:00
• 801f1cbd4c !114 修复店铺优惠券为部分商品。部分商品使用优惠券无效 Merge pull request !114 from OceansDeep/feature/pg OceansDeep 2022-01-13 09:12:00 +00:00
• f8260c3b29 修复店铺优惠券为部分商品。部分商品使用优惠券无效 paulGao 2022-01-13 17:04:01 +08:00
• 9e74c15413 代码优化 paulGao 2022-01-12 19:46:07 +08:00
• 65e7f9750a 增加获取uuid的方法，为压测环境的同一token购物车重复问题处理 Chopper 2022-01-12 11:20:27 +08:00
• 62804941c2 Merge remote-tracking branch 'origin/feature/pg' into test Chopper 2022-01-11 17:39:46 +08:00
• 05818baf7a 优化一些配置项，优化部分路基 Chopper 2022-01-11 17:34:48 +08:00
• 1c28e0bd5f 优化结算时获取用户优惠券信息（增加redis存储） paulGao 2022-01-11 17:34:00 +08:00
• 0460e219f9 购物车创建时减少一次redis的读写 Chopper 2022-01-11 16:34:18 +08:00
• eec3611218 优化sql Chopper 2022-01-11 15:16:02 +08:00
• 87f637099c '合并master' fengtianyangyang 2022-01-11 14:50:06 +08:00
• 5f0241768d 去除事务注解 Chopper 2022-01-11 14:48:11 +08:00
• 60b4ab5c5b '路径问题' fengtianyangyang 2022-01-11 14:32:01 +08:00
• bbed7afdcb !113 修复商品审核和编辑商品缺失对es操作问题 Merge pull request !113 from OceansDeep/feature/pg OceansDeep 2022-01-11 04:11:31 +00:00
• 459a736ebc 修复商品审核和编辑商品缺失对es操作问题 paulGao 2022-01-11 12:10:54 +08:00
• bdbc620515 !112 优化es商品索引的mapping的促销存储结构 Merge pull request !112 from OceansDeep/feature/pg OceansDeep 2022-01-11 03:39:13 +00:00