瀏覽代碼

:art: Support LiuYun account login https://github.com/siyuan-note/siyuan/issues/8578

Daniel 2 年之前
父節點
當前提交
ab5a91de5c
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 2 1
      kernel/api/account.go
  2. 5 2
      kernel/model/liandi.go

+ 2 - 1
kernel/api/account.go

@@ -95,7 +95,8 @@ func login(c *gin.Context) {
 	name := arg["userName"].(string)
 	name := arg["userName"].(string)
 	password := arg["userPassword"].(string)
 	password := arg["userPassword"].(string)
 	captcha := arg["captcha"].(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 {
 	if nil != err {
 		return
 		return
 	}
 	}

+ 5 - 2
kernel/model/liandi.go

@@ -564,13 +564,16 @@ func CheckActivationcode(code string) (retCode int, msg string) {
 	return
 	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{}{}
 	result := map[string]interface{}{}
 	request := httpclient.NewCloudRequest30s()
 	request := httpclient.NewCloudRequest30s()
 	_, err = request.
 	_, err = request.
 		SetSuccessResult(&result).
 		SetSuccessResult(&result).
 		SetBody(map[string]string{"userName": userName, "userPassword": password, "captcha": captcha}).
 		SetBody(map[string]string{"userName": userName, "userPassword": password, "captcha": captcha}).
-		Post(util.ChinaServer + "/apis/siyuan/login")
+		Post(getCloudServer() + "/apis/siyuan/login")
 	if nil != err {
 	if nil != err {
 		logging.LogErrorf("login failed: %s", err)
 		logging.LogErrorf("login failed: %s", err)
 		return nil, errors.New(Conf.Language(18))
 		return nil, errors.New(Conf.Language(18))