Commit Graph

Select branches

Hide Pull Requests

5.X

dev

main

wzj-main

wzj-wqx

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#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

#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

#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

#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

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#3

#3

#30

#30

#300

#300

#301

#301

#302

#302

#303

#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

#32

#320

#320

#321

#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

#369

#37

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#374

#375

#375

#376

#377

#377

#378

#378

#379

#379

#38

#38

#380

#380

#381

#381

#382

#382

#383

#383

#384

#384

#385

#385

#386

#386

#387

#387

#388

#388

#389

#389

#39

#39

#390

#390

#391

#391

#392

#392

#393

#393

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#40

#400

#400

#401

#401

#402

#402

#403

#403

#404

#404

#405

#405

#406

#406

#407

#407

#408

#408

#409

#409

#41

#41

#410

#410

#411

#411

#412

#412

#413

#413

#414

#414

#415

#415

#416

#416

#417

#417

#418

#418

#419

#419

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#430

#430

#431

#431

#432

#432

#433

#433

#434

#434

#435

#435

#436

#436

#437

#437

#438

#438

#439

#439

#44

#44

#440

#440

#441

#441

#442

#442

#443

#443

#444

#444

#445

#445

#446

#446

#447

#447

#448

#448

#449

#449

#45

#45

#450

#450

#451

#451

#452

#452

#453

#453

#454

#454

#455

#455

#456

#456

#457

#457

#458

#458

#459

#459

#46

#460

#460

#461

#461

#462

#462

#463

#463

#464

#464

#465

#465

#466

#466

#467

#467

#468

#468

#469

#469

#47

#47

#470

#470

#471

#471

#472

#472

#473

#473

#474

#474

#475

#475

#476

#476

#477

#477

#478

#478

#479

#479

#48

#48

#480

#480

#481

#481

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#488

#488

#489

#489

#49

#49

#490

#490

#491

#491

#492

#492

#493

#493

#494

#494

#495

#495

#496

#496

#497

#497

#498

#498

#499

#499

#5

#5

#50

#50

#500

#500

#501

#501

#502

#502

#503

#503

#504

#504

#505

#505

#506

#506

#507

#507

#508

#508

#509

#509

#51

#510

#510

#511

#511

#512

#512

#513

#513

#514

#514

#515

#515

#516

#516

#517

#517

#518

#518

#519

#519

#52

#52

#520

#520

#521

#521

#522

#522

#523

#523

#524

#524

#525

#525

#526

#526

#527

#527

#528

#528

#529

#529

#53

#53

#530

#530

#531

#531

#532

#532

#533

#533

#534

#534

#535

#535

#536

#536

#537

#537

#538

#538

#539

#539

#54

#54

#540

#540

#541

#541

#542

#542

#543

#543

#544

#544

#545

#545

#546

#546

#547

#547

#548

#548

#549

#549

#55

#55

#550

#550

#551

#551

#552

#552

#553

#553

#554

#554

#555

#555

#556

#556

#557

#557

#558

#558

#559

#559

#56

#56

#560

#560

#561

#561

#562

#562

#563

#563

#564

#564

#565

#565

#566

#566

#567

#567

#568

#568

#569

#569

#57

#57

#570

#570

#571

#571

#572

#572

#573

#573

#574

#574

#575

#575

#576

#576

#577

#577

#578

#578

#579

#58

#58

#580

#580

#581

#581

#582

#582

#583

#583

#584

#584

#585

#585

#586

#586

#587

#587

#588

#588

#589

#589

#59

#59

#590

#590

#591

#591

#592

#592

#593

#593

#594

#594

#595

#595

#596

#596

#597

#597

#598

#598

#599

#599

#6

#6

#60

#60

#600

#600

#601

#601

#602

#602

#603

#603

#604

#604

#605

#605

#606

#606

#607

#607

#608

#608

#609

#609

#61

#61

#610

#610

#611

#611

#612

#612

#613

#613

#614

#614

#615

#615

#616

#616

#617

#617

#618

#618

#619

#619

#62

#62

#620

#620

#621

#621

#622

#622

#623

#623

#624

#624

#625

#625

#626

#626

#627

#627

#628

#628

#629

#629

#63

#63

#630

#630

#631

#631

#632

#632

#633

#633

#634

#634

#635

#635

#636

#636

#637

#637

#638

#638

#639

#639

#64

#64

#640

#640

#641

#641

#642

#642

#643

#643

#644

#644

#645

#645

#646

#646

#647

#647

#648

#648

#649

#649

#65

#65

#650

#650

#651

#651

#652

#652

#653

#653

#654

