修改SNAPI内部路径，修改UA头

ProjectCfg.py

@@ -1,5 +1,3 @@
-import platform
-
 # 项目配置
 PROFECT_NAME : str = 'SolianForDesktop'
 PROFECT_VERSION : str = '1.0(alpha)'
@@ -11,4 +9,3 @@ PYTHON_VERSION_MIN : tuple[int,int] = (3, 7)
 PYTHON_VERSION_MAX : tuple[int,int] = (0, 0)
 LIB_LIST : list[str] = ['flask']
 DOMAIN : str = 'https://solian.app/api'
-UA : str = f"SolianForPythonApp/0.000.001 ({platform.system()})"

core/CallServerAPIs.py

@@ -1,6 +1,6 @@
 from ProjectCfg import DOMAIN
-from SNAPI.CallServer import _make_request
-from SNAPI import *
+from .SNAPI.CallServer import _make_request
+from .SNAPI import *
 
 ###=========================活动API=================================
 

core/DBServices.py

@@ -1,9 +1,18 @@
 import sqlite3
 
 def DBStart():
-    conn = sqlite3.connect('./dbfile/App.db')
+    conn = sqlite3.connect('./UserData/App.db')
     c = conn.cursor()
-    c.execute('''CREATE TABLE IF NOT EXISTS chat
-                 (id TEXT PRIMARY KEY, accountid TEXT, name TEXT, avatar TEXT, lastmessage TEXT, lastmessagetime TEXT)''')
+
+def DBClose():
+    conn = sqlite3.connect('./UserData/App.db')
+    c = conn.cursor()
+    conn.close()
+
+def DBRunSQL(sql):
+    conn = sqlite3.connect('./UserData/App.db')
+    c = conn.cursor()
+    c.executescript(sql)
     conn.commit()
     conn.close()
+    return c.fetchall()

core/LoginServices.py

@@ -3,6 +3,7 @@ import json
 import uuid
 import platform
 import hashlib
+from . import PyWebPageAPI
 
 class AuthClient:
     def __init__(self, base_url):
@@ -14,7 +15,7 @@ class AuthClient:
         self.factors = []
         self.selected_factor_id = None
         self.password = ''
-        self.user_store = f"SolianForPythonApp/0.000.001({platform.system()})"  # 您可以自定义此User-Agent字符串
+        self.user_store = f"SolianForPythonApp/0.0.1(A)({PyWebPageAPI.GetDeviceInfo()})"  # 您可以自定义此User-Agent字符串
         self.device_id = self.user_store
 
     def generate_device_id(self):
@@ -201,7 +202,7 @@ class AuthClient:
 # 示例调用
 if __name__ == "__main__":
     auth_client = AuthClient(base_url='https://api.solian.app/id')
-    account_identifier = 'nanci'#你的账号
+    account_identifier = ''#你的账号
     selected_factor_id = "enter-code"  # 用户需要选择一个因素
     password = ''#你的密码
     # 第一步：检查账户有效性

core/PyWebPageAPI.py

@@ -76,3 +76,11 @@ def CheckPortAvailable(port : int) -> bool:
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         return s.connect_ex(('localhost', port)) != 0
     return False
+
+def GetDeviceInfo() -> str:
+    """
+    获取设备信息
+    :return:
+    """
+    import platform
+    return platform.system() + platform.version() + platform.machine()

core/SNAPI/CallServer.py

@@ -2,8 +2,9 @@ import requests
 import json
 from requests.exceptions import RequestException
 import platform
+from . import PyWebPageAPI
 
-UA = f"SolianForPythonApp/0.000.001 ({platform.system()})"
+UA = f"SolianForPythonApp/0.0.1(A) ({PyWebPageAPI.GetDeviceInfo()})"
 
 def _make_request(method: str, url: str, headers: dict, params: dict = None, normal_codes: list = [200], request_body: dict = None) -> dict:
     """内部辅助函数，用于发送HTTP请求并处理响应"""

core/SNAPI/Chat.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 from typing import List,Any,Optional,Dict
 
 ###=========================聊天API=================================

core/SNAPI/Poll.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 from typing import List,Any,Optional,Dict
 
 ###==========================投票功能============================

core/SNAPI/Post.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 from typing import List,Any,Optional,Dict
 ###==========================帖子管理============================
 def GetFeaturedPosts(Authorization: str) -> dict:

core/SNAPI/PostCategory.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 from typing import Optional
 
 ###==========================帖子分类管理============================

core/SNAPI/PostTag.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 from typing import Optional
 
 ###==========================帖子标签管理============================

core/SNAPI/Publisher.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 from typing import Optional
 ###==========================发布者管理============================
 def GetPublisher(Authorization: str, name: str) -> dict:

core/SNAPI/Realm.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 
 ###==========================领域部分==========================
 

core/SNAPI/RealtimeCall.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from.CallServer import _make_request
 
 ###==========================实时聊天==========================
 

core/SNAPI/Sticker.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 
 ###==========================贴纸==========================
 

core/SNAPI/WebArticle.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 
 ###==========================网页文章==========================
 

core/SNAPI/WebFeed.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 
 ###==========================网页流==========================
 

core/SNAPI/WebFeedPublic.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 
 ###==========================公共网页流==========================
 

core/SNAPI/WebReader.py

@@ -1,5 +1,5 @@
 from ProjectCfg import DOMAIN
-from CallServer import _make_request
+from .CallServer import _make_request
 
 ###==========================网页阅读器==========================
 def ReadForURL(url:str,Authorization: str='' ) -> dict:

core/WebViewWIndow.py

@@ -3,5 +3,5 @@ import webview
 def WebViewWIndow(url: str,title: str,width: int,height: int):#创建Webview窗口
     webview.create_window(title=title, url=url, width=width, height=height)
     webview.settings['ALLOW_DOWNLOADS'] = True
-    webview.start(icon="./assets/img/icon.png")
+    webview.start(icon="./assets/img/icon.ico")
     exit(0)