subjson and multidomain

backend/service/config.go

@@ -18,6 +18,7 @@ var LastUpdate int64
 type ConfigService struct {
 	ClientService
 	TlsService
+	InDataService
 	singbox.Controller
 	SettingService
 }
@@ -80,7 +81,7 @@ func (s *ConfigService) GetConfig() (*SingBoxConfig, error) {
 
 func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string) error {
 	var err error
-	var clientChanges, tlsChanges, settingChanges, configChanges []model.Changes
+	var clientChanges, tlsChanges, inChanges, settingChanges, configChanges []model.Changes
 	if _, ok := changes["clients"]; ok {
 		err = json.Unmarshal([]byte(changes["clients"]), &clientChanges)
 		if err != nil {
@@ -93,6 +94,12 @@ func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string)
 			return err
 		}
 	}
+	if _, ok := changes["inData"]; ok {
+		err = json.Unmarshal([]byte(changes["inData"]), &inChanges)
+		if err != nil {
+			return err
+		}
+	}
 	if _, ok := changes["settings"]; ok {
 		err = json.Unmarshal([]byte(changes["settings"]), &settingChanges)
 		if err != nil {
@@ -128,6 +135,12 @@ func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string)
 			return err
 		}
 	}
+	if len(inChanges) > 0 {
+		err = s.InDataService.Save(tx, inChanges)
+		if err != nil {
+			return err
+		}
+	}
 	if len(settingChanges) > 0 {
 		err = s.SettingService.Save(tx, settingChanges)
 		if err != nil {
@@ -185,14 +198,19 @@ func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string)
 
 	// Log changes
 	dt := time.Now().Unix()
-	allChanges := append(append(clientChanges, settingChanges...), append(configChanges, tlsChanges...)...)
-	for index := range allChanges {
-		allChanges[index].DateTime = dt
-		allChanges[index].Actor = loginUser
-	}
-	err = tx.Model(model.Changes{}).Create(&allChanges).Error
-	if err != nil {
-		return err
+	allChanges := append(clientChanges, settingChanges...)
+	allChanges = append(allChanges, configChanges...)
+	allChanges = append(allChanges, tlsChanges...)
+	allChanges = append(allChanges, inChanges...)
+	if len(allChanges) > 0 {
+		for index := range allChanges {
+			allChanges[index].DateTime = dt
+			allChanges[index].Actor = loginUser
+		}
+		err = tx.Model(model.Changes{}).Create(&allChanges).Error
+		if err != nil {
+			return err
+		}
 	}
 
 	LastUpdate = dt

backend/service/inData.go

@@ -0,0 +1,46 @@
+package service
+
+import (
+	"encoding/json"
+	"s-ui/database"
+	"s-ui/database/model"
+
+	"gorm.io/gorm"
+)
+
+type InDataService struct {
+}
+
+func (s *InDataService) GetAll() ([]model.InboundData, error) {
+	db := database.GetDB()
+	inData := []model.InboundData{}
+	err := db.Model(model.InboundData{}).Scan(&inData).Error
+	if err != nil {
+		return nil, err
+	}
+
+	return inData, nil
+}
+
+func (s *InDataService) Save(tx *gorm.DB, changes []model.Changes) error {
+	var err error
+	for _, change := range changes {
+		inData := model.InboundData{}
+		err = json.Unmarshal(change.Obj, &inData)
+		if err != nil {
+			return err
+		}
+		switch change.Action {
+		case "new":
+			err = tx.Create(&inData).Error
+		case "del":
+			err = tx.Where("id = ?", change.Index).Delete(model.InboundData{}).Error
+		default:
+			err = tx.Save(inData).Error
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return err
+}

backend/service/setting.go

@@ -36,6 +36,7 @@ var defaultValueMap = map[string]string{
 	"subEncode":     "true",
 	"subShowInfo":   "false",
 	"subURI":        "",
+	"subJsonExt":    "",
 }
 
 type SettingService struct {
@@ -65,7 +66,7 @@ func (s *SettingService) GetAllSetting() (*map[string]string, error) {
 	}
 
 	// Due to security principles
-	delete(allSetting, "webSecret")
+	delete(allSetting, "secret")
 
 	return &allSetting, nil
 }
@@ -347,6 +348,10 @@ func (s *SettingService) Save(tx *gorm.DB, changes []model.Changes) error {
 	return err
 }
 
+func (s *SettingService) GetSubJsonExt() (string, error) {
+	return s.getString("subJsonExt")
+}
+
 func (s *SettingService) fileExists(path string) error {
 	_, err := os.Stat(path)
 	return err