From 1e496fb09e021406e2caa4a8b68175f6d5529ec4 Mon Sep 17 00:00:00 2001
From: WJQSERVER <wjqserver@outlook.com>
Date: Fri, 11 Oct 2024 02:54:16 +0800
Subject: [PATCH] 24w14a

---
 .github/workflows/build-dev.yml | 2 +-
 .github/workflows/build.yml     | 7 ++++++-
 CHANGELOG.md                    | 6 ++++++
 docker/dockerfile/dev/init.sh   | 2 +-
 init.sh                         | 2 +-
 main.go                         | 7 +++++++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index e2a1b41..402fb8e 100644
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -41,7 +41,7 @@ jobs:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
         run: |
-          CGO_ENABLED=0 go build -ldflags="-s -w" -o  ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go
+          CGO_ENABLED=0 go build -o  ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go
           upx -9 ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}
       - name: Package
         run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 85d469d..a342b5a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,12 +32,17 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
+      - name: Install UPX
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y upx
       - name: Build
         env:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
         run: |
-          CGO_ENABLED=0 go build -o  ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go
+          CGO_ENABLED=0 go build -ldflags="-s -w" -o  ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}} ./main.go
+          upx -9 ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}
       - name: Package
         run: |
           tar -czvf ${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}.tar.gz ./${{ env.OUTPUT_BINARY }}-${{matrix.goos}}-${{matrix.goarch}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fdd8c6..9e23362 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # 更新日志
 
+24w14a
+---
+- PRE-RELEASE: 此版本是v1.4.3的预发布版本,请勿在生产环境中使用
+- CHANGE: 优化代码结构,提升性能
+- ADD: 新增命令行参数 `-cfg string` 用于指定配置文件路径
+
 v1.4.2
 ---
 - CHANGE: 优化代码结构,提升性能
diff --git a/docker/dockerfile/dev/init.sh b/docker/dockerfile/dev/init.sh
index a4dea96..78f8bc3 100644
--- a/docker/dockerfile/dev/init.sh
+++ b/docker/dockerfile/dev/init.sh
@@ -20,7 +20,7 @@ fi
 
 /data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATION}/log/caddy.log 2>&1 &
 
-/data/${APPLICATION}/${APPLICATION} > /data/${APPLICATION}/log/run.log 2>&1 &
+/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.yaml > /data/${APPLICATION}/log/run.log 2>&1 &
 
 while true; do
     sleep 1
diff --git a/init.sh b/init.sh
index 86db1e1..9af2dd6 100644
--- a/init.sh
+++ b/init.sh
@@ -20,7 +20,7 @@ fi
 
 /data/caddy/caddy run --config /data/caddy/config/Caddyfile > /data/${APPLICATON}/log/caddy.log 2>&1 &
 
-/data/${APPLICATON}/${APPLICATON} > /data/ghproxy/log/run.log 2>&1 &
+/data/${APPLICATON}/${APPLICATON} > /data/${APPLICATON}/log/run.log 2>&1 &
 
 while [[ true ]]; do
     sleep 1
diff --git a/main.go b/main.go
index 38bc5c6..ca48578 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"flag"
 	"fmt"
 	"log"
 	"net/http"
@@ -21,6 +22,11 @@ var (
 	configfile = "/data/ghproxy/config/config.yaml"
 )
 
+func ReadFlag() {
+	cfgfile := flag.String("cfg", configfile, "config file path")
+	configfile = *cfgfile
+}
+
 func loadConfig() {
 	var err error
 	// 初始化配置
@@ -48,6 +54,7 @@ func Loadlist(cfg *config.Config) {
 }
 
 func init() {
+	ReadFlag()
 	loadConfig()
 	setupLogger()
 	Loadlist(cfg)