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-07-05 17:56:00 +08:00
parent 5a0299208c
commit c8b84aacb0
5 changed files with 14 additions and 7 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.7bcd86f8.js"></script> <script src="/admin/umi.bdd2adb2.js"></script>
</body></html> </body></html>
core/admin/p__Proxy__index.0e6895f9.async.js
+1
View File
File diff suppressed because one or more lines are too long
core/admin/p__Proxy__index.64867732.async.js
-1
View File
File diff suppressed because one or more lines are too long
core/admin/umi.7bcd86f8.js → core/admin/umi.bdd2adb2.js
+2 -2
View File
File diff suppressed because one or more lines are too long
core/proxy.go
+10 -3
View File
@@ -113,7 +113,8 @@ func GetProxyTransport(rawURL string, uuid string, params map[string]interface{}
return i, err return i, err
} }
if len(plugins) != 0 { if len(plugins) != 0 {
i, err := plugins[0].Conn.DialContext(context.Background(), &addr) p = plugins[0]
i, err := p.Conn.DialContext(context.Background(), &addr)
if err != nil { if err != nil {
err = fmt.Errorf("%s(%s)代理错误：%v", p.Type, p.Name, err) err = fmt.Errorf("%s(%s)代理错误：%v", p.Type, p.Name, err)
} }
@@ -172,6 +173,7 @@ func init() {
Proxies.Delete(key) Proxies.Delete(key)
return nil return nil
} }
if strings.HasPrefix(new, "o:") { if strings.HasPrefix(new, "o:") {
err := json.Unmarshal([]byte(strings.Replace(new, "o:", "", 1)), &ncfg) err := json.Unmarshal([]byte(strings.Replace(new, "o:", "", 1)), &ncfg)
if err != nil { if err != nil {
@@ -185,6 +187,10 @@ func init() {
// Port: ncfg.Port, // Port: ncfg.Port,
// } // }
} }
if ncfg.CreatedAt == 0 {
ncfg.CreatedAt = int(time.Now().Unix())
new = "o:" + string(utils.JsonMarshal(ncfg))
}
// ov, ok := Proxies.Load(nkey) // ov, ok := Proxies.Load(nkey)
// if ok && (!IsDifferent(ocfg, ncfg, []string{"Name", "UUID", "Rules", "Plugins"}) || checkProxy(ov.(C.Proxy))) { //代理依旧有效 // if ok && (!IsDifferent(ocfg, ncfg, []string{"Name", "UUID", "Rules", "Plugins"}) || checkProxy(ov.(C.Proxy))) { //代理依旧有效
// return nil // return nil
@@ -202,9 +208,10 @@ func init() {
} }
} }
ncfg.Conn = p ncfg.Conn = p
ncfg.CreatedAt = int(time.Now().Unix())
Proxies.Store(key, &ncfg) Proxies.Store(key, &ncfg)
return nil return &storage.Final{
Now: new,
}
}) })
} }