Commit Graph

Select branches

Hide Pull Requests

master

springboot3

#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

#502

#502

#503

#503

#504

#504

#505

#505

#506

#506

#507

#507

#508

#508

#509

#509

#51

#51

#510

#510

#511

#511

#512

#512

#513

#513

#514

#514

#515

#515

#516

#516

#517

#517

#518

#518

#519

#519

#52

#52

#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

#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

Mono Color

• 8b07f8925f !57 因笔误导致无意义的判断，同时还会出现空指针异常 Merge pull request !57 from xjt283525476/master xjt283525476 2018-12-29 10:21:58 +08:00
• 2af817d8dc !58 解决tomcat无法退出问题 Merge pull request !58 from j3east/j3east j3east 2018-12-29 10:21:17 +08:00
• 0e240cb244 代码风格和项目保持一致 cj 2018-12-28 23:05:53 +08:00
• fc834b35cb 一键打war包 cj 2018-12-28 22:55:31 +08:00
• 4fa795dee9 确保应用退出时能关闭后台线程 cj 2018-12-28 22:54:38 +08:00
• 33788ecd02 ry-ui新增序列号生成方法 RuoYi 2018-12-28 17:33:15 +08:00
• 3d3017804d Excel注解支持多级获取 RuoYi 2018-12-28 16:15:56 +08:00
• 63ee2ba2e7 修复会出现空指针异常 wangchl 2018-12-28 14:23:23 +08:00
• aac46aa353 修复明显笔误 xjt283525476 2018-12-27 19:41:56 +08:00
• c6e4daedd4 摸版edit缺少; RuoYi 2018-12-27 11:43:16 +08:00
• 6b9b8ed889 !56 修改注释中的参数名称 Merge pull request !56 from GeBron/master GeBron 2018-12-25 23:29:09 +08:00
• 1f000d9f84 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-12-25 23:26:52 +08:00
• 9d5a702e1f 新增方法$.operate.get(url) RuoYi 2018-12-25 23:24:38 +08:00
• bb1831f609 修改注释中的参数名称 GeBron 2018-12-25 20:35:18 +08:00
• c628cf7ee7 去掉多余; RuoYi 2018-12-25 17:16:27 +08:00
• 1de73da333 会话检查优化 RuoYi 2018-12-25 11:56:16 +08:00
• c404de1773 reset RuoYi 2018-12-20 19:41:56 +08:00
• cfcd48b6b2 取消配置文件配置从数据源，改为直接从数据库中直接读取 wangchl 2018-12-20 14:24:02 +08:00
• a87e1d019d 修正getSubject命名 RuoYi 2018-12-19 18:10:44 +08:00
• ef91e71d7b 修正登录必填项位置偏移 RuoYi 2018-12-19 14:58:06 +08:00
• 3bacfc5951 !55 模板 Merge pull request !55 from zhangmrit/ruoyi zhangmrit 2018-12-19 14:54:18 +08:00
• b5cd54da66 时区 zhangmrit 2018-12-19 14:51:08 +08:00
• 0e9925a481 mysql时区和模板修复 zhangmrit 2018-12-19 13:55:27 +08:00
• 7943b765ca 升级MYSQL驱动 RuoYi 2018-12-18 18:16:29 +08:00
• a74e58f7d5 升级SpringBoot到最新版本2.1.1 RuoYi 2018-12-17 22:32:37 +08:00
• ea58f8db9c 添加群号 RuoYi 2018-12-14 17:25:04 +08:00
• 89e21eecea 验证码配置补齐注释 RuoYi 2018-12-14 12:43:31 +08:00
• 35df1dbcdf 验证码文本字符间距修正 RuoYi 2018-12-14 12:30:33 +08:00
• 0972bba763 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-12-12 13:26:16 +08:00
• 583b06ca9a 登录界面去除iCheck插件改为自定义css（提升响应速度及部分背景图不适应） RuoYi 2018-12-12 13:26:01 +08:00
• 6a4b1898b1 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-12-08 23:11:16 +08:00
• 268f0a6321 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴 （2核8G云服务器5M带宽） RuoYi 2018-12-08 23:11:02 +08:00
• e56a7e7e57 磁盘（光驱）验证除数不为零 RuoYi 2018-12-06 11:44:20 +08:00
• 9d225fecb9 修正部门菜单排序字段无效 RuoYi 2018-12-03 20:47:33 +08:00
• d24481f9a5 部门修改不允许最后层级节点选择 RuoYi 2018-12-01 18:39:54 +08:00
• 6a592827e8 若依 3.1 v3.1 RuoYi 2018-12-01 16:14:19 +08:00
• 451caf12fc 修正选中菜单项无效 RuoYi 2018-11-30 11:37:50 +08:00
• 7517b1baa9 !46 多余的标签 Merge pull request !46 from zhangmrit/ruoyi zhangmrit 2018-11-28 19:03:37 +08:00
• 5d582331d3 多余的标签 zhangmrit 2018-11-28 18:32:55 +08:00
• 2d99d2c286 !45 补全@Override注解；修正注释中参数项； Merge pull request !45 from tenchiwuyo/master tenchiwuyo 2018-11-28 16:47:42 +08:00
• d881d45829 补全@Override注解；修正注释中参数项； andy 2018-11-28 16:19:53 +08:00
• 66aabcd2b4 !43 修复菜单,部门管理tree控件展开/折叠不可用问题 Merge pull request !43 from chenzz/Branch_bug_fix chenzz 2018-11-26 15:37:18 +08:00
• 6128d816de 修复菜单,部门管理tree控件展开/折叠不可用问题 chenzz 2018-11-26 15:35:37 +08:00
• 553358aa12 新增提交静默更新表格方法 RuoYi 2018-11-25 17:27:57 +08:00
• 650f89ac13 任务日志新增详细 RuoYi 2018-11-24 16:13:35 +08:00
• 1292dcf579 Excel注解新增 height/width/suffix/defaultValue RuoYi 2018-11-24 08:54:01 +08:00
• 1c1078565a Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-11-23 22:43:53 +08:00
• 4d2d5defb9 Excel注解新增 dateFormat日期格式/readConverterExp读取内容转表达式 RuoYi 2018-11-23 22:43:20 +08:00
• 75f27dc536 删出冗余代码 wangchl 2018-11-23 17:16:48 +08:00
• aa06f1adc5 代码生成datas变量全局 RuoYi 2018-11-23 13:26:03 +08:00
• a42c824e92 文件路径保持与packageName一致 RuoYi 2018-11-22 21:33:57 +08:00
• 67e87bde94 在线用户服务修改 RuoYi 2018-11-22 13:03:57 +08:00
• a2735adc57 !39 ruoyi-system模块下SysUserOnlineServiceImpl未实现ISysUserOnlineService Merge pull request !39 from TyroneGo/master 若依 2018-11-22 12:35:11 +08:00
• 80bda1909c SysUserOnlineServiceImpl类没有实现ISysUserOnlineService Tyrone 2018-11-22 10:27:16 +08:00
• a46738dd9d 会话获取Principal RuoYi 2018-11-22 09:28:06 +08:00
• c96b73bbda 代码生成优化 RuoYi 2018-11-21 23:37:09 +08:00
• 4fed9a1e50 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-11-19 18:05:57 +08:00
• b0495c23a6 修复热部署引起Null RuoYi 2018-11-19 18:05:44 +08:00
• 007a4e5275 !36 注解丢失 Merge pull request !36 from 麦洛/master 若依 2018-11-19 17:06:20 +08:00
• bf01219420 添加丢失的 @Override注解 麦洛 2018-11-19 15:43:18 +08:00
• bcb7ba19f9 系统用户会话命名sysUser RuoYi 2018-11-18 18:17:40 +08:00
• d870710af1 系统用户会话命名sysUser RuoYi 2018-11-18 18:02:20 +08:00
• 6244e6bf18 全局ajax提示 RuoYi 2018-11-15 18:34:05 +08:00
• c1be1659ea 增加关闭全屏 RuoYi 2018-11-15 15:33:03 +08:00
• 6cda301f43 选项卡新增全屏显示 RuoYi 2018-11-15 13:35:41 +08:00
• e5b314cc96 修复定时任务无法删除参数问题 wangchl 2018-11-15 12:07:20 +08:00
• 3383418837 新增打包文件 RuoYi 2018-11-15 08:58:54 +08:00
• 3a44c4e765 日志详细优化 RuoYi 2018-11-14 23:08:52 +08:00
• 0c5da2cf17 上传头像提交修改 RuoYi 2018-11-14 18:29:59 +08:00
• ecfba42651 !34 BaseController迁移到framework模块的com.ruoyi.web.base路径下 Merge pull request !34 from CharlesSong/master CharlesSong 2018-11-13 16:55:24 +08:00
• 26b4f598e2 为了便于二次开发依赖framework项目 1.BaseController迁移到framework com.ruoyi.web.base中 2.admin中的properties 放到root pom中 CharlesSong 2018-11-13 16:48:44 +08:00
• 737c2d8515 前台日期格式转化 RuoYi 2018-11-13 13:07:00 +08:00
• 8a005a088d 2018年度最受欢迎中国开源软件评选 请给若依/RuoYi 投票，谢谢支持。 https://www.oschina.net/project/top_cn_2018?sort=1 RuoYi 2018-11-12 10:57:54 +08:00
• dcc534bb2d 2018年度最受欢迎中国开源软件评选 请给若依/RuoYi 投票，谢谢支持。 https://www.oschina.net/project/top_cn_2018?sort=1 RuoYi 2018-11-12 10:55:37 +08:00
• ebc6a1ade2 登录失败清空验证码 RuoYi 2018-11-07 22:25:36 +08:00
• 834089ef08 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-11-01 17:49:35 +08:00
• d30b66b633 阿里云双11活动1折团 RuoYi 2018-11-01 17:49:23 +08:00
• 6a4894e9d1 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-10-27 21:39:36 +08:00
• a44aa5db42 校验cron表达式是否有效 RuoYi 2018-10-27 21:39:01 +08:00
• 71c3274333 修改finalName RuoYi 2018-10-26 13:29:07 +08:00
• 1961ca5197 添加warName RuoYi 2018-10-26 13:21:40 +08:00
• ba2d7f418d 部署war包启动说明 RuoYi 2018-10-26 13:01:30 +08:00
• 83b4c25137 扫描路径修改 RuoYi 2018-10-18 16:48:05 +08:00
• 6ee8053a9b 内网不查询地址 RuoYi 2018-10-16 20:21:59 +08:00
• 7b0e1c46c5 !32 判断如果是内网IP则不去获取IP地址 Merge pull request !32 from Skqing/master Skqing 2018-10-16 19:57:55 +08:00
• 6c99bc1059 !33 修正参数名称 Merge pull request !33 from tenchiwuyo/master tenchiwuyo 2018-10-16 19:54:17 +08:00
• f0dadb0123 Merge remote-tracking branch 'origin/master' andy 2018-10-16 16:19:16 +08:00
• 6afaae0c05 修正参数名称，deptId改为operId andy 2018-10-16 16:17:24 +08:00
• e4b9638bd5 判断如果是内网IP则不去获取IP地址 Skqing 2018-10-16 12:47:09 +08:00
• 27dee2a63a 增加16号段的电话号码验证 Administrator 2018-10-15 20:38:16 +08:00
• 260feb7cef 优化一些细节 RuoYi 2018-10-12 14:10:25 +08:00
• c778cd2ac9 !31 表格增加行间隔色配置项 Merge pull request !31 from tenchiwuyo/master tenchiwuyo 2018-10-12 13:28:59 +08:00
• 9660e30ca5 增加表格是否行间隔色的option配置项 andy 2018-10-12 13:21:08 +08:00
• 5285003dee 修复个人信息-修改密码 RuoYi 2018-10-11 20:27:34 +08:00
• b5e8432e2f 代码生成路径调整 RuoYi 2018-10-10 21:56:19 +08:00
• 4ac96a8348 !30 gitignore更新 Merge pull request !30 from j3east/master j3east 2018-10-09 17:25:02 +08:00
• f7a0c94c16 不能直接忽略所有名为build的文件夹，因为源代码目录中含也有名为build的文件夹， cj 2018-10-09 15:39:01 +08:00
• 16dc6ab57e 父部门不能选择&选择树自适应 RuoYi 2018-10-08 13:41:45 +08:00
• 5b2664a87a !29 添加gitignore Merge pull request !29 from j3east/master j3east 2018-10-07 23:26:20 +08:00
• 5070f1325f 添加 gitignore cj 2018-10-07 23:22:16 +08:00