ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xx

This commit is contained in:
tiny 2020-03-04 19:01:53 +08:00
parent d40d78bc3b
commit 4a454daacf
19 changed files with 406 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/run.bat
View File

@ -1,14 +1,14 @@
@echo off @echo off
echo. echo.
echo [信息] 运行Web工程。 echo [信息] 执行Web。
echo. echo.
cd %~dp0 cd %~dp0
cd ../ruoyi-admin/target cd ../infosouth-admin/target
set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -jar %JAVA_OPTS% ruoyi-admin.jar java -jar %JAVA_OPTS% infosouth-admin.jar
cd bin cd bin
pause pause

3
infosouth-admin/src/main/java/cn/com/infosouth/RuoYiApplication.java
View File

@ -3,6 +3,7 @@ package cn.com.infosouth;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
/** /**
* 启动程序 * 启动程序
@ -16,6 +17,6 @@ public class RuoYiApplication
{ {
// System.setProperty("spring.devtools.restart.enabled", "false"); // System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args); SpringApplication.run(RuoYiApplication.class, args);
System.out.println(" 系统启动成功(◠‿◠) \n"); System.out.println(" 系统启动成功 \n");
} }
} }

2
infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysIndexController.java
View File

@ -34,6 +34,8 @@ public class SysIndexController extends BaseController
mmap.put("menus", menus); mmap.put("menus", menus);
mmap.put("user", user); mmap.put("user", user);
mmap.put("sysName", Global.getName()); mmap.put("sysName", Global.getName());
mmap.put("sysBaba", Global.getBaba());
mmap.put("sysWelcome", Global.getWelcome());
mmap.put("sysVersion", Global.getVersion()); mmap.put("sysVersion", Global.getVersion());
mmap.put("copyrightYear", Global.getCopyrightYear()); mmap.put("copyrightYear", Global.getCopyrightYear());
mmap.put("demoEnabled", Global.isDemoEnabled()); mmap.put("demoEnabled", Global.isDemoEnabled());

14
infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysLoginController.java
View File

@ -39,17 +39,15 @@ public class SysLoginController extends BaseController
} }
@GetMapping("/login") @GetMapping("/login")
public String login(ModelMap mmap) public String login(ModelMap mmap, HttpServletRequest request, HttpServletResponse response)
{ {
// 如果是Ajax请求，返回Json字符串。 // 如果是Ajax请求，返回Json字符串。
//HttpServletRequest request, HttpServletResponse response, if (ServletUtils.isAjaxRequest(request)) {
// if (ServletUtils.isAjaxRequest(request)) return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
// {
// return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}"); }
//
// }
mmap.put("sysName", Global.getName()); mmap.put("sysName", Global.getName());
mmap.put("sysWelcome", Global.getWelcomeDesc()); mmap.put("sysWelcome", Global.getWelcome());
mmap.put("sysBaba", Global.getBaba()); mmap.put("sysBaba", Global.getBaba());
mmap.put("copyrightYear", Global.getCopyrightYear()); mmap.put("copyrightYear", Global.getCopyrightYear());
mmap.put("sysVersion", Global.getVersion()); mmap.put("sysVersion", Global.getVersion());

6
infosouth-admin/src/main/java/cn/com/infosouth/web/controller/tool/BuildController.java
View File

@ -13,14 +13,12 @@ import cn.com.infosouth.common.core.controller.BaseController;
*/ */
@Controller @Controller
@RequestMapping("/tool/build") @RequestMapping("/tool/build")
public class BuildController extends BaseController public class BuildController extends BaseController {
{
private String prefix = "tool/build"; private String prefix = "tool/build";
@RequiresPermissions("tool:build:view") @RequiresPermissions("tool:build:view")
@GetMapping() @GetMapping()
public String build() public String build() {
{
return prefix + "/build"; return prefix + "/build";
} }
} }

6
infosouth-admin/src/main/resources/application.yml
View File

