alroyso 1 year ago
parent
commit
4d6b3bb247
2 changed files with 23 additions and 23 deletions
  1. 3 3
      lib/app/controller/GlobalController.dart
  2. 20 20
      lib/app/controller/service.dart

+ 3 - 3
lib/app/controller/GlobalController.dart

@@ -79,9 +79,9 @@ class GlobalController extends GetxController {
     //await controllers.service.serviceModeSwitch(true);
     // init clash core
 
-    // await controllers.service.initClashCoreConfig();
-    // if (controllers.service.coreStatus.value != RunningState.running) return;
-    // await controllers.core.updateVersion();
+     await controllers.service.initClashCoreConfig();
+     if (controllers.service.coreStatus.value != RunningState.running) return;
+     await controllers.core.updateVersion();
     //initRegularlyUpdate();
   }
 

+ 20 - 20
lib/app/controller/service.dart

@@ -366,7 +366,7 @@ class ServiceController extends GetxController {
       coreStatus.value = RunningState.stoped;
     }
     Future<void> initClashCoreConfig() async {
-
+      controllers.config.config.value.selected = 'init_proxy.yaml';
        //await stopClashCore();
        await startClashCore();
        if (coreStatus.value == RunningState.error) {
@@ -389,26 +389,26 @@ class ServiceController extends GetxController {
   }
     Future<void> reloadClashCore() async {
       controllers.config.config.value.selected = 'proxy.yaml';
-      // if( coreStatus.value == RunningState.running){
-      //   controllers.global.updateMsg("重新配置...");
-      //   await controllers.config.readClashCoreApi();
-      //   controllers.global.updateMsg("${controllers.config.clashCoreApiAddress.value}...");
-      //   controllers.core.setApi(controllers.config.clashCoreApiAddress.value, controllers.config.clashCoreApiSecret.value);
-      //   controllers.global.updateMsg("setApi${controllers.config.clashCoreApiAddress.value}...");
-      //   await controllers.core.fetchReloadConfig({"path":  path.join(Paths.config.path, controllers.config.config.value.selected),"payload":""});
-      //   controllers.global.updateMsg("fetchReloadConfig${controllers.config.clashCoreApiAddress.value}...");
-      // }
-      //BotToast.showText(text: '正在重启 Core ……');
-      controllers.global.updateMsg("停止内核...");
-      await stopClashCore();
-      await controllers.config.readClashCoreApi();
-      await startClashCore();
-      if (coreStatus.value == RunningState.error) {
-        controllers.global.updateMsg("启动内核失败...");
-      } else {
-        await controllers.core.updateVersion();
-        controllers.global.updateMsg("启动内核成功...");
+      if( coreStatus.value == RunningState.running){
+        controllers.global.updateMsg("重新配置...");
+        await controllers.config.readClashCoreApi();
+        controllers.global.updateMsg("${controllers.config.clashCoreApiAddress.value}...");
+        controllers.core.setApi(controllers.config.clashCoreApiAddress.value, controllers.config.clashCoreApiSecret.value);
+        controllers.global.updateMsg("setApi${controllers.config.clashCoreApiAddress.value}...");
+        await controllers.core.fetchReloadConfig({"path":  path.join(Paths.config.path, controllers.config.config.value.selected),"payload":""});
+        controllers.global.updateMsg("fetchReloadConfig${controllers.config.clashCoreApiAddress.value}...");
       }
+      //BotToast.showText(text: '正在重启 Core ……');
+      // controllers.global.updateMsg("停止内核...");
+      // await stopClashCore();
+      // await controllers.config.readClashCoreApi();
+      // await startClashCore();
+      // if (coreStatus.value == RunningState.error) {
+      //   controllers.global.updateMsg("启动内核失败...");
+      // } else {
+      //   await controllers.core.updateVersion();
+      //   controllers.global.updateMsg("启动内核成功...");
+      // }
     }
 
   Future<int> getFreePort() async {