From 3523f8d6c827178424ed99533bfcaab24becd826 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 26 May 2024 13:52:07 +0800
Subject: [PATCH] update

---
 class/core/config_api.py                    |  35 ++++++++++++++++----
 route/static/img/phpmyadmin.png             | Bin 2046 -> 0 bytes
 route/static/img/pure-ftpd.png              | Bin 1283 -> 0 bytes
 route/static/img/pureftpd.png               | Bin 1283 -> 0 bytes
 route/static/img/soft_ico/ico-apache.png    | Bin 1367 -> 0 bytes
 route/static/img/soft_ico/ico-pure-ftpd.png | Bin 1256 -> 0 bytes
 route/static/img/soft_ico/ico-pureftpd.png  | Bin 1682 -> 0 bytes
 route/static/img/soft_ico/ico-yunsuo.png    | Bin 1799 -> 0 bytes
 route/templates/default/config.html         |   2 +-
 setting.py                                  |  13 +++++---
 10 files changed, 37 insertions(+), 13 deletions(-)
 delete mode 100755 route/static/img/phpmyadmin.png
 delete mode 100755 route/static/img/pure-ftpd.png
 delete mode 100755 route/static/img/pureftpd.png
 delete mode 100755 route/static/img/soft_ico/ico-apache.png
 delete mode 100755 route/static/img/soft_ico/ico-pure-ftpd.png
 delete mode 100755 route/static/img/soft_ico/ico-pureftpd.png
 delete mode 100755 route/static/img/soft_ico/ico-yunsuo.png

diff --git a/class/core/config_api.py b/class/core/config_api.py
index 13a88c001..625aa85fd 100755
--- a/class/core/config_api.py
+++ b/class/core/config_api.py
@@ -42,7 +42,7 @@ class config_api:
         'bind_domain' : 'data/bind_domain.pl',                  # 面板域名绑定
         'unauth_status' : 'data/unauthorized_status.pl',        # URL路径未成功显示状态
         'auth_secret': 'data/auth_secret.pl',                   # 二次验证密钥
-        'ssl':'data/ssl.pl',                                    # ssl设置
+        'ssl':'ssl/choose.pl',                                    # ssl设置
         'hook_database' : 'data/hook_database.json',            # 数据库钩子
         'hook_menu' : 'data/hook_menu.json',                    # 菜单钩子
         'hook_global_static' : 'data/hook_global_static.json',  # 静态文件钩子
@@ -363,17 +363,18 @@ class config_api:
 
     def getPanelSslData(self):
         cert = {}
-        keyPath = 'ssl/private.pem'
-        certPath = 'ssl/cert.pem'
+        keyPath = 'ssl/local/private.pem'
+        certPath = 'ssl/local/cert.pem'
+
         if not os.path.exists(certPath):
             # 不再自动生成证书
-            # mw.createSSL()
+            mw.createLocalSSL()
             cert['privateKey'] = ''
             cert['is_https'] = ''
             cert['certPem'] = ''
-            cert['rep'] = os.path.exists('ssl/input.pl')
-            cert['info'] = {'endtime': 0, 'subject': '无',
-                            'notAfter': '无', 'notBefore': '无', 'issuer': '无'}
+            cert['rep'] = os.path.exists('ssl/local/input.pl')
+            cert['info'] = mw.getCertName(certPath)
+            # cert['info'] = {'endtime': 0, 'subject': '无','notAfter': '无', 'notBefore': '无', 'issuer': '无'}
             return cert
 
         panel_ssl = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
@@ -390,6 +391,26 @@ class config_api:
         cert['info'] = mw.getCertName(certPath)
         return cert
 
+    # 面板本地SSL设置
+    def setPanelLocalSslApi(self):
+        cert = {}
+        keyPath = 'ssl/local/private.pem'
+        certPath = 'ssl/local/cert.pem'
+
+        if not os.path.exists(certPath):
+            mw.createLocalSSL()
+
+        choose_file = self.__file['ssl']
+        mw.writeFile(choose_file, 'local')
+        return mw.returnJson(True, '设置成功')
+
+    # 关闭SSL
+    def closePanelSslApi(self):
+        choose_file = self.__file['ssl']
+        if os.path.exists(choose_file):
+            os.remove(choose_file)
+        return mw.returnJson(True, '关闭SSL成功')
+
     # 保存面板证书
     def savePanelSslApi(self):
         keyPath = 'ssl/private.pem'
