From d46c83f51bcb2d5de49bfe94bbd6079507f2083c Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Tue, 3 Jan 2023 22:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=84=9A=E6=9C=ACUI=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoConfig.py | 15 +++++++-------- UI/AutoConfig.py | 6 +----- UI/AutoConfig.ui | 9 +-------- UI/__pycache__/AutoConfig.cpython-37.pyc | Bin 3922 -> 3822 bytes 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/AutoConfig.py b/AutoConfig.py index f18db7b..2f4c949 100755 --- a/AutoConfig.py +++ b/AutoConfig.py @@ -15,6 +15,7 @@ import sys import base64 import json import traceback +import urllib.request import req as requests import PyQt5.QtWidgets as QtWidgets from UI.AutoConfig import * @@ -38,8 +39,6 @@ urlSourcesList = [ urlSources = urlSourcesList[0] lists = [] -#print(requests.post("http://120.25.153.144:30250/PingLun", {"PinLun": "测试文本", "Version": "purgeexepro.sh"}).text) - class ProgramRunStatusUpload(): msgWindow = None starLayout = None @@ -139,7 +138,7 @@ class InformationWindow(): about = f"<h1>关于“{choose}”的介绍</h1>\n<p>暂无此程序的介绍</p>" try: import requests as r - fenlists = requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Jhc2hBcHBGZW4v").decode("utf-8") + fileName + base64.b64decode("L2FsbC5qc29u").decode("utf-8"), timeout=1000).json() + fenlists = requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Jhc2hBcHBGZW4v").decode("utf-8") + urllib.request.quote(fileName) + base64.b64decode("L2FsbC5qc29u").decode("utf-8"), timeout=1000).json() tipsInfo = "" except: fenlists = [0, 0, 0, 0, 0] @@ -253,7 +252,7 @@ class ProgramRunStatusShow(): fileName = i[1] break try: - fenlists = requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Jhc2hBcHBGZW4v").decode("utf-8") + fileName + base64.b64decode("L2FsbC5qc29u").decode("utf-8")).json() + fenlists = requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Jhc2hBcHBGZW4v").decode("utf-8") + urllib.request.quote(fileName) + base64.b64decode("L2FsbC5qc29u").decode("utf-8")).json() tipsInfo = "" except: #traceback.print_exc() @@ -311,7 +310,7 @@ class ProgramRunStatusShow(): else: # 显示最新的3条评论 try: - all = int(requests.get(f"{base64.b64decode('aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy9iYXNocGlubHVuL3Jhdy9icmFuY2gvbWFzdGVyLw==').decode('utf-8')}{fileName}/data.txt").text) + all = int(requests.get(f"{base64.b64decode('aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy9iYXNocGlubHVuL3Jhdy9icmFuY2gvbWFzdGVyLw==').decode('utf-8')}{urllib.request.quote(fileName)}/data.txt").text) now = all - 3 print(all) if all < 3: @@ -322,7 +321,7 @@ class ProgramRunStatusShow(): uploadList = [] for i in range(all - 1, start - 1, -1): print(f"第 {i + 1} 条评论:") - info = requests.get(f"{base64.b64decode('aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy9iYXNocGlubHVuL3Jhdy9icmFuY2gvbWFzdGVyLw==').decode('utf-8')}{fileName}/pf-{i}.txt").text.strip() + info = requests.get(f"{base64.b64decode('aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy9iYXNocGlubHVuL3Jhdy9icmFuY2gvbWFzdGVyLw==').decode('utf-8')}{urllib.request.quote(fileName)}/pf-{i}.txt").text.strip() print(info) uploadList.append([f"用户{i + 1}", i + 1, info]) Add(uploadList) @@ -380,7 +379,7 @@ def UpdateFen(): uploadList = [] for i in range(now + 2, now - 1, -1): print(f"第 {i + 1} 条评论:") - info = requests.get(f"https://code.gitlink.org.cn/gfdgd-xi-org/bashpinlun/raw/branch/master/{fileName}/pf-{i}.txt").text.strip() + info = requests.get(f"https://code.gitlink.org.cn/gfdgd-xi-org/bashpinlun/raw/branch/master/{urllib.request.quote(fileName)}/pf-{i}.txt").text.strip() print(info) uploadList.append([f"用户{i + 1}", i + 1, info]) #ProgramRunStatusShow.pingLunLayout.removeItem(ProgramRunStatusShow.pingLunLayout.itemAt(2)) @@ -572,7 +571,7 @@ if __name__ == "__main__": #pass # 连接信号和槽 ui.saerchBotton.clicked.connect(Connect.SearchBotton_Clicked) - ui.uploadFen.clicked.connect(UploadFen) + #ui.uploadFen.clicked.connect(UploadFen) ui.getInfoButton.clicked.connect(InformationWindow.ShowWindow) ui.runBotton.clicked.connect(Connect.RunBotton_Clicked) ui.openFile.triggered.connect(Connect.OpenFile_Triggered) diff --git a/UI/AutoConfig.py b/UI/AutoConfig.py index 379cebe..3419fc3 100755 --- a/UI/AutoConfig.py +++ b/UI/AutoConfig.py @@ -41,9 +41,6 @@ class Ui_MainWindow(object): self.getFen = QtWidgets.QPushButton(self.centralwidget) self.getFen.setObjectName("getFen") self.horizontalLayout_2.addWidget(self.getFen) - self.uploadFen = QtWidgets.QPushButton(self.centralwidget) - self.uploadFen.setObjectName("uploadFen") - self.horizontalLayout_2.addWidget(self.uploadFen) self.runBotton = QtWidgets.QPushButton(self.centralwidget) self.runBotton.setObjectName("runBotton") self.horizontalLayout_2.addWidget(self.runBotton) @@ -110,8 +107,7 @@ class Ui_MainWindow(object): self.searchTips.setText(_translate("MainWindow", "搜索内容(为空代表显示所有内容):")) self.saerchBotton.setText(_translate("MainWindow", "搜索")) self.getInfoButton.setText(_translate("MainWindow", "获取选中项介绍")) - self.getFen.setText(_translate("MainWindow", "获取选中项的评分")) - self.uploadFen.setText(_translate("MainWindow", "提交选中项的评分")) + self.getFen.setText(_translate("MainWindow", "获取/提交选中项的评分和评论")) self.runBotton.setText(_translate("MainWindow", "部署此方案")) self.menu.setTitle(_translate("MainWindow", "程序")) self.menu_2.setTitle(_translate("MainWindow", "切换源")) diff --git a/UI/AutoConfig.ui b/UI/AutoConfig.ui index c793ce7..ea5b234 100755 --- a/UI/AutoConfig.ui +++ b/UI/AutoConfig.ui @@ -64,14 +64,7 @@ <item> <widget class="QPushButton" name="getFen"> <property name="text"> - <string>获取选中项的评分</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="uploadFen"> - <property name="text"> - <string>提交选中项的评分</string> + <string>获取/提交选中项的评分和评论</string> </property> </widget> </item> diff --git a/UI/__pycache__/AutoConfig.cpython-37.pyc b/UI/__pycache__/AutoConfig.cpython-37.pyc index a4e9f505e335e1b4b21c55ac0f07811530250871..ed67d90419124bfc2602e3ff772cb81919b9fcc4 100644 GIT binary patch delta 1111 zcmZ9KOHUI~6oBWBeN0<AQK3K!Eu~Xr`k>PXP&CBECN2zNq3EWOsNpsd!XuWl(Iz!W zd`Hw9T^JX45;iW>_=?I(6aRp^V@;)OaO+0nncJc5OeZ}#=R4myb7wL?0(*Wj=XN_e z_?;PlKNIpj62GC<H$T6kN|~Fp(Ss1%RfM=QqP>t?w7kSqe;KK$%v}fo3(&q&koMz4 zaPj!C${fZy%x1w4X*HXWAd@JEJM>M>P8d32=y<eFxq|3GeTd!gh<?LCV1poa>f`%d z1}+2dGVuuT2=Hzbj{=VZ_nLSNc#Oueuc9?rF@$}MoWnh)fdn`SZ9sPtu(a3YDBvh9 zjslL~<RrmKwm6j}Nbt%GPoDxQ)gq<9=`%TLaMCSKnhxQh<}l9Tev_X8o@wzjurs8h z3LB8<FtnrkxI{-(u7%4w4>K!fs1k-sF;q!Il{Qovy_%>mP3dKT-9n<HDrX?!CZSpF z8-e!~oExJ@>pAA8xQIkntsh9vwt<e39ort+vip&T{IQ1vo$%ckyCCG9%Z1WpVR0pQ zshGE)J~308U0Ni+-Ci;!^jQ30kOjd@?g>}WDETW)ptt0dW0E{~JV6&p+Ie-rRpv3m z!VO+OT^p?vM}xSjm3()8v9Tk0$P3rCxD0!Ltv}q}+)!!{K33PC?q0vM{psbd`g!Ns zTJ7~(_4du`<NJ`*UTwacZi^t)O>Vi*wQI-D3vlAIv!(e0djL3V))F~T93hJ6@s5H} zWFf0%!w@dRe_1BeVvO7sPby>kysnuBtk8970~QDZ63&x<Vq9)Yjn!Mi_`(uinJ*l7 KXgUv}gZ~efkS3e} delta 1193 zcmZXT%TE(g6vpR{&`w+01SzFJA3&!{AJQij(3r@^g(1<XiFQL8rVFru8KxU;QWJ^M zmFV5!!rR1+CdObiL06dQKcI2r#tlB$uyW_d@7@+V9ozKeobUU6C-+X<gW%_oXU^?* zN_c&>uPpk8A9+5K7u#Px5Y>>GrzS0THAqcb2%rlvN$YJ8BBAeNF0Rl`xxXH4Qba-` zR3m~9LkqJJW0Z|)$MKf6z6LglY#4jIyaylQoJgqXR5<<rIZ-%KI6jdl>_jso@+WJg zF5=@5#{mtr;xL3BgC2wKx9D-`ap;2<JpnxdeaNCGp(oiXZJ6t#pJ?@UZb(|d5=a3` znF1*=K?{=xlQuDFFd++*0h2K?88CQahqrH#I=-GPpsWeX0va(xU~*t`CML%wv{B9o zUDC!Zd>(q<#OJXy(&AM%2{$1o++Sr=4M{9&8nG4@6<D%kN_9->jw#bI<vON($CPbN zVKzC7lc=oFklGTIXj@^^{I`GyHo82+W}CexU6x`hEq1@PRc}_-N*Z<Ao|Dt`jqO0z zz4WPlg!t&LUCj^RpP~Cviq7@2F<)M-&Xx3{{nEKbV`*(wALRBBFT=b9cnMO!5~AB~ zzpO{-Ma3Wm`boJ!c4)6-o?df2Av*ozxE1ZL$r{m=yK?K?F4iLy$C2V@J(N0k{kV>w zHSzwYDUR=>*Il=}_}S=pmp@qL-Oq=cd+(p^-+8dN^K!rO?$_4F?^hc??%#Xe6C-4h z#@$!@y!?#(T15pny0T<c%Ji|jP|zdLV#o9;?%TNUTrl*~>UyPQl=T8vMVaQ^B+3nZ z*5mZAJ3&>?`P9szZerVkZn!QU=t5D5vOu>y$?^8qBl4SaW@SyQR?24`9G6kN@;`&e BFaiJo