ui

Author: mooncode163

ServerApp/.DS_Store

@@ -1,6 +1,6 @@
 from flask import Flask
 from AppVersionParser import mainAppVersionParser 
-from AppVersionTapTap import mainAppVersionTapTap 
+from ServerAppVersionTapTap import mainServerAppVersionTapTap 
 
 from flask import request
 app = Flask(__name__)
@@ -13,12 +13,14 @@
 # pip3 install flask
 # pip3 install selenium
 
+# linux 安装目录 /var/www/html/PythonUnity/ServerApp/AppVersion
 
 # ubuntu16.04上安装及使用selenium、chrome、chromedriver
 # https://blog.csdn.net/shuchuan0409/article/details/101615221
 
 # 在Ubuntu上安装Chrome浏览器和ChromeDriver
 # https://www.cnblogs.com/z-x-y/p/9024622.html
+# google-chrome --version
 
 # http://127.0.0.1:8080/
 # http://47.242.56.146:8080/
@@ -40,8 +42,8 @@ def GetAppVersionHuawei():
     # return "2.0.0"
     return mainAppVersionParser.GetVersion(cur_version,package,appid)
 
-
-# http://0.0.0.0:8080/AppVersion_taptap?cur_version=1.2.0&package=com.moonma.hanziyuan&appid=46445
+# http://mooncore.cn:8182/AppVersion_taptap?cur_version=1.2.0&package=com.moonma.hanziyuan&appid=46445
+# http://0.0.0.0:8182/AppVersion_taptap?cur_version=1.2.0&package=com.moonma.hanziyuan&appid=46445
 @app.route('/AppVersion_taptap')
 def GetAppVersionTapTap():
     print(request.url) 
@@ -50,7 +52,7 @@ def GetAppVersionTapTap():
     appid = request.args["appid"] 
     print(appid)
     # return "2.0.0"
-    return mainAppVersionTapTap.GetVersion(cur_version,package,appid)
+    return mainServerAppVersionTapTap.GetVersion(cur_version,package,appid)
 
 # http://mooncore.cn:8080/AppVersion?package=com.moonma.caicaile
 @app.route('/AppVersion')
@@ -63,4 +65,4 @@ def GetAppVersion():
 
 if __name__ == '__main__':
     # app.run()
-    app.run(host='0.0.0.0', port=8080)
+    app.run(host='0.0.0.0', port=8182)

ServerApp/AppVersion/AppVersion.py

