Skip to content

Commit 6ed7607

Browse files
committed
ui
1 parent e17c038 commit 6ed7607

28 files changed

+275
-34
lines changed

.DS_Store

0 Bytes
Binary file not shown.

Common/.DS_Store

0 Bytes
Binary file not shown.

Common/File/FTPUtil

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
#! /bin/sh
3+
# 脚本文件的绝对路径存在了环境变量filepath中,可以用
4+
filepath=$(cd "$(dirname "$0")"; pwd)
5+
echo $filepath
6+
cd $filepath
7+
python3 FTPUtil.py

Common/File/FTPUtil.py

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
#!/usr/bin/python
2+
# coding=utf-8
3+
import sys
4+
import zipfile
5+
import shutil
6+
import os
7+
import os.path
8+
import json
9+
10+
from ftplib import FTP
11+
import time,tarfile,os
12+
# import paramiko
13+
14+
# ubuntu 安装 vsftpd
15+
# sudo apt-get install vsftpd
16+
# FileZilla连接 选择sftp协议 vsftpd 的端口选22
17+
18+
# 添加vsftpd 登录用户
19+
#新建文件/etc/vsftpd.user_list,用于存放允许访问ftp的用户:
20+
# sudo touch /etc/vsftpd.user_list
21+
# sudo vim /etc/vsftpd.user_list
22+
# 在/etc/vsftpd.user_list中添加允许登录ftp 的用户
23+
# root
24+
25+
26+
# https://blog.csdn.net/qq_39122146/article/details/103907247
27+
28+
29+
30+
31+
class FTPUtil():
32+
#连接ftp
33+
def ftpconnect(self,host,port, username, password):
34+
ftp = FTP()
35+
# 打开调试级别2,显示详细信息
36+
# ftp.set_debuglevel(2)
37+
ftp.connect(host, port)
38+
ftp.login(username, password)
39+
return ftp
40+
41+
#从ftp下载文件
42+
def downloadfile(self,ftp, remotepath, localpath):
43+
# 设置的缓冲区大小
44+
bufsize = 1024
45+
fp = open(localpath, 'wb')
46+
ftp.retrbinary('RETR ' + remotepath, fp.write, bufsize)
47+
ftp.set_debuglevel(0)# 参数为0,关闭调试模式
48+
fp.close()
49+
50+
#从本地上传文件到ftp
51+
def uploadfile(self,ftp, remotepath, localpath):
52+
bufsize = 1024
53+
fp = open(localpath, 'rb')
54+
ftp.storbinary('STOR ' + remotepath, fp, bufsize)
55+
ftp.set_debuglevel(0)
56+
fp.close()
57+
58+
mainFTPUtil = FTPUtil()
59+
60+
if __name__ == "__main__":
61+
#host,port, username, password
62+
p = FTPUtil()
63+
# ftp = p.ftpconnect("47.242.56.146", 21,"root", "Qianlizhiwai1")
64+
# #下载文件,第一个是ftp服务器路径下的文件,第二个是要下载到本地的路径文件
65+
# p.downloadfile(ftp, "/12.mp3", r"C:\Users\Administrator\Desktop\ftp\download\test.mp3")
66+
# # 上传文件,第一个是要上传到ftp服务器路径下的文件,第二个是本地要上传的的路径文件
67+
# p.uploadfile(ftp, '/upload/1.txt', "C:/Users/Administrator/Desktop/1.txt")
68+
# # ftp.close() #关闭ftp
69+
# # #调用本地播放器播放下载的视频
70+
# # os.system('start D:\soft\kugou\KGMusic\KuGou.exe C:\Users\Administrator\Desktop\ftp\test.mp3')
71+
72+
# print(ftp.getwelcome())# 打印出欢迎信息
73+
# # 获取当前路径
74+
# pwd_path = ftp.pwd()
75+
# print("FTP当前路径:", pwd_path)
76+
# 显示目录下所有目录信息
77+
# ftp.dir()
78+
# 设置FTP当前操作的路径
79+
# ftp.cwd('/upload/')
80+
# # 返回一个文件名列表
81+
# filename_list = ftp.nlst()
82+
# print(filename_list)
83+
84+
# ftp.mkd('目录名')# 新建远程目录
85+
# ftp.rmd('目录名') # 删除远程目录
86+
# ftp.delete('文件名') # 删除远程文件
87+
# ftp.rename('fromname', 'toname') # 将fromname修改名称为toname
88+
89+
# 逐行读取ftp文本文件
90+
file = '/upload/1.txt'
91+
# ftp.retrlines('RETR %s' % file)
92+
#与 retrlines()类似,只是这个指令处理二进制文件。回调函数 cb 用于处理每一块(块大小默认为 8KB)下载的数据
93+
# ftp.retrbinary('RETR %s' % file)
94+
95+
96+
97+
98+
# transport = paramiko.Transport(("47.242.56.146", 21)) # 获取Transport实例
99+
# transport.connect(username="root", password="Qianlizhiwai1") # 建立连接
100+
101+
# # 创建sftp对象,SFTPClient是定义怎么传输文件、怎么交互文件
102+
# sftp = paramiko.SFTPClient.from_transport(transport)
103+
104+
# # 将本地 api.py 上传至服务器 /www/test.py。文件上传并重命名为test.py
105+
# sftp.put("E:/test/api.py", "/www/test.py")
106+
107+
# # 将服务器 /www/test.py 下载到本地 aaa.py。文件下载并重命名为aaa.py
108+
# sftp.get("/www/test.py", "E:/test/aaa.py")
109+
110+
# # 关闭连接
111+
# transport.close()
112+
113+
114+
1.23 KB
Binary file not shown.

