Merge pull request #202 from terwer/v4.x

fix； article error
terwer · Mar 8, 2024 · 6c3d851 · 6c3d851
2 parents 7c36e24 + af41177
commit 6c3d851
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 37 deletions.
diff --git a/docker-compose-with-rds.yml b/docker-compose-with-rds.yml
@@ -41,16 +41,4 @@ services:
 #      - "3000:3000"
 #    environment:
 #      - npm_config_unsafe_perm=true
-#    restart: "no"
-  jvue-artalk:
-    image: jvue/artalk:2.8.3
-    container_name: jvue-artalk
-    build:
-      context: ./
-      dockerfile: ./jvue-artalk/Dockerfile
-    ports:
-      - 8005:23366
-    volumes:
-      - ./jvue-artalk/data:/data
-      - ./jvue-artalk/ssl/certs/v4.pem:/etc/ssl/certs/v4.pem
-      - ./jvue-artalk/ssl/certs/v4.key:/etc/ssl/certs/v4.key
+#    restart: "no"
diff --git a/jvue-artalk/.gitignore b/jvue-artalk/.gitignore
diff --git a/jvue-artalk/Dockerfile b/jvue-artalk/Dockerfile
diff --git a/jvue-front/components/themes/default/Artalk.vue b/jvue-front/components/themes/default/Artalk.vue
@@ -8,7 +8,6 @@
 
 <script>
 import "artalk/dist/Artalk.css";
-// import Artalk from "artalk";
 
 export default {
   mounted() {
@@ -46,8 +45,8 @@ export default {
           el: "#Comments",
           pageKey: "", // 页面链接
           pageTitle: "", // 页面标题
-          server: "https://v4.terwergreen.com:8005", // 后端地址
-          site: "浅海拾贝"
+          server: process.env.artalkServerUrl, // 后端地址
+          site: "JVue4博客"
         });
         console.log("Artalk初始化完成...");
       });

diff --git a/jvue-front/nuxt.config.js b/jvue-front/nuxt.config.js
@@ -3,12 +3,18 @@ const pkg = require("./package");
 // 后端接口地址
 const JVUE_SERVER_URL =
   process.env.JVUE_SERVER_URL ?? "http://localhost:8008/api";
+const ARTALK_SERVER_URL =
+  process.env.ARTALK_SERVER_URL ?? "http://localhost:23366";
 console.log("JVUE_SERVER_URL =>", JVUE_SERVER_URL);
+console.log("ARTALK_SERVER_URL =>", ARTALK_SERVER_URL);
 
 module.exports = {
   debug: true,
   mode: "universal",
   telemetry: false,
+  env: {
+    artalkServerUrl: ARTALK_SERVER_URL
+  },
 
   /*
    ** Headers of the page
@@ -20,7 +26,17 @@ module.exports = {
       { name: "viewport", content: "width=device-width, initial-scale=1" },
       { hid: "description", name: "description", content: pkg.description }
     ],
-    link: [{ rel: "icon", type: "image/x-icon", href: "/favicon.ico" }]
+    link: [
+      { rel: "icon", type: "image/x-icon", href: "/favicon.ico" },
+      {
+        href:
+          "https://cdnjs.cloudflare.com/ajax/libs/lightgallery/2.3.0/css/lightgallery.css",
+        rel: "stylesheet"
+      }
+    ],
+    script: [
+      { src: "https://cdnjs.cloudflare.com/ajax/libs/artalk/2.8.3/Artalk.js" }
+    ]
   },
 
   /*

diff --git a/jvue-front/package.json b/jvue-front/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@nuxtjs/axios": "^5.3.6",
-    "artalk": "^2.3.4",
+    "artalk": "2.8.3",
     "cross-env": "^5.2.0",
     "element-ui": "2.4.11",
     "express": "^4.16.4",

diff --git a/jvue-front/pages/about.vue b/jvue-front/pages/about.vue
@@ -80,7 +80,7 @@ import HeaderTime from "../components/themes/default/HeaderTime";
 import Header from "../components/themes/default/Header";
 import Footer from "../components/themes/default/Footer";
 import FriendLink from "../components/themes/default/FriendLink";
-import Artalk from "../components/themes/default/Artalk";
+import Artalk from "../components/themes/default/Artalk.vue";
 
 const logger = getLogger("pages/index");
 

diff --git a/jvue-front/pages/post/_id.vue b/jvue-front/pages/post/_id.vue
@@ -99,17 +99,21 @@
 </template>
 
 <script>
-/* eslint no-undef: 0 */ // --> OFF
-/* eslint nuxt/no-globals-in-created: 0 */ // --> OFF
-/* eslint vue/no-v-html: 0 */ // --> OFF
-/* eslint no-useless-escape: 0 */ // --> OFF
-import { getLogger } from "../../util/logger";
+/* eslint no-undef: 0 */
+// --> OFF
+/* eslint nuxt/no-globals-in-created: 0 */
+// --> OFF
+/* eslint vue/no-v-html: 0 */
+// --> OFF
+/* eslint no-useless-escape: 0 */
+// --> OFF
 import HeaderTime from "../../components/themes/default/HeaderTime";
 import Header from "../../components/themes/default/Header";
 import Footer from "../../components/themes/default/Footer";
 import FriendLink from "../../components/themes/default/FriendLink";
-import Artalk from "../../components/themes/default/Artalk";
-import { inBrowser } from "../../util/dom";
+import Artalk from "../../components/themes/default/Artalk.vue";
+import { getLogger } from "~/util/logger";
+import { inBrowser } from "~/util/dom";
 
 const logger = getLogger("pages/post");
 
@@ -241,15 +245,18 @@ export default {
 .post-default {
   margin: 20px;
 }
+
 .post-default #postTitle {
   a {
     color: #000;
     line-height: 1.5;
     text-decoration: none;
   }
+
   a:hover {
     color: red;
   }
+
   h1 {
     border-bottom: 1px solid #ddd;
     font-size: 28px;
@@ -272,12 +279,14 @@ export default {
     margin: 10px 0;
     display: none;
   }
+
   h2 {
     font-size: 21px;
     font-weight: bold;
     line-height: 1.5;
     margin: 10px 0;
   }
+
   p {
     line-height: 32px;
     // 图片自适应
@@ -286,6 +295,7 @@ export default {
     }
   }
 }
+
 .error-message {
   font-size: 48px;
   text-align: center;
@@ -301,6 +311,7 @@ export default {
       code {
         font-size: 16px;
       }
+
       p {
         code {
           font-size: 16px;
@@ -320,9 +331,11 @@ export default {
     margin: 10px 0;
     border: 1px solid #ccc !important;
     border-radius: 3px !important;
+
     code {
       font-size: 16px;
     }
+
     p {
       code {
         font-size: 16px;