重构：移除字符集常量

重构：新增认证接口及公共抽象类

Author: sparrowzoo

Diff for: sparrow-mvc-thymeleaf/pom.xml

@@ -27,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sparrow-mvc-thymeleaf</artifactId>
-    <version>1.0.0-RELEASE</version>
+    <version>1.0.1-RELEASE</version>
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -60,4 +60,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

Diff for: sparrow-mvc/src/main/java/com/sparrow/web/support/ValidateCode.java

@@ -40,8 +40,8 @@ public ValidateCode() {
     }
 
     private static final long serialVersionUID = -5813134629255375160L;
-    private int imagewidth = 100;
-    private int imageheight = 35;
+    private int imageWidth = 100;
+    private int imageHeight = 35;
     private int codeCount = 4;
     private int fontHeight;
     private int codeY;
@@ -58,35 +58,35 @@ public void init() throws ServletException {
         String strCodeCount = this.getInitParameter("codeCount");
         try {
             if (strWidth != null && strWidth.length() != 0) {
-                this.imagewidth = Integer.parseInt(strWidth);
+                this.imageWidth = Integer.parseInt(strWidth);
             }
             if (strHeight != null && strHeight.length() != 0) {
-                this.imageheight = Integer.parseInt(strHeight);
+                this.imageHeight = Integer.parseInt(strHeight);
             }
             if (strCodeCount != null && strCodeCount.length() != 0) {
                 codeCount = Integer.parseInt(strCodeCount);
             }
         } catch (NumberFormatException e) {
             e.printStackTrace();
         }
-        this.codeWidth = this.imagewidth / (codeCount + 1);
-        this.fontHeight = this.imageheight - 2;
-        this.codeY = this.imageheight - 4;
+        this.codeWidth = this.imageWidth / (codeCount + 1);
+        this.fontHeight = this.imageHeight - 2;
+        this.codeY = this.imageHeight - 4;
 
     }
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
-        BufferedImage buffImg = new BufferedImage(this.imagewidth,
-            this.imageheight, BufferedImage.TYPE_INT_RGB);
+        BufferedImage buffImg = new BufferedImage(this.imageWidth,
+            this.imageHeight, BufferedImage.TYPE_INT_RGB);
         Graphics2D gd = buffImg.createGraphics();
         Random random = new Random();
         gd.setColor(Color.white);
-        gd.fillRect(0, 0, this.imagewidth, this.imageheight);
+        gd.fillRect(0, 0, this.imageWidth, this.imageHeight);
         Font font = new Font("Fixedsys", Font.PLAIN, fontHeight);
         gd.setFont(font);
-        gd.drawRect(0, 0, this.imagewidth - 1, this.imageheight - 1);
+        gd.drawRect(0, 0, this.imageWidth - 1, this.imageHeight - 1);
 
         StringBuilder randomCode = new StringBuilder();
         int red = 0, green = 0, blue = 0;
