From 0f3af04cf851e6a9453617e38d4671aae17b7e56 Mon Sep 17 00:00:00 2001 From: Jrohy Date: Thu, 19 Sep 2019 22:58:23 +0800 Subject: [PATCH] fix tls setting --- v2ray_util/__init__.py | 2 +- v2ray_util/config_modify/cdn.py | 4 ++-- v2ray_util/config_modify/tls.py | 13 +++++++------ .../locale_i18n/zh_CH/LC_MESSAGES/lang.mo | Bin 13411 -> 13361 bytes .../locale_i18n/zh_CH/LC_MESSAGES/lang.po | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/v2ray_util/__init__.py b/v2ray_util/__init__.py index 00a2b9c2..5c8d0b6b 100644 --- a/v2ray_util/__init__.py +++ b/v2ray_util/__init__.py @@ -1,3 +1,3 @@ -__version__ = '3.5.0' +__version__ = '3.5.2' from .util_core.trans import _ \ No newline at end of file diff --git a/v2ray_util/config_modify/cdn.py b/v2ray_util/config_modify/cdn.py index 631a6877..43fb26f3 100644 --- a/v2ray_util/config_modify/cdn.py +++ b/v2ray_util/config_modify/cdn.py @@ -35,7 +35,7 @@ def openHttps(self): TLSModifier(self.group_tag, self.group_index, self.domain).turn_on() def modify(): - gs = GroupSelector("run cdn mode") + gs = GroupSelector(_("run cdn mode")) group = gs.group if group == None: @@ -65,7 +65,7 @@ def modify(): if input_ip != local_ip: print(_("domain can't analysis to local ip!!!")) - print(_("if cdn is cloudclare, must open dns only mode!")) + print(_("must be close cdn proxy!")) print("") return diff --git a/v2ray_util/config_modify/tls.py b/v2ray_util/config_modify/tls.py index b80d590a..bb772aed 100644 --- a/v2ray_util/config_modify/tls.py +++ b/v2ray_util/config_modify/tls.py @@ -18,11 +18,12 @@ def turn_on(self): print(_("2. Customize certificate(prepare certificate file paths)")) print("") choice=input(_("please select: ")) + input_domain = self.domain if choice == "1": - if not self.domain: + if not input_domain: local_ip = get_ip() print(_("local vps ip address: ") + local_ip + "\n") - input_domain=input(_("please input your vps domain: ")) + input_domain = input(_("please input your vps domain: ")) try: input_ip = socket.gethostbyname(input_domain) except Exception: @@ -48,12 +49,12 @@ def turn_on(self): if not os.path.exists(crt_file) or not os.path.exists(key_file): print(_("certificate cert or key not exist!")) return - if not self.domain: - domain = input(_("please input the certificate cert file domain: ")) - if not domain: + if not input_domain: + input_domain = input(_("please input the certificate cert file domain: ")) + if not input_domain: print(_("domain is null!")) return - self.writer.write_tls(True, crt_file=crt_file, key_file=key_file, domain=domain) + self.writer.write_tls(True, crt_file=crt_file, key_file=key_file, domain=input_domain) else: print(_("input error!")) diff --git a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo index 5198e8214a7a770e02a8fde602064319886d4cd7..0c03dd560ad899d9851a1102c76c6d7316dd2d28 100644 GIT binary patch delta 2957 zcmXZce@xd!9LMoD5&22hFKBnNNGt;)Bf-WrW+wDD#9Op%fi4l z#JMaTR)n@JCG~5$hFOZz)@-#Hvt*^Bq*kuEjGBq{eDS@F@wmIs-M#PLclW)t^3clW zGGD%#rFhI@Z~;c+N=(3NjKpTV7h7;R9>x?rjT+aFiTD?$V@yQ{=HSni`RhQeE}p#wF+RSdx(@}~h|n1m^qiqo9WV=(nPB&KabEoeJ3g|)bP zJFe{$P)AaY3cM9{srDiF z(oUo1=|%;-gv!VOYMvkl>xiQ;ocNZe0%oIjmX8WN7q#+bs0CG^CaT5zupYhGhPuS3 zP)GSY-i5J5A*PK)FHXc_EJ0;%C;A?saD;-M%g?CPhp{bn$i>lE;_4Mh7i+*p*oqoA zhzgX(AZ=hes^2`+L^wqp{y3Y_(n4M*O`1ugHn4E!|)r_%6o7D{)0;G z(`-ZiH#j$;7T)CQ2T(`$87gom76h4nhZCtsaig`7hfxcC(nmo%T8P?dC2C+JYNb2e z_d_^~dKc;$MSBAiq@c!Sp~lTdje8a~?`mf~D&Q_x--kob__+IU*?sua)x*iZQW%dc z-o~LOEJU640@Ok(kyEgj-1ipLdq3ptMBR}dRKGi@@kyk&Nbi3Vg=!kAap;Ev*HI7R z(NnYyNJra=y1nO7{W3U@0xZC(Sc7@!NBzM3idy&`DD`;Ws$SV>^bp^Q zDJbxKHDEdNgl(g1Z${nTJ*b5oMg2bXqK@bWYW#nwz;Wbz8s^}mSb>_i9o4S`v+!H= z4V?)EnZ%EQQkI9>*)y1p6-XD`jY@GBD)1oYV`N5P{1eC~Z82(|*HE{9FS0i4cK(Zx zQy)8l{OiLD1d!f<>ab;ciK1fD_+PflyLxTq#+p=rar{Fep0(>&4YgHNmM!0n|u2(O2v|VZ5oa)b+cre6s^^=3N{_;U<|FNz9i#eNu{s(W%Mce=Y delta 3007 zcmYM!eN5F=9LMo5B7}kpWN4uByC{Zn#Z<&6g4Ch;xTU60b51}MQ&5mt*7_Nh=~iZB z4>t3mmO4$buFkDVOGDJkQWu-q<`#DGX-r$r`op!}AMR;wclUM9`JIRF`JVIpeX;!N z@-5|lZ!=3zFdK(C*aw%P+Uv1DZoqili4WlcOvV$Kjz6Qu-NlEodoQyr9E6%@8mj*S zOvFmpzOI+~mO{fO8u-~R_u!DT88zV#sD(RF3*E;an855gn1UV_VH#H86l_2R(ux{? z8|PpQlc?YPKE7E#h1E1Xf(NlLwqYLL#6k=Z_E=nk%E&g<&c8%Wd=caDI`+dqQ2lx& zMcOlvpJnqm1RqEBEA=S^DXhZ`-0SM!p(gkXV=$5YX+R35Vh#pyy7M`Vrv4VPw!MQ2 z=o4fLJK*ZgND{2owfk+Z;TkHkd#D|yJs6p2B$5Q1?3|0))JriFH=_bPg38=i&Y!R+ z_1{qo-bMxT4=TV!I#cv5Kw&TqV=xCxoEwq*WXDhowxCje2h~53C{@oznruEQGnJ@2 z^BU?7>_7$Dj=F1c{ORtbV>0X8FbcZe`KU;rbS^~gyaE--^T-_bDysiB_xv-|(HuoB zd=7QFt|9l-qIsx!l91$D0F{|sjAwl-q@c5!>70++(IV7>HK>R;q5^3|O|TOO;(qk- z4C)f!KpkZg7pObtA+gv*^l&cDz*_W`vacx&!(ULZOElY1%7duq#W)CSUA+HK^44$Wqpb9v&P({&ki=(x8-H#s@HrintStF_Ey9 z(n?hS&CZWd0q=43Q>df5fI6yQF+Ym$0uHC1$&J+p=Ai;C^C@U2HK-lFff~3Q73m@O z{48p~6`Y2hsMlzW7ipi08vitEd^KwPOQ`ujaDI-O=Y*^K=PBs*2%{dvlWz@3Mb$^3 zQdod&!e+VWD^O?cqXKy!IR)G6o_~va-!D0DqVC9jRKHBp%Xr@=Q7EFJ80&EdYG4X4 z`C80En(Sj#zi&{tHjdL!~G+fLVh40VgYN0MMyP~V4c=ulibv*W@J`lCzEYu~O7Hm*Zu;0$WM4kQWoCu#$Oxw$&Z0!+|tnch_(vUf}3TYHbpsi~{-%F3&}Rn_H7 zLxU2A#|^LOs#n%}Wh<-e%F9+RsaYEIR@K$6^{Q7dt@6sNYQ5^Jl`nLS2!y8hZRr*o z+AlXIv~0lQXePXV^f2>v?Aska{&wh8dQ{Kc@ScW_9osuTZ2EsfEfMs>8@JuqzCL_> deRxaLf73<=212KXB}a$u2Ag6+hey2<^)Ii&Q)U1F diff --git a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po index c4381613..c8338369 100644 --- a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po +++ b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po @@ -579,8 +579,8 @@ msgstr "V2ray MTProto/Shadowsocks协议不支持配置https!!!" ### tls.py end ### ### cdn.py start ### -msgid "1.run cdn mode" -msgstr "1.走cdn模式" +msgid "run cdn mode" +msgstr "走cdn模式" msgid "1.80 port + ws" msgstr "1.80端口 + ws" @@ -597,8 +597,8 @@ msgstr "请输入走cdn的域名: " msgid "domain is empty!" msgstr "域名为空!" -msgid "if cdn is cloudclare, must open dns only mode!" -msgstr "如果是cloudclare cdn, 则需开启dns only模式!" +msgid "must be close cdn proxy!" +msgstr "必须先关闭cdn的代理!" ### update_timer.py start ###