Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	README.md

pom.xml

@@ -66,12 +66,6 @@
 			<version>3.1.0</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.16.6</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

src/main/java/love/sola/netsupport/api/Error.java

@@ -28,7 +28,7 @@ public class Error {
     public static final Object OK = new Object();
     public static final Error PARAMETER_REQUIRED = new Error(-1);
     public static final Error ILLEGAL_PARAMETER = new Error(-2);
-//	public static final Error REQUEST_FAILED = new Error(-3); REMOVED
+    //	public static final Error REQUEST_FAILED = new Error(-3); REMOVED
     public static final Error LENGTH_LIMIT_EXCEEDED = new Error(-4);
     public static final Error INVALID_PARAMETER = new Error(-5);
     public static final Error USER_NOT_FOUND = new Error(-11);

src/main/java/love/sola/netsupport/api/manager/TicketPush.java

@@ -62,7 +62,7 @@ public class TicketPush extends API {
             if (u == null) {
                 return Error.USER_NOT_FOUND;
             }
-			Ticket t = new Ticket(null, u, desc, null, "Pushed By Admin", null, op, Status.UNCHECKED);
+            Ticket t = new Ticket(u, desc, null, "Pushed By Admin", null, op, Status.UNCHECKED);
             s.save(t);
             s.getTransaction().commit();
             return t;

src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java

@@ -67,14 +67,12 @@ public class ToolsCheck extends API {
         try (Session s = SQLCore.sf.openSession()) {
             s.beginTransaction();
             s.save(new love.sola.netsupport.pojo.ToolsCheck(
-							null,
                     op,
                     op.getBlock(),
                     new Date(),
                     status,
                     remark
-					)
+            ));
-			);
             s.getTransaction().commit();
             return Error.OK;
         }

src/main/java/love/sola/netsupport/config/Cortana.java

@@ -17,7 +17,6 @@
 
 package love.sola.netsupport.config;
 
-import lombok.Data;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.InputStream;
@@ -42,15 +41,19 @@ public class Cortana {
         String[] replies;
     }
 
-	@Data
     public static class Rule {
         String[] regexp;
         String[] replies;
+
+        public Rule() {
+        }
     }
 
-	@Data
     public static class RawConfig {
         Map<String, Rule> rules;
+
+        public RawConfig() {
+        }
     }
 
 }

src/main/java/love/sola/netsupport/config/Settings.java

@@ -17,13 +17,11 @@
 
 package love.sola.netsupport.config;
 
-import lombok.ToString;
 import love.sola.netsupport.sql.TableConfig;
 
 /**
  * @author Sola {@literal <dev@sola.love>}
  */
-@ToString
 public class Settings {
 
     public static final int MAX_DESC_LENGTH = 255;
@@ -34,9 +32,6 @@ public class Settings {
         I = TableConfig.getSettings();
     }
 
-	// -------------------------------------------- //
-	// CONFIGURATIONS
-	// -------------------------------------------- //
     public String Wechat_AppId;
     public String Wechat_Secret;
     public String Wechat_Token;
@@ -53,4 +48,17 @@ public class Settings {
         I = this;
     }
 
+    @Override
+    public String toString() {
+        return "Settings{" +
+                "Wechat_AppId='" + Wechat_AppId + '\'' +
+                ", Wechat_Secret='" + Wechat_Secret + '\'' +
+                ", Wechat_Token='" + Wechat_Token + '\'' +
+                ", Wechat_AesKey='" + Wechat_AesKey + '\'' +
+                ", Check_Spam_Cache_Expire_Time=" + Check_Spam_Cache_Expire_Time +
+                ", Check_Spam_Interval=" + Check_Spam_Interval +
+                ", User_Session_Max_Inactive=" + User_Session_Max_Inactive +
+                ", User_Wechat_Cache_Expire_Time=" + User_Wechat_Cache_Expire_Time +
+                '}';
+    }
 }

src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java

@@ -19,7 +19,6 @@ package love.sola.netsupport.config;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import lombok.ToString;
 import me.chanjar.weixin.common.util.xml.XStreamInitializer;
 import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
 
@@ -29,7 +28,6 @@ import java.io.InputStream;
  * @author chanjarster
  */
 @XStreamAlias("wechat-config")
