优化

src/main/java/cn/palmte/work/controller/backend/AdminController.java

@@ -50,24 +50,23 @@ public class AdminController extends BaseController {
     public String singIn(RedirectAttributes attr, LoginRequest loginRequest, HttpServletRequest request) throws Exception {
         String userName = loginRequest.getUserName();
         String password = loginRequest.getPassword();
-        String captchaToken = loginRequest.getCaptchaToken();
+        //String captchaToken = loginRequest.getCaptchaToken();
         String code;
         String message;
         try{
-            try{
+            /*try{
                 code = request.getSession().getAttribute(CaptchaUtils.RANDOM_CODE_KEY).toString();
             }catch(Exception e){
                 logger.info(e.getMessage() , e);
                 message ="验证码错误";
                 attr.addAttribute("errorMessages",message);
                 return "redirect:/admin/err";
-            }
+            }*/
             try {
                 String privateKey = request.getSession().getAttribute(Constant.PRIVATEKEY).toString();
                 userName = new String(RSAUtils.decryptByPrivateKey(Base64Utils.decode(userName), privateKey));
                 password = new String(RSAUtils.decryptByPrivateKey(Base64Utils.decode(password), privateKey));
-                captchaToken = new String(RSAUtils.decryptByPrivateKey(Base64Utils.decode(captchaToken),privateKey));
-                logger.info("username:" + userName + ",password:" + password + ",captcha:" + captchaToken);
+                //captchaToken = new String(RSAUtils.decryptByPrivateKey(Base64Utils.decode(captchaToken),privateKey));
             } catch (Exception e) {
                 logger.error("解密出错", e);
                 attr.addAttribute("errorMessages", "用户名密码错误");
@@ -79,15 +78,15 @@ public class AdminController extends BaseController {
                 attr.addAttribute("errorMessages", message);
                 return "redirect:/admin/err";
             }
-            if(!captchaToken.toUpperCase().equals(code)){
+            /*if(!captchaToken.toUpperCase().equals(code)){
                 message ="验证码错误!";
                 attr.addAttribute("errorMessages",message);
                 return "redirect:/admin/err";
-            }
+            }*/
             /**
              * 移除验证数据
              */
-            request.getSession().removeAttribute(CaptchaUtils.RANDOM_CODE_KEY);
+            //request.getSession().removeAttribute(CaptchaUtils.RANDOM_CODE_KEY);
             Admin admin = adminService.getAdminByUsername(userName);
             if (null == admin) {
                 message = "用户名或密码错误~~~";
@@ -139,8 +138,6 @@ public class AdminController extends BaseController {
                 request.getSession().setAttribute("message", "");
             }
 
-
-
             message = login(userName, newPassword, false, false);
             if (!message.isEmpty()) {
                 attr.addAttribute("errorMessages", message);

src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.application.name=fourcal
 server.port=8282
-server.session.timeout=7200
+server.session.timeout=21600
 server.context-path=/fourcal
 app.version=0.0.1
 spring.profiles.active=sit

src/main/resources/templates/admin/admin_login.ftl

@@ -78,13 +78,13 @@
                     <span class="am-input-group-label"><i class="am-icon-lock am-icon-fw"></i></span>
                     <input type="password" class="am-form-field"  id="password" autocomplete="off" name="password" placeholder="输入你的密码">
                 </div>
-                <div class="am-form-group am-input-group">
+                <#--<div class="am-form-group am-input-group">
                     <span class="am-input-group-label"><i class="am-icon-key am-icon-fw"></i></span>
                     <input type="text" class="am-form-field" id="captchaToken" name="captchaToken" placeholder="输入验证码">
                     <span class="am-input-group-btn">
                         <img id="captchaImage" src="${base}/admin/captcha?width=100&height=35&fontsize=30" alt="换一张" />
                     </span>
-                </div>
+                </div>-->
                 <div class="am-cf">
                     <input id="loginBtn" type="submit" name="" value="登 录" class="am-u-sm-12 am-btn am-btn-primary am-btn-sm am-fl">
                 </div>
@@ -119,7 +119,7 @@
     };
     $().ready( function() {
 
-        var $captcha = $("#captcha");
+        /*var $captcha = $("#captcha");
         var $captchaImage = $("#captchaImage");
 
         $captchaImage.click( function() {
@@ -130,24 +130,24 @@
             }
             imageSrc = imageSrc + "?timestamp=" + timestamp + "&width=100&height=35&fontsize=30";
             $captchaImage.attr("src", imageSrc);
-        });
+        });*/
 
 
         //登录
         $("#loginForm").submit(function(){
             var username = $.trim($("#username").val());
             var passwd = $.trim($("#password").val());
-            var vcode = $.trim($("#captchaToken").val());
+            //var vcode = $.trim($("#captchaToken").val());
             if(username.length == 0) {
                 $("#msg").html("用户名不能为空");
                 return false;
             } else if(passwd.length == 0) {
                 $("#msg").html("密码不能为空");
                 return false;
-            } else if(vcode.length != 4) {
+            } /*else if(vcode.length != 4) {
                 $("#msg").html("验证码错误");
                 return false;
-            }
+            }*/
            /* $("#password").val(encryptByDES(passwd,"C36DF8PM"));
             $("#username").val(encryptByDES(username,"C36DF8PM"));
             $("#captchaToken").val(encryptByDES(vcode,"C36DF8PM"));*/
@@ -159,7 +159,7 @@
             console.log(encrypted);
             $("#password").val(encrypt.encrypt(passwd));
             $("#username").val(encrypt.encrypt(username));
-            $("#captchaToken").val(encrypt.encrypt(vcode));
+            //$("#captchaToken").val(encrypt.encrypt(vcode));
 
 
 

src/main/resources/templates/admin/project_estimate_add.ftl

@@ -60,8 +60,8 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input type="text" id="name" class="am-input" data-validate-async data-validation-message="请输入项目名称（20字符以内）"
-                                       name="name" placeholder="请输入项目名称（20字符以内）" maxlength="20"
+                                <input type="text" id="name" class="am-input" data-validate-async data-validation-message="请输入项目名称（35字符以内）"
+                                       name="name" placeholder="请输入项目名称（35字符以内）" maxlength="35"
                                        value="" required />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>

src/main/resources/templates/admin/project_estimate_edit.ftl

@@ -67,8 +67,8 @@
                 <div class="am-g am-form-group am-margin-top">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（20字符以内）"
-                               name="name" placeholder="请输入项目名称（20字符以内）" maxlength="20"
+                        <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（35字符以内）"
+                               name="name" placeholder="请输入项目名称（35字符以内）" maxlength="35"
                                value="${project.name}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>