zzw/lone-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: git diff

Browse Source
This commit is contained in:
zzw
2026-08-13 15:47:07 +08:00
parent 085ba3ae34 94e1c6f97d
commit 6a42e763d0
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -157,7 +157,6 @@ func main() {
listenOn := utils.GetConfigString("base.listenOn") listenOn := utils.GetConfigString("base.listenOn")
mode := utils.GetConfigString("base.mode") mode := utils.GetConfigString("base.mode")
serviceName := utils.GetConfigString("base.name") serviceName := utils.GetConfigString("base.name")
registerIP := utils.GetConfigString("base.registerIP")
if err := discovery.Init(discovery.Config{ if err := discovery.Init(discovery.Config{
Hosts: c.Nacos.Hosts, Hosts: c.Nacos.Hosts,
@@ -176,13 +175,14 @@ func main() {
if err := discovery.Register(discovery.Instance{ if err := discovery.Register(discovery.Instance{
ServiceName: serviceName, ServiceName: serviceName,
IP: registerIP, IP: c.Nacos.RegisterIP,
Port: port, Port: port,
Group: c.Nacos.Group, Group: c.Nacos.Group,
}); err != nil { }); err != nil {
logx.Errorf("nacos register: %v", err) logx.Errorf("nacos register: %v", err)
os.Exit(1) os.Exit(1)
} }
logx.Infof("服务注册成功: %s:%d", c.Nacos.RegisterIP, port)
defer func() { defer func() {
if err := discovery.Deregister(); err != nil { if err := discovery.Deregister(); err != nil {
admin/admin.go
+3 -2
View File
@@ -59,7 +59,6 @@ func main() {
listenOn := utils.GetConfigString("base.listenOn") listenOn := utils.GetConfigString("base.listenOn")
mode := utils.GetConfigString("base.mode") mode := utils.GetConfigString("base.mode")
serviceName := utils.GetConfigString("base.name") serviceName := utils.GetConfigString("base.name")
registerIP := utils.GetConfigString("base.registerIP")
// 初始化服务发现 // 初始化服务发现
if err := discovery.Init(discovery.Config{ if err := discovery.Init(discovery.Config{
@@ -80,13 +79,14 @@ func main() {
// 注册服务 // 注册服务
if err := discovery.Register(discovery.Instance{ if err := discovery.Register(discovery.Instance{
ServiceName: serviceName, ServiceName: serviceName,
IP: registerIP, IP: c.Nacos.RegisterIP,
Port: port, Port: port,
Group: c.Nacos.Group, Group: c.Nacos.Group,
}); err != nil { }); err != nil {
logx.Errorf("nacos register: %v", err) logx.Errorf("nacos register: %v", err)
os.Exit(1) os.Exit(1)
} }
logx.Infof("服务注册成功: %s:%d", c.Nacos.RegisterIP, port)
defer func() { defer func() {
if err := discovery.Deregister(); err != nil { if err := discovery.Deregister(); err != nil {
@@ -149,6 +149,7 @@ func main() {
s.Start() s.Start()
} }
// listenPort 拆分端口
func listenPort(listenOn string) (uint64, error) { func listenPort(listenOn string) (uint64, error) {
_, portStr, err := net.SplitHostPort(listenOn) _, portStr, err := net.SplitHostPort(listenOn)
if err != nil { if err != nil {
admin/internal/dao/login.go
+3 -2
View File
@@ -16,8 +16,9 @@ type JwtInfo struct {
} }
type Token struct { type Token struct {
Token string `json:"token"` Token string `json:"token"`
Refresh string `json:"refresh"` Refresh string `json:"refresh"`
Info JwtInfo `json:"info"`
} }
type JwtInfoServices struct { type JwtInfoServices struct {
admin/internal/logic/adminloginlogic.go
+6 -7
View File
@@ -64,21 +64,20 @@ func (l *AdminLoginLogic) AdminLogin(in *admin.AdminLoginRequest) (*admin.Respon
} }
data := dao.JwtInfo{ data := dao.JwtInfo{
Id: info.Id, Id: info.Id,
Name: info.Name, Name: info.Name,
Email: info.Email, Email: info.Email,
Phone: info.Phone, Phone: info.Phone,
Avatar: info.Avatar, Avatar: info.Avatar,
//Roles: info.Roles,
LastTime: utils.Now(), LastTime: utils.Now(),
} }
retData := dao.Token{ retData := dao.Token{
Token: utils.MD5Encrypt(data.Phone + utils.Now().String()), Token: utils.MD5Encrypt(data.Phone + utils.Now().String()),
Info: data,
} }
retData.Refresh = utils.MD5Encrypt(data.Phone + retData.Token) retData.Refresh = utils.MD5Encrypt(data.Phone + retData.Token)
l.setLogin(retData.Token, retData.Refresh, data) l.setLogin(retData.Token, retData.Refresh, data)
return l.ok(retData), nil return l.ok(retData), nil
} }