Merge remote-tracking branch 'origin/mark' into yonghui

2019-12-27 17:52:23 +08:00
parent ed8627c58a edbe3a92f7
commit b068d07c33
16 changed files with 239 additions and 83 deletions
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -97,6 +97,9 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableMtwm", false) {
 		MtwmAPI = mtwmapi.New(beego.AppConfig.String("mtwmAppID"), beego.AppConfig.String("mtwmSecret"), beego.AppConfig.String("mtwmCallbackURL"))
+		if mtwmCookieStr := beego.AppConfig.DefaultString("mtwmCookieStr", ""); mtwmCookieStr != "" {
+			MtwmAPI.SetCookieWithStr(mtwmCookieStr)
+		}
 	} else {
 		MtwmAPI = nil
 	}