Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-31 22:08:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-06-02 10:14:06 +08:00
commit 837b3e849f
3 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/api/account.go
View file

@ -25,6 +25,18 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
func startFreeTrial(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
err := model.StartFreeTrial()
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
}
func useActivationcode(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)

1
kernel/api/router.go
View file

@ -54,6 +54,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/account/checkActivationcode", model.CheckAuth, checkActivationcode)
ginServer.Handle("POST", "/api/account/useActivationcode", model.CheckAuth, useActivationcode)
ginServer.Handle("POST", "/api/account/deactivate", model.CheckAuth, deactivateUser)
ginServer.Handle("POST", "/api/account/startFreeTrial", model.CheckAuth, startFreeTrial)
ginServer.Handle("POST", "/api/notebook/lsNotebooks", model.CheckAuth, lsNotebooks)
ginServer.Handle("POST", "/api/notebook/openNotebook", model.CheckAuth, openNotebook)

17
kernel/model/liandi.go
View file

@ -31,6 +31,23 @@ import (
var ErrFailedToConnectCloudServer = errors.New("failed to connect cloud server")
func StartFreeTrial() (err error) {
requestResult := gulu.Ret.NewResult()
request := util.NewCloudRequest(Conf.System.NetworkProxy.String())
_, err = request.
SetResult(requestResult).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/user/startFreeTrial")
if nil != err {
util.LogErrorf("start free trial failed: %s", err)
return ErrFailedToConnectCloudServer
}
if 0 != requestResult.Code {
return errors.New(requestResult.Msg)
}
return
}
func DeactivateUser() (err error) {
requestResult := gulu.Ret.NewResult()
request := util.NewCloudRequest(Conf.System.NetworkProxy.String())