RuoYi

Commit Graph

Select branches

Hide Pull Requests

master

#1

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#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

#19

#19

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#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

#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

#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

#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

#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

#369

#37

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#375

#375

#376

#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

#391

#392

#392

#393

#393

#394

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#40

#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

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#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

#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

#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

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#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

#50

#50

#500

#500

#501

#501

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#742939

#75

#75

#76

#76

#77

#77

#78

#78

#780139

#786641

#788658

#788913

#79

#79

#791045

#791183

#794411

#8

#80

#80

#801369

#802025

#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

#98

#99

#99

v2.2

v2.3

v2.4

v3.0

v3.1

v3.2

v3.3

v3.4

v4.0

v4.1

v4.2

v4.3

v4.3.1

v4.4

v4.5.0

v4.5.1

v4.6.0

v4.6.1

v4.6.2

v4.7.0

v4.7.1

v4.7.2

v4.7.3

v4.7.4

v4.7.5

v4.7.6

v4.7.7

v4.7.8

v4.7.9

f94df2fa20 活动管理模块添加 dy 2021-03-24 16:58:59 +0800
418863cf5c 活动管理模块添加 dy 2021-03-24 16:58:09 +0800
bdd597895e 增加commons-pool2.jar zkr_liushenlu 2021-03-24 16:56:26 +0800
042bbf4d35 活动管理模块添加 dy 2021-03-24 16:48:42 +0800
3ed20009d7 添加redis配置 zkr_liushenlu 2021-03-24 16:46:01 +0800
edbf8aa910 活动管理模块添加 dy 2021-03-24 16:44:24 +0800
e6cb6d2a62 活动管理模块添加 dy 2021-03-24 16:40:11 +0800
1ffa14d01a 文章广告 zkr_liushenlu 2021-03-24 16:37:47 +0800
85abaf6956 添加oss redis jar zkr_liushenlu 2021-03-24 16:37:11 +0800
9080a5574c 文章广告 zkr_liushenlu 2021-03-24 15:13:35 +0800
df4c741d62 添加aliyun oss jar zkr_liushenlu 2021-03-24 15:13:07 +0800
e30977c051 添加获取当前时间方法 zkr_liushenlu 2021-03-24 13:04:58 +0800
2dd786ae47 文章广告 zkr_liushenlu 2021-03-24 10:09:54 +0800
b9437e3e8c 文章广告 zkr_liushenlu 2021-03-24 10:09:27 +0800
7752a981ed 更换目录 zkr_liushenlu 2021-03-24 09:36:41 +0800
f3550bd4b8 增加新模块 zkr_liushenlu 2021-03-23 18:19:39 +0800
c178a662fe 广告控制器 zkr_liushenlu 2021-03-23 16:29:49 +0800
ca3924520d 广告控制器 zkr_liushenlu 2021-03-23 16:28:06 +0800
cd25bd4b8d 增加新模块 zkr_liushenlu 2021-03-23 16:18:45 +0800
5365064fe5 添加在线数据库链接地址 zkr_liushenlu 2021-03-23 15:51:10 +0800
0af3103291 互联网营销平台init wanghuayue 2021-03-23 15:07:00 +0800
c71fb14476 update README.md. txwanghy 2021-03-23 10:25:20 +0800
414686e2c8 Pre Merge pull request !278 from 徐爽/N/A 徐爽 2021-03-21 18:46:36 +0800
a8ebf27371 update LICENSE. 徐爽 2021-03-21 18:46:35 +0800
053b627584 Pre Merge pull request !277 from 徐爽/N/A 徐爽 2021-03-21 18:44:59 +0800
d311d2170f add bb.151321251 徐爽 2021-03-21 18:44:59 +0800
6ad5695b4a Pre Merge pull request !276 from 徐爽/N/A 徐爽 2021-03-21 18:43:22 +0800
3be6ac8e0b add aa. 徐爽 2021-03-21 18:43:22 +0800
fcfd475fac Pre Merge pull request !273 from Gszekt/master Gszekt 2021-03-21 10:55:34 +0800
04e7a314f8 个人信息添加手机&邮箱重复验证 RuoYi 2021-03-21 10:54:18 +0800
a0208a1c15 Pre Merge pull request !275 from Zail/master Zail 2021-03-18 09:11:44 +0800
0c68fc1760 瞎搞呗 Zail 2021-03-18 09:11:36 +0800
9d3f806e0d 操作日志返回参数添加非空验证 RuoYi 2021-03-17 14:57:59 +0800
b773a09938 添加新群号 RuoYi 2021-03-16 16:15:39 +0800
031ad2b93e 切换为logback-spring方式的配置文件，这样可以使用spring的一些配置。其中引入spring boot默认的logging配置，并设置了带颜色控制台输出样式。其他的没有变动 Zail 2021-03-15 16:31:56 +0800
c48c76754a 页面若未匹配到字典标签，则返回字典值 tangliu 2021-03-15 12:14:34 +0800
b0d5cbdf6d 数据库密码加密 Gszekt 2021-03-13 17:34:55 +0800
13dc1a2cce Pre Merge pull request !272 from Gszekt/master Gszekt 2021-03-13 16:03:41 +0800
780d083fcc 数据库密码加密 Gszekt 2021-03-13 16:01:50 +0800
c10c3966fb 数据监控默认账户密码防止越权访问 RuoYi 2021-03-13 10:25:31 +0800
bcbd6322e9 个人中心错误问题 RuoYi 2021-03-13 10:24:54 +0800
e58bad1ae7 velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞 RuoYi 2021-03-13 10:24:42 +0800
27a3083e80 !268 将控制器基类的日志设置成 this.getClass()，这样在日志里就可以记录是在哪个控制器记录的 Merge pull request !268 from phper08/master 若依 2021-03-13 10:13:06 +0800
54840a25d4 Pre Merge pull request !234 from 编程圈子/master 编程圈子 2021-03-07 12:28:53 +0800
7b63c101f3 Pre Merge pull request !247 from dawn9117/N/A dawn9117 2021-03-07 12:28:53 +0800
929e2bfe8f Pre Merge pull request !256 from niezhida/N/A niezhida 2021-03-07 12:28:53 +0800
7d155f98c0 Pre Merge pull request !266 from szluyu99/master szluyu99 2021-03-07 12:28:53 +0800
bcccb18696 Pre Merge pull request !267 from 陈琳强/N/A 陈琳强 2021-03-07 12:28:53 +0800
5fcc184e77 Pre Merge pull request !206 from Errors0/N/A Errors0 2021-03-07 12:28:52 +0800
4fa764770d Pre Merge pull request !209 from 瘦八爷/master 瘦八爷 2021-03-07 12:28:52 +0800
e23d3a2ed7 Pre Merge pull request !174 from ZZ/N/A ZZ 2021-03-07 12:28:51 +0800
e2d2f5cb94 Pre Merge pull request !152 from Jason_liu/master Jason_liu 2021-03-07 12:28:49 +0800
0d80527975 Pre Merge pull request !159 from ZZ/N/A ZZ 2021-03-07 12:28:49 +0800
eced2d112e Pre Merge pull request !148 from geeksun/master geeksun 2021-03-07 12:28:48 +0800
fb00847bd8 Pre Merge pull request !151 from whmmm/master whmmm 2021-03-07 12:28:48 +0800
860c29554d Pre Merge pull request !134 from Lynne/docker Lynne 2021-03-07 12:28:46 +0800
3d872f7e51 Pre Merge pull request !122 from lnrCoder/master lnrCoder 2021-03-07 12:28:45 +0800
8852144f51 Pre Merge pull request !117 from jianjunL/master jianjunL 2021-03-07 12:28:43 +0800
25a4b8c285 子表模板默认日期格式化 RuoYi 2021-03-07 12:27:46 +0800
d81f47fa47 Pre Merge pull request !261 from leeyazhou/fix leeyazhou 2021-03-03 13:38:30 +0800
4a58de4841 升级oshi到最新版本v5.6.0 RuoYi 2021-03-03 13:37:45 +0800
895850128a !269 【支持MAC M1】服务监控时返回code500,提升jna版本对应新版MAC Merge pull request !269 from 刘振/feat_upgrade_jna_version 若依 2021-03-03 13:28:57 +0800
53323fb743 Pre Merge pull request !271 from 憨憨blue/N/A 憨憨blue 2021-03-02 08:56:10 +0800
71ec9be030 add 测试. 憨憨blue 2021-03-02 08:56:09 +0800
0790238628 Pre Merge pull request !270 from 枯木/N/A 枯木 2021-03-02 08:53:57 +0800
98f6a1491d update README.md. 枯木 2021-03-02 08:53:56 +0800
3ee4dbcfcc 【支持MAC M1】服务监控时返回code500,提升jna版本对应新版MAC 劉振 2021-02-27 22:59:27 +0900
8a78937164 update ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java. 将控制器基类的日志设置成 this.getClass()，这样在日志里就可以记录是在哪个控制器记录的 phper08 2021-02-26 14:48:54 +0800
1befc59ba9 test commit wudi 2021-02-26 08:52:32 +0800
c0063a41c2 11 陈琳强 2021-02-25 10:46:36 +0800
4df7548238 update ruoyi-admin/src/main/resources/templates/main.html. 首页中的介绍有一处标点错误。 szluyu99 2021-02-20 15:24:13 +0800
fd8caa01e9 代码生成预览语言根据后缀名高亮显示 RuoYi 2021-02-20 11:06:36 +0800
d2cb20024f 升级SpringBoot到最新版本2.2.13 RuoYi 2021-02-20 11:06:03 +0800
6a03e11c7e Pre Merge pull request !265 from 常朕/N/A 常朕 2021-02-19 15:27:40 +0800
e5657ff43a update ruoyi-admin/src/main/resources/templates/login.html. 常朕 2021-02-19 15:27:39 +0800
f05e6d6276 Pre Merge pull request !260 from dgjunjie/master dgjunjie 2021-02-16 07:49:36 +0800
5989c3eec3 Merge branch 'master' of https://gitee.com/y_project/RuoYi dgjunjie 2021-02-16 07:48:56 +0800
46611fbf38 Pre Merge pull request !245 from 淡蓝色的忧伤/dev 淡蓝色的忧伤 2021-02-10 11:46:07 +0800
5889acf196 修改ip字段长度防止ipv6地址长度不够 RuoYi 2021-02-10 11:45:18 +0800
487e6a3b3a 升级shiro到最新版1.7.1 阻止身份认证绕过漏洞 RuoYi 2021-02-10 11:35:54 +0800
3004047ee6 Merge branch 'master' of https://gitee.com/y_project/RuoYi dgjunjie 2021-02-08 09:20:23 +0800
7f7fbe0472 Pre Merge pull request !263 from 无名丶小辈/master 无名丶小辈 2021-02-05 09:26:52 +0800
6ab8ce2796 update ruoyi-admin/src/main/resources/templates/system/user/user.html. 支持字符串user_id，避免字符串ID时，程序会产生异常无名丶小辈 2021-02-05 09:23:28 +0800
f0b8eb9f53 Pre Merge pull request !262 from 吴先生/N/A 吴先生 2021-02-04 19:25:15 +0800
11fa2f71ac ForATest 吴先生 2021-02-04 19:25:14 +0800
8f6141481f 树状列表代码生成 lin 2021-02-04 08:02:17 +0800
930308a16f 升级bootstrapTable相关组件到最新版本v1.18.2 RuoYi 2021-02-03 10:14:11 +0800
15f9c354cd 升级bootstrapTable到最新版本v1.18.0 RuoYi 2021-02-03 10:12:34 +0800
bb367b6620 搜索建议选择后隐藏列表 RuoYi 2021-02-02 16:59:55 +0800
701411132d 主子表示例增加初始化数据 Ricky 2021-02-01 11:01:51 +0800
e69f043cad 优化Excel导入增加空行判断 Ricky 2021-02-01 10:23:11 +0800
26e6bbcb6a 优化Excel导入增加空行判断 Ricky 2021-02-01 10:21:34 +0800
1b85a970db

fix: 接口中定义的方法可去除public leeyazhou 2021-01-29 11:10:15 +0800
ee4cb184c2

fix: 接口中定义的方法可去除public leeyazhou 2021-01-29 11:04:39 +0800
42026cd090

fix: 更新文件权限为可执行 leeyazhou 2021-01-29 10:58:32 +0800
1ca0c34e42 当切换横向菜单时，删除上部导航菜单多出的无效“统计报表”菜单 dgjunjie 2021-01-28 14:45:05 +0800
071ed585a7 Pre Merge pull request !255 from 嘿白熊/master 嘿白熊 2021-01-26 11:09:00 +0800
3d12a776bc update loading-sm.gif RuoYi 2021-01-26 11:07:50 +0800
3cbeeabe53 Pre Merge pull request !259 from 荀卿/dev 荀卿 2021-01-24 11:29:19 +0800
409f006bc9 20210124 新增微信模块 nijian 2021-01-24 11:27:58 +0800