diff --git a/kernel/api/account.go b/kernel/api/account.go index ffcb1c5d2..0802a6e25 100644 --- a/kernel/api/account.go +++ b/kernel/api/account.go @@ -95,7 +95,8 @@ func login(c *gin.Context) { name := arg["userName"].(string) password := arg["userPassword"].(string) captcha := arg["captcha"].(string) - result, err := model.Login(name, password, captcha) + cloudRegion := int(arg["cloudRegion"].(float64)) + result, err := model.Login(name, password, captcha, cloudRegion) if nil != err { return } diff --git a/kernel/model/liandi.go b/kernel/model/liandi.go index 41d748690..2ec88b99a 100644 --- a/kernel/model/liandi.go +++ b/kernel/model/liandi.go @@ -564,13 +564,16 @@ func CheckActivationcode(code string) (retCode int, msg string) { return } -func Login(userName, password, captcha string) (ret *gulu.Result, err error) { +func Login(userName, password, captcha string, cloudRegion int) (ret *gulu.Result, err error) { + Conf.CloudRegion = cloudRegion + Conf.Save() + result := map[string]interface{}{} request := httpclient.NewCloudRequest30s() _, err = request. SetSuccessResult(&result). SetBody(map[string]string{"userName": userName, "userPassword": password, "captcha": captcha}). - Post(util.ChinaServer + "/apis/siyuan/login") + Post(getCloudServer() + "/apis/siyuan/login") if nil != err { logging.LogErrorf("login failed: %s", err) return nil, errors.New(Conf.Language(18))