@@ -0,0 +1,67 @@
+from flask import Flask
+from AppVersionParser import mainAppVersionParser 
+from ServerAppVersionTapTap import mainServerAppVersionTapTap 
+
+from flask import request
+app = Flask(__name__)
+
+# 在 Ubuntu 上使用 Nginx 部署 Flask 应用
+# https://www.oschina.net/translate/serving-flask-with-nginx-on-ubuntu
+# sudo apt-get install python-setuptools
+# sudo easy_install pip
+# pip3 install virtualenv
+# pip3 install flask
+# pip3 install selenium
+
+# linux 安装目录 /var/www/html/PythonUnity/ServerApp/AppVersion
+
+# ubuntu16.04上安装及使用selenium、chrome、chromedriver
+# https://blog.csdn.net/shuchuan0409/article/details/101615221
+
+# 在Ubuntu上安装Chrome浏览器和ChromeDriver
+# https://www.cnblogs.com/z-x-y/p/9024622.html
+
+# http://127.0.0.1:8080/
+# http://47.242.56.146:8080/
+@app.route('/')
+def hello_world():
+    return 'Hello World!'
+
+# http://47.242.56.146:8080/AppVersion_huawei?cur_version=1.2.0&package=com.moonma.hanziyuan&appid=100278849
+# http://mooncore.cn:8080/AppVersion_huawei?cur_version=1.2.0&package=com.moonma.caicaile&appid=100270155
+# http://127.0.0.1:5000/AppVersion_huawei?cur_version=1.2.0&package=com.moonma.caicaile&appid=100270155
+@app.route('/AppVersion_huawei')
+def GetAppVersionHuawei():
+    print(request.url)
+    cur_version = request.args["cur_version"]
+    package = request.args["package"]
+    appid = request.args["appid"]
+    print(cur_version)
+    print(package)
+    # return "2.0.0"
+    return mainAppVersionParser.GetVersion(cur_version,package,appid)
+
+# http://mooncore.cn:8183/AppVersion_taptap?cur_version=1.2.0&package=com.moonma.hanziyuan&appid=46445
+# http://0.0.0.0:8182/AppVersion_taptap?cur_version=1.2.0&package=com.moonma.hanziyuan&appid=46445
+@app.route('/AppVersion_taptap')
+def GetServerAppVersionTapTap():
+    print(request.url) 
+    cur_version = request.args["cur_version"]
+    package = request.args["package"]
+    appid = request.args["appid"] 
+    print(appid)
+    # return "2.0.0"
+    return mainServerAppVersionTapTap.GetVersion(cur_version,package,appid)
+
+# http://mooncore.cn:8080/AppVersion?package=com.moonma.caicaile
+@app.route('/AppVersion')
+def GetAppVersion():
+    print(request.url) 
+    package = request.args["package"] 
+    print(package)
+    # return "2.0.0"
+    return mainAppVersionParser.GetVersionByPackage(package)
+
+if __name__ == '__main__':
+    # app.run()
+    app.run(host='0.0.0.0', port=8183)

ServerApp/AppVersion/AppVersionTest.py

@@ -19,7 +19,7 @@
 from DBApp import mainDBApp
 
 
-class AppVersionTapTap():  
+class ServerAppVersionTapTap():  
     driver:None
     def GetVersion(self,html, start,min,end):
         idx = html.find(start) 
@@ -41,6 +41,11 @@ def GetHtml(self,appid):
         # 创建chrome浏览器驱动，无头模式（超爽）
         chrome_options = Options()
         chrome_options.add_argument('--headless')
+
+        # linux 上chrome上需要加上下面两句 ,不然会报错
+        # 例如 unknown error: DevToolsActivePort file doesn‘t exist
+        chrome_options.add_argument("--no-sandbox")
+        chrome_options.add_argument('--disable-dev-shm-usage')
         self.driver = webdriver.Chrome(chrome_options=chrome_options)
 
         # 加载百度页面
@@ -119,8 +124,8 @@ def GetVersion(self,cur_version,package,appid):
 
 
 
-mainAppVersionTapTap = AppVersionTapTap() 
+mainServerAppVersionTapTap = ServerAppVersionTapTap() 
 # # 主函数的实现
 if __name__ == "__main__":
 
-    mainAppVersionTapTap.ParseVersion("46445")
+    mainServerAppVersionTapTap.ParseVersion("46445")

ServerApp/AppVersion/AppVersionTapTap.py renamed to ServerApp/AppVersion/ServerAppVersionTapTap.py

@@ -17,16 +17,16 @@
 # pip install PyUserInput
 from pykeyboard import PyKeyboard
 
-import pyautogui 
-from pynput import mouse
-import pynput, time
+# import pyautogui 
+# from pynput import mouse
+# import pynput, time
 from Common.Platform import Platform
 
 # webdriver 下载 http://chromedriver.storage.googleapis.com/index.html
 
 # mac mini m1 arm cpu keyboard python crash bug
-if 'Darwin' not in platform.system():
-    import keyboard #Using module keyboard
+# if 'Darwin' not in platform.system():
+#     import keyboard #Using module keyboard
 
 
 class CmdType(object): 

ServerApp/AppVersion/WebDriver/WebDriverCmd.py

@@ -12,5 +12,6 @@ pyautogui
 jwt
 cryptography
 incremental
+PyUserInput
 
 #uvloop~=0.12