lixing hace 4 años
padre
commit
22aedb811b

+ 1 - 1
fm-common/src/main/java/com/persagy/fm/common/model/entity/BaseEntity.java

@@ -49,7 +49,7 @@ public abstract class BaseEntity<T> extends Model implements IBaseEntity,Seriali
 
 	/** 实体状态 - 有效标识 */
 	@TableField(fill = FieldFill.INSERT)
-	protected int valid;
+	protected Integer valid;
 
 	@Override
 	public boolean equals (Object obj) {

+ 2 - 2
fm-common/src/main/java/com/persagy/fm/common/model/entity/IBaseEntity.java

@@ -38,12 +38,12 @@ public interface IBaseEntity extends Comparable<IBaseEntity>{
 	 * 取得实体状态
 	 * @return 实体状态
 	 */
-	int getValid();
+	Integer getValid();
 
 	/**
 	 * 设置实体状态
 	 * @param status 实体状态
 	 */
-	void setValid(int status);
+	void setValid(Integer status);
 	
 }

+ 1 - 1
fm-common/src/main/java/com/persagy/fm/common/utils/SecureAES.java

@@ -120,7 +120,7 @@ public class SecureAES {
 			throw new AESDecryptException("token is null");
 		}
 		String[] tokens = headerToken.split("\\.");
-		if (tokens.length != 2) {
+		if (tokens.length < 2) {
 			throw new AESDecryptException("token invalid parameter");
 		}
 		String encryptAccount = tokens[0];			// 加密的账号信息