x
This commit is contained in:
@@ -8,6 +8,6 @@
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script src="/admin/umi.7bcd86f8.js"></script>
|
||||
<script src="/admin/umi.bdd2adb2.js"></script>
|
||||
|
||||
</body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+10
-3
@@ -113,7 +113,8 @@ func GetProxyTransport(rawURL string, uuid string, params map[string]interface{}
|
||||
return i, err
|
||||
}
|
||||
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 {
|
||||
err = fmt.Errorf("%s(%s)代理错误:%v", p.Type, p.Name, err)
|
||||
}
|
||||
@@ -172,6 +173,7 @@ func init() {
|
||||
Proxies.Delete(key)
|
||||
return nil
|
||||
}
|
||||
|
||||
if strings.HasPrefix(new, "o:") {
|
||||
err := json.Unmarshal([]byte(strings.Replace(new, "o:", "", 1)), &ncfg)
|
||||
if err != nil {
|
||||
@@ -185,6 +187,10 @@ func init() {
|
||||
// Port: ncfg.Port,
|
||||
// }
|
||||
}
|
||||
if ncfg.CreatedAt == 0 {
|
||||
ncfg.CreatedAt = int(time.Now().Unix())
|
||||
new = "o:" + string(utils.JsonMarshal(ncfg))
|
||||
}
|
||||
// ov, ok := Proxies.Load(nkey)
|
||||
// if ok && (!IsDifferent(ocfg, ncfg, []string{"Name", "UUID", "Rules", "Plugins"}) || checkProxy(ov.(C.Proxy))) { //代理依旧有效
|
||||
// return nil
|
||||
@@ -202,9 +208,10 @@ func init() {
|
||||
}
|
||||
}
|
||||
ncfg.Conn = p
|
||||
ncfg.CreatedAt = int(time.Now().Unix())
|
||||
Proxies.Store(key, &ncfg)
|
||||
return nil
|
||||
return &storage.Final{
|
||||
Now: new,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user