feat: 调整发布命令文件

bootstrap/bootstrap.go

@@ -1,5 +1,7 @@
 package bootstrap
 
-import _ "github.com/falling-ts/gower/app/consoles"
-import _ "github.com/falling-ts/gower/bootstrap/routes"
-import _ "github.com/falling-ts/gower/bootstrap/resources"
+import (
+	_ "github.com/falling-ts/gower/app/consoles"
+	_ "github.com/falling-ts/gower/bootstrap/0/routes"
+	_ "github.com/falling-ts/gower/bootstrap/1/resources"
+)

cmd/init-rclone.cmd

@@ -0,0 +1,16 @@
+@echo off
+
+where rclone >nul 2>&1
+if %errorlevel% == 0 (
+    echo ---------------- rclone installed ----------------
+) else (
+    echo ---------------- rclone installing... ----------------
+    go install github.com/rclone/rclone@v1.62.2
+    echo ---------------- rclone installed ----------------
+)
+
+
+rclone version
+
+echo ---------------- please create test and prod ssh server ----------------
+rclone config

cmd/init-rclone.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if ! command -v rclone &> /dev/null
+then
+    echo "---------------- rclone installing... ----------------"
+    go install github.com/rclone/[email protected]
+    echo "---------------- rclone installed ----------------"
+else
+    echo "---------------- rclone is already installed ----------------"
+fi
+
+rclone version
+
+echo "---------------- please create test and prod ssh server ----------------"
+rclone config

release-prod-full.cmd → cmd/release-prod-full.cmd

@@ -39,8 +39,8 @@ mkdir upload
 cd ../../
 
 echo ---------------- uploading... ----------------
-rclone mkdir prod:/go/src
-rclone copy --progress ./ prod:/go/src/ ^
+rclone mkdir prod:go/src
+rclone copy --progress ./ prod:go/src/ ^
     --include "app/**" ^
     --include "bootstrap/**" ^
     --include "configs/**" ^
@@ -55,13 +55,11 @@ rclone copy --progress ./ prod:/go/src/ ^
     --include "trans/**" ^
     --include "utils/**" ^
     --include "docker-compose.yaml" ^
-    --include "Dockerfile-prod-full" ^
-    --include "entrypoint-prod-full.sh" ^
     --include "go.mod" ^
     --include "go.sum" ^
     --include "main.go" ^
     --include "main_test.go" ^
-    --include "run-prod-full.sh"
+    --include "cmd/run-prod-full.sh"
 
 echo ---------------- finished [next connect ssh and run] ----------------
 

release-prod-full.sh → cmd/release-prod-full.sh

