From 3b65a5dc04be7cdac460c84ebaa38bf009405128 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 八月 2025 09:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects

---
 玻璃公司项目/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java |  278 +++++++++++++++++++++++++++---------------------------
 1 files changed, 139 insertions(+), 139 deletions(-)

diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java"
index 80fe82f..8ef3e15 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java"
@@ -53,183 +53,183 @@
       _jspx_out = out;
       _jspx_resourceInjector = (org.glassfish.jsp.api.ResourceInjector) application.getAttribute("com.sun.appserv.jsp.resource.injector");
 
-      out.write("\n");
-      out.write("\n");
-      out.write("\n");
-      out.write("\n");
+      out.write("\r\n");
+      out.write("\r\n");
+      out.write("\r\n");
+      out.write("\r\n");
       if (_jspx_meth_c_set_0(_jspx_page_context))
         return;
-      out.write("\n");
-      out.write("\n");
-      out.write("<!DOCTYPE html>\n");
-      out.write("<html>\n");
-      out.write("<head>\n");
-      out.write("  <meta charset=\"utf-8\">\n");
-      out.write("  <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n");
-      out.write("  <title>MES | 鐧诲綍</title>\n");
-      out.write("  <!-- Tell the browser to be responsive to screen width -->\n");
-      out.write("  <meta content=\"width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no\" name=\"viewport\">\n");
-      out.write("  <!-- Bootstrap 3.3.7 -->\n");
+      out.write("\r\n");
+      out.write("\r\n");
+      out.write("<!DOCTYPE html>\r\n");
+      out.write("<html>\r\n");
+      out.write("<head>\r\n");
+      out.write("  <meta charset=\"utf-8\">\r\n");
+      out.write("  <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\r\n");
+      out.write("  <title>MES | 鐧诲綍</title>\r\n");
+      out.write("  <!-- Tell the browser to be responsive to screen width -->\r\n");
+      out.write("  <meta content=\"width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no\" name=\"viewport\">\r\n");
+      out.write("  <!-- Bootstrap 3.3.7 -->\r\n");
       out.write("  <link rel=\"stylesheet\" href=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css\">\n");
-      out.write("  <!-- Font Awesome -->\n");
+      out.write("/static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css\">\r\n");
+      out.write("  <!-- Font Awesome -->\r\n");
       out.write("  <link rel=\"stylesheet\" href=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css\">\n");
-      out.write("  <!-- Ionicons -->\n");
+      out.write("/static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css\">\r\n");
+      out.write("  <!-- Ionicons -->\r\n");
       out.write("  <link rel=\"stylesheet\" href=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/AdminLTE/bower_components/Ionicons/css/ionicons.min.css\">\n");
-      out.write("  <!-- Theme style -->\n");
+      out.write("/static/AdminLTE/bower_components/Ionicons/css/ionicons.min.css\">\r\n");
+      out.write("  <!-- Theme style -->\r\n");
       out.write("  <link rel=\"stylesheet\" href=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/AdminLTE/dist/css/AdminLTE.min.css\">\n");
-      out.write("  <!-- iCheck -->\n");
+      out.write("/static/AdminLTE/dist/css/AdminLTE.min.css\">\r\n");
+      out.write("  <!-- iCheck -->\r\n");
       out.write("  <link rel=\"stylesheet\" href=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/AdminLTE/plugins/iCheck/square/blue.css\">\n");
-      out.write("\n");
-      out.write("  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->\n");
-      out.write("  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->\n");
-      out.write("  <!--[if lt IE 9]>\n");
-      out.write("  <script src=\"https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js\"></script>\n");
-      out.write("  <script src=\"https://oss.maxcdn.com/respond/1.4.2/respond.min.js\"></script>\n");
-      out.write("  <![endif]-->\n");
-      out.write("\n");
-      out.write("  <!-- Google Font -->\n");
-      out.write("  <link rel=\"stylesheet\" href=\"https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic\">\n");
-      out.write("\n");
-      out.write("<!-- jQuery 3 -->\n");
+      out.write("/static/AdminLTE/plugins/iCheck/square/blue.css\">\r\n");
+      out.write("\r\n");
+      out.write("  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->\r\n");
+      out.write("  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->\r\n");
+      out.write("  <!--[if lt IE 9]>\r\n");
+      out.write("  <script src=\"https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js\"></script>\r\n");
+      out.write("  <script src=\"https://oss.maxcdn.com/respond/1.4.2/respond.min.js\"></script>\r\n");
+      out.write("  <![endif]-->\r\n");
+      out.write("\r\n");
+      out.write("  <!-- Google Font -->\r\n");
+      out.write("  <link rel=\"stylesheet\" href=\"https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic\">\r\n");
+      out.write("\r\n");
+      out.write("<!-- jQuery 3 -->\r\n");
       out.write("<script src=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/AdminLTE/bower_components/jquery/dist/jquery.min.js\"></script>\n");
