فهرست منبع

fix:调整注册时间返回类型

liusw 6 سال پیش
والد
کامیت
e805aa4868

+ 1 - 1
sso-server/src/main/java/com/uas/sso/controller/BaseController.java

@@ -166,7 +166,7 @@ public class BaseController {
         sendSms("templateForSendSmsAboutValidAllCode", mobile, new Object[]{code});
 
         // 邮件
-        sendEmail("templateForSendEmailWhenRegister", email, data);
+//        sendEmail("templateForSendEmailWhenRegister", email, data);
 
         // 返回tokenId
         return token.getId();

+ 9 - 2
sso-server/src/main/java/com/uas/sso/sync/entity/SyncUser.java

@@ -8,6 +8,9 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import org.hibernate.annotations.Cache;
 
@@ -291,8 +294,12 @@ public class SyncUser implements Serializable {
         this.salt = salt;
     }
 
-    public Timestamp getRegisterDate() {
-        return registerDate;
+    public String getRegisterDate() {
+        String registerDateString = null;
+        if (registerDate != null) {
+            registerDateString = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date(registerDate.getTime()));
+        }
+        return registerDateString;
     }
 
     public void setRegisterDate(Timestamp registerDate) {

+ 8 - 2
sso-server/src/main/java/com/uas/sso/sync/entity/SyncUserspace.java

@@ -7,6 +7,8 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -264,8 +266,12 @@ public class SyncUserspace {
         this.corporation = corporation;
     }
 
-    public Timestamp getRegisterDate() {
-        return registerDate;
+    public String getRegisterDate() {
+        String registerDateString = null;
+        if (registerDate != null) {
+            registerDateString = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date(registerDate.getTime()));
+        }
+        return registerDateString;
     }
 
     public void setRegisterDate(Timestamp registerDate) {

+ 1 - 1
sso-server/src/main/java/com/uas/sso/sync/service/impl/SyncSsoServiceImpl.java

@@ -80,7 +80,7 @@ public class SyncSsoServiceImpl implements SyncSsoService {
         }
         AccountCenterLoginState accountCenterLoginState = new AccountCenterLoginState();
         accountCenterLoginState.setEnuu(spaceUU.intValue());
-        accountCenterLoginState.setEnuu(userUU.intValue());
+        accountCenterLoginState.setUu(userUU.intValue());
         String token = UUID.randomUUID().toString();
         accountCenterLoginState.setToken(token);