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

新增arj21项目

This commit is contained in:
tiny 2020-03-04 14:25:36 +08:00
parent f42ef091f4
commit ee30354ce7
8 changed files with 108 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infosouth-admin/pom.xml
View File

@ -72,6 +72,12 @@
<groupId>cn.com.infosouth</groupId>
<artifactId>infosouth-generator</artifactId>
</dependency>
<!-- 虚拟机型数据库 -->
<dependency>
<groupId>cn.com.infosouth</groupId>
<artifactId>infosouth-arj21</artifactId>
</dependency>
</dependencies>

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

@ -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)

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

@ -129,4 +129,4 @@ xss:
# 排除链接（多个用逗号分隔）
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
urlPatterns: /system/*,/monitor/*,/tool/*,/arj21/*

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

@ -234,7 +234,7 @@
th:src="@{/system/main}" frameborder="0" seamless></iframe>
</div>
<div class="footer">
<div class="pull-right">Copyright © [[${copyrightYear}]] Powered By Infosouth ${{sysVersion}}</div>
<div class="pull-right">Copyright © [[${copyrightYear}]] Powered By Infosouth [[${sysVersion}]]</div>
</div>
</div>
<!--右侧部分结束-->

22
infosouth-arj21/pom.xml Normal file
View File

@ -0,0 +1,22 @@
<?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">
<parent>
<artifactId>amas.comac</artifactId>
<groupId>cn.com.infosouth</groupId>
<version>4.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>infosouth-arj21</artifactId>
<description>商飞客服虚拟机型数据库业务层</description>
<dependencies>
<dependency>
<groupId>cn.com.infosouth</groupId>
<artifactId>infosouth-common</artifactId>
</dependency>
</dependencies>
</project>

40
infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/CsvManagerController.java Normal file
View File

@ -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";
}
}

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

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

12
pom.xml
View File

@ -167,7 +167,14 @@
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!-- ARJ21-->
<dependency>
<groupId>cn.com.infosouth</groupId>
<artifactId>infosouth-arj21</artifactId>
<version>${infosouth.version}</version>
</dependency>
<!-- 定时任务-->
<dependency>
<groupId>cn.com.infosouth</groupId>
@ -213,7 +220,8 @@
<module>infosouth-quartz</module>
<module>infosouth-generator</module>
<module>infosouth-common</module>
</modules>
<module>infosouth-arj21</module>
</modules>
<packaging>pom</packaging>