config: 更新结构

Author: Weidows

cmd/wutils/main.go

@@ -53,31 +53,42 @@ var (
 							Level:  "info",
 							Format: "json",
 						},
-						Runner: runner.RunnerConfig{
-							MaxWorkers: 4,
-							Timeout:    "30s",
-						},
-						Parallel: struct {
-							Dsg bool
-							Ol  bool
-						}{Dsg: true, Ol: true},
-						Dsg: struct {
-							Disk  []string `required:"true"`
-							Delay int      `default:"30"`
-						}{Disk: []string{"E:"}, Delay: 30},
-						Ol: struct {
-							Delay    int `default:"2"`
-							Patterns []struct {
-								Title   string
-								Opacity byte
+						Refresh: 10,
+						Cmd: struct {
+							Dsg struct {
+								Parallel bool
+								Disk     []string `required:"true"`
+								Delay    int      `default:"30"`
+							}
+							Ol struct {
+								Parallel bool
+								Delay    int `default:"2"`
+								Patterns []struct {
+									Title   string
+									Opacity byte
+								}
 							}
-						}{Delay: 2, Patterns: []struct {
-							Title   string
-							Opacity byte
 						}{
-							{Title: "(XY|xy)plorer", Opacity: 200},
-							{Title: "设置$", Opacity: 220},
-						}},
+							Dsg: struct {
+								Parallel bool
+								Disk     []string `required:"true"`
+								Delay    int      `default:"30"`
+							}{Parallel: true, Disk: []string{"E:"}, Delay: 30},
+							Ol: struct {
+								Parallel bool
+								Delay    int `default:"2"`
+								Patterns []struct {
+									Title   string
+									Opacity byte
+								}
+							}{Parallel: true, Delay: 2, Patterns: []struct {
+								Title   string
+								Opacity byte
+							}{
+								{Title: "(XY|xy)plorer", Opacity: 200},
+								{Title: "设置$", Opacity: 220},
+							}},
+						},
 					}
 					data, err := yaml.Marshal(&defaultConfig)
 					if err != nil {
@@ -145,10 +156,10 @@ var (
 				Aliases: []string{"pl"},
 				Usage:   "并行+后台执行任务 (配置取自wutils.yml)",
 				Action: func(cCtx *cli.Context) (err error) {
-					if kr.Config.Parallel.Dsg {
+					if kr.Config.Cmd.Dsg.Parallel {
 						go kr.Dsg()
 					}
-					if kr.Config.Parallel.Ol {
+					if kr.Config.Cmd.Ol.Parallel {
 						kr.Ol()
 					}
 

cmd/wutils/runner/configs.go

@@ -18,22 +18,22 @@ type RunnerConfig struct {
 }
 
 type Config struct {
-	App      AppConfig
-	Logging  LoggingConfig
-	Runner   RunnerConfig
-	Parallel struct {
-		Dsg bool
-		Ol  bool
-	}
-	Dsg struct {
-		Disk  []string `required:"true"`
-		Delay int      `default:"30"`
-	} `yaml:"dsg" required:"true"`
-	Ol struct {
-		Delay    int `default:"2"`
-		Patterns []struct {
-			Title   string
-			Opacity byte
+	App     AppConfig
+	Logging LoggingConfig
+	Refresh int `default:"10"`
+	Cmd     struct {
+		Dsg struct {
+			Parallel bool
+			Disk     []string `required:"true"`
+			Delay    int      `default:"30"`
+		}
+		Ol struct {
+			Parallel bool
+			Delay    int `default:"2"`
+			Patterns []struct {
+				Title   string
+				Opacity byte
+			}
 		}
 	}
 }

cmd/wutils/runner/keep_runner.go

@@ -32,16 +32,16 @@ func NewKeepRunner(logger *logrus.Logger, configPath string) *Scope {
 func (s *Scope) init() {
 	for {
 		_ = configor.Load(&s.Config, s.ConfigPath)
-		if s.Config.Runner.Refresh < 1 {
-			s.Config.Runner.Refresh = 1
+		if s.Config.Refresh < 1 {
+			s.Config.Refresh = 1
 		}
-		time.Sleep(time.Second * time.Duration(s.Config.Runner.Refresh))
+		time.Sleep(time.Second * time.Duration(s.Config.Refresh))
 	}
 }
 
 // Dsg 执行 DSG 任务
 func (s *Scope) Dsg() {
-	s.Logger.Infoln(s.Config.Dsg)
+	s.Logger.Infoln(s.Config.Cmd.Dsg)
 	writeString := func(disk string) {
 		f := strings.Join([]string{disk, ".dsg"}, "/")
 
@@ -54,24 +54,24 @@ func (s *Scope) Dsg() {
 	}
 
 	for true {
-		collection.ForEach(s.Config.Dsg.Disk, func(i int, v string) {
+		collection.ForEach(s.Config.Cmd.Dsg.Disk, func(i int, v string) {
 			go writeString(v)
 		})
-		time.Sleep(time.Second * time.Duration(s.Config.Dsg.Delay))
+		time.Sleep(time.Second * time.Duration(s.Config.Cmd.Dsg.Delay))
 	}
 }
 
 // Ol 执行 OL 任务
 func (s *Scope) Ol() {
-	s.Logger.Infoln(s.Config.Ol)
+	s.Logger.Infoln(s.Config.Cmd.Ol)
 
 	for true {
 		windows := os2.GetEnumWindowsInfo(&os2.EnumWindowsFilter{
 			IgnoreNoTitled:  true,
 			IgnoreInvisible: true,
 		})
 		collection.ForEach(windows, func(i int, window *os2.EnumWindowsResult) {
-			collection.ForEach(s.Config.Ol.Patterns, func(ii int, pattern struct {
+			collection.ForEach(s.Config.Cmd.Ol.Patterns, func(ii int, pattern struct {
 				Title   string
 				Opacity byte
 			}) {
@@ -83,7 +83,7 @@ func (s *Scope) Ol() {
 				}
 			})
 		})
-		time.Sleep(time.Second * time.Duration(s.Config.Ol.Delay))
+		time.Sleep(time.Second * time.Duration(s.Config.Cmd.Ol.Delay))
 	}
 }
 

cmd/wutils/zip/crack.go

@@ -30,7 +30,9 @@ func getPasswordFilePath() (string, error) {
 		if err := os.MkdirAll(dir, 0755); err != nil {
 			return "", fmt.Errorf("failed to create directory: %w", err)
 		}
-		defaultContent := []byte("# Add your password dictionary here, one password per line\n")
+		defaultContent := []byte("# Add your password dictionary here, one password per line\n" +
+			"123456\npassword\n" +
+			"admin\n12345678\n")
 		if err := os.WriteFile(path, defaultContent, 0644); err != nil {
 			return "", fmt.Errorf("failed to create password file: %w", err)
 		}