adjusted code

zhufuyi · Mar 30, 2024 · c5781b3 · c5781b3
1 parent d602c03
commit c5781b3
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 7 deletions.
diff --git a/cmd/serverNameExample_grpcExample/initial/initApp.go b/cmd/serverNameExample_grpcExample/initial/initApp.go
@@ -36,7 +36,14 @@ func InitApp() {
 	_, err := logger.Init(
 		logger.WithLevel(cfg.Logger.Level),
 		logger.WithFormat(cfg.Logger.Format),
-		logger.WithSave(cfg.Logger.IsSave),
+		logger.WithSave(
+			cfg.Logger.IsSave,
+			//logger.WithFileName(cfg.Logger.LogFileConfig.Filename),
+			//logger.WithFileMaxSize(cfg.Logger.LogFileConfig.MaxSize),
+			//logger.WithFileMaxBackups(cfg.Logger.LogFileConfig.MaxBackups),
+			//logger.WithFileMaxAge(cfg.Logger.LogFileConfig.MaxAge),
+			//logger.WithFileIsCompression(cfg.Logger.LogFileConfig.IsCompression),
+		),
 	)
 	if err != nil {
 		panic(err)

diff --git a/cmd/serverNameExample_grpcGwPbExample/initial/initApp.go b/cmd/serverNameExample_grpcGwPbExample/initial/initApp.go
@@ -36,7 +36,14 @@ func InitApp() {
 	_, err := logger.Init(
 		logger.WithLevel(cfg.Logger.Level),
 		logger.WithFormat(cfg.Logger.Format),
-		logger.WithSave(cfg.Logger.IsSave),
+		logger.WithSave(
+			cfg.Logger.IsSave,
+			//logger.WithFileName(cfg.Logger.LogFileConfig.Filename),
+			//logger.WithFileMaxSize(cfg.Logger.LogFileConfig.MaxSize),
+			//logger.WithFileMaxBackups(cfg.Logger.LogFileConfig.MaxBackups),
+			//logger.WithFileMaxAge(cfg.Logger.LogFileConfig.MaxAge),
+			//logger.WithFileIsCompression(cfg.Logger.LogFileConfig.IsCompression),
+		),
 	)
 	if err != nil {
 		panic(err)

diff --git a/cmd/serverNameExample_grpcHttpPbExample/initial/initApp.go b/cmd/serverNameExample_grpcHttpPbExample/initial/initApp.go
@@ -36,7 +36,14 @@ func InitApp() {
 	_, err := logger.Init(
 		logger.WithLevel(cfg.Logger.Level),
 		logger.WithFormat(cfg.Logger.Format),
-		logger.WithSave(cfg.Logger.IsSave),
+		logger.WithSave(
+			cfg.Logger.IsSave,
+			//logger.WithFileName(cfg.Logger.LogFileConfig.Filename),
+			//logger.WithFileMaxSize(cfg.Logger.LogFileConfig.MaxSize),
+			//logger.WithFileMaxBackups(cfg.Logger.LogFileConfig.MaxBackups),
+			//logger.WithFileMaxAge(cfg.Logger.LogFileConfig.MaxAge),
+			//logger.WithFileIsCompression(cfg.Logger.LogFileConfig.IsCompression),
+		),
 	)
 	if err != nil {
 		panic(err)

diff --git a/cmd/serverNameExample_grpcPbExample/initial/initApp.go b/cmd/serverNameExample_grpcPbExample/initial/initApp.go
@@ -36,7 +36,14 @@ func InitApp() {
 	_, err := logger.Init(
 		logger.WithLevel(cfg.Logger.Level),
 		logger.WithFormat(cfg.Logger.Format),
-		logger.WithSave(cfg.Logger.IsSave),
+		logger.WithSave(
+			cfg.Logger.IsSave,
+			//logger.WithFileName(cfg.Logger.LogFileConfig.Filename),
+			//logger.WithFileMaxSize(cfg.Logger.LogFileConfig.MaxSize),
+			//logger.WithFileMaxBackups(cfg.Logger.LogFileConfig.MaxBackups),
+			//logger.WithFileMaxAge(cfg.Logger.LogFileConfig.MaxAge),
+			//logger.WithFileIsCompression(cfg.Logger.LogFileConfig.IsCompression),
+		),
 	)
 	if err != nil {
 		panic(err)

diff --git a/cmd/serverNameExample_httpExample/initial/initApp.go b/cmd/serverNameExample_httpExample/initial/initApp.go
@@ -36,7 +36,14 @@ func InitApp() {
 	_, err := logger.Init(
 		logger.WithLevel(cfg.Logger.Level),
 		logger.WithFormat(cfg.Logger.Format),
-		logger.WithSave(cfg.Logger.IsSave),
+		logger.WithSave(
+			cfg.Logger.IsSave,
+			//logger.WithFileName(cfg.Logger.LogFileConfig.Filename),
+			//logger.WithFileMaxSize(cfg.Logger.LogFileConfig.MaxSize),
+			//logger.WithFileMaxBackups(cfg.Logger.LogFileConfig.MaxBackups),
+			//logger.WithFileMaxAge(cfg.Logger.LogFileConfig.MaxAge),
+			//logger.WithFileIsCompression(cfg.Logger.LogFileConfig.IsCompression),
+		),
 	)
 	if err != nil {
 		panic(err)

diff --git a/cmd/serverNameExample_httpPbExample/initial/initApp.go b/cmd/serverNameExample_httpPbExample/initial/initApp.go
@@ -36,7 +36,14 @@ func InitApp() {
 	_, err := logger.Init(
 		logger.WithLevel(cfg.Logger.Level),
 		logger.WithFormat(cfg.Logger.Format),
-		logger.WithSave(cfg.Logger.IsSave),
+		logger.WithSave(
+			cfg.Logger.IsSave,
+			//logger.WithFileName(cfg.Logger.LogFileConfig.Filename),
+			//logger.WithFileMaxSize(cfg.Logger.LogFileConfig.MaxSize),
+			//logger.WithFileMaxBackups(cfg.Logger.LogFileConfig.MaxBackups),
+			//logger.WithFileMaxAge(cfg.Logger.LogFileConfig.MaxAge),
+			//logger.WithFileIsCompression(cfg.Logger.LogFileConfig.IsCompression),
+		),
 	)
 	if err != nil {
 		panic(err)

diff --git a/cmd/serverNameExample_mixExample/initial/initApp.go b/cmd/serverNameExample_mixExample/initial/initApp.go
@@ -36,7 +36,14 @@ func InitApp() {
 	_, err := logger.Init(
 		logger.WithLevel(cfg.Logger.Level),
 		logger.WithFormat(cfg.Logger.Format),
-		logger.WithSave(cfg.Logger.IsSave),
+		logger.WithSave(
+			cfg.Logger.IsSave,
+			//logger.WithFileName(cfg.Logger.LogFileConfig.Filename),
+			//logger.WithFileMaxSize(cfg.Logger.LogFileConfig.MaxSize),
+			//logger.WithFileMaxBackups(cfg.Logger.LogFileConfig.MaxBackups),
+			//logger.WithFileMaxAge(cfg.Logger.LogFileConfig.MaxAge),
+			//logger.WithFileIsCompression(cfg.Logger.LogFileConfig.IsCompression),
+		),
 	)
 	if err != nil {
 		panic(err)

diff --git a/cmd/sponge/commands/generate/template.go b/cmd/sponge/commands/generate/template.go
@@ -366,6 +366,9 @@ func NewCenter(configFile string) (*Center, error) {
 
   checkResult $?
 
+  sponge merge rpc-pb
+  checkResult $?
+
   protoc --proto_path=. --proto_path=./third_party \
     --go-gin_out=. --go-gin_opt=paths=source_relative --go-gin_opt=plugin=handler \
     --go-gin_opt=moduleName=${moduleName} --go-gin_opt=serverName=${serverName} --go-gin_opt=suitedMonoRepo=${suitedMonoRepo} \