diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 052abf5..c99b432 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -58,17 +58,25 @@ jobs: java: - 'springboot-backend/**' - - name: Set up JDK + - name: Set up JDK and Maven if: steps.java-changes.outputs.java == 'true' uses: actions/setup-java@v3 with: java-version: 8 distribution: 'temurin' + - name: Cache Maven dependencies + if: steps.java-changes.outputs.java == 'true' + uses: actions/cache@v3 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build Java JAR if: steps.java-changes.outputs.java == 'true' working-directory: ./springboot-backend - run: ./mvnw clean package -DskipTests + run: mvn clean package -DskipTests - name: Build Java Docker image if: steps.java-changes.outputs.java == 'true' diff --git a/.gitignore b/.gitignore index 2e8985e..35324cd 100644 --- a/.gitignore +++ b/.gitignore @@ -215,6 +215,10 @@ secrets.json *.p12 *.pfx +# Go-gost 特定配置文件 +go-gost/config.json +go-gost/gost.json + # ========================================== # 备份和临时文件 # ========================================== diff --git a/vue-frontend/nginx.conf b/vue-frontend/nginx.conf index bdb6388..51a0831 100644 --- a/vue-frontend/nginx.conf +++ b/vue-frontend/nginx.conf @@ -60,12 +60,12 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://127.0.0.1:6365/api/v1/; + proxy_pass http://backend:6365/api/v1/; } # WebSocket代理 - system-info location /system-info { - proxy_pass http://127.0.0.1:6365/system-info; + proxy_pass http://backend:6365/system-info; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade;