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

• 613a808cec 店铺流水调用售后模块直接船渡wrapper调整 Chopper 2021-12-02 14:42:46 +08:00
• af52a68abc mq订阅标签规范代码 Chopper 2021-12-01 15:49:28 +08:00
• 9c2738399e !66 店铺流水相关代码优化，流水与结算单业务隔离。联合登陆信息查询代码优化，更优雅的实现,优化规范余额相关模型传递问题 Merge pull request !66 from chopper711/liushuai chopper711 2021-12-01 07:22:55 +00:00
• 385a4ae618 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-01 15:21:57 +08:00
• b0d39324ef 联合登陆信息查询代码优化，更优雅的实现 Chopper 2021-12-01 15:21:43 +08:00
• c224ad568e 优化规范余额相关模型传递问题 Chopper 2021-12-01 09:58:21 +08:00
• 6184ba9b82 店铺流水相关代码优化，流水与结算单业务隔离。 相关方法进行优化，迁移。 Chopper 2021-11-30 16:57:19 +08:00
• bea807c7b4 demosite相关补充提交 Chopper 2021-11-30 16:55:58 +08:00
• 323bc6b775 将限制项提高到框架common模块 Chopper 2021-11-30 16:53:37 +08:00
• 7c87d13ba2 '去除4.24订单处理功能' fengtianyangyang 2021-11-30 15:28:12 +08:00
• 3e10c891ab '去除处理4.24版本之前订单功能' fengtianyangyang 2021-11-30 15:19:42 +08:00
• 643d966740 Merge remote-tracking branch 'origin/master' fengtianyangyang 2021-11-30 15:07:14 +08:00
• 94968799c3 '合并订单多售后功能' fengtianyangyang 2021-11-30 15:03:49 +08:00
• 30d53fa41e 去除无效的引用 Chopper 2021-11-30 15:03:17 +08:00
• 00805d6a49 !65 规范代码，收藏功能完善优化 Merge pull request !65 from chopper711/liushuai chopper711 2021-11-30 07:02:31 +00:00
• 0e7665f59d 店铺收藏/商品收藏问题处理优化 Chopper 2021-11-30 15:00:30 +08:00
• 96cc2bd37f '代码规范' fengtianyangyang 2021-11-30 14:54:05 +08:00
• 71e51b3b6f 规范店铺模块调用商品模块方法 Chopper 2021-11-30 10:00:46 +08:00
• 5f90e422e6 '代码格式优化及去除orderItem多余字段' fengtianyangyang 2021-11-29 17:43:17 +08:00
• b65cdfc1fb !64 规范service调用，简化readme Merge pull request !64 from chopper711/liushuai chopper711 2021-11-29 08:47:57 +00:00
• a3c597b3c5 简化readme Chopper 2021-11-29 16:47:22 +08:00
• db587fda30 规范service调用 Chopper 2021-11-29 16:38:53 +08:00
• 7170e3a16a !63 敏感词加载继续优化一下，初始化放在consumer中执行 Merge pull request !63 from chopper711/liushuai chopper711 2021-11-29 03:48:17 +00:00
• 61aa3ca3d2 敏感词加载继续优化一下，初始化放在consumer中执行 Chopper 2021-11-29 11:47:54 +08:00
• 96f57b7df8 !62 功能模块优化，敏感词模块优化 Merge pull request !62 from chopper711/liushuai chopper711 2021-11-29 03:47:20 +00:00
• d16df738d3 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-11-29 11:17:20 +08:00
• 9ae0921f69 同步在阿里云修改的短信签名 lifenlong 2021-11-26 08:39:01 +08:00
• 5dd1c95294 短信签名缺失ID lifenlong 2021-11-25 11:09:55 +08:00
• 404fecd83c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-11-25 09:50:22 +08:00
• a4fb3db3cd 结算业务代码优化调整 Chopper 2021-11-24 16:23:27 +08:00
• 92d64db0b7 去除创建店铺自动创建店铺楼层装修 Chopper 2021-11-24 15:44:21 +08:00
• 033ec0fd61 !61 CurrencyUtil 修正 来自@BigBender 同学的pr Merge pull request !61 from BigBender/master chopper711 2021-11-24 06:48:34 +00:00
• dc36274212 替换 BigDecimal.ROUND_HALF_UP 为 RoundingMode.HALF_UP, 减少冗余代码 yc_l_zZ_admin 2021-11-24 14:08:38 +08:00
• 817587522b 去除一个无效控制器 Chopper 2021-11-24 10:30:34 +08:00
• 58648c3ece 模块隔离优化 Chopper 2021-11-24 10:30:21 +08:00
• 16f314bd80 敏感词更新策略问题调整，敏感词迁移至公共工具类 Chopper 2021-11-23 16:56:03 +08:00
• f8408030a9 敏感词更新策略问题调整，敏感词迁移至公共工具类 Chopper 2021-11-23 16:53:53 +08:00
• c276b1595c 微信参数小写处理 Chopper 2021-11-22 18:30:11 +08:00
• 71cc57959b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-11-22 18:20:41 +08:00
• dbd35c18b5 微信支付签名被xss过滤问题处理忽略 Chopper 2021-11-22 18:20:06 +08:00
• 1e868c2335 修复未登录用户，浏览积分商品报错 OceansDeep 2021-11-22 10:18:39 +00:00
• 59461175d9 修复支付宝配置私钥后无法支付问题 Chopper 2021-11-22 16:45:54 +08:00
• aee5d4be2e '修改DBsql错误版本文件名称' fengtianyangyang 2021-11-22 15:35:40 +08:00
• e9c18935c5 '修改DBsql文件错误字段' fengtianyangyang 2021-11-22 15:29:27 +08:00
• b80aa48735 '项目启动处理4.24版本之前订单问题' fengtianyangyang 2021-11-22 15:24:23 +08:00
• c32999aa03 缩略图相关方法调整 Chopper 2021-11-22 14:55:16 +08:00
• 56d486e010 将http工具类整合在一起 Chopper 2021-11-22 10:53:27 +08:00
• d83f82a340 '增加项目启动时对4.2.4之前版本orderItem订单处理' fengtianyangyang 2021-11-19 18:42:47 +08:00
• 2f49292672 update README.md. chopper711 2021-11-19 04:05:17 +00:00
• c09b6061fc update README.md. chopper711 2021-11-19 04:03:23 +00:00
• 1d14a0adb5 '修改注释规范' fengtianyangyang 2021-11-19 11:41:31 +08:00
• 840a2eabdb '买家端取消售后及管理端终止售后,买家端重新发起售后问题' fengtianyangyang 2021-11-19 11:24:50 +08:00
• f2be8e6abd 'DB-新增字段' fengtianyangyang 2021-11-19 09:26:14 +08:00
• 71fb4b2b2b '多数量商品售后功能' fengtianyangyang 2021-11-18 19:26:47 +08:00
• 3cabf0a32c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-11-18 17:23:52 +08:00
• 8416fd49ae 优化代码结构，分包更清晰。 去除无效逻辑。 Chopper 2021-11-18 17:23:18 +08:00
• 3a15c2eaa7 !59 优惠券过期处理bug修复 Merge pull request !59 from CodeNose/fixbug_20211117_couponRemoveBug chopper711 2021-11-18 03:36:45 +00:00
• e0eb76e120 !60 升级版本号 Merge pull request !60 from OceansDeep/feature/pg OceansDeep 2021-11-17 10:31:56 +00:00
• 8a29ce048d 升级版本号 paulGao 2021-11-17 18:30:08 +08:00
• d43b679f8d 优惠券过期删除bug修复 hhf 2021-11-17 17:48:45 +08:00
• 74abc4b360 !58 优化es默认搜索 Merge pull request !58 from OceansDeep/feature/pg v4.2.3 OceansDeep 2021-11-17 09:13:52 +00:00
• f1c0207a3d 优化es默认搜索 paulGao 2021-11-17 17:06:46 +08:00
• f61f98d288 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-11-17 16:55:09 +08:00
• 3727b67a23 商品分类控制器无效注入去除，页面请求埋点request替换为静态方法 Chopper 2021-11-17 16:55:05 +08:00
• dae52cd68f Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-11-17 16:23:31 +08:00
• 805197c127 增加订单查询参数（按照评论状态） paulGao 2021-11-16 18:27:54 +08:00
• aca627e137 !57 增加订单查询参数（按照评论状态） Merge pull request !57 from OceansDeep/feature/pg OceansDeep 2021-11-16 09:55:41 +00:00
• 1b6a650ba4 增加订单查询参数（按照评论状态） paulGao 2021-11-16 17:54:39 +08:00
• 7d43279b49 !56 修复获取售后信息无权限问题，修复xss忽略过滤转义问题 Merge pull request !56 from OceansDeep/feature/pg OceansDeep 2021-11-16 09:00:39 +00:00
• a843081663 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-11-16 16:58:41 +08:00
• 2765dd8fd9 修复获取售后信息无权限问题，修复xss忽略过滤转义问题 paulGao 2021-11-16 16:55:58 +08:00
• 0e7c703dfd xss 过滤放掉邮箱 Chopper 2021-11-16 15:58:22 +08:00
• f9112c4b39 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-11-16 15:27:47 +08:00
• 1707563118 VO增加注册时间字段 Chopper 2021-11-16 15:27:43 +08:00
• 803bd32f4b 增加店铺字符串'null'处理 fengtianyangyang 2021-11-15 18:21:30 +08:00
• 31728300e1 规范参数命名 Chopper 2021-11-14 15:42:43 +08:00
• 1d317998af 增加说明 Chopper 2021-11-14 15:41:16 +08:00
• 078af06b63 增加过滤筛选项 Chopper 2021-11-14 15:39:59 +08:00
• 155d98e8b9 忽略加密参数xss，增加微信调试信息 Chopper 2021-11-14 15:33:30 +08:00
• 3c6d6e67bd Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-11-14 14:17:41 +08:00
• 4dc5950191 尝试解决无法base64解析错误 Chopper 2021-11-14 14:17:38 +08:00
• 4b3935339e !55 修复编辑店铺报错电子邮箱报错 Merge pull request !55 from Bulbasaur/feature/pg Bulbasaur 2021-11-12 10:17:40 +00:00
• e218738fda 修复编辑店铺报错电子邮箱报错 paulGao 2021-11-12 18:13:02 +08:00
• dc4c529c2c !54 去除部分脱敏 Merge pull request !54 from Bulbasaur/feature/pg Bulbasaur 2021-11-12 09:56:02 +00:00
• 617cf98bc0 去除部分脱敏 paulGao 2021-11-12 17:54:25 +08:00
• 7aa2c05d92 格式化忽略文件，去除无效文件夹 Chopper 2021-11-12 13:22:25 +08:00
• 505f3fcf96 增加xxl-job说明 Chopper 2021-11-12 13:19:54 +08:00
• 920d095fda 调整描述文字 Chopper 2021-11-12 13:07:19 +08:00
• 2369b61243 !53 修复安全漏洞。优化代码 Merge pull request !53 from Bulbasaur/feature/pg Bulbasaur 2021-11-11 10:21:56 +00:00
• 89420f5c1e Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-11-11 18:18:00 +08:00
• 6f13218564 修复安全漏洞。优化代码 paulGao 2021-11-11 18:15:21 +08:00
• 5cd0c9a205 update README.md. chopper711 2021-11-10 09:57:22 +00:00
• 2fbdfb293a !52 优化商品参数修改代码 Merge pull request !52 from Bulbasaur/feature/pg Bulbasaur 2021-11-10 06:30:58 +00:00
• 9fd75c65e1 优化商品参数 paulGao 2021-11-10 14:15:10 +08:00
• 9fda721bd4 !51 修复PayKit使用字符编码报错问题 Merge pull request !51 from OceansDeep/feature/pg OceansDeep 2021-11-09 09:23:51 +00:00
• 8854a97547 修复PayKit使用字符编码报错问题 paulGao 2021-11-09 17:22:42 +08:00
• c1d84a7130 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-11-09 15:17:39 +08:00
• 0ff0f266d4 会员收货地址管理类位置规范 Chopper 2021-11-09 15:17:26 +08:00
• 93d9b217ca !50 修复PayKit使用字符编码报错问题 Merge pull request !50 from OceansDeep/feature/pg OceansDeep 2021-11-09 01:48:07 +00:00
• 725e65cffb 修复PayKit使用字符编码报错问题 paulGao 2021-11-09 09:45:27 +08:00