From 368afccb7fac557f287a59614011697d4355a792 Mon Sep 17 00:00:00 2001
From: dukai <kai.du@d-robotics.cc>
Date: Tue, 20 May 2025 15:49:23 +0800
Subject: [PATCH] update

---
 config.yml                     | 18 ++++++++++--------
 config/config.go               |  9 +++++++--
 store/redis_lua/redis_store.go |  4 +++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/config.yml b/config.yml
index dd7a7b6..a42d024 100644
--- a/config.yml
+++ b/config.yml
@@ -3,16 +3,18 @@ robotfs:
   log_path: "/var/log/robotfs"
 
 redis:
-  address: "localhost:6379"
-  password: ""
-  db: 0
+  address: "180.76.110.177:6379"
+  username: "default"
+  password: "uRC0EKTFm*4"
+  database: 0
+  # superLargeDirectories: []
 
 s3:
-  region: "us-east-1"
-  endpoint: "http://localhost:9000"
-  access_key_id: "minioadmin"
-  secret_access_key: "minioadmin"
-  bucket_name: "robotfs"
+  region: "default"
+  endpoint: "http://120.48.66.228:6202"
+  access_key_id: "admin"
+  secret_access_key: "admin"
+  bucket_name: "myjfs"
   use_path_style: true
 
 juicefs:
diff --git a/config/config.go b/config/config.go
index 1ca3c3c..27e062e 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"robotfs/utils"
 	"time"
 
 	"gosvc"
@@ -8,6 +9,10 @@ import (
 	"gosvc/logger"
 )
 
+var (
+	cfg = utils.GetViper()
+)
+
 func SetupServiceConfig() {
 	gosvc.Config = gosvc.ServiceConfig{
 		Name:    "robotfs",
@@ -17,7 +22,7 @@ func SetupServiceConfig() {
 		},
 		Logger: gosvc.LoggerConfig{
 			Options: logger.Options{
-				TargetDirectory: "/var/log/robotfs",
+				TargetDirectory: cfg.GetString("robotfs.log_path"),
 				FilePrefix:      "robotfs",
 				CycleFiles:      16,
 				MaxFileSize:     64 * 1024 * 1024,
@@ -37,7 +42,7 @@ func SetupServiceConfig() {
 		HTTPServer: gosvc.HTTPServerConfig{
 			Enable: true,
 			Options: httpserver.Options{
-				Address:              "0.0.0.0:6201",
+				Address:              cfg.GetString("robotfs.address"),
 				TLSEnabled:           false,
 				CrossOriginEnabled:   true,
 				MaxConcurrentStreams: 10000,
diff --git a/store/redis_lua/redis_store.go b/store/redis_lua/redis_store.go
index 4befd0e..7fe7778 100644
--- a/store/redis_lua/redis_store.go
+++ b/store/redis_lua/redis_store.go
@@ -21,15 +21,17 @@ func (store *RedisLuaStore) GetName() string {
 func (store *RedisLuaStore) Initialize(configuration utils.Configuration, prefix string) (err error) {
 	return store.initialize(
 		configuration.GetString(prefix+"address"),
+		configuration.GetString(prefix+"username"),
 		configuration.GetString(prefix+"password"),
 		configuration.GetInt(prefix+"database"),
 		configuration.GetStringSlice(prefix+"superLargeDirectories"),
 	)
 }
 
-func (store *RedisLuaStore) initialize(hostPort string, password string, database int, superLargeDirectories []string) (err error) {
+func (store *RedisLuaStore) initialize(hostPort string, username, password string, database int, superLargeDirectories []string) (err error) {
 	store.Client = redis.NewClient(&redis.Options{
 		Addr:     hostPort,
+		Username: username,
 		Password: password,
 		DB:       database,
 	})