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

x

Browse Source
This commit is contained in:
cdle
2023-06-30 22:32:08 +08:00
parent 6f5d178740
commit 40b1ae10e5
8 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/admin/index.html
+1 -1
View File
@@ -8,6 +8,6 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script src="/admin/umi.e1539056.js"></script> <script src="/admin/umi.62445b9a.js"></script>
</body></html> </body></html>
core/admin/p__Plugin__Share__index.0cc75c33.async.js → core/admin/p__Plugin__Share__index.9fd12c34.async.js
+1 -1
View File
File diff suppressed because one or more lines are too long
core/admin/umi.e1539056.js → core/admin/umi.62445b9a.js
+1 -1
View File
File diff suppressed because one or more lines are too long
core/function.go
+1 -1
View File
@@ -579,7 +579,7 @@ func HandleMessage(sender common.Sender) {
if err == nil { if err == nil {
if reg.FindString(content) != "" { if reg.FindString(content) != "" {
//todo 支持JS语法 //todo 支持JS语法
output := parseReply(reply.Value) output := parseReply2(reply.Value)
sender.Reply(output) sender.Reply(output)
} }
} }
core/plugin_core.go
+3
View File
@@ -573,6 +573,9 @@ func initPlugin(data string, uuid string) (*common.Function, []func(), error) {
vm.Set("uuid", func() string { vm.Set("uuid", func() string {
return uuid return uuid
}) })
vm.Set("genUuid", func() string {
return utils.GenUUID()
})
vm.Set("UUID", func() string { vm.Set("UUID", func() string {
return uuid return uuid
}) })
core/plugin_publish.go
+4 -1
View File
@@ -24,7 +24,10 @@ func CheckPluginAddress(address string) error {
} }
data, _ := httplib.Get(address).Bytes() data, _ := httplib.Get(address).Bytes()
rr := RequestPluginResult{} rr := RequestPluginResult{}
json.Unmarshal(data, &rr) err := json.Unmarshal(data, &rr)
if IsCdle {
console.Error(err, address, string(data))
}
if !rr.Success { if !rr.Success {
return errors.New("无效的地址") return errors.New("无效的地址")
} }
core/plugin_subscribe.go
+1 -1
View File
@@ -29,7 +29,7 @@ type RequestPluginResult struct {
var plugin_list = []*common.Function{} var plugin_list = []*common.Function{}
var cdle_sublink = "link://T4EywWN46ztYBhHNdOl6Tpz8QQsCZGj8JvdRJ5QKatJm0P+mI/G3ruO7AC04guqqKKa29VOvTGR7ATUJGYayRBpG2RFq+6ZPK3vcu6KCDGvRE3S43Gj42EXfvs04M6s4" var cdle_sublink = "link://T4EywWN46ztYBhHNdOl6Tpz8QQsCZGj8JvdRJ5QKatJm0P+mI/G3ruO7AC04guqqKKa29VOvTGR7ATUJGYayRBpG2RFq+6ZPK3vcu6KCDGvRE3S43Gj42EXfvs04M6s4\nlink://T4EywWN46ztYBhHNdOl6Tpz8QQsCZGj8JvdRJ5QKatJYds3a/BticqD0hzidGsOysEx/RK/nKppChxMLb6QGczhWjGC/M2ETxWb+Jl+6q/x+LP4gy+ibeAEzatOYwdZMckI8nN/R6mY/HW2dyBtp0qH1ldICn6Wl+9YowLvvpLU="
func initPluginList() { func initPluginList() {
list := []*common.Function{} list := []*common.Function{}
core/reply.go
+12 -12
View File
@@ -204,18 +204,18 @@ func init() {
var REPLY = MakeBucket("reply") var REPLY = MakeBucket("reply")
// 能处理字符：你好，我是${ user.name } // // 能处理字符：你好，我是${ user.name }
func parseReply(str string) string { // func parseReply(str string) string {
re := regexp.MustCompile(`\$\{\s*([^\s{}]+)\s*\}`) // re := regexp.MustCompile(`\$\{\s*([^\s{}]+)\s*\}`)
return re.ReplaceAllStringFunc(str, func(match string) string { // return re.ReplaceAllStringFunc(str, func(match string) string {
bk := match[2 : len(match)-1] // bk := match[2 : len(match)-1]
b_k := strings.Split(bk, ".") // b_k := strings.Split(bk, ".")
if len(b_k) != 3 { // if len(b_k) != 3 {
return fmt.Sprintf("${%s}", bk) // return fmt.Sprintf("${%s}", bk)
} // }
return MakeBucket(b_k[1]).GetString(b_k[2]) // return MakeBucket(b_k[1]).GetString(b_k[2])
}) // })
} // }
// 能处理字符：你好，我是${ user.name ?? 6 } // 能处理字符：你好，我是${ user.name ?? 6 }
func parseReply2(str string) string { func parseReply2(str string) string {