From 330eeefbddbe5b545e7e1a1c31687cfd5557e01d Mon Sep 17 00:00:00 2001 From: terwer Date: Fri, 8 Mar 2024 13:42:27 +0800 Subject: [PATCH 1/3] feat: update artalk --- jvue-artalk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jvue-artalk/Dockerfile b/jvue-artalk/Dockerfile index 9bea73b..c9ea9e2 100644 --- 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" From 0d289c89c92cff1a8e2929d40bd6dfc14ff352c9 Mon Sep 17 00:00:00 2001 From: terwer Date: Fri, 8 Mar 2024 13:50:52 +0800 Subject: [PATCH 2/3] feat: update artalk --- docker-compose-with-rds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-with-rds.yml b/docker-compose-with-rds.yml index 15f2455..03e8e16 100644 --- 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: ./ From 1fca9bc5275e60517808c1d30848f43dfcb00f9e Mon Sep 17 00:00:00 2001 From: terwer Date: Fri, 8 Mar 2024 14:00:09 +0800 Subject: [PATCH 3/3] feat: server url as env var --- jvue-front/nuxt.config.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jvue-front/nuxt.config.js b/jvue-front/nuxt.config.js index ac80b5c..e85c9d0 100644 --- 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 }, /*