debug: add log

Author: lianjin

server/Dockerfile

@@ -1,5 +1,5 @@
 # Use the official Go image with version 1.24
-FROM golang:1.24.0-alpine AS builder 
+FROM golang:1.24.0 AS builder 
 
 # Set the working directory inside the container
 WORKDIR /app
@@ -19,7 +19,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     go clean -cache -modcache
 
 # Create a non-root user and set permissions
-RUN adduser -D -h /home/appuser appuser && \
+RUN useradd -m appuser && \
     mkdir -p logs && \
     chown -R appuser:appuser config/ && \
     chown -R appuser:appuser logs/ && \

server/go.mod

@@ -53,7 +53,7 @@ require (
 	github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/go-sql-driver/mysql v1.9.3 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/goccy/go-yaml v1.18.0 // indirect

server/go.sum

@@ -71,6 +71,8 @@ github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHO
 github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=

server/log/logger.go

@@ -36,8 +36,13 @@ func getLogLevel() zapcore.Level {
 
 func getEncoder() zapcore.Encoder {
 	encoderConfig := zap.NewProductionEncoderConfig()
+	location, err := time.LoadLocation("Asia/Singapore")
+	if err != nil {
+		// 如果加载时区失败，回退到本地时区
+		location = time.Local
+	}
 	encoderConfig.EncodeTime = func(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
-		enc.AppendString(t.Local().Format("2006-01-02 15:04:05"))
+		enc.AppendString(t.In(location).Format("2006-01-02 15:04:05"))
 	}
 	encoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
 	return zapcore.NewConsoleEncoder(encoderConfig)

server/main.go

@@ -40,8 +40,12 @@ func main() {
 	go grpc.Init(sigCh)
 	go http.Init(sigCh)
 	// listen terminage signal
-	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM, syscall.SIGUSR1, syscall.SIGUSR2)
 	sig := <-sigCh // Block until signal is received
 	debug.PrintStack()
 	log.Logger.Infof("Received signal: %v, shutting down", sig)
+<<<<<<< Updated upstream
+	select {}
+=======
+>>>>>>> Stashed changes
 }

server/repository/init.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/NUS-ISS-Agile-Team/ceramicraft-user-mservice/server/config"
+	"github.com/NUS-ISS-Agile-Team/ceramicraft-user-mservice/server/log"
 	"github.com/NUS-ISS-Agile-Team/ceramicraft-user-mservice/server/repository/model"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
@@ -29,13 +30,15 @@ func Init() {
 		config.Config.MySQLConfig.Port,
 		config.Config.MySQLConfig.DBName,
 	)
+	fmt.Printf("Connecting to MySQL at %s", dsn)
 	DB, err = gorm.Open(mysql.Open(dsn),
 		&gorm.Config{
 			PrepareStmt:            true,
 			SkipDefaultTransaction: true,
 		},
 	)
 	if err != nil {
+		log.Logger.Errorf("failed to connect database: %v", err)
 		panic(err)
 	}
 	err = DB.AutoMigrate(
@@ -44,6 +47,7 @@ func Init() {
 		&model.UserAddress{},
 	)
 	if err != nil {
+		log.Logger.Errorf("failed to migrate database: %v", err)
 		panic(err)
 	}
 }