diff --git a/bin/run.bat b/bin/run.bat
index 90073a828..69ea2e54c 100644
--- a/bin/run.bat
+++ b/bin/run.bat
@@ -1,14 +1,14 @@
 @echo off
 echo.
-echo [信息] 运行Web工程。
+echo [信息] 执行Web。
 echo.
 
 cd %~dp0
-cd ../ruoyi-admin/target
+cd ../infosouth-admin/target
 
 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
 pause
\ No newline at end of file
diff --git a/infosouth-admin/src/main/java/cn/com/infosouth/RuoYiApplication.java b/infosouth-admin/src/main/java/cn/com/infosouth/RuoYiApplication.java
index 1bd20ce79..db378c1c3 100644
--- a/infosouth-admin/src/main/java/cn/com/infosouth/RuoYiApplication.java
+++ b/infosouth-admin/src/main/java/cn/com/infosouth/RuoYiApplication.java
@@ -3,6 +3,7 @@ package cn.com.infosouth;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 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");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("  绯荤粺鍚姩鎴愬姛(鈼犫�库棤)   \n");
+        System.out.println("  绯荤粺鍚姩鎴愬姛  \n");
     }
 }
\ No newline at end of file
diff --git a/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysIndexController.java b/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysIndexController.java
index cd18dddac..8d1665613 100644
--- a/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysIndexController.java
+++ b/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysIndexController.java
@@ -34,6 +34,8 @@ public class SysIndexController extends BaseController
         mmap.put("menus", menus);
         mmap.put("user", user);
         mmap.put("sysName", Global.getName());
+        mmap.put("sysBaba", Global.getBaba());
+        mmap.put("sysWelcome", Global.getWelcome());
         mmap.put("sysVersion", Global.getVersion());
         mmap.put("copyrightYear", Global.getCopyrightYear());
         mmap.put("demoEnabled", Global.isDemoEnabled());
diff --git a/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysLoginController.java b/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysLoginController.java
index d07e3ab01..cfdc13ab1 100644
--- a/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysLoginController.java
+++ b/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/system/SysLoginController.java
@@ -39,17 +39,15 @@ public class SysLoginController extends BaseController
     }
 
     @GetMapping("/login")
-    public String login(ModelMap mmap)
+    public String login(ModelMap mmap, HttpServletRequest request, HttpServletResponse response)
     {
         // 濡傛灉鏄疉jax璇锋眰锛岃繑鍥濲son瀛楃涓层��
-        //HttpServletRequest request, HttpServletResponse response,
-        //        if (ServletUtils.isAjaxRequest(request))
-        //        {
-        //            return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"鏈櫥褰曟垨鐧诲綍瓒呮椂銆傝閲嶆柊鐧诲綍\"}");
-        //
-        //        }
+		if (ServletUtils.isAjaxRequest(request)) {
+			return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"鏈櫥褰曟垨鐧诲綍瓒呮椂銆傝閲嶆柊鐧诲綍\"}");
+
+		}
         mmap.put("sysName", Global.getName());
-        mmap.put("sysWelcome", Global.getWelcomeDesc());
+        mmap.put("sysWelcome", Global.getWelcome());
         mmap.put("sysBaba", Global.getBaba());
         mmap.put("copyrightYear", Global.getCopyrightYear());
         mmap.put("sysVersion", Global.getVersion());
diff --git a/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/tool/BuildController.java b/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/tool/BuildController.java
index dae8f3ca9..9201792b7 100644
--- a/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/tool/BuildController.java
+++ b/infosouth-admin/src/main/java/cn/com/infosouth/web/controller/tool/BuildController.java
@@ -13,14 +13,12 @@ import cn.com.infosouth.common.core.controller.BaseController;
  */
 @Controller
 @RequestMapping("/tool/build")
