diff --git a/README.md b/README.md index 36c855a..2c5d436 100644 --- a/README.md +++ b/README.md @@ -30,28 +30,27 @@ v2ray linux 客户端，使用pyqt5编写GUI界面，核心基于v2ray-core(v2ra # 使用 +## 使用前请注意 +使用脚本安装时下载的程序实在`ubuntu 18.04` + `Python3.6`的环境下打包的，因此在Python版本不一致的环境中可能会出现版本不兼容的问题 + +解决方法： + +在自己的电脑上重新打包程序，具体方法如下（参考） +1. 运行`git clone https://github.com/jiangxufeng/v2rayL.git` +2. 进入项目文件夹，然后运行`pip install -r requirements.txt` +3. 运行`cd v2rayL-GUI && pyinstaller -F v2rayLui.py -p config.py -p sub2conf_api.py -p v2rayL_api.py -p v2rayL_threads.py -p utils.py -i images/logo.ico -n v2rayLui` +4. 打包后运行`mv dist/v2rayLui /usr/bin/v2rayL/v2rayLui` + ## 安装 -方法一： ``` bash <(curl -s -L http://dl.thinker.ink/install.sh) ``` -方法二： -``` -在release中下载最新的install.sh，然后运行 ./install.sh -``` - ## 更新 -方法一： ``` bash bash <(curl -s -L http://dl.thinker.ink/update.sh) ``` -方法二： -``` bash -在release中下载最新的update.sh，然后运行 ./update.sh -``` - ## 卸载 ``` bash bash <(curl -s -L http://dl.thinker.ink/uninstall.sh) @@ -61,7 +60,7 @@ bash <(curl -s -L http://dl.thinker.ink/uninstall.sh) ![首页](http://cloud.thinker.ink/download/a043a08860f239f8d0cbeb2dc2a5b6d5.png) -![setting1](http://cloud.thinker.ink/images/364231980b07e8881164f61cd220d0bb.png) +![setting1](http://cloud.thinker.ink/images/617ce660cc4a2a22bd275d73d0d7c616.png) ![setting2](http://cloud.thinker.ink/images/8835526765d479143879c08fe1ecb8a4.png) diff --git a/v2rayL-GUI/config.py b/v2rayL-GUI/config.py index 1dda85f..3a9a99f 100755 --- a/v2rayL-GUI/config.py +++ b/v2rayL-GUI/config.py @@ -5,8 +5,12 @@ conf_template = { "dns": { "servers": [ - "1.1.1.1" - ] + "1.1.1.1", + "8.8.8.8", + "8.8.4.4", + "localhost" + ], + }, "inbounds": [{ "port": 1080, diff --git a/v2rayL-GUI/new_ui.py b/v2rayL-GUI/new_ui.py index 6519950..a1fc897 100644 --- a/v2rayL-GUI/new_ui.py +++ b/v2rayL-GUI/new_ui.py @@ -627,7 +627,7 @@ def retranslateUi(self, SystemSettings): self.label_3.setText(_translate("SystemSettings", "Socks：")) self.label_4.setText(_translate("SystemSettings", "版本更新")) self.label_5.setText(_translate("SystemSettings", "当前版本：")) - self.version_label.setText(_translate("SystemSettings", "v2.1.1")) + self.version_label.setText(_translate("SystemSettings", "v2.1.2")) self.checkupdateButton.setText(_translate("SystemSettings", "检查更新")) self.label_7.setText(_translate("SystemSettings", "自动检查更新")) self.label_6.setText(_translate("SystemSettings", "**端口可选范围：1080-10080，每次修改都将更新。**")) @@ -659,7 +659,7 @@ def retranslateUi(self, HelpUi): "\n" "

当前版本

\n" "

——————————————————————

\n" - "

v2.1.1

\n" + "

v2.1.2

\n" "


\n" "

说明

\n" "

——————————————————————

")) @@ -720,7 +720,7 @@ def setupUi(self, Form): self.pushButton_1.setObjectName("pushButton_1") self.time = QLabel(Form) self.time.setGeometry(QRect(510, 400, 160, 31)) - self.time.setStyleSheet('font: 75 11pt;font-weight:bold;') + self.time.setStyleSheet('font: 55 11pt;font-weight:500;') self.time.setObjectName("time") self.tableWidget.setShowGrid(False) diff --git a/v2rayL-GUI/sub2conf_api.py b/v2rayL-GUI/sub2conf_api.py index a2f8808..f4b8385 100755 --- a/v2rayL-GUI/sub2conf_api.py +++ b/v2rayL-GUI/sub2conf_api.py @@ -136,13 +136,21 @@ def setconf(self, region, http, socks): "uplinkCapacity": 12, "writeBufferSize": 1 }, - "security": "tls" if use_conf["tls"] else "" + "security": "tls" if use_conf["tls"] else "", + "tlssettings": { + "allowInsecure": True, + "serverName": use_conf["host"] if use_conf["tls"] else "" + } } # tcp elif use_conf["net"] == "tcp": conf['outbounds'][0]["streamSettings"] = { "network": use_conf["net"], "security": "tls" if use_conf["tls"] else "", + "tlssettings": { + "allowInsecure": True, + "serverName": use_conf["host"] if use_conf["tls"] else "" + }, "tcpsettings": { "connectionReuse": True, "header": { diff --git a/v2rayL-GUI/utils.py b/v2rayL-GUI/utils.py index 4e432bb..6dfe9b8 100644 --- a/v2rayL-GUI/utils.py +++ b/v2rayL-GUI/utils.py @@ -75,5 +75,3 @@ def qt_message_handler(mode, context, message): if en == "True": with open("/etc/v2rayL/v2rayL_op.log", "a+") as f: f.write(' %s - %s: %s\n' % (datetime.datetime.now(), mode, info)) - -# https://sub.qianglie.xyz/subscribe.php?sid=5582&token=g6e8VdU6C40H \ No newline at end of file diff --git a/v2rayL-GUI/v2rayL_threads.py b/v2rayL-GUI/v2rayL_threads.py index 03e0f3b..106b4d2 100755 --- a/v2rayL-GUI/v2rayL_threads.py +++ b/v2rayL-GUI/v2rayL_threads.py @@ -178,7 +178,7 @@ def run(self): with open("/etc/v2rayL/update.sh", 'w') as f: f.write(req.text) - subprocess.call(["chmod +x /etc/v2rayL/update.sh && /etc/v2rayL/upda.sh"], shell=True) + subprocess.call(["chmod +x /etc/v2rayL/update.sh && /etc/v2rayL/update.sh"], shell=True) self.sinOut.emit(("vrud", "@@OK@@", "更新完成, 重启程序生效.", None)) diff --git a/v2rayL-GUI/v2rayLui.py b/v2rayL-GUI/v2rayLui.py index 85a607c..40a1e55 100644 --- a/v2rayL-GUI/v2rayLui.py +++ b/v2rayL-GUI/v2rayLui.py @@ -37,7 +37,7 @@ def __init__(self, parent=None): super(MyMainWindow, self).__init__(parent) self.init_ui() - self.version = "2.1.1" + self.version = "2.1.2" # 获取api操作 self.v2rayL = V2rayL()