-@ToString
 public class WxMpXmlInMemoryConfigStorage extends WxMpInMemoryConfigStorage {
 
     @SuppressWarnings("unchecked")

src/main/java/love/sola/netsupport/pojo/Operator.java

@@ -18,10 +18,6 @@
 package love.sola.netsupport.pojo;
 
 import com.google.gson.annotations.Expose;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -31,17 +27,16 @@ import javax.persistence.Table;
 /**
  * @author Sola {@literal <dev@sola.love>}
  */
-
-@Data
-@ToString(exclude = "password")
-@AllArgsConstructor
-@NoArgsConstructor
 @Entity
 @Table(name = "operators")
 public class Operator {
 
     public static final String PROPERTY_WECHAT = "wechat";
 
+    //System Accounts
+    public static Operator USER_SELF;
+    public static Operator ADMIN;
+
     @Id
     @Column(name = "id", nullable = false, insertable = false, updatable = false)
     private Integer id;
@@ -57,9 +52,84 @@ public class Operator {
     @Expose(serialize = false)
     private String password;
 
+    public Operator(Integer id, String name, Integer access, String wechat, Integer block, Integer week, String password) {
+        this.id = id;
+        this.name = name;
+        this.access = access;
+        this.wechat = wechat;
+        this.block = block;
+        this.week = week;
+        this.password = password;
+    }
 
-	//System Accounts
+    public Operator() {
-	public static Operator USER_SELF;
+    }
-	public static Operator ADMIN;
 
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getAccess() {
+        return access;
+    }
+
+    public void setAccess(Integer access) {
+        this.access = access;
+    }
+
+    public String getWechat() {
+        return wechat;
+    }
+
+    public void setWechat(String wechat) {
+        this.wechat = wechat;
+    }
+
+    public Integer getBlock() {
+        return block;
+    }
+
+    public void setBlock(Integer block) {
+        this.block = block;
+    }
+
+    public Integer getWeek() {
+        return week;
+    }
+
+    public void setWeek(Integer week) {
+        this.week = week;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public String toString() {
+        return "Operator{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", access=" + access +
+                ", wechat='" + wechat + '\'' +
+                ", block=" + block +
+                ", week=" + week +
+                '}';
+    }
 }

src/main/java/love/sola/netsupport/pojo/Ticket.java

@@ -17,9 +17,6 @@
 
 package love.sola.netsupport.pojo;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import love.sola.netsupport.sql.TableTicket;
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.RelationTargetAuditMode;
@@ -30,9 +27,6 @@ import java.util.Date;
 /**
  * @author Sola {@literal <dev@sola.love>}
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Entity
 @Table(name = "tickets")
 @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
@@ -58,4 +52,94 @@ public class Ticket {
     private Operator operator;
     private Integer status;
 
+    public Ticket() {
+    }
+
+    public Ticket(User user, String description, Date submitTime, String remark, Date updateTime, Operator operator, Integer status) {
+        this.user = user;
+        this.description = description;
+        this.submitTime = submitTime;
+        this.remark = remark;
+        this.updateTime = updateTime;
+        this.operator = operator;
+        this.status = status;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Date getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Operator getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Operator operator) {
+        this.operator = operator;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "Ticket{" +
+                "id=" + id +
+                ", user=" + user +
+                ", description='" + description + '\'' +
+                ", submitTime=" + submitTime +
+                ", remark='" + remark + '\'' +
+                ", updateTime=" + updateTime +
+                ", operator=" + operator +
+                ", status=" + status +
+                '}';
+    }
 }

src/main/java/love/sola/netsupport/pojo/ToolsCheck.java

@@ -1,8 +1,5 @@
 package love.sola.netsupport.pojo;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 
@@ -12,9 +9,6 @@ import java.util.Date;
 /**
  * @author Sola {@literal <dev@sola.love>}
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Entity
 @Table(name = "toolschk", indexes = {
         @Index(columnList = "block,chktime,status"),
@@ -37,4 +31,75 @@ public class ToolsCheck {
     private Integer status = 0;
     private String remark;
 
+
+    public ToolsCheck() {
+    }
+
+    public ToolsCheck(Operator operator, Integer block, Date checkTime, Integer status, String remark) {
+        this.operator = operator;
+        this.block = block;
+        this.checkTime = checkTime;
+        this.status = status;
+        this.remark = remark;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Operator getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Operator operator) {
+        this.operator = operator;
+    }
+
+    public Integer getBlock() {
+        return block;
+    }
+
+    public void setBlock(Integer block) {
+        this.block = block;
+    }
+
+    public Date getCheckTime() {
+        return checkTime;
+    }
+
+    public void setCheckTime(Date checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "ToolsCheck{" +
+                "id=" + id +
+                ", operator=" + operator +
+                ", block=" + block +
+                ", checkTime=" + checkTime +
+                ", status=" + status +
+                ", remark='" + remark + '\'' +
+                '}';
+    }
 }

src/main/java/love/sola/netsupport/pojo/User.java

@@ -18,9 +18,6 @@
 package love.sola.netsupport.pojo;
 
 import com.google.gson.annotations.Expose;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import love.sola.netsupport.enums.ISP;
 import love.sola.netsupport.enums.ISPConverter;
 
@@ -29,13 +26,15 @@ import javax.persistence.*;
 /**
  * @author Sola {@literal <dev@sola.love>}
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Entity
 @Table(name = "users")
 public class User {
 
+    //System Accounts
+    public static User OFFICIAL_CHINA_UNICOM_XH;
+    public static User OFFICIAL_CHINA_MOBILE_XH;
+    public static User OFFICIAL_CHINA_MOBILE_FX;
+
     public static final String PROPERTY_NAME = "name";
     public static final String PROPERTY_WECHAT = "wechatId";
     public static final String PROPERTY_BLOCK = "block";
@@ -56,10 +55,95 @@ public class User {
     private Integer room;
     private Long phone;
 
+    public User() {
+    }
 
-	//System Accounts
+    public User(Long id, String name, ISP isp, String netAccount, String wechatId, Integer block, Integer room, Long phone) {
-	public static User OFFICIAL_CHINA_UNICOM_XH;
+        this.id = id;
-	public static User OFFICIAL_CHINA_MOBILE_XH;
+        this.name = name;
-	public static User OFFICIAL_CHINA_MOBILE_FX;
+        this.isp = isp;
+        this.netAccount = netAccount;
+        this.wechatId = wechatId;
+        this.block = block;
+        this.room = room;
+        this.phone = phone;
+    }
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ISP getIsp() {
+        return isp;
+    }
+
+    public void setIsp(ISP isp) {
+        this.isp = isp;
+    }
+
+    public String getNetAccount() {
+        return netAccount;
+    }
+
+    public void setNetAccount(String netAccount) {
+        this.netAccount = netAccount;
+    }
+
+    public String getWechatId() {
+        return wechatId;
+    }
+
+    public void setWechatId(String wechatId) {
+        this.wechatId = wechatId;
+    }
+
+    public Integer getBlock() {
+        return block;
+    }
+
+    public void setBlock(Integer block) {
+        this.block = block;
+    }
+
+    public Integer getRoom() {
+        return room;
+    }
+
+    public void setRoom(Integer room) {
+        this.room = room;
+    }
+
+    public Long getPhone() {
+        return phone;
+    }
+
+    public void setPhone(Long phone) {
+        this.phone = phone;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", isp=" + isp +
+                ", netAccount='" + netAccount + '\'' +
+                ", wechatId='" + wechatId + '\'' +
+                ", block=" + block +
+                ", room=" + room +
+                ", phone=" + phone +
+                '}';
+    }
 }

src/main/java/love/sola/netsupport/session/MapSession.java

@@ -32,31 +32,18 @@
  */
 package love.sola.netsupport.session;
 
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.*;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
 
 /**
  * @author Sola {@literal <dev@sola.love>}
  */
-@EqualsAndHashCode(of = "id")
 public final class MapSession implements WxSession, Serializable {
 
-	@Getter
     private final String id;
     private Map<String, Object> sessionAttrs = new HashMap<String, Object>();
-	@Getter
     private long creationTime = System.currentTimeMillis();
-	@Getter
-	@Setter
     private long lastAccessedTime = creationTime;
-	@Getter
     private boolean invalidated = false;
 
     /**
@@ -102,4 +89,38 @@ public final class MapSession implements WxSession, Serializable {
         invalidated = true;
     }
 
+    public long getLastAccessedTime() {
+        return lastAccessedTime;
+    }
+
+    public void setLastAccessedTime(long lastAccessedTime) {
+        this.lastAccessedTime = lastAccessedTime;
+    }
+
+    @Override
+    public String getId() {
+
+        return id;
+    }
+
+    public long getCreationTime() {
+        return creationTime;
+    }
+
+    public boolean isInvalidated() {
+        return invalidated;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MapSession)) return false;
+        MapSession that = (MapSession) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }

src/main/java/love/sola/netsupport/wechat/handler/admin/SignHandler.java

@@ -35,8 +35,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * @deprecated limited time only
  * @author Sola {@literal <dev@sola.love>}
+ * @deprecated limited time only
  */
 @Deprecated
 public class SignHandler implements WxMpMessageHandler {

src/test/java/love/sola/netsupport/util/EncryptTest.java

@@ -26,7 +26,7 @@ public class EncryptTest {
         assert "Encrypt".equals(RSAUtil.decrypt(RSAUtil.encrypt("Encrypt")));
     }
 
-//	@Test
+    //	@Test
     public void testRSASpecKey() throws NoSuchAlgorithmException, InvalidKeySpecException {
         System.out.println("RSAUtil.privateKey_s = " + RSAUtil.privateKey_s);
         System.out.println("RSAUtil.publicKey_s = " + RSAUtil.publicKey_s);