From 14e6a1798e2c84ad40b5e15a344823e35895ebc6 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期一, 07 七月 2025 18:03:41 +0800 Subject: [PATCH] 修改登录页面和Swagger --- se-system/src/main/java/com/terra/system/config/PropertiesConfig.java | 4 se-system/src/main/resources/static/html/login.html | 2 se-system/pom.xml | 16 + pom.xml | 2 se-system/src/main/java/com/terra/system/controller/all/SignController.java | 2 se-system/src/main/resources/templates/monitor.html | 2 se-system/src/main/resources/application-test.yml | 6 se-system/src/main/resources/templates/login.html | 6 /dev/null | 368 ---------------------------------------------- se-system/src/main/resources/templates/druid.html | 2 se-system/src/main/resources/templates/index.html | 2 se-system/src/main/java/com/terra/system/config/SwaggerConfig.java | 12 + se-system/src/main/java/com/terra/system/config/WebConfig.java | 3 13 files changed, 44 insertions(+), 383 deletions(-) diff --git a/pom.xml b/pom.xml index 0593698..209453b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <tobato.version>1.27.2</tobato.version> <kaptcha.version>2.3.3</kaptcha.version> <pagehelper.boot.version>2.0.0</pagehelper.boot.version> - <druid.version>1.2.23</druid.version> +<!-- <druid.version>1.2.23</druid.version>--> <dynamic-ds.version>4.3.1</dynamic-ds.version> <commons.io.version>2.19.0</commons.io.version> <velocity.version>2.3</velocity.version> diff --git a/se-system/pom.xml b/se-system/pom.xml index a255572..98a2fe3 100644 --- a/se-system/pom.xml +++ b/se-system/pom.xml @@ -43,6 +43,13 @@ <artifactId>spring-boot-starter-web</artifactId> </dependency> + <!--thymeleaf--> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-thymeleaf</artifactId> +<!-- <version>2.2.2.RELEASE</version>--> + </dependency> + <!--lombok--> <dependency> <groupId>org.projectlombok</groupId> @@ -144,7 +151,14 @@ <dependency> <groupId>com.github.oshi</groupId> <artifactId>oshi-core</artifactId> - <version>4.4.2</version> + <version>6.8.0</version> + </dependency> + + <!--hutool--> + <dependency> + <groupId>cn.hutool</groupId> + <artifactId>hutool-all</artifactId> + <version>5.7.20</version> </dependency> <!--commons-fileupload--> diff --git a/se-system/src/main/java/com/terra/system/config/PropertiesConfig.java b/se-system/src/main/java/com/terra/system/config/PropertiesConfig.java index 2a9f713..bbcd1ca 100644 --- a/se-system/src/main/java/com/terra/system/config/PropertiesConfig.java +++ b/se-system/src/main/java/com/terra/system/config/PropertiesConfig.java @@ -19,10 +19,10 @@ @Value("${sys.path.temp}") private String tempPath; - // @Value("${spring.datasource.druid.stat-view-servlet.login-username}") + @Value("${spring.datasource.druid.stat-view-servlet.login-username}") private String druidUser; - // @Value("${spring.datasource.druid.stat-view-servlet.login-password}") + @Value("${spring.datasource.druid.stat-view-servlet.login-password}") private String druidPwd; @Value("${sys.tile_path}") diff --git a/se-system/src/main/java/com/terra/system/config/SwaggerConfig.java b/se-system/src/main/java/com/terra/system/config/SwaggerConfig.java index 65574a8..b91d361 100644 --- a/se-system/src/main/java/com/terra/system/config/SwaggerConfig.java +++ b/se-system/src/main/java/com/terra/system/config/SwaggerConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; @@ -11,6 +12,7 @@ import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -21,6 +23,9 @@ @Configuration @EnableSwagger2 public class SwaggerConfig { + @Resource + Environment env; + private List<ApiKey> securitySchemes() { List<ApiKey> apiKeys = new ArrayList<ApiKey>(); apiKeys.add(new ApiKey("Authorization", "token", "header")); @@ -49,8 +54,13 @@ @Bean public Docket createRestApi() { + String swaggerEnable = env.getProperty("sys.swaggerEnable"); + boolean enable = "true".equals(swaggerEnable); + return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(apiInfo()).select() + .enable(enable) + .apiInfo(apiInfo()) + .select() .apis(RequestHandlerSelectors.basePackage("com.terra.system.controller")) //.securitySchemes(securitySchemes()) //.securityContexts(securityContexts()) diff --git a/se-system/src/main/java/com/terra/system/config/WebConfig.java b/se-system/src/main/java/com/terra/system/config/WebConfig.java index c3d5896..2ebce58 100644 --- a/se-system/src/main/java/com/terra/system/config/WebConfig.java +++ b/se-system/src/main/java/com/terra/system/config/WebConfig.java @@ -13,6 +13,7 @@ import org.springframework.web.servlet.config.annotation.*; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.List; /** @@ -104,7 +105,7 @@ //SerializerFeature.PrettyFormat); converter.setFastJsonConfig(config); - converter.setDefaultCharset(Charset.forName("UTF-8")); + converter.setDefaultCharset(StandardCharsets.UTF_8); converters.add(converter); } } diff --git a/se-system/src/main/java/com/terra/system/controller/all/SignController.java b/se-system/src/main/java/com/terra/system/controller/all/SignController.java index 5c5f8d7..ab70102 100644 --- a/se-system/src/main/java/com/terra/system/controller/all/SignController.java +++ b/se-system/src/main/java/com/terra/system/controller/all/SignController.java @@ -65,7 +65,7 @@ UserEntity ue = tokenService.getCurrentUser(req); if (ue != null) { - mv.addObject("msg", "Hello " + ue.getUname() + " !"); + mv.addObject("msg", "Hello锛�" + ue.getUname() + " 锛�"); } return mv; diff --git a/se-system/src/main/resources/application-test.yml b/se-system/src/main/resources/application-test.yml index 9bc4189..79d51c4 100644 --- a/se-system/src/main/resources/application-test.yml +++ b/se-system/src/main/resources/application-test.yml @@ -9,6 +9,8 @@ context-path: / spring: + application: + name: se-system # redis redis: database: 0 @@ -122,6 +124,8 @@ # 绯荤粺閰嶇疆 sys: + # 鍚敤swagger + swaggerEnable: true # 鑷姩鏌ヨ autoQuery: 0 # 绠$悊鍛業D @@ -151,4 +155,4 @@ exePath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/Bin/MxCAD/Release/mxcadassembly.exe targetPath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/SRC/TsWeb/public/data # 涓婁紶闄勪欢琛� - attachTabs: bd.b_pac_hydrogeology,bd.b_pac_frozensoil,bd.b_pac_geologic_hazard,bd.b_pac_marine_meteorological,bd.b_pac_meteorological,bs.m_equipment_nameplate,bs.m_hydraulic_protection,bs.m_marker,bs.s_explorationpoint,bs.u_sectionline \ No newline at end of file + attachTabs: bd.b_pac_hydrogeology,bd.b_pac_frozensoil diff --git a/se-system/src/main/resources/static/html/login.html b/se-system/src/main/resources/static/html/login.html index 74beba9..0801e53 100644 --- a/se-system/src/main/resources/static/html/login.html +++ b/se-system/src/main/resources/static/html/login.html @@ -1,7 +1,7 @@ 锘�<!DOCTYPE> <html> <head> - <title>绠¢亾鍩虹澶ф暟鎹钩鍙版湇鍔�-鐧诲綍</title> + <title>绯荤粺鏈嶅姟-鐧诲綍</title> <meta http-equiv="Expires" content="0" /> <meta http-equiv="Cache" content="no-cache" /> <meta http-equiv="Pragma" content="no-cache" /> diff --git a/se-system/src/main/resources/templates/druid.html b/se-system/src/main/resources/templates/druid.html index 85f890e..50730f0 100644 --- a/se-system/src/main/resources/templates/druid.html +++ b/se-system/src/main/resources/templates/druid.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> - <title>绠¢亾鍩虹澶ф暟鎹钩鍙版湇鍔�-鏁版嵁搴撶洃鎺�</title> + <title>绯荤粺鏈嶅姟-鏁版嵁搴撶洃鎺�</title> <script> location.href = "../druid/index.html"; </script> diff --git a/se-system/src/main/resources/templates/index.html b/se-system/src/main/resources/templates/index.html index 85fc5f3..341681f 100644 --- a/se-system/src/main/resources/templates/index.html +++ b/se-system/src/main/resources/templates/index.html @@ -2,7 +2,7 @@ <html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <head> <meta charset="UTF-8"> - <title>绠¢亾鍩虹澶ф暟鎹钩鍙版湇鍔�-棣栭〉</title> + <title>绯荤粺鏈嶅姟-棣栭〉</title> <script src="../js/jquery.min.js"></script> <script> window.onload = function () { diff --git a/se-system/src/main/resources/templates/login.html b/se-system/src/main/resources/templates/login.html index 4922d38..cd2700f 100644 --- a/se-system/src/main/resources/templates/login.html +++ b/se-system/src/main/resources/templates/login.html @@ -1,7 +1,7 @@ 锘�<!DOCTYPE> <html> <head> - <title>绠¢亾鍩虹澶ф暟鎹钩鍙版湇鍔�-鐧诲綍</title> + <title>绯荤粺鏈嶅姟-鐧诲綍</title> <meta http-equiv="Expires" content="0" /> <meta http-equiv="Cache" content="no-cache" /> <meta http-equiv="Pragma" content="no-cache" /> @@ -62,9 +62,9 @@ </form> </div> - <div class="title"> + <!--<div class="title"> <img src="../images/login/lg_03.png" alt=""/> - </div> + </div>--> <script src='../js/earth/dat.gui.min.js'></script> <script src='../js/earth/Stats.js'></script> diff --git a/se-system/src/main/resources/templates/login_old.html b/se-system/src/main/resources/templates/login_old.html deleted file mode 100644 index 4229e48..0000000 --- a/se-system/src/main/resources/templates/login_old.html +++ /dev/null @@ -1,368 +0,0 @@ -<!DOCTYPE> -<html> -<head> - <title>绠¢亾鍩虹澶ф暟鎹钩鍙版湇鍔�-鐧诲綍</title> - <meta charset="utf-8" /> - <meta http-equiv="pragma" content="no-cache" /> - <meta http-equiv="cache-control" content="no-cache" /> - <meta http-equiv="expires" content="0" /> - <link href="../favicon.ico" rel="icon" type="image/x-icon" /> - <link href="../css/style.css" rel="stylesheet" /> - <script src="../js/jquery.min.js"></script> - <script src="../js/jquery.cookie.min.js"></script> - <script src="../js/zxcvbn.js"></script> - <script src="../js/rsa.min.js"></script> -</head> -<body style="background-color: #0059cf; overflow-y: hidden !important;"> - <form method="post" id="fm1" class="fm-v clearfix" action="/sign/login"> - <div class="loginheader" style='display: none;'> - <span class="loginname">鍗曠偣鐧诲綍</span> - <img class="devline" src="../images/login/loginline.png" /><span class="lognameE">Log in</span> - </div> - <div id="topBg" style="background-color: #1a65c9; height: 30%; display: none;"></div> - <div id='div_middle' class="loginmain"> - <div id='div_loginTitle' class="logintitle" style="display: none;"></div> - <div id="topBgColor" style="background-color: #1a65c9; height: 19%; display: none;"></div> - <div id='div_loginBox' class="logintable"> - <div id="loginBox_Title" style="height: 60px; line-height: 60px;"> - <span style="color: #fff; font-size: 50px; font-family: initial; font-weight: 700;">鐢ㄦ埛鐧诲綍</span> - </div> - <!-- 鐢ㄦ埛鍚� --> - <div class="loginid" style='width: 400px; margin-right: 50px; margin-top: 45px; border-bottom: 1px solid #fff;'> - <label for="username"></label> - <input class="required" id="username" placeholder="璇疯緭鍏ョ敤鎴峰悕" size="20" tabindex="1" - type="text" accesskey="n" autocomplete="off" name="username" value="admin" /> - </div> - <!-- 瀵嗙爜 --> - <section> - <div class="loginpwd" style='width: 400px; margin-right: 20px; margin-top: 30px; border-bottom: 1px solid #fff;'> - <label for="password"></label> - <input class="required" placeholder="璇疯緭鍏ュ瘑鐮�" type="password" id="password" size="20" tabindex="2" - accesskey="p" autocomplete="off" name="password" value="Admin@1234_lf" /><span id="capslock-on" style="display: none;"> - <i class="fa fa-exclamation-circle"></i> - <span>CAPSLOCK key is turned on!</span> - </span> - </div> - </section> - <section class="row check"> - </section> - <!-- 楠岃瘉鐮� --> - <section> - <div class="loginvalifield" style="width: 400px; margin-right: 20px; margin-top: 30px; border-bottom: 1px solid #fff;"> - <div class="loginvalicode"> - <label for="inputCode"></label> - <input id="inputCode" placeholder="璇疯緭鍏ラ獙璇佺爜" name="inputCode" class="required" tabindex="3" accesskey="v" type="text" value="" size="35" autocomplete="off" maxlength="6"> - </div> - <span class="code" id="checkCode" onclick="createCode()"></span> - </div> - </section> - <section> - <div id="eMsg" style="color: red; height: 40px; line-height: 40px; font-size: 15px; margin-bottom: -20px; margin-left: 45px;"></div> - </section> - <!-- 鐧诲綍鎸夐挳 --> - <section> - <input class="loginbtn" style="margin-top: 25px;" name="submit" accesskey="l" value="" tabindex="5" type="button" onclick="sysLogin();"> - </section> - </div> - </div> - <div id='div_foot' style="display: none;"> - <span>鎶�鏈敮鎸侊細鍥藉娴锋磱淇℃伅涓績</span> - </div> - </form> - <script> - var code; - function createCode() { - code = ""; - var codeLength = 4; //楠岃瘉鐮佺殑闀垮害 - var checkCode = document.getElementById("checkCode"); - /* var codeChars = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'); */ - var codeChars = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9); - for (var i = 0; i < codeLength; i++) { - var charNum = Math.floor(Math.random() * 10); - code += codeChars[charNum]; - } - if (checkCode) { - checkCode.className = "code"; - checkCode.innerHTML = code; - } - } - - var leftoffset = 474; - - // 绂佹鍦╥frame鎵撳紑 - function noIframe() { - if (top.location != self.location) { - window.top.location = self.location.href.split("?")[0]; - } - } - - function autoResize() { - var div_obj = document.getElementById("div_middle"); - //瀹藉害鑷�傚簲 - var fullWidth = document.body.offsetWidth; - var div_loginBox = document.getElementById("div_loginBox"); - var boxWidth = div_loginBox.offsetWidth; - var myWidth = div_obj.offsetWidth; - //if (fullWidth > 1920) { fullWidth = 1920; } - - var winWidht = window.innerWidth; - var winHeight = window.innerHeight - 100; - var bgHeight = 1080; - winWidht += 150; - if (winWidht >= 1920) { - $("#div_middle").css("background", "url(../images/NewGJXJlogin/1920/2bg.jpg) no-repeat").css("background-position", "center bottom").css("height", "800px"); - $("#div_middle").css("height", "980px"); - $(".logintable").css("margin-top", "170px"); - div_loginBox.style.left = ((fullWidth - 410) / 2 + 474) + "px"; - bgHeight = 980; //1080 - } else if (winWidht >= 1600) { - $("#div_middle").css("background", "url(../images/NewGJXJlogin/1600/2bg.jpg) no-repeat").css("background-position", "center bottom").css("height", "800px"); - $("#loginBox_Title span").css("font-size", "40px"); - $(".loginid").css("margin-top", "35px").css("height", "45px").css("width", "350px").css("background", "url(../images/NewGJXJlogin/1600/user.png) no-repeat").css("background-position", "3% 40%"); - $(".loginid input").css("width", "306px").css("margin-left", "45px").css("font-size", "18px"); - $(".loginpwd").css("margin-top", "20px").css("height", "45px").css("width", "350px").css("background", "url(../images/NewGJXJlogin/1600/password.png) no-repeat").css("background-position", "3% 40%"); - $(".loginpwd input").css("width", "306px").css("margin-left", "45px").css("font-size", "18px"); - $(".loginvalicode").css("height", "45px").css("width", "270px").css("background", "url(../images/NewGJXJlogin/1600/code.png) no-repeat").css("background-position", "4.5% 40%"); - $(".loginvalicode input").css("width", "215px").css("margin-left", "49px").css("font-size", "18px"); - $(".loginvalifield").css("margin-top", "20px").css("width", "350px").css("height", "45px"); - $("#inputCode").css("margin-left", "46px"); - $(".logintable").css("margin-top", "113px").css("width", "350px").css("height", "470px"); - //$(".logintable").css("margin-top", "210px").css("width", "350px").css("height", "470px"); - $("#carLink div").css("background", "url(../images/NewGJXJlogin/1600/add.png) no-repeat").css("background-position", "3% 40%"); - $("#carLink a").css("margin-left", "50px").css("font-size", "16px"); - $(".loginbtn").css("margin-top", "25px"); - leftoffset = 404; - bgHeight = 800; //900 - div_loginBox.style.left = ((fullWidth - 360) / 2 + leftoffset) + "px"; - } else if (winWidht >= 1440) { - $("#div_middle").css("background", "url(../images/NewGJXJlogin/1440/2bg.jpg) no-repeat").css("background-position", "center bottom").css("height", "810px"); - $("#loginBox_Title").css("height", "50px").css("line-height", "50px"); - $("#loginBox_Title span").css("font-size", "36px"); - $(".loginid").css("margin-top", "20px").css("height", "45px").css("width", "320px").css("background", "url(../images/NewGJXJlogin/1440/user.png) no-repeat").css("background-position", "3% 40%"); - $(".loginid input").css("width", "276px").css("margin-left", "45px").css("font-size", "16px"); - $(".loginpwd").css("margin-top", "20px").css("height", "45px").css("width", "320px").css("background", "url(../images/NewGJXJlogin/1440/password.png) no-repeat").css("background-position", "3% 40%"); - $(".loginpwd input").css("width", "276px").css("margin-left", "45px").css("font-size", "16px"); - $(".loginvalicode").css("height", "45px").css("width", "240px").css("background", "url(../images/NewGJXJlogin/1440/code.png) no-repeat").css("background-position", "4.5% 40%"); - $(".loginvalicode input").css("width", "185px").css("margin-left", "49px").css("font-size", "16px"); - $(".loginvalifield").css("margin-top", "20px").css("width", "320px").css("height", "45px"); - $(".logintable").css("margin-top", "201px").css("width", "320px").css("height", "420px"); - $("#carLink div").css("background", "url(../images/NewGJXJlogin/1440/add.png) no-repeat").css("background-position", "3.5% 40%").css("margin-top", "25px").css("height", "30px").css("line-height", "30px"); - $("#carLink a").css("margin-left", "50px").css("font-size", "16px"); - $(".loginbtn").css("margin-top", "25px").css("height", "50px"); - leftoffset = 357; - bgHeight = 810; - div_loginBox.style.left = ((fullWidth - 320) / 2 + leftoffset) + "px"; - } else if (winWidht >= 1366) { - $("#div_middle").css("background", "url(../images/NewGJXJlogin/1366/2bg.jpg) no-repeat").css("background-position", "center bottom").css("height", "668px"); - $("#loginBox_Title").css("height", "50px").css("line-height", "50px"); - $("#loginBox_Title span").css("font-size", "32px"); - $(".loginid").css("margin-top", "35px").css("height", "40px").css("width", "300px").css("background", "url(../images/NewGJXJlogin/1366/user.png) no-repeat").css("background-position", "3% 50%"); - $(".loginid input").css("width", "256px").css("margin-left", "45px").css("font-size", "14px"); - $(".loginpwd").css("margin-top", "20px").css("height", "40px").css("width", "300px").css("background", "url(../images/NewGJXJlogin/1366/password.png) no-repeat").css("background-position", "3% 50%"); - $(".loginpwd input").css("width", "256px").css("margin-left", "45px").css("font-size", "14px"); - $(".loginvalicode").css("height", "40px").css("width", "220px").css("background", "url(../images/NewGJXJlogin/1366/code.png) no-repeat").css("background-position", "4.5% 50%"); - $(".loginvalicode input").css("width", "165px").css("margin-left", "46px").css("font-size", "14px"); - $(".loginvalifield").css("margin-top", "20px").css("width", "300px").css("height", "40px"); - $(".logintable").css("margin-top", "83px").css("width", "300px").css("height", "390px"); - //$(".logintable").css("margin-top", "135px").css("width", "300px").css("height", "390px"); - $("#carLink div").css("background", "url(../images/NewGJXJlogin/1366/add.png) no-repeat").css("background-position", "3.5% 50%").css("margin-top", "25px").css("height", "30px").css("line-height", "30px"); - $("#carLink a").css("margin-left", "50px").css("font-size", "14px"); - $(".loginbtn").css("margin-top", "10px").css("height", "56px"); - leftoffset = 338; - bgHeight = 668; //731 - div_loginBox.style.left = ((fullWidth - 300) / 2 + leftoffset) + "px"; - } else { - //fullWidth = 1280; - $("#div_middle").css("background", "url(../images/NewGJXJlogin/1280/2bg.jpg) no-repeat").css("background-position", "center bottom").css("height", "620px"); - $("#loginBox_Title").css("height", "50px").css("line-height", "50px"); - $("#loginBox_Title span").css("font-size", "32px"); - $(".loginid").css("margin-top", "27px").css("height", "40px").css("width", "280px").css("background", "url(../images/NewGJXJlogin/1280/user.png) no-repeat").css("background-position", "3% 50%"); - $(".loginid input").css("width", "236px").css("margin-left", "45px").css("font-size", "14px"); - $(".loginpwd").css("margin-top", "20px").css("height", "40px").css("width", "280px").css("background", "url(../images/NewGJXJlogin/1280/password.png) no-repeat").css("background-position", "3% 50%"); - $(".loginpwd input").css("width", "236px").css("margin-left", "45px").css("font-size", "14px"); - $(".loginvalicode").css("height", "40px").css("width", "200px").css("background", "url(../images/NewGJXJlogin/1280/code.png) no-repeat").css("background-position", "4.5% 50%"); - $(".loginvalicode input").css("width", "145px").css("margin-left", "46px").css("font-size", "14px"); - $(".loginvalifield").css("margin-top", "20px").css("width", "280px").css("height", "40px"); - $(".logintable").css("margin-top", "70px").css("width", "280px").css("height", "380px"); - $("#carLink div").css("background", "url(../images/NewGJXJlogin/1280/add.png) no-repeat").css("background-position", "3.5% 50%").css("margin-top", "25px").css("height", "30px").css("line-height", "30px"); - $("#carLink a").css("margin-left", "50px").css("font-size", "14px"); - $(".loginbtn").css("margin-top", "0px").css("height", "50px"); - leftoffset = 314; - bgHeight = 620; - div_loginBox.style.left = ((fullWidth - 280) / 2 + leftoffset) + "px"; - $("body").css("overflow", "hidden"); - } - div_obj.style.width = fullWidth + "px"; - if (winHeight > bgHeight) { - div_obj.style.height = winHeight + "px"; - var marginTop = parseFloat($(".logintable").css("margin-top").replace("px")) + (winHeight - bgHeight); - $(".logintable").css("margin-top", marginTop + "px"); - } - //楂樺害鑷�傚簲 - var fullHeight = document.body.offsetHeight; - var myHeight = div_obj.offsetHeight; - if (fullHeight > myHeight) { - //div_obj.style.marginTop = ((fullHeight - myHeight) / 2) + "px"; - } - var div_loginTitle = document.getElementById("div_loginTitle"); - var titleWidth = div_loginTitle.offsetWidth; - div_loginTitle.style.left = (fullWidth - titleWidth) / 2 + "px"; - } - - window.onload = function () { - noIframe(); - createCode(); - autoResize(); - getPublicKey(); - $(window).on("resize", autoResize); - //document.getElementById('username').focus(); - document.getElementById('inputCode').focus(); - } - </script> - <script> - function getPublicKey() { - $.get("getPublicKey", function (rs) { - if (rs && rs.code == 200) { - window.encrypt = new JSEncrypt(); - encrypt.setPublicKey(rs.result); - } - }); - } - - function sysValidate() { - // 楠岃瘉鐢ㄦ埛鍚嶄笌瀵嗙爜 - var theUsername = document.getElementById("username").value; - if (theUsername.length <= 0) { - $("#eMsg").html("鎻愮ず锛氳杈撳叆鐢ㄦ埛鍚嶏紒"); - $("#username").focus(); - return false; - } - var thePassword = document.getElementById("password").value; - if (thePassword.length <= 0) { - $("#eMsg").html("鎻愮ず锛氳杈撳叆瀵嗙爜锛�"); - $("#password").focus(); - return false; - } - /*if (!isValid(thePassword)) { - $("#eMsg").html("鎻愮ず锛氬瘑鐮佷负8-20浣嶅寘鍚瓧姣嶃�佹暟瀛楀拰鐗规畩瀛楃锛�"); - $("#password").focus(); - return false; - }*/ - - // 楠岃瘉楠岃瘉鐮� - var inputCode = document.getElementById("inputCode").value; - if (inputCode.length <= 0) { - $("#eMsg").html("鎻愮ず锛氳杈撳叆楠岃瘉鐮侊紒"); - $("#inputCode").focus(); - return false; - } - if (inputCode.toUpperCase() != code.toUpperCase()) { - $("#eMsg").html("鎻愮ず锛氶獙璇佺爜杈撳叆鏈夎锛�"); - $("#inputCode").val("").focus(); - createCode(); - return false; - } - - return true; - } - - window.isBusy = false; - - function sysLogin() { - if (isBusy || !sysValidate()) { - return; - } - - isBusy = true; - var username = $.trim($("#username").val()); - var password = $("#password").val(); - var service = getQueryStr("service"); - - var data = { - "uid": encrypt.encrypt(username), - "pwd": encrypt.encrypt(password) - }; - - $.ajax({ - url: "login", - type: "POST", - data: JSON.stringify(data), - dataType: "json", // html銆乯son銆乯sonp銆乻cript銆乼ext - contentType: "application/json", // "application/json", "application/x-www-form-urlencoded", - success: function (rs) { - isBusy = false; - - if (!rs || rs.code !== 200) { - createCode(); - var msg = rs && rs.msg ? rs.msg : "鐧诲綍澶辫触锛�"; - $("#eMsg").html(msg); - return; - } - - if (rs.msg) alert(rs.msg); - - var service = getQueryStr("service"); - if (service) { - service += (service.indexOf("?") > -1 ? "&" : "?") + "token=" + rs.result.token; - location.href = service; - return; - } - - location.href = location.href.replace("/sign/toLogin", "/sign/toIndex"); - }, - error: function (e) { - isBusy = false; - console.error(e); - alert("鐧诲綍鍑洪敊锛岃鑱旂郴绠$悊鍛橈紒"); - } - }); - } - - function ajax(url, type, data, dataType, contentType, fn, efn) { - $.ajax({ - url: url, - type: type, - data: data, - dataType: dataType || "json", // html銆乯son銆乯sonp銆乻cript銆乼ext - contentType: contentType || "application/json", // "application/x-www-form-urlencoded" - success: function (data) { - fn(data); - }, - error: function (e) { - console.error(e); - fn(); - } - }); - } - - // 鑾峰彇URL鍙傛暟 - function getQueryStr(name) { - var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'); - var r = window.location.search.substr(1).match(reg); - if (r != null) { - return decodeURI(r[2]); - } - return null; - } - - document.onkeydown = function (e) { - var ev = window.event || e; - var code = ev.keyCode || ev.which || ev.charCode; - if (code == 13) { - sysLogin(); - } - } - - // 瀵嗙爜鏄惁鍚堣 - function isValid(pwd) { - if (pwd) { - var regex = new RegExp('^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![a-z0-9]+$)(?![a-z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![0-9\W!@#$%^&*`~()\\-_+=,.?;<>]+$)[a-zA-Z0-9\W!@#$%^&*`~()\\-_+=,.?;<>]{12,20}$'); - return regex.test(pwd) - } - return false; - } - </script> -</body> -</html> diff --git a/se-system/src/main/resources/templates/monitor.html b/se-system/src/main/resources/templates/monitor.html index c3343a0..5864a8a 100644 --- a/se-system/src/main/resources/templates/monitor.html +++ b/se-system/src/main/resources/templates/monitor.html @@ -4,7 +4,7 @@ <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>杩愮淮鐩戞帶</title> + <title>绯荤粺鏈嶅姟-杩愮淮鐩戞帶</title> <link rel="stylesheet" href="./css/main/main1.css"> <link rel="stylesheet" href="./css/main/jquery-ui.min.css"> -- Gitblit v1.9.3