@ -1,9 +1,9 @@
# 项目相关配置 # 项目相关配置
ruoyi: infosouth:
# 名称 # 名称
name: ARJ21-700飞机参考机型虚拟数据库 name: ARJ21-700飞机参考机型虚拟数据库
welcomeDesc: "ARJ21-700飞机 参考机型虚拟数据库" baba: 中国商飞客服公司
baba: 中国商飞 welcome: ARJ21-700飞机参考机型虚拟数据库
# 版本 # 版本
version: 4.1.0 version: 4.1.0
# 版权年份 # 版权年份

2
infosouth-admin/src/main/resources/banner.txt
View File

@ -1,4 +1,4 @@
Application Version: ${ruoyi.version} Application Version: ${infosouth.version}
Spring Boot Version: ${spring-boot.version} Spring Boot Version: ${spring-boot.version}
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
__ __ _____ _____ ____ __ __ _____ __ __ _____ _____ ____ __ __ _____

47
infosouth-admin/src/main/resources/static/css/login.css
View File

@ -1,6 +1,7 @@
html { html {
height: 100% height: 100%
} }
body.signin { body.signin {
height: auto; height: auto;
background: url(../img/login-background.jpg) no-repeat center fixed; background: url(../img/login-background.jpg) no-repeat center fixed;
@ -8,41 +9,64 @@ body.signin {
-moz-background-size: cover; -moz-background-size: cover;
-o-background-size: cover; -o-background-size: cover;
background-size: cover; background-size: cover;
color:rgba(255,255,255,.95) color: rgba(255, 255, 255, .95);
} }
.mohu {
float:left;
background-position:center;
background-repeat:no-repeat;
background-size:cover;
-webkit-filter: blur(9px);
-moz-filter: blur(9px);
-o-filter: blur(9px);
-ms-filter: blur(9px);
filter:blur(9px);
}
.signinpanel { .signinpanel {
width: 750px; width: 750px;
margin: 10% auto 0 margin: 10% auto 0
} }
.signinpanel .logopanel { .signinpanel .logopanel {
float: none; float: none;
width: auto; width: auto;
padding: 0; padding: 0;
background: 0 0 background: 0 0
} }
.signinpanel .signin-info ul { .signinpanel .signin-info ul {
list-style: none; list-style: none;
padding: 0; padding: 0;
margin: 20px 0 margin: 20px 0
} }
.signinpanel .form-control { .signinpanel .form-control {
display: block; display: block;
margin-top: 15px margin-top: 15px
} }
.signinpanel .uname { .signinpanel .uname {
background: #fff url(../img/user.png) no-repeat 95% center; background: #fff url(../img/user.png) no-repeat 95% center;
color: #333 color: #333
} }
.signinpanel .pword { .signinpanel .pword {
background: #fff url(../img/locked.png) no-repeat 95% center; background: #fff url(../img/locked.png) no-repeat 95% center;
color: #333 color: #333
} }
.signinpanel .code { .signinpanel .code {
background: #fff no-repeat 95% center;color:#333; margin:0 0 15px 0; background: #fff no-repeat 95% center;
color: #333;
margin: 0 0 15px 0;
} }
.signinpanel .btn { .signinpanel .btn {
margin-top: 15px margin-top: 15px
} }
.signinpanel form { .signinpanel form {
background: rgba(255, 255, 255, .2); background: rgba(255, 255, 255, .2);
border: 1px solid rgba(255, 255, 255, .3); border: 1px solid rgba(255, 255, 255, .3);
@ -54,11 +78,13 @@ body.signin {
border-radius: 3px; border-radius: 3px;
padding: 30px padding: 30px
} }
.signup-footer { .signup-footer {
border-top: solid 1px rgba(255, 255, 255, .3); border-top: solid 1px rgba(255, 255, 255, .3);
margin: 20px 0; margin: 20px 0;
padding-top: 15px padding-top: 15px
} }
@media screen and (max-width:768px) { @media screen and (max-width:768px) {
.signinpanel, .signuppanel { .signinpanel, .signuppanel {
margin: 0 auto; margin: 0 auto;
@ -78,14 +104,16 @@ body.signin {
.signinpanel .signin-info ul { .signinpanel .signin-info ul {
display: none display: none
} }
}@media screen and (max-width:320px) { }
@media screen and (max-width:320px) {
.signinpanel, .signuppanel { .signinpanel, .signuppanel {
margin: 0 20px; margin: 0 20px;
width: auto width: auto
} }
} }
/* /*
登录界面check样式 閻ц缍嶉悾宀勬桨check閺嶅嘲绱<EFBFBD>
*/ */
.checkbox-custom { .checkbox-custom {
position: relative; position: relative;
@ -94,10 +122,10 @@ body.signin {
display: inline-block; display: inline-block;
} }
/* /*
将初始的checkbox的样式改变 鐏忓棗鍨垫慨瀣畱checkbox閻ㄥ嫭鐗卞蹇旀暭閸欙拷
*/ */
.checkbox-custom input[type="checkbox"] { .checkbox-custom input[type="checkbox"] {
opacity: 0; /*将初始的checkbox隐藏起来*/ opacity: 0; /*鐏忓棗鍨垫慨瀣畱checkbox闂呮劘妫岀挧閿嬫降*/
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
z-index: 2; z-index: 2;
@ -106,7 +134,7 @@ body.signin {
left: 3px; left: 3px;
} }
/* /*
设计新的checkbox，位置 鐠佹崘顓搁弬鎵畱checkbox閿涘奔缍呯純锟<EFBFBD>
*/ */
.checkbox-custom label:before { .checkbox-custom label:before {
content: ''; content: '';
@ -122,7 +150,7 @@ body.signin {
background: #fff; background: #fff;
} }
/* /*
点击初始的checkbox，将新的checkbox关联起来 閻愮懓鍤崚婵嗩潗閻ㄥ垻heckbox閿涘苯鐨㈤弬鎵畱checkbox閸忓疇浠堢挧閿嬫降
*/ */
.checkbox-custom input[type="checkbox"]:checked+label:after { .checkbox-custom input[type="checkbox"]:checked+label:after {
position: absolute; position: absolute;
@ -138,10 +166,11 @@ body.signin {
height: 16px; height: 16px;
color: #333; color: #333;
} }
.checkbox-custom label { .checkbox-custom label {
cursor: pointer; cursor: pointer;
line-height: 1.2; line-height: 1.2;
font-weight: normal; /*改变了rememberme的字体*/ font-weight: normal; /*閺<>鐟板綁娴滃敃ememberme閻ㄥ嫬鐡ф担锟<E68B85>*/
margin-bottom: 0; margin-bottom: 0;
text-align: left; text-align: left;
} }

22
infosouth-admin/src/main/resources/static/css/style.css
View File

@ -473,7 +473,7 @@ body.body-small.fixed-sidebar.mini-navbar .navbar-static-side {
border-left-width: 0; border-left-width: 0;
} }
/*伸缩菜单*/ /*浼哥缉鑿滃崟*/
.fixed-sidebar.mini-navbar .nav li:hover>a> span.nav-label { .fixed-sidebar.mini-navbar .nav li:hover>a> span.nav-label {
top: 0px; top: 0px;
padding: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;
@ -495,7 +495,7 @@ body.body-small.fixed-sidebar.mini-navbar .navbar-static-side {
min-width: 140px; min-width: 140px;
border-radius: 2px; border-radius: 2px;
} }
/*伸缩菜单结束*/ /*浼哥缉鑿滃崟缁撴潫*/
body.fixed-sidebar.mini-navbar .navbar-default .nav>li>.nav-second-level li a { body.fixed-sidebar.mini-navbar .navbar-default .nav>li>.nav-second-level li a {
font-size: 12px; font-size: 12px;
@ -6927,7 +6927,7 @@ body.rtls .top-navigation .footer.fixed, body.rtls.top-navigation .footer.fixed
padding:0; padding:0;
} }
/*编辑器按钮样式冲突*/ /*缂栬緫鍣ㄦ寜閽牱寮忓啿绐<EFBFBD>*/
.note-editor .btn-default { .note-editor .btn-default {
color: #333333!important; color: #333333!important;
background-color: #ffffff!important; background-color: #ffffff!important;
@ -7030,3 +7030,19 @@ body.rtls .top-navigation .footer.fixed, body.rtls.top-navigation .footer.fixed
z-index: 9998; z-index: 9998;
margin: 0; margin: 0;
} }
.welcome-lang {
float:left;
margin: 0px;
font-size: 20px;
width:60%;
color:white;
}
.welcome-lang span{
text-align: center;
display: block;
line-height: 50px;
margin: 0px;
padding: 0px;
}

BIN
infosouth-admin/src/main/resources/static/img/login-background-old.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 139 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
infosouth-admin/src/main/resources/static/img/login-background.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 676 KiB

BIN
infosouth-admin/src/main/resources/static/img/profile.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

10
infosouth-admin/src/main/resources/templates/arj21/csvmanager/list.html
View File

@ -1,10 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>csvmanager-infoflight</title>
</head>
<body>
infoflight---哈哈哈~
</body>
</html>

11
infosouth-admin/src/main/resources/templates/index.html
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title>${{sysName}}-首页</title> <title>[[${sysName}]]</title>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<meta http-equiv="refresh" content="0;ie.html"/> <meta http-equiv="refresh" content="0;ie.html"/>
<![endif]--> <![endif]-->
@ -29,7 +29,7 @@
<ul class="nav" id="side-menu"> <ul class="nav" id="side-menu">
<a th:href="@{/index}"> <a th:href="@{/index}">
<li class="logo"> <li class="logo">
<span class="logo-lg" >RuoYi</span> <span class="logo-lg" >[[${sysBaba}]]</span>
</li> </li>
</a> </a>
<li> <li>
@ -50,7 +50,7 @@
<li> <li>
<a href="#"><i class="fa fa-home"></i> <span class="nav-label">主页</span> <span class="fa arrow"></span></a> <a href="#"><i class="fa fa-home"></i> <span class="nav-label">主页</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
<li><a class="menuItem" th:href="@{/system/main}">了解若依</a></li> <li><a class="menuItem" th:href="@{/system/main}">首页</a></li>
</ul> </ul>
</li> </li>
<li th:each="menu : ${menus}"> <li th:each="menu : ${menus}">
@ -180,9 +180,10 @@
<i class="fa fa-bars"></i> <i class="fa fa-bars"></i>
</a> </a>
</div> </div>
<div class="nav navbar-top-links welcome-lang">
<span>[[${sysWelcome}]]</span>
</div>
<ul class="nav navbar-top-links navbar-right welcome-message"> <ul class="nav navbar-top-links navbar-right welcome-message">
<li><a title="视频教程" href="http://doc.ruoyi.vip/ruoyi/document/spjc.html" target="_blank"><i class="fa fa-video-camera"></i> 视频教程</a></li>
<li><a title="开发文档" href="http://doc.ruoyi.vip" target="_blank"><i class="fa fa-question-circle"></i> 开发文档</a></li>
<li><a title="全屏显示" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li> <li><a title="全屏显示" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li>
<li class="dropdown user-menu"> <li class="dropdown user-menu">
<a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown"> <a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">

88
infosouth-admin/src/main/resources/templates/login.html
View File

@ -2,79 +2,109 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org"> <html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> <meta name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>[[${sysName}]] 登录</title> <title>[[${sysName}]] 登录</title>
<meta name="description" content="后台管理系统"> <meta name="description" content="后台管理系统">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/> <link href="../static/css/bootstrap.min.css"
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/> th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
<link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/> <link href="../static/css/font-awesome.min.css"
<link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/> th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.1.0}" rel="stylesheet"/> <link href="../static/css/style.css" th:href="@{/css/style.css}"
rel="stylesheet" />
<link href="../static/css/login.css" th:href="@{/css/login.css}"
rel="stylesheet" />
<link href="../static/ruoyi/css/ry-ui.css"
th:href="@{/ruoyi/css/ry-ui.css?v=4.1.0}" rel="stylesheet" />
<!-- 360浏览器急速模式 --> <!-- 360浏览器急速模式 -->
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<!-- 避免IE使用兼容模式 --> <!-- 避免IE使用兼容模式 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/> <link rel="shortcut icon" href="../static/favicon.ico"
<style type="text/css">label.error { position:inherit; }</style> th:href="@{favicon.ico}" />
<style type="text/css">
label.error {
position: inherit;
}
</style>
<script> <script>
if(window.top!==window.self){window.top.location=window.location}; if(window.top!==window.self){window.top.location=window.location};
</script> </script>
</head> </head>
<body class="signin"> <body class="signin">
<div class="mohu"></div>
<div class="signinpanel"> <div class="signinpanel">
<div class="row"> <div class="row">
<div class="col-sm-7"> <div class="col-sm-4">
<div class="signin-info"> <div class="signin-info">
<div class="logopanel m-b"> <div class="logopanel m-b">
<h1><img alt="[ [[${sysBaba}]] ]" src="../static/comac.png" th:src="@{/comac.png}"></h1> <h1>
<img alt="[ [[${sysBaba}]] ]" src="../static/comac.png"
th:src="@{/comac.png}">
</h1>
</div> </div>
<div class="m-b"></div> <div class="m-b"></div>
<h4>[[${sysWelcome}]] ---</h4> <h2>[[${sysWelcome}]]</h2>
<strong>还没有账号？ <a href="#">立即注册&raquo;</a></strong> <!--<strong>还没有账号？ <a href="#">立即注册&raquo;</a></strong> -->
</div> </div>
</div> </div>
<div class="col-sm-3"></div>
<div class="col-sm-5"> <div class="col-sm-5">
<form id="signupForm"> <form id="signupForm">
<h4 class="no-margins">登录</h4> <h4 class="no-margins">登录</h4>
<p class="m-t-md">>>请注意数据保密</p> <p class="m-t-md">注意数据保密!</p>
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" /> <input type="text" name="username" class="form-control uname"
<input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123" /> placeholder="用户名" value="admin" /> <input type="password"
name="password" class="form-control pword" placeholder="密码"
value="admin123" />
<div class="row m-t" th:if="${captchaEnabled==true}"> <div class="row m-t" th:if="${captchaEnabled==true}">
<div class="col-xs-6"> <div class="col-xs-6">
<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" autocomplete="off"> <input type="text" name="validateCode" class="form-control code"
placeholder="验证码" maxlength="5" autocomplete="off">
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">
<a href="javascript:void(0);" title="点击更换验证码"> <a href="javascript:void(0);" title="点击更换验证码"> <img
<img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/> th:src="@{captcha/captchaImage(type=${captchaType})}"
class="imgcode" width="85%" />
</a> </a>
</div> </div>
</div> </div>
<div class="checkbox-custom" th:classappend="${captchaEnabled==false} ? 'm-t'"> <div class="checkbox-custom"
<input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label> th:classappend="${captchaEnabled==false} ? 'm-t'">
<input type="checkbox" id="rememberme" name="rememberme">
<label for="rememberme">记住我</label>
</div> </div>
<button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button> <button class="btn btn-success btn-block" id="btnSubmit"
data-loading="正在验证登录，请稍后...">登录</button>
</form> </form>
</div> </div>
</div> </div>
<div class="row"></div>
<div class="signup-footer"> <div class="signup-footer">
<div class="pull-left"> <div class="pull-left">
<div class="pull-right">Copyright © [[${copyrightYear}]] Powered By Infosouth [[${sysVersion}]]</div> <div class="pull-right">Copyright © [[${copyrightYear}]]
Powered By Infosouth [[${sysVersion}]]</div>
</div> </div>
</div> </div>
</div> </div>
<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script> <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
<!-- 全局js --> <!-- 全局js -->
<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script> <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
<script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.min.js}"></script> <script src="../static/js/bootstrap.min.js"
th:src="@{/js/bootstrap.min.js}"></script>
<!-- 验证插件 --> <!-- 验证插件 -->
<script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script> <script src="../static/ajax/libs/validate/jquery.validate.min.js"
<script src="../static/ajax/libs/validate/messages_zh.min.js" th:src="@{/ajax/libs/validate/messages_zh.min.js}"></script> th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
<script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script> <script src="../static/ajax/libs/validate/messages_zh.min.js"
<script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script> th:src="@{/ajax/libs/validate/messages_zh.min.js}"></script>
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.1.0}"></script> <script src="../static/ajax/libs/layer/layer.min.js"
th:src="@{/ajax/libs/layer/layer.min.js}"></script>
<script src="../static/ajax/libs/blockUI/jquery.blockUI.js"
th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
<script src="../static/ruoyi/js/ry-ui.js"
th:src="@{/ruoyi/js/ry-ui.js?v=4.1.0}"></script>
<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script> <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
</body> </body>
</html> </html>

28
infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/CsvManagerController.java
View File

@ -3,7 +3,12 @@ package cn.com.infosouth.arj21.controller.csvmanager;
import cn.com.infosouth.common.config.Global; import cn.com.infosouth.common.config.Global;
import cn.com.infosouth.common.core.controller.BaseController; import cn.com.infosouth.common.core.controller.BaseController;
import cn.com.infosouth.common.core.domain.AjaxResult; import cn.com.infosouth.common.core.domain.AjaxResult;
import cn.com.infosouth.common.utils.ServletUtils;
import cn.com.infosouth.common.utils.StringUtils; import cn.com.infosouth.common.utils.StringUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;
@ -21,20 +26,19 @@ public class CsvManagerController extends BaseController {
private String prefix = "arj21/csvmanager"; private String prefix = "arj21/csvmanager";
@GetMapping("/infoFlight") @GetMapping("/infoFlight")
public String list(ModelMap mmap) public String list(ModelMap mmap, HttpServletRequest request, HttpServletResponse response)
{ {
// 如果是Ajax请求，返回Json字符串。 // 如果是Ajax请求，返回Json字符串。
//HttpServletRequest request, HttpServletResponse response, if (ServletUtils.isAjaxRequest(request))
// if (ServletUtils.isAjaxRequest(request)) {
// { return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
// return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
// }
// } mmap.put("sysName", Global.getName());
// mmap.put("sysName", Global.getName()); mmap.put("sysWelcome", Global.getWelcome());
// mmap.put("sysWelcome", Global.getWelcomeDesc()); mmap.put("sysBaba", Global.getBaba());
// mmap.put("sysBaba", Global.getBaba()); mmap.put("copyrightYear", Global.getCopyrightYear());
// mmap.put("copyrightYear", Global.getCopyrightYear()); mmap.put("sysVersion", Global.getVersion());
// mmap.put("sysVersion", Global.getVersion());
return prefix + "/list"; return prefix + "/list";
} }
} }

2
infosouth-common/pom.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http:r//www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>amas.comac</artifactId> <artifactId>amas.comac</artifactId>

14
infosouth-common/src/main/java/cn/com/infosouth/common/config/Global.java
View File

@ -9,14 +9,14 @@ import org.springframework.stereotype.Component;
* @author ruoyi * @author ruoyi
*/ */
@Component @Component
@ConfigurationProperties(prefix = "ruoyi") @ConfigurationProperties(prefix = "infosouth")
public class Global public class Global
{ {
/** 项目名称 */ /** 项目名称 */
private static String name; private static String name;
/** 欢迎词 **/ /** 欢迎词 **/
private static String welcomeDesc; private static String welcome;
/** 甲方爸爸 **/ /** 甲方爸爸 **/
private static String baba; private static String baba;
@ -46,19 +46,19 @@ public class Global
Global.name = name; Global.name = name;
} }
public static String getWelcomeDesc() { public static String getWelcome() {
return welcomeDesc; return welcome;
} }
public static void setWelcomeDesc(String welcomeDesc) { public void setWelcome(String welcome) {
Global.welcomeDesc = welcomeDesc; Global.welcome = welcome;
} }
public static String getBaba() { public static String getBaba() {
return baba; return baba;
} }
public static void setBaba(String baba) { public void setBaba(String baba) {
Global.baba = baba; Global.baba = baba;
} }

2
pom.xml
View File

@ -219,8 +219,8 @@
<module>infosouth-system</module> <module>infosouth-system</module>
<module>infosouth-quartz</module> <module>infosouth-quartz</module>
<module>infosouth-generator</module> <module>infosouth-generator</module>
<module>infosouth-common</module>
<module>infosouth-arj21</module> <module>infosouth-arj21</module>
<module>infosouth-common</module>
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>