Merge pull request #201 from terwer/v4.x

feat: update deps and fix issues
terwer · Mar 8, 2024 · 7c36e24 · 7c36e24
2 parents 2923fe5 + 1fca9bc
commit 7c36e24
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/docker-compose-with-rds.yml b/docker-compose-with-rds.yml
@@ -43,7 +43,7 @@ services:
 #      - npm_config_unsafe_perm=true
 #    restart: "no"
   jvue-artalk:
-    image: terwer/jvue-artalk:2.1
+    image: jvue/artalk:2.8.3
     container_name: jvue-artalk
     build:
       context: ./

diff --git a/jvue-artalk/Dockerfile b/jvue-artalk/Dockerfile
@@ -1,4 +1,4 @@
-FROM artalk/artalk-go:2.1
+FROM artalk/artalk-go:2.8.3
 #镜像创建者的信息
 LABEL maintainer="terwer<youweics@163.com>"
 

diff --git a/jvue-front/nuxt.config.js b/jvue-front/nuxt.config.js
@@ -1,6 +1,9 @@
 const pkg = require("./package");
 
-const development = process.env.NODE_ENV !== "production";
+// 后端接口地址
+const JVUE_SERVER_URL =
+  process.env.JVUE_SERVER_URL ?? "http://localhost:8008/api";
+console.log("JVUE_SERVER_URL =>", JVUE_SERVER_URL);
 
 module.exports = {
   debug: true,
@@ -62,8 +65,7 @@ module.exports = {
    */
   axios: {
     // See https://github.com/nuxt-community/axios-module#options
-    baseURL: "http://localhost:8008/api"
-    // baseURL: development ? "http://localhost:8008/api" : "http://localhost/api"
+    baseURL: JVUE_SERVER_URL
   },
 
   /*