From 7457a300dc5ce86660a95f10b31e737e4d0d2be2 Mon Sep 17 00:00:00 2001
From: mjsoftware <1406993111@qq.com>
Date: Mon, 16 Dec 2024 18:08:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=99=BB=E5=BD=95=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E8=83=BD=E5=8A=9B=E5=8F=AF=E9=80=89=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                | 10 ++++++----
 templates/common/navbar.html | 12 +++++++-----
 templates/main/article.html  |  9 +++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 34efbb8..99cf713 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -200,12 +200,14 @@ spec:
           name: expand_login_skill
           label: 扩展登录后能力
           help: 开启后，在文章详情界面，根据作者身份显示编辑按钮。控制台按钮 - 登录组件样式 添加 新建文章 和 发布瞬间 菜单项。登录用户需要具有进入控制台的权限。
-          value: true
+          value: 'console'
           options:
-            - label: 开启
-              value: true
+            - label: 控制台
+              value: 'console'
+            - label: 个人
+              value: 'uc'
             - label: 关闭
-              value: false
+              value: 'none'
         - $formkit: radio
           name: load_progress
           label: 加载进度条
diff --git a/templates/common/navbar.html b/templates/common/navbar.html
index 2b89ac5..ce3894b 100644
--- a/templates/common/navbar.html
+++ b/templates/common/navbar.html
@@ -75,18 +75,20 @@
                th:title="${theme.config.basic_style.console.console_title}">
                 <i th:class="${#strings.defaultString(theme.config.basic_style.console.console_icon, 'ri-equalizer-line')}"></i>
             </a>
-            <div th:if="${theme.config.basic_style.show_console == 'logon'}" class="navbar-logon" trigger="hover" th:with="currentUser = ${contributorFinder.getContributor(#authentication.name)}">
+            <div th:if="${theme.config.basic_style.show_console == 'logon'}" class="navbar-logon" trigger="hover"
+                 th:with="currentUser = ${contributorFinder.getContributor(#authentication.name)},
+                         skillUrl = ${theme.config.basic_style.expand_login_skill}">
                 <div class="navbar-logon-head">
                     <img th:src="${currentUser.avatar ?: #theme.assets('/img/avatar.svg')}"
                          th:alt="${currentUser.displayName}"
                     />
                 </div>
                 <ul class="navbar-logon-group">
-                    <li th:if="${theme.config.basic_style.expand_login_skill && !#strings.isEmpty(logonUserName)}" class="navbar-logon-group-menu">
-                        <a href="/console/posts/editor" target="_blank"><i th:if="${!#strings.isEmpty(theme.config.basic_style.logon.console_person_class)}" th:class="${theme.config.basic_style.logon.console_post_class}"></i> 新建文章</a>
+                    <li th:if="${skillUrl != 'none' && !#strings.isEmpty(logonUserName)}" class="navbar-logon-group-menu">
+                        <a th:href="@{|/${skillUrl}/posts/editor|}" target="_blank"><i th:if="${!#strings.isEmpty(theme.config.basic_style.logon.console_person_class)}" th:class="${theme.config.basic_style.logon.console_post_class}"></i> 新建文章</a>
                     </li>
-                    <li th:if="${theme.config.basic_style.expand_login_skill && !#strings.isEmpty(logonUserName)}" class="navbar-logon-group-menu">
-                        <a href="/console/moments" target="_blank"><i th:if="${!#strings.isEmpty(theme.config.basic_style.logon.console_person_class)}" th:class="${theme.config.basic_style.logon.console_moment_class}"></i> 发布瞬间</a>
+                    <li th:if="${skillUrl != 'none' && !#strings.isEmpty(logonUserName)}" class="navbar-logon-group-menu">
+                        <a th:href="@{|/${skillUrl}/moments|}" target="_blank"><i th:if="${!#strings.isEmpty(theme.config.basic_style.logon.console_person_class)}" th:class="${theme.config.basic_style.logon.console_moment_class}"></i> 发布瞬间</a>
                     </li>
                     <li th:if="${!#strings.isEmpty(logonUserName)}" class="navbar-logon-group-menu">
                         <a href="/uc" target="_blank"><i th:if="${!#strings.isEmpty(theme.config.basic_style.logon.console_person_class)}" th:class="${theme.config.basic_style.logon.console_person_class}"></i> 个人中心</a>
diff --git a/templates/main/article.html b/templates/main/article.html
index 242e1c6..58b3d94 100644
--- a/templates/main/article.html
+++ b/templates/main/article.html
@@ -2,6 +2,7 @@
      th:fragment="article (post, type)"
      th:with="updateInterval = ${T(java.lang.Math).floor((#dates.createNow().getTime()/1000.0 - post.status.lastModifyTime.getEpochSecond())/86400.0).intValue()},
      isPost = ${type == 'Post'},
+     skillUrl = ${theme.config.basic_style.expand_login_skill},
      thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail + (#strings.contains(theme.config.post.default_thumbnail, '?') ? '&' : '?') + 'id=' + post.metadata.name : thumbnail.gen(post.spec.cover, 'xl')}">
 
     <div th:if="${!#strings.isEmpty(thumbnail)}" class="card widget">
@@ -19,8 +20,8 @@
                     </li>
                     <li><i class="ri-thumb-up-line"></i>[[${post.stats.upvote}]]</li>
                     <li><i class="ri-quill-pen-line"></i>[[${#strings.length(#strings.trim(post.content.content))}]]</li>
-                    <li th:if="${theme.config.basic_style.expand_login_skill && logonUserName == post.spec.owner}" class="is-hidden-laptop">
-                        <a target="_blank" title="编辑文章" th:href="@{|/console/${isPost ? 'posts' : 'single-pages'}/editor?name=${post.metadata.name}|}"><i class="ri-edit-2-line"></i>编辑</a></li>
+                    <li th:if="${logonUserName == post.spec.owner && (skillUrl == 'console' || (skillUrl == 'uc' && isPost))}" class="is-hidden-laptop">
+                        <a target="_blank" title="编辑文章" th:href="@{|/${skillUrl}/${isPost ? 'posts' : 'single-pages'}/editor?name=${post.metadata.name}|}"><i class="ri-edit-2-line"></i>编辑</a></li>
                 </ul>
             </div>
         </div>
@@ -48,8 +49,8 @@
                         </li>
                         <li><i class="ri-thumb-up-line"></i>[[${post.stats.upvote}]]</li>
                         <li><i class="ri-quill-pen-line"></i>[[${#strings.length(#strings.trim(post.content.content))}]]</li>
-                        <li th:if="${theme.config.basic_style.expand_login_skill && logonUserName == post.spec.owner}" class="is-hidden-laptop">
-                            <a target="_blank" title="编辑文章"  th:href="@{|/console/${isPost ? 'posts' : 'single-pages'}/editor?name=${post.metadata.name}|}"><i class="ri-edit-2-line"></i>编辑</a></li>
+                        <li th:if="${logonUserName == post.spec.owner && (skillUrl == 'console' || (skillUrl == 'uc' && isPost))}" class="is-hidden-laptop">
+                            <a target="_blank" title="编辑文章"  th:href="@{|/skillUrl/${isPost ? 'posts' : 'single-pages'}/editor?name=${post.metadata.name}|}"><i class="ri-edit-2-line"></i>编辑</a></li>
                     </ul>
                     <div th:if="${isPost && !#lists.isEmpty(post.categories)}" class="level-item">
                         <a th:each="cy : ${post.categories}" th:href="${cy.status.permalink}"