1
0
ting.yin 6 жил өмнө
parent
commit
8f2c76e87c

+ 177 - 93
stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/LoginController.java

@@ -31,18 +31,16 @@ import cn.com.qmth.stmms.common.utils.RequestUtils;
 @Controller
 public class LoginController {
 
-    protected static final String INDEX_VIEW = "modules/sys/index";
-
     protected static final String AP_INDEX_VIEW = "modules/sys/indexAp";
 
-    protected static final String SYS_LOGIN_VIEW = "modules/sys/sysLogin";
-
     protected static final String AP_SYS_LOGIN_VIEW = "modules/sys/sysLoginAp";
 
-    protected static final String MARK_LOGIN_VIEW = "modules/sys/markLogin";
-
     protected static final String AP_MARK_LOGIN_VIEW = "modules/sys/markLoginAp";
 
+    protected static final String LOGIN_VIEW = "modules/sys/login";
+
+    private static final String LOGIN_TYPE_KEY = "loginType";
+
     @Autowired
     private UserService userService;
 
@@ -51,32 +49,35 @@ public class LoginController {
 
     @Autowired
     private ExamSubjectService examSubjectService;
-    
+
     @Autowired
     private ExamService examService;
 
     @Value("${app.index}")
     private String appIndex;
+    
+    @Value("${index.logo}")
+    private String indexLogo;
 
     @RequestMapping(value = { "/", "", "/index" })
     public ModelAndView index(HttpServletRequest request) {
         if ("aopeng".equals(appIndex)) {
             return new ModelAndView(AP_INDEX_VIEW);
         }
-        return new ModelAndView(INDEX_VIEW);
+        return new ModelAndView("redirect:/login");
     }
 
     @RequestMapping(value = "/admin-login", method = RequestMethod.GET)
     public ModelAndView adminIndex(HttpServletRequest request) {
-        // StmmsSession session = RequestUtils.getSession(request);
-        // if (StringUtils.isNotBlank(session.getParameter("userId"))) {
-        // return new ModelAndView("modules/sys/examIndex");
-        // } else {
         if ("aopeng".equals(appIndex)) {
             return new ModelAndView(AP_SYS_LOGIN_VIEW);
         }
-        return new ModelAndView(SYS_LOGIN_VIEW);
-        // }
+        StmmsSession session = RequestUtils.getSession(request);
+        session.setParameter(LOGIN_TYPE_KEY, null);
+        ModelAndView view = new ModelAndView(LOGIN_VIEW);
+        view.addObject("indexLogo", indexLogo);
+        view.addObject("showType", "admin-login");
+        return view;
     }
 
     /**
@@ -89,54 +90,161 @@ public class LoginController {
      */
     @RequestMapping(value = "/admin-login", method = RequestMethod.POST)
     public ModelAndView adminLogin(User user, HttpServletRequest request, HttpServletResponse response) {
+        StmmsSession session = RequestUtils.getSession(request);
         User u = userService.findByLoginNameAndStatus(user.getLoginName());
         if (u != null) {
-            if (u.getPassword().equals(Md5EncryptUtils.md5(user.getPassword()))) {
-                u.setLastLoginTime(new Date());
-                u.setLastLoginIp(request.getRemoteAddr());
-                userService.save(u);
+            return adminLogin(u, user.getPassword(), request, session);
+        } else {
+            if ("aopeng".equals(appIndex)) {
+                ModelAndView aPview = new ModelAndView(AP_SYS_LOGIN_VIEW);
+                aPview.addObject("message", "无此用户");
+                return aPview;
+            }
+            ModelAndView modelAndView = new ModelAndView(LOGIN_VIEW);
+            modelAndView.addObject("message", "无此用户");
+            return modelAndView;
+        }
+    }
 
-                StmmsSession session = RequestUtils.getSession(request);
-                new WebUser(u.getId(), u.getType()).writeToSession(session);
+    @RequestMapping(value = "/login", method = RequestMethod.GET)
+    public ModelAndView login(HttpServletRequest request) {
+        StmmsSession session = RequestUtils.getSession(request);
+        session.setParameter(LOGIN_TYPE_KEY, null);
+        ModelAndView view = new ModelAndView(LOGIN_VIEW);
+        view.addObject("indexLogo", indexLogo);
+        view.addObject("showType", "admin-login");
+        return view;
+    }
 
-                if (u.getType() == UserType.ADMIN || u.getType() == UserType.VIEWER
-                        || u.getType() == UserType.SCHOOLVIEWER) {
-                    if (u.getType() == UserType.VIEWER) {// 科组长
-                        String examId = u.getLoginName().split("-")[0];
-                        String subjectCode = u.getLoginName().split("-")[1];
-                        session.setParameter("examId", examId);
-                        session.setParameter("subjectCode", subjectCode);
-                    }
-                    ModelAndView modelAndView = new ModelAndView("redirect:admin/home");
-                    return modelAndView;
-                } else {
-                    if ("aopeng".equals(appIndex)) {
-                        ModelAndView aPview = new ModelAndView(AP_SYS_LOGIN_VIEW);
-                        aPview.addObject("message", "无此类型的用户");
-                        return aPview;
-                    }
-                    ModelAndView view = new ModelAndView(SYS_LOGIN_VIEW);
-                    view.addObject("message", "无此类型的用户");
-                    return view;
-                }
+    /**
+     * 科组长、评卷员登录
+     * 
+     * @param request
+     * @param loginType
+     * @param examId
+     * @param code
+     * @param password
+     * @return
+     */
+    @RequestMapping(value = "/mark-login", method = RequestMethod.POST)
+    public ModelAndView login(HttpServletRequest request, @RequestParam String loginName, @RequestParam String password) {
+        Marker marker = markerService.findByLoginName(loginName);
+        if (marker != null) {
+            return markerLogin(request, marker, password);
+        }
+        // SubjectHeader header =
+        // subjectHeaderService.findByLoginName(loginName);
+        // if (header != null) {
+        // return subjectHeaderLogin(request, header, password);
+        // }
+        if ("aopeng".equals(appIndex)) {
+            ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
+            aPview.addObject("message", "帐号不存在");
+            return aPview;
+        }
+        ModelAndView view = new ModelAndView(LOGIN_VIEW);
+        view.addObject("message", "帐号不存在");
+        return view;
+    }
+
+    /**
+     * 登录
+     * 
+     * @param user
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public ModelAndView adminLogin(User user, @RequestParam(required = false) String showType,
+            HttpServletRequest request, HttpServletResponse response) {
+        StmmsSession session = RequestUtils.getSession(request);
+        String loginType = session.getParameter(LOGIN_TYPE_KEY);
+        // 管理员
+        if ("admin-login".equals(showType)) {
+            User u = userService.findByLoginNameAndStatus(user.getLoginName());
+            if (u != null) {
+                return adminLogin(u, user.getPassword(), request, session);
             } else {
                 if ("aopeng".equals(appIndex)) {
                     ModelAndView aPview = new ModelAndView(AP_SYS_LOGIN_VIEW);
-                    aPview.addObject("message", "密码错误");
+                    aPview.addObject("message", "无此用户");
                     return aPview;
                 }
-                ModelAndView modelAndView = new ModelAndView(SYS_LOGIN_VIEW);
-                modelAndView.addObject("message", "密码错误");
+                ModelAndView modelAndView = new ModelAndView(LOGIN_VIEW);
+                modelAndView.addObject("message", "无此用户");
+                modelAndView.addObject("showType", showType);
+                modelAndView.addObject("indexLogo", indexLogo);
                 return modelAndView;
             }
+        } else if ("mark-login".equals(showType) || "mark-login".equals(loginType)) {
+            Marker marker = markerService.findByLoginName(user.getLoginName());
+            if (marker != null) {
+                return markerLogin(request, marker, user.getPassword());
+            }
+            if ("aopeng".equals(appIndex)) {
+                ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
+                aPview.addObject("message", "帐号不存在");
+                return aPview;
+            }
+            ModelAndView view = new ModelAndView(LOGIN_VIEW);
+            view.addObject("message", "帐号不存在");
+            view.addObject("showType", showType);
+            view.addObject("indexLogo", indexLogo);
+            return view;
+        } else {
+            return new ModelAndView("redirect:/login");
+        }
+
+    }
+
+    /**
+     * 管理员登录
+     * @param u
+     * @param password
+     * @param request
+     * @param session
+     * @return
+     */
+    private ModelAndView adminLogin(User u, String password, HttpServletRequest request, StmmsSession session) {
+        if (u.getPassword().equals(Md5EncryptUtils.md5(password))) {
+            u.setLastLoginTime(new Date());
+            u.setLastLoginIp(request.getRemoteAddr());
+            userService.save(u);
+
+            new WebUser(u.getId(), u.getType()).writeToSession(session);
+
+            if (u.getType() == UserType.ADMIN || u.getType() == UserType.VIEWER || u.getType() == UserType.SCHOOLVIEWER) {
+                if (u.getType() == UserType.VIEWER) {// 科组长
+                    String examId = u.getLoginName().split("-")[0];
+                    String subjectCode = u.getLoginName().split("-")[1];
+                    session.setParameter("examId", examId);
+                    session.setParameter("subjectCode", subjectCode);
+                }
+                ModelAndView modelAndView = new ModelAndView("redirect:admin/home");
+                return modelAndView;
+            } else {
+                if ("aopeng".equals(appIndex)) {
+                    ModelAndView aPview = new ModelAndView(AP_SYS_LOGIN_VIEW);
+                    aPview.addObject("message", "无此类型的用户");
+                    return aPview;
+                }
+                ModelAndView view = new ModelAndView(LOGIN_VIEW);
+                view.addObject("message", "无此类型的用户");
+                view.addObject("showType", "admin-login");
+                view.addObject("indexLogo", indexLogo);
+                return view;
+            }
         } else {
             if ("aopeng".equals(appIndex)) {
                 ModelAndView aPview = new ModelAndView(AP_SYS_LOGIN_VIEW);
-                aPview.addObject("message", "无此用户");
+                aPview.addObject("message", "密码错误");
                 return aPview;
             }
-            ModelAndView modelAndView = new ModelAndView(SYS_LOGIN_VIEW);
-            modelAndView.addObject("message", "无此用户");
+            ModelAndView modelAndView = new ModelAndView(LOGIN_VIEW);
+            modelAndView.addObject("message", "密码错误");
+            modelAndView.addObject("showType", "admin-login");
+            modelAndView.addObject("indexLogo", indexLogo);
             return modelAndView;
         }
     }
@@ -163,50 +271,20 @@ public class LoginController {
      */
     @RequestMapping(value = "/mark-login", method = RequestMethod.GET)
     public ModelAndView loginInit(HttpServletRequest request, @RequestParam(required = false) String message) {
-
         if ("aopeng".equals(appIndex)) {
             ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
             aPview.addObject("message", StringUtils.trimToNull(message));
             return aPview;
         }
-        ModelAndView modelAndView = new ModelAndView(MARK_LOGIN_VIEW);
+        StmmsSession session = RequestUtils.getSession(request);
+        session.setParameter(LOGIN_TYPE_KEY, "mark-login");
+        ModelAndView modelAndView = new ModelAndView(LOGIN_VIEW);
         modelAndView.addObject("message", StringUtils.trimToNull(message));
+        modelAndView.addObject(LOGIN_TYPE_KEY, "mark-login");
+        modelAndView.addObject("indexLogo", indexLogo);
         return modelAndView;
     }
 
-    /**
-     * 科组长、评卷员登录
-     * 
-     * @param request
-     * @param loginType
-     * @param examId
-     * @param code
-     * @param password
-     * @return
-     */
-    @RequestMapping(value = "/mark-login", method = RequestMethod.POST)
-    public ModelAndView login(HttpServletRequest request, @RequestParam String loginName,
-            @RequestParam String password) {
-        Marker marker = markerService.findByLoginName(loginName);
-        if (marker != null) {
-            return markerLogin(request, marker, password);
-        }
-
-        // SubjectHeader header =
-        // subjectHeaderService.findByLoginName(loginName);
-        // if (header != null) {
-        // return subjectHeaderLogin(request, header, password);
-        // }
-        if ("aopeng".equals(appIndex)) {
-            ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
-            aPview.addObject("message", "帐号不存在");
-            return aPview;
-        }
-        ModelAndView view = new ModelAndView(MARK_LOGIN_VIEW);
-        view.addObject("message", "帐号不存在");
-        return view;
-    }
-
     /**
      * 评卷员登录
      * 
@@ -216,7 +294,7 @@ public class LoginController {
      * @return
      */
     public ModelAndView markerLogin(HttpServletRequest request, Marker marker, String password) {
-        ModelAndView modelAndView = new ModelAndView(MARK_LOGIN_VIEW);
+        ModelAndView modelAndView = new ModelAndView(LOGIN_VIEW);
         ModelAndView modelAndViewForAP = new ModelAndView(AP_MARK_LOGIN_VIEW);
         if (!marker.getPassword().equals(password)) {
             if ("aopeng".equals(appIndex)) {
@@ -224,6 +302,8 @@ public class LoginController {
                 return modelAndViewForAP;
             }
             modelAndView.addObject("message", "密码错误");
+            modelAndView.addObject("indexLogo", indexLogo);
+            modelAndView.addObject("showType", "mark-login");
             return modelAndView;
         }
         if (marker.isEnable() == false) {
@@ -232,21 +312,25 @@ public class LoginController {
                 return modelAndViewForAP;
             }
             modelAndView.addObject("message", "帐号已禁用");
+            modelAndView.addObject("indexLogo", indexLogo);
+            modelAndView.addObject("showType", "mark-login");
             return modelAndView;
         }
         Exam exam = examService.findById(marker.getExamId());
         Date now = new Date();
-        if((exam.getStartTime()!=null&&now.before(exam.getStartTime()))
-                || (exam.getEndTime()!=null&&now.after(exam.getEndTime()))){
+        if ((exam.getStartTime() != null && now.before(exam.getStartTime()))
+                || (exam.getEndTime() != null && now.after(exam.getEndTime()))) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String start = exam.getStartTime()==null?"":" 开始时间:"+sdf.format(exam.getStartTime());
-            String end = exam.getEndTime()==null?"":" 结束时间:"+sdf.format(exam.getEndTime());
+            String start = exam.getStartTime() == null ? "" : " 开始时间:" + sdf.format(exam.getStartTime());
+            String end = exam.getEndTime() == null ? "" : " 结束时间:" + sdf.format(exam.getEndTime());
             if ("aopeng".equals(appIndex)) {
-                modelAndViewForAP.addObject("message", "不在评卷时间范围,"+start+" "+end);
+                modelAndViewForAP.addObject("message", "不在评卷时间范围," + start + " " + end);
                 return modelAndViewForAP;
             }
-            modelAndView.addObject("message", "不在评卷时间范围 "+start+" "+end);
-            return modelAndView; 
+            modelAndView.addObject("message", "不在评卷时间范围 " + start + " " + end);
+            modelAndView.addObject("indexLogo", indexLogo);
+            modelAndView.addObject("showType", "mark-login");
+            return modelAndView;
         }
 
         new WebUser(marker.getId(), UserType.MARKER).writeToSession(RequestUtils.getSession(request));
@@ -254,11 +338,11 @@ public class LoginController {
         if (marker.getLastLoginTime() == null) {
             return new ModelAndView("redirect:/mark/reset");
         } else {
-        	marker.setLastLoginTime(new Date());
-        	marker.setLastLoginIp(request.getRemoteAddr());
-        	markerService.save(marker);
+            marker.setLastLoginTime(new Date());
+            marker.setLastLoginIp(request.getRemoteAddr());
+            markerService.save(marker);
             return new ModelAndView("redirect:/mark/subject-select");
-        } 
+        }
     }
 
     /**

+ 64 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/sys/login.jsp

@@ -0,0 +1,64 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>登录</title>
+	<meta name="decorator" content="default"/>
+	<%@include file="/WEB-INF/views/include/head.jsp" %>
+    <link rel="stylesheet" href="${ctxStatic}/common/login.css">
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$("#showType").hide();
+			$("#adminLogin").click(function() {
+				$("#adminLogin").addClass("on");
+				$("#markLogin").removeClass("on");
+				$("#showType").attr("value","admin-login");
+			});
+			$("#markLogin").click(function() {
+				$("#markLogin").addClass("on");
+				$("#adminLogin").removeClass("on");
+				$("#showType").attr("value","mark-login");
+			});
+			if(self.frameElement && self.frameElement.tagName=="IFRAME"){
+				parent.location.reload();
+			}
+		});
+	</script>
+</head>
+<body>
+<div class="container">
+  <div class="middle cl">
+   <div class="left">
+    <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div>
+    <p>Copyright &#169武汉启明软件 2012-2014</p>
+   </div>
+   <div class="right">
+     <div class="title">
+       <h1>高校考试管理平台</h1>
+       <c:if test="${loginType == 'admin-login' }"><p>管理员登录</p></c:if>
+       <c:if test="${loginType == 'mark-login' }"><p>评卷员登录</p></c:if>
+       <c:if test="${loginType == null || loginType == '' }">
+       <p><span><a href="#" class="<c:if test="${showType == 'admin-login' ||showType==null}">on</c:if>" id="adminLogin">管理员登录</a></span>
+       	<span><a href="#" class="<c:if test="${showType == 'mark-login' }">on</c:if>" id="markLogin">评卷员登录</a></span></p>
+       </c:if>
+     </div>
+     <div class="loginbox">
+      <form action="${ctx}/login" method="post" role="form" id="loginForm">
+      	<input id ="showType" name ="showType" value="${showType}" />
+        <div class="input-group">
+        	<input type="text" class="form-control required" id="loginName" name="loginName" placeholder="请输入用户名" autocomplete="off" value="${loginName }"/>
+        </div>
+        <div class="input-group">
+        	<input type="password" class="form-control required" id="password" name="password" placeholder="请输入密码" autocomplete="off"/>
+        </div>
+        <div class="point <c:if test="${message != null }"></c:if><c:if test="${message == null }">hide</c:if>">
+        <em class="error">${message }</em>
+        </div>
+        <div class="login-btn"><input class="opacity" type="submit" value="登 录"/></div>
+      </form>
+     </div>
+   </div>
+  </div>
+</div>
+</body>
+</html>

+ 236 - 0
stmms-web/src/main/webapp/static/common/login.css

@@ -0,0 +1,236 @@
+/*common*/
+* {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+	outline: none;
+	-webkit-tap-highlight-color: transparent;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	font-family: "微软雅黑";
+	text-decoration: none;
+}
+html, body {
+	height: 100%;
+	color: #1B2C5F;
+	overflow-x: hidden;
+}
+body {
+	background: url(../images/bg.jpg) no-repeat 0 30% #F0F3FF fixed;
+	background-size: cover;
+}
+a {
+	text-decoration: none;
+}
+input {
+	font-family: "微软雅黑";
+	outline: none;
+	vertical-align: top;
+}
+.ellipsis {
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+::-webkit-input-placeholder {
+    color:    #B4B7C3;
+}
+:-moz-placeholder {
+   color:    #B4B7C3;
+}
+::-moz-placeholder {
+   color:    #B4B7C3;
+}
+:-ms-input-placeholder {
+   color:    #B4B7C3;
+}
+.cl:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}
+.cl {
+	zoom: 1;
+}
+/*container*/
+.container {
+	width: 100%;
+	height: 100%;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: -ms-flexbox;
+	display: flex;
+	
+	-webkit-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center;
+	
+	-webkit-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+}
+.middle {
+	width: 920px;
+	height: 540px;
+	overflow: hidden;
+	background: rgba(255,255,255,.75);
+	-moz-box-shadow: 0px 15px 15px 0px rgba(203,205,211,0.3);
+	-webkit-box-shadow: 0px 15px 15px 0px rgba(203,205,211,0.3);
+	box-shadow: 0px 15px 15px 0px rgba(203,205,211,0.3);
+	padding-left: 320px;
+}
+.left {
+	position: relative;
+	float: left;
+	width: 320px;
+	height: 540px;
+	overflow: hidden;
+	margin-left: -320px;
+	padding: 38px;
+	background: #142862 url(../images/loginbg.png) no-repeat 0 0;
+}
+.left .logo img {
+	width: 130px;
+}
+.left p {
+	position: absolute;
+	left: 38px;
+	bottom: 38px;
+	font-size: 13px;
+	font-size: 700;
+	color: rgba(255,255,255,.65);
+}
+.right {
+	float: left;
+	width: 100%;
+	height: 540px;
+	padding: 90px 130px;
+}
+/*title*/
+.title h1 {
+	height: 38px;
+	line-height: 38px;
+	overflow: hidden;
+	text-align: center;
+	font-size: 26px;
+	color: #1B2C5F;
+}
+.title p {
+	height: 80px;
+	line-height: 80px;
+	overflow: hidden;
+	text-align: center;
+	font-size: 16px;
+	font-size: 700;
+	color: #B4B7C3;
+}
+.title p a {
+	display: inline-block;
+	width: 120px;
+	height: 56px;
+	line-height: 22px;
+	overflow: hidden;
+	text-align: center;
+	font-size: 16px;
+	font-size: 700;
+	color: #B4B7C3;
+	padding-top: 24px;
+	border-bottom: 1px solid #E2E5EB;
+}
+.title p a.on {
+	color: #4E9FE2;
+	border-bottom: 2px solid #66AEE9;
+}
+a:hover, a:focus, a:focus-within,a:active, a:visited{
+	text-decoration: none!important;
+	outline:none;
+}
+/*input*/
+.input-group {
+	width: 100%;
+}
+.input-group input {
+	width: 100%;
+	height: 48px;
+	line-height: 48px;
+	color:#1B2C5F;
+	padding: 0 20px 0 48px;
+	background: none;
+	border: 1px solid #E2E5EB;
+	-moz-border-radius: 8px;
+	-webkit-border-radius: 8px;
+	border-radius: 8px;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	transition: none!important;
+}
+.input-group input:focus {
+	outline: 0;
+	border: 1px solid #E2E5EB;
+	-webkit-box-shadow: 0px 10px 15px 0px rgba(203,205,211,.1);
+	-moz-box-shadow: 0px 10px 15px 0px rgba(203,205,211,.1);
+	box-shadow: 0px 10px 15px 0px rgba(203,205,211,.1);
+}
+input#loginName {
+	background: url(../images/userid.png) no-repeat 20px 50%;
+}
+input#loginName:focus {
+	background: url(../images/userid-on.png) no-repeat 20px 50% #FFF;
+}
+input#password {
+	background: url(../images/password.png) no-repeat 20px 50%;
+	margin-top: 20px;
+}
+input#password:focus {
+	background: url(../images/password-on.png) no-repeat 20px 50% #FFF;
+}
+input:-internal-autofill-selected{
+	background: none!important;
+}
+/*point*/
+.point {
+	height: 16px;
+	line-height: 16px;
+	overflow: hidden;
+	font-size: 12px;
+	padding-left: 21px;
+	margin-top: 16px;
+}
+.point em.error {
+	font-style: normal;
+	color: #FF5F5F;
+	padding-left: 28px;
+	background: url(../images/error.png) no-repeat 0 50%;
+}
+/*btn*/
+.login-btn {
+	text-align: center;
+	padding-top: 40px;
+}
+.login-btn input {
+	display: inline-block;
+	width: 160px;
+	height: 54px;
+	line-height: 54px;
+	overflow: hidden;
+	letter-spacing: 3px;
+	font-size: 20px;
+	font-weight: 700;
+	color: #FFF;
+	border: 0;
+	background: #66ADE8;
+	background-image:-webkit-linear-gradient(to right, #88D3FC, #66ADE8); 
+	background-image:linear-gradient(to right, #88D3FC, #66ADE8); 
+	-moz-border-radius: 30px;
+	-webkit-border-radius: 30px;
+	border-radius: 30px;
+}
+.login-btn input:hover {
+	-moz-box-shadow: 0px 10px 20px 0px rgba(119,192,242,.4);
+	-webkit-box-shadow: 0px 10px 20px 0px rgba(119,192,242,.4);
+	box-shadow: 0px 10px 20px 0px rgba(119,192,242,.4);
+}

BIN
stmms-web/src/main/webapp/static/favicon.png


BIN
stmms-web/src/main/webapp/static/images/bg.jpg


BIN
stmms-web/src/main/webapp/static/images/error.png


BIN
stmms-web/src/main/webapp/static/images/loginbg.png


BIN
stmms-web/src/main/webapp/static/images/logo@2x.png


BIN
stmms-web/src/main/webapp/static/images/password-on.png


BIN
stmms-web/src/main/webapp/static/images/password.png


BIN
stmms-web/src/main/webapp/static/images/userid-on.png


BIN
stmms-web/src/main/webapp/static/images/userid.png


BIN
stmms-web/src/main/webapp/static/images/whdxlogo.png


+ 1 - 1
stmms-web/src/main/webapp/static/mark-new/css/style.css

@@ -1180,4 +1180,4 @@ a.button.all-zero-button {
 	height: calc(100vh - 51px);
 	padding: 15px;
 	overflow-y: scroll;
-}
+}