From d03ed6570b7a1ffbcfe74cbadeaa65ea48d18941 Mon Sep 17 00:00:00 2001 From: RockYang Date: Fri, 23 Jun 2023 18:04:16 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BC=98=E5=8C=96=20docker-compse=20?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=B7=AF=E7=94=B1=20Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docker/build.sh | 4 ++-- docker/conf/config.toml | 2 +- docker/conf/nginx/conf.d/chatgpt-plus.conf | 2 +- docker/docker-compose.yaml | 13 ++++++------- docker/dockerfile-api-go | 3 +++ docker/dockerfile-vue | 4 +++- web/src/main.js | 12 ++++++------ 8 files changed, 23 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index e3d86e5a..c4a5c589 100644 --- a/README.md +++ b/README.md @@ -292,7 +292,7 @@ make linux 个人的力量始终有限，任何形式的贡献都是欢迎的，包括但不限于贡献代码，优化文档，提交 issue 和 PR 等。 **尤其是新版本的开发计划比较大，包括各种语言的后端 API 实现，本人精力有限，希望借助社区的力量来完成这些 API 的开发。** -如果有兴趣的话，也可以加微信进入微信讨论群。 +如果有兴趣的话，也可以加微信进入微信讨论群（**添加好友时请注明来自Github!!!**）。 ![微信名片](docs/imgs/wx.png) diff --git a/docker/build.sh b/docker/build.sh index 4dcd9750..0bb23d5b 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -12,20 +12,20 @@ npm run build cd ../docker # remove docker image if exists +docker rmi registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-go:$version docker rmi chatgpt-plus-go:$version # build docker image for chatgpt-plus-go docker build -t chatgpt-plus-go:$version -f dockerfile-api-go ../ # build docker image for chatgpt-plus-vue +docker rmi registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:$version docker rmi chatgpt-plus-vue:$version docker build -t chatgpt-plus-vue:$version -f dockerfile-vue ../ # add tag for aliyum docker registry goImageId=`docker images |grep chatgpt-plus-go |grep $version |awk '{print $3}'` -docker rmi registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-go:$version docker tag $goImageId registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-go:$version vueImageId=`docker images |grep chatgpt-plus-vue |grep $version |awk '{print $3}'` -docker rmi registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:$version docker tag $vueImageId registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:$version diff --git a/docker/conf/config.toml b/docker/conf/config.toml index f53c018c..699930a0 100644 --- a/docker/conf/config.toml +++ b/docker/conf/config.toml @@ -1,5 +1,5 @@ Listen = "0.0.0.0:5678" -ProxyURL = "http://127.0.0.1:7777" +ProxyURL = "http://192.168.3.200:7777" MysqlDns = "root:12345678@tcp(192.168.3.200:3306)/chatgpt_plus?charset=utf8mb4&parseTime=True&loc=Local" [Session] diff --git a/docker/conf/nginx/conf.d/chatgpt-plus.conf b/docker/conf/nginx/conf.d/chatgpt-plus.conf index 8294cde0..2d97a390 100644 --- a/docker/conf/nginx/conf.d/chatgpt-plus.conf +++ b/docker/conf/nginx/conf.d/chatgpt-plus.conf @@ -35,7 +35,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; - proxy_pass http://192.168.3.200:5678; # 这里改成后端服务的内网 IP 地址 + proxy_pass http://192.168.3.200:6789; # 这里改成后端服务的内网 IP 地址 } } diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index c876486c..f52efec1 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -2,21 +2,20 @@ version: '3' services: # 后端 API 程序 chatgpt-plus-go: - image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-go:v3.0.0 - # image: chatplus-go:v3.0.0 + image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-go:v3.0.1 + # image: chatgpt-plus-go:v3.0.1 container_name: chatgpt-plus-go #build: ./ restart: always - # network_mode: host + # network_mode: host ports: - - "5678:5678" + - "6789:5678" volumes: - ./conf/config.toml:/var/www/app/config.toml - # 前端应用 chatgpt-vue: - image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:v3.0.0 - # image: chatplus-vue:v3.0.0 + image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:v3.0.1 + # image: chatgpt-plus-vue:v3.0.1 container_name: chatgpt-plus-vue #build: ./ restart: always diff --git a/docker/dockerfile-api-go b/docker/dockerfile-api-go index 79495050..f671e712 100644 --- a/docker/dockerfile-api-go +++ b/docker/dockerfile-api-go @@ -8,5 +8,8 @@ COPY ./api/go/bin/chatgpt-v3-amd64-linux /var/www/app EXPOSE 5678 +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl + # 容器启动时执行的命令 CMD ["./chatgpt-v3-amd64-linux"] diff --git a/docker/dockerfile-vue b/docker/dockerfile-vue index e26de833..46533a97 100644 --- a/docker/dockerfile-vue +++ b/docker/dockerfile-vue @@ -6,4 +6,6 @@ MAINTAINER yangjian WORKDIR /var/www/app COPY ./web/dist /var/www/app/dist -EXPOSE 80 443 8080 \ No newline at end of file +EXPOSE 80 +EXPOSE 443 +EXPOSE 8080 \ No newline at end of file diff --git a/web/src/main.js b/web/src/main.js index 4b655f53..aa4368d9 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -15,6 +15,12 @@ const routes = [ {name: 'login', path: '/login', component: Login, meta: {title: '用户登录'}}, {name: 'register', path: '/register', component: Register, meta: {title: '用户注册'}}, {name: 'plus', path: '/chat', component: ChatPlus, meta: {title: 'ChatGPT-智能助手V3'}}, + { + path: '/admin/login', + name: 'admin-login', + meta: {title: 'Chat-Plus 控制台登录'}, + component: () => import('@/views/admin/Login.vue'), + }, { name: 'admin', path: '/admin', @@ -22,12 +28,6 @@ const routes = [ component: () => import("@/views/admin/Home.vue"), meta: {title: 'ChatGPT-Plus 管理后台'}, children: [ - { - path: '/admin/welcome', - name: 'admin-home', - meta: {title: 'Chat-Plus 控制台登录'}, - component: () => import('@/views/admin/Login.vue'), - }, { path: '/admin/welcome', name: 'admin-home',