diff --git a/.gitignore b/.gitignore index 1da6425..81cd76e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ develop/jd_cookie jd_wskey logs/* jd_* -data \ No newline at end of file +data +sets.conf \ No newline at end of file diff --git a/core/config.go b/core/config.go index e05c40d..bc26feb 100644 --- a/core/config.go +++ b/core/config.go @@ -1,14 +1,8 @@ package core import ( - "io" - "io/ioutil" "os" "path/filepath" - - "github.com/astaxie/beego/logs" - "github.com/beego/beego/v2/adapter/httplib" - "gopkg.in/yaml.v2" ) type Yaml struct { @@ -18,33 +12,3 @@ type Yaml struct { var ExecPath, _ = filepath.Abs(filepath.Dir(os.Args[0])) var Config Yaml - -func ReadYaml(confDir string, conf interface{}, url string) { - path := confDir + "config.yaml" - if _, err := os.Stat(confDir); err != nil { - os.MkdirAll(confDir, os.ModePerm) - } - f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0777) - if err != nil { - logs.Warn(err) - } - s, _ := ioutil.ReadAll(f) - if len(s) == 0 { - logs.Info("下载配置%s", url) - r, err := httplib.Get("https://ghproxy.com/" + url).Response() - if err == nil { - io.Copy(f, r.Body) - } - } - f.Close() - content, err := ioutil.ReadFile(path) - if err != nil { - logs.Warn("解析配置文件%s读取错误: %v", path, err) - return - } - if yaml.Unmarshal(content, conf) != nil { - logs.Warn("解析配置文件%s出错: %v", path, err) - return - } - logs.Info("解析配置文件%s", path) -} diff --git a/core/init.go b/core/init.go index e287ed1..14529c3 100644 --- a/core/init.go +++ b/core/init.go @@ -1,7 +1,9 @@ package core import ( + "bufio" "os" + "regexp" "time" ) @@ -16,9 +18,21 @@ func init() { } } initStore() - ReadYaml(ExecPath+"/conf/", &Config, "https://raw.githubusercontent.com/cdle/sillyGirl/main/conf/demo_config.yaml") - InitReplies() initToHandleMessage() + InitReplies() + file, err := os.Open(ExecPath + "/conf/sets.conf") + if err == nil { + scanner := bufio.NewScanner(file) + for scanner.Scan() { + line := scanner.Text() + if regexp.MustCompile(`^set`).MatchString(line) { + Senders <- &Faker{ + Message: line, + } + } + } + file.Close() + } initSys() Duration = time.Duration(sillyGirl.GetInt("duration", 5)) * time.Second } diff --git a/develop/qinglong/cron.go b/develop/qinglong/cron.go index 707972b..ad55b78 100644 --- a/develop/qinglong/cron.go +++ b/develop/qinglong/cron.go @@ -199,7 +199,7 @@ func init() { Admin: true, Cron: "*/5 * * * *", Handle: func(s core.Sender) interface{} { - if s.GetImType() == "fake" && qinglong.Get("autoCronHideDuplicate", "true") == "false" { + if s.GetImType() == "fake" && qinglong.GetBool("autoCronHideDuplicate", true) == false { return nil } w := func(s string) int {