#654

#655

#655

#656

#656

#657

#657

#658

#658

#659

#659

#66

#66

#660

#660

#661

#661

#662

#662

#663

#663

#664

#664

#665

#665

#666

#666

#667

#667

#668

#668

#669

#669

#67

#67

#670

#670

#671

#671

#672

#672

#673

#673

#674

#674

#675

#675

#676

#676

#677

#677

#678

#678

#679

#679

#68

#68

#680

#680

#681

#681

#682

#682

#683

#683

#684

#684

#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

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#99

#99

4.8.2

v4.2.0

v4.3.0

v4.3.1

v4.4.0

v4.5.0

v4.6.0

v4.7.0

v4.8.0

v4.8.1

v4.8.3

v4.8.3-fast

v5.0.0

v5.1.0

v5.1.1

v5.1.2

v5.2.0

v5.2.1

v5.2.2

v5.2.3

v5.3.0

v5.3.1

Mono Color

• 800ee8e8d5 refactor(ruoyi):调整权限控制注解- 移除了 IMMessageTemplateController 中的 @SaCheckPermission 注解 - 注释掉了 SysMenuController 中的 @SaCheckRole 注解 - 保留了必要的 @SaCheckPermission 注解 wzj-main huk 2025-09-05 18:35:57 +08:00
• 2dd6ac0631 feat(system): 完善租户创建权限控制 huk 2025-09-05 18:24:05 +08:00
• bf728cee9b [fix]修改视频上传 wangqx 2025-09-05 17:58:30 +08:00
• 2616b5fff8 [fix]修改视频上传 wangqx 2025-09-05 16:48:03 +08:00
• bb9e2a9c7a feat(auth): 优化多租户登录逻辑 huk 2025-09-05 15:56:04 +08:00
• a210e4b0aa refactor(transaction): 重构分账模型领域对象 huk 2025-09-05 13:59:06 +08:00
• 17648ceb5c Merge remote-tracking branch 'origin/wzj-main' into wzj-main huk 2025-09-05 12:51:37 +08:00
• 07df3682ea feat(common): 修复自动注入异常并优化代码 huk 2025-09-05 12:51:29 +08:00
• a3fc224f0e [fix]修改视频的bug wangqx 2025-09-05 11:22:00 +08:00
• 4a44c85177 refactor(order): 优化订单状态相关代码 huk 2025-09-05 10:29:07 +08:00
• 2fe6800ac3 feat(transaction): 为实体类添加逻辑删除注解并优化订单查询逻辑 huk 2025-09-04 17:41:49 +08:00
• 15690ac810 feat(transaction): 完善分账功能并更新订单状态 huk 2025-09-04 14:57:31 +08:00
• 793c34a96a [fix]修改查询结果 wangqx 2025-09-03 13:41:25 +08:00
• 8e6911c155 Merge remote-tracking branch 'origin/wzj-main' into wzj-main huk 2025-09-03 13:35:45 +08:00
• b03006bbc2 refactor(system): 新增店铺，其租户默认签名状态为待签约 huk 2025-09-03 13:35:37 +08:00
• 82c06e75a8 [fix]修改取消点赞，修改消费消息 wangqx 2025-09-03 13:15:58 +08:00
• 5e6f6c9c3d refactor(goods): 优化商品相关代码结构 huk 2025-09-03 13:09:35 +08:00
• 886a9cb4de feat(app): 添加视频上传接口并优化视频上传参数 huk 2025-09-03 12:35:49 +08:00
• 80b80b9578 refactor(Admin): 更新微信小程序密钥并优化代码 huk 2025-09-03 10:57:50 +08:00
• 4ff73cb5ec [fix]修改用户创建 wangqx 2025-09-03 10:40:04 +08:00
• e1937355dc refactor(order): 更新订单状态逻辑和支付流程 huk 2025-09-03 09:48:38 +08:00
• 55e1fcb553 refactor(交易模块): 优化订单和分账相关功能 huk 2025-09-02 18:36:53 +08:00
• 83b4744fbd refactor(transaction): 重构分账逻辑 huk 2025-09-02 16:27:18 +08:00
• dd588457e0 feat(payment): 更新易支付回调URL地址为远程服务器地址 huk 2025-09-02 14:31:40 +08:00
• ee1e05a5d0 build: 修改local和dev环境日志级别为 debug huk 2025-09-02 12:28:40 +08:00
• 0a011ecf6c [fix]去掉.run目录的git wangqx 2025-09-02 10:44:46 +08:00
• 8fd4393ec1 [fix]修改list路径为page wangqx 2025-09-02 10:43:22 +08:00
• 0a954f060d Merge remote-tracking branch 'origin/wzj-main' into wzj-main huk 2025-09-01 10:53:56 +08:00
• 4ded3b177b feat(transaction): 实现易生支付实时退款功能并优化微信支付流程 huk 2025-09-01 10:53:40 +08:00
• b5cffc9370 [fix]app不进行权限校验 wangqx 2025-09-01 10:52:07 +08:00
• 4e543a22d2 [fix]修改创建用户时自动创建member wangqx 2025-09-01 09:13:56 +08:00
• 81b8b959aa refactor(order): 重构订单模块 huk 2025-08-30 18:10:08 +08:00
• b9b7d66549 Merge remote-tracking branch 'origin/wzj-main' into wzj-main haolj 2025-08-30 16:36:25 +08:00
• dd8796ba79 [feat]搜索功用修改 haolj 2025-08-30 16:35:13 +08:00
• 76f1afc0fe [fix]修改评论列表的路径 wangqx 2025-08-30 10:23:53 +08:00
• 4d02d61b64 [feat]搜索功用修改 haolj 2025-08-30 10:06:57 +08:00
• be04c3785c [feat]解决合并冲突问题 haolj 2025-08-29 20:15:10 +08:00
• 72febf46dd [feat]解决合并冲突问题 haolj 2025-08-29 19:48:50 +08:00
• 1aebe07488 Merge remote-tracking branch 'origin/wzj-main' into wzj-main haolj 2025-08-29 19:38:49 +08:00
• 214d1cf82e [feat]增加首页视频、商品和用户搜索接口v1.0 haolj 2025-08-29 19:28:36 +08:00
• f27e96ffed [feat]增加首页视频、商品和用户搜索接口v1.0 haolj 2025-08-29 19:27:44 +08:00
• b82f640919 refactor(yml): 调整 EasyPay 配置格式- 将 easypay 配置项从多行缩进格式改为单行格式 - 保留了原有的配置内容，仅调整了配置项的格式 huk 2025-08-29 18:12:33 +08:00
• a543a8805f Merge remote-tracking branch 'origin/wzj-main' into wzj-main huCareYou 2025-08-29 12:10:39 +08:00
• 510cf76e4a feat(transaction): 集成易生支付功能 huCareYou 2025-08-29 12:10:31 +08:00
• 5586e8cee3 [fix]修改vlog不登陆获取热点数据 wangqx 2025-08-29 11:08:45 +08:00
• 832689d040 [fix]修改点赞与取消点赞接口字段 wangqx 2025-08-29 10:19:31 +08:00
• e48622f44d [fix]修改点赞与取消点赞接口字段 wangqx 2025-08-29 10:00:36 +08:00
• f26a2a46b0 [fix]修改点赞与取消点赞接口字段 wangqx 2025-08-29 09:59:36 +08:00
• 50c6f60b25 [fix]修改视频推送逻辑 wangqx 2025-08-28 17:29:26 +08:00
• 6c4ffb26e9 [fix]修改视频推送逻辑 wangqx 2025-08-28 15:44:43 +08:00
• 53c12bcf1b [fix]修改视频推送逻辑 wangqx 2025-08-28 15:43:21 +08:00
• e7c0d39162 [fix]修改feedback对象字段 wangqx 2025-08-28 09:43:21 +08:00
• a47bc23853 [fix]修改bug:举报投诉接口保存失败 haolj 2025-08-27 18:05:43 +08:00
• e23afb299b [fix]修改App中根据字典类型查询字典数据列表(只包含默认租户的数据) haolj 2025-08-27 17:10:17 +08:00
• 03a9967da4 [fix]修改消息的逻辑，将消息通过mq放出来，然后再由消费者发送给腾讯 wangqx 2025-08-27 10:49:02 +08:00
• 8859977761 [fix]: - 移除了提交签约、审核提交的签约和确认审核通过的签约接口中的 @SaCheckRole 注解 - 修复了审核未通过时未填写失败原因的逻辑判断 - 在提交签约时清空失败原因字段 huCareYou 2025-08-26 13:44:52 +08:00
• 7bb559d294 [fix]修改mq为rockectmq wangqx 2025-08-26 09:07:54 +08:00
• 329d25d4da feat(system): 添加租户签约功能 huCareYou 2025-08-25 17:39:57 +08:00
• 1869dbb3a4 [fix]修改mq为rockectmq wangqx 2025-08-25 17:02:31 +08:00
• 983375f2c7 [fix]修改bug wangqx 2025-08-25 14:36:05 +08:00
• c21d61f4f0 [fix]修改bug wangqx 2025-08-25 14:35:44 +08:00
• b450526775 [fix]修改视频相关 wangqx 2025-08-21 17:12:02 +08:00
• b8702f827c [fix]修改视频相关 wangqx 2025-08-21 15:47:21 +08:00
• 99b07e32fb 测试 曹佳豪 2025-08-20 10:16:38 +08:00
• 93e7bd66d9 修改bug 曹佳豪 2025-08-20 10:10:50 +08:00
• c6fb827116 修改bug 曹佳豪 2025-08-20 10:04:15 +08:00
• 621ec391ed 修改bug 曹佳豪 2025-08-18 15:12:44 +08:00
• 5957a113c4 修改bug 曹佳豪 2025-08-18 15:06:33 +08:00
• 106d64be05 Merge remote-tracking branch 'origin/wzj-main' into wzj-main 曹佳豪 2025-08-18 14:20:08 +08:00
• ea92f61773 修改bug 曹佳豪 2025-08-18 14:19:45 +08:00
• fd06e105bb [fix]使用本地的redis wangqx 2025-08-16 15:29:12 +08:00
• 311727a874 Merge remote-tracking branch 'origin/wzj-main' into wzj-main 曹佳豪 2025-08-16 11:29:23 +08:00
• 44e84bce11 修改bug 曹佳豪 2025-08-16 11:28:51 +08:00
• 65da753e66 [fix]删除member参数，改为从token中获取 wangqx 2025-08-16 11:17:18 +08:00
• adb23bb268 修改bug 曹佳豪 2025-08-16 11:15:40 +08:00
• 90be00a277 [fix]删除member参数，改为从token中获取 wangqx 2025-08-16 10:05:51 +08:00
• ccadf33e19 修改商品列表 fxh 2025-08-15 19:47:41 +08:00
• e0f6ccace8 Merge remote-tracking branch 'origin/wzj-main' into wzj-main 曹佳豪 2025-08-15 19:06:17 +08:00
• af2e269e71 修改bug 曹佳豪 2025-08-15 19:05:25 +08:00
• 593fac4044 [fix]删除多余的代码 wangqx 2025-08-15 17:47:45 +08:00
• 1369cf324b 修改红包记录 fxh 2025-08-15 17:36:56 +08:00
• e2ce1e1211 [feat]增加app轮播接口，增加app会员接口 wangqx 2025-08-15 17:05:59 +08:00
• 2c4ea0c22c Merge remote-tracking branch 'origin/wzj-main' into wzj-main fxh 2025-08-15 16:55:32 +08:00
• f6357bb922 app接口 fxh 2025-08-15 16:54:59 +08:00
• b6c6855842 修改bug+迁移app接口 曹佳豪 2025-08-15 16:51:03 +08:00
• 580739f2f7 [feat]增加app轮播接口，增加app会员接口 wangqx 2025-08-15 14:36:39 +08:00
• 777992a096 [feat]修改文章列表。增加app接口 wangqx 2025-08-15 14:23:34 +08:00
• 584958eb9c [feat]开发文章分类和文章 wangqx 2025-08-15 10:13:18 +08:00
• f2dfb8412a [feat]开发文章分类和文章 wangqx 2025-08-14 17:06:45 +08:00
• 7429692522 [feat]开发文章分类和文章 wangqx 2025-08-14 15:54:17 +08:00
• cc68b15b40 Merge remote-tracking branch 'origin/wzj-main' into wzj-main 曹佳豪 2025-08-14 15:48:51 +08:00
• 9d5b1e109d 修改bug 曹佳豪 2025-08-14 15:47:09 +08:00
• 9d4e42de60 修改bug fxh 2025-08-14 14:52:55 +08:00
• 02eb7ceeeb Merge remote-tracking branch 'origin/wzj-main' into wzj-main fxh 2025-08-13 17:36:27 +08:00
• d71994cdaa 修改bug fxh 2025-08-13 17:35:50 +08:00
• 3fb0972dd0 Merge remote-tracking branch 'origin/wzj-main' into wzj-main 曹佳豪 2025-08-13 17:29:53 +08:00
• 7d9505bf21 修改视频 曹佳豪 2025-08-13 17:29:13 +08:00
• 48f9d66f1d [fix]修改用户接口 wangqx 2025-08-12 15:44:47 +08:00
• 2b0acc4d01 Merge remote-tracking branch 'origin/wzj-main' into wzj-main 曹佳豪 2025-08-12 15:46:14 +08:00
• 68dd5db747 账户明细 曹佳豪 2025-08-12 15:44:46 +08:00