fix: fix some options

zhufuyi · Oct 27, 2024 · cfcde89 · cfcde89
1 parent 1dec90c
commit cfcde89
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/cmd/sponge/commands/generate/common.go b/cmd/sponge/commands/generate/common.go
@@ -870,7 +870,7 @@ func adaptPgDsn(dsn string) string {
 
 	u, err := url.Parse(dsn)
 	if err != nil {
-		panic(err)
+		return dsn
 	}
 
 	if u.RawQuery == "" {

diff --git a/cmd/sponge/commands/generate/http.go b/cmd/sponge/commands/generate/http.go
@@ -87,16 +87,16 @@ func HTTPCommand() *cobra.Command {
 				return err
 			}
 			g := &httpGenerator{
-				moduleName:    moduleName,
-				serverName:    serverName,
-				projectName:   projectName,
-				repoAddr:      repoAddr,
-				dbDSN:         sqlArgs.DBDsn,
-				dbDriver:      sqlArgs.DBDriver,
-				codes:         codes,
-				outPath:       outPath,
-				isExtendedAPI: sqlArgs.IsExtendedAPI,
-
+				moduleName:     moduleName,
+				serverName:     serverName,
+				projectName:    projectName,
+				repoAddr:       repoAddr,
+				dbDSN:          sqlArgs.DBDsn,
+				dbDriver:       sqlArgs.DBDriver,
+				codes:          codes,
+				outPath:        outPath,
+				isExtendedAPI:  sqlArgs.IsExtendedAPI,
+				isEmbed:        sqlArgs.IsEmbed,
 				suitedMonoRepo: suitedMonoRepo,
 			}
 			outPath, err = g.generateCode()

diff --git a/pkg/grpc/grpccli/option.go b/pkg/grpc/grpccli/option.go
@@ -96,9 +96,9 @@ func WithEnableLog(log *zap.Logger) Option {
 		o.enableLog = true
 		if log != nil {
 			o.log = log
-		} else {
-			o.log = zap.NewNop()
+			return
 		}
+		o.log, _ = zap.NewProduction()
 	}
 }
 

diff --git a/pkg/httpcli/httpcli.go b/pkg/httpcli/httpcli.go
@@ -347,18 +347,14 @@ func defaultOptions() *options {
 // WithParams set params
 func WithParams(params map[string]interface{}) Option {
 	return func(o *options) {
-		if o.params != nil {
-			o.params = params
-		}
+		o.params = params
 	}
 }
 
 // WithHeaders set headers
 func WithHeaders(headers map[string]string) Option {
 	return func(o *options) {
-		if o.headers != nil {
-			o.headers = headers
-		}
+		o.headers = headers
 	}
 }
 

diff --git a/pkg/logger/option.go b/pkg/logger/option.go
@@ -130,7 +130,7 @@ func WithFileName(filename string) FileOption {
 // WithFileMaxSize set maximum file size (MB)
 func WithFileMaxSize(maxSize int) FileOption {
 	return func(f *fileOptions) {
-		if f.maxSize > 0 {
+		if maxSize > 0 {
 			f.maxSize = maxSize
 		}
 	}