修复对接的问题

Signed-off-by: 716 <[email protected]>

frontend/.env.development

@@ -1 +1 @@
-BACKEND_URL=/api
+BACKEND_URL=http://127.0.0.1:19035

internal/backend/controllers/base/login.go

@@ -38,7 +38,7 @@ func (cb ControllerBase) LoginHandler(c *gin.Context) {
 		nowAccessToken := my_util.GenerateAccessToken()
 		common.SetAccessToken(nowAccessToken)
 		c.JSON(http.StatusOK, backend.ReplyLogin{AccessToken: nowAccessToken,
-			Settings: settings.GetSettings().GetNoPasswordSettings()})
+			Settings: *settings.GetSettings().GetNoPasswordSettings()})
 		return
 	}
 }

internal/logic/cron_helper/cron_helper.go

@@ -12,9 +12,9 @@ import (
 
 type CronHelper struct {
 	fullSubDownloadProcessing     bool // 这个是核心耗时函数执行的状态
-	fullSubDownloadProcessingLock sync.Locker
+	fullSubDownloadProcessingLock sync.Mutex
 	cronHelperRunning             bool // 这个是定时器启动的状态，它为true，不代表核心函数在执行
-	cronHelperRunningLock         sync.Locker
+	cronHelperRunningLock         sync.Mutex
 	c                             *cron.Cron
 	dh                            *downloader_helper.DownloaderHelper
 }
@@ -53,6 +53,8 @@ func (ch *CronHelper) Start(runImmediately bool) {
 			settings.GetSettings().CommonSettings.ScanInterval, "to Download")
 	}
 
+	log_helper.GetLogger().Infoln("CronHelper Start...")
+	log_helper.GetLogger().Infoln("Next Sub Scan Will Process After", settings.GetSettings().CommonSettings.ScanInterval)
 	ch.c.Start()
 }
 

internal/pkg/settings/settings.go

@@ -54,7 +54,10 @@ func GetSettings(reloadSettings ...bool) *Settings {
 
 // SetFullNewSettings 从 Web 端传入新的 Settings 完整设置
 func SetFullNewSettings(inSettings *Settings) error {
+
+	nowConfigFPath := _settings.configFPath
 	_settings = inSettings
+	_settings.configFPath = nowConfigFPath
 	return _settings.Save()
 }
 
@@ -81,7 +84,7 @@ func (s *Settings) Save() error {
 	return strcut_json.ToFile(s.configFPath, s)
 }
 
-func (s Settings) GetNoPasswordSettings() *Settings {
+func (s *Settings) GetNoPasswordSettings() *Settings {
 	nowSettings := clone.Clone(s).(*Settings)
 	nowSettings.UserInfo.Password = noPassword4Show
 	return nowSettings

internal/types/backend/reply_login.go

@@ -3,7 +3,7 @@ package backend
 import "github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 
 type ReplyLogin struct {
-	AccessToken string             `json:"access_token,omitempty"` // 登录成功后返回令牌
-	Settings    *settings.Settings `json:"settings,omitempty"`     // 登录成功后返回当前的 Setting 信息
-	Message     string             `json:"message,omitempty"`
+	AccessToken string            `json:"access_token,omitempty"` // 登录成功后返回令牌
+	Settings    settings.Settings `json:"settings,omitempty"`     // 登录成功后返回当前的 Setting 信息
+	Message     string            `json:"message,omitempty"`
 }