修改用户认证信息时间显示

sso-manage-console-web/src/components/accounts/users/UserBasicInfo.vue

@@ -60,12 +60,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="注册时间">
-          <!-- TODO 注册时间 -->
-          <div>2017-06-11 12:51:44</div>
+          <div v-text="formatDate(userInfo.registerDate)"></div>
         </el-form-item>
         <el-form-item label="上次登录">
-          <!-- TODO 上次登录 -->
-          <div>2017-06-11 12:51:44</div>
+          <div v-text="formatDate(userInfo.lastLoginTime)"></div>
         </el-form-item>
         <el-form-item label="注册来源">
           <div>{{ userInfo.fromApp }}</div>
@@ -84,6 +82,7 @@
 <script>
   import _ from 'lodash'
   import axios from '@/assets/js/axios'
+  import { formatDate } from '@/assets/js/utils'
 
   export default {
     name: 'user-basic-info',
@@ -120,6 +119,9 @@
         }
 
         axios.put('/api/user//modifyUserInfo', data).then(success).catch(error)
+      },
+      formatDate (timestamp) {
+        return formatDate(null, null, timestamp)
       }
     },
     mounted () {

sso-manage-console-web/src/components/accounts/users/UserHome.vue

@@ -78,8 +78,9 @@
           width="160">
         </el-table-column>
         <el-table-column
-          prop="lastLogin"
-          label="上次登录">
+          prop="lastLoginTime"
+          label="上次登录"
+          :formatter="formatDate">
         </el-table-column>
         <el-table-column
           prop="fromApp"

sso-server/src/main/java/com/uas/sso/entity/User.java

@@ -11,6 +11,7 @@ import javax.persistence.*;
 
 import com.uas.sso.core.Const;
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 用户信息
@@ -472,6 +473,14 @@ public class User implements Serializable {
         this.questions = questions;
     }
 
+    public Timestamp getLastLoginTime() {
+        if (userRecord != null && userRecord.getLastLoginTime() != null) {
+            return userRecord.getLastLoginTime();
+        } else {
+            return null;
+        }
+    }
+
     @JsonIgnore
     @JSONField(serialize = false)
     public Set<Userspace> getUserSpaces() {