mirror of
https://github.com/kenzok8/openwrt-packages
synced 2025-01-09 04:37:38 +08:00
update 2022-07-05 08:50:49
This commit is contained in:
github-actions[bot]
parent
d7a357b398
commit
59056d1ba5
@ -1,7 +1,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=aliyundrive-webdav
|
||||
PKG_VERSION:=1.7.0
|
||||
PKG_VERSION:=1.7.1
|
||||
PKG_RELEASE:=$(AUTORELEASE)
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-aliyundrive-webdav
|
||||
PKG_VERSION:=1.7.0
|
||||
PKG_VERSION:=1.7.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
|
||||
|
||||
|
||||
@ -6,15 +6,18 @@ function index()
|
||||
end
|
||||
|
||||
local page
|
||||
page = entry({"admin", "services", "aliyundrive-webdav"}, alias("admin", "services", "aliyundrive-webdav", "client"), _("AliyunDrive WebDAV"), 10) -- 首页
|
||||
page = entry({ "admin", "services", "aliyundrive-webdav" }, alias("admin", "services", "aliyundrive-webdav", "client"),
|
||||
_("AliyunDrive WebDAV"), 10) -- 首页
|
||||
page.dependent = true
|
||||
page.acl_depends = { "luci-app-aliyundrive-webdav" }
|
||||
|
||||
entry({"admin", "services", "aliyundrive-webdav", "client"}, cbi("aliyundrive-webdav/client"), _("Settings"), 10).leaf = true -- 客户端配置
|
||||
entry({"admin", "services", "aliyundrive-webdav", "log"}, form("aliyundrive-webdav/log"), _("Log"), 30).leaf = true -- 日志页面
|
||||
entry({ "admin", "services", "aliyundrive-webdav", "client" }, cbi("aliyundrive-webdav/client"), _("Settings"), 10).leaf = true -- 客户端配置
|
||||
entry({ "admin", "services", "aliyundrive-webdav", "log" }, form("aliyundrive-webdav/log"), _("Log"), 30).leaf = true -- 日志页面
|
||||
|
||||
entry({"admin", "services", "aliyundrive-webdav", "status"}, call("action_status")).leaf = true -- 运行状态
|
||||
entry({"admin", "services", "aliyundrive-webdav", "logtail"}, call("action_logtail")).leaf = true -- 日志采集
|
||||
entry({ "admin", "services", "aliyundrive-webdav", "status" }, call("action_status")).leaf = true -- 运行状态
|
||||
entry({ "admin", "services", "aliyundrive-webdav", "logtail" }, call("action_logtail")).leaf = true -- 日志采集
|
||||
entry({ "admin", "services", "aliyundrive-webdav", "qrcode" }, call("action_generate_qrcode")).leaf = true -- 生成扫码登录二维码地址和参数
|
||||
entry({ "admin", "services", "aliyundrive-webdav", "query" }, call("action_query_qrcode")).leaf = true -- 查询扫码登录结果
|
||||
end
|
||||
|
||||
function action_status()
|
||||
@ -38,3 +41,19 @@ function action_logtail()
|
||||
luci.http.prepare_content("application/json")
|
||||
luci.http.write_json(e)
|
||||
end
|
||||
|
||||
function action_generate_qrcode()
|
||||
local output = luci.sys.exec("aliyundrive-webdav qr generate")
|
||||
luci.http.prepare_content("application/json")
|
||||
luci.http.write(output)
|
||||
end
|
||||
|
||||
function action_query_qrcode()
|
||||
local data = luci.http.formvalue()
|
||||
local t = data.t
|
||||
local ck = data.ck
|
||||
local output = {}
|
||||
output.refresh_token = luci.sys.exec("aliyundrive-webdav qr query --t " .. t .. " --ck " .. ck)
|
||||
luci.http.prepare_content("application/json")
|
||||
luci.http.write_json(output)
|
||||
end
|
||||
|
||||
@ -11,7 +11,11 @@ enable = e:option(Flag, "enable", translate("Enable"))
|
||||
enable.rmempty = false
|
||||
|
||||
refresh_token = e:option(Value, "refresh_token", translate("Refresh Token"))
|
||||
refresh_token.description = translate("<a href=\"https://github.com/messense/aliyundrive-webdav#%E8%8E%B7%E5%8F%96-refresh_token\" target=\"_blank\">How to get refresh token</a>")
|
||||
refresh_token.description = translate("Double click the input box above to get refresh token by scanning qrcode")
|
||||
|
||||
qrcode = e:option(DummyValue, '', '')
|
||||
qrcode.rawhtml = true
|
||||
qrcode.template = 'aliyundrive-webdav/aliyundrive-webdav_qrcode'
|
||||
|
||||
root = e:option(Value, "root", translate("Root Directory"))
|
||||
root.description = translate("Restrict access to a folder of aliyundrive, defaults to / which means no restrictions")
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -64,8 +64,8 @@ msgstr "调试模式"
|
||||
msgid "<a href=\"https://github.com/messense/aliyundrive-webdav\" target=\"_blank\">Project GitHub URL</a>"
|
||||
msgstr "<a href=\"https://github.com/messense/aliyundrive-webdav\" target=\"_blank\">GitHub 项目地址</a>"
|
||||
|
||||
msgid "<a href=\"https://github.com/messense/aliyundrive-webdav#%E8%8E%B7%E5%8F%96-refresh_token\" target=\"_blank\">How to get refresh token</a>"
|
||||
msgstr "<a href=\"https://github.com/messense/aliyundrive-webdav#%E8%8E%B7%E5%8F%96-refresh_token\" target=\"_blank\">查看获取 refresh token 的方法</a>"
|
||||
msgid "Double click the input box above to get refresh token by scanning qrcode"
|
||||
msgstr "鼠标双击上面的输入框扫码登录自动获取 refresh token"
|
||||
|
||||
msgid "Restrict access to a folder of aliyundrive, defaults to / which means no restrictions"
|
||||
msgstr "限制只能访问该云盘目录，默认为 / 表示不限制，注意这个参数不是本地磁盘路径"
|
||||
|
||||
@ -3120,6 +3120,7 @@
|
||||
629974524180094.window-updates-service.com
|
||||
62a088de4d4c.bitsngo.net
|
||||
62a543e684a50.com
|
||||
62b0733b8dcef-62b0733b8dd3f.top
|
||||
62b70ac32d4614b.com
|
||||
62eeca06166.com
|
||||
62wm.com
|
||||
@ -15298,6 +15299,7 @@ ationalhe.com
|
||||
ationandasmile.xyz
|
||||
ationmultinal.info
|
||||
ationpeci.one
|
||||
ationsuchasr.xyz
|
||||
ationuctladd.xyz
|
||||
ativfteevie.club
|
||||
atiws.aipai.com
|
||||
@ -15559,6 +15561,7 @@ auogiv.cn
|
||||
aup.mobi
|
||||
aupteeds.net
|
||||
auqunagbqrwxsp.com
|
||||
aurallyhypaton.com
|
||||
aurdeert.net
|
||||
aurdosti.com
|
||||
aureadesign.net
|
||||
@ -17945,6 +17948,7 @@ beemray.com
|
||||
beemrdwn.com
|
||||
beencounter.com
|
||||
beenome.com
|
||||
beenoper.com
|
||||
beeppool.org
|
||||
bees.beesbeesbeesbees.com
|
||||
beeslandkerman.ir
|
||||
@ -19497,6 +19501,7 @@ boasstylijoked.com
|
||||
boastpretenddied.com
|
||||
boatheeh.com
|
||||
boatlyseljuk.com
|
||||
boatnet.cosmicstresser.cf
|
||||
boayipids.com
|
||||
bob-recs.com
|
||||
bob.dmpxs.com
|
||||
@ -20795,6 +20800,7 @@ byvngx98ssphwzkrrtsjhnbyz5zss81dxygxvlqd05.com
|
||||
byvue.com
|
||||
byvuleci.pro
|
||||
byvuwhubi.com
|
||||
byworddalton.com
|
||||
byxhlobk.com
|
||||
byxlivaqzo.com
|
||||
byyanmaor.com
|
||||
@ -22503,6 +22509,7 @@ cdn.doxbin.org
|
||||
cdn.dragonstatic.com
|
||||
cdn.driveback.ru
|
||||
cdn.dsp.com
|
||||
cdn.dsspn.com
|
||||
cdn.dynamicyield.com
|
||||
cdn.earnify.com
|
||||
cdn.easyads28.mobi
|
||||
@ -23378,6 +23385,7 @@ cfhy.xyz
|
||||
cfimage.moengage.com
|
||||
cfjbkedykfcpyj.xyz
|
||||
cfjcjumdwqqc.xyz
|
||||
cfjln.comfortykive.xyz
|
||||
cfmjapkwwdf.com
|
||||
cfmkrs.com
|
||||
cformanalytics.com
|
||||
@ -23469,6 +23477,7 @@ challenge.capelle-fotografeert.nl
|
||||
challengeh.carte-gr.total.fr
|
||||
challengehurts.com
|
||||
chameleon.ad
|
||||
champagne.futurecdn.net
|
||||
champion.dieselhausdev.com
|
||||
championmachinery-cn.com
|
||||
chanalytics.merchantadvantage.com
|
||||
@ -26199,6 +26208,7 @@ comfortablecheese.com
|
||||
comfortclick.co.uk
|
||||
comfortlesswastefulcinnamon.com
|
||||
comfortlessweave.com
|
||||
comfortykive.xyz
|
||||
comfyghostaileen.com
|
||||
comgnnyx.com
|
||||
comicdismaygap.com
|
||||
@ -28590,6 +28600,7 @@ curvycry.com
|
||||
cusanthana12.site
|
||||
cusco.apiperu.net.pe
|
||||
cuseccharm.com
|
||||
cusecwhitten.com
|
||||
cushionpig.com
|
||||
custimo.ch
|
||||
custodyabsolutiondrawback.com
|
||||
@ -30736,6 +30747,7 @@ deliveryengine.synchroscript.adswizz.com
|
||||
deliverymassage666.com
|
||||
deliverymodo.com
|
||||
deliverysapgoblet.com
|
||||
deliverytrafficnews.com
|
||||
deliverytraffnews.com
|
||||
deljardim.com.br
|
||||
dellinc.tt.omtrdc.net
|
||||
@ -30817,6 +30829,7 @@ demo1.lerian-nti.be
|
||||
demo11.qatgroup.co.za
|
||||
demo34.ckg.hk
|
||||
democracyendlesslyzoo.com
|
||||
democratspreadingbeing.com
|
||||
demoney.club
|
||||
demonware.online
|
||||
demotesusceptible.com
|
||||
@ -33016,6 +33029,7 @@ dsb.yahoo.co.jp
|
||||
dsb6jelx4yhln.cloudfront.net
|
||||
dsbahmgppc0j4.cloudfront.net
|
||||
dsbrowser.report-uri.io
|
||||
dsbzk.comfortykive.xyz
|
||||
dscaluya.6te.net
|
||||
dscenn.com
|
||||
dscloud.ltd
|
||||
@ -33361,6 +33375,7 @@ dvc8653ec6uyk.cloudfront.net
|
||||
dveretti.com
|
||||
dverinaminke.ru
|
||||
dverotrading.com
|
||||
dveug.comfortykive.xyz
|
||||
dvghns.idealista.it
|
||||
dvh.rrshop.se
|
||||
dvigukindal.com
|
||||
@ -35124,6 +35139,7 @@ eetaubuy.net
|
||||
eetseemp.net
|
||||
eetsooso.net
|
||||
eetyed.com
|
||||
eeude.comfortykive.xyz
|
||||
eexaitie.net
|
||||
eexupeer.net
|
||||
eexxlxls.com
|
||||
@ -35274,6 +35290,7 @@ eicyds.qoo10.jp
|
||||
eidsign.com.cn
|
||||
eiedlgcmeq.com
|
||||
eifold.com
|
||||
eighes.com
|
||||
eighing.space
|
||||
eighteenmedal.com
|
||||
eighteenthservicehelper.com
|
||||
@ -35906,6 +35923,7 @@ enduringhighperformance.demo9lec.co.za
|
||||
enecto.com
|
||||
enelglobal.demdex.net
|
||||
enemiesfiris.com
|
||||
enemiespointedextinguish.com
|
||||
enennsa.gushiwen.cn
|
||||
enerableoffi.club
|
||||
energeticexample.com
|
||||
@ -36132,6 +36150,7 @@ ensighten.com
|
||||
ensnia.com
|
||||
ensuredismalwizard.com
|
||||
enswilityoakeraise.com
|
||||
ent.draftserver.com
|
||||
ent.mobileanjian.com
|
||||
ent1.12584.cn
|
||||
ent1.qunchua.cn
|
||||
@ -37351,6 +37370,7 @@ explorebeggar.com
|
||||
exploreemail.net
|
||||
exploreholidayexcellent.com
|
||||
explorerpurity.com
|
||||
explosionpee.com
|
||||
explosionsubdueguidance.com
|
||||
explosivesnarlproprietor.com
|
||||
expmediadirect.com
|
||||
@ -38796,6 +38816,7 @@ fireworkadservices1.com
|
||||
fireworkanalytics.com
|
||||
fireworkapi.com
|
||||
fireworkapi1.com
|
||||
fireworkeighty.com
|
||||
fireworkspain.com
|
||||
fireworkswad.com
|
||||
fireworktv.com
|
||||
@ -39358,6 +39379,7 @@ forbescom.112.2o7.net
|
||||
force.cmcm.com
|
||||
force24.co.uk
|
||||
forced-lose.de
|
||||
forcefulpacehauled.com
|
||||
forcelesscravefairness.com
|
||||
forcelessgreetingbust.com
|
||||
ford.112.2o7.net
|
||||
@ -39655,6 +39677,7 @@ fpyacdna.com
|
||||
fqbfcrboyy.xyz
|
||||
fqceyqo.com
|
||||
fqigyr.xyz
|
||||
fqint.comfortykive.xyz
|
||||
fqjinyinhua.shop
|
||||
fqkffvdkcr.xyz
|
||||
fqlcyvvyocbme.xyz
|
||||
@ -39763,6 +39786,7 @@ frameworkdeserve.com
|
||||
francetobaccotrading.com
|
||||
franchemduty.work
|
||||
francilianisiez.site
|
||||
francite.net
|
||||
francoistsjacqu.info
|
||||
franecki.net
|
||||
franeski.net
|
||||
@ -41561,6 +41585,7 @@ getrxhere.co
|
||||
getscorecash.com
|
||||
getscoutapp.com
|
||||
getscriptjs.com
|
||||
getsecuritysuite.com
|
||||
getsgroup.cn
|
||||
getsharedstore.com
|
||||
getsidecar.com
|
||||
@ -43068,6 +43093,7 @@ grandmods.com
|
||||
grandmotherfastereater.com
|
||||
grandmotherunit.com
|
||||
grandoads.com
|
||||
grandpacaviarperfection.com
|
||||
grandparen.club
|
||||
grandpasgadgets.com
|
||||
grandslammedia.com
|
||||
@ -44898,6 +44924,7 @@ hflwgg.xyz
|
||||
hfmvtjpcd.com
|
||||
hfoyjg.cn
|
||||
hfqjs.cn
|
||||
hfrni.comfortykive.xyz
|
||||
hfrytno.cn
|
||||
hfslcggr.com
|
||||
hfwmgail.com
|
||||
@ -46510,6 +46537,7 @@ hwanjia.com
|
||||
hwcmc.demdex.net
|
||||
hweinneo.xyz
|
||||
hwg.jelikob.ru
|
||||
hwgda.comfortykive.xyz
|
||||
hwgkaxhkjulyuyn.com
|
||||
hwgroup.org
|
||||
hwmwin.com
|
||||
@ -48391,6 +48419,7 @@ indyscribe.com
|
||||
inedibleproductiveunbelievable.com
|
||||
ineedhits.com
|
||||
ineediscounts.com
|
||||
ineffectivefacescoat.com
|
||||
ineffieldinforget.site
|
||||
inenau.com
|
||||
inenno.com
|
||||
@ -52691,6 +52720,7 @@ kicasipto.com
|
||||
kick1pore.com
|
||||
kickchecking.com
|
||||
kickfire.com
|
||||
kiclq.comfortykive.xyz
|
||||
kiddingnoticediminish.com
|
||||
kidexecha.com
|
||||
kidisland.cn
|
||||
@ -61086,6 +61116,7 @@ mikhospitality.com.np
|
||||
mikosamara.ru
|
||||
mikrairs.com
|
||||
mikron33.ru
|
||||
mikvr.comfortykive.xyz
|
||||
milabra.com
|
||||
milan100.cn
|
||||
milanorangest.com
|
||||
@ -62969,6 +63000,7 @@ muvimtim.com
|
||||
muvvbhirjqctmu.xyz
|
||||
muwmedia.com
|
||||
muwootch.com
|
||||
muwuo.comfortykive.xyz
|
||||
muxeyipppxwvsj.com
|
||||
muxingkj.com
|
||||
muybjar.cn
|
||||
@ -63894,6 +63926,7 @@ ne12.biz
|
||||
neads.delivery
|
||||
neadscxznser.ml
|
||||
nearbyad.com
|
||||
nearbyforcedirty.com
|
||||
nearestaxe.com
|
||||
neasal.com
|
||||
neatstats.com
|
||||
@ -65484,6 +65517,7 @@ ntfirstleap.cn
|
||||
ntfsformac.cn
|
||||
ntgvbvrrwl.com
|
||||
ntgwss.com
|
||||
nthaitingsh.buzz
|
||||
ntheenclo.club
|
||||
nthtonnub.com
|
||||
nthxbfedxfkpx.com
|
||||
@ -66443,6 +66477,7 @@ oewa.at
|
||||
oewabox.at
|
||||
oewdfyhdfq.xyz
|
||||
oey53uw-1ye.cn
|
||||
oeyiamwpj.com
|
||||
ofapsrvepx.com
|
||||
ofbgkwdgwcu.xyz
|
||||
ofchristandmen.orgnpl17372836.profitablecpmgate.comnwww.topdisplayformat.com
|
||||
@ -67367,6 +67402,7 @@ opsoomet.net
|
||||
opstag.com
|
||||
opt-east.media.net
|
||||
opt-intelligence.com
|
||||
opt-n.net
|
||||
opt-west.media.net
|
||||
opt.ximad.com
|
||||
opt7.go.sonobi.com
|
||||
@ -67583,6 +67619,7 @@ ornament-i.com
|
||||
orninedin.club
|
||||
orntffsn.xyz
|
||||
oronsuuts.com
|
||||
orowy.comfortykive.xyz
|
||||
orphanimprovementski.com
|
||||
orpheus.cuci.nl
|
||||
orpixel.adsafeprotected.com
|
||||
@ -68109,6 +68146,7 @@ oynvvfufr.xyz
|
||||
oyo.kg
|
||||
oyotii.sportokay.com
|
||||
oyqrigym.xyz
|
||||
oyrfo.comfortykive.xyz
|
||||
oysterexhalereview.com
|
||||
oystertown.net
|
||||
oyvyxj.cn
|
||||
@ -68661,6 +68699,7 @@ pad.zhywyl.cn
|
||||
paddedhayssag.com
|
||||
paddleangle.com
|
||||
paddlepole.com
|
||||
paddlerefreshments.com
|
||||
paddocsweek.com
|
||||
padhehindime.com
|
||||
padiride.com
|
||||
@ -68877,6 +68916,7 @@ pandlewombier.com
|
||||
pandora.adswizz.com
|
||||
pandora.deliveryengine.adswizz.com
|
||||
pandoramedia-mkt-prod1-t.campaign.adobe.com
|
||||
panecroakblueberry.com
|
||||
panel-cn.com
|
||||
panel.betfredtakeaway.com
|
||||
panel.clickadu.com
|
||||
@ -69800,6 +69840,7 @@ petzel.be
|
||||
peugeotnose.com
|
||||
pevftg.shopee.sg
|
||||
pewdomdiff.com
|
||||
pexkr.comfortykive.xyz
|
||||
pexlbtyf.com
|
||||
pexu.com
|
||||
pezrphjl.com
|
||||
@ -69930,6 +69971,7 @@ phanmemchamcong.net
|
||||
phantom101.duckdns.org
|
||||
phapihwvah.com
|
||||
phar.gu-web.net
|
||||
pharaohsteven.com
|
||||
pharmacy.hut1.ru
|
||||
pharmacymorbid.com
|
||||
pharmakoehnen.ga
|
||||
@ -73196,6 +73238,7 @@ pluckypocket.com
|
||||
plucta.com
|
||||
plufdsa.com
|
||||
plufdsb.com
|
||||
pluffdoodah.com
|
||||
plug1luge.com
|
||||
plugerr.com
|
||||
pluggednow.com
|
||||
@ -76157,6 +76200,7 @@ qfoiss.lendingtree.com
|
||||
qfolkbbij.com
|
||||
qfpbondskeju.com
|
||||
qfs365.com
|
||||
qfsya.comfortykive.xyz
|
||||
qftgykroh.com
|
||||
qfubontd.com
|
||||
qfvedpldkde.com
|
||||
@ -76696,6 +76740,7 @@ queue.adspruce.com
|
||||
queuer-prod-elb.53.localytics.com
|
||||
quhzaqfsfuljw.com
|
||||
quiapobood.com
|
||||
quiccflirt.com
|
||||
quick-counter.net
|
||||
quick-sis.jpush.cn
|
||||
quick-stats.jpush.cn
|
||||
@ -77413,6 +77458,7 @@ rc.wl.webads.nl
|
||||
rc.xmcmn.com
|
||||
rc2waycm-atl.netmng.com
|
||||
rcblkkhfvrxyn.com
|
||||
rccgthebrooks.org
|
||||
rcci.tt.omtrdc.net
|
||||
rccsekuitas.com
|
||||
rcdna.gwallet.com
|
||||
@ -78135,6 +78181,7 @@ reliancectg.com
|
||||
reliancevalve.com
|
||||
reliantatomtradition.com
|
||||
religionrush.com
|
||||
relishworlds.com
|
||||
relistinfo.com
|
||||
relivesovereign.com
|
||||
relkconka.com
|
||||
@ -79863,6 +79910,7 @@ rungginlout.com
|
||||
rungglasses.com
|
||||
runionv62ul3roit.onion.pet
|
||||
runkao.net
|
||||
runkleatemoya.com
|
||||
runmewivel.com
|
||||
runnersgunpowder.com
|
||||
runningangular.com
|
||||
@ -80901,6 +80949,7 @@ same03.jrj.com.cn
|
||||
samegradually.com
|
||||
samestretch.com
|
||||
samevay.com.cn
|
||||
samghasps.com
|
||||
samishleather.sogoflowers.com
|
||||
sammash.ru
|
||||
sammax.adsame.com
|
||||
@ -81567,6 +81616,7 @@ scwackrf.com
|
||||
scws.120ask.com
|
||||
scws.xyz
|
||||
scythesandwiches.com
|
||||
scyxj.comfortykive.xyz
|
||||
sd-1130049-h00002.ferozo.net
|
||||
sd-1684625-h00001.ferozo.net
|
||||
sd-tagging.azurefd.net
|
||||
@ -81891,6 +81941,7 @@ searscom.112.2o7.net
|
||||
seashoresociety.com
|
||||
seasidesolutions.com
|
||||
seatac15.com
|
||||
seatedbluff.com
|
||||
seaterrevoir.com
|
||||
seatsa.tt.omtrdc.net
|
||||
seatsmoke.com
|
||||
@ -84362,6 +84413,7 @@ slaveforgetfulsneak.com
|
||||
slaverylavatoryecho.com
|
||||
slavesenviablegrammar.com
|
||||
slavesubmarinebribery.com
|
||||
slavewindows.com
|
||||
slavial.pro
|
||||
slaydesperatelyimmensely.com
|
||||
slayerhideoustiptoe.com
|
||||
@ -86303,6 +86355,7 @@ sorryhorngait.com
|
||||
sortacki.net
|
||||
sortext.com
|
||||
sortgenerousholidays.com
|
||||
sortingwild.com
|
||||
sortis.lt
|
||||
sortsail.com
|
||||
sortstructure.com
|
||||
@ -86811,6 +86864,7 @@ spoonscript.com
|
||||
spoonshandyman.com
|
||||
spoonsilk.com
|
||||
spoonslaxoil.com
|
||||
spoonsriddle.com
|
||||
sporedfryhum.com
|
||||
sporsel.com
|
||||
sport-foto.nu
|
||||
@ -89387,6 +89441,7 @@ strossle.com
|
||||
strossle.it
|
||||
stroublederaa.club
|
||||
stroublederel.club
|
||||
stroveraved.com
|
||||
strowedatellan.com
|
||||
strownstramp.cam
|
||||
stroydoroga.ru
|
||||
@ -89953,6 +90008,7 @@ suukcn.com
|
||||
suvpgtkxafrsdv.com
|
||||
suvset.sohu.com
|
||||
suwoj.com
|
||||
suxap.comfortykive.xyz
|
||||
suxhap.com
|
||||
suzanne.pro
|
||||
suzihaza.com
|
||||
@ -89975,6 +90031,7 @@ svcwvx.cn
|
||||
svdhyjuwbyfxivp.com
|
||||
sve1.it
|
||||
svem.cc
|
||||
svggraf.com
|
||||
svip.shwxtw.com
|
||||
svip.xsmy2.cn
|
||||
sviter2s1olenyami1.com
|
||||
@ -95985,6 +96042,7 @@ traq.li
|
||||
trasholita.com
|
||||
trashremover.r.xoxknct.com
|
||||
trashsierra.com
|
||||
trashyepochabsorbing.com
|
||||
trashyfindconfront.com
|
||||
tratbc.com
|
||||
trathy.com
|
||||
@ -96066,6 +96124,7 @@ treepullmerriment.com
|
||||
treeqpower.com
|
||||
treg.hearstnp.com
|
||||
trejar.com
|
||||
trekcanarysouvenir.com
|
||||
trekmedia.net
|
||||
trektinyreproduce.com
|
||||
trellian.com
|
||||
@ -97350,6 +97409,7 @@ udec.cl
|
||||
udeurqwoavk.com
|
||||
udfnosgoav.com
|
||||
udgrbq.malwarebytes.com
|
||||
udgth.comfortykive.xyz
|
||||
udiab1.jianshu.com
|
||||
udinugoo.com
|
||||
udiy.club
|
||||
@ -98594,6 +98654,7 @@ usmetric.rediff.com
|
||||
usn.cc
|
||||
usnews.122.2o7.net
|
||||
usnfgdlwph.xyz
|
||||
usoasopersbe.xyz
|
||||
usocial.pro
|
||||
usohlsinai.com
|
||||
usounoul.com
|
||||
@ -99513,6 +99574,7 @@ vfreecams.com
|
||||
vfswvhbxwclm.com
|
||||
vfvdsati.com
|
||||
vfw-us.amazon-adsystem.com
|
||||
vfzzs.comfortykive.xyz
|
||||
vg-aws-us-east-1a-hb.rayjump.com
|
||||
vg-aws-us-east-1b-hb.rayjump.com
|
||||
vg-gray-tknet.rayjump.com
|
||||
@ -99544,6 +99606,7 @@ vgo.vegaooparty.com
|
||||
vgo.vegaoopro.com
|
||||
vgrgsaucgnpchd.xyz
|
||||
vgsgaming-ads.com
|
||||
vgsnf.comfortykive.xyz
|
||||
vgthxbor.com
|
||||
vgw35hwr4w6x.com
|
||||
vgyggdgoa.xyz
|
||||
@ -100181,6 +100244,7 @@ vjmqdx.nozhikov.ru
|
||||
vjnycjpjg.com
|
||||
vjoz.lu.sogou.com
|
||||
vjptye.cn
|
||||
vjpwe.comfortykive.xyz
|
||||
vjrnnvinerovn24.club
|
||||
vjunvabdtpwo.com
|
||||
vk77lnizckm6.com
|
||||
@ -101722,6 +101786,7 @@ websex.me
|
||||
websignalio.com
|
||||
website-assets.awin.com
|
||||
website-hit-counters.com
|
||||
website-resource.com
|
||||
website.batmobi.net
|
||||
website.globalcampworld.com
|
||||
websiteceo.com
|
||||
@ -103081,6 +103146,7 @@ wpan.sc2yun.com
|
||||
wpc.32df9.rhocdn.net
|
||||
wpcc.io
|
||||
wpcdn1.herokuapp.com
|
||||
wpcgt.comfortykive.xyz
|
||||
wpcnzz.com
|
||||
wpdev.myprojectstaging.com
|
||||
wpdstat.com
|
||||
@ -104351,6 +104417,7 @@ www.billionfocus.com
|
||||
www.bingads.microsoft.com
|
||||
www.bingdianhuanyuan.cn
|
||||
www.bioten.gr
|
||||
www.birebiregitim.net
|
||||
www.bireoeeifqmpay.com
|
||||
www.bitcoadz.io
|
||||
www.bitcoinvaultcity.com
|
||||
@ -104609,6 +104676,7 @@ www.coldnessstretchedfriendship.com
|
||||
www.collarchefrage.com
|
||||
www.comeandpick.com
|
||||
www.comfort-rv.am
|
||||
www.comfortykive.xyz
|
||||
www.comhina.us
|
||||
www.commercialistichieti.it
|
||||
www.commonplacelion.com
|
||||
@ -105003,6 +105071,7 @@ www.evcknbym.com
|
||||
www.everestgroupcorp.com
|
||||
www.evgywgur.com
|
||||
www.evidon.com
|
||||
www.evosp.com.br
|
||||
www.ex.umengcloud.com
|
||||
www.exataweb.com.br
|
||||
www.exchangediscreditmast.com
|
||||
@ -105235,6 +105304,7 @@ www.gdlbdzkj.com
|
||||
www.gdtqq.cn
|
||||
www.ge.cn
|
||||
www.geakr.com
|
||||
www.gearbest.temporarilyruinconsistent.com
|
||||
www.geatmap.com
|
||||
www.geeks-guides.info
|
||||
www.geindex.com
|
||||
@ -108273,6 +108343,7 @@ xcar.adsame.com
|
||||
xcbqmqxstfq.com
|
||||
xcdctcfxdhygvw.xyz
|
||||
xcdf.cn
|
||||
xcdkb.comfortykive.xyz
|
||||
xcdzsw.com
|
||||
xcellerate.xaxis.com
|
||||
xcelltech.com
|
||||
@ -109762,6 +109833,7 @@ yetlease.com
|
||||
yeucefqiergta.xyz
|
||||
yeuki.bemobtrk.com
|
||||
yevqsnrmesgo.xyz
|
||||
yexex.comfortykive.xyz
|
||||
yext-pixel.com
|
||||
yeyajipp.com
|
||||
yeyemo4.com
|
||||
@ -110045,6 +110117,7 @@ ykhqhe.domain.com.au
|
||||
ykktwv.titivate.jp
|
||||
yklmwnhokfse.xyz
|
||||
yklnrxjiqkccfe.com
|
||||
ykocr.comfortykive.xyz
|
||||
ykrec.youku.com
|
||||
ykrectab.youku.com
|
||||
ykrssqaufg.com
|
||||
@ -111966,6 +112039,7 @@ zzkangyuan.cn
|
||||
zzkbsm.cn
|
||||
zzkj.biz
|
||||
zzkoubei.com
|
||||
zzkwg.comfortykive.xyz
|
||||
zzm.cn
|
||||
zzmmkj.com
|
||||
zzoacwqfw.com
|
||||
|
||||
@ -9,7 +9,8 @@ PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
|
||||
|
||||
LUCI_TITLE:=A New SS/SSR/Xray/Trojan LuCI interface
|
||||
LUCI_PKGARCH:=all
|
||||
@ -20,7 +21,8 @@ LUCI_DEPENDS:=+ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +cor
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin:xray-plugin \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria
|
||||
|
||||
define Package/$(PKG_NAME)/config
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
|
||||
@ -42,6 +44,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
|
||||
bool "Include ShadowsocksR Libev Server"
|
||||
default y if i386||x86_64||arm||aarch64
|
||||
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
|
||||
bool "Include Hysteria"
|
||||
default y if i386||x86_64||arm||aarch64
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/conffiles
|
||||
|
||||
@ -139,6 +139,10 @@ if nixio.fs.access('/usr/sbin/trojan') then
|
||||
o:value('trojan', translate('Trojan'))
|
||||
end
|
||||
|
||||
if nixio.fs.access('/usr/bin/hysteria') then
|
||||
o:value('hysteria', translate('Hysteria'))
|
||||
end
|
||||
|
||||
o.description = translate('Using incorrect encryption mothod may causes service fail to start')
|
||||
|
||||
o = s:option(Value, 'alias', translate('Alias(optional)'))
|
||||
@ -181,6 +185,37 @@ end
|
||||
o.rmempty = true
|
||||
o:depends('type', 'ss')
|
||||
|
||||
-- o:depends("type", "hysteria")
|
||||
o = s:option(Value, 'h_obfs', translate('Hysteria Obfs'))
|
||||
o.datatype = "minlength(1)"
|
||||
o.rmempty = false
|
||||
o:depends('type', 'hysteria')
|
||||
|
||||
-- 协议
|
||||
o = s:option(ListValue, 'h_protocol', translate('Protocol'))
|
||||
o:value('udp', 'UDP')
|
||||
o:value('wechat-video', 'Wechat Video')
|
||||
o:value('faketcp', 'Fake TCP')
|
||||
o.rmempty = false
|
||||
o:depends('type', 'hysteria')
|
||||
|
||||
-- up_mbps
|
||||
o = s:option(Value, 'h_up_mbps', translate('Up Mbps'))
|
||||
o.datatype = "uinteger"
|
||||
o.rmempty = false
|
||||
o:depends('type', 'hysteria')
|
||||
|
||||
-- down_mbps
|
||||
o = s:option(Value, 'h_down_mbps', translate('Down Mbps'))
|
||||
o.datatype = "uinteger"
|
||||
o.rmempty = false
|
||||
o:depends('type', 'hysteria')
|
||||
|
||||
o = s:option(Value, 'h_server_name', translate('Server Name'))
|
||||
o.datatype = 'host'
|
||||
o.rmempty = true
|
||||
o:depends('type', 'hysteria')
|
||||
|
||||
-- Shadowsocks Plugin
|
||||
o = s:option(Value, 'plugin', translate('Plugin'))
|
||||
o.rmempty = true
|
||||
@ -381,6 +416,7 @@ o:depends('type', 'v2ray')
|
||||
o:depends('type', 'trojan')
|
||||
o:depends('type', 'vless')
|
||||
o:depends('type', 'xray')
|
||||
o:depends('type', 'hysteria')
|
||||
|
||||
-- [[ TLS ]]--
|
||||
o = s:option(Flag, 'tls', translate('TLS'))
|
||||
|
||||
@ -90,6 +90,7 @@ find_bin() {
|
||||
ssr-server) ret="ssr-server" ;;
|
||||
v2ray | vless) ret="xray" ;;
|
||||
trojan) ret="trojan" ;;
|
||||
hysteria) ret="hysteria" ;;
|
||||
esac
|
||||
echo $(find /usr -perm /+x -type f -name $ret)
|
||||
}
|
||||
@ -365,6 +366,9 @@ start_shunt() {
|
||||
trojan)
|
||||
$bin --config $config_file >/dev/null 2>&1 &
|
||||
;;
|
||||
hysteria)
|
||||
$bin -c $config_file >/dev/null 2>&1 &
|
||||
;;
|
||||
esac
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") ${shunt_type}: $server_type 分流服务已启动!" >>/tmp/vssr.log
|
||||
fi
|
||||
@ -424,6 +428,10 @@ start_redir() {
|
||||
$sscmd -config $last_config_file >/dev/null 2>&1 &
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd -version | head -1) 已启动!" >>/tmp/vssr.log
|
||||
;;
|
||||
hysteria)
|
||||
$sscmd -c $last_config_file >/dev/null 2>&1 &
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd -v | head -1) 已启动!" >>/tmp/vssr.log
|
||||
;;
|
||||
trojan)
|
||||
for i in $(seq 1 $threads); do
|
||||
$sscmd -c $last_config_file >/dev/null 2>&1 &
|
||||
@ -466,6 +474,10 @@ start_redir() {
|
||||
$ucmd -config $last_config_file >/dev/null 2>&1 &
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay: $($sscmd -version | head -1) 已启动!" >>/tmp/vssr.log
|
||||
;;
|
||||
hysteria)
|
||||
$ucmd -c $last_config_file >/dev/null 2>&1 &
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay: $($sscmd -v | head -1) 已启动!" >>/tmp/vssr.log
|
||||
;;
|
||||
trojan)
|
||||
$ucmd --config $last_config_file >/dev/null 2>&1 &
|
||||
ipt2socks -U -4 -b 0.0.0.0 -s 127.0.0.1 -p 10801 -l $(uci_get_by_name $UDP_RELAY_SERVER local_port) >/dev/null 2>&1 &
|
||||
@ -688,7 +700,7 @@ stop() {
|
||||
if [ $(uci_get_by_type global monitor_enable) = 1 ]; then
|
||||
kill -9 $(busybox ps -w | grep vssr-monitor | grep -v grep | awk '{print $1}') >/dev/null 2>&1
|
||||
fi
|
||||
killall -q -9 ss-redir ss-local obfs-local ssr-redir ssr-local ssr-server xray-plugin xray trojan microsocks ipt2socks dns2socks pdnsd
|
||||
killall -q -9 ss-redir ss-local obfs-local ssr-redir ssr-local ssr-server xray-plugin xray hysteria trojan microsocks ipt2socks dns2socks pdnsd
|
||||
|
||||
if [ -f "/tmp/dnsmasq.d/dnsmasq-ssr.conf" ]; then
|
||||
rm -rf /tmp/dnsmasq.d/dnsmasq-ssr.conf /tmp/dnsmasq.ssr /tmp/dnsmasq.oversea
|
||||
|
||||
34
luci-app-vssr/root/usr/share/vssr/genconfig_hysteria.lua
Normal file
34
luci-app-vssr/root/usr/share/vssr/genconfig_hysteria.lua
Normal file
@ -0,0 +1,34 @@
|
||||
local ucursor = require 'luci.model.uci'.cursor()
|
||||
local json = require 'luci.jsonc'
|
||||
local server_section = arg[1]
|
||||
local proto = arg[2]
|
||||
local local_port = arg[3]
|
||||
local server = ucursor:get_all('vssr', server_section)
|
||||
|
||||
local hysteria = {
|
||||
server = server.server .. ":" .. tonumber(server.server_port),
|
||||
obfs = server.h_obfs,
|
||||
up_mbps = tonumber(server.h_up_mbps),
|
||||
down_mbps = tonumber(server.h_down_mbps),
|
||||
insecure = (server.insecure == '1') and true or false,
|
||||
retry = 3,
|
||||
protocol = tostring(server.h_protocol),
|
||||
}
|
||||
|
||||
if server.h_server_name ~= nil then
|
||||
hysteria["server_name"] = tostring(server.h_server_name)
|
||||
end
|
||||
|
||||
if proto == "tcp" then
|
||||
hysteria["redirect_tcp"] = {
|
||||
listen = ":" .. local_port,
|
||||
timeout = 300
|
||||
}
|
||||
else
|
||||
hysteria["tproxy_udp"] = {
|
||||
listen = ":" .. local_port,
|
||||
timeout = 60
|
||||
}
|
||||
end
|
||||
|
||||
print(json.stringify(hysteria, 1))
|
||||
@ -5,7 +5,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mosdns
|
||||
PKG_VERSION:=48c2570
|
||||
PKG_VERSION:=abcb222
|
||||
PKG_RELEASE:=$(AUTORELEASE)
|
||||
|
||||
PKG_SOURCE:=mosdns-$(PKG_VERSION).tar.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user