From e7d1b45de142f0696b376a7dfc5b66616e9a549d Mon Sep 17 00:00:00 2001
From: LanShui <2031845258@qq.com>
Date: Tue, 21 May 2024 23:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __pycache__/apps.cpython-310.pyc   | Bin 6634 -> 7370 bytes
 __pycache__/module.cpython-310.pyc | Bin 1076 -> 1118 bytes
 apps.py                            | 140 ++++++++++++++++++-----------
 config_app/favorite.db             | Bin 0 -> 12288 bytes
 config_app/login_user.json         |   2 +-
 main.py                            |   7 +-
 module.py                          |   2 +
 7 files changed, 95 insertions(+), 56 deletions(-)
 create mode 100644 config_app/favorite.db

diff --git a/__pycache__/apps.cpython-310.pyc b/__pycache__/apps.cpython-310.pyc
index c116246ac8419077f49d9aeb3a0cf398af749932..1c6eaaf070d026311f1bd2129c70db6355ff16ec 100644
GIT binary patch
delta 1725
zcmah}TWB0r7(V~(WcEHgyE}WCY_i#;w05bsNJXfDO4@8|Xq(o}+L)zvyUm%Ty9wEJ
zcG5KQj1iJjD+F5(^r;WKc)<r>G~$aEd=gZ!eNtEuFCbEV@kM;G>VG!d5G3Lp&i7x>
zf18=}%fT-WskLCxNAUUf?#ZcJ{kPN}`1IDk@f8{=YG#;5&B&BQbsAffSD_fCaWg^_
zsFP`u8f$V<KTc>jO|21{GGnW*VjSfj+KX~;TTY;yrhO>)nMt%8C}(It%Kc_H$|*W9
zMzXsehzhdMazB6iV%40qv+q9~gXD62vNktWnJ$&*=MPMkuhguHZSJQR`5EaqFgAu<
z34rv*gse!A<rkE%;Awuq{Q(T}AKh=kv;4Y;!`_XQ_e+3b{<H6G$n$l-=^w{b)**!D
zG`}Cvc{p$a&hhhsOK^dI7FdL%{BZC)nBr-5FqT3$F`c8h>z_!3+=S()cvbC#-TZZR
zU}c<)5nHM%4Y%!S0#z1>b(*@T!RfNS4WH0C3R4>XCUM-XYnYsOJ09k41Q=R?TpmO|
z*d##ENA1wIY=>-(dZ?HBsDE94Bj|YTa3jLJ7|%COD3Niky1*oJo+n9tdJ%((H6cRz
z8c`Z(LYoG$DD{ry_-(x!v*R?BAa;WJskZKN0xVEX((sJS`l(}$Y_kSguw#9fKNIS7
zx*24<o66KqIzcfVQ)$#7R5wV6i=h<1BRipXPl>IbR7b;}3>IQqQv$NBtIejq-`<qH
zqF1AKx1ACd(&W12gju)|ZW6o4AUN&_i#Socca=Cgi{hArPK?E{AfpLrjWfNGX7TpO
z|7_cJCxJajSpt2!aYm_isP;KYlryx4B`Y9&Z^Gq3dy26pC@ji!+RM*r$+P06%f#-#
z2}|dJI0lgA6iwR$%vgmAIA8<qTLnjAz$Ds*)9+@aDmS_qW*R37z9ovMUNOcxbP*Ow
zHp8!KhgXi3hXB90%nr}dd~T?a%M^x=oXlm8b$*7DUA{PLX7=uQLIfEZ&Wwx}a>sM|
z%$fYisiFKt=0t8HGxS2?^vEcNJe3<QJic{$<==V7a{05l{OHgrOq_dho9E7sr9y73
z@IRhd#PR=%Hu5O!X5P}Vk(0U7R`#tjA9)Fy9o$j9@sXAQwbf->R?T|g#osr(i{A_H
zInt8n%l4&~QmIc>X3duV=vpZWu~ff2i&u=LqrVjs5EqaTU<l|&;J=6OMq1w7)k$;S
zuGHqN=TMnV@ed;d`-<9TgwkxKZkHx&)GWGCQ*=$%tzxiao1ZN&l`3z39f1iGj}`;8
zY?sklTy=Fz6?xhaLaybq7Un9*)NdompnwN_lBZ22Ndo0BRo0M^|MvMkXba#Liz|8>
zRK8n(Y)=F{E(y@}q2%ry01qBOZ970x_Pi?n!C%r3Y11P2jDS7?*LY8`x9beDbmMdV
z8%cRhXm9X$62owx|C+dFTt~${+;thjL(*Ug&1klV-$)+ZeFgcVI$N8r%#{}Erd66T
zm#hU;T1x_67O>2JNIs#=3%15X#+o7mSSl}jqWnEWh5h_vBOL`<lCfG1BC_VwQd+-0
F^AFmHmrVcw

delta 964
zcmZWn&ubGw6rMM`-E21dGudSGtEny2T2xR()CwMK!Gj{Gpcp9yowaRRTHS6HWtLh~
zFG3NSlh8wA^`IAPa}Y!if)_3HDtJ)vC@B306yL@uf;+r#=6m1c&3kY5{h_b>%vr<G
z2!0dN@yiFx_sufAy1(;W&9_<FcP>+wVeXP#hiaN-eTU`HCo_-bm*i^Z7-0ogTq3OK
zyLG9WMP6cM<mEQcA@61t<Q3mTJ&(MHZ9~4zFCZ_n-ZNyd@A(!3F-^B1-x`%XfbQ13
ztWek?xUvcR#qq>C42hqKM{q=}ssaXD2a+2A!$L|uhEw86%7?SU(kJ19xS>zLnE0Y!
zhohoud<I_(nTMS$Hm9Nuqs{4*5OLS+fj;rn>{~cPLM2Qvg(aBElFRZvBkBs(Mv`|m
zAyUo}Mr2%d3CN7Pm&^@a2O#k}kH(dT#<V81_f!*@zCxo!n5yZa!3>XtCQmSPS&CGy
z)+}aCNx_SbYIjsCmXkc$k#CAMt6kIY9DkzXAdPFC+u|K>;~H}cgry6lbIKrdSL7(w
z?kM}WBQw&mBb%qV-lRbO>uLSpp0K_JEp)<kTp-IW)5zdPLv4}}(~m=Bax=0*w@xCP
zTO(xDh#c-<L0%J3O>?`E<>@94>FQ=%&qNtasqqZP<Z(oWWvJyM7rDoZ+?|AW?5Fk!
zGuV{H?FuWcND*-0ly%`mWlm~xql?Q;z`vy|Mw}z9cWDpkU|xLBY!_$U*K{x|`m=qj
zK^FFy_{u>WEIfUbg87+=_~EA!6i`8<D#Sab6qKL3EH-i#(8br>fNO&)Q9$<(n)of=
z>=ti~f;jC}Y(LIB8ADGD3*wg73zu3Cy$@8m9ee6xp*R9-;%)IxVG$kA(B@<Wl~f>z
zJtqfC;$mrE|5ZF!&FR_k$(gbFIX@Vi@^1uJ&>4g=T#I2|ye#d8De<ke1dAdlZ--st
VLAl~k84I@|E!&!1vU}YVzW{%P;{N~u

diff --git a/__pycache__/module.cpython-310.pyc b/__pycache__/module.cpython-310.pyc
index c290da0b5368b234d016778cdbab31b82853328a..e53a5d7929cd4bc1d3cffcdecd4f17377f712ecd 100644
GIT binary patch
delta 146
zcmdnOagT#HpO=@50SMfUz0-D2<dtO<n5ccpmNiE`N<D=kg*8VbN&`r<<!I(=MQJfI
zfW@?<w1G5xj!v#_lrB_EFG>$Aryr%iS&OlPk<noCVy5q+oCTEysYS^-nFY5vONtVc
iQ<D;tvnS7FHe)jcT3Tc{`6{zDqsnAK7RkwKEPMcn?j}<J

delta 135
zcmcb|v4w*-pO=@50SH#Sc2Ao=kyn<HVWRdWUA7$cT#YCVMurrI6xJNgC`};Eo}-nk
z9i<Hw(}~gn%jrhxZnk2qU}V&ryqW3y<O9s6Z2Casiu5P{X0}#Q05TOABp78F9T+)S
MI2aL-2grtC0HD_z+5i9m

diff --git a/apps.py b/apps.py
index 2c8c299..0b3cf2f 100644
--- a/apps.py
+++ b/apps.py
@@ -16,6 +16,7 @@ reload_password_page = "https://login.mc-user.com:233/account/login"
 register_web_page = "https://login.mc-user.com:233/f0649fc2aeb411eda71f00163e095b49/register"
 
 login_json_file = "config_app/login_user.json"
+favorite_file_sqlite = "config_app/favorite.db"
 
 window_size_int = (950, 560)
 
@@ -102,75 +103,106 @@ class Thread_appcode_login_user(QThread):
         super(Thread_appcode_login_user, self).__init__()
 
     def run(self):
-        data = dict()
-        code = int(0)
-
-        ping_server = os.system("ping www.baidu.com -n 3")
-        if ping_server == 1:
+        try:
             data = dict()
-            code = int(2)
-            data_config = {
-                "data_config": data,
-                "code": code
-            }
-            return self.data_th.emit(data_config)
+            code = int(0)
 
-        with open(file=login_json_file, mode='r', encoding="UTF-8", newline='') as f_read:
-            login_json_user = json.load(f_read)
-
-        login_user = {
-            "accessToken": login_json_user.get("accessToken"),
-            "clientToken": login_json_user.get("clientToken")
-        }
-        json_login_crauser = requests.post(url=aotu_user_url + "authserver/validate", headers=login_headers, json=login_user)
-
-        if json_login_crauser.status_code != 204:
-            ref_login_key = requests.post(url=aotu_user_url + "authserver/refresh", headers=login_headers, json=login_user)
-            if ref_login_key.status_code != 204:
+            ping_server = os.system("ping www.baidu.com -n 3")
+            if ping_server == 1:
                 data = dict()
-                code = int(1)
+                code = int(2)
                 data_config = {
                     "data_config": data,
                     "code": code
                 }
                 return self.data_th.emit(data_config)
-            url_https_mc_login_json = requests.post(url=aotu_user_url + "authserver/refresh", headers=login_headers, json=login_user)
-            data_login_file = {
-                "accessToken": url_https_mc_login_json.get("accessToken"),
-                "clientToken": url_https_mc_login_json.get("clientToken"),
-                "id": url_https_mc_login_json["selectedProfile"]["id"],
-                "name": url_https_mc_login_json["selectedProfile"]["name"]
+
+            if os.path.isfile(favorite_file_sqlite) is False:
+                sqlite_list_code = [
+                    '''
+                    CREATE TABLE Favorite_table (
+                        ID INTEGER PRIMARY KEY AUTOINCREMENT,
+                        SERVERNAME TEXT,
+                        SERVER_TEST TEXT,
+                        IMAGE TEXT,
+                        SERVER_FILE_NAME TEXT
+                    );
+                    '''
+                ]
+                sql = sqlite3.connect(favorite_file_sqlite)
+                csr = sql.cursor()
+                for sqlite_play_i in sqlite_list_code:
+                    csr.execute(sqlite_play_i)
+                csr.close()
+                sql.commit()
+                sql.close()
+
+            with open(file=login_json_file, mode='r', encoding="UTF-8", newline='') as f_read:
+                login_json_user = json.load(f_read)
+
+            login_user = {
+                "accessToken": login_json_user.get("accessToken"),
+                "clientToken": login_json_user.get("clientToken")
             }
-            with open(file=login_json_file, mode='w', encoding="UTF-8", newline='') as dump_f:
-                json.dump(data_login_file, dump_f)
+            json_login_crauser = requests.post(url=aotu_user_url + "authserver/validate", headers=login_headers, json=login_user)
 
-        req_server_list_api = requests.get(url=cra_mc_server_api + server_ip_list_dict, headers=login_headers)
-        server_list_json_dict: dict = [req_server_list_api.json()[cra_mc_api_id]]
+            if json_login_crauser.status_code != 204:
+                ref_login_key = requests.post(url=aotu_user_url + "authserver/refresh", headers=login_headers, json=login_user)
+                if ref_login_key.status_code != 204:
+                    data = dict()
+                    code = int(1)
+                    data_config = {
+                        "data_config": data,
+                        "code": code
+                    }
+                    return self.data_th.emit(data_config)
+                url_https_mc_login_json = requests.post(url=aotu_user_url + "authserver/refresh", headers=login_headers, json=login_user)
+                data_login_file = {
+                    "accessToken": url_https_mc_login_json.get("accessToken"),
+                    "clientToken": url_https_mc_login_json.get("clientToken"),
+                    "id": url_https_mc_login_json["selectedProfile"]["id"],
+                    "name": url_https_mc_login_json["selectedProfile"]["name"]
+                }
+                with open(file=login_json_file, mode='w', encoding="UTF-8", newline='') as dump_f:
+                    json.dump(data_login_file, dump_f)
 
-        server_list_json_ = server_list_json_dict
+            req_server_list_api = requests.get(url=cra_mc_server_api + server_ip_list_dict, headers=login_headers)
+            server_list_json_dict: dict = [req_server_list_api.json()[cra_mc_api_id]]
 
-        server_list0 = list()
-        for i_server in server_list_json_:
-            server_list1 = [
-                i_server.get("servername")
-            ]
-            server_list0.append(server_list1)
+            server_list_json_ = server_list_json_dict
 
-        for i_image_content_for in server_list_json_:
-            req_image = requests.get(url=i_image_content_for.get("logourl")).content
-            i_image_content_for.update({"image": req_image})
+            server_list0 = list()
+            for i_server in server_list_json_:
+                server_list1 = [
+                    i_server.get("servername")
+                ]
+                server_list0.append(server_list1)
 
-        data = {
-            "name": login_json_user.get("name"),
-            "server_list": server_list_json_,
-            "server_id_list": server_list0
-        }
+            for i_image_content_for in server_list_json_:
+                req_image = requests.get(url=i_image_content_for.get("logourl")).content
+                i_image_content_for.update({"image": req_image})
 
-        data_config = {
-            "data_config": data,
-            "code": code
-        }
-        return self.data_th.emit(data_config)
+            data = {
+                "name": login_json_user.get("name"),
+                "server_list": server_list_json_,
+                "server_id_list": server_list0
+            }
+
+            data_config = {
+                "data_config": data,
+                "code": code
+            }
+            return self.data_th.emit(data_config)
+        except Exception as error:
+            data = {
+                "error": str(error)
+            }
+            code = int(9)
+            data_configs = {
+                "data_config": data,
+                "code": code
+            }
+            return self.data_th.emit(data_configs)
 
 class customQListWidgetItem(QListWidgetItem):
     def __init__(self, image, names: str, tests: str):
diff --git a/config_app/favorite.db b/config_app/favorite.db
new file mode 100644
index 0000000000000000000000000000000000000000..117d7aa76f0a950a6861805ca0e1968dca1713be
GIT binary patch
literal 12288
zcmeI#%}T>S5C`zxRFn!9Z@tdVh88crfKjI<n8dnS#hgMc5rlrwHu?b4XYBJh5i7I}
z)pPw1Y{J0oZ1$Ja#P`8#k<-g$Hp&XRP^U_3bxEX@(z0r@R#D~$t3=*q{#$5uKF}vp
z<un$mv6Ke_0uX=z1Rwwb2tWV=5P$##{;fdYIc&DuIw`W}VLqP@Wgt!G`SdLx4>r@<
zwPDXPS??-f+Nf=fvr*oWo$kk(K5DwIUev#OcC+`%tn6BmIcpu)E2(u%72)5IA6f3P
zp}z4$&m?rq33(6p&X1&B$dT<-?u^+yvWdJ<Zop4Fi&D$6-BBgy_WsbN>j#|v9JuvS
zZaJIF(2sxs1Rwwb2tWV=5P$##AOHafKwysrF#qrI&&Aas009U<00Izz00bZa0SG_<
H0^b6k$ku6_

literal 0
HcmV?d00001

diff --git a/config_app/login_user.json b/config_app/login_user.json
index 81b9864..0cd3f32 100644
--- a/config_app/login_user.json
+++ b/config_app/login_user.json
@@ -1 +1 @@
-{"accessToken": "eb00b22d167411ef92c5e252f2c508d4", "clientToken": "ea55c2cc-1674-11ef-92c5-e252f2c508d4", "id": "a6143eb7a7883daab9a05dbe052879a1", "name": "GameDaBai"}
\ No newline at end of file
+{"accessToken": "7e56f116178611ef92c5e252f2c508d4", "clientToken": "7da4f2dd-1786-11ef-92c5-e252f2c508d4", "id": "a6143eb7a7883daab9a05dbe052879a1", "name": "GameDaBai"}
\ No newline at end of file
diff --git a/main.py b/main.py
index fba304b..676595c 100644
--- a/main.py
+++ b/main.py
@@ -26,6 +26,12 @@ class Login_Window_app(QWidget):
 
     def run_th_app(self, data_config: dict):
         self.destroy()
+        if data_config.get("code") == 9:
+            error_str = data_config.get("data_config")
+            message_error = apps.Message_yes_no(message="在启动客户端时发生严重错误，请复制以下错误信息发送给开发者或管理员，单击确定即可复制\n\n" + error_str.get("error"))
+            if message_error.value() is True:
+                pyperclip.copy(error_str.get("error"))
+            return sys.exit(0)
         if data_config.get("code") == 2:
             apps.Message_ok(message="网络出问题了，请检查完网络连接再来哦主人")
             return sys.exit(0)
@@ -254,7 +260,6 @@ class My_APP_Window(QTabWidget):
         self.server_ip_list = QListWidget()
         self.server_ip_list.setFixedSize(500, 55)
         self.server_ip_list.setFlow(QListView.LeftToRight)
-        self.server_ip_list.addItems(["name1", "name2", "name33"])
         index_home_grid_box.addWidget(self.server_ip_list, 2, 0, alignment=Qt.AlignLeft | Qt.AlignBottom)
 
         self.start_game_button = QPushButton(text="启动游戏")
diff --git a/module.py b/module.py
index 0767ab0..d7000ce 100644
--- a/module.py
+++ b/module.py
@@ -12,6 +12,8 @@ import requests
 import json
 import datetime
 import sqlite3
+import pyperclip
+import traceback
 from time import sleep
 import zipfile
 from shutil import rmtree