正式构建版本 1.0.0

config/config.go

@@ -35,8 +35,9 @@ type DatabaseConfig struct {
 	Mysql  MysqlConfig
 }
 type RedisConfig struct {
-	Enable bool
-	URL    string
+	Enable   bool
+	URL      string
+	Password string
 }
 
 type MysqlConfig struct {

install.sh

@@ -2,11 +2,11 @@
 export PORT=8081
 export TRACING_ENABLE=true
 export TRACING_JAEGER_URL=http://localhost:14268/api/traces
-
+#jaeger-collector-service.monitoring.svc.cluster.local:14268
 # 注册中心
 export REGISTRY_ENABLE=true
 export REGISTRY_CONSUL_URL=http://localhost:8500
-
+#consul-api-service.monitoring.svc.cluster.local:8500
 # 数据库
 export DATABASE_ENABLE=true
 export DATABASE_MYSQL_USER=root
@@ -18,5 +18,6 @@ export DATABASE_MYSQL_DATABASE=sghblog
 # Redis
 export REDIS_ENABLE=true
 export REDIS_URL=localhost:6379
+export REDIS_PASSWORD=xugang131500
 
 go run main.go

main.go

@@ -16,6 +16,7 @@ import (
 	"go.opentelemetry.io/otel/propagation"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
 	"sghgogs.com/sghblog/authorization-service/config"
 	"sghgogs.com/sghblog/authorization-service/domain/repository"
@@ -40,17 +41,20 @@ func main() {
 		logrus.Fatal(err)
 	}
 	if cfg := config.RedisAddress(); cfg.Enable {
+		fmt.Println(cfg.Enable)
 		authutil.NewJWTAuth(redis.NewClient(&redis.Options{
-			Addr:     cfg.URL, // Redis 服务器地址
-			Password: "",      // Redis 密码，如果有的话
-			DB:       0,       // 默认数据库
+			Addr:     cfg.URL,      // Redis 服务器地址
+			Password: cfg.Password, // Redis 密码，如果有的话
+			DB:       0,            // 默认数据库
 		}), name, cfg.Enable)
+		// cfg.Password
 	}
 	// 1. 连接数据库
 	var db *gorm.DB
 	if cfg := config.DataBase(); cfg.Enable {
 		address := fmt.Sprintf("%v:%v@(%v:%v)/%v?charset=utf8mb4,utf8&parseTime=True&loc=Local", cfg.Mysql.User, cfg.Mysql.Password, cfg.Mysql.Host, cfg.Mysql.Port, cfg.Mysql.DataBase)
 		db, _ = gorm.Open(mysql.Open(address), &gorm.Config{
+			Logger: logger.Default.LogMode(logger.Info),
 			NamingStrategy: schema.NamingStrategy{
 				SingularTable: true,
 			}})

test/admin_common/admin_common_test.go

@@ -3,12 +3,6 @@ package admin_common
 import (
 	"fmt"
 	"golang.org/x/crypto/bcrypt"
-	"gorm.io/driver/mysql"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-	"sghgogs.com/sghblog/authorization-service/domain/repository"
-	"sghgogs.com/sghblog/authorization-service/domain/service"
 	"testing"
 	"time"
 )
@@ -29,17 +23,17 @@ func hashPassword(password string) (string, error) {
 }
 
 func TestAdminLogin(t *testing.T) {
-	address := fmt.Sprintf("%v:%v@(%v:%v)/%v?charset=utf8mb4,utf8&parseTime=True&loc=Local", "root", "xugang131500", "47.56.16.206", 3306, "sghblog")
-	db, err := gorm.Open(mysql.Open(address), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Info),
-		NamingStrategy: schema.NamingStrategy{
-			SingularTable: true,
-		}})
-	if err != nil {
-		t.Fatal(err)
-	}
-	repo := repository.NewRepository(db)
-	newService := service.NewService(repo)
+	// address := fmt.Sprintf("%v:%v@(%v:%v)/%v?charset=utf8mb4,utf8&parseTime=True&loc=Local", "root", "xugang131500", "47.56.16.206", 3306, "sghblog")
+	// db, err := gorm.Open(mysql.Open(address), &gorm.Config{
+	// 	Logger: logger.Default.LogMode(logger.Info),
+	// 	NamingStrategy: schema.NamingStrategy{
+	// 		SingularTable: true,
+	// 	}})
+	// if err != nil {
+	// 	t.Fatal(err)
+	// }
+	// repo := repository.NewRepository(db)
+	// newService := service.NewService(repo)
 	t.Run("过期时间", func(t *testing.T) {
 		old := time.Now().Unix()
 		add := time.Now().Add(time.Second * time.Duration(0.5*3600)).Unix()
@@ -50,10 +44,10 @@ func TestAdminLogin(t *testing.T) {
 		// fmt.Println("expiryTime", expiryTime)
 	})
 	t.Run("登录", func(t *testing.T) {
-		login, err := newService.AdminLogin("admin", "123456", 1)
+		// login, err := newService.AdminLogin("admin", "123456", 1)
 		// fmt.Println(checkPasswordHash("123456", login.Password))
-		fmt.Println(err)
-		fmt.Println(login.Roles)
-		fmt.Println(login.Teams)
+		// fmt.Println(err)
+		// fmt.Println(login.Roles)
+		// fmt.Println(login.Teams)
 	})
 }

test/common/admin_login_test.go

@@ -1,37 +1,29 @@
 package common
 
 import (
-	"fmt"
-	"github.com/stretchr/testify/assert"
-	"gorm.io/driver/mysql"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-	"sghgogs.com/sghblog/authorization-service/domain/repository"
-	authorization_service "sghgogs.com/sghblog/authorization-service/proto"
 	"testing"
 )
 
 func TestAdminLogin(t *testing.T) {
-	address := fmt.Sprintf("%v:%v@(%v:%v)/%v?charset=utf8mb4,utf8&parseTime=True&loc=Local", "root", "xugang131500", "47.56.16.206", 3306, "sghblog")
-	db, err := gorm.Open(mysql.Open(address), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Info),
-		NamingStrategy: schema.NamingStrategy{
-			SingularTable: true,
-		}})
-	if err != nil {
-		t.Fatal(err)
-	}
-	repo := repository.NewRepository(db)
-	loginRequest := &authorization_service.AdminLoginRequest{
-		Username: "",
-		Password: "",
-		Role:     "",
-	}
-	// 调用 AdminLogin 方法
-	user, err := repo.AdminLogin(loginRequest)
-	// 断言期望的结果
-	assert.NoError(t, err)
-	assert.NotNil(t, user)
-	assert.Equal(t, loginRequest.Username, user.Username)
+	// address := fmt.Sprintf("%v:%v@(%v:%v)/%v?charset=utf8mb4,utf8&parseTime=True&loc=Local", "root", "xugang131500", "47.56.16.206", 3306, "sghblog")
+	// db, err := gorm.Open(mysql.Open(address), &gorm.Config{
+	// 	Logger: logger.Default.LogMode(logger.Info),
+	// 	NamingStrategy: schema.NamingStrategy{
+	// 		SingularTable: true,
+	// 	}})
+	// if err != nil {
+	// 	t.Fatal(err)
+	// }
+	// repo := repository.NewRepository(db)
+	// loginRequest := &authorization_service.AdminLoginRequest{
+	// 	Username: "",
+	// 	Password: "",
+	// 	// Role:     "",
+	// }
+	// // 调用 AdminLogin 方法
+	// // user, err := repo.AdminLogin(loginRequest)
+	// // 断言期望的结果
+	// assert.NoError(t, err)
+	// assert.NotNil(t, user)
+	// assert.Equal(t, loginRequest.Username, user.Username)
 }