Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: update deps and fix issues #201

Merged
merged 3 commits into from Mar 8, 2024
Merged

feat: update deps and fix issues #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
330eeef
feat: update artalk
terwer Mar 8, 2024
0d289c8
feat: update artalk
terwer Mar 8, 2024
1fca9bc
feat: server url as env var
terwer Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose-with-rds.yml
View file
Open in desktop
Expand Up @@ -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: ./
Expand Down
2 changes: 1 addition & 1 deletion jvue-artalk/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM artalk/artalk-go:2.1
FROM artalk/artalk-go:2.8.3
#镜像创建者的信息
LABEL maintainer="terwer<youweics@163.com>"

Expand Down
8 changes: 5 additions & 3 deletions jvue-front/nuxt.config.js
View file
Open in desktop
@@ -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,
Expand Down Expand Up @@ -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
},

/*
Expand Down