lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 18:17:52 -05:00
Code Issues Releases Wiki Activity
ff59bd37ce
v2fly/infra/conf
History
Jebbs ff59bd37ce
v5: New multi-json loader (#451) 
* scalable commands column

* new multi-json loader
For both internal & external json loader

This commit also:
* applies -confdir to other formats, e.g. "yaml" in the future
* multiple assign of -confdir is accepted
* add flag to load confdir recursively
* config loader can have alias name
* json loader also accepts .jsonc
* add merge command
* add help topics for json merge, format loader
* format loaders don't panic

* apply lint style

* add merge test

* merge same tag in array, solve v2fly/discussion#97

* apply lint style

* merge code optimize

* fix merge cmdarg.Arg

* update cmd description

* improve merge logic
* fix zero value overwrite
* fix "null" lost after array merge

* code optimize

* fix merged slices not sorted

* code optimize

* add package doc

* fix a typo
2020-11-28 22:06:03 +08:00
..
json Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
merge v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
serial v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
api.go API: Reflection Service Support (#435) 2020-11-20 01:57:31 +08:00
blackhole_test.go merge ext into core 2019-02-10 19:04:11 +01:00
blackhole.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
buildable.go merge ext into core 2019-02-10 19:04:11 +01:00
common_test.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
common.go Refine unix domain socket (#367) 2020-10-29 07:30:38 +00:00
conf.go Errorgen: support to run outside of GOPATH 2020-10-04 13:06:12 +08:00
dns_proxy_test.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
dns_proxy.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
dns_test.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
dns.go Fix lint according to golangci-lint (#439) 2020-11-22 05:05:01 +08:00
dokodemo_test.go merge ext into core 2019-02-10 19:04:11 +01:00
dokodemo.go merge ext into core 2019-02-10 19:04:11 +01:00
errors.generated.go merge ext into core 2019-02-10 19:04:11 +01:00
freedom_test.go merge ext into core 2019-02-10 19:04:11 +01:00
freedom.go fix user level parsing in freedom. fixes #1555 2019-02-16 21:25:19 +01:00
general_test.go merge ext into core 2019-02-10 19:04:11 +01:00
http_test.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
http.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
loader.go merge ext into core 2019-02-10 19:04:11 +01:00
log.go add: mute access/error logger seperately 2019-06-11 15:29:52 +08:00
mtproto_test.go merge ext into core 2019-02-10 19:04:11 +01:00
mtproto.go merge ext into core 2019-02-10 19:04:11 +01:00
policy_test.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
policy.go Add stats counter for outbounds 2020-06-27 00:31:46 -04:00
reverse_test.go merge ext into core 2019-02-10 19:04:11 +01:00
reverse.go merge ext into core 2019-02-10 19:04:11 +01:00
router_test.go fix port field parsing. fixes #1684 2019-05-11 23:14:38 +08:00
router.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
shadowsocks_test.go merge ext into core 2019-02-10 19:04:11 +01:00
shadowsocks.go remove shadowsosks ota (#238) 2020-10-02 16:13:31 +08:00
socks_test.go merge ext into core 2019-02-10 19:04:11 +01:00
socks.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
transport_authenticators.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
transport_internet.go Remove XTLS (#431) 2020-11-20 15:53:10 +08:00
transport_test.go merge ext into core 2019-02-10 19:04:11 +01:00
transport.go merge ext into core 2019-02-10 19:04:11 +01:00
trojan.go Remove XTLS (#431) 2020-11-20 15:53:10 +08:00
v2ray_test.go Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
v2ray.go Fix lint according to golangci-lint (#439) 2020-11-22 05:05:01 +08:00
vless_test.go Remove XTLS (#431) 2020-11-20 15:53:10 +08:00
vless.go Remove XTLS (#431) 2020-11-20 15:53:10 +08:00
vmess_test.go merge ext into core 2019-02-10 19:04:11 +01:00
vmess.go 32 -> 0 2020-11-02 11:00:08 +00:00