解决h2db升级失败问题

Author: heavyrian2012

src/main/java/cn/wildfirechat/app/jpa/UserPassword.java

@@ -24,14 +24,16 @@ public class UserPassword {
 
 	private long lastTryTime;
 
-	/** 密码最后一次更新时间（毫秒时间戳），0 表示从未设置过密码或历史数据无记录 */
-	private long passwordUpdateTime;
+	/** 密码最后一次更新时间（毫秒时间戳），0 或 null 表示从未设置过密码或历史数据无记录 */
+	private Long passwordUpdateTime;
 
 	public UserPassword() {
+		this.passwordUpdateTime = 0L;
 	}
 
 	public UserPassword(String userId) {
 		this.userId = userId;
+		this.passwordUpdateTime = 0L;
 	}
 
 	public UserPassword(String userId, String password, String salt) {
@@ -41,6 +43,7 @@ public UserPassword(String userId, String password, String salt) {
 		this.resetCodeTime = 0;
 		this.tryCount = 0;
 		this.lastTryTime = 0;
+		this.passwordUpdateTime = 0L;
 	}
 
 	public UserPassword(String userId, String password, String salt, String resetCode, long resetCodeTime) {
@@ -51,6 +54,7 @@ public UserPassword(String userId, String password, String salt, String resetCod
 		this.resetCodeTime = resetCodeTime;
 		this.tryCount = 0;
 		this.lastTryTime = 0;
+		this.passwordUpdateTime = 0L;
 	}
 
 	public String getUserId() {
@@ -110,7 +114,7 @@ public void setLastTryTime(long lastTryTime) {
 	}
 
 	public long getPasswordUpdateTime() {
-		return passwordUpdateTime;
+		return passwordUpdateTime == null ? 0L : passwordUpdateTime;
 	}
 
 	public void setPasswordUpdateTime(long passwordUpdateTime) {

src/test/java/cn/wildfirechat/app/jpa/UserPasswordTest.java

@@ -19,6 +19,7 @@ public void testDefaultConstructor() {
         assertEquals(0, userPassword.getTryCount());
         assertEquals(0L, userPassword.getResetCodeTime());
         assertEquals(0L, userPassword.getLastTryTime());
+        assertEquals(0L, userPassword.getPasswordUpdateTime());
     }
 
     @Test
@@ -33,6 +34,7 @@ public void testConstructorWithUserId() {
         assertEquals(userId, userPassword.getUserId());
         assertNull(userPassword.getPassword());
         assertEquals(0, userPassword.getTryCount());
+        assertEquals(0L, userPassword.getPasswordUpdateTime());
     }
 
     @Test
@@ -54,6 +56,7 @@ public void testConstructorWithAllParams() {
         assertEquals(resetCode, userPassword.getResetCode());
         assertEquals(resetCodeTime, userPassword.getResetCodeTime());
         assertEquals(0, userPassword.getTryCount());
+        assertEquals(0L, userPassword.getPasswordUpdateTime());
     }
 
     @Test
@@ -69,6 +72,7 @@ public void testSettersAndGetters() {
         userPassword.setResetCodeTime(1234567890L);
         userPassword.setTryCount(5);
         userPassword.setLastTryTime(9876543210L);
+        userPassword.setPasswordUpdateTime(1111111111L);
 
         // Then
         assertEquals("user456", userPassword.getUserId());
@@ -78,13 +82,15 @@ public void testSettersAndGetters() {
         assertEquals(1234567890L, userPassword.getResetCodeTime());
         assertEquals(5, userPassword.getTryCount());
         assertEquals(9876543210L, userPassword.getLastTryTime());
+        assertEquals(1111111111L, userPassword.getPasswordUpdateTime());
     }
 
     @Test
     public void testTryCountIncrementation() {
         // Given
         UserPassword userPassword = new UserPassword("user", "pass", "salt");
         assertEquals(0, userPassword.getTryCount());
+        assertEquals(0L, userPassword.getPasswordUpdateTime());
 
         // When - increment from constructor default (0)
         userPassword.setTryCount(userPassword.getTryCount() + 1);