diff --git a/route/static/img/phpmyadmin.png b/route/static/img/phpmyadmin.png
deleted file mode 100755
index 56fbf2c9b8de872b83edf90a221b9335bf958daf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2046
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

diff --git a/route/static/img/pure-ftpd.png b/route/static/img/pure-ftpd.png
deleted file mode 100755
index 8ac61bb453231da73799c7fa0b0d81dc92ed85d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1283
zcmV+e1^oJnP)<h;3K|Lk000e1NJLTq002Dz002A)1^@s6)jqOJ000EaNkl<ZcmeI0
z1F&m76ovci*|u%lwr$%UJ=++q-+H!f+qP{hd1p;0o!)z^w0+K**+sO^7woLWCZ+uD
z%s>ax477nZ&<5H-8)yS<pbfNvHqZvzK;wHc18tzc6?^#-^4L*`$B$h@A3l5-Lxv2&
zv}x1A*pw+#FmBv9+`W4jEW2>wLW~+UO67a3GkyAWyng)}?tDy|Gzol`FJF$!moEno
z`0ZQBsnZ~P_kp-^-8D2Ho6Uw;v0~wuUw+~5Fn03fNxZcht5Bf=|2xX@J4TEctcwT{
zB7~@uBS#KAefkukeS`}a&QXSSQl(0TN|h>M!GZ<Bfd(Mz)`vKK#{Kl3J9jSP#fygm
z1qz^AwQ6Y5q6Hc?YJ>(28qiRqMh#rQZtpRUGGCDSO`A4ldF0NWn}AGb8uM5O0|pFm
zj5K}3i4%uDnCI|OqC^QKOO}jzYzIe=9t{lG>Nt@<Kc_bTdxnk@B?<}^D#YKM%D8&<
zs>3+-ILa)`JpO0;?c29G-3iQ>#-D%w$uw1mzm-GfgU}&-?Ax~wJ$v><#*7&W&t>61
zu+^T-n-B8ufBD}#bfid;2#u{<w`w`!OA|V3)TmgpWQp5y$_Jr$?AQ?^j~!H|Oc_F>
zUAuPdVE@)}$BvNIs;M;JM|%DG^;*t0Zrn&{u4~MmJ=<M5<|$~GKDu=2LTD~0Jbd_2
zAA0Rth=d6tj~~~EUTam>akhE$W?!J`!y|P6{{0D!I(6!BS?F(1rAk58s?Gmj6f}Lf
zh3?g>7oox6_E_z$KAM<42O?T@$O{+sp^FqLLWoa3(wxrq>eWM%BuUVzQzyMqw(1JY
zziib~OOf$qoufB<+BtG_yJBz&8Z_g8N@u%#vSi7ElqpkU;>3x1(Em?|j2{n@;zk#m
zTTZ@w`B1D_F_bG;j?t9H(Pwbs785Wu%g_fS^zh-sF=)^r?$@l(EsJ|LMUdWF&XkE!
zoB#cTrZ~u&H7nTbH2$VqDpjf!gG)fr&K=7(6C_AL<2t4<0#lA^D=!&6I^@26{z3Dl
zIrSJt|N84MsD~Q)zyJQj^XJb4hNc81G}kY;D2_PSFa-&hl24#_?ttr<CXyzBs8rca
zS&cxZgoAerd`)W^*X;5Yko^Zh4zSExa>CN>LPJbxh?6e>dW8jR%?dem806~JkRwJw
z+H8<jmHPVfq4j(akiui>Qb(Hj_g}mZ7anrk_HPiHQ#p0okb&yiGl&!^Aj_0t^!~=6
zhYg1e9|3ar?vUzh)M)$ER?6|4fu<@XSpNZGf|-aKmD8Q4sxKZ|sXnjJoU)v{@8iek
zwiE(b7B9}uP@^9>G|$7_viyLisNo*WcHEY8?pQ`|Z=*~=mBt_@h7Dmlr?(O&fdw*(
z5#Co(`|7HqRjXF<s)_Y^bK<U?@<9dW(TA8bk8s?Bd62Nf&z}#uXpvogS!zxcF9Au7
ze)FdP(7Y|7O5*YE;K74h4e^$f>Wcc@{Ru6E57u$t=Jo5K@Q@kObL|q?KIN&{YSx0x
zotsBVM)AO=H%~gewS4j7h3-`i%TuDVzT3LGJ_sc4--EQuJE!vwo9o<M_Ul7`UuK|#
tX$IOr8)yS<pbfNvHqZvzKpSWS{Q;5QZra0zT}l7|002ovPDHLkV1l{>eWCyW

diff --git a/route/static/img/pureftpd.png b/route/static/img/pureftpd.png
deleted file mode 100755
index 8ac61bb453231da73799c7fa0b0d81dc92ed85d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1283
zcmV+e1^oJnP)<h;3K|Lk000e1NJLTq002Dz002A)1^@s6)jqOJ000EaNkl<ZcmeI0
z1F&m76ovci*|u%lwr$%UJ=++q-+H!f+qP{hd1p;0o!)z^w0+K**+sO^7woLWCZ+uD
z%s>ax477nZ&<5H-8)yS<pbfNvHqZvzK;wHc18tzc6?^#-^4L*`$B$h@A3l5-Lxv2&
zv}x1A*pw+#FmBv9+`W4jEW2>wLW~+UO67a3GkyAWyng)}?tDy|Gzol`FJF$!moEno
z`0ZQBsnZ~P_kp-^-8D2Ho6Uw;v0~wuUw+~5Fn03fNxZcht5Bf=|2xX@J4TEctcwT{
zB7~@uBS#KAefkukeS`}a&QXSSQl(0TN|h>M!GZ<Bfd(Mz)`vKK#{Kl3J9jSP#fygm
z1qz^AwQ6Y5q6Hc?YJ>(28qiRqMh#rQZtpRUGGCDSO`A4ldF0NWn}AGb8uM5O0|pFm
zj5K}3i4%uDnCI|OqC^QKOO}jzYzIe=9t{lG>Nt@<Kc_bTdxnk@B?<}^D#YKM%D8&<
zs>3+-ILa)`JpO0;?c29G-3iQ>#-D%w$uw1mzm-GfgU}&-?Ax~wJ$v><#*7&W&t>61
zu+^T-n-B8ufBD}#bfid;2#u{<w`w`!OA|V3)TmgpWQp5y$_Jr$?AQ?^j~!H|Oc_F>
zUAuPdVE@)}$BvNIs;M;JM|%DG^;*t0Zrn&{u4~MmJ=<M5<|$~GKDu=2LTD~0Jbd_2
zAA0Rth=d6tj~~~EUTam>akhE$W?!J`!y|P6{{0D!I(6!BS?F(1rAk58s?Gmj6f}Lf
zh3?g>7oox6_E_z$KAM<42O?T@$O{+sp^FqLLWoa3(wxrq>eWM%BuUVzQzyMqw(1JY
zziib~OOf$qoufB<+BtG_yJBz&8Z_g8N@u%#vSi7ElqpkU;>3x1(Em?|j2{n@;zk#m
zTTZ@w`B1D_F_bG;j?t9H(Pwbs785Wu%g_fS^zh-sF=)^r?$@l(EsJ|LMUdWF&XkE!
zoB#cTrZ~u&H7nTbH2$VqDpjf!gG)fr&K=7(6C_AL<2t4<0#lA^D=!&6I^@26{z3Dl
zIrSJt|N84MsD~Q)zyJQj^XJb4hNc81G}kY;D2_PSFa-&hl24#_?ttr<CXyzBs8rca
zS&cxZgoAerd`)W^*X;5Yko^Zh4zSExa>CN>LPJbxh?6e>dW8jR%?dem806~JkRwJw
z+H8<jmHPVfq4j(akiui>Qb(Hj_g}mZ7anrk_HPiHQ#p0okb&yiGl&!^Aj_0t^!~=6
zhYg1e9|3ar?vUzh)M)$ER?6|4fu<@XSpNZGf|-aKmD8Q4sxKZ|sXnjJoU)v{@8iek
zwiE(b7B9}uP@^9>G|$7_viyLisNo*WcHEY8?pQ`|Z=*~=mBt_@h7Dmlr?(O&fdw*(
z5#Co(`|7HqRjXF<s)_Y^bK<U?@<9dW(TA8bk8s?Bd62Nf&z}#uXpvogS!zxcF9Au7
ze)FdP(7Y|7O5*YE;K74h4e^$f>Wcc@{Ru6E57u$t=Jo5K@Q@kObL|q?KIN&{YSx0x
zotsBVM)AO=H%~gewS4j7h3-`i%TuDVzT3LGJ_sc4--EQuJE!vwo9o<M_Ul7`UuK|#
tX$IOr8)yS<pbfNvHqZvzKpSWS{Q;5QZra0zT}l7|002ovPDHLkV1l{>eWCyW

diff --git a/route/static/img/soft_ico/ico-apache.png b/route/static/img/soft_ico/ico-apache.png
deleted file mode 100755
index 3772caf0a4882a9ef2e6d9ebc03583d7e23dce04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1367
zcmV-d1*rOoP)<h;3K|Lk000e1NJLTq001Qb001Zm1^@s6c>pur000FZNkl<Zcmd6r
z1C-@v7>2VpQX6Y4Ya_F^Z64KKZ{6P7xV5piZ4B4SSa*=M@%DTFbDJ}&n@n@gbApTi
znfLqdpFg7k_}`HqgX%YKT$qZhwqN#UzDrT$+LcKAboz3fwf8{IJ(sE==;X@Pq=`sh
zI`>?{+eke66w;DDhsX`^x_p!g6|4(MEA2BUU&GOD{S+c*Q_}06nkc<uU5MF%^SeL8
z<*gI2?X#NLw!AroSh7&B8{N-dNm(-$rxx~6ESz2i5npw~g|OKy**XA*S5gz1K=SGj
z?4<X*iCSA6d4C{2=v_+*F|D&F=dJT}O1KnvFf{42r;#$Ny%LJ{^;SX@yZH4`oQ?Vx
z06dX0gsB<Z)`rGU?}Lodjeu8%AZ$!mykJyRViaOu1vk?RsdXuf)*xYcXDFekdpSas
zy#B>FFuiN32P{X(Whr0!*IyvEeREvzQ6Cu59eewkN+{{EzQCNGN=#A&fVp1WW+qZ7
zxmgFGWoz8%*ToTHYD_G4N+YCv`x<0wppfpW)TK+8d~tJLS3;*-H&jxgZQ5bR9d}TO
zf~u6!uRO;2$aaKWlRA50V&bDSkyO1cu2gM`n>CtaZ-eF(qNEZE^k|68K?8B=K$J5d
zxg})?zPM4-5LebvLN{(}N;wKqjESk_*kc#gZ-$eQi&DPWIq$>LD&h2<tpLs7UI{I!
zT3;nb0&>h=12EO?^;Ctxb6;8%vTv!aWUdr#h&knM$AU7IRbuBJG}LQSS~j-N?M0rR
z^x4w6N6R;(h~j3k=J>E=HA<;tVvF$60aI`(C9uxzm8X6oI^GJeD!-;ehT=?trr4s@
zRYG?0wv<#taV-Z@$l_Gtw$#+{Q8U;_j?l@XEik;~-Pl*Qfs<T(g^ox*9Bs4AZm-ex
zLvQ^U%E2j;s5L=Kv37X8)ZOeOmP|D}%gWmf0H5m*4pO$MtE&#eA+0{8D8xRZ6w9Vk
zqv-yruTjYF#na5xL(~2CHmxNhinLQgONzE**(gXMB^wzs37ky5c*N3WATT9L9V`%n
zh+;h`q>^GvOepg9PO$eK4)yH0Z^P{O*D;w*g?lKWNhPW(DXUN$qJDicO{hNdO3K{w
z!uQs^qJxzb<vJC;4d0h-rBY*h8~V<0mLi@=SzDs!&TaWPC`Cq>tge!xAca=k+lysW
zLS9Mfl2YjFnyG}iZ&2)Bl@iPNi`E7*O@Q-}mr|zn(;oQm7=^EktCTRPTuY`zA(qW{
zW^51O!c9LNlMyOl&!Y=5wNQvkiGn|9UBHq$_cgDi;`SXk1xtDgQbLtbNYVQENb8}5
zE+5X!@oV$2rv(4159ZpHv^&weV2i9m>+<#gQ>NM8Y}Tw9_N?3qmNPRY$;x9DssFY=
zcm9-q@xmG1O)0%nwTg4!dh0E4lU~Cv>#!MIpX-^KsRPo|ll_8~lA1V|d%0!@2^IY0
z)Tzw5!bA}^McDi&;#r?mOi2pccWiT{_=qHFg$lNaAUQQw!DAv~OcNrL4Ux)<En-#>
zA4LV@FG<~f&)pTIbo>G(CFwvuOo^O0LgY_`!0*cfzmxEf4i%;fhM?yuC7Us7^e6<k
zJcTHeHKn}7@)pWdDl4|&r(iCrU_Wsnn_ns)X1_QRIfN*|y+!0$A)m`e-cpLJLRN6U
zPN?8WN$K=&zx~d~-jYEWrxC=@m}LM%FlAtq`ydA2OXRwPoI88=k6`A6;}A*&ds-(v
Z{uS5M8K&%j*+>8Y002ovPDHLkV1k&UpaB2?

diff --git a/route/static/img/soft_ico/ico-pure-ftpd.png b/route/static/img/soft_ico/ico-pure-ftpd.png
deleted file mode 100755
index 8ec5eb803bc3d1ccc8839c09b5365453e2a1fdd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1256
zcmV<E1Q+{>P)<h;3K|Lk000e1NJLTq002Ay001Zm1^@s6qPv;@000E9Nkl<ZcmeI1
z1F$1a5XbZBY}>YN+qP|&&NfQ@S!dg}ZQHhXZh!S^Q~N3pndF@}RUOPsZ|`r^|DCv$
zQs0$1zz(nj{MDHQEZ>tkzz*=&XfI!iI(Afy$B#XM4<9}(Lxv2IY15{8*pw+#WZbxM
za`*0Cq4C0n3uV-(QMNY0`%IrcU0%O_jh_S+W74Ea!fW~R<#PG*<*<W&`&QJ{X`*`f
z5#z>nPhf(&TrP<fE0+B7%P)NQu#+cG%3Je76)IHVH|^Y?F=E8PS0Y4+5XdJ-jvVsz
z=~IG;Jw~{2;oNQTNtG&<RH{@-7A#m0Hozic)U7YZ=`%r3>A7>~O1yaSq(FfJQmtAw
zY0;vEG-}jH8Z>BtNsSsc<ofl1o?>*lIqI7>ZAyE|ojW&hlv73>J~Cjy0QU$JBTk$+
z#GuX{qeO`kk}O#=>bQ;^J$lqXShLfN{P~&A{0<&CN|Y#4s8Au{JJa{-)vIn}x-q&m
zrjFl~-@bjDDGn?*EPwv_CuNoo-`zp17y#R2?Ay0bdiLxo88c=CoTcD9ta&|^H=n4#
z|K)ecz>y+F0$8?g-KrIY8wNOP)Tpv#$&z5(Sup_Kv13P|Iy$FJnKA%NyLRoY&edPH
z9XpDuR?RB&ZiLsbU#}Ht<Hn5uvyNr<?AgJ#qs{^jDn^$sT>xeY$-{>a^?}!}6(eCn
zQOA$#0k1V3bpmbPyxA*YVuS?Tzkh##rB0nXECu}(RH~GyTDAH8<p2{SIN)BrdI8Kv
zCXcP$>7^O7=ZFz4x~K~m^?-{MDFVPJA7Q3&y?XT|Ns=VesZ%Gd_{#J(%=oHROYfBy
zH)`9Z>0$d0O-f=T2{T~Uy;aV2d1c9xMN+0rDHA77)C2y1x~TZ^L?K*sfJrO)^5v6a
z#fnL}a^=`HF-Dz@gf!weFl~szPCR`0a2Ygc5cwE?(h@ltfupx}Gi73T=C?jDi9c)B
ztn@a<cT|v+DpiV&#4libr*h2%2@+teTVer=#MD+)D!RFL_wCaM=7yPW?3RE1^_N&L
zH1B`^{U^_#Klc|HSqU)fl{Caivt|(+EFbS~_|6^HEha|NBw|#mY_Hefv=9Y4&i<`o
z4P%WiUm>dh08s->GnbiR>TttTC}|6iFAsQy32M#;HFTJ$)vHB~7$M5#5>>St^<O-&
zUJT$66-$@8%Zz{jmG|Moi`usR8v|zgrcN7pQ+oDHj1(zEl_|q6{S5&R8!jq*1W~(p
z2Ub<1Mh8r1OA&q(z^FZ-`Va8fxQwV#nc_Shec8a4nhOn>Y07kcA3r{+C-5#^yf__U
zjk;gJJkOGrd;&(WkYl+{aP91!$}Sz+=mKYzv0)j*hEUFwwnT^Tn-)TY^Ch&buG(3(
zY8A&r_;cbBY&$Ck$||H7#+-S81>{&B3ILx!U(}*S0jkPWX-4r9qR`woZ~6wzDF^C@
zN3??n4{AAc8i{H`Z-?}xWsiYRu-CkP9Z?}FLweR~04&oSC04VRsNA`E9AvlleM<Ah
z!s+6R7cX>=S7?vy#6Lt|tr(=9`}ahd?d|29F<a|e)0}@EzAJNp9bgCe>$VSyugVfF
S{qZ*d0000<MNUMnLSTYZAXk_G

diff --git a/route/static/img/soft_ico/ico-pureftpd.png b/route/static/img/soft_ico/ico-pureftpd.png
deleted file mode 100755
index 93a29253b0b1f921a77eb10f9de9d9167fe36c36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1682
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

diff --git a/route/static/img/soft_ico/ico-yunsuo.png b/route/static/img/soft_ico/ico-yunsuo.png
deleted file mode 100755
index fdd86754a1e76ea11f0fe8df144bc3be9e5e6aa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1799
zcmV+i2l)7jP)<h;3K|Lk000e1NJLTq001%o001Zm0{{R3i>z6G00072P)t-s|NsA<
z<J~{j#39qWA<nxh&A3t3#Ifn+I@Q4;&b1)MwHU>;OVh*}%e4{2vM<lPKhM9u?B}fC
z+#$uS7{skO(7mSY;{W;o@9yr7+|{$~=J@~r-R9+`-q=XazgpSM*7)=P|Ns8?`0eWL
z=H}+a-`-`>#`W*=%+}T3-rc|9;4jLz5W}ry+|I)A>z(A@!{g!0;NGjv%J=s6aI~z-
z(bL%6+|}dZ(Dm_JtfOPKt#i%B?D+TX;p9ojy=S7Fb*G{byrzQJ%>VE4S<l0U+|?Po
zrYg9o_UY>&x1$iTo$%%6*XHG{zP-cr@AvlowB+CR^7FR0x5mfFoZ8ka#k9Z9%bmBh
zDxs5-q@cgOzlEBZMxBv`tEY;<xFfu+O0uL(wyRpix#;5Ly~o8=w5mL>qGHIuL(I4s
zzOC;6{<GfK3BRWhy{(br+Cjv)W~-!(x3!bLy06B?da$Z~tEX9{oweZIiq6Sv!MQT6
zn@pygK(C{9yS04Cz;)Qn-uU)Zsi2a#v$NLJ%*@Q@*V!w-uAtA#JHxdpuAGCuxRbE1
z#kjbNrK6(8#qrzTJF}%YqLdG-mJp+o4z{D{`}i}&wF<18cHYyp#l^P0z0mIP8kvrI
zp_{hO$}W$Dp{J=rxvU4dtA5bNqtD8S?cY<xwpEvvc$}E3x3`S7uXK}=RE>+Z)zBNZ
zsB)j1Hjs&Ho0awE=n1!_r}FIN@$cEz*lM}5me$RMsHSb&&Y!`(8LOM<+uRqUm28}v
zz2)Q8?(qzzm=T_gRL8poww?jDqnmx66#xJL0d!JMQvg8b*k%9#1Yk)-K~#7Fe9u!B
zz(5Q@(Hco@Tl?Q&ZM`$Ucaji$Bt_FS^AXGO#3Moc3J}Inx(ikoUy{cMYl?cCaT6eO
zk~|R^SAmGyS&-r_6m(-6410*CMgANj+m7q`tO7@-X<Fwo%#CnC=z39{0N^1^3%*I3
z<#|z7Ro$F~Wm$M4^s$o6vTV?LBPqL~j(Tv9TnobhevQo5sd?t4$WCgzDYE0*cGH>E
zw(VwZ+qU=bx?i#vgWfkYkAKg5@FnzNLgg;)LKY08IG}}aa0-uzbdQRTiA5O4#V5Fh
zB!>J-%HV&9Ltqj@Nvh<O)HH<CGcvQ->>PYJ7la&p0>T$T^0*@&urRf^MjMi-!#Vm~
z=6mdk!!JPz2FVzWzP|ae{Q_4%b)i>LaY-q2a0^^?S$Rcem8YcS6H}`(Ra9M5TUQS|
zf$i9n@W6&fMH3zS4}sw3mR7E<t-XU}c%HW+zc@H34kdLaMFi&RLSvQx5Spgrn?g*%
zex_10&kL3WgagrqAQ9a?y>)&4lthZl2L=a*8iz5)RH|99BMNsHByYWBWVB%{&JU>#
z;}sJrlOw|v2(`apPaF>g6~>1tCDoY}u9@;oXke$K^spU@ZfQv$b`t~}LO2G@H22TW
zB_ISp7q^VqdEQO0)D=_ILhVrbVsO0x`?n+n;jpx<q*hjA5Q-^ZSmOefQKjtq#%5nA
z-db%8+wNtd#fA`yova@I*9e5t)^_()5uP}k+~18$#A*|v8Oj{vA-04dwW7PK0QPd!
z#Ro>s%g<Ees>hUW{#d>CI8^XfEq_9ZqjRJ&=-3pHf36Z^EM4YghO28yhWUVnk-r5g
z3s0<`l<zTCsl?56Ga%imu~fR*uU*=`Rf_^@R!%3B2M3%vdoC=jIIIwb(x-}wTMTE<
zch6s_O1OAQ5Llaq5e{6P?(!AitJkjIxLJ0tWueM&tL4J&I}OwNyOYJ`_XM7^CGh60
z4(+%iIi3CYADn+!?pGKatIT;c-+H}*V>ynqBBUD-=JBzfEO{@GCy`GJrBO~d+|Rry
zKIT}66_Gz6%x|ZorrNR+WYYW$OX68=&GVS~ZWdas2>}&Au02J_=i2zmP*fOy>gGur
z)2D_eUif*1U6crCO-L!slAaDjGu|l!b8|6I6Utw{%t{^|#tX%Ff!OXv!7wB|uk<~w
z6hfy>cZ1VBy%Nv8-ZJSi9XH#b%CU9}V<2W#MBhDeK;AyY%gYNx)P_~<z}*#5BJ~#J
z5bT6B=Otd`nK$ci0V#9TZx`RD>vW4nyCOSw?lLEGoS0!jewRv!h(3-Ngm>3#AzAm|
zzrTO><=KZ1j<c+|HeV0N{P@EU7I8L{mwx-$Bn^@y`)Pmw)2HLd_db38{CSU+j;b;E
zi^zSoEP<3>`gS6!TYwgx5#-1l=H!Pxa`&?Mb>#<}sLWli$AHN1g(SG|MEZ;OmS22>
p4%__bQc_CF;q6jC68zsj{sJkoVZ1X*aVY=*002ovPDHLkV1l0I&c*-$

diff --git a/route/templates/default/config.html b/route/templates/default/config.html
index 900251c67..655630e3c 100755
--- a/route/templates/default/config.html
+++ b/route/templates/default/config.html
@@ -54,7 +54,7 @@
 
 					<p class="mtb15">
 						<span class="set-tit text-right">面板端口</span>
-						<input data-port="{{data['port']}}" id="banport" name="port" class="inputtxt bt-input-text" type="numner" value="{{data['port']}}" maxlength="5">
+						<input data-port="{{data['port']}}" id="banport" name="port" class="inputtxt bt-input-text" type="number" value="{{data['port']}}" maxlength="5">
 						<button type="button" class="btn btn-success btn-sm ml5 btn_port" disabled>保存</button>
 						<span class="set-info c7">建议端口范围7200 - 65535</span>
 					</p>
diff --git a/setting.py b/setting.py
index cf91aeb78..07e0e3e62 100755
--- a/setting.py
+++ b/setting.py
@@ -59,11 +59,14 @@ if os.path.exists('data/ipv6.pl'):
 else:
     bind.append('0.0.0.0:%s' % mw_port)
 
-# if os.path.exists('data/ssl.pl'):
-#     certfile = 'ssl/certificate.pem'
-#     keyfile  = 'ssl/privateKey.pem'
-#     ciphers = 'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'
-#     ssl_version = 2
+ssl_choose_file = 'ssl/choose.pl'
+if os.path.exists(ssl_choose_file):
+    ssl_choose = mw.readFile(ssl_choose_file).strip()
+    if mw.inArray(['local','nginx'],ssl_choose):
+        certfile = 'ssl/'+ssl_choose+'/cert.pem'
+        keyfile  = 'ssl/'+ssl_choose+'/private.pem'
+        ciphers = 'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'
+        ssl_version = 2
 
 # 初始安装时,自动生成安全路径
 if not os.path.exists('data/admin_path.pl'):