Merge branch 'master' of github.com:lanyulei/ferry

lanyulei · Feb 26, 2024 · 57d37a2 · 57d37a2
2 parents 0bfcfe8 + 197114a
commit 57d37a2
Show file tree

Hide file tree

Showing 20 changed files with 544 additions and 8,915 deletions.
diff --git a/apis/process/task.go b/apis/process/task.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	uuid "github.com/satori/go.uuid"
+	uuid "github.com/google/uuid"
 	"github.com/spf13/viper"
 )
 
@@ -116,7 +116,7 @@ func CreateTask(c *gin.Context) {
 		return
 	}
 
-	uuidValue := uuid.Must(uuid.NewV4(), err)
+	uuidValue := uuid.Must(uuid.New(), err)
 	fileName := fmt.Sprintf("%v/%v-%v-%v",
 		viper.GetString("script.path"),
 		taskValue.Name,

diff --git a/cmd/api/server.go b/cmd/api/server.go
@@ -103,10 +103,10 @@ func run() error {
 		tools.GetCurrntTimeStr(),
 		config2.ApplicationConfig.Host,
 		config2.ApplicationConfig.Port)
-	fmt.Printf("%s Swagger URL http://%s:%s/swagger/index.html \r\n",
-		tools.GetCurrntTimeStr(),
-		config2.ApplicationConfig.Host,
-		config2.ApplicationConfig.Port)
+	//fmt.Printf("%s Swagger URL http://%s:%s/swagger/index.html \r\n",
+	//	tools.GetCurrntTimeStr(),
+	//	config2.ApplicationConfig.Host,
+	//	config2.ApplicationConfig.Port)
 	fmt.Printf("%s Enter Control + C Shutdown Server \r\n", tools.GetCurrntTimeStr())
 	// 等待中断信号以优雅地关闭服务器（设置 5 秒的超时时间）
 	quit := make(chan os.Signal)

diff --git a/config/settings.dev.yml b/config/settings.dev.yml
@@ -14,9 +14,9 @@ settings:
     dbtype: mysql
     host: 127.0.0.1
     name: ferry
-    password: your password
+    password: 123456
     port: 3306
-    username: ferry
+    username: root
   domain:
     gethost: 1
     url: localhost:9527
@@ -55,7 +55,7 @@ settings:
   public:
     islocation: 0
   redis:
-    url: redis://127.0.0.1:6379
+    url: redis://:123456@127.0.0.1:6379
   ssl:
     key: keystring
     pem: temp/pem.pem
diff --git a/database/sqlite3.go b/database/sqlite3.go
diff --git a/docs/_config.yml b/docs/_config.yml