diff --git a/modules/labelmsg/redismsgsender.go b/modules/labelmsg/redismsgsender.go index c9fa072715..8b2eae772b 100644 --- a/modules/labelmsg/redismsgsender.go +++ b/modules/labelmsg/redismsgsender.go @@ -2,14 +2,10 @@ package labelmsg import ( "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) // 方法名 -const ( - LabelTaskName = "LabelRedisQueue" - LabelDatasetDeleteQueue = "LabelDatasetDeleteQueue" - DecompressOBSTaskName = "LabelDecompressOBSQueue" -) func SendAddAttachToLabelSys(attach string) error { @@ -18,7 +14,7 @@ func SendAddAttachToLabelSys(attach string) error { //记得销毁本次链连接 defer redisclient.Close() - _, err := redisclient.Do("Publish", LabelTaskName, attach) + _, err := redisclient.Do("Publish", setting.LabelTaskName, attach) if err != nil { log.Critical("redis Publish failed.") } @@ -35,7 +31,7 @@ func SendDeleteAttachToLabelSys(attach string) error { //记得销毁本次链连接 defer redisclient.Close() - _, err := redisclient.Do("Publish", LabelDatasetDeleteQueue, attach) + _, err := redisclient.Do("Publish", setting.LabelDatasetDeleteQueue, attach) if err != nil { log.Critical("redis Publish failed.") } @@ -51,7 +47,7 @@ func SendDecompressAttachToLabelOBS(attach string) error { //记得销毁本次链连接 defer redisclient.Close() - _, err := redisclient.Do("Publish", DecompressOBSTaskName, attach) + _, err := redisclient.Do("Publish", setting.DecompressOBSTaskName, attach) if err != nil { log.Critical("redis Publish failed.") } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 687f026057..0fbc9f9092 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -431,6 +431,11 @@ var ( AuthUser string AuthPassword string + //labelsystem config + LabelTaskName string + LabelDatasetDeleteQueue string + DecompressOBSTaskName string + //cloudbrain config CBAuthUser string CBAuthPassword string @@ -1145,6 +1150,11 @@ func NewContext() { AuthUser = sec.Key("USER").MustString("cW4cMtH24eoWPE7X") AuthPassword = sec.Key("PASSWORD").MustString("4BPmgvK2hb2Eywwyp4YZRY4B7yQf4DAC") + sec = Cfg.Section("labelsystem") + LabelTaskName = sec.Key("LabelTaskName").MustString("LabelRedisQueue") + LabelDatasetDeleteQueue = sec.Key("LabelDatasetDeleteQueue").MustString("LabelDatasetDeleteQueue") + DecompressOBSTaskName = sec.Key("DecompressOBSTaskName").MustString("LabelDecompressOBSQueue") + sec = Cfg.Section("cloudbrain") CBAuthUser = sec.Key("USER").MustString("cW4cMtH24eoWPE7X") CBAuthPassword = sec.Key("PWD").MustString("4BPmgvK2hb2Eywwyp4YZRY4B7yQf4DAC") diff --git a/public/self/func.js b/public/self/func.js index 23dfeceb3a..d16ca1b056 100644 --- a/public/self/func.js +++ b/public/self/func.js @@ -1,11 +1,7 @@ function getIp(){ - - //return "http://192.168.62.129:8000"; - - //return "http://192.168.62.129"; - return "http://192.168.62.129:8010"; - //return "http://111.231.109.64:8000"; + return "/labelsystem"; + }