增加服务配置参数

db.yaml

@@ -1,18 +0,0 @@
-auth:
-  token: "aaaaaawww"
-
-service:
-  read_timeout: 30
-  write_timeout: 30
-  idle_timeout: 60
-
-database:
-  type: "oracle"  # mysql, postgres, oracle, sqlserver
-  host: "161.189.7.134"
-  port: 1521
-  username: "x6_stock_dev"
-  password: "mosdev"
-  database: "ORCL"
-  max_open_conns: 100
-  max_idle_conns: 10
-  conn_max_lifetime: 300

db_pg.yaml

@@ -1,10 +0,0 @@
-database:
-  type: "postgres"  # mysql, postgres, oracle, sqlserver
-  host: "69.235.172.218"
-  port: 5432
-  username: "x3stock"
-  password: "mos8555"
-  database: "x3stock"
-  max_open_conns: 100
-  max_idle_conns: 10
-  conn_max_lifetime: 300

gct.sh

@@ -20,36 +20,63 @@ if ! git rev-parse --git-dir > /dev/null 2>&1; then
     exit 1
 fi
 
-# 检查是否有未暂存的更改
-if [ -z "$(git status --porcelain)" ]; then
-    echo "提示: 没有检测到任何更改需要提交。"
-    exit 0
-fi
-
-echo "开始提交并打版本标签..."
+echo "开始处理提交和版本标签..."
 echo "提交描述: $COMMIT_MESSAGE"
 echo "版本标签: $VERSION_TAG"
 
-# 添加所有更改到暂存区[citation:4][citation:6]
-git add .
+# 检查是否有未提交的更改
+if [ -n "$(git status --porcelain)" ]; then
+    echo "检测到未提交的更改，正在提交..."
+    
+    # 添加所有更改到暂存区
+    git add .
+    
+    # 进行提交
+    git commit -m "$COMMIT_MESSAGE"
+    if [ $? -ne 0 ]; then
+        echo "错误: 提交失败。"
+        exit 1
+    fi
+    echo "✅ 更改已提交"
+else
+    echo "提示: 没有未提交的更改，跳过提交步骤"
+    
+    # 检查是否有未提交的commit但未推送
+    LOCAL_COMMITS=$(git log @{u}..HEAD --oneline 2>/dev/null | wc -l)
+    if [ $LOCAL_COMMITS -eq 0 ]; then
+        echo "错误: 没有需要推送的提交。"
+        exit 1
+    else
+        echo "检测到 $LOCAL_COMMITS 个本地提交等待推送"
+    fi
+fi
 
-# 进行提交[citation:4][citation:10]
-git commit -m "$COMMIT_MESSAGE"
-if [ $? -ne 0 ]; then
-    echo "错误: 提交失败。"
+# 检查标签是否已存在
+if git rev-parse "$VERSION_TAG" >/dev/null 2>&1; then
+    echo "错误: 标签 '$VERSION_TAG' 已经存在。"
     exit 1
 fi
 
-# 创建轻量标签或附注标签（这里创建轻量标签）[citation:4]
+# 创建标签
 git tag "$VERSION_TAG"
 if [ $? -ne 0 ]; then
     echo "错误: 创建标签失败。"
     exit 1
 fi
+echo "✅ 标签 '$VERSION_TAG' 已创建"
 
-# 推送到远程仓库并推送标签[citation:4]
+# 推送到远程仓库并推送标签
 echo "正在推送到远程仓库..."
 git push
+if [ $? -ne 0 ]; then
+    echo "错误: 推送提交失败。"
+    exit 1
+fi
+
 git push origin "$VERSION_TAG"
+if [ $? -ne 0 ]; then
+    echo "错误: 推送标签失败。"
+    exit 1
+fi
 
 echo "✅ 完成！提交已推送，版本标签 $VERSION_TAG 已创建并推送。"

go.mod

@@ -7,9 +7,10 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/microsoft/go-mssqldb v1.9.4
 	github.com/sijms/go-ora/v2 v2.9.0
-	gopkg.in/yaml.v2 v2.4.0
 )
 
+require gopkg.in/yaml.v2 v2.4.0 // indirect
+
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
 	git.x2erp.com/qdy/go-base v0.1.2

go.sum

@@ -1,7 +1,5 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-git.x2erp.com/qdy/go-base v0.1.1 h1:Yj6rFTCL9CShqdQeE6mUYQMugUpI25nWNL0i09SFtXo=
-git.x2erp.com/qdy/go-base v0.1.1/go.mod h1:+NdHouWcxqex8sJUwDTGSl/OIh5fKOT6tJteefD1MMA=
 git.x2erp.com/qdy/go-base v0.1.2 h1:4bdkh+WYV+61/qqf1RvqtK0jPKen4BndLGEHjo2opgY=
 git.x2erp.com/qdy/go-base v0.1.2/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=