feat: git diff

README.md

@@ -157,7 +157,6 @@ func main() {
 	listenOn := utils.GetConfigString("base.listenOn")
 	mode := utils.GetConfigString("base.mode")
 	serviceName := utils.GetConfigString("base.name")
-	registerIP := utils.GetConfigString("base.registerIP")
 
 	if err := discovery.Init(discovery.Config{
 		Hosts:       c.Nacos.Hosts,
@@ -176,13 +175,14 @@ func main() {
 
 	if err := discovery.Register(discovery.Instance{
 		ServiceName: serviceName,
-		IP:          registerIP,
+    IP:          c.Nacos.RegisterIP,
 		Port:        port,
 		Group:       c.Nacos.Group,
 	}); err != nil {
 		logx.Errorf("nacos register: %v", err)
 		os.Exit(1)
 	}
+  logx.Infof("服务注册成功: %s:%d", c.Nacos.RegisterIP, port)
 
 	defer func() {
 		if err := discovery.Deregister(); err != nil {

admin/admin.go

@@ -59,7 +59,6 @@ func main() {
 	listenOn := utils.GetConfigString("base.listenOn")
 	mode := utils.GetConfigString("base.mode")
 	serviceName := utils.GetConfigString("base.name")
-	registerIP := utils.GetConfigString("base.registerIP")
 
 	// 初始化服务发现
 	if err := discovery.Init(discovery.Config{
@@ -80,13 +79,14 @@ func main() {
 	// 注册服务
 	if err := discovery.Register(discovery.Instance{
 		ServiceName: serviceName,
-		IP:          registerIP,
+		IP:          c.Nacos.RegisterIP,
 		Port:        port,
 		Group:       c.Nacos.Group,
 	}); err != nil {
 		logx.Errorf("nacos register: %v", err)
 		os.Exit(1)
 	}
+	logx.Infof("服务注册成功: %s:%d", c.Nacos.RegisterIP, port)
 
 	defer func() {
 		if err := discovery.Deregister(); err != nil {
@@ -149,6 +149,7 @@ func main() {
 	s.Start()
 }
 
+// listenPort 拆分端口
 func listenPort(listenOn string) (uint64, error) {
 	_, portStr, err := net.SplitHostPort(listenOn)
 	if err != nil {

admin/internal/dao/login.go

@@ -16,8 +16,9 @@ type JwtInfo struct {
 }
 
 type Token struct {
-	Token   string `json:"token"`
-	Refresh string `json:"refresh"`
+	Token   string  `json:"token"`
+	Refresh string  `json:"refresh"`
+	Info    JwtInfo `json:"info"`
 }
 
 type JwtInfoServices struct {

admin/internal/logic/adminloginlogic.go

@@ -64,21 +64,20 @@ func (l *AdminLoginLogic) AdminLogin(in *admin.AdminLoginRequest) (*admin.Respon
 	}
 
 	data := dao.JwtInfo{
-		Id:     info.Id,
-		Name:   info.Name,
-		Email:  info.Email,
-		Phone:  info.Phone,
-		Avatar: info.Avatar,
-		//Roles:    info.Roles,
+		Id:       info.Id,
+		Name:     info.Name,
+		Email:    info.Email,
+		Phone:    info.Phone,
+		Avatar:   info.Avatar,
 		LastTime: utils.Now(),
 	}
 	retData := dao.Token{
 		Token: utils.MD5Encrypt(data.Phone + utils.Now().String()),
+		Info:  data,
 	}
 	retData.Refresh = utils.MD5Encrypt(data.Phone + retData.Token)
 
 	l.setLogin(retData.Token, retData.Refresh, data)
-
 	return l.ok(retData), nil
 }