Merge pull request #72 from linhaojun857/dev

merge dev

aurora-springboot/src/main/resources/application.yml

@@ -25,10 +25,10 @@ spring:
     database: 1
     lettuce:
       pool:
+        min-idle: 10
         max-idle: 100
         max-active: 100
         max-wait: 10000
-        min-idle: 10
 
   rabbitmq:
     host: rabbitmq的ip

aurora-vue/aurora-blog/src/components/Sidebar/src/Notice.vue

@@ -2,7 +2,7 @@
   <div class="sidebar-box">
     <SubTitle :title="'titles.notice'" icon="notice" />
     <div class="mx-auto">
-      <span class="text-sm font-semibold text-right notice"> {{ notice }}</span>
+      <span class="text-sm font-medium text-right notice"> {{ notice }}</span>
     </div>
   </div>
 </template>

aurora-vue/aurora-blog/src/components/Sidebar/src/WebsiteInfo.vue

@@ -3,15 +3,15 @@
     <SubTitle :title="'titles.website_info'" icon="website-info" />
     <ul class="mx-auto">
       <li class="pb-3">
-        <span class="text-sm font-semibold">{{ t('settings.running-time') }}:</span>
-        <span class="text-sm font-semibold text-right float-right" v-if="websiteCreateTime != ''">
+        <span class="text-sm font-medium">{{ t('settings.running-time') }}:</span>
+        <span class="text-sm font-medium text-right float-right" v-if="websiteCreateTime != ''">
           {{ websiteCreateTime }}
         </span>
         <ob-skeleton v-else class="float-right" tag="span" width="136px" height="16px" />
       </li>
       <li class="pb-2">
-        <span class="text-sm font-semibold">{{ t('settings.view-count') }}:</span>
-        <span class="text-sm font-semibold text-right float-right" v-if="viewCount">{{ viewCount }}</span>
+        <span class="text-sm font-medium">{{ t('settings.view-count') }}:</span>
+        <span class="text-sm font-medium text-right float-right" v-if="viewCount">{{ viewCount }}</span>
         <ob-skeleton v-else class="float-right" tag="span" width="60px" height="16px" />
       </li>
     </ul>

aurora-vue/aurora-blog/src/stores/meta.ts

@@ -1,15 +1,9 @@
 import { defineStore } from 'pinia'
-import { i18n } from '@/locales/index'
 
 export const useMetaStore = defineStore('metaStore', {
   state: () => {
     return {
       title: '花未眠的个人博客'
     }
-  },
-  actions: {
-    setTitle(title: string): void {
-      this.title = i18n.global.te(`menu.${title}`) ? i18n.global.t(`menu.${title}`) : title
-    }
   }
 })

aurora-vue/aurora-blog/src/styles/index.scss

