Commit 1afd7f41 authored by Liang Ding's avatar Liang Ding

🎨 Fix #12

parent 2fb63847
......@@ -173,6 +173,8 @@ public class OAuthProcessor {
}
} else {
user.put(UserExt.USER_GITHUB_ID, openId);
user.put(User.USER_NAME, userName);
user.put(UserExt.USER_AVATAR, userAvatar);
try {
userMgmtService.updateUser(user);
} catch (final Exception e) {
......@@ -185,6 +187,7 @@ public class OAuthProcessor {
}
} else {
user.put(User.USER_NAME, userName);
user.put(UserExt.USER_AVATAR, userAvatar);
try {
userMgmtService.updateUser(user);
} catch (final Exception e) {
......
......@@ -24,12 +24,12 @@
<div class="fn__clear"></div>
<div class="form form__no-table">
<div id="userUpdate" class="fn__none form form__no-table">
<label for="userNameUpdate">${userName1Label}<span style="color: #991a1a">${changeUserNameTipLabel}</span></label>
<input id="userNameUpdate" type="text"/>
<label for="userNameUpdate">${userName1Label}</label>
<input id="userNameUpdate" type="text" readonly/>
<label for="userAvatarUpdate">${userAvatar1Label}</label>
<input id="userAvatarUpdate" type="text" readonly/>
<label for="userURLUpdate">${userURL1Label}</label>
<input id="userURLUpdate" type="text"/>
<label for="userAvatarUpdate">${userAvatar1Label}</label>
<input id="userAvatarUpdate" type="text"/>
<label for="userB3KeyUpdate">B3 Key</label>
<input id="userB3KeyUpdate" type="text"/>
<br><br>
......
......@@ -24,7 +24,6 @@
# Author: Dongxu Wang
#
changeUserNameTipLabel=(Please keep the blog, community and GitHub user names in the same, otherwise it will not be able to login)
setMobileLabel=Set to mobile skin
configSiteLabel=Go to the site link to configure GitHub, Twitter, etc.
hljsThemeLabel=hljs theme:
......@@ -376,13 +375,9 @@ mobileLabel=Mobile Theme
helloWorld.title=\u4E16\u754C\uFF0C\u4F60\u597D\uFF01
helloWorld.content=Solo \u535A\u5BA2\u7CFB\u7EDF\u5DF2\u7ECF\u521D\u59CB\u5316\u5B8C\u6BD5\uFF0C\u53EF\u5728\u7BA1\u7406\u540E\u53F0 - \u5DE5\u5177 - \u504F\u597D\u8BBE\u5B9A\u4E2D\u8C03\u6574\u66F4\u591A\u7EC6\u8282\u8BBE\u7F6E\u3002\u5982\u679C\u9700\u8981\u5BFC\u5165\u5DF2\u6709\u535A\u5BA2\u6587\u7AE0\uFF0C\u8BF7\u53C2\u8003\u6587\u6863 [Hexo/Jekyll/Markdown \u6587\u4EF6\u5BFC\u5165](https://hacpai.com/article/1498490209748)\u3002\n\n\
\u5BF9\u4E86\uFF0C\u51FA\u4E8E\u5B89\u5168\u8003\u8651\u8BF7\u5C3D\u5FEB\u5B8C\u6210\u5982\u4E0B\u64CD\u4F5C\uFF1A\n\n\
1. \u4F7F\u7528 GitHub \u8D26\u53F7\u767B\u5F55[\u793E\u533A](https://hacpai.com)\n\
1. \u767B\u5F55[\u793E\u533A](https://hacpai.com)\n\
2. \u5728\u793E\u533A[\u4E2A\u4EBA\u8BBE\u7F6E - B3](https://hacpai.com/settings/b3) \u4E2D\u66F4\u65B0 B3 Key\n\
3. \u5728 Solo \u7BA1\u7406\u540E\u53F0 - \u5DE5\u5177 - \u7528\u6237\u7BA1\u7406\u4E2D\u4E5F\u8FDB\u884C\u540C\u6837\u7684 B3 Key \u66F4\u65B0\n\n\
\u53E6\u5916\uFF0CSolo \u4F1A\u6BCF\u5929\u81EA\u52A8\u5BFC\u51FA\u4F60\u7684\u535A\u5BA2\u6587\u7AE0\u5230 GitHub \u4ED3\u5E93\uFF08[\u793A\u4F8B](https://github.com/88250/solo-blog)\uFF09\uFF1A\n\n\
1. \u6709\u673A\u4F1A\u8BA9\u66F4\u591A\u4EBA\u770B\u5230\u4F60\u7684\u6587\u7AE0\n\
2. \u81EA\u52A8\u5907\u4EFD\u6587\u7AE0\u6570\u636E\n\n\
\u8BE5\u529F\u80FD\u9ED8\u8BA4\u662F\u5F00\u542F\u7684\uFF0C\u5982\u679C\u4E0D\u9700\u8981\u8BF7\u5230\u7BA1\u7406\u540E\u53F0 - \u5DE5\u5177 - \u504F\u597D\u8BBE\u5B9A - \u53C2\u6570\u8BBE\u7F6E\u4E2D\u5173\u95ED\u3002\u5F00\u542F\u65F6\u4F1A\u81EA\u52A8\u521B\u5EFA/\u66F4\u65B0 `solo-blog` \u4ED3\u5E93\uFF0C\u8BF7\u6CE8\u610F\u4F60\u6CA1\u6709\u8BE5\u540C\u540D\u4ED3\u5E93\u4EE5\u514D\u6570\u636E\u88AB\u8986\u76D6\u3002\n\n\
\u6700\u540E\uFF0C\u5982\u679C\u4F60\u89C9\u5F97 Solo \u5F88\u8D5E\uFF0C\u8BF7\u5230[\u9879\u76EE\u4E3B\u9875](https://github.com/88250/solo)\u7ED9\u9897\u661F\u9F13\u52B1\u4E00\u4E0B :heart:
helloWorld.comment.content=\u5199\u535A\u5BA2\u9700\u8981\u575A\u6301\uFF0C\u76F8\u4FE1\u79EF\u7D2F\u540E\u5FC5\u7136\u4F1A\u6709\u6536\u83B7\uFF0C\u6211\u4EEC\u4E00\u8D77\u52AA\u529B\u52A0\u6CB9 :smile:
articleContentPwd=This article need password to view.
......
......@@ -24,7 +24,6 @@
# Author: Dongxu Wang
#
changeUserNameTipLabel=\uFF08\u8BF7\u4FDD\u6301\u535A\u5BA2\u7AEF\u3001\u793E\u533A\u4EE5\u53CA GitHub \u4E09\u4E2A\u5730\u65B9\u7528\u6237\u540D\u4E00\u81F4\uFF0C\u5426\u5219\u4F1A\u5BFC\u81F4\u65E0\u6CD5\u767B\u5F55\uFF09
setMobileLabel=\u8BBE\u7F6E\u4E3A\u79FB\u52A8\u7AEF\u76AE\u80A4
configSiteLabel=\u524D\u5F80\u914D\u7F6E GitHub\uFF0CTwitter \u7B49\u7AD9\u70B9\u94FE\u63A5
hljsThemeLabel=\u4EE3\u7801\u9AD8\u4EAE\u4E3B\u9898\uFF1A
......@@ -376,13 +375,9 @@ mobileLabel=\u79FB\u52A8\u7248
helloWorld.title=\u4E16\u754C\uFF0C\u4F60\u597D\uFF01
helloWorld.content=Solo \u535A\u5BA2\u7CFB\u7EDF\u5DF2\u7ECF\u521D\u59CB\u5316\u5B8C\u6BD5\uFF0C\u53EF\u5728\u7BA1\u7406\u540E\u53F0 - \u5DE5\u5177 - \u504F\u597D\u8BBE\u5B9A\u4E2D\u8C03\u6574\u66F4\u591A\u7EC6\u8282\u8BBE\u7F6E\u3002\u5982\u679C\u9700\u8981\u5BFC\u5165\u5DF2\u6709\u535A\u5BA2\u6587\u7AE0\uFF0C\u8BF7\u53C2\u8003\u6587\u6863 [Hexo/Jekyll/Markdown \u6587\u4EF6\u5BFC\u5165](https://hacpai.com/article/1498490209748)\u3002\n\n\
\u5BF9\u4E86\uFF0C\u51FA\u4E8E\u5B89\u5168\u8003\u8651\u8BF7\u5C3D\u5FEB\u5B8C\u6210\u5982\u4E0B\u64CD\u4F5C\uFF1A\n\n\
1. \u4F7F\u7528 GitHub \u8D26\u53F7\u767B\u5F55[\u793E\u533A](https://hacpai.com)\n\
1. \u767B\u5F55[\u793E\u533A](https://hacpai.com)\n\
2. \u5728\u793E\u533A[\u4E2A\u4EBA\u8BBE\u7F6E - B3](https://hacpai.com/settings/b3) \u4E2D\u66F4\u65B0 B3 Key\n\
3. \u5728 Solo \u7BA1\u7406\u540E\u53F0 - \u5DE5\u5177 - \u7528\u6237\u7BA1\u7406\u4E2D\u4E5F\u8FDB\u884C\u540C\u6837\u7684 B3 Key \u66F4\u65B0\n\n\
\u53E6\u5916\uFF0CSolo \u4F1A\u6BCF\u5929\u81EA\u52A8\u5BFC\u51FA\u4F60\u7684\u535A\u5BA2\u6587\u7AE0\u5230 GitHub \u4ED3\u5E93\uFF08[\u793A\u4F8B](https://github.com/88250/solo-blog)\uFF09\uFF1A\n\n\
1. \u6709\u673A\u4F1A\u8BA9\u66F4\u591A\u4EBA\u770B\u5230\u4F60\u7684\u6587\u7AE0\n\
2. \u81EA\u52A8\u5907\u4EFD\u6587\u7AE0\u6570\u636E\n\n\
\u8BE5\u529F\u80FD\u9ED8\u8BA4\u662F\u5F00\u542F\u7684\uFF0C\u5982\u679C\u4E0D\u9700\u8981\u8BF7\u5230\u7BA1\u7406\u540E\u53F0 - \u5DE5\u5177 - \u504F\u597D\u8BBE\u5B9A - \u53C2\u6570\u8BBE\u7F6E\u4E2D\u5173\u95ED\u3002\u5F00\u542F\u65F6\u4F1A\u81EA\u52A8\u521B\u5EFA/\u66F4\u65B0 `solo-blog` \u4ED3\u5E93\uFF0C\u8BF7\u6CE8\u610F\u4F60\u6CA1\u6709\u8BE5\u540C\u540D\u4ED3\u5E93\u4EE5\u514D\u6570\u636E\u88AB\u8986\u76D6\u3002\n\n\
\u6700\u540E\uFF0C\u5982\u679C\u4F60\u89C9\u5F97 Solo \u5F88\u8D5E\uFF0C\u8BF7\u5230[\u9879\u76EE\u4E3B\u9875](https://github.com/88250/solo)\u7ED9\u9897\u661F\u9F13\u52B1\u4E00\u4E0B :heart:
helloWorld.comment.content=\u5199\u535A\u5BA2\u9700\u8981\u575A\u6301\uFF0C\u76F8\u4FE1\u79EF\u7D2F\u540E\u5FC5\u7136\u4F1A\u6709\u6536\u83B7\uFF0C\u6211\u4EEC\u4E00\u8D77\u52AA\u529B\u52A0\u6CB9 :smile:
articleContentPwd=\u8BE5\u6587\u7AE0\u5DF2\u7ECF\u52A0\u5BC6\u3002
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment