Merge pull request #35 from OrdinaryRoad-Project/feat-v0.0.13

Feat v0.0.13
OrdinaryRoad-Project · Sep 14, 2023 · dba21c7 · dba21c7
2 parents 9e5047c + 9d70a63
commit dba21c7
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,7 @@ Backend: [![构建状态](https://ordinaryroad.coding.net/badges/ordinaryroad/jo
 - 评论文章
 - 回复评论
 - 评论删除
+- [ ] 评论敏感词校验
 
 ### 日志模块
 
@@ -92,4 +93,10 @@ Backend: [![构建状态](https://ordinaryroad.coding.net/badges/ordinaryroad/jo
 - Quarkus
 - MyBatis Plus
 - SaToken
-- Nuxt.js
+- Nuxt.js
+
+---
+
+[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" width="200" alt="Copyright © 2000-2023 JetBrains s.r.o. JetBrains and the JetBrains logo are registered trademarks of JetBrains s.r.o."/>](https://jb.gg/OpenSourceSupport)
+
+感谢 [**JetBrains**](https://www.jetbrains.com) 提供的开源项目产品许可证。
diff --git a/docker/ordinaryroad-blog-ui/Dockerfile b/docker/ordinaryroad-blog-ui/Dockerfile
@@ -19,4 +19,4 @@ ENV HOST=0.0.0.0
 
 # 提示nuxt权限不够，chmod -R 777 .
 #CMD npm install --no-package-lock; npm run build; npm run start
-CMD npm run build; npm run start
+CMD npm run start
diff --git a/ordinaryroad-blog-quarkus/pom.xml b/ordinaryroad-blog-quarkus/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>tech.ordinaryroad.quarkus</groupId>
         <artifactId>ordinaryroad-blog</artifactId>
-        <version>0.0.12</version>
+        <version>0.0.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -93,10 +93,10 @@
             <artifactId>quarkus-config-yaml</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-mate-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-mate-starter</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>me.zhyd.oauth</groupId>

diff --git a/ordinaryroad-blog-ui/components/or/Header.vue b/ordinaryroad-blog-ui/components/or/Header.vue
@@ -100,12 +100,6 @@ export default {
 
     onSearchSubmit (searchInput) {
       window.open(`/search/${searchInput}`, '_blank')
-    },
-    click (index) {
-      this.setSelectedThemeOption({
-        value: index,
-        $vuetify: this.$vuetify
-      })
     }
   }
 }

diff --git a/ordinaryroad-blog-ui/package.json b/ordinaryroad-blog-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ordinaryroad-blog-ui",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "private": true,
   "config": {
     "nuxt": {
@@ -25,19 +25,20 @@
     "@nuxtjs/sitemap": "^2.4.0",
     "core-js": "^3.25.3",
     "echarts": "^5.4.3",
+    "jinrishici": "^1.0.6",
     "js-cookie": "^3.0.5",
     "medium-zoom": "^1.0.8",
     "nuxt": "^2.15.8",
     "ordinaryroad-vuetify": "^1.5.8",
-    "vditor": "^3.9.4",
+    "vditor": "^3.9.5",
     "vue": "^2.7.10",
     "vue-i18n": "^8.27.2",
     "vue-json-viewer": "^2.2.22",
     "vue-masonry-wall": "^0.3.2",
     "vue-qr": "^2.5.0",
     "vue-server-renderer": "^2.7.10",
     "vue-template-compiler": "^2.7.10",
-    "vuetify": "^2.6.15",
+    "vuetify": "^2.7.1",
     "vuetify2-expand": "^1.1.2"
   },
   "devDependencies": {

diff --git a/ordinaryroad-blog-ui/plugins/access/index.js b/ordinaryroad-blog-ui/plugins/access/index.js
@@ -31,7 +31,7 @@ export default ({
     const userInfo = store.getters['user/getUserInfo']
     return userInfo != null
   }
-  const checkLogin = () => {
+  const checkLogin = (redirect = route.fullPath) => {
     const logged = isLogged()
     if (!logged) {
       app.$dialog({
@@ -42,7 +42,7 @@ export default ({
         if (isConfirm) {
           app.router.push({
             path: '/user/login',
-            query: { redirect: route.fullPath }
+            query: { redirect }
           })
         }
       })

diff --git a/pom.xml b/pom.xml
@@ -29,13 +29,13 @@
     <parent>
         <groupId>tech.ordinaryroad.quarkus</groupId>
         <artifactId>ordinaryroad-quarkus</artifactId>
-        <version>1.5.4</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>ordinaryroad-blog</artifactId>
-    <version>0.0.12</version>
+    <version>0.0.13</version>
     <description>OrdinaryRoad Blog</description>
 
     <modules>
@@ -57,8 +57,8 @@
     </repositories>
 
     <properties>
-        <ordinaryroad-quarkus.version>1.5.4</ordinaryroad-quarkus.version>
-        <mapstruct.version>1.5.3.Final</mapstruct.version>
+        <ordinaryroad-quarkus.version>1.6.0</ordinaryroad-quarkus.version>
+        <mapstruct.version>1.5.5.Final</mapstruct.version>
         <mybatis-mate-starter.version>1.2.5</mybatis-mate-starter.version>
         <JustAuth.version>1.16.5</JustAuth.version>
     </properties>