@@ -39,8 +39,7 @@ html::-webkit-scrollbar {
 html::-webkit-scrollbar-thumb {
   background: #434343;
   border-radius: 16px;
-  box-shadow: inset 2px 2px 2px rgba(100, 100, 100, 0.25),
-    inset -2px -2px 2px rgba(0, 0, 0, 0.25);
+  box-shadow: inset 2px 2px 2px rgba(100, 100, 100, 0.25), inset -2px -2px 2px rgba(0, 0, 0, 0.25);
 }
 
 html::-webkit-scrollbar-track {
@@ -56,8 +55,7 @@ div::-webkit-scrollbar {
 div::-webkit-scrollbar-thumb {
   background: #434343;
   border-radius: 16px;
-  box-shadow: inset 2px 2px 2px rgba(100, 100, 100, 0.25),
-    inset -2px -2px 2px rgba(0, 0, 0, 0.25);
+  box-shadow: inset 2px 2px 2px rgba(100, 100, 100, 0.25), inset -2px -2px 2px rgba(0, 0, 0, 0.25);
 }
 
 div::-webkit-scrollbar-track {
@@ -74,4 +72,3 @@ div::-webkit-scrollbar-track {
 .is-collapsed {
   max-height: 0;
 }
-

aurora-vue/aurora-blog/src/views/About.vue

@@ -209,7 +209,7 @@ export default defineComponent({
   padding-left: 1.5rem;
 
   > li {
-    @apply font-bold pb-1;
+    @apply font-medium pb-1;
     &.is-active-li > .node-name--H1 {
       @apply text-ob;
     }
@@ -222,7 +222,7 @@ export default defineComponent({
   }
 
   ol li {
-    @apply font-semibold mt-1.5 mb-1.5;
+    @apply font-medium mt-1.5 mb-1.5;
     padding-left: 1.5rem;
     &.is-active-li > .node-name--H2 {
       @apply text-ob;
@@ -255,7 +255,7 @@ export default defineComponent({
     width: 1em;
     margin-left: -1.15em;
     padding: 0;
-    font-weight: bold;
+    font-weight: medium;
     text-shadow: 0 0 0.5em var(--accent-2);
   }
 

aurora-vue/aurora-blog/src/views/Article.vue

@@ -155,7 +155,6 @@ import { Comment } from '@/components/Comment'
 import { SubTitle } from '@/components/Title'
 import { ArticleCard } from '@/components/ArticleCard'
 import '@/styles/prism-aurora-future.css'
-import { useMetaStore } from '@/stores/meta'
 import { useCommonStore } from '@/stores/common'
 import { useCommentStore } from '@/stores/comment'
 import Sticky from '@/components/Sticky.vue'
@@ -171,7 +170,6 @@ export default defineComponent({
   components: { Sidebar, Comment, SubTitle, ArticleCard, Profile, Sticky, Navigator },
   setup() {
     const proxy: any = getCurrentInstance()?.appContext.config.globalProperties
-    const metaStore = useMetaStore()
     const commonStore = useCommonStore()
     const commentStore = useCommentStore()
     const route = useRoute()
@@ -289,7 +287,6 @@ export default defineComponent({
           router.push({ path: '/出错啦' })
           return
         }
-        metaStore.setTitle(data.data.articleTitle)
         commonStore.setHeaderImage(data.data.articleCover)
         new Promise((resolve) => {
           data.data.articleContent = markdownToHtml(data.data.articleContent)
@@ -390,7 +387,7 @@ export default defineComponent({
   padding-left: 1.5rem;
 
   > li {
-    @apply font-bold pb-1;
+    @apply font-medium pb-1;
     &.is-active-li > .node-name--H1 {
       @apply text-ob;
     }
@@ -403,7 +400,7 @@ export default defineComponent({
   }
 
   ol li {
-    @apply font-semibold mt-1.5 mb-1.5;
+    @apply font-medium mt-1.5 mb-1.5;
     padding-left: 1.5rem;
     &.is-active-li > .node-name--H2 {
       @apply text-ob;
@@ -436,7 +433,7 @@ export default defineComponent({
     width: 1em;
     margin-left: -1.15em;
     padding: 0;
-    font-weight: bold;
+    font-weight: medium;
     text-shadow: 0 0 0.5em var(--accent-2);
   }
 

aurora-vue/aurora-blog/src/views/Home.vue

@@ -76,7 +76,6 @@ import { Title } from '@/components/Title'
 import { Sidebar, Profile, RecentComment, TagBox, Notice, WebsiteInfo } from '@/components/Sidebar'
 import { useAppStore } from '@/stores/app'
 import { useUserStore } from '@/stores/user'
-import { useMetaStore } from '@/stores/meta'
 import { useArticleStore } from '@/stores/article'
 import { useCategoryStore } from '@/stores/Category'
 import { useI18n } from 'vue-i18n'
@@ -100,7 +99,6 @@ export default defineComponent({
     WebsiteInfo
   },
   setup() {
-    useMetaStore().setTitle('home')
     const appStore = useAppStore()
     const userStore = useUserStore()
     const articleStore = useArticleStore()

aurora-vue/aurora-blog/tailwind.config.js

@@ -1,6 +1,6 @@
 module.exports = {
   purge: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
-  darkMode: false, // or 'media' or 'class'
+  darkMode: false,
   theme: {
     extend: {
       spacing: {