From b53ee9dc413e066675129476ad2952fa0ab2a65c Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Fri, 26 Mar 2021 10:44:54 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=B7=AF=E5=BE=84=20/user/nickname=20->=20/user/accou?=
 =?UTF-8?q?nt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/archive/list.vue                 |  2 +-
 components/common/user/list.vue             |  2 +-
 components/layouts/mobile/header.vue        | 14 +++++++++++++-
 components/layouts/pc/header.vue            | 14 +++++++++++++-
 pages/admin/users.vue                       |  2 +-
 pages/article/_article_id.vue               |  2 +-
 pages/article/post/_article_id.vue          |  1 -
 pages/chats/{_nickname.vue => _account.vue} |  8 ++++----
 pages/login.vue                             |  3 ++-
 pages/portfolio/_portfolio_id.vue           |  2 +-
 pages/user/{_nickname.vue => _account.vue}  | 16 ++++++++--------
 plugins/sockjs.js                           |  4 ++--
 store/user.js                               | 12 ++++++------
 13 files changed, 53 insertions(+), 29 deletions(-)
 rename pages/chats/{_nickname.vue => _account.vue} (97%)
 rename pages/user/{_nickname.vue => _account.vue} (96%)

diff --git a/components/archive/list.vue b/components/archive/list.vue
index 36256cb..111472d 100644
--- a/components/archive/list.vue
+++ b/components/archive/list.vue
@@ -31,7 +31,7 @@
               </el-col>
               <el-col :xs="16" :sm="16" :xl="16">
                 <div>
-                  <el-link rel="nofollow" @click="onRouter('user', article.articleAuthorName)" :underline="false"
+                  <el-link rel="nofollow" @click="onRouter('user', article.articleAuthor.userAccount)" :underline="false"
                            class="text-default">
                     {{ article.articleAuthorName }}
                   </el-link>
diff --git a/components/common/user/list.vue b/components/common/user/list.vue
index 4f3c952..d0ff3ed 100644
--- a/components/common/user/list.vue
+++ b/components/common/user/list.vue
@@ -7,7 +7,7 @@
         </el-col>
         <el-col :span="21">
           <div>
-            <el-link rel="nofollow" @click="onRouter(user.nickname)" :underline="false" class="text-default">
+            <el-link rel="nofollow" @click="onRouter(user.account)" :underline="false" class="text-default">
               {{ user.nickname }}
             </el-link>
             <small class="d-block text-muted">{{ user.signature }}</small>
diff --git a/components/layouts/mobile/header.vue b/components/layouts/mobile/header.vue
index ae7ddd3..d3363fa 100644
--- a/components/layouts/mobile/header.vue
+++ b/components/layouts/mobile/header.vue
@@ -106,6 +106,18 @@
         }
         return _ts.$store.state.userInfo?.nickname;
       },
+      account() {
+        let _ts = this;
+        if (isBrowser) {
+          if (!_ts.$store.state.userInfo) {
+            let user = localStorage.getItem('user');
+            if (user) {
+              _ts.$store.commit('setUser', JSON.parse(user))
+            }
+          }
+        }
+        return _ts.$store.state.userInfo?.account;
+      },
       hasPermissions() {
         return this.$store.getters.hasPermissions('blog_admin');
       }
@@ -154,7 +166,7 @@
         switch (item) {
           case 'user':
             _ts.$router.push({
-              path: '/user/' + _ts.nickname
+              path: '/user/' + _ts.account
             })
             break;
           case 'user-info':
diff --git a/components/layouts/pc/header.vue b/components/layouts/pc/header.vue
index 32418dd..05b2ead 100644
--- a/components/layouts/pc/header.vue
+++ b/components/layouts/pc/header.vue
@@ -142,6 +142,18 @@ export default {
       }
       return _ts.$store.state.userInfo?.nickname;
     },
+    account() {
+      let _ts = this;
+      if (isBrowser) {
+        if (!_ts.$store.state.userInfo) {
+          let user = localStorage.getItem('user');
+          if (user) {
+            _ts.$store.commit('setUser', JSON.parse(user))
+          }
+        }
+      }
+      return _ts.$store.state.userInfo?.account;
+    },
     hasPermissions() {
       return this.$store.getters.hasPermissions('blog_admin');
     }
@@ -219,7 +231,7 @@ export default {
       switch (item) {
         case 'user':
           _ts.$router.push({
-            path: '/user/' + _ts.nickname
+            path: '/user/' + _ts.account
           })
           break;
         case 'user-info':
diff --git a/pages/admin/users.vue b/pages/admin/users.vue
index 09c2174..d727808 100644
--- a/pages/admin/users.vue
+++ b/pages/admin/users.vue
@@ -29,7 +29,7 @@
           width="180"
           prop="nickname">
           <template slot-scope="scope">
-            <el-link type="primary" :href="getUserPath(scope.row.nickname)" :underline="false">
+            <el-link type="primary" :href="getUserPath(scope.row.account)" :underline="false">
               {{ scope.row.nickname }}
             </el-link>
           </template>
diff --git a/pages/article/_article_id.vue b/pages/article/_article_id.vue
index 5741d01..7bb74b3 100644
--- a/pages/article/_article_id.vue
+++ b/pages/article/_article_id.vue
@@ -17,7 +17,7 @@
               </el-col>
               <el-col :xs="9" :sm="11" :xl="11">
                 <div style="margin-left: 1rem;">
-                  <el-link rel="nofollow" @click="onRouter('user', article.articleAuthorName)" :underline="false"
+                  <el-link rel="nofollow" @click="onRouter('user', article.articleAuthor.userAccount)" :underline="false"
                            class="text-default">{{ article.articleAuthorName }}
                   </el-link>
                   <small class="d-block text-muted">{{ article.timeAgo }}</small>
diff --git a/pages/article/post/_article_id.vue b/pages/article/post/_article_id.vue
index 23006ee..be31e60 100644
--- a/pages/article/post/_article_id.vue
+++ b/pages/article/post/_article_id.vue
@@ -48,7 +48,6 @@
 <script>
   import Vue from 'vue';
   import {mapState} from 'vuex';
-  import { isBrowser } from '~/environment'
 
   export default {
     name: "PostArticle",
diff --git a/pages/chats/_nickname.vue b/pages/chats/_account.vue
similarity index 97%
rename from pages/chats/_nickname.vue
rename to pages/chats/_account.vue
index b1939cb..d2e2f69 100644
--- a/pages/chats/_nickname.vue
+++ b/pages/chats/_account.vue
@@ -9,7 +9,7 @@
       </el-col>
       <el-col style="margin-top: 2rem;" id="messagesContent">
         <el-col v-for="message in Array.prototype.reverse.call(messages)" :key="message.dataId">
-          <el-col v-if="message.from === user.nickname">
+          <el-col v-if="message.from === user.account">
             <el-col :span="22" style="text-align: right;">
               <div class="from-message">
                 <div v-html="message.content"></div>
@@ -156,8 +156,8 @@ export default {
     async send() {
       let _ts = this;
       const message = {
-        to: _ts.to.nickname,
-        from: _ts.user.nickname,
+        to: _ts.to.account,
+        from: _ts.user.account,
         dataType: 1,
         dataId: new Date().getTime(),
         content: await _ts.contentEditor.getHTML()
@@ -172,7 +172,7 @@ export default {
     _ts.$store.commit('setActiveMenu', 'post-article');
 
     let to = {
-      nickname: _ts.$route.params?.nickname
+      account: _ts.$route.params?.account
     }
 
     _ts.$set(_ts, 'to', to);
diff --git a/pages/login.vue b/pages/login.vue
index 069aeaf..34f7b2f 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -108,7 +108,8 @@ export default {
 
               let user = {
                 nickname: res.user.nickname,
-                avatarURL: res.user.avatarUrl
+                avatarURL: res.user.avatarUrl,
+                account: res.user.account
               }
               _ts.$store.commit('setAuth', auth) // mutating to store for client rendering
               localStorage.setItem('user', JSON.stringify(user))
diff --git a/pages/portfolio/_portfolio_id.vue b/pages/portfolio/_portfolio_id.vue
index 204b0a5..47fcaaf 100644
--- a/pages/portfolio/_portfolio_id.vue
+++ b/pages/portfolio/_portfolio_id.vue
@@ -7,7 +7,7 @@
         </el-col>
         <el-col style="margin-bottom: .5rem;">
           <span class="text-default" style="padding-right: 1rem;">作者</span>
-          <el-link rel="nofollow" @click="onRouter('user', portfolio.portfolioAuthorName)" :underline="false" class="text-default">
+          <el-link rel="nofollow" @click="onRouter('user', portfolio.portfolioAuthor.userAccount)" :underline="false" class="text-default">
             <el-avatar :src="portfolio.portfolioAuthorAvatarUrl" :size="16"></el-avatar>
             {{ portfolio.portfolioAuthorName }}
           </el-link>
diff --git a/pages/user/_nickname.vue b/pages/user/_account.vue
similarity index 96%
rename from pages/user/_nickname.vue
rename to pages/user/_account.vue
index 2284fcc..dff04b0 100644
--- a/pages/user/_nickname.vue
+++ b/pages/user/_account.vue
@@ -35,7 +35,7 @@
             <div v-if="oauth.idUser !== user.idUser">
               <el-button type="primary" v-if="isFollow" @click="cancelFollowUser(user.idUser)" plain>取消关注</el-button>
               <el-button type="primary" v-else @click="followUser(user.idUser)" plain>关注</el-button>
-              <el-button @click="gotoChats" plain>聊天</el-button>
+              <el-button v-show="false" @click="gotoChats" plain>聊天</el-button>
             </div>
           </div>
           <div v-else>
@@ -89,7 +89,7 @@ export default {
   name: "User",
   components: {ArticleList, PortfolioList, UserList},
   validate({params, store}) {
-    return params.nickname
+    return params.account
   },
   fetch({store, params, query, error}) {
     params.page = query.page || 1
@@ -112,25 +112,25 @@ export default {
       switch (_ts.activeTab) {
         case "0":
           _ts.$store.dispatch('user/fetchArticleList', {
-            nickname: _ts.$route.params.nickname,
+            account: _ts.$route.params.account,
             page: _ts.$route.query.page || 1
           })
           break;
         case "1":
           _ts.$store.dispatch('user/fetchPortfolioList', {
-            nickname: _ts.$route.params.nickname,
+            account: _ts.$route.params.account,
             page: _ts.$route.query.page || 1
           })
           break;
         case "2":
           _ts.$store.dispatch('user/fetchFollowerList', {
-            nickname: _ts.$route.params.nickname,
+            account: _ts.$route.params.account,
             page: _ts.$route.query.page || 1
           })
           break;
         default:
           _ts.$store.dispatch('user/fetchFollowingList', {
-            nickname: _ts.$route.params.nickname,
+            account: _ts.$route.params.account,
             page: _ts.$route.query.page || 1
           })
           break
@@ -181,14 +181,14 @@ export default {
     },
     onRouter(key, page) {
       this.$router.push({
-        path: `/user/${this.$route.params.nickname}?tab=${key}&page=${page}`
+        path: `/user/${this.$route.params.account}?tab=${key}&page=${page}`
       })
 
     },
     gotoChats() {
       let _ts = this;
       _ts.$router.push({
-        path: `/chats/${_ts.user.nickname}`
+        path: `/chats/${_ts.user.account}`
       })
     },
     followUser(idUser) {
diff --git a/plugins/sockjs.js b/plugins/sockjs.js
index 1fc9bad..0062489 100644
--- a/plugins/sockjs.js
+++ b/plugins/sockjs.js
@@ -25,14 +25,14 @@ export default {
     }, _ts.headers);
     _ts.stompClient.subscribe('/topic/greening', (msg) => {
       console.log('pub', JSON.parse(msg.body));
-    });
+    }, _ts.headers);
   },
   initSocket: function (user) {
     let _ts = this;
     _ts.socket = new SockJS(apiConfig.SOCKET);
     _ts.stompClient = Stomp.over(_ts.socket);
     let headers = {
-      id: user.nickname
+      id: user.account
     }
     _ts.headers = headers;
     _ts.stompClient.connect(_ts.headers, () => {
diff --git a/store/user.js b/store/user.js
index c2b2c76..e30d571 100644
--- a/store/user.js
+++ b/store/user.js
@@ -58,7 +58,7 @@ export const actions = {
   fetchDetail({ commit }, params) {
     commit('updateFetching', true);
     return this.$axios
-      .$get(`${USER_API_PATH}/${params.nickname}`)
+      .$get(`${USER_API_PATH}/${params.account}`)
       .then(response => {
         commit('updateDetailData', response)
         commit('updateFetching', false)
@@ -70,7 +70,7 @@ export const actions = {
   fetchUserExtend({ commit }, params) {
     commit('updateFetching', true);
     return this.$axios
-      .$get(`${USER_API_PATH}/${params.nickname}/user-extend`)
+      .$get(`${USER_API_PATH}/${params.account}/user-extend`)
       .then(response => {
         commit('updateUserExtendData', response)
         commit('updateFetching', false)
@@ -82,7 +82,7 @@ export const actions = {
   fetchArticleList({commit}, params) {
     commit('updateFetching', true);
     return this.$axios
-      .$get(`${USER_API_PATH}/${params.nickname}/articles`, {
+      .$get(`${USER_API_PATH}/${params.account}/articles`, {
         params: {
           page: params.page
         }
@@ -98,7 +98,7 @@ export const actions = {
   fetchPortfolioList({commit}, params) {
     commit('updateFetching', true);
     return this.$axios
-      .$get(`${USER_API_PATH}/${params.nickname}/portfolios`, {
+      .$get(`${USER_API_PATH}/${params.account}/portfolios`, {
         params: {
           page: params.page
         }
@@ -118,7 +118,7 @@ export const actions = {
       pagination: {}
     })
     return this.$axios
-      .$get(`${USER_API_PATH}/${params.nickname}/followers`, {
+      .$get(`${USER_API_PATH}/${params.account}/followers`, {
         params: {
           page: params.page
         }
@@ -138,7 +138,7 @@ export const actions = {
       pagination: {}
     })
     return this.$axios
-      .$get(`${USER_API_PATH}/${params.nickname}/followings`, {
+      .$get(`${USER_API_PATH}/${params.account}/followings`, {
         params: {
           page: params.page
         }