@@ -118,7 +118,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
         throws IOException {
         if (req.getParameter(Constant.VALIDATE_CODE) != null
             && req.getParameter(Constant.VALIDATE_CODE).equalsIgnoreCase(req.getSession().getAttribute(
-            Constant.VALIDATE_CODE)
+                Constant.VALIDATE_CODE)
             .toString().toLowerCase())) {
             resp.getWriter().write("OK");
             return;

Diff for: sparrow-protocol/src/main/java/com/sparrow/protocol/LoginUser.java

@@ -17,99 +17,98 @@
 package com.sparrow.protocol;
 
 public class LoginUser implements VO {
+    /**
+     * 用户ID
+     */
     private Long userId;
+    /**
+     * 用户昵称
+     */
     private String nickName;
+    /**
+     * 用户名
+     */
     private String userName;
+    /**
+     * 头象
+     */
     private String avatar;
+    /**
+     * 设备id
+     */
     private String deviceId;
-    private Boolean activate;
+
     private Integer days;
+
     private Long expireAt;
 
     public static LoginUser create(Long userId,
-        String userName,
-        String nickName,
-        String avatar,
-        String deviceId,
-        Boolean activate,
-        Integer expireDays) {
+                                   String userName,
+                                   String nickName,
+                                   String avatar,
+                                   String deviceId,
+                                   Integer days) {
         LoginUser login = new LoginUser();
         login.userId = userId;
         login.userName = userName;
         login.nickName = nickName;
         login.avatar = avatar;
+        login.days = days;
+        login.expireAt = System.currentTimeMillis() + days * 24 * 60 * 60 * 1000;
         login.deviceId = deviceId;
-        login.activate = activate;
-        login.days = expireDays;
-        if (login.days == null) {
-            login.days = 1;
-        }
-        if (expireDays > 0) {
-            login.expireAt = System.currentTimeMillis() + 1000 * 60 * 60 * 24L * expireDays;
-        } else {
-            login.expireAt = 0L;
-        }
         return login;
     }
 
     public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
     public String getNickName() {
         return nickName;
     }
 
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
     public String getUserName() {
         return userName;
     }
 
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
     public String getAvatar() {
         return avatar;
     }
 
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
     public String getDeviceId() {
         return deviceId;
     }
 
-    public void setDeviceId(String deviceId) {
-        this.deviceId = deviceId;
+    public Integer getDays() {
+        return days;
+    }
+
+    public Long getExpireAt() {
+        return expireAt;
     }
 
-    public Boolean getActivate() {
-        return activate;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
-    public void setActivate(Boolean activate) {
-        this.activate = activate;
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
     }
 
-    public Integer getDays() {
-        return days;
+    public void setUserName(String userName) {
+        this.userName = userName;
     }
 
-    public void setDays(Integer days) {
-        this.days = days;
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
     }
 
-    public Long getExpireAt() {
-        return expireAt;
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public void setDays(Integer days) {
+        this.days = days;
     }
 
     public void setExpireAt(Long expireAt) {

Diff for: sparrow-protocol/src/main/java/com/sparrow/protocol/LoginUserStatus.java

@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sparrow.protocol;
+
+public class LoginUserStatus {
+    public static final Integer STATUS_NORMAL = 1;
+    public static final Integer STATUS_FREEZE = 2;
+    public static final Integer STATUS_DISABLE = 0;
+
+
+    public LoginUserStatus(Integer status, Long expireAt) {
+        this.status = status;
+        this.expireAt = expireAt;
+    }
+
+    /**
+     * 用户状态 1:正常 2:冻结 0：禁用
+     */
+    private Integer status;
+
+    /**
+     * 过期时间
+     */
+    private Long expireAt;
+
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getExpireAt() {
+        return expireAt;
+    }
+
+    public void setExpireAt(Long expireAt) {
+        this.expireAt = expireAt;
+    }
+
+}

Diff for: sparrow-protocol/src/main/java/com/sparrow/protocol/constant/Constant.java

@@ -41,10 +41,6 @@ public class Constant {
     public static final String VALIDATE_CODE = "validate_code";
     public static final String IMAGE_EXTENSION = ".jpg|.jpeg|.gif|.png";
 
-    public static final String CHARSET_UTF_8 = "UTF-8";
-    public static final String CHARSET_GBK = "GBK";
-    public static final String CHARSET_ISO_8859_1 = "ISO-8859-1";
-
     public static final String CONTENT_TYPE_FORM = "application/x-www-form-urlencoded";
     public static final String CONTENT_TYPE_MS_DOWNLOAD = "application/x-msdownload";
 

Diff for: sparrow-protocol/src/main/java/com/sparrow/protocol/constant/SparrowError.java

@@ -82,6 +82,9 @@ public enum SparrowError implements ErrorSupport {
     GLOBAL_PARAMETER_IS_ILLEGAL(true, GlobalModule.GLOBAL, "28", "parameter is illegal"),
     GLOBAL_SMS_SEND_ERROR(true, GlobalModule.GLOBAL, "29", "short message service error"),
     USER_NOT_LOGIN(true, GlobalModule.GLOBAL, "34", "user not login"),
+
+    USER_DISABLE(true, GlobalModule.GLOBAL, "34", "user disable"),
+
     IMAGE_EXTENSION_NOT_FOUND(true, GlobalModule.GLOBAL, "35", "image extension not found");
 
     private boolean system;

Diff for: sparrow/src/main/java/com/sparrow/constant/ConfigKeyLanguage.java

@@ -51,13 +51,15 @@ public class ConfigKeyLanguage {
     public static final String EFFECTIVE = "effective";
     public static final String INEFFECTIVE = "ineffective";
     public static final String MODIFY_PASSWORD_SUCCESS = "user_password_modify_success";
-    public static final String USER_DEFAULT_NICKNAME = "default_user_name";
     public static final String USER_MODIFY_SUCCESS = "user_modify_success";
     public static final String USER_EMAIL_SUBJECT = "user_email_subject";
     public static final String USER_EMAIL_CONTENT = "user_email_content";
     public static final String USER_DISABLE = "user_disable";
     public static final String USER_NOT_ACTIVE = "user_not_active";
-    public static final String USER_VISITOR = "user_visitor";
+    public static final String USER_VISITOR_NAME = "visitor_user_name";
+
+    public static final String USER_VISITOR_NICKNAME = "visitor_nick_name";
+
     public static final String SYSTEM_SERVER_ERROR = "system_server_error";
     public static final String SUCCESS = "success";
     public static final String USER_STATUS_PREFIX = "user_status_";