update golang and package version

change config log path
change cicd

.github/workflows/cicd.yml

@@ -55,13 +55,10 @@ jobs:
         echo ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
         echo ${{ secrets.SSH_KEY_BASE64 }} | base64 -d >> ~/.ssh/id_rsa
         chmod 600 ~/.ssh/id_rsa ~/.ssh/config ~/.ssh/known_hosts
-        echo ${{ secrets.DEPLOYMENT }} | base64 -d >> deployment.yaml
-        sed -i 's/TAG/${{ env.NOW }}/g' deployment.yaml
         sed -i 's/MYSQL_DSN/${{ secrets.MYSQL_DSN }}/g' ./config/config.yaml
         sed -i 's/MSSQL_DSN/${{ secrets.MSSQL_DSN }}/g' ./config/config.yaml
         sed -i 's/ORACLE_DSN/${{ secrets.ORACLE_DSN }}/g' ./config/config.yaml
         sed -i 's/POSTGRESQL_DSN/${{ secrets.POSTGRESQL_DSN }}/g' ./config/config.yaml
-        scp -i ~/.ssh/id_rsa deployment.yaml ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.WEB_FOLDER }}deployment.yaml
       env:
         NOW: "${{ steps.current-time.outputs.formattedTime }}"
 
@@ -86,4 +83,8 @@ jobs:
         key: ${{ secrets.SSH_KEY }}
         script: |
           cd ${{ secrets.WEB_FOLDER }}
-          kubectl apply -f deployment.yaml
+          cp default.yaml deployment.yaml
+          sed -i 's/TAG/${{ env.NOW }}/g' deployment.yaml
+          kubectl apply -f deployment.yaml
+      env:
+        NOW: "${{ steps.current-time.outputs.formattedTime }}"

.gitignore

@@ -16,3 +16,4 @@
 dist/
 config/config-dev.yaml
 log/
+.idea/

config/config.yaml

@@ -50,16 +50,16 @@ log:
       formatter:
         location: Asia/Taipei
       output:
-        P: ${path}/web/%yyyy-%MM-%dd/${Program}.log
-        linkName: ${path}/web/${Program}
+        P: ${path}/web/${Program}/%yyyy-%MM-%dd.log
+        linkName: ${path}/web/${Program}/${Program}
         clock: Asia/Taipei
         maxAge: 7
     job:
       formatter:
         location: Asia/Taipei
       output:
-        P: ${path}/job/%yyyy-%MM-%dd/${Program}.log
-        linkName: ${path}/job/${Program}
+        P: ${path}/job/${Program}/%yyyy-%MM-%dd.log
+        linkName: ${path}/job/${Program}/${Program}
         clock: Asia/Taipei
         maxAge: 7
     sql:

go.mod

@@ -1,41 +1,48 @@
 module github.com/xjustloveux/jgo.web
 
-go 1.19
+go 1.21
 
 require (
 	github.com/denisenkom/go-mssqldb v0.12.3
 	github.com/fatih/structs v1.1.0
-	github.com/gin-gonic/gin v1.8.1
-	github.com/go-playground/universal-translator v0.18.0
-	github.com/go-playground/validator/v10 v10.11.1
-	github.com/go-sql-driver/mysql v1.6.0
-	github.com/godror/godror v0.35.0
-	github.com/lib/pq v1.10.7
-	github.com/xjustloveux/jgo v1.3.14
+	github.com/gin-gonic/gin v1.9.1
+	github.com/go-playground/universal-translator v0.18.1
+	github.com/go-playground/validator/v10 v10.16.0
+	github.com/go-sql-driver/mysql v1.7.1
+	github.com/godror/godror v0.40.4
+	github.com/lib/pq v1.10.9
+	github.com/xjustloveux/jgo v1.3.24
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
 	github.com/Knetic/govaluate v3.0.0+incompatible // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
-	github.com/goccy/go-json v0.9.11 // indirect
-	github.com/godror/knownpb v0.1.0 // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/godror/knownpb v0.1.1 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/ugorji/go/codec v1.2.7 // indirect
-	golang.org/x/crypto v0.3.0 // indirect
-	golang.org/x/net v0.2.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )