diff --git a/app.go b/app.go index 9fbd71b..ac8d785 100644 --- a/app.go +++ b/app.go @@ -96,8 +96,8 @@ func (a *App) domReady(ctx context.Context) { // Add your action here //定时更新数据 + config := data.NewSettingsApi(&data.Settings{}).GetConfig() go func() { - config := data.NewSettingsApi(&data.Settings{}).GetConfig() interval := config.RefreshInterval if interval <= 0 { interval = 1 @@ -123,13 +123,15 @@ func (a *App) domReady(ctx context.Context) { defer ticker.Stop() for range ticker.C { telegraph := refreshTelegraphList() - if telegraph != nil { + if telegraph != nil && config.EnableNews { go runtime.EventsEmit(a.ctx, "telegraph", telegraph) } } }() - go runtime.EventsEmit(a.ctx, "telegraph", refreshTelegraphList()) + if config.EnableNews { + go runtime.EventsEmit(a.ctx, "telegraph", refreshTelegraphList()) + } go MonitorStockPrices(a) go MonitorFundPrices(a) go data.NewFundApi().AllFund() diff --git a/backend/data/settings_api.go b/backend/data/settings_api.go index b76c2b4..b51fe68 100644 --- a/backend/data/settings_api.go +++ b/backend/data/settings_api.go @@ -30,6 +30,7 @@ type Settings struct { KDays int64 `json:"kDays"` EnableDanmu bool `json:"enableDanmu"` BrowserPath string `json:"browserPath"` + EnableNews bool `json:"enableNews"` } func (receiver Settings) TableName() string { @@ -71,6 +72,7 @@ func (s SettingsApi) UpdateConfig() string { "k_days": s.Config.KDays, "enable_danmu": s.Config.EnableDanmu, "browser_path": s.Config.BrowserPath, + "enable_news": s.Config.EnableNews, }) } else { logger.SugaredLogger.Infof("未找到配置,创建默认配置:%+v", s.Config) @@ -95,6 +97,7 @@ func (s SettingsApi) UpdateConfig() string { KDays: s.Config.KDays, EnableDanmu: s.Config.EnableDanmu, BrowserPath: s.Config.BrowserPath, + EnableNews: s.Config.EnableNews, }) } return "保存成功!" diff --git a/frontend/src/App.vue b/frontend/src/App.vue index e3bbcbc..1e241d7 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -8,7 +8,7 @@ import { WindowSetPosition, WindowUnfullscreen } from '../wailsjs/runtime' -import {h, onMounted, ref} from "vue"; +import {h, onBeforeMount, onMounted, ref} from "vue"; import { RouterLink } from 'vue-router' import {darkTheme, NGradientText, NIcon, NText,} from 'naive-ui' import { @@ -17,7 +17,8 @@ import { ExpandOutline, PowerOutline, LogoGithub, MoveOutline, WalletOutline, StarOutline, AlarmOutline, SparklesOutline, } from '@vicons/ionicons5' - +import {GetConfig} from "../wailsjs/go/main/App"; +const enableNews= ref(false) const contentStyle = ref("") const content = ref('数据来源于网络,仅供参考;投资有风险,入市需谨慎') const isFullscreen = ref(false) @@ -197,6 +198,15 @@ window.onerror = function (msg, source, lineno, colno, error) { return true; }; +onBeforeMount(()=>{ + GetConfig().then((res)=>{ + console.log(res) + if(res.enableNews){ + enableNews.value=true + } + }) +}) + onMounted(()=>{ contentStyle.value="max-height: calc(90vh);overflow: hidden" }) @@ -232,7 +242,7 @@ onMounted(()=>{ --> - + {{item}} diff --git a/frontend/src/components/settings.vue b/frontend/src/components/settings.vue index a7092d3..9198ef3 100644 --- a/frontend/src/components/settings.vue +++ b/frontend/src/components/settings.vue @@ -35,6 +35,7 @@ const formValue = ref({ }, enableDanmu:false, browserPath: '', + enableNews:false, }) onMounted(()=>{ @@ -65,6 +66,8 @@ onMounted(()=>{ } formValue.value.enableDanmu = res.enableDanmu formValue.value.browserPath = res.browserPath + formValue.value.enableNews = res.enableNews + console.log(res) }) //message.info("加载完成") @@ -92,7 +95,8 @@ function saveConfig(){ crawlTimeOut:formValue.value.openAI.crawlTimeOut, kDays:formValue.value.openAI.kDays, enableDanmu:formValue.value.enableDanmu, - browserPath:formValue.value.browserPath + browserPath:formValue.value.browserPath, + enableNews:formValue.value.enableNews, }) //console.log("Settings",config) @@ -165,6 +169,7 @@ function importConfig(){ } formValue.value.enableDanmu = config.enableDanmu formValue.value.browserPath = config.browserPath + formValue.value.enableNews = config.enableNews // formRef.value.resetFields() }; reader.readAsText(file); @@ -227,6 +232,9 @@ window.onerror = function (event, source, lineno, colno, error) { + + + 发送测试通知 diff --git a/frontend/wailsjs/go/models.ts b/frontend/wailsjs/go/models.ts index d2c545d..b0c0987 100644 --- a/frontend/wailsjs/go/models.ts +++ b/frontend/wailsjs/go/models.ts @@ -171,6 +171,7 @@ export namespace data { kDays: number; enableDanmu: boolean; browserPath: string; + enableNews: boolean; static createFrom(source: any = {}) { return new Settings(source); @@ -202,6 +203,7 @@ export namespace data { this.kDays = source["kDays"]; this.enableDanmu = source["enableDanmu"]; this.browserPath = source["browserPath"]; + this.enableNews = source["enableNews"]; } convertValues(a: any, classs: any, asMap: boolean = false): any {