chickliu/Sillyv2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cdle
2021-09-09 19:28:23 +08:00
parent ae9b3b2916
commit 19804c540e
4 changed files with 166 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -1
View File
@@ -3,4 +3,5 @@ test
sillyGirl sillyGirl
.vscode .vscode
dev.go dev.go
.DS_Store .DS_Store
develop/jd_cookie
develop/jd_help/help.go
+1 -1
View File
@@ -102,7 +102,7 @@ func init() {
Value: f[i], Value: f[i],
}) })
} }
qinglong.SetEnv(envs...) qinglong.SetConfigEnv(envs...)
return return
} }
} }
develop/qinglong/config.go
+134 -5
View File
@@ -25,6 +25,124 @@ func init() {
}) })
} }
func init() {
core.AddCommand("ql", []core.Function{
{
Rules: []string{`envs`},
Admin: true,
Handle: func(_ im.Sender) interface{} {
envs, err := GetConfigEnvs("")
if err != nil {
return err
}
if len(envs) == 0 {
return "未设置任何环境变量"
}
es := []string{}
for _, env := range envs {
es = append(es, formatEnv(&env))
}
return strings.Join(es, "\n\n")
},
},
{
Rules: []string{`env get ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
name := s.Get()
envs, err := GetConfigEnvs(name)
if err != nil {
return err
}
if len(envs) == 0 {
return "未设置该环境变量"
}
es := []string{}
for _, env := range envs {
if env.Name == name {
es = append(es, formatEnv(&env))
}
}
return strings.Join(es, "\n\n")
},
},
{
Rules: []string{`env find ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
m := s.Get()
envs, err := GetConfigEnvs(m)
if err != nil {
return err
}
if len(envs) == 0 {
return "找不到环境变量"
}
es := []string{}
for _, env := range envs {
es = append(es, formatEnv(&env))
}
return strings.Join(es, "\n\n")
},
},
{
Rules: []string{`env set ? ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
err := SetConfigEnv(Env{
Name: s.Get(0),
Value: s.Get(1),
Status: 3,
})
if err != nil {
return err
}
return fmt.Sprintf("操作成功")
},
},
// {
// Rules: []string{`env delete ?`},
// Admin: true,
// Handle: func(s im.Sender) interface{} {
// if err := DelEnv(&Env{ID: s.Get()}); err != nil {
// return err
// }
// return "操作成功"
// },
// },
{
Rules: []string{`env remark ? ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
if err := SetConfigEnv(Env{Name: s.Get(0), Remarks: s.Get(1), Status: 3}); err != nil {
return err
}
return "操作成功"
},
},
{
Rules: []string{`env disable ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
if err := SetConfigEnv(Env{Name: s.Get(0), Status: 1}); err != nil {
return err
}
return "操作成功"
},
},
{
Rules: []string{`env enable ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
if err := SetConfigEnv(Env{Name: s.Get(0)}); err != nil {
return err
}
return "操作成功"
},
},
})
}
func GetConfig() (string, error) { func GetConfig() (string, error) {
config := "data" config := "data"
if err := req(CONFIG, &config, "/config.sh"); err != nil { if err := req(CONFIG, &config, "/config.sh"); err != nil {
@@ -43,7 +161,7 @@ func SvaeConfig(content string) error {
return nil return nil
} }
func GetEnvs(searchValue string) ([]Env, error) { func GetConfigEnvs(searchValue string) ([]Env, error) {
envs := []Env{} envs := []Env{}
content, err := GetConfig() content, err := GetConfig()
if err != nil { if err != nil {
@@ -70,13 +188,16 @@ func GetEnvs(searchValue string) ([]Env, error) {
return envs, nil return envs, nil
} }
func SetEnv(envs ...Env) error { func SetConfigEnv(envs ...Env) error {
config, err := GetConfig() config, err := GetConfig()
if err != nil { if err != nil {
return err return err
} }
lines := strings.Split(config, "\n") lines := strings.Split(config, "\n")
for _, env := range envs { for _, env := range envs {
if env.Name == "" {
continue
}
set := false set := false
for j, line := range lines { for j, line := range lines {
for i, pattern := range []string{`^\s*export\s+([^'"=\s]+)=[ '"]?(.*?)['"]?$`, `^\s*#[#\s]*export\s+([^'"=\s]+)=[ '"]?(.*?)['"]?$`, `^\s*([^'"=\s]+)=[ '"]?(.*?)['"]?$`, `^\s*#[#\s]*([^'"=\s]+)=[ '"]?(.*?)['"]?$`} { for i, pattern := range []string{`^\s*export\s+([^'"=\s]+)=[ '"]?(.*?)['"]?$`, `^\s*#[#\s]*export\s+([^'"=\s]+)=[ '"]?(.*?)['"]?$`, `^\s*([^'"=\s]+)=[ '"]?(.*?)['"]?$`, `^\s*#[#\s]*([^'"=\s]+)=[ '"]?(.*?)['"]?$`} {
@@ -90,15 +211,15 @@ func SetEnv(envs ...Env) error {
if env.Name != e.Name { if env.Name != e.Name {
continue continue
} }
if env.Value != e.Value { if env.Value != "" && env.Value != e.Value {
e.Value = env.Value e.Value = env.Value
} }
if env.Status != e.Status { if env.Status < 2 {
e.Status = env.Status e.Status = env.Status
} }
h := "" h := ""
if e.Status == 1 { if e.Status == 1 {
h = "# " h = "## "
} }
if i <= 1 { if i <= 1 {
h = "export " h = "export "
@@ -115,3 +236,11 @@ func SetEnv(envs ...Env) error {
} }
return SvaeConfig(strings.Join(lines, "\n")) return SvaeConfig(strings.Join(lines, "\n"))
} }
func formatEnv(env *Env) string {
status := "已启用"
if env.Status != 0 {
status = "已禁用"
}
return fmt.Sprintf("名称：%v\n状态：%v\n值：%v", env.Name, status, env.Value)
}
develop/qinglong/env.go
+29 -142
View File
@@ -2,11 +2,6 @@ package qinglong
import ( import (
"errors" "errors"
"fmt"
"strings"
"github.com/cdle/sillyGirl/core"
"github.com/cdle/sillyGirl/im"
) )
type EnvResponse struct { type EnvResponse struct {
@@ -23,103 +18,6 @@ type Env struct {
Remarks string `json:"remarks,omitempty"` Remarks string `json:"remarks,omitempty"`
} }
func init() {
core.AddCommand("ql", []core.Function{
{
Rules: []string{`envs`},
Admin: true,
Handle: func(_ im.Sender) interface{} {
envs, err := GetEnvs("")
if err != nil {
return err
}
if len(envs) == 0 {
return "未设置任何环境变量"
}
es := []string{}
for _, env := range envs {
es = append(es, formatEnv(&env))
}
return strings.Join(es, "\n\n")
},
},
{
Rules: []string{`env get ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
name := s.Get()
envs, err := GetEnvs(name)
if err != nil {
return err
}
if len(envs) == 0 {
return "未设置该环境变量"
}
es := []string{}
for _, env := range envs {
if env.Name == name {
es = append(es, formatEnv(&env))
}
}
return strings.Join(es, "\n\n")
},
},
{
Rules: []string{`env find ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
m := s.Get()
envs, err := GetEnvs(m)
if err != nil {
return err
}
if len(envs) == 0 {
return "找不到环境变量"
}
es := []string{}
for _, env := range envs {
es = append(es, formatEnv(&env))
}
return strings.Join(es, "\n\n")
},
},
{
Rules: []string{`env set ? ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
err := SetEnv(Env{
Name: s.Get(0),
Value: s.Get(1),
})
if err != nil {
return err
}
return fmt.Sprintf("操作成功")
},
},
{
Rules: []string{`env del ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
if err := RemEnv(&Env{ID: s.Get()}); err != nil {
return err
}
return "操作成功"
},
},
{
Rules: []string{`env remark ? ?`},
Admin: true,
Handle: func(s im.Sender) interface{} {
if err := ModEnv(&Env{ID: s.Get(0), Remarks: s.Get(1)}); err != nil {
return err
}
return "操作成功"
},
},
})
}
func GetEnv(name string) (*Env, error) { func GetEnv(name string) (*Env, error) {
envs, err := GetEnvs("") envs, err := GetEnvs("")
if err != nil { if err != nil {
@@ -133,39 +31,36 @@ func GetEnv(name string) (*Env, error) {
return nil, nil return nil, nil
} }
// func GetEnvs(searchValue string) ([]Env, error) { func GetEnvs(searchValue string) ([]Env, error) {
// er := EnvResponse{} er := EnvResponse{}
// if err := req(ENVS, &er, "?searchValue="+searchValue); err != nil { if err := req(ENVS, &er, "?searchValue="+searchValue); err != nil {
// return nil, err return nil, err
// } }
// return er.Data, nil return er.Data, nil
// } }
// func SetEnv(e *Env) error { func SetEnv(e *Env) error {
// if e.Name == "JD_COOKIE" { envs, err := GetEnvs("")
// return errors.New("不支持的操作") if err != nil {
// } return err
// envs, err := GetEnvs("") }
// if err != nil { for _, env := range envs {
// return err if env.Name == e.Name {
// } if e.Remarks != "" {
// for _, env := range envs { env.Remarks = e.Remarks
// if env.Name == e.Name { }
// if e.Remarks != "" { if e.Value != "" {
// env.Remarks = e.Remarks env.Value = e.Value
// } }
// if e.Value != "" { if e.Name != "" {
// env.Value = e.Value env.Name = e.Name
// } }
// if e.Name != "" { env.Timestamp = ""
// env.Name = e.Name return req(PUT, ENVS, env)
// } }
// env.Timestamp = "" }
// return req(PUT, ENVS, env) return AddEnv(e)
// } }
// }
// return AddEnv(e)
// }
func ModEnv(e *Env) error { func ModEnv(e *Env) error {
envs, err := GetEnvs("") envs, err := GetEnvs("")
@@ -197,11 +92,3 @@ func AddEnv(e *Env) error {
func RemEnv(e *Env) error { func RemEnv(e *Env) error {
return req(DELETE, ENVS, []byte(`["`+e.ID+`"]`)) return req(DELETE, ENVS, []byte(`["`+e.ID+`"]`))
} }
func formatEnv(env *Env) string {
status := "已启用"
if env.Status != 0 {
status = "已禁用"
}
return fmt.Sprintf("名称：%v\n备注：%v\n状态：%v\n值：%v", env.Name, env.Remarks, status, env.Value)
}