-      out.write("<!-- Bootstrap 3.3.7 -->\n");
+      out.write("/static/AdminLTE/bower_components/jquery/dist/jquery.min.js\"></script>\r\n");
+      out.write("<!-- Bootstrap 3.3.7 -->\r\n");
       out.write("<script src=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js\"></script>\n");
-      out.write("<!-- iCheck -->\n");
+      out.write("/static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js\"></script>\r\n");
+      out.write("<!-- iCheck -->\r\n");
       out.write("<script src=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/AdminLTE/plugins/iCheck/icheck.min.js\"></script>\n");
-      out.write("<script>\n");
-      out.write("  $(function () {\n");
-      out.write("    $('input').iCheck({\n");
-      out.write("      checkboxClass: 'icheckbox_square-blue',\n");
-      out.write("      radioClass: 'iradio_square-blue',\n");
-      out.write("      increaseArea: '20%' /* optional */\n");
-      out.write("    });\n");
-      out.write("  });\n");
-      out.write("</script>\n");
-      out.write("\n");
-      out.write(" <style>\n");
-      out.write("        div.background\n");
-      out.write("        {\n");
-      out.write("            width:400px;\n");
-      out.write("            height:270px;\n");
-      out.write("            margin-left:-5%;\n");
-      out.write("            border:1px solid black;\n");
-      out.write("            background:rgba(0,0,0,0.05);/*鍏抽敭浠g爜*/\n");
-      out.write("            z-index:100;\n");
-      out.write("        }\n");
-      out.write("        \n");
-      out.write("        div.transbox\n");
-      out.write("        {\n");
-      out.write("            width:300px;\n");
-      out.write("            height:35px;\n");
-      out.write("            margin-left:15%;\n");
-      out.write("            margin-top:50px;\n");
-      out.write("            border:0px solid rgba(255,0,0,0.3);\n");
-      out.write("            z-index:101;\n");
-      out.write("        }\n");
-      out.write("        \n");
-      out.write("        .thumbnaildiv {\n");
-      out.write("        height: 150px;\n");
-      out.write("        text-align: center;\n");
-      out.write("        padding: 15px;\n");
-      out.write("    }\n");
-      out.write("    </style>\n");
-      out.write("</head>\n");
-      out.write("\n");
-      out.write("\n");
-      out.write("<body style=\"background-image: url('/gmms2/static/images/glass.jpg'); background-size: cover;\">\n");
+      out.write("/static/AdminLTE/plugins/iCheck/icheck.min.js\"></script>\r\n");
+      out.write("<script>\r\n");
+      out.write("  $(function () {\r\n");
+      out.write("    $('input').iCheck({\r\n");
+      out.write("      checkboxClass: 'icheckbox_square-blue',\r\n");
+      out.write("      radioClass: 'iradio_square-blue',\r\n");
+      out.write("      increaseArea: '20%' /* optional */\r\n");
+      out.write("    });\r\n");
+      out.write("  });\r\n");
+      out.write("</script>\r\n");
+      out.write("\r\n");
+      out.write(" <style>\r\n");
+      out.write("        div.background\r\n");
+      out.write("        {\r\n");
+      out.write("            width:400px;\r\n");
+      out.write("            height:270px;\r\n");
+      out.write("            margin-left:-5%;\r\n");
+      out.write("            border:1px solid black;\r\n");
+      out.write("            background:rgba(0,0,0,0.05);/*鍏抽敭浠g爜*/\r\n");
+      out.write("            z-index:100;\r\n");
+      out.write("        }\r\n");
+      out.write("        \r\n");
+      out.write("        div.transbox\r\n");
+      out.write("        {\r\n");
+      out.write("            width:300px;\r\n");
+      out.write("            height:35px;\r\n");
+      out.write("            margin-left:15%;\r\n");
+      out.write("            margin-top:50px;\r\n");
+      out.write("            border:0px solid rgba(255,0,0,0.3);\r\n");
+      out.write("            z-index:101;\r\n");
+      out.write("        }\r\n");
+      out.write("        \r\n");
+      out.write("        .thumbnaildiv {\r\n");
+      out.write("        height: 150px;\r\n");
+      out.write("        text-align: center;\r\n");
+      out.write("        padding: 15px;\r\n");
+      out.write("    }\r\n");
+      out.write("    </style>\r\n");
+      out.write("</head>\r\n");
+      out.write("\r\n");
+      out.write("\r\n");
+      out.write("<body style=\"background-image: url('/gmms2/static/images/glass.jpg'); background-size: cover;\">\r\n");
  if (SetupUtil.databaseExists()) { 
-      out.write("\n");
-      out.write("<div style=\"margin-top: 150px;\"> \n");
+      out.write("\r\n");
+      out.write("<div style=\"margin-top: 150px;\"> \r\n");
       out.write("<div align=\"center\"><img alt=\"logo\" src=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/static/images/blacklogo.png\" style=\"width: 450px;height: 100px; \"></div>\n");
-      out.write("<div class=\"login-box\" style=\"margin-top: 10px;\">\n");
-      out.write("  <!-- <div class=\"login-logo\">\n");
-      out.write("    <img alt=\"logo\" src=\"/gmms2/static/images/logo.jpg\">\n");
-      out.write("  </div> -->\n");
-      out.write(" \n");
-      out.write("  \n");
-      out.write("  <!-- /.login-logo -->\n");
-      out.write("  <div class=\"background\" style=\"border-radius:3px;\" id=\"mydiv\">\n");
+      out.write("/static/images/blacklogo.png\" style=\"width: 450px;height: 100px; \"></div>\r\n");
+      out.write("<div class=\"login-box\" style=\"margin-top: 10px;\">\r\n");
+      out.write("  <!-- <div class=\"login-logo\">\r\n");
+      out.write("    <img alt=\"logo\" src=\"/gmms2/static/images/logo.jpg\">\r\n");
+      out.write("  </div> -->\r\n");
+      out.write(" \r\n");
+      out.write("  \r\n");
+      out.write("  <!-- /.login-logo -->\r\n");
+      out.write("  <div class=\"background\" style=\"border-radius:3px;\" id=\"mydiv\">\r\n");
       out.write("    <form action=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/login\" method=\"post\">\n");
+      out.write("/login\" method=\"post\">\r\n");
       out.write("    ");
 
 	String error = (String) request.getAttribute(FormAuthenticationFilter.DEFAULT_ERROR_KEY_ATTRIBUTE_NAME);
 	if(error != null){
 	
-      out.write("\n");
-      out.write("\t\t<div class=\"alert alert-error input-medium controls\">\n");
-      out.write("\t\t\t<button class=\"close\" data-dismiss=\"alert\">脳</button>鐧诲綍澶辫触锛岃閲嶈瘯.\n");
-      out.write("\t\t</div>\n");
+      out.write("\r\n");
+      out.write("\t\t<div class=\"alert alert-error input-medium controls\">\r\n");
+      out.write("\t\t\t<button class=\"close\" data-dismiss=\"alert\">脳</button>鐧诲綍澶辫触锛岃閲嶈瘯.\r\n");
+      out.write("\t\t</div>\r\n");
       out.write("\t");
 
 	}
 	
-      out.write("\n");
-      out.write("    <!-- <div style =\"font-size:25px;text-align:center \">鐜荤拑鐢熶骇绠$悊绯荤粺</div><br><br> -->\n");
-      out.write("      <div class=\"transbox\">\n");
-      out.write("        <font size=\"4\">鐢ㄦ埛鍚�:</font><input type=\"text\" name=\"username\" class=\"form-control\" placeholder=\"璇疯緭鍏ヨ处鎴穃">\n");
-      out.write("        <span class=\"glyphicon glyphicon-user form-control-feedback\"></span>\n");
-      out.write("      </div>\n");
-      out.write("      <div class=\"transbox\">\n");
-      out.write("        <font size=\"4\">瀵嗙爜:</font><input type=\"password\" name=\"password\" class=\"form-control\" placeholder=\"璇疯緭鍏ュ瘑鐮乗">\n");
-      out.write("        <span class=\"glyphicon glyphicon-lock form-control-feedback\"></span>\n");
-      out.write("      </div>\n");
-      out.write("      <div class=\"transbox\">\n");
-      out.write("        <div class=\"col-xs-8\">\n");
-      out.write("          <div class=\"checkbox icheck\">\n");
-      out.write("          \t<label style=\"color: red;\">\n");
-      out.write("              \t璁颁綇<input type=\"checkbox\">\n");
-      out.write("            </label>\n");
-      out.write("          </div>\n");
-      out.write("        </div>\n");
-      out.write("        <!-- /.col -->\n");
-      out.write("        <div class=\"col-xs-4\">\n");
-      out.write("          <button type=\"submit\" class=\"btn btn-primary btn-block btn-flat\">鐧� 褰�</button>\n");
-      out.write("        </div>\n");
-      out.write("        <!-- /.col -->\n");
-      out.write("      </div>\n");
-      out.write("    </form>\n");
-      out.write("  </div>\n");
-      out.write("  <!-- /.login-box-body -->\n");
-      out.write("</div>\n");
-      out.write("<!-- /.login-box -->\n");
-      out.write("\n");
-      out.write("</div>\n");
-      out.write("<div style=\"margin-left: 2%; margin-top: 19%;\"><strong>Copyright &copy; 2014-2018 <a href=\"#\">涓婃捣鍖楃幓鑷姩鍖栨妧鏈湁闄愬叕鍙�</a>.</strong> All rights reserved.</div>\n");
+      out.write("\r\n");
+      out.write("    <!-- <div style =\"font-size:25px;text-align:center \">鐜荤拑鐢熶骇绠$悊绯荤粺</div><br><br> -->\r\n");
+      out.write("      <div class=\"transbox\">\r\n");
+      out.write("        <font size=\"4\">鐢ㄦ埛鍚�:</font><input type=\"text\" name=\"username\" class=\"form-control\" placeholder=\"璇疯緭鍏ヨ处鎴穃">\r\n");
+      out.write("        <span class=\"glyphicon glyphicon-user form-control-feedback\"></span>\r\n");
+      out.write("      </div>\r\n");
+      out.write("      <div class=\"transbox\">\r\n");
+      out.write("        <font size=\"4\">瀵嗙爜:</font><input type=\"password\" name=\"password\" class=\"form-control\" placeholder=\"璇疯緭鍏ュ瘑鐮乗">\r\n");
+      out.write("        <span class=\"glyphicon glyphicon-lock form-control-feedback\"></span>\r\n");
+      out.write("      </div>\r\n");
+      out.write("      <div class=\"transbox\">\r\n");
+      out.write("        <div class=\"col-xs-8\">\r\n");
+      out.write("          <div class=\"checkbox icheck\">\r\n");
+      out.write("          \t<label style=\"color: red;\">\r\n");
+      out.write("              \t璁颁綇<input type=\"checkbox\">\r\n");
+      out.write("            </label>\r\n");
+      out.write("          </div>\r\n");
+      out.write("        </div>\r\n");
+      out.write("        <!-- /.col -->\r\n");
+      out.write("        <div class=\"col-xs-4\">\r\n");
+      out.write("          <button type=\"submit\" class=\"btn btn-primary btn-block btn-flat\">鐧� 褰�</button>\r\n");
+      out.write("        </div>\r\n");
+      out.write("        <!-- /.col -->\r\n");
+      out.write("      </div>\r\n");
+      out.write("    </form>\r\n");
+      out.write("  </div>\r\n");
+      out.write("  <!-- /.login-box-body -->\r\n");
+      out.write("</div>\r\n");
+      out.write("<!-- /.login-box -->\r\n");
+      out.write("\r\n");
+      out.write("</div>\r\n");
+      out.write("<div style=\"margin-left: 2%; margin-top: 19%;\"><strong>Copyright &copy; 2014-2018 <a href=\"#\">涓婃捣鍖楃幓鑷姩鍖栨妧鏈湁闄愬叕鍙�</a>.</strong> All rights reserved.</div>\r\n");
       out.write(" ");
  } else { 
-      out.write("\n");
+      out.write("\r\n");
       out.write("        \t\t\t\t\t<a href=\"");
       out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
-      out.write("/systemmgmt/initializeDatabase\" class=\"btn btn-large btn-success\">鍒涘缓鏁版嵁搴撹〃</a>\n");
-      out.write("        \t\t\t\t\t<br><br>\n");
-      out.write("        \t\t\t\t\t<p align=\"left\">棣栨閮ㄧ讲绯荤粺鏃讹紝鐐瑰嚮姝ゆ寜閽皢鍒涘缓鏁版嵁搴撹〃锛屽苟瀵煎叆璐ф灦銆佸悐瑁呬綅銆佸垏鍓叉満銆佷笂鐗囦綅淇℃伅</p>\n");
-      out.write("       \t\t\n");
+      out.write("/systemmgmt/initializeDatabase\" class=\"btn btn-large btn-success\">鍒涘缓鏁版嵁搴撹〃</a>\r\n");
+      out.write("        \t\t\t\t\t<br><br>\r\n");
+      out.write("        \t\t\t\t\t<p align=\"left\">棣栨閮ㄧ讲绯荤粺鏃讹紝鐐瑰嚮姝ゆ寜閽皢鍒涘缓鏁版嵁搴撹〃锛屽苟瀵煎叆璐ф灦銆佸悐瑁呬綅銆佸垏鍓叉満銆佷笂鐗囦綅淇℃伅</p>\r\n");
+      out.write("       \t\t\r\n");
       out.write("    ");
  } 
-      out.write("\n");
-      out.write(" \n");
-      out.write("</body>\n");
-      out.write("</html>\n");
+      out.write("\r\n");
+      out.write(" \r\n");
+      out.write("</body>\r\n");
+      out.write("</html>\r\n");
     } catch (Throwable t) {
       if (!(t instanceof SkipPageException)){
         out = _jspx_out;

--
Gitblit v1.8.0