ProjectConfig/.DS_Store

0 Bytes
Binary file not shown.

ProjectConfig/Script/.DS_Store

0 Bytes
Binary file not shown.

ProjectConfig/Script/AppInfo/AppInfo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def GetJsonFile(self,isHd):
8282
jsonfile = cur_path+'/appinfo_hd.json'
8383
return os.path.normpath(jsonfile)
8484

85-
def loadJson(self,isHd,isReload=False):
85+
def loadJson(self,isHd,isReload=True):
8686
if self.rootJson is None or isReload is True:
8787
jsonfile = self.GetJsonFile(isHd)
8888
strfile = FileUtil.GetFileString(jsonfile)
@@ -476,7 +476,7 @@ def GetAppVersionJson(self,os,isHd,channel=""):
476476

477477
# if channel==Source.HUAWEI:
478478
# key = os
479-
479+
print("GetAppVersionJson key="+key)
480480
return appversion[key]
481481

482482

43 Bytes
Binary file not shown.

ProjectConfig/Script/AppStore/AppStoreTaptap.py

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
from Project.Resource import mainResource
1919
from Common import Source
2020
from Common.File.FileUtil import FileUtil
21+
from Common.File.FTPUtil import mainFTPUtil
2122
from Common.File.FileBrowser import FileBrowser
2223
from AppInfo.AppInfo import mainAppInfo
2324
from Common.Platform import Platform
24-
25+
from ServerApp.AppVersion.DBApp import DBApp
26+
from ServerApp.AppVersion.AppItemInfo import AppItemInfo
2527

2628
from selenium import webdriver
2729
from selenium.webdriver.common.keys import Keys
@@ -653,6 +655,60 @@ def GotoUploadPage(self, isHD):
653655
self.driver.get(url)
654656
time.sleep(1)
655657

658+
def GetDbFile(self):
659+
return mainResource.GetDirProductDBRoot()+"/DBAppTaptap.db"
660+
661+
def GetDbFileOnServer(self):
662+
return "PythonUnity/ServerApp/AppVersion/DBAppTaptap.db"
663+
664+
# 更新服务器上的版本db
665+
def UpLoadVesionDB(self):
666+
self.UpdateVesionDBInfo(False)
667+
self.UpdateVesionDBInfo(True)
668+
669+
dbfile = self.GetDbFile()
670+
dbfileOnServer = self.GetDbFileOnServer()
671+
# FTP upload
672+
# ftp = mainFTPUtil.ftpconnect("47.242.56.146", 21,"root", "Qianlizhiwai1")
673+
# mainFTPUtil.uploadfile(ftp, dbfileOnServer, dbfile)
674+
self.UploadSFTPByGo(dbfile,dbfileOnServer)
675+
676+
677+
def UploadSFTPByGo(self,localfile,serverfile):
678+
godir = mainResource.GetDirGoRoot()+ "/Ftp"
679+
os.chdir(godir)
680+
filego = "Ftp.go"
681+
cmd = "go run "+filego+" "+localfile+" "+serverfile
682+
print(cmd)
683+
os.system(cmd)
684+
685+
686+
687+
def UpdateVesionDBInfo(self,isHD):
688+
appid = mainAppInfo.GetAppId(isHD,Source.TAPTAP)
689+
version = mainAppInfo.GetAppVersion(Source.ANDROID,isHD,Source.TAPTAP)
690+
print("UpdateVesionDBInfo version="+version+ " isHD="+str(isHD))
691+
# return
692+
package = mainAppInfo.GetAppPackage(Source.ANDROID,isHD,Source.TAPTAP)
693+
db = DBApp()
694+
dbfile = self.GetDbFile()
695+
696+
dbfileOnServer = self.GetDbFileOnServer()
697+
db.OpenDB(dbfile)
698+
699+
appinfo = AppItemInfo()
700+
appinfo.appid= appid
701+
appinfo.package= package
702+
appinfo.version= version
703+
704+
if db.IsItemExist(appinfo.package)==True:
705+
db.UpdateItem(appinfo)
706+
else:
707+
# AddItem
708+
db.AddItem(appinfo)
709+
710+
711+
656712
def UpLoadApk(self, isHD):
657713
webcmd = WebDriverCmd(self.driver)
658714

0 commit comments

Comments
 (0)