-public class BuildController extends BaseController
-{
-    private String prefix = "tool/build";
+public class BuildController extends BaseController {
+	private String prefix = "tool/build";
 
-    @RequiresPermissions("tool:build:view")
-    @GetMapping()
-    public String build()
-    {
-        return prefix + "/build";
-    }
+	@RequiresPermissions("tool:build:view")
+	@GetMapping()
+	public String build() {
+		return prefix + "/build";
+	}
 }
diff --git a/infosouth-admin/src/main/resources/application.yml b/infosouth-admin/src/main/resources/application.yml
index 95a0a4e86..f4f2af3a8 100644
--- a/infosouth-admin/src/main/resources/application.yml
+++ b/infosouth-admin/src/main/resources/application.yml
@@ -1,9 +1,9 @@
 # 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
+infosouth:
   # 鍚嶇О
   name: ARJ21-700椋炴満鍙傝�冩満鍨嬭櫄鎷熸暟鎹簱
-  welcomeDesc: "ARJ21-700椋炴満 鍙傝�冩満鍨嬭櫄鎷熸暟鎹簱"
-  baba: 涓浗鍟嗛
+  baba: 涓浗鍟嗛瀹㈡湇鍏徃
+  welcome: ARJ21-700椋炴満鍙傝�冩満鍨嬭櫄鎷熸暟鎹簱
   # 鐗堟湰
   version: 4.1.0
   # 鐗堟潈骞翠唤
diff --git a/infosouth-admin/src/main/resources/banner.txt b/infosouth-admin/src/main/resources/banner.txt
index 5c086f757..9c6564065 100644
--- a/infosouth-admin/src/main/resources/banner.txt
+++ b/infosouth-admin/src/main/resources/banner.txt
@@ -1,4 +1,4 @@
-Application Version: ${ruoyi.version}
+Application Version: ${infosouth.version}
 Spring Boot Version: ${spring-boot.version}
 ///////////////////////////////////////////////////////////////////////////////////
            __  __           _____    _____ ____  __  __          _____
diff --git a/infosouth-admin/src/main/resources/static/css/login.css b/infosouth-admin/src/main/resources/static/css/login.css
index 95c3579bb..5fe9091c5 100644
--- a/infosouth-admin/src/main/resources/static/css/login.css
+++ b/infosouth-admin/src/main/resources/static/css/login.css
@@ -1,147 +1,176 @@
 html {
-	height:100%
+	height: 100%
 }
+
 body.signin {
-	height:auto;
-	background:url(../img/login-background.jpg) no-repeat center fixed;
-	-webkit-background-size:cover;
-	-moz-background-size:cover;
-	-o-background-size:cover;
-	background-size:cover;
-	color:rgba(255,255,255,.95)
+ 	height: auto;
+	background: url(../img/login-background.jpg) no-repeat center fixed;
+	-webkit-background-size: cover;
+	-moz-background-size: cover;
+	-o-background-size: cover;
+	background-size: cover;
+	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 {
-	width:750px;
-	margin:10% auto 0
+	width: 750px;
+	margin: 10% auto 0
 }
+
 .signinpanel .logopanel {
-	float:none;
-	width:auto;
-	padding:0;
-	background:0 0
+	float: none;
+	width: auto;
+	padding: 0;
+	background: 0 0
 }
+
 .signinpanel .signin-info ul {
-	list-style:none;
-	padding:0;
-	margin:20px 0
+	list-style: none;
+	padding: 0;
+	margin: 20px 0
 }
+
 .signinpanel .form-control {
-	display:block;
-	margin-top:15px
+	display: block;
+	margin-top: 15px
 }
+
 .signinpanel .uname {
-	background:#fff url(../img/user.png) no-repeat 95% center;
-	color:#333
+	background: #fff url(../img/user.png) no-repeat 95% center;
+	color: #333
 }
+
 .signinpanel .pword {
-	background:#fff url(../img/locked.png) no-repeat 95% center;
-	color:#333
+	background: #fff url(../img/locked.png) no-repeat 95% center;
+	color: #333
 }
+
 .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 {
-	margin-top:15px
+	margin-top: 15px
 }
+
 .signinpanel form {
-	background:rgba(255,255,255,.2);
-	border:1px solid rgba(255,255,255,.3);
-	-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);
-	-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);
-	box-shadow:0 3px 0 rgba(12,12,12,.03);
-	-moz-border-radius:3px;
-	-webkit-border-radius:3px;
-	border-radius:3px;
-	padding:30px
+	background: rgba(255, 255, 255, .2);
+	border: 1px solid rgba(255, 255, 255, .3);
+	-moz-box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
+	-webkit-box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
+	box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	padding: 30px
 }
+
 .signup-footer {
-	border-top:solid 1px rgba(255,255,255,.3);
-	margin:20px 0;
-	padding-top:15px
+	border-top: solid 1px rgba(255, 255, 255, .3);
+	margin: 20px 0;
+	padding-top: 15px
 }