@@ -26,8 +26,8 @@ rm -rf upload/*
 cd ../../
 
 echo "---------------- uploading... ----------------"
-rclone mkdir prod:/go/src
-rclone copy --progress ./ prod:/go/src/ \
+rclone mkdir prod:go/src
+rclone copy --progress ./ prod:go/src/ \
     --include "app/**" \
     --include "bootstrap/**" \
     --include "configs/**" \
@@ -42,13 +42,11 @@ rclone copy --progress ./ prod:/go/src/ \
     --include "trans/**" \
     --include "utils/**" \
     --include "docker-compose.yaml" \
-    --include "Dockerfile-prod-full" \
-    --include "entrypoint-prod-full.sh" \
     --include "go.mod" \
     --include "go.sum" \
     --include "main.go" \
     --include "main_test.go" \
-    --include "run-prod-full.sh"
+    --include "cmd/run-prod-full.sh"
 
 echo "---------------- finished [next connect ssh and run] ----------------"
 

release-prod-simple.cmd → cmd/release-prod-simple.cmd

@@ -15,11 +15,11 @@ SET GOARCH=amd64
 go build -o gower -tags prod,tmpl,static
 
 echo ---------------- uploading...----------------
-rclone mkdir prod:/go/bin
-rclone deletefile --progress prod:/go/bin/gower
-rclone copy --progress ./ prod:/go/bin/ ^
+rclone mkdir prod:go/bin
+rclone deletefile --progress prod:go/bin/gower
+rclone copy --progress ./ prod:go/bin/ ^
     --include "gower" ^
-    --include "run-simple.sh" ^
+    --include "cmd/run-simple.sh" ^
     --include "gower.service"
 
 echo ---------------- finished [next connect ssh and run] ----------------

release-prod-simple.sh → cmd/release-prod-simple.sh

@@ -15,11 +15,11 @@ export GOARCH=amd64
 go build -o gower -tags prod,tmpl,static
 
 echo "---------------- uploading...----------------"
-rclone mkdir prod:/go/bin
-rclone deletefile --progress prod:/go/bin/gower
-rclone copy --progress ./ prod:/go/bin/ \
+rclone mkdir prod:go/bin
+rclone deletefile --progress prod:go/bin/gower
+rclone copy --progress ./ prod:go/bin/ \
     --include "gower" \
-    --include "run-simple.sh" \
+    --include "cmd/run-simple.sh" \
     --include "gower.service"
 
 echo "---------------- finished [next connect ssh and run] ----------------"

release-prod.cmd → cmd/release-prod.cmd

@@ -50,17 +50,16 @@ SET GOARCH=amd64
 go build -o gower -tags prod,tmpl,static
 
 echo ---------------- uploading...----------------
-rclone mkdir prod:/go/bin
-rclone deletefile --progress prod:/go/bin/gower
-rclone copy --progress ./ prod:/go/bin/ ^
+rclone mkdir prod:go/bin
+rclone deletefile --progress prod:go/bin/gower
+rclone copy --progress ./ prod:go/bin/ ^
     --include "envs/.env.development" ^
     --include "envs/.env.production" ^
     --include "public/static/**" ^
     --include "storage/**" ^
     --include "third_apps/**" ^
     --include "gower" ^
     --include "docker-compose.yaml" ^
-    --include "Dockerfile" ^
-    --include "run.sh"
+    --include "cmd/run.sh"
 
 echo ---------------- finished [next connect ssh and run] ----------------

release-prod.sh → cmd/release-prod.sh

@@ -35,17 +35,16 @@ export GOARCH=amd64
 go build -o gower -tags prod,tmpl,static
 
 echo "---------------- uploading...----------------"
-rclone mkdir prod:/go/bin
-rclone deletefile --progress prod:/go/bin/gower
-rclone copy --progress ./ prod:/go/bin/ \
+rclone mkdir prod:go/bin
+rclone deletefile --progress prod:go/bin/gower
+rclone copy --progress ./ prod:go/bin/ \
     --include "envs/.env.development" \
     --include "envs/.env.production" \
     --include "public/static/**" \
     --include "storage/**" \
     --include "third_apps/**" \
     --include "gower" \
     --include "docker-compose.yaml" \
-    --include "Dockerfile" \
-    --include "run.sh"
+    --include "cmd/run.sh"
 
 echo "---------------- finished [next connect ssh and run] ----------------"

release-test-full.cmd → cmd/release-test-full.cmd

@@ -39,8 +39,8 @@ mkdir upload
 cd ../../
 
 echo ---------------- uploading... ----------------
-rclone mkdir test:/go/src
-rclone copy --progress ./ test:/go/src/ ^
+rclone mkdir test:go/src
+rclone copy --progress ./ test:go/src/ ^
     --include "app/**" ^
     --include "bootstrap/**" ^
     --include "configs/**" ^
@@ -55,13 +55,11 @@ rclone copy --progress ./ test:/go/src/ ^
     --include "trans/**" ^
     --include "utils/**" ^
     --include "docker-compose.yaml" ^
-    --include "Dockerfile-test-full" ^
-    --include "entrypoint-test-full.sh" ^
     --include "go.mod" ^
     --include "go.sum" ^
     --include "main.go" ^
     --include "main_test.go" ^
-    --include "run-test-full.sh"
+    --include "cmd/run-test-full.sh"
 
 
 

release-test-full.sh → cmd/release-test-full.sh

@@ -26,8 +26,8 @@ rm -rf upload/*
 cd ../../
 
 echo "---------------- uploading... ----------------"
-rclone mkdir test:/go/src
-rclone copy --progress ./ test:/go/src/ \
+rclone mkdir test:go/src
+rclone copy --progress ./ test:go/src/ \
     --include "app/**" \
     --include "bootstrap/**" \
     --include "configs/**" \
@@ -42,13 +42,11 @@ rclone copy --progress ./ test:/go/src/ \
     --include "trans/**" \
     --include "utils/**" \
     --include "docker-compose.yaml" \
-    --include "Dockerfile-test-full" \
-    --include "entrypoint-test-full.sh" \
     --include "go.mod" \
     --include "go.sum" \
     --include "main.go" \
     --include "main_test.go" \
-    --include "run-test-full.sh"
+    --include "cmd/run-test-full.sh"
 
 echo "---------------- finished [next connect ssh and run] ----------------"
 

release-test-simple.cmd → cmd/release-test-simple.cmd

@@ -15,11 +15,11 @@ SET GOARCH=amd64
 go build -o gower -tags test,tmpl,static
 
 echo ---------------- uploading...----------------
-rclone mkdir test:/go/bin
-rclone deletefile --progress test:/go/bin/gower
-rclone copy --progress ./ test:/go/bin/ ^
+rclone mkdir test:go/bin
+rclone deletefile --progress test:go/bin/gower
+rclone copy --progress ./ test:go/bin/ ^
     --include "gower" ^
-    --include "run-simple.sh" ^
+    --include "cmd/run-simple.sh" ^
     --include "gower.service"
 
 echo ---------------- finished [next connect ssh and run] ----------------

release-test-simple.sh → cmd/release-test-simple.sh

@@ -15,11 +15,11 @@ export GOARCH=amd64
 go build -o gower -tags test,tmpl,static
 
 echo "---------------- uploading...----------------"
-rclone mkdir test:/go/bin
-rclone deletefile --progress test:/go/bin/gower
-rclone copy --progress ./ test:/go/bin/ \
+rclone mkdir test:go/bin
+rclone deletefile --progress test:go/bin/gower
+rclone copy --progress ./ test:go/bin/ \
     --include "gower" \
-    --include "run-simple.sh" \
+    --include "cmd/run-simple.sh" \
     --include "gower.service"
 
 echo "---------------- finished [next connect ssh and run] ----------------"

release-test.cmd → cmd/release-test.cmd

@@ -50,18 +50,17 @@ SET GOARCH=amd64
 go build -o gower -tags test,tmpl,static
 
 echo ---------------- uploading...----------------
-rclone mkdir test:~/go/bin
-rclone deletefile --progress test:~/go/bin/gower
+rclone mkdir test:go/bin
+rclone deletefile --progress test:go/bin/gower
 
-rclone copy --progress ./ test:~/go/bin/ ^
+rclone copy --progress ./ test:go/bin/ ^
     --include "envs/.env.development" ^
     --include "envs/.env.test" ^
     --include "public/static/**" ^
     --include "storage/**" ^
     --include "third_apps/**" ^
     --include "gower" ^
     --include "docker-compose.yaml" ^
-    --include "Dockerfile" ^
-    --include "run.sh"
+    --include "cmd/run.sh"
 
 echo ---------------- finished [next connect ssh and run] ----------------

release-test.sh → cmd/release-test.sh

@@ -35,17 +35,16 @@ export GOARCH=amd64
 go build -o gower -tags test,tmpl,static
 
 echo "---------------- uploading...----------------"
-rclone mkdir test:/go/bin
-rclone deletefile --progress test:/go/bin/gower
-rclone copy --progress ./ test:/go/bin/ \
+rclone mkdir test:go/bin
+rclone deletefile --progress test:go/bin/gower
+rclone copy --progress ./ test:go/bin/ \
     --include "envs/.env.development" \
     --include "envs/.env.test" \
     --include "public/static/**" \
     --include "storage/**" \
     --include "third_apps/**" \
     --include "gower" \
     --include "docker-compose.yaml" \
-    --include "Dockerfile" \
-    --include "run.sh"
+    --include "cmd/run.sh"
 
 echo "---------------- finished [next connect ssh and run] ----------------"

run-dev-full.cmd → cmd/run-dev-full.cmd

@@ -4,10 +4,10 @@ echo ---------------- build static... ----------------
 call npm run dev
 
 echo ---------------- clean docker... ----------------
-docker compose down
+docker-compose down
 
 echo ---------------- start dev ----------------
-docker compose up -d --build dev-full
+docker-compose up -d --build dev-full
 
 echo ---------------- tail -f dev log ----------------
 docker logs -f gower

run-dev-full.sh → cmd/run-dev-full.sh

@@ -4,10 +4,10 @@ echo "---------------- build static... ----------------"
 npm run dev
 
 echo "---------------- clean docker... ----------------"
-docker compose down
+docker-compose down
 
 echo "---------------- start dev ----------------"
-docker compose up -d --build dev-full
+docker-compose up -d --build dev-full
 
 echo "---------------- tail -f dev log ----------------"
 docker logs -f gower

run-dev.cmd → cmd/run-dev.cmd

@@ -15,10 +15,10 @@ SET GOARCH=amd64
 go build -o gower -tags tmpl,static
 
 echo ---------------- clean docker... ----------------
-docker compose down
+docker-compose down
 
 echo ---------------- start dev ----------------
-docker compose up -d --build gower
+docker-compose up -d --build gower
 
 echo ---------------- tail -f dev log ----------------
 docker logs -f gower

run-dev.sh → cmd/run-dev.sh

@@ -15,10 +15,10 @@ export GOARCH=amd64
 go build -o gower -tags tmpl,static
 
 echo "---------------- clean docker... ----------------"
-docker compose down
+docker-compose down
 
 echo "---------------- start dev ----------------"
-docker compose up -d --build gower
+docker-compose up -d --build gower
 
 echo "---------------- tail -f dev log ----------------"
 docker logs -f gower

run-prod-full.sh → cmd/run-prod-full.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 echo "---------------- 清理容器 ----------------"
-docker compose down
+docker-compose down
 
 echo "---------------- 启动生产 ----------------"
-docker compose up -d --build prod-full
+docker-compose up -d --build prod-full
 
 echo "---------------- 查看容器日志 ----------------"
 docker logs -f gower

run-test-full.sh → cmd/run-test-full.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 echo "---------------- 清理容器 ----------------"
-docker compose down
+docker-compose down
 
 echo "---------------- 启动测试 ----------------"
-docker compose up -d --build test-full
+docker-compose up -d --build test-full
 
 echo "---------------- 查看容器日志 ----------------"
 docker logs -f gower

run.sh → cmd/run.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "---------------- 清理容器 ----------------"
-docker compose down
+docker-compose down
 
 echo "---------------- 启动测试或生产 ----------------"
-docker compose up -d --build gower
+docker-compose up -d --build gower