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 0ee6d77b6..cd18dddac 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 @@ -33,11 +33,28 @@ public class SysIndexController extends BaseController List menus = menuService.selectMenusByUser(user); mmap.put("menus", menus); mmap.put("user", user); + mmap.put("sysName", Global.getName()); + mmap.put("sysVersion", Global.getVersion()); mmap.put("copyrightYear", Global.getCopyrightYear()); mmap.put("demoEnabled", Global.isDemoEnabled()); return "index"; } + // 系统首页（old） + @GetMapping("/index-old") + public String index2(ModelMap mmap) + { + // 取身份信息 + SysUser user = ShiroUtils.getSysUser(); + // 根据用户id取出菜单 + List menus = menuService.selectMenusByUser(user); + mmap.put("menus", menus); + mmap.put("user", user); + mmap.put("copyrightYear", Global.getCopyrightYear()); + mmap.put("demoEnabled", Global.isDemoEnabled()); + return "index-old"; + } + // 切换主题 @GetMapping("/system/switchSkin") public String switchSkin(ModelMap mmap) 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 ebd3773be..2ca9a958b 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 @@ -2,11 +2,14 @@ package cn.com.infosouth.web.controller.system; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import cn.com.infosouth.common.config.Global; 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.ResponseBody; @@ -24,7 +27,25 @@ import cn.com.infosouth.common.utils.StringUtils; public class SysLoginController extends BaseController { @GetMapping("/login") - public String login(HttpServletRequest request, HttpServletResponse response) + 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) { // 如果是Ajax请求，返回Json字符串。 if (ServletUtils.isAjaxRequest(request)) @@ -32,7 +53,7 @@ public class SysLoginController extends BaseController return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}"); } - return "login"; + return "login-old"; } @PostMapping("/login") diff --git a/infosouth-admin/src/main/resources/application.yml b/infosouth-admin/src/main/resources/application.yml index a4c7a00c5..6a596aaa2 100644 --- a/infosouth-admin/src/main/resources/application.yml +++ b/infosouth-admin/src/main/resources/application.yml @@ -1,7 +1,9 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi + name: ARJ21-700飞机参考机型虚拟数据库 + welcomeDesc: "ARJ21-700飞机 参考机型虚拟数据库" + baba: 中国商飞 # 版本 version: 4.1.0 # 版权年份 @@ -61,9 +63,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 300MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 2000MB # 服务模块 devtools: restart: diff --git a/infosouth-admin/src/main/resources/banner.txt b/infosouth-admin/src/main/resources/banner.txt index 263924d26..5c086f757 100644 --- a/infosouth-admin/src/main/resources/banner.txt +++ b/infosouth-admin/src/main/resources/banner.txt @@ -1,7 +1,11 @@ Application Version: ${ruoyi.version} Spring Boot Version: ${spring-boot.version} -//////////////////////////////////////////////////////////////////// -╔═╗╔╦╗╔═╗╔═╗ ╔═╗╔═╗╔╦╗╔═╗╔═╗ -╠═╣║║║╠═╣╚═╗ ║ ║ ║║║║╠═╣║ -╩ ╩╩ ╩╩ ╩╚═╝ o ╚═╝╚═╝╩ ╩╩ ╩╚═╝ -//////////////////////////////////////////////////////////////////// \ No newline at end of file +/////////////////////////////////////////////////////////////////////////////////// + __ __ _____ _____ ____ __ __ _____ + /\ | \/ | /\ / ____| / ____/ __ \| \/ | /\ / ____| + / \ | \ / | / \ | (___ | | | | | | \ / | / \ | | + / /\ \ | |\/| | / /\ \ \___ \ | | | | | | |\/| | / /\ \| | + / ____ \| | | |/ ____ \ ____) | | |___| |__| | | | |/ ____ | |____ + /_/ \_|_| |_/_/ \_|_____/ \_____\____/|_| |_/_/ \_\_____| + +/////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/static/comac.png b/infosouth-admin/src/main/resources/static/comac.png new file mode 100644 index 000000000..ec3a198ec Binary files /dev/null and b/infosouth-admin/src/main/resources/static/comac.png differ diff --git a/infosouth-admin/src/main/resources/templates/index-old.html b/infosouth-admin/src/main/resources/templates/index-old.html new file mode 100644 index 000000000..cdfe16e83 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/index-old.html @@ -0,0 +1,316 @@ + + + + + + + 若依系统首页 + + + + + + + + + + + +
+ + + + + + +
+
+ +
+
+ + + + 刷新 +
+ + + +
+ +
+
+
© [[${copyrightYear}]] RuoYi Copyright
+
+
+ +
+ + + + + + + + + + + + + + + diff --git a/infosouth-admin/src/main/resources/templates/index.html b/infosouth-admin/src/main/resources/templates/index.html index cdfe16e83..f0180ef69 100644 --- a/infosouth-admin/src/main/resources/templates/index.html +++ b/infosouth-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 若依系统首页 + ${{sysName}}-首页 @@ -234,7 +234,7 @@ th:src="@{/system/main}" frameborder="0" seamless>
-
© [[${copyrightYear}]] RuoYi Copyright
+
Copyright © [[${copyrightYear}]] Powered By Infosouth ${{sysVersion}}
diff --git a/infosouth-admin/src/main/resources/templates/login-old.html b/infosouth-admin/src/main/resources/templates/login-old.html new file mode 100644 index 000000000..7344bc1f6 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/login-old.html @@ -0,0 +1,87 @@ + + + + + + + 登录系统 + + + + + + + + + + + + + + + + + +
+
+
+ +
+
+
+

登录：

+

你若不离不弃，我必生死相依

+ + +
+
+ +
+
+ + + +
+
+
+ +
+ +
+
+
+ +
+ + + + + + + + + + + + + diff --git a/infosouth-admin/src/main/resources/templates/login.html b/infosouth-admin/src/main/resources/templates/login.html index 8971e6f55..6c658a5b1 100644 --- a/infosouth-admin/src/main/resources/templates/login.html +++ b/infosouth-admin/src/main/resources/templates/login.html @@ -4,8 +4,8 @@ - 登录若依系统 - + [[${sysName}]] 登录 + @@ -29,24 +29,17 @@
-

登录：

-

你若不离不弃，我必生死相依

+

登录

+

>>请注意数据保密

@@ -68,7 +61,7 @@
diff --git a/infosouth-admin/src/main/resources/templates/main.html b/infosouth-admin/src/main/resources/templates/main.html index f76d45ec0..7ec0d015b 100644 --- a/infosouth-admin/src/main/resources/templates/main.html +++ b/infosouth-admin/src/main/resources/templates/main.html @@ -4,7 +4,7 @@ - 若依介绍 + 介绍 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 8f8e9cd2e..4abadf2a4 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 @@ -15,6 +15,12 @@ public class Global /** 项目名称 */ private static String name; + /** 欢迎词 **/ + private static String welcomeDesc; + + /** 甲方爸爸 **/ + private static String baba; + /** 版本 */ private static String version; @@ -40,6 +46,22 @@ public class Global Global.name = name; } + public static String getWelcomeDesc() { + return welcomeDesc; + } + + public static void setWelcomeDesc(String welcomeDesc) { + Global.welcomeDesc = welcomeDesc; + } + + public static String getBaba() { + return baba; + } + + public static void setBaba(String baba) { + Global.baba = baba; + } + public static String getVersion() { return version; diff --git a/infosouth-framework/src/main/java/cn/com/infosouth/framework/config/ShiroConfig.java b/infosouth-framework/src/main/java/cn/com/infosouth/framework/config/ShiroConfig.java index 7b82add32..8cb67a399 100644 --- a/infosouth-framework/src/main/java/cn/com/infosouth/framework/config/ShiroConfig.java +++ b/infosouth-framework/src/main/java/cn/com/infosouth/framework/config/ShiroConfig.java @@ -242,6 +242,7 @@ public class ShiroConfig // 对静态资源设置匿名访问 filterChainDefinitionMap.put("/favicon.ico**", "anon"); filterChainDefinitionMap.put("/ruoyi.png**", "anon"); + filterChainDefinitionMap.put("/comac.png**", "anon"); filterChainDefinitionMap.put("/css/**", "anon"); filterChainDefinitionMap.put("/docs/**", "anon"); filterChainDefinitionMap.put("/fonts/**", "anon");