From 1b49b58df6c0efd78193cb006be42a450a3c7fd8 Mon Sep 17 00:00:00 2001 From: "LinskRuis.32G" Date: Sat, 24 Apr 2021 15:44:01 +0800 Subject: [PATCH] bugs+ --- core/cloud/userCloud/user.go | 4 ++-- core/comms/const.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/cloud/userCloud/user.go b/core/cloud/userCloud/user.go index 983b753..1b9e88d 100644 --- a/core/cloud/userCloud/user.go +++ b/core/cloud/userCloud/user.go @@ -35,9 +35,9 @@ func GetUsrPerms(uid string) map[string]bool { } return e } -func Login(m *sysBean.LoginReq) (*sysBean.LoginRes, error) { +func Login(name, pass string) (*sysBean.LoginRes, error) { e := &sysBean.LoginRes{} - err := DoJson("Login", m, e) + err := DoJson("Login", &sysBean.LoginReq{Name: name, Pass: pass}, e) if err != nil { return nil, err } diff --git a/core/comms/const.go b/core/comms/const.go index dbccefa..b45838f 100644 --- a/core/comms/const.go +++ b/core/comms/const.go @@ -17,7 +17,7 @@ const ( var ( TimeZHT = time.FixedZone("CST", 8*3600) - REG_Host = regexp.MustCompile(`((\w+\.)*)((jzdisk\.)\w+)(:\d+)?`) - REG_Hosts = regexp.MustCompile(`https?://((\w+\.)*)((1ydt\.)\w+)(:\d+)?`) - REG_Phone = regexp.MustCompile(`^([0-9]{0,3})[1][3,4,5,7,8,9][0-9]{9}$`) + RegHost = regexp.MustCompile(`((\w+\.)*)((jzdisk\.)\w+)(:\d+)?`) + RegHosts = regexp.MustCompile(`https?://((\w+\.)*)((1ydt\.)\w+)(:\d+)?`) + RegPhone = regexp.MustCompile(`^([0-9]{0,3})[1][3,4,5,7,8,9][0-9]{9}$`) )