+
 @media screen and (max-width:768px) {
-	.signinpanel,.signuppanel {
-	margin:0 auto;
-	width:420px!important;
-	padding:20px
-}
-.signinpanel form {
-	margin-top:20px
-}
-.signup-footer,.signuppanel .form-control {
-	margin-bottom:10px
-}
-.signup-footer .pull-left,.signup-footer .pull-right {
-	float:none!important;
-	text-align:center
-}
-.signinpanel .signin-info ul {
-	display:none
-}
-}@media screen and (max-width:320px) {
-	.signinpanel,.signuppanel {
-	margin:0 20px;
-	width:auto
+	.signinpanel, .signuppanel {
+		margin: 0 auto;
+		width: 420px !important;
+		padding: 20px
+	}
+	.signinpanel form {
+		margin-top: 20px
+	}
+	.signup-footer, .signuppanel .form-control {
+		margin-bottom: 10px
+	}
+	.signup-footer .pull-left, .signup-footer .pull-right {
+		float: none !important;
+		text-align: center
+	}
+	.signinpanel .signin-info ul {
+		display: none
+	}
 }
+
+@media screen and (max-width:320px) {
+	.signinpanel, .signuppanel {
+		margin: 0 20px;
+		width: auto
+	}
 }
 /*
-鐧诲綍鐣岄潰check鏍峰紡
+闁谎嗩嚙缂嶅秹鎮惧畝鍕〃check闁哄秴鍢茬槐锟�
 */
 .checkbox-custom {
-    position: relative;
-    padding: 0 15px 0 25px;
-    margin-bottom: 7px;
-    display: inline-block;
+	position: relative;
+	padding: 0 15px 0 25px;
+	margin-bottom: 7px;
+	display: inline-block;
 }
 /*
-灏嗗垵濮嬬殑checkbox鐨勬牱寮忔敼鍙�
+閻忓繐妫楅崹鍨叏鐎ｎ剚鐣眂heckbox闁汇劌瀚悧鍗烆嚕韫囨梹鏆柛娆欐嫹
 */
 .checkbox-custom input[type="checkbox"] {
-    opacity: 0; /*灏嗗垵濮嬬殑checkbox闅愯棌璧锋潵*/
-    position: absolute;
-    cursor: pointer;
-    z-index: 2;
-    margin: -6px 0 0 0;
-    top: 50%;
-    left: 3px;
+	opacity: 0; /*閻忓繐妫楅崹鍨叏鐎ｎ剚鐣眂heckbox闂傚懏鍔樺Λ宀�鎸ч柨瀣檷*/
+	position: absolute;
+	cursor: pointer;
+	z-index: 2;
+	margin: -6px 0 0 0;
+	top: 50%;
+	left: 3px;
 }
 /*
-璁捐鏂扮殑checkbox锛屼綅缃�
+閻犱焦宕橀鎼佸棘閹殿喗鐣眂heckbox闁挎稑濂旂紞鍛磾閿燂拷
 */
 .checkbox-custom label:before {
-    content: '';
-    position: absolute;
-    top: 50%;
-    left: 0;
-    margin-top: -9px;
-    width: 18px;
-    height: 17px;
-    display: inline-block;
-    border-radius: 2px;
-    border: 1px solid #bbb;
-    background: #fff;
+	content: '';
+	position: absolute;
+	top: 50%;
+	left: 0;
+	margin-top: -9px;
+	width: 18px;
+	height: 17px;
+	display: inline-block;
+	border-radius: 2px;
+	border: 1px solid #bbb;
+	background: #fff;
 }
 /*
-鐐瑰嚮鍒濆鐨刢heckbox锛屽皢鏂扮殑checkbox鍏宠仈璧锋潵
+闁绘劗鎳撻崵顕�宕氬┑鍡╂綏闁汇劌鍨籬eckbox闁挎稑鑻惃銏ゅ棘閹殿喗鐣眂heckbox闁稿繐鐤囨禒鍫㈡導闁垮闄�
 */
-.checkbox-custom input[type="checkbox"]:checked +label:after {
-    position: absolute;
-    display: inline-block;
-    font-family: 'Glyphicons Halflings';
-    content: "\e013";
-    top: 42%;
-    left: 3px;
-    margin-top: -5px;
-    font-size: 11px;
-    line-height: 1;
-    width: 16px;
-    height: 16px;
-    color: #333;
+.checkbox-custom input[type="checkbox"]:checked+label:after {
+	position: absolute;
+	display: inline-block;
+	font-family: 'Glyphicons Halflings';
+	content: "\e013";
+	top: 42%;
+	left: 3px;
+	margin-top: -5px;
+	font-size: 11px;
+	line-height: 1;
+	width: 16px;
+	height: 16px;
+	color: #333;
 }
+
 .checkbox-custom label {
-    cursor: pointer;
-    line-height: 1.2;
-    font-weight: normal; /*鏀瑰彉浜唕ememberme鐨勫瓧浣�*/
-    margin-bottom: 0;
-    text-align: left;
+	cursor: pointer;
+	line-height: 1.2;
+	font-weight: normal; /*闁猴拷閻熸澘缍佸ù婊冩晝ememberme闁汇劌瀚悺褎鎷呴敓锟�*/
+	margin-bottom: 0;
+	text-align: left;
 }
\ No newline at end of file
diff --git a/infosouth-admin/src/main/resources/static/css/style.css b/infosouth-admin/src/main/resources/static/css/style.css
index 0e1dd234b..9fd412d98 100644
--- a/infosouth-admin/src/main/resources/static/css/style.css
+++ b/infosouth-admin/src/main/resources/static/css/style.css
@@ -473,7 +473,7 @@ body.body-small.fixed-sidebar.mini-navbar .navbar-static-side {
     border-left-width: 0;
 }
 
-/*浼哥缉鑿滃崟*/
+/*娴煎摜缂夐懣婊冨礋*/
 .fixed-sidebar.mini-navbar .nav li:hover>a> span.nav-label {
     top: 0px;
     padding: 10px 10px 10px 10px;
@@ -495,7 +495,7 @@ body.body-small.fixed-sidebar.mini-navbar .navbar-static-side {
     min-width: 140px;
     border-radius: 2px;
 }
-/*浼哥缉鑿滃崟缁撴潫*/
+/*娴煎摜缂夐懣婊冨礋缂佹挻娼�*/
 
 body.fixed-sidebar.mini-navbar .navbar-default .nav>li>.nav-second-level li a {
     font-size: 12px;
@@ -6927,7 +6927,7 @@ body.rtls .top-navigation .footer.fixed, body.rtls.top-navigation .footer.fixed
     padding:0;
 }
 
-/*缂栬緫鍣ㄦ寜閽牱寮忓啿绐�*/
+/*缂傛牞绶崳銊﹀瘻闁筋喗鐗卞蹇撳暱缁愶拷*/
 .note-editor .btn-default {
     color: #333333!important;
     background-color: #ffffff!important;
@@ -7029,4 +7029,20 @@ body.rtls .top-navigation .footer.fixed, body.rtls.top-navigation .footer.fixed
 	top: 0px;
 	z-index: 9998;
 	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;
 }
\ No newline at end of file
diff --git a/infosouth-admin/src/main/resources/static/img/login-background-old.jpg b/infosouth-admin/src/main/resources/static/img/login-background-old.jpg
index adfa3f90c..e69de29bb 100644
Binary files a/infosouth-admin/src/main/resources/static/img/login-background-old.jpg and b/infosouth-admin/src/main/resources/static/img/login-background-old.jpg differ
diff --git a/infosouth-admin/src/main/resources/static/img/login-background.jpg b/infosouth-admin/src/main/resources/static/img/login-background.jpg
new file mode 100644
index 000000000..a9bdbdec2
Binary files /dev/null and b/infosouth-admin/src/main/resources/static/img/login-background.jpg differ
diff --git a/infosouth-admin/src/main/resources/static/img/profile.jpg b/infosouth-admin/src/main/resources/static/img/profile.jpg
index b3a940b21..d845347ae 100644
Binary files a/infosouth-admin/src/main/resources/static/img/profile.jpg and b/infosouth-admin/src/main/resources/static/img/profile.jpg differ
diff --git a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/list.html b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/list.html
index ed43ff6d0..e69de29bb 100644
--- a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/list.html
+++ b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/list.html
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>csvmanager-infoflight</title>
-</head>
-<body>
-infoflight---鍝堝搱鍝垀
-</body>
-</html>
\ No newline at end of file
diff --git a/infosouth-admin/src/main/resources/templates/index.html b/infosouth-admin/src/main/resources/templates/index.html
index 62f41a90f..bddc35cc1 100644
--- a/infosouth-admin/src/main/resources/templates/index.html
+++ b/infosouth-admin/src/main/resources/templates/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>${{sysName}}-棣栭〉</title>
+    <title>[[${sysName}]]</title>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html"/>
     <![endif]-->
@@ -29,7 +29,7 @@
             <ul class="nav" id="side-menu">
                 <a th:href="@{/index}">
                   <li class="logo">
-				    <span class="logo-lg" >RuoYi</span>
+				    <span class="logo-lg" >[[${sysBaba}]]</span>
             	  </li>
             	</a>
             	<li>
@@ -50,7 +50,7 @@
                 <li>
                     <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">
-                        <li><a class="menuItem" th:href="@{/system/main}">浜嗚В鑻ヤ緷</a></li>
+                        <li><a class="menuItem" th:href="@{/system/main}">棣栭〉</a></li>
                     </ul>
                 </li>
                 <li th:each="menu : ${menus}">
@@ -180,9 +180,10 @@
                     	<i class="fa fa-bars"></i>
                     </a>
                 </div>
+                <div class="nav navbar-top-links welcome-lang">
+                	<span>[[${sysWelcome}]]</span>
+                </div>
                 <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 class="dropdown user-menu">
 						<a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
diff --git a/infosouth-admin/src/main/resources/templates/login.html b/infosouth-admin/src/main/resources/templates/login.html
index 6c658a5b1..6eccd2718 100644
--- a/infosouth-admin/src/main/resources/templates/login.html
+++ b/infosouth-admin/src/main/resources/templates/login.html
@@ -1,80 +1,110 @@
 <!DOCTYPE html>
-<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    
-    <title>[[${sysName}]] 鐧诲綍</title>
-    <meta name="description" content="鍚庡彴绠＄悊绯荤粺">
-    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
-    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
-    <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
-    <link href="../static/css/login.min.css" th:href="@{/css/login.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"/>
-    <!-- 360娴忚鍣ㄦ�ラ�熸ā寮� -->
-    <meta name="renderer" content="webkit">
-    <!-- 閬垮厤IE浣跨敤鍏煎妯″紡 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
-    <style type="text/css">label.error { position:inherit;  }</style>
-    <script>
+<meta charset="utf-8">
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+
+<title>[[${sysName}]] 鐧诲綍</title>
+<meta name="description" content="鍚庡彴绠＄悊绯荤粺">
+<link href="../static/css/bootstrap.min.css"
+	th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
+<link href="../static/css/font-awesome.min.css"
+	th:href="@{/css/font-awesome.min.css}" 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娴忚鍣ㄦ�ラ�熸ā寮� -->
+<meta name="renderer" content="webkit">
+<!-- 閬垮厤IE浣跨敤鍏煎妯″紡 -->
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<link rel="shortcut icon" href="../static/favicon.ico"
+	th:href="@{favicon.ico}" />
+<style type="text/css">
+label.error {
+	position: inherit;
+}
+</style>
+<script>
         if(window.top!==window.self){window.top.location=window.location};
     </script>
 </head>
 
 <body class="signin">
-
-    <div class="signinpanel">
-        <div class="row">
-            <div class="col-sm-7">
-                <div class="signin-info">
-                    <div class="logopanel m-b">
-                        <h1><img alt="[ [[${sysBaba}]] ]" src="../static/comac.png" th:src="@{/comac.png}"></h1>
-                    </div>
-                    <div class="m-b"></div>
-                    <h4>[[${sysWelcome}]] ---</h4>
-                    <strong>杩樻病鏈夎处鍙凤紵 <a href="#">绔嬪嵆娉ㄥ唽&raquo;</a></strong>
-                </div>
-            </div>
-            <div class="col-sm-5">
-                <form id="signupForm">
-                    <h4 class="no-margins">鐧诲綍</h4>
-                    <p class="m-t-md">>>璇锋敞鎰忔暟鎹繚瀵�</p>
-                    <input type="text"     name="username" class="form-control uname"     placeholder="鐢ㄦ埛鍚�" value="admin"    />
-                    <input type="password" name="password" class="form-control pword"     placeholder="瀵嗙爜"   value="admin123" />
+	<div class="mohu"></div>
+	<div class="signinpanel">
+		<div class="row">
+			<div class="col-sm-4">
+				<div class="signin-info">
+					<div class="logopanel m-b">
+						<h1>
+							<img alt="[ [[${sysBaba}]] ]" src="../static/comac.png"
+								th:src="@{/comac.png}">
+						</h1>
+					</div>
+					<div class="m-b"></div>
+					<h2>[[${sysWelcome}]]</h2>
+					<!--<strong>杩樻病鏈夎处鍙凤紵 <a href="#">绔嬪嵆娉ㄥ唽&raquo;</a></strong>  -->
+				</div>
+			</div>
+			<div class="col-sm-3"></div>
+			<div class="col-sm-5">
+				<form id="signupForm">
+					<h4 class="no-margins">鐧诲綍</h4>
+					<p class="m-t-md">娉ㄦ剰鏁版嵁淇濆瘑!</p>
+					<input type="text" name="username" class="form-control uname"
+						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="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 class="col-xs-6">
-							<a href="javascript:void(0);" title="鐐瑰嚮鏇存崲楠岃瘉鐮�">
-								<img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
+							<a href="javascript:void(0);" title="鐐瑰嚮鏇存崲楠岃瘉鐮�"> <img
+								th:src="@{captcha/captchaImage(type=${captchaType})}"
+								class="imgcode" width="85%" />
 							</a>
 						</div>
 					</div>
-                    <div class="checkbox-custom" th:classappend="${captchaEnabled==false} ? 'm-t'">
-				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">璁颁綇鎴�</label>
-				    </div>
-                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="姝ｅ湪楠岃瘉鐧诲綍锛岃绋嶅悗...">鐧诲綍</button>
-                </form>
-            </div>
-        </div>
-        <div class="signup-footer">
-            <div class="pull-left">
-                <div class="pull-right">Copyright 漏 [[${copyrightYear}]] Powered By Infosouth [[${sysVersion}]]</div>
-            </div>
-        </div>
-    </div>
-<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
-<!-- 鍏ㄥ眬js -->
-<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/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
-<script src="../static/ajax/libs/validate/messages_zh.min.js" th:src="@{/ajax/libs/validate/messages_zh.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/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>
+					<div class="checkbox-custom"
+						th:classappend="${captchaEnabled==false} ? 'm-t'">
+						<input type="checkbox" id="rememberme" name="rememberme">
+						<label for="rememberme">璁颁綇鎴�</label>
+					</div>
+					<button class="btn btn-success btn-block" id="btnSubmit"
+						data-loading="姝ｅ湪楠岃瘉鐧诲綍锛岃绋嶅悗...">鐧诲綍</button>
+				</form>
+			</div>
+		</div>
+		<div class="row"></div>
+		<div class="signup-footer">
+			<div class="pull-left">
+				<div class="pull-right">Copyright 漏 [[${copyrightYear}]]
+					Powered By Infosouth [[${sysVersion}]]</div>
+			</div>
+		</div>
+	</div>
+	<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
+	<!-- 鍏ㄥ眬js -->
+	<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/ajax/libs/validate/jquery.validate.min.js"
+		th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
+	<script src="../static/ajax/libs/validate/messages_zh.min.js"
+		th:src="@{/ajax/libs/validate/messages_zh.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/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>
 </body>
 </html>
diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/CsvManagerController.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/CsvManagerController.java
index b099aaf8f..09b64c173 100644
--- a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/CsvManagerController.java
+++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/CsvManagerController.java
@@ -3,7 +3,12 @@ package cn.com.infosouth.arj21.controller.csvmanager;
 import cn.com.infosouth.common.config.Global;
 import cn.com.infosouth.common.core.controller.BaseController;
 import cn.com.infosouth.common.core.domain.AjaxResult;
+import cn.com.infosouth.common.utils.ServletUtils;
 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.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
@@ -21,20 +26,19 @@ public class CsvManagerController extends BaseController {
     private String prefix = "arj21/csvmanager";
 
     @GetMapping("/infoFlight")
-    public String list(ModelMap mmap)
+    public String list(ModelMap mmap, HttpServletRequest request, HttpServletResponse response)
     {
         // 濡傛灉鏄疉jax璇锋眰锛岃繑鍥濲son瀛楃涓层��
-        //HttpServletRequest request, HttpServletResponse response,
-        //        if (ServletUtils.isAjaxRequest(request))
-        //        {
-        //            return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"鏈櫥褰曟垨鐧诲綍瓒呮椂銆傝閲嶆柊鐧诲綍\"}");
-        //
-        //        }
-//        mmap.put("sysName", Global.getName());
-//        mmap.put("sysWelcome", Global.getWelcomeDesc());
-//        mmap.put("sysBaba", Global.getBaba());
-//        mmap.put("copyrightYear", Global.getCopyrightYear());
-//        mmap.put("sysVersion", Global.getVersion());
+        if (ServletUtils.isAjaxRequest(request))
+        {
+            return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"鏈櫥褰曟垨鐧诲綍瓒呮椂銆傝閲嶆柊鐧诲綍\"}");
+
+        }
+        mmap.put("sysName", Global.getName());
+        mmap.put("sysWelcome", Global.getWelcome());
+        mmap.put("sysBaba", Global.getBaba());
+        mmap.put("copyrightYear", Global.getCopyrightYear());
+        mmap.put("sysVersion", Global.getVersion());
         return prefix + "/list";
     }
 }
diff --git a/infosouth-common/pom.xml b/infosouth-common/pom.xml
index 7398e8d8e..0204fc531 100644
--- a/infosouth-common/pom.xml
+++ b/infosouth-common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
     <parent>
         <artifactId>amas.comac</artifactId>
diff --git a/infosouth-common/src/main/java/cn/com/infosouth/common/config/Global.java b/infosouth-common/src/main/java/cn/com/infosouth/common/config/Global.java
index 4abadf2a4..1cfa73aa4 100644
--- a/infosouth-common/src/main/java/cn/com/infosouth/common/config/Global.java
+++ b/infosouth-common/src/main/java/cn/com/infosouth/common/config/Global.java
@@ -9,14 +9,14 @@ import org.springframework.stereotype.Component;
  * @author ruoyi
  */
 @Component
-@ConfigurationProperties(prefix = "ruoyi")
+@ConfigurationProperties(prefix = "infosouth")
 public class Global
 {
     /** 椤圭洰鍚嶇О */
     private static String name;
 
     /** 娆㈣繋璇� **/
-    private static String welcomeDesc;
+    private static String welcome;
 
     /** 鐢叉柟鐖哥埜 **/
     private static String baba;
@@ -46,23 +46,23 @@ public class Global
         Global.name = name;
     }
 
-    public static String getWelcomeDesc() {
-        return welcomeDesc;
-    }
+    public static String getWelcome() {
+		return welcome;
+	}
 
-    public static void setWelcomeDesc(String welcomeDesc) {
-        Global.welcomeDesc = welcomeDesc;
-    }
+	public void setWelcome(String welcome) {
+		Global.welcome = welcome;
+	}
 
-    public static String getBaba() {
-        return baba;
-    }
+	public static String getBaba() {
+		return baba;
+	}
 
-    public static void setBaba(String baba) {
-        Global.baba = baba;
-    }
+	public void setBaba(String baba) {
+		Global.baba = baba;
+	}
 
-    public static String getVersion()
+	public static String getVersion()
     {
         return version;
     }
diff --git a/pom.xml b/pom.xml
index 27f8d44f8..718573338 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://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">
+	xmlns:xsi="http://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">
 	<modelVersion>4.0.0</modelVersion>
-	
-    <groupId>cn.com.infosouth</groupId>
-    <artifactId>amas.comac</artifactId>
-    <version>4.1.0</version>
 
-    <name>amas.comac.v2</name>
+	<groupId>cn.com.infosouth</groupId>
+	<artifactId>amas.comac</artifactId>
+	<version>4.1.0</version>
+
+	<name>amas.comac.v2</name>
 	<url>http://www.infosouth.com.cn</url>
-    <description>绠＄悊绯荤粺</description>
-    
-    <properties>
-	    <infosouth.version>4.1.0</infosouth.version>
+	<description>绠＄悊绯荤粺</description>
+
+	<properties>
+		<infosouth.version>4.1.0</infosouth.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
@@ -32,219 +32,219 @@
 		<poi.version>3.17</poi.version>
 		<velocity.version>1.7</velocity.version>
 	</properties>
-	
-    <!-- 渚濊禆澹版槑 -->
-    <dependencyManagement>
-        <dependencies>
-        
-            <!-- SpringBoot鐨勪緷璧栭厤缃�-->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            
-            <!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+
+	<!-- 渚濊禆澹版槑 -->
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- SpringBoot鐨勪緷璧栭厤缃� -->
 			<dependency>
-	            <groupId>com.alibaba</groupId>
-	            <artifactId>druid-spring-boot-starter</artifactId>
-	            <version>${druid.version}</version>
-	        </dependency>
-	        
-	        <!--楠岃瘉鐮� -->
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>2.1.1.RELEASE</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+			<dependency>
+				<groupId>com.alibaba</groupId>
+				<artifactId>druid-spring-boot-starter</artifactId>
+				<version>${druid.version}</version>
+			</dependency>
+
+			<!--楠岃瘉鐮� -->
 			<dependency>
 				<groupId>com.github.penggle</groupId>
 				<artifactId>kaptcha</artifactId>
 				<version>${kaptcha.version}</version>
 			</dependency>
-			
+
 			<!--Shiro鏍稿績妗嗘灦 -->
 			<dependency>
 				<groupId>org.apache.shiro</groupId>
 				<artifactId>shiro-core</artifactId>
 				<version>${shiro.version}</version>
 			</dependency>
-			
+
 			<!-- Shiro浣跨敤Srping妗嗘灦 -->
 			<dependency>
 				<groupId>org.apache.shiro</groupId>
 				<artifactId>shiro-spring</artifactId>
 				<version>${shiro.version}</version>
 			</dependency>
-			
+
 			<!-- Shiro浣跨敤EhCache缂撳瓨妗嗘灦 -->
 			<dependency>
 				<groupId>org.apache.shiro</groupId>
 				<artifactId>shiro-ehcache</artifactId>
 				<version>${shiro.version}</version>
 			</dependency>
-	
+
 			<!-- thymeleaf妯℃澘寮曟搸鍜宻hiro妗嗘灦鐨勬暣鍚� -->
 			<dependency>
 				<groupId>com.github.theborakompanioni</groupId>
 				<artifactId>thymeleaf-extras-shiro</artifactId>
 				<version>${thymeleaf.extras.shiro.version}</version>
 			</dependency>
-	
+
 			<!-- 瑙ｆ瀽瀹㈡埛绔搷浣滅郴缁熴�佹祻瑙堝櫒绛� -->
 			<dependency>
 				<groupId>eu.bitwalker</groupId>
 				<artifactId>UserAgentUtils</artifactId>
 				<version>${bitwalker.version}</version>
 			</dependency>
-			
+
 			<!-- pagehelper 鍒嗛〉鎻掍欢 -->
 			<dependency>
 				<groupId>com.github.pagehelper</groupId>
 				<artifactId>pagehelper-spring-boot-starter</artifactId>
 				<version>${pagehelper.boot.version}</version>
 			</dependency>
-			
+
 			<!-- 鑾峰彇绯荤粺淇℃伅 -->
 			<dependency>
 				<groupId>com.github.oshi</groupId>
 				<artifactId>oshi-core</artifactId>
 				<version>${oshi.version}</version>
 			</dependency>
-			
-			<!-- swagger2-->
+
+			<!-- swagger2 -->
 			<dependency>
 				<groupId>io.springfox</groupId>
 				<artifactId>springfox-swagger2</artifactId>
 				<version>${swagger.version}</version>
 				<exclusions>
-				    <exclusion>
-				        <groupId>io.swagger</groupId>
-				        <artifactId>swagger-annotations</artifactId>
-				    </exclusion>
-				    <exclusion>
-				        <groupId>io.swagger</groupId>
-				        <artifactId>swagger-models</artifactId>
-				    </exclusion>
+					<exclusion>
+						<groupId>io.swagger</groupId>
+						<artifactId>swagger-annotations</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>io.swagger</groupId>
+						<artifactId>swagger-models</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
-			
-			<!-- swagger2-UI-->
+
+			<!-- swagger2-UI -->
 			<dependency>
 				<groupId>io.springfox</groupId>
 				<artifactId>springfox-swagger-ui</artifactId>
 				<version>${swagger.version}</version>
 			</dependency>
-            
-            <!--io甯哥敤宸ュ叿绫� -->
+
+			<!--io甯哥敤宸ュ叿绫� -->
 			<dependency>
 				<groupId>commons-io</groupId>
 				<artifactId>commons-io</artifactId>
 				<version>${commons.io.version}</version>
 			</dependency>
-	
+
 			<!--鏂囦欢涓婁紶宸ュ叿绫� -->
 			<dependency>
 				<groupId>commons-fileupload</groupId>
 				<artifactId>commons-fileupload</artifactId>
 				<version>${commons.fileupload.version}</version>
 			</dependency>
-			
+
 			<!-- excel宸ュ叿 -->
 			<dependency>
 				<groupId>org.apache.poi</groupId>
 				<artifactId>poi-ooxml</artifactId>
 				<version>${poi.version}</version>
 			</dependency>
-			
+
 			<!--velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
-	        <dependency>
-	            <groupId>org.apache.velocity</groupId>
-	            <artifactId>velocity</artifactId>
-	            <version>${velocity.version}</version>
-	        </dependency>
-	        
-	        <!-- 闃块噷JSON瑙ｆ瀽鍣� -->
+			<dependency>
+				<groupId>org.apache.velocity</groupId>
+				<artifactId>velocity</artifactId>
+				<version>${velocity.version}</version>
+			</dependency>
+
+			<!-- 闃块噷JSON瑙ｆ瀽鍣� -->
 			<dependency>
 				<groupId>com.alibaba</groupId>
 				<artifactId>fastjson</artifactId>
 				<version>${fastjson.version}</version>
 			</dependency>
 
-			<!-- ARJ21-->
+			<!-- ARJ21 -->
 			<dependency>
 				<groupId>cn.com.infosouth</groupId>
 				<artifactId>infosouth-arj21</artifactId>
 				<version>${infosouth.version}</version>
 			</dependency>
 
-            <!-- 瀹氭椂浠诲姟-->
+			<!-- 瀹氭椂浠诲姟 -->
 			<dependency>
 				<groupId>cn.com.infosouth</groupId>
 				<artifactId>infosouth-quartz</artifactId>
 				<version>${infosouth.version}</version>
 			</dependency>
-	
-			<!-- 浠ｇ爜鐢熸垚-->
+
+			<!-- 浠ｇ爜鐢熸垚 -->
 			<dependency>
 				<groupId>cn.com.infosouth</groupId>
 				<artifactId>infosouth-generator</artifactId>
 				<version>${infosouth.version}</version>
 			</dependency>
-			
-			<!-- 鏍稿績妯″潡-->
+
+			<!-- 鏍稿績妯″潡 -->
 			<dependency>
 				<groupId>cn.com.infosouth</groupId>
 				<artifactId>infosouth-framework</artifactId>
 				<version>${infosouth.version}</version>
 			</dependency>
-			
-	        <!-- 绯荤粺妯″潡-->
+
+			<!-- 绯荤粺妯″潡 -->
 			<dependency>
 				<groupId>cn.com.infosouth</groupId>
 				<artifactId>infosouth-system</artifactId>
 				<version>${infosouth.version}</version>
 			</dependency>
-			
-			<!-- 閫氱敤宸ュ叿-->
-	        <dependency>
-	            <groupId>cn.com.infosouth</groupId>
-	            <artifactId>infosouth-common</artifactId>
-	            <version>${infosouth.version}</version>
-	        </dependency>
-	        
-        </dependencies>
-    </dependencyManagement>
 
-    <modules>
-	    <module>infosouth-admin</module>
+			<!-- 閫氱敤宸ュ叿 -->
+			<dependency>
+				<groupId>cn.com.infosouth</groupId>
+				<artifactId>infosouth-common</artifactId>
+				<version>${infosouth.version}</version>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
+	<modules>
+		<module>infosouth-admin</module>
 		<module>infosouth-framework</module>
 		<module>infosouth-system</module>
 		<module>infosouth-quartz</module>
 		<module>infosouth-generator</module>
-        <module>infosouth-common</module>
 		<module>infosouth-arj21</module>
+		<module>infosouth-common</module>
 	</modules>
-    <packaging>pom</packaging>
+	<packaging>pom</packaging>
 
 
 	<dependencies>
 
-		 
+
 
 	</dependencies>
 
 	<build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
+					<encoding>${project.build.sourceEncoding}</encoding>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 	<repositories>
 		<repository>