From edfd70a77d83716d511a9bc1e64f27492f38b15a Mon Sep 17 00:00:00 2001
From: nitezs <admin@nite07.com>
Date: Wed, 27 Sep 2023 14:54:53 +0800
Subject: [PATCH] modify

---
 API_README.md                |  1 +
 README.md                    |  3 +--
 config/config.go             | 20 ++++++++++----------
 templates/template_meta.yaml |  2 ++
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/API_README.md b/API_README.md
index 57ed577..583d1b8 100644
--- a/API_README.md
+++ b/API_README.md
@@ -15,6 +15,7 @@
 | sort         | string | 否                 | `nameasc` | 国家策略组排序策略，可选值 `nameasc`、`namedesc`、`sizeasc`、`sizedesc`                                                                                                                     |
 | replace      | string | 否                 | -         | 通过正则表达式重命名节点，格式 `[<ReplaceKey>,<ReplaceTo>],[<ReplaceKey>,<ReplaceTo>]...`                                                                                                  |
 | remove       | string | 否                 | -         | 通过正则表达式删除节点                                                                                                                                                                 |
+| nodeList     | bool   | 否                 | `false`   | 只输出节点                                                                                                                                                                       |                                                                                                                                                                       |
 
 # `/short`
 
diff --git a/README.md b/README.md
index 7d3e183..a343498 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@
 
 | 变量名                   | 说明                                                        | 默认值                   |
 |-----------------------|-----------------------------------------------------------|-----------------------|
-| BASE_PATH             | 程序运行子路径，例如将服务反代在 `https://example.com/sub` 则此变量值应为 `/sub` | `/`                   |
 | PORT                  | 端口                                                        | `8011`                |
 | META_TEMPLATE         | meta 模板文件名                                                | `template_meta.yaml`  |
 | CLASH_TEMPLATE        | clash 模板文件名                                               | `template_clash.yaml` |
@@ -37,7 +36,7 @@
 | LOG_LEVEL             | 日志等级，可选值 `debug`,`info`,`warn`,`error`                    | `info`                |
 | SHORT_LINK_LENGTH     | 短链长度                                                      | `6`                   |
 
-### API
+### API                                       
 
 [API文档](./API_README.md)
 
diff --git a/config/config.go b/config/config.go
index 2371992..fe67c6d 100644
--- a/config/config.go
+++ b/config/config.go
@@ -15,8 +15,8 @@ type Config struct {
 	RequestMaxFileSize int64
 	CacheExpire        int64
 	LogLevel           string
-	BasePath           string
-	ShortLinkLength    int
+	//BasePath           string
+	ShortLinkLength int
 }
 
 var Default *Config
@@ -32,8 +32,8 @@ func LoadConfig() error {
 		Port:               8011,
 		CacheExpire:        60 * 5,
 		LogLevel:           "info",
-		BasePath:           "/",
-		ShortLinkLength:    6,
+		//BasePath:           "/",
+		ShortLinkLength: 6,
 	}
 	_ = godotenv.Load()
 	if os.Getenv("PORT") != "" {
@@ -73,12 +73,12 @@ func LoadConfig() error {
 	if os.Getenv("LOG_LEVEL") != "" {
 		Default.LogLevel = os.Getenv("LOG_LEVEL")
 	}
-	if os.Getenv("BASE_PATH") != "" {
-		Default.BasePath = os.Getenv("BASE_PATH")
-		if Default.BasePath[len(Default.BasePath)-1] != '/' {
-			Default.BasePath += "/"
-		}
-	}
+	//if os.Getenv("BASE_PATH") != "" {
+	//	Default.BasePath = os.Getenv("BASE_PATH")
+	//	if Default.BasePath[len(Default.BasePath)-1] != '/' {
+	//		Default.BasePath += "/"
+	//	}
+	//}
 	if os.Getenv("SHORT_LINK_LENGTH") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("SHORT_LINK_LENGTH"))
 		if err != nil {
diff --git a/templates/template_meta.yaml b/templates/template_meta.yaml
index 8885bf4..5d47b72 100644
--- a/templates/template_meta.yaml
+++ b/templates/template_meta.yaml
@@ -111,9 +111,11 @@ rules:
   - GEOSITE,microsoft,Microsoft
   - GEOSITE,apple,Apple
   - GEOSITE,netflix,Netflix
+  - GEOIP,netflix,Netflix
   - GEOSITE,onedrive,Onedrive
   - GEOSITE,youtube,Youtube
   - GEOSITE,telegram,Telegram
+  - GEOIP,telegram,Telegram
   - GEOSITE,openai,OpenAI
   - GEOSITE,bilibili,哔哩哔哩
   - GEOSITE,bahamut,巴哈姆特