#415 修改func.js及标注系统的消息队列使用配置文件的方式实现

Merged
lewis merged 1 commits from zouanping into V20210910 2 years ago
  1. +4
    -8
      modules/labelmsg/redismsgsender.go
  2. +10
    -0
      modules/setting/setting.go
  3. +2
    -6
      public/self/func.js

+ 4
- 8
modules/labelmsg/redismsgsender.go View File

@@ -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.")
}


+ 10
- 0
modules/setting/setting.go View File

@@ -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")


+ 2
- 6
public/self/func.js View File

@@ -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";

}




Loading…
Cancel
Save