xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-24 20:07:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(frontend): move form-item hints from extra to tooltip

Browse Source 
Switch reality target, node options, and WARP auto-update-IP hints from
inline extra text to label tooltips for a cleaner form layout.
This commit is contained in:
MHSanaei
2026-06-17 17:24:16 +02:00
parent d6cddaff12
commit 4915d6b18d
23 changed files with 218 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/xray_setting.go
+13 -13
View File
@@ -41,39 +41,39 @@ func (s *XraySettingService) CheckXrayConfig(XrayTemplateConfig string) error {
return nil
}
func (s *XraySettingService) UpdateWarpXraySetting(warpData map[string]string, warpConfig map[string]interface{}) error {
func (s *XraySettingService) UpdateWarpXraySetting(warpData map[string]string, warpConfig map[string]any) error {
template, err := s.GetXrayConfigTemplate()
if err != nil {
return err
}
var cfg map[string]interface{}
var cfg map[string]any
if err := json.Unmarshal([]byte(template), &cfg); err != nil {
return err
}
outbounds, ok := cfg["outbounds"].([]interface{})
outbounds, ok := cfg["outbounds"].([]any)
if !ok {
return nil
}
updated := false
for _, outIface := range outbounds {
out, ok := outIface.(map[string]interface{})
out, ok := outIface.(map[string]any)
if !ok {
continue
}
if tag, ok := out["tag"].(string); ok && tag == "warp" {
settings, ok := out["settings"].(map[string]interface{})
settings, ok := out["settings"].(map[string]any)
if !ok {
continue
}
settings["secretKey"] = warpData["private_key"]
if conf, ok := warpConfig["config"].(map[string]interface{}); ok {
if iface, ok := conf["interface"].(map[string]interface{}); ok {
if addrs, ok := iface["addresses"].(map[string]interface{}); ok {
if conf, ok := warpConfig["config"].(map[string]any); ok {
if iface, ok := conf["interface"].(map[string]any); ok {
if addrs, ok := iface["addresses"].(map[string]any); ok {
var addrList []string
if v4, ok := addrs["v4"].(string); ok && v4 != "" {
addrList = append(addrList, v4+"/32")
@@ -100,12 +100,12 @@ func (s *XraySettingService) UpdateWarpXraySetting(warpData map[string]string, w
settings["reserved"] = res
}
if peers, ok := conf["peers"].([]interface{}); ok && len(peers) > 0 {
if peer, ok := peers[0].(map[string]interface{}); ok {
if pSettings, ok := settings["peers"].([]interface{}); ok && len(pSettings) > 0 {
if pSet, ok := pSettings[0].(map[string]interface{}); ok {
if peers, ok := conf["peers"].([]any); ok && len(peers) > 0 {
if peer, ok := peers[0].(map[string]any); ok {
if pSettings, ok := settings["peers"].([]any); ok && len(pSettings) > 0 {
if pSet, ok := pSettings[0].(map[string]any); ok {
pSet["publicKey"] = peer["public_key"]
if endpoint, ok := peer["endpoint"].(map[string]interface{}); ok {
if endpoint, ok := peer["endpoint"].(map[string]any); ok {
pSet["endpoint"] = endpoint["host"]
}
}