Merge pull request #302 from AmiyaBot/V6-dev

V6 dev

Author: vivien8261

.github/publish.txt

@@ -1 +1 @@
-v6.5.7
+v6.5.8

.github/workflows/package.yaml

@@ -55,4 +55,4 @@ jobs:
                 with:
                     context: .
                     push: true
-                    tags: amiyabot/amiyabot:2.0.2, amiyabot/amiyabot:latest
+                    tags: amiyabot/amiyabot:6.5.8, amiyabot/amiyabot:latest

.gitignore

@@ -15,6 +15,7 @@ config/cos.yaml
 config/remote.yaml
 config/penetration.yaml
 main*.py
+start.zsh
 
 *.pyc
 *.spec

core/config/remote.py

@@ -1,12 +1,26 @@
+import requests
 from dataclasses import dataclass, field
 from core.util import init_config_file
 
 
 @dataclass
 class Remote:
     cos: str = 'https://cos.amiyabot.com'
-    plugin: str = 'https://server.amiyabot.com:10001'
+    plugin: str = 'https://cdn.amiyabot.com'
     console: str = 'http://106.52.139.57:8000'
+    
+    def __init__(self):
+        try:
+            res = requests.get(f'{self.plugin}/api/v1/remote')
+            data = res.json()
+            if res.status_code != 200 or not 'code' in data:
+                return
+            if data['code'] == 200:
+                self.cos = data['data']['cos']
+                self.plugin = data['data']['plugin']
+                self.console = data['data']['console']
+        except:
+            pass
 
 
 @dataclass
@@ -15,7 +29,7 @@ class RemoteConfig:
 
 
 def init(file: str) -> RemoteConfig:
-    return init_config_file(file, RemoteConfig)
+    return init_config_file(file, RemoteConfig, True)
 
 
 remote_config = init('config/remote.yaml')

core/util/yamlManager.py

@@ -44,10 +44,13 @@ def create_yaml(cls, path: str, data: dict, overwrite: bool = False):
         return True
 
 
-def init_config_file(file: str, build_cls):
+def init_config_file(file: str, build_cls, refresh=False):
     config = {}
     if os.path.exists(file):
-        config = YamlManager.read_yaml(file, _dict=True)
+        config = YamlManager.read_yaml(file, _dict=True, _refresh=refresh)
 
-    YamlManager.create_yaml(file, merge_dict(config, asdict(build_cls())), True)
+    if not refresh:
+        YamlManager.create_yaml(file, merge_dict(config, asdict(build_cls())), True)
+    else:
+        YamlManager.create_yaml(file, asdict(build_cls()), True)
     return YamlManager.read_yaml(file)