diff --git a/infosouth-admin/pom.xml b/infosouth-admin/pom.xml
index ead7216a1..f81a20dac 100644
--- a/infosouth-admin/pom.xml
+++ b/infosouth-admin/pom.xml
@@ -72,6 +72,12 @@
cn.com.infosouth
infosouth-generator
+
+
+
+ cn.com.infosouth
+ infosouth-arj21
+
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 2ca9a958b..d07e3ab01 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
@@ -26,24 +26,6 @@ import cn.com.infosouth.common.utils.StringUtils;
@Controller
public class SysLoginController extends BaseController
{
- @GetMapping("/login")
- public String login(ModelMap mmap2)
- {
- // 如果是Ajax请求,返回Json字符串。
- //HttpServletRequest request, HttpServletResponse response,
- // if (ServletUtils.isAjaxRequest(request))
- // {
- // return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
- //
- // }
- mmap2.put("sysName", Global.getName());
- mmap2.put("sysWelcome", Global.getWelcomeDesc());
- mmap2.put("sysBaba", Global.getBaba());
- mmap2.put("copyrightYear", Global.getCopyrightYear());
- mmap2.put("sysVersion", Global.getVersion());
- return "login";
- }
-
@GetMapping("/login-old")
public String loginOld(HttpServletRequest request, HttpServletResponse response)
{
@@ -56,6 +38,24 @@ public class SysLoginController extends BaseController
return "login-old";
}
+ @GetMapping("/login")
+ public String login(ModelMap mmap)
+ {
+ // 如果是Ajax请求,返回Json字符串。
+ //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());
+ return "login";
+ }
+
@PostMapping("/login")
@ResponseBody
public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
diff --git a/infosouth-admin/src/main/resources/application.yml b/infosouth-admin/src/main/resources/application.yml
index 6a596aaa2..f46875217 100644
--- a/infosouth-admin/src/main/resources/application.yml
+++ b/infosouth-admin/src/main/resources/application.yml
@@ -129,4 +129,4 @@ xss:
# 排除链接(多个用逗号分隔)
excludes: /system/notice/*
# 匹配链接
- urlPatterns: /system/*,/monitor/*,/tool/*
+ urlPatterns: /system/*,/monitor/*,/tool/*,/arj21/*
diff --git a/infosouth-admin/src/main/resources/templates/index.html b/infosouth-admin/src/main/resources/templates/index.html
index f0180ef69..0e21f5e2e 100644
--- a/infosouth-admin/src/main/resources/templates/index.html
+++ b/infosouth-admin/src/main/resources/templates/index.html
@@ -234,7 +234,7 @@
th:src="@{/system/main}" frameborder="0" seamless>
diff --git a/infosouth-arj21/pom.xml b/infosouth-arj21/pom.xml
new file mode 100644
index 000000000..4bd46bd2d
--- /dev/null
+++ b/infosouth-arj21/pom.xml
@@ -0,0 +1,22 @@
+
+
+
+ amas.comac
+ cn.com.infosouth
+ 4.1.0
+
+ 4.0.0
+
+ infosouth-arj21
+
+ 商飞客服虚拟机型数据库业务层
+
+
+
+ cn.com.infosouth
+ infosouth-common
+
+
+
\ No newline at end of file
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
new file mode 100644
index 000000000..b099aaf8f
--- /dev/null
+++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/CsvManagerController.java
@@ -0,0 +1,40 @@
+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.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.subject.Subject;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("/arj21/csvmanager")
+public class CsvManagerController extends BaseController {
+ private String prefix = "arj21/csvmanager";
+
+ @GetMapping("/infoFlight")
+ public String list(ModelMap mmap)
+ {
+ // 如果是Ajax请求,返回Json字符串。
+ //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());
+ return prefix + "/list";
+ }
+}
diff --git a/infosouth-arj21/src/main/resources/templates.arj21/csvmanager/list.html b/infosouth-arj21/src/main/resources/templates.arj21/csvmanager/list.html
new file mode 100644
index 000000000..ed43ff6d0
--- /dev/null
+++ b/infosouth-arj21/src/main/resources/templates.arj21/csvmanager/list.html
@@ -0,0 +1,10 @@
+
+
+
+
+ csvmanager-infoflight
+
+
+infoflight---哈哈哈~
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 18b1892eb..27f8d44f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,14 @@
fastjson
${fastjson.version}
-
+
+
+
+ cn.com.infosouth
+ infosouth-arj21
+ ${infosouth.version}
+
+
cn.com.infosouth
@@ -213,7 +220,8 @@
infosouth-quartz
infosouth-generator
infosouth-common
-
+ infosouth-arj21
+
pom