Dev (#2)

fix: 修复当订阅链接有多个 clash 配置时丢失节点的问题
update: 增加检测更新
modify: 修改数据库路径
modify: 修改短链生成逻辑
modify: 统一输出信息

.env.example

@@ -5,3 +5,4 @@ REQUEST_RETRY_TIMES=3
 REQUEST_MAX_FILE_SIZE=1048576
 CACHE_EXPIRE=300
 LOG_LEVEL=info
+BASE_PATH=/

.github/workflows/docker.yml

@@ -47,6 +47,9 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          build-args: |
+            dev=true
+            version=${{ github.sha }}
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ steps.set_tag.outputs.tag }}
 
@@ -56,6 +59,9 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          build-args: |
+            dev=false 
+            version=${{ steps.set_tag.outputs.tag }}
           push: true
           tags: |
             ghcr.io/${{ github.repository }}:${{ steps.set_tag.outputs.tag }}

.github/workflows/go.yml

@@ -23,12 +23,10 @@ jobs:
 
       - name: Build
         run: |
-          LDFLAGS="-s -w"
+          LDFLAGS="-s -w -X config.Version=${{ github.ref_name }}"
           
           # Linux
-          CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-386 main.go
           CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-amd64 main.go
-          CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-arm main.go
           CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-arm64 main.go
           
           # Darwin
@@ -36,9 +34,7 @@ jobs:
           CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-darwin-arm64 main.go
           
           # Windows
-          CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-386.exe main.go
           CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-amd64.exe main.go
-          CGO_ENABLED=0 GOOS=windows GOARCH=arm go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-arm.exe main.go
           CGO_ENABLED=0 GOOS=windows GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-arm64.exe main.go
 
       - name: Create Release
@@ -52,16 +48,6 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Upload Release Asset (Linux 386)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./output/sub2clash-linux-386
-          asset_name: sub2clash-linux-386
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset (Linux amd64)
         uses: actions/upload-release-asset@v1
         env:
@@ -72,16 +58,6 @@ jobs:
           asset_name: sub2clash-linux-amd64
           asset_content_type: application/octet-stream
 
-      - name: Upload Release Asset (Linux arm)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./output/sub2clash-linux-arm
-          asset_name: sub2clash-linux-arm
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset (Linux arm64)
         uses: actions/upload-release-asset@v1
         env:
@@ -112,16 +88,6 @@ jobs:
           asset_name: sub2clash-darwin-arm64
           asset_content_type: application/octet-stream
 
-      - name: Upload Release Asset (Windows 386)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.up
-          asset_path: ./output/sub2clash-windows-386.exe
-          asset_name: sub2clash-windows-386.exe
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset (Windows amd64)
         uses: actions/upload-release-asset@v1
         env:
@@ -132,22 +98,12 @@ jobs:
           asset_name: sub2clash-windows-amd64.exe
           asset_content_type: application/octet-stream
 
-      - name: Upload Release Asset (Windows arm)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./output/sub2clash-windows-arm.exe
-          asset_name: sub2clash-windows-arm.exe
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset (Windows arm64)
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.up
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./output/sub2clash-windows-arm64.exe
           asset_name: sub2clash-windows-arm64.exe
           asset_content_type: application/octet-stream

.gitignore

@@ -3,4 +3,5 @@ dist
 subs
 test
 logs
-dist/
+sub2clash.db
+.env

.goreleaser.yaml

@@ -1,6 +1,6 @@
-before:
+#before:
-  hooks:
+#  hooks:
-    - go mod tidy
+#    - go mod tidy
 builds:
   - env:
       - CGO_ENABLED=0
@@ -10,10 +10,8 @@ builds:
       - darwin
     goarch:
       - amd64
-      - arm
       - arm64
-      - 386
     ldflags:
-      - -s -w
+      - -s -w -X sub2clash/config.Version={{ .Version }}
     no_unique_dist_dir: true
     binary: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"

Dockerfile

@@ -9,8 +9,12 @@ WORKDIR /app
 COPY . .
 RUN go mod download
 
+# 获取参数
+ARG version
+ARG dev
+
 # 使用 -ldflags 参数进行编译
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o sub2clash main.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X sub2clash/config.Version=${version} -X sub2clash/config.Dev=${dev}" -o sub2clash main.go
 
 FROM alpine:latest
 

README.md

@@ -26,7 +26,8 @@
 可以通过编辑 .env 文件来修改默认配置，docker 直接添加环境变量
 
 | 变量名                   | 说明                                                        | 默认值                   |
-|-----------------------|----------------------------------------|-----------------------|
+|-----------------------|-----------------------------------------------------------|-----------------------|
+| BASE_PATH             | 程序运行子路径，例如将服务反代在 `https://example.com/sub` 则此变量值应为 `/sub` | `/`                   |
 | PORT                  | 端口                                                        | `8011`                |
 | META_TEMPLATE         | meta 模板文件名                                                | `template_meta.yaml`  |
 | CLASH_TEMPLATE        | clash 模板文件名                                               | `template_clash.yaml` |
@@ -34,6 +35,7 @@
 | REQUEST_MAX_FILE_SIZE | Get 请求订阅文件最大大小（byte）                                      | `1048576`             |
 | CACHE_EXPIRE          | 订阅缓存时间（秒）                                                 | `300`                 |
 | LOG_LEVEL             | 日志等级，可选值 `debug`,`info`,`warn`,`error`                    | `info`                |
+| SHORT_LINK_LENGTH     | 短链长度                                                      | `6`                   |
 
 ### API
 
@@ -49,7 +51,7 @@
 | template     | string | 否                 | -         | 外部模板链接或内部模板名称                                                                                                                                                               |
 | ruleProvider | string | 否                 | -         | 格式 `[Behavior,Url,Group,Prepend,Name],[Behavior,Url,Group,Prepend,Name]...`，其中 `Group` 是该规则集所走的策略组名，`Prepend` 为 bool 类型，如果为 `true` 规则将被添加到规则列表顶部，否则添加到规则列表底部（会调整到MATCH规则之前） | 
 | rule         | string | 否                 | -         | 格式 `[Rule,Prepend],[Rule,Prepend]...`，其中 `Prepend` 为 bool 类型，如果为 `true` 规则将被添加到规则列表顶部，否则添加到规则列表底部（会调整到MATCH规则之前）                                                            | 
-| autoTest     | bool   | 否                 | `false`   | 指定国家策略组是否自动测速                                                                                                                                                               |
+| autoTest     | bool   | 否                 | `false`   | 国家策略组是否自动测速                                                                                                                                                                 |
 | lazy         | bool   | 否                 | `false`   | 自动测速是否启用 lazy                                                                                                                                                               |
 | sort         | string | 否                 | `nameasc` | 国家策略组排序策略，可选值 `nameasc`、`namedesc`、`sizeasc`、`sizedesc`                                                                                                                     |
 
@@ -63,5 +65,3 @@
 [代理链接解析](./parser)还没有经过严格测试，可能会出现解析错误的情况，如果出现问题请提交 issue
 
 ## TODO
-
-- [ ] 可视化面板

api/controller/clash.go

@@ -5,6 +5,7 @@ import (
 	"gopkg.in/yaml.v3"
 	"net/http"
 	"sub2clash/config"
+	"sub2clash/model"
 	"sub2clash/validator"
 )
 
@@ -15,7 +16,7 @@ func SubmodHandler(c *gin.Context) {
 		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
-	sub, err := BuildSub(query, config.Default.ClashTemplate)
+	sub, err := BuildSub(model.Clash, query, config.Default.ClashTemplate)
 	if err != nil {
 		c.String(http.StatusInternalServerError, err.Error())
 		return

api/controller/default.go

@@ -1,12 +1,13 @@
 package controller
 
 import (
-	"crypto/md5"
+	"crypto/sha256"
 	"encoding/hex"
 	"errors"
 	"gopkg.in/yaml.v3"
 	"net/url"
 	"regexp"
+	"sort"
 	"strings"
 	"sub2clash/model"
 	"sub2clash/parser"
@@ -14,12 +15,12 @@ import (
 	"sub2clash/validator"
 )
 
-func BuildSub(query validator.SubQuery, template string) (
+func BuildSub(clashType model.ClashType, query validator.SubValidator, template string) (
 	*model.Subscription, error,
 ) {
 	// 定义变量
-	var temp *model.Subscription
+	var temp = &model.Subscription{}
-	var sub *model.Subscription
+	var sub = &model.Subscription{}
 	var err error
 	var templateBytes []byte
 	// 加载模板
@@ -43,6 +44,7 @@ func BuildSub(query validator.SubQuery, template string) (
 	if err != nil {
 		return nil, errors.New("解析模板失败: " + err.Error())
 	}
+	var proxyList []model.Proxy
 	// 加载订阅
 	for i := range query.Subs {
 		data, err := utils.LoadSubscription(query.Subs[i], query.Refresh)
@@ -50,31 +52,49 @@ func BuildSub(query validator.SubQuery, template string) (
 			return nil, errors.New("加载订阅失败: " + err.Error())
 		}
 		// 解析订阅
-		var proxyList []model.Proxy
+
 		err = yaml.Unmarshal(data, &sub)
 		if err != nil {
 			reg, _ := regexp.Compile("(ssr|ss|vmess|trojan|http|https)://")
 			if reg.Match(data) {
-				proxyList = utils.ParseProxy(strings.Split(string(data), "\n")...)
+				p := utils.ParseProxy(strings.Split(string(data), "\n")...)
+				proxyList = append(proxyList, p...)
 			} else {
 				// 如果无法直接解析，尝试Base64解码
 				base64, err := parser.DecodeBase64(string(data))
 				if err != nil {
 					return nil, errors.New("加载订阅失败: " + err.Error())
 				}
-				proxyList = utils.ParseProxy(strings.Split(base64, "\n")...)
+				p := utils.ParseProxy(strings.Split(base64, "\n")...)
+				proxyList = append(proxyList, p...)
 			}
 		} else {
-			proxyList = sub.Proxies
+			proxyList = append(proxyList, sub.Proxies...)
 		}
-		utils.AddProxy(sub, query.AutoTest, query.Lazy, query.Sort, proxyList...)
 	}
+	// 将新增节点都添加到临时变量 t 中，防止策略组排序错乱
+	var t = &model.Subscription{}
+	utils.AddProxy(t, query.AutoTest, query.Lazy, clashType, proxyList...)
 	// 处理自定义代理
 	utils.AddProxy(
-		sub, query.AutoTest, query.Lazy, query.Sort,
+		t, query.AutoTest, query.Lazy, clashType,
 		utils.ParseProxy(query.Proxies...)...,
 	)
-	MergeSubAndTemplate(temp, sub)
+	// 排序策略组
+	switch query.Sort {
+	case "sizeasc":
+		sort.Sort(model.ProxyGroupsSortBySize(t.ProxyGroups))
+	case "sizedesc":
+		sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(t.ProxyGroups)))
+	case "nameasc":
+		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups))
+	case "namedesc":
+		sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(t.ProxyGroups)))
+	default:
+		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups))
+	}
+	// 合并新节点和模板
+	MergeSubAndTemplate(temp, t)
 	// 处理自定义规则
 	for _, v := range query.Rules {
 		if v.Prepend {
@@ -85,7 +105,7 @@ func BuildSub(query validator.SubQuery, template string) (
 	}
 	// 处理自定义 ruleProvider
 	for _, v := range query.RuleProviders {
-		hash := md5.Sum([]byte(v.Url))
+		hash := sha256.Sum224([]byte(v.Url))
 		name := hex.EncodeToString(hash[:])
 		provider := model.RuleProvider{
 			Type:     "http",

api/controller/meta.go

@@ -6,6 +6,7 @@ import (
 	"gopkg.in/yaml.v3"
 	"net/http"
 	"sub2clash/config"
+	"sub2clash/model"
 	"sub2clash/validator"
 )
 
@@ -16,7 +17,7 @@ func SubHandler(c *gin.Context) {
 		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
-	sub, err := BuildSub(query, config.Default.MetaTemplate)
+	sub, err := BuildSub(model.ClashMeta, query, config.Default.MetaTemplate)
 	if err != nil {
 		c.String(http.StatusInternalServerError, err.Error())
 		return

api/controller/short_link.go

@@ -0,0 +1,79 @@
+package controller
+
+import (
+	"errors"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+	"net/http"
+	"strings"
+	"sub2clash/config"
+	"sub2clash/model"
+	"sub2clash/utils"
+	"sub2clash/utils/database"
+	"sub2clash/validator"
+	"time"
+)
+
+func ShortLinkGenHandler(c *gin.Context) {
+	// 从请求中获取参数
+	var params validator.ShortLinkGenValidator
+	if err := c.ShouldBind(&params); err != nil {
+		c.String(400, "参数错误: "+err.Error())
+	}
+	if strings.TrimSpace(params.Url) == "" {
+		c.String(400, "参数错误")
+		return
+	}
+	// 生成hash
+	hash := utils.RandomString(config.Default.ShortLinkLength)
+	// 存入数据库
+	var item model.ShortLink
+	result := database.FindShortLinkByUrl(params.Url, &item)
+	if result.Error == nil {
+		c.String(200, item.Hash)
+		return
+	} else {
+		if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			c.String(500, "数据库错误: "+result.Error.Error())
+			return
+		}
+	}
+	// 如果记录存在则重新生成hash，直到记录不存在
+	result = database.FindShortLinkByHash(hash, &item)
+	for result.Error == nil {
+		hash = utils.RandomString(config.Default.ShortLinkLength)
+		result = database.FindShortLinkByHash(hash, &item)
+	}
+	// 创建记录
+	database.FirstOrCreateShortLink(
+		&model.ShortLink{
+			Hash:            hash,
+			Url:             params.Url,
+			LastRequestTime: -1,
+		},
+	)
+	// 返回短链接
+	c.String(200, hash)
+}
+
+func ShortLinkGetHandler(c *gin.Context) {
+	// 获取动态路由
+	hash := c.Param("hash")
+	if strings.TrimSpace(hash) == "" {
+		c.String(400, "参数错误")
+		return
+	}
+	// 查询数据库
+	var shortLink model.ShortLink
+	result := database.FindShortLinkByHash(hash, &shortLink)
+	// 重定向
+	if result.Error != nil {
+		c.String(404, "未找到短链接")
+		return
+	}
+	// 更新最后访问时间
+	shortLink.LastRequestTime = time.Now().Unix()
+	database.SaveShortLink(&shortLink)
+	uri := config.Default.BasePath + shortLink.Url
+	c.Redirect(http.StatusTemporaryRedirect, uri)
+}

api/route.go

@@ -1,13 +1,30 @@
 package api
 
 import (
+	"embed"
 	"github.com/gin-gonic/gin"
+	"html/template"
 	"sub2clash/api/controller"
+	"sub2clash/config"
 	"sub2clash/middleware"
 )
 
+//go:embed templates/*
+var templates embed.FS
+
 func SetRoute(r *gin.Engine) {
 	r.Use(middleware.ZapLogger())
+	// 使用内嵌的模板文件
+	r.SetHTMLTemplate(template.Must(template.New("").ParseFS(templates, "templates/*")))
+	r.GET(
+		"/", func(c *gin.Context) {
+			c.HTML(
+				200, "index.html", gin.H{
+					"Version": config.Version,
+				},
+			)
+		},
+	)
 	r.GET(
 		"/clash", func(c *gin.Context) {
 			controller.SubmodHandler(c)
@@ -18,4 +35,14 @@ func SetRoute(r *gin.Engine) {
 			controller.SubHandler(c)
 		},
 	)
+	r.POST(
+		"/short", func(c *gin.Context) {
+			controller.ShortLinkGenHandler(c)
+		},
+	)
+	r.GET(
+		"/s/:hash", func(c *gin.Context) {
+			controller.ShortLinkGetHandler(c)
+		},
+	)
 }

api/templates/index.html

@@ -0,0 +1,425 @@
+<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta content="width=device-width, initial-scale=1.0" name="viewport" />
+    <title>sub2clash</title>
+
+    <!-- Bootstrap CSS -->
+    <link
+      crossorigin="anonymous"
+      href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
+      integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
+      rel="stylesheet"
+    />
+
+    <!-- Bootstrap JS -->
+    <script
+      crossorigin="anonymous"
+      integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+      src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+    ></script>
+
+    <!-- Axios -->
+    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+
+    <style>
+      .container {
+        max-width: 800px;
+      }
+
+      .btn-xs {
+        padding: 2px 2px; /* 调整内边距以减小按钮大小 */
+        font-size: 10px; /* 设置字体大小 */
+        line-height: 1.2; /* 调整行高 */
+        border-radius: 3px; /* 可选的边框半径调整 */
+        height: 25px;
+        width: 25px;
+      }
+    </style>
+  </head>
+
+  <body class="bg-light">
+    <div class="container mt-5">
+      <div class="mb-4">
+        <h2>sub2clash</h2>
+        <span class="text-muted fst-italic"
+          >通用订阅链接转 Clash(Meta) 配置工具
+          <a
+            href="https://github.com/nitezs/sub2clash#clash-meta"
+            target="_blank"
+            >使用文档</a
+          ></span
+        >
+      </div>
+
+      <form id="apiForm">
+        <!-- API Endpoint -->
+        <div class="form-group mb-3">
+          <label for="endpoint">客户端类型:</label>
+          <select class="form-control" id="endpoint" name="endpoint">
+            <option value="clash">Clash</option>
+            <option value="meta">Clash.Meta</option>
+          </select>
+        </div>
+
+        <!-- Subscription Link -->
+        <div class="form-group mb-3">
+          <label for="sub">订阅链接:</label>
+          <textarea
+            class="form-control"
+            id="sub"
+            name="sub"
+            placeholder="每行输入一个订阅链接"
+            rows="5"
+          ></textarea>
+        </div>
+
+        <!-- Proxy Link -->
+        <div class="form-group mb-3">
+          <label for="proxy">节点分享链接:</label>
+          <textarea
+            class="form-control"
+            id="proxy"
+            name="proxy"
+            placeholder="每行输入一个节点分享链接"
+            rows="5"
+          ></textarea>
+        </div>
+
+        <!-- Refresh -->
+        <div class="form-check mb-3">
+          <input
+            class="form-check-input"
+            id="refresh"
+            name="refresh"
+            type="checkbox"
+          />
+          <label class="form-check-label" for="refresh">强制刷新配置</label>
+        </div>
+
+        <!-- Template -->
+        <div class="form-group mb-3">
+          <label for="template">模板链接或名称（可选）:</label>
+          <input
+            class="form-control"
+            id="template"
+            name="template"
+            placeholder="输入外部模板链接或内部模板名称"
+            type="text"
+          />
+        </div>
+
+        <!-- Rule Provider -->
+        <div class="form-group mb-3" id="ruleProviderGroup">
+          <label>Rule Provider:</label>
+          <button
+            class="btn btn-primary mb-1 btn-xs"
+            onclick="addRuleProvider()"
+            type="button"
+          >
+            +
+          </button>
+        </div>
+
+        <!-- Rule -->
+        <div class="form-group mb-3" id="ruleGroup">
+          <label>规则:</label>
+          <button
+            class="btn btn-primary mb-1 btn-xs"
+            onclick="addRule()"
+            type="button"
+          >
+            +
+          </button>
+        </div>
+
+        <!-- Auto Test -->
+        <div class="form-check mb-3">
+          <input
+            class="form-check-input"
+            id="autoTest"
+            name="autoTest"
+            type="checkbox"
+          />
+          <label class="form-check-label" for="autoTest"
+            >国家策略组自动测速</label
+          >
+        </div>
+
+        <!-- Lazy -->
+        <div class="form-check mb-3">
+          <input
+            class="form-check-input"
+            id="lazy"
+            name="lazy"
+            type="checkbox"
+          />
+          <label class="form-check-label" for="lazy">自动测速启用 lazy</label>
+        </div>
+
+        <!-- Sort -->
+        <div class="form-group mb-3">
+          <label for="sort">国家策略组排序策略:</label>
+          <select class="form-control" id="sort" name="sort">
+            <option value="nameasc">名称（升序）</option>
+            <option value="namedesc">名称（降序）</option>
+            <option value="sizeasc">节点数量（升序）</option>
+            <option value="sizedesc">节点数量（降序）</option>
+          </select>
+        </div>
+      </form>
+
+      <!-- Display the API Link -->
+      <div class="form-group mb-5">
+        <label for="apiLink">配置链接:</label>
+        <div class="input-group mb-2">
+          <input class="form-control" id="apiLink" readonly type="text" />
+          <button class="btn btn-primary" onclick="generateURL()" type="button">
+            生成链接
+          </button>
+          <button
+            class="btn btn-primary"
+            onclick="copyToClipboard('apiLink',this)"
+            type="button"
+          >
+            复制链接
+          </button>
+        </div>
+        <div class="input-group">
+          <input class="form-control" id="apiShortLink" readonly type="text" />
+          <button
+            class="btn btn-primary"
+            onclick="generateShortLink()"
+            type="button"
+          >
+            生成短链
+          </button>
+          <button
+            class="btn btn-primary"
+            onclick="copyToClipboard('apiShortLink',this)"
+            type="button"
+          >
+            复制短链
+          </button>
+        </div>
+      </div>
+
+      <!-- footer-->
+      <footer>
+        <p class="text-center">
+          Powered by
+          <a class="link-primary" href="https://github.com/nitezs/sub2clash"
+            >sub2clash</a
+          >
+        </p>
+        <p class="text-center">Version {{.Version}}</p>
+      </footer>
+    </div>
+
+    <script>
+      async function copyToClipboard(elem, e) {
+        const apiLinkInput = document.querySelector(`#${elem}`).value;
+        try {
+          await navigator.clipboard.writeText(apiLinkInput);
+          let text = e.textContent;
+          e.addEventListener("mouseout", function () {
+            e.textContent = text;
+          });
+          e.textContent = "复制成功";
+        } catch (err) {
+          console.error("复制到剪贴板失败:", err);
+        }
+      }
+
+      function createRuleProvider() {
+        const div = document.createElement("div");
+        div.classList.add("input-group", "mb-2");
+        div.innerHTML = `
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Behavior">
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Url">
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Group">
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Prepend">
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Name">
+            <button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button>
+        `;
+        return div;
+      }
+
+      function createRule() {
+        const div = document.createElement("div");
+        div.classList.add("input-group", "mb-2");
+        div.innerHTML = `
+            <input type="text" class="form-control" name="rule" placeholder="Rule">
+            <input type="text" class="form-control" name="rule" placeholder="Prepend">
+            <input type="text" class="form-control" name="rule" placeholder="Group">
+            <button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button>
+        `;
+        return div;
+      }
+
+      function addRuleProvider() {
+        const div = createRuleProvider();
+        document.getElementById("ruleProviderGroup").appendChild(div);
+      }
+
+      function addRule() {
+        const div = createRule();
+        document.getElementById("ruleGroup").appendChild(div);
+      }
+
+      function removeElement(button) {
+        button.parentElement.remove();
+      }
+
+      function generateURI() {
+        const queryParams = [];
+
+        // 获取 API Endpoint
+        const endpoint = document.getElementById("endpoint").value;
+
+        // 获取并组合订阅链接
+        let subLines = document
+          .getElementById("sub")
+          .value.split("\n")
+          .filter((line) => line.trim() !== "");
+        let noSub = false;
+        // 去除 subLines 中空元素
+        subLines = subLines.map((item) => {
+          if (item !== "") {
+            return item;
+          }
+        });
+        if (subLines.length > 0) {
+          queryParams.push(`sub=${encodeURIComponent(subLines.join(","))}`);
+        } else {
+          noSub = true;
+        }
+
+        // 获取并组合节点分享链接
+        let proxyLines = document
+          .getElementById("proxy")
+          .value.split("\n")
+          .filter((line) => line.trim() !== "");
+        let noProxy = false;
+        // 去除 proxyLines 中空元素
+        proxyLines = proxyLines.map((item) => {
+          if (item !== "") {
+            return item;
+          }
+        });
+        if (proxyLines.length > 0) {
+          queryParams.push(`proxy=${encodeURIComponent(proxyLines.join(","))}`);
+        } else {
+          noProxy = true;
+        }
+        if (noSub && noProxy) {
+          alert("订阅链接和节点分享链接不能同时为空！");
+          return "";
+        }
+        // 获取复选框的值
+        const refresh = document.getElementById("refresh").checked;
+        queryParams.push(`refresh=${refresh ? "true" : "false"}`);
+        const autoTest = document.getElementById("autoTest").checked;
+        queryParams.push(`autoTest=${autoTest ? "true" : "false"}`);
+        const lazy = document.getElementById("lazy").checked;
+        queryParams.push(`lazy=${lazy ? "true" : "false"}`);
+
+        // 获取模板链接或名称（如果存在）
+        const template = document.getElementById("template").value;
+        if (template.trim() !== "") {
+          queryParams.push(`template=${encodeURIComponent(template)}`);
+        }
+
+        // 获取Rule Provider和规则
+        const ruleProviders = document.getElementsByName("ruleProvider");
+        const rules = document.getElementsByName("rule");
+        let providers = [];
+        for (let i = 0; i < ruleProviders.length / 5; i++) {
+          let baseIndex = i * 5;
+          let behavior = ruleProviders[baseIndex].value;
+          let url = ruleProviders[baseIndex + 1].value;
+          let group = ruleProviders[baseIndex + 2].value;
+          let prepend = ruleProviders[baseIndex + 3].value;
+          let name = ruleProviders[baseIndex + 4].value;
+          // 是否存在空值
+          if (
+            behavior.trim() === "" ||
+            url.trim() === "" ||
+            group.trim() === "" ||
+            prepend.trim() === "" ||
+            name.trim() === ""
+          ) {
+            alert("Rule Provider 中存在空值，请检查后重试！");
+            return "";
+          }
+          providers.push(`[${behavior},${url},${group},${prepend},${name}]`);
+        }
+        queryParams.push(
+          `ruleProvider=${encodeURIComponent(providers.join(","))}`,
+        );
+
+        let ruleList = [];
+        for (let i = 0; i < rules.length / 3; i++) {
+          if (rules[i * 3].value.trim() !== "") {
+            let rule = rules[i * 3].value;
+            let prepend = rules[i * 3 + 1].value;
+            let group = rules[i * 3 + 2].value;
+            // 是否存在空值
+            if (
+              rule.trim() === "" ||
+              prepend.trim() === "" ||
+              group.trim() === ""
+            ) {
+              alert("Rule 中存在空值，请检查后重试！");
+              return "";
+            }
+            ruleList.push(`[${rule},${prepend},${group}]`);
+          }
+        }
+        queryParams.push(`rule=${encodeURIComponent(ruleList.join(","))}`);
+
+        // 获取排序策略
+        const sort = document.getElementById("sort").value;
+        queryParams.push(`sort=${sort}`);
+        return `${endpoint}?${queryParams.join("&")}`;
+      }
+
+      function generateURL() {
+        const apiLink = document.getElementById("apiLink");
+        let uri = generateURI();
+        if (uri === "") {
+          return;
+        }
+        apiLink.value = `${window.location.origin}${window.location.pathname}${uri}`;
+      }
+
+      function generateShortLink() {
+        const apiShortLink = document.getElementById("apiShortLink");
+        let uri = generateURI();
+        if (uri === "") {
+          return;
+        }
+        axios
+          .post(
+            "./short",
+            {
+              url: uri,
+            },
+            {
+              headers: {
+                "Content-Type": "application/json",
+              },
+            },
+          )
+          .then((response) => {
+            apiShortLink.value = `${window.location.origin}${window.location.pathname}s/${response.data}`;
+          })
+          .catch((error) => {
+            console.log(error);
+            alert("生成短链失败，请重试！");
+          });
+      }
+    </script>
+  </body>
+</html>

config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"errors"
 	"github.com/joho/godotenv"
 	"os"
 	"strconv"
@@ -14,11 +15,15 @@ type Config struct {
 	RequestMaxFileSize int64
 	CacheExpire        int64
 	LogLevel           string
+	BasePath           string
+	ShortLinkLength    int
 }
 
 var Default *Config
+var Version string
+var Dev string
 
-func init() {
+func LoadConfig() error {
 	Default = &Config{
 		MetaTemplate:       "template_meta.yaml",
 		ClashTemplate:      "template_clash.yaml",
@@ -27,15 +32,14 @@ func init() {
 		Port:               8011,
 		CacheExpire:        60 * 5,
 		LogLevel:           "info",
+		BasePath:           "/",
+		ShortLinkLength:    6,
 	}
-	err := godotenv.Load()
+	_ = godotenv.Load()
-	if err != nil {
-		return
-	}
 	if os.Getenv("PORT") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("PORT"))
 		if err != nil {
-			panic("PORT invalid")
+			return errors.New("PORT invalid")
 		}
 		Default.Port = atoi
 	}
@@ -48,25 +52,39 @@ func init() {
 	if os.Getenv("REQUEST_RETRY_TIMES") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("REQUEST_RETRY_TIMES"))
 		if err != nil {
-			panic("REQUEST_RETRY_TIMES invalid")
+			return errors.New("REQUEST_RETRY_TIMES invalid")
 		}
 		Default.RequestRetryTimes = atoi
 	}
 	if os.Getenv("REQUEST_MAX_FILE_SIZE") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("REQUEST_MAX_FILE_SIZE"))
 		if err != nil {
-			panic("REQUEST_MAX_FILE_SIZE invalid")
+			return errors.New("REQUEST_MAX_FILE_SIZE invalid")
 		}
 		Default.RequestMaxFileSize = int64(atoi)
 	}
 	if os.Getenv("CACHE_EXPIRE") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("CACHE_EXPIRE"))
 		if err != nil {
-			panic("CACHE_EXPIRE invalid")
+			return errors.New("CACHE_EXPIRE invalid")
 		}
 		Default.CacheExpire = int64(atoi)
 	}
 	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("SHORT_LINK_LENGTH") != "" {
+		atoi, err := strconv.Atoi(os.Getenv("SHORT_LINK_LENGTH"))
+		if err != nil {
+			return errors.New("SHORT_LINK_LENGTH invalid")
+		}
+		Default.ShortLinkLength = atoi
+	}
+	return nil
 }

docker-compose.yml

@@ -8,8 +8,9 @@ services:
     ports:
       - "8011:8011"
     volumes:
-      - ./templates:/app/templates
       - ./logs:/app/logs
+      - ./templates:/app/templates
+      - ./data:/app/data
     # environment:
     #   - PORT=8011
     #   - META_TEMPLATE=template_meta.yaml

go.mod

@@ -4,21 +4,30 @@ go 1.21
 
 require (
 	github.com/gin-gonic/gin v1.9.1
+	github.com/glebarez/sqlite v1.9.0
 	github.com/joho/godotenv v1.5.1
-	go.uber.org/zap v1.25.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/text v0.13.0
 	gopkg.in/yaml.v3 v3.0.1
+	gorm.io/gorm v1.25.4
 )
 
 require (
 	github.com/bytedance/sonic v1.10.1 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/glebarez/go-sqlite v1.21.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.15.4 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
@@ -26,6 +35,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
@@ -33,6 +43,9 @@ require (
 	golang.org/x/crypto v0.13.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
+	modernc.org/libc v1.22.5 // indirect
+	modernc.org/mathutil v1.5.0 // indirect
+	modernc.org/memory v1.5.0 // indirect
+	modernc.org/sqlite v1.23.1 // indirect
 )

go.sum

@@ -1,5 +1,3 @@
-github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
-github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.10.1 h1:7a1wuFXL1cMy7a3f7/VFcEtriuXQnUBhtoVfOZiaysc=
@@ -13,12 +11,18 @@ github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
+github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
+github.com/glebarez/sqlite v1.9.0 h1:Aj6bPA12ZEx5GbSF6XADmCkYXlljPNUY+Zf1EQxynXs=
+github.com/glebarez/sqlite v1.9.0/go.mod h1:YBYCoyupOao60lzp1MVBLEjZfgkq0tdB1voAQ09K9zw=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -30,9 +34,18 @@ github.com/go-playground/validator/v10 v10.15.4/go.mod h1:9iXMNT7sEkjXb0I+enO7QX
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -54,6 +67,9 @@ github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -73,8 +89,8 @@ go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
 go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
-go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y=
 golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
@@ -88,7 +104,6 @@ golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
@@ -98,5 +113,15 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw=
+gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
+modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
+modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
+modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
+modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
+modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

logger/logger.go

@@ -4,8 +4,6 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"path/filepath"
-	"sub2clash/config"
-	"sub2clash/utils"
 	"sync"
 	"time"
 )
@@ -13,9 +11,11 @@ import (
 var (
 	Logger   *zap.Logger
 	lock     sync.Mutex
+	logLevel string
 )
 
-func init() {
+func InitLogger(level string) {
+	logLevel = level
 	buildLogger()
 	go rotateLogs()
 }
@@ -24,7 +24,7 @@ func buildLogger() {
 	lock.Lock()
 	defer lock.Unlock()
 	var level zapcore.Level
-	switch config.Default.LogLevel {
+	switch logLevel {
 	case "error":
 		level = zap.ErrorLevel
 	case "debug":
@@ -36,10 +36,6 @@ func buildLogger() {
 	default:
 		level = zap.InfoLevel
 	}
-	err := utils.MKDir("logs")
-	if err != nil {
-		panic("创建日志失败" + err.Error())
-	}
 	zapConfig := zap.NewProductionConfig()
 	zapConfig.Encoding = "console"
 	zapConfig.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
@@ -47,9 +43,10 @@ func buildLogger() {
 	zapConfig.OutputPaths = []string{"stdout", getLogFileName("info")}
 	zapConfig.ErrorOutputPaths = []string{"stderr", getLogFileName("error")}
 	zapConfig.Level = zap.NewAtomicLevelAt(level)
+	var err error
 	Logger, err = zapConfig.Build()
 	if err != nil {
-		panic("创建日志失败" + err.Error())
+		panic("log failed" + err.Error())
 	}
 }
 

main.go

@@ -5,13 +5,12 @@ import (
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 	"io"
-	"os"
-	"path/filepath"
 	"strconv"
 	"sub2clash/api"
 	"sub2clash/config"
 	"sub2clash/logger"
 	"sub2clash/utils"
+	"sub2clash/utils/database"
 )
 
 //go:embed templates/template_meta.yaml
@@ -20,39 +19,44 @@ var templateMeta string
 //go:embed templates/template_clash.yaml
 var templateClash string
 
-func writeTemplate(path string, template string) error {
-	tPath := filepath.Join(
-		"templates", path,
-	)
-	if _, err := os.Stat(tPath); os.IsNotExist(err) {
-		file, err := os.Create(tPath)
-		if err != nil {
-			return err
-		}
-		defer func(file *os.File) {
-			_ = file.Close()
-		}(file)
-		_, err = file.WriteString(template)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func init() {
-	if err := utils.MKDir("subs"); err != nil {
+	// 加载配置
-		os.Exit(1)
+	err := config.LoadConfig()
+	// 初始化日志
+	logger.InitLogger(config.Default.LogLevel)
+	if err != nil {
+		logger.Logger.Panic("load config failed", zap.Error(err))
 	}
-	if err := utils.MKDir("templates"); err != nil {
+	// 检查更新
-		os.Exit(1)
+	if config.Dev != "true" {
+		go func() {
+			update, newVersion, err := utils.CheckUpdate()
+			if err != nil {
+				logger.Logger.Warn("check update failed", zap.Error(err))
 			}
-	if err := writeTemplate(config.Default.MetaTemplate, templateMeta); err != nil {
+			if update {
-		os.Exit(1)
+				logger.Logger.Info("new version is available", zap.String("version", newVersion))
 			}
-	if err := writeTemplate(config.Default.ClashTemplate, templateClash); err != nil {
+		}()
-		os.Exit(1)
+	} else {
+		logger.Logger.Info("running in dev mode")
 	}
+	// 创建文件夹
+	err = utils.MkEssentialDir()
+	if err != nil {
+		logger.Logger.Panic("create essential dir failed", zap.Error(err))
+	}
+	// 写入默认模板
+	err = utils.WriteDefalutTemplate(templateMeta, templateClash)
+	if err != nil {
+		logger.Logger.Panic("write default template failed", zap.Error(err))
+	}
+	// 连接数据库
+	err = database.ConnectDB()
+	if err != nil {
+		logger.Logger.Panic("database connect failed", zap.Error(err))
+	}
+	logger.Logger.Info("database connect success")
 }
 
 func main() {
@@ -64,10 +68,10 @@ func main() {
 	r := gin.Default()
 	// 设置路由
 	api.SetRoute(r)
-	logger.Logger.Info("Server is running at http://localhost:" + strconv.Itoa(config.Default.Port))
+	logger.Logger.Info("server is running at http://localhost:" + strconv.Itoa(config.Default.Port))
 	err := r.Run(":" + strconv.Itoa(config.Default.Port))
 	if err != nil {
-		logger.Logger.Error("Server run error", zap.Error(err))
+		logger.Logger.Error("server running failed", zap.Error(err))
 		return
 	}
 }

model/clash.go

@@ -0,0 +1,29 @@
+package model
+
+type ClashType int
+
+const (
+	Clash ClashType = 1 + iota
+	ClashMeta
+)
+
+func GetSupportProxyTypes(clashType ClashType) map[string]bool {
+	if clashType == Clash {
+		return map[string]bool{
+			"ss":     true,
+			"ssr":    true,
+			"vmess":  true,
+			"trojan": true,
+		}
+	}
+	if clashType == ClashMeta {
+		return map[string]bool{
+			"ss":     true,
+			"ssr":    true,
+			"vmess":  true,
+			"trojan": true,
+			"vless":  true,
+		}
+	}
+	return nil
+}

model/github.go

@@ -0,0 +1,12 @@
+package model
+
+type Tags []struct {
+	Name       string `json:"name"`
+	ZipballUrl string `json:"zipball_url"`
+	TarballUrl string `json:"tarball_url"`
+	Commit     struct {
+		Sha string `json:"sha"`
+		Url string `json:"url"`
+	}
+	NodeId string `json:"node_id"`
+}

model/proxy_group.go

@@ -39,7 +39,6 @@ func (p ProxyGroupsSortByName) Less(i, j int) bool {
 	bestMatch, _, _ := matcher.Match(language.Make("zh"))
 	// 使用最佳匹配的语言进行排序
 	c := collate.New(bestMatch)
-
 	return c.CompareString(p[i].Name, p[j].Name) < 0
 }
 

model/rule_provider.go

@@ -0,0 +1,13 @@
+package model
+
+type RuleProvider struct {
+	Type     string `yaml:"type,omitempty"`
+	Behavior string `yaml:"behavior,omitempty"`
+	Url      string `yaml:"url,omitempty"`
+	Path     string `yaml:"path,omitempty"`
+	Interval int    `yaml:"interval,omitempty"`
+}
+
+type Payload struct {
+	Rules []string `yaml:"payload,omitempty"`
+}

model/short_link.go

@@ -0,0 +1,7 @@
+package model
+
+type ShortLink struct {
+	Hash            string `gorm:"primary_key"`
+	Url             string
+	LastRequestTime int64
+}

model/sub.go

@@ -12,15 +12,3 @@ type Subscription struct {
 	Rules              []string                `yaml:"rules,omitempty"`
 	RuleProviders      map[string]RuleProvider `yaml:"rule-providers,omitempty,omitempty"`
 }
-
-type RuleProvider struct {
-	Type     string `yaml:"type,omitempty"`
-	Behavior string `yaml:"behavior,omitempty"`
-	Url      string `yaml:"url,omitempty"`
-	Path     string `yaml:"path,omitempty"`
-	Interval int    `yaml:"interval,omitempty"`
-}
-
-type Payload struct {
-	Rules []string `yaml:"payload,omitempty"`
-}

parser/ss.go

@@ -12,12 +12,12 @@ import (
 func ParseSS(proxy string) (model.Proxy, error) {
 	// 判断是否以 ss:// 开头
 	if !strings.HasPrefix(proxy, "ss://") {
-		return model.Proxy{}, fmt.Errorf("无效的 ss Url")
+		return model.Proxy{}, fmt.Errorf("invalid ss Url")
 	}
 	// 分割
 	parts := strings.SplitN(strings.TrimPrefix(proxy, "ss://"), "@", 2)
 	if len(parts) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 ss Url")
+		return model.Proxy{}, fmt.Errorf("invalid ss Url")
 	}
 	if !strings.Contains(parts[0], ":") {
 		// 解码
@@ -29,13 +29,13 @@ func ParseSS(proxy string) (model.Proxy, error) {
 	}
 	credentials := strings.SplitN(parts[0], ":", 2)
 	if len(credentials) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 ss 凭证")
+		return model.Proxy{}, fmt.Errorf("invalid ss Url")
 	}
 	// 分割
 	serverInfo := strings.SplitN(parts[1], "#", 2)
 	serverAndPort := strings.SplitN(serverInfo[0], ":", 2)
 	if len(serverAndPort) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 ss 服务器和端口")
+		return model.Proxy{}, fmt.Errorf("invalid ss Url")
 	}
 	// 转换端口字符串为数字
 	port, err := strconv.Atoi(strings.TrimSpace(serverAndPort[1]))

parser/ssr.go

@@ -11,9 +11,10 @@ import (
 func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 	// 判断是否以 ssr:// 开头
 	if !strings.HasPrefix(proxy, "ssr://") {
-		return model.Proxy{}, fmt.Errorf("无效的 ssr Url")
+		return model.Proxy{}, fmt.Errorf("invalid ssr Url")
 	}
 	var err error
+	proxy = strings.TrimPrefix(proxy, "ssr://")
 	if !strings.Contains(proxy, ":") {
 		proxy, err = DecodeBase64(strings.TrimPrefix(proxy, "ssr://"))
 		if err != nil {
@@ -21,7 +22,7 @@ func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 		}
 	}
 	// 分割
-	detailsAndParams := strings.SplitN(strings.TrimPrefix(proxy, "ssr://"), "/?", 2)
+	detailsAndParams := strings.SplitN(proxy, "/?", 2)
 	parts := strings.Split(detailsAndParams[0], ":")
 	params, err := url.ParseQuery(detailsAndParams[1])
 	if err != nil {
@@ -32,7 +33,21 @@ func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 	if err != nil {
 		return model.Proxy{}, err
 	}
+	var obfsParam string
+	var protoParam string
+	var remarks string
+	if params.Get("obfsparam") != "" {
+		obfsParam, err = DecodeBase64(params.Get("obfsparam"))
+	}
+	if params.Get("protoparam") != "" {
+		protoParam, err = DecodeBase64(params.Get("protoparam"))
+	}
+	if params.Get("remarks") != "" {
+		remarks, err = DecodeBase64(params.Get("remarks"))
+	}
+
 	result := model.Proxy{
+		Name:          remarks,
 		Type:          "ssr",
 		Server:        parts[0],
 		Port:          port,
@@ -40,8 +55,13 @@ func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 		Cipher:        parts[3],
 		Obfs:          parts[4],
 		Password:      parts[5],
-		ObfsParam:     params.Get("obfsparam"),
+		ObfsParam:     obfsParam,
-		ProtocolParam: params.Get("protoparam"),
+		ProtocolParam: protoParam,
 	}
+
+	if result.Name == "" {
+		result.Name = result.Server
+	}
+
 	return result, nil
 }

parser/trojan.go

@@ -11,12 +11,12 @@ import (
 func ParseTrojan(proxy string) (model.Proxy, error) {
 	// 判断是否以 trojan:// 开头
 	if !strings.HasPrefix(proxy, "trojan://") {
-		return model.Proxy{}, fmt.Errorf("无效的 trojan Url")
+		return model.Proxy{}, fmt.Errorf("invalid trojan Url")
 	}
 	// 分割
 	parts := strings.SplitN(strings.TrimPrefix(proxy, "trojan://"), "@", 2)
 	if len(parts) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 trojan Url")
+		return model.Proxy{}, fmt.Errorf("invalid trojan Url")
 	}
 	// 分割
 	serverInfo := strings.SplitN(parts[1], "#", 2)
@@ -27,7 +27,7 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 		return model.Proxy{}, err
 	}
 	if len(serverAndPort) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 trojan 服务器和端口")
+		return model.Proxy{}, fmt.Errorf("invalid trojan")
 	}
 	// 处理端口
 	port, err := strconv.Atoi(strings.TrimSpace(serverAndPort[1]))

parser/vless.go

@@ -11,12 +11,12 @@ import (
 func ParseVless(proxy string) (model.Proxy, error) {
 	// 判断是否以 vless:// 开头
 	if !strings.HasPrefix(proxy, "vless://") {
-		return model.Proxy{}, fmt.Errorf("无效的 vless Url")
+		return model.Proxy{}, fmt.Errorf("invalid vless Url")
 	}
 	// 分割
 	parts := strings.SplitN(strings.TrimPrefix(proxy, "vless://"), "@", 2)
 	if len(parts) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 vless Url")
+		return model.Proxy{}, fmt.Errorf("invalid vless Url")
 	}
 	// 分割
 	serverInfo := strings.SplitN(parts[1], "#", 2)
@@ -27,7 +27,7 @@ func ParseVless(proxy string) (model.Proxy, error) {
 		return model.Proxy{}, err
 	}
 	if len(serverAndPort) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 vless 服务器和端口")
+		return model.Proxy{}, fmt.Errorf("invalid vless")
 	}
 	// 处理端口
 	port, err := strconv.Atoi(strings.TrimSpace(serverAndPort[1]))

parser/vmess.go

@@ -12,7 +12,7 @@ import (
 func ParseVmess(proxy string) (model.Proxy, error) {
 	// 判断是否以 vmess:// 开头
 	if !strings.HasPrefix(proxy, "vmess://") {
-		return model.Proxy{}, fmt.Errorf("无效的 vmess Url")
+		return model.Proxy{}, fmt.Errorf("invalid vmess Url")
 	}
 	// 解码
 	base64, err := DecodeBase64(strings.TrimPrefix(proxy, "vmess://"))

templates/template_meta.yaml

@@ -13,6 +13,12 @@ proxy-groups:
   - name: 手动切换
     type: select
     proxies:
+  - name: 微软服务
+    type: select
+    proxies:
+      - 节点选择
+      - 手动切换
+      - DIRECT
   - name: 游戏平台
     type: select
     proxies:
@@ -48,14 +54,14 @@ proxy-groups:
       - 手动切换
       - DIRECT
 rules:
-  - GEOSITE,private,全球直连
+  - GEOSITE,private,全球直连,no-resolve
   - GEOIP,private,全球直连
   - GEOSITE,category-ads-all,广告拦截
-  - GEOSITE,CN,全球直连
+  - GEOSITE,microsoft,微软服务
-  - GEOIP,CN,全球直连
-  - GEOSITE,biliintl,哔哩哔哩
   - GEOSITE,bilibili,哔哩哔哩
   - GEOSITE,bahamut,巴哈姆特
   - GEOSITE,category-games,游戏平台
   - GEOSITE,geolocation-!cn,节点选择
+  - GEOSITE,CN,全球直连
+  - GEOIP,CN,全球直连
   - MATCH,漏网之鱼

utils/check_update.go

@@ -0,0 +1,33 @@
+package utils
+
+import (
+	"encoding/json"
+	"errors"
+	"io"
+	"sub2clash/config"
+	"sub2clash/model"
+)
+
+func CheckUpdate() (bool, string, error) {
+	get, err := Get("https://api.github.com/repos/nitezs/sub2clash/tags")
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	var version model.Tags
+	all, err := io.ReadAll(get.Body)
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	err = json.Unmarshal(all, &version)
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	if version[0].Name == config.Version {
+		return false, "", nil
+	} else {
+		return true, version[0].Name, nil
+	}
+}

utils/database/database.go

@@ -0,0 +1,58 @@
+package database
+
+import (
+	"github.com/glebarez/sqlite"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
+	"path/filepath"
+	"sub2clash/logger"
+	"sub2clash/model"
+	"sub2clash/utils"
+)
+
+var DB *gorm.DB
+
+func ConnectDB() error {
+	// 用上面的数据库连接初始化 gorm
+	err := utils.MKDir("data")
+	if err != nil {
+		return err
+	}
+	db, err := gorm.Open(
+		sqlite.Open(filepath.Join("data", "sub2clash.db")), &gorm.Config{
+			Logger: nil,
+		},
+	)
+	if err != nil {
+		return err
+	}
+	if err != nil {
+		return err
+	}
+	DB = db
+	err = db.AutoMigrate(&model.ShortLink{})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func FindShortLinkByUrl(url string, shortLink *model.ShortLink) *gorm.DB {
+	logger.Logger.Debug("find short link by url", zap.String("url", url))
+	return DB.Where("url = ?", url).First(&shortLink)
+}
+
+func FindShortLinkByHash(hash string, shortLink *model.ShortLink) *gorm.DB {
+	logger.Logger.Debug("find short link by hash", zap.String("hash", hash))
+	return DB.Where("hash = ?", hash).First(&shortLink)
+}
+
+func SaveShortLink(shortLink *model.ShortLink) {
+	logger.Logger.Debug("save short link", zap.String("hash", shortLink.Hash))
+	DB.Save(shortLink)
+}
+
+func FirstOrCreateShortLink(shortLink *model.ShortLink) {
+	logger.Logger.Debug("first or create short link", zap.String("hash", shortLink.Hash))
+	DB.FirstOrCreate(shortLink)
+}

utils/mkdir.go

@@ -0,0 +1,30 @@
+package utils
+
+import (
+	"errors"
+	"os"
+)
+
+func MKDir(dir string) error {
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
+		err := os.MkdirAll(dir, os.ModePerm)
+		if err != nil {
+
+			return err
+		}
+	}
+	return nil
+}
+
+func MkEssentialDir() error {
+	if err := MKDir("subs"); err != nil {
+		return errors.New("create subs dir failed" + err.Error())
+	}
+	if err := MKDir("templates"); err != nil {
+		return errors.New("create templates dir failed" + err.Error())
+	}
+	if err := MKDir("logs"); err != nil {
+		return errors.New("create logs dir failed" + err.Error())
+	}
+	return nil
+}

utils/os.go

@@ -1,16 +0,0 @@
-package utils
-
-import (
-	"os"
-)
-
-func MKDir(dir string) error {
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err := os.MkdirAll(dir, os.ModePerm)
-		if err != nil {
-
-			return err
-		}
-	}
-	return nil
-}

utils/proxy.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"sort"
 	"strings"
 	"sub2clash/model"
 	"sub2clash/parser"
@@ -29,12 +28,16 @@ func GetContryName(proxy model.Proxy) string {
 }
 
 func AddProxy(
-	sub *model.Subscription, autotest bool, lazy bool, sortStrategy string,
+	sub *model.Subscription, autotest bool,
-	proxies ...model.Proxy,
+	lazy bool, clashType model.ClashType, proxies ...model.Proxy,
 ) {
 	newCountryGroupNames := make([]string, 0)
+	proxyTypes := model.GetSupportProxyTypes(clashType)
 	// 添加节点
 	for _, proxy := range proxies {
+		if !proxyTypes[proxy.Type] {
+			continue
+		}
 		sub.Proxies = append(sub.Proxies, proxy)
 		haveProxyGroup := false
 		countryName := GetContryName(proxy)
@@ -79,26 +82,6 @@ func AddProxy(
 			newCountryGroupNames = append(newCountryGroupNames, countryName)
 		}
 	}
-	// 统计国家策略组数量
-	countryGroupCount := 0
-	for i := range sub.ProxyGroups {
-		if sub.ProxyGroups[i].IsCountryGrop {
-			countryGroupCount++
-		}
-	}
-	// 对国家策略组进行排序
-	switch sortStrategy {
-	case "sizeasc":
-		sort.Sort(model.ProxyGroupsSortBySize(sub.ProxyGroups[:countryGroupCount]))
-	case "sizedesc":
-		sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(sub.ProxyGroups[:countryGroupCount])))
-	case "nameasc":
-		sort.Sort(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount]))
-	case "namedesc":
-		sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount])))
-	default:
-		sort.Sort(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount]))
-	}
 }
 
 func ParseProxy(proxies ...string) []model.Proxy {

utils/random_string.go

@@ -0,0 +1,13 @@
+package utils
+
+import "math/rand"
+
+func RandomString(length int) string {
+	// 生成随机字符串
+	const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+	var result []byte
+	for i := 0; i < length; i++ {
+		result = append(result, charset[rand.Intn(len(charset))])
+	}
+	return string(result)
+}

utils/sub.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"crypto/md5"
+	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
 	"io"
@@ -19,7 +19,7 @@ func LoadSubscription(url string, refresh bool) ([]byte, error) {
 	if refresh {
 		return FetchSubscriptionFromAPI(url)
 	}
-	hash := md5.Sum([]byte(url))
+	hash := sha256.Sum224([]byte(url))
 	fileName := filepath.Join(subsDir, hex.EncodeToString(hash[:]))
 	stat, err := os.Stat(fileName)
 	if err != nil {
@@ -49,7 +49,7 @@ func LoadSubscription(url string, refresh bool) ([]byte, error) {
 }
 
 func FetchSubscriptionFromAPI(url string) ([]byte, error) {
-	hash := md5.Sum([]byte(url))
+	hash := sha256.Sum224([]byte(url))
 	fileName := filepath.Join(subsDir, hex.EncodeToString(hash[:]))
 	resp, err := Get(url)
 	if err != nil {

utils/template.go

@@ -8,7 +8,7 @@ import (
 )
 
 // LoadTemplate 加载模板
-// template 模板文件名
+// templates 模板文件名
 func LoadTemplate(template string) ([]byte, error) {
 	tPath := filepath.Join("templates", template)
 	if _, err := os.Stat(tPath); err == nil {

utils/write_default_template.go

@@ -0,0 +1,37 @@
+package utils
+
+import (
+	"os"
+	"path/filepath"
+	"sub2clash/config"
+)
+
+func writeTemplate(path string, template string) error {
+	tPath := filepath.Join(
+		"templates", path,
+	)
+	if _, err := os.Stat(tPath); os.IsNotExist(err) {
+		file, err := os.Create(tPath)
+		if err != nil {
+			return err
+		}
+		defer func(file *os.File) {
+			_ = file.Close()
+		}(file)
+		_, err = file.WriteString(template)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func WriteDefalutTemplate(templateMeta string, templateClash string) error {
+	if err := writeTemplate(config.Default.MetaTemplate, templateMeta); err != nil {
+		return err
+	}
+	if err := writeTemplate(config.Default.ClashTemplate, templateClash); err != nil {
+		return err
+	}
+	return nil
+}

validator/short_link.go

@@ -0,0 +1,9 @@
+package validator
+
+type ShortLinkGenValidator struct {
+	Url string `form:"url" binding:"required"`
+}
+
+type ShortLinkGetValidator struct {
+	Hash string `form:"hash" binding:"required"`
+}

validator/sub.go

@@ -1,7 +1,7 @@
 package validator
 
 import (
-	"crypto/md5"
+	"crypto/sha256"
 	"encoding/hex"
 	"errors"
 	"github.com/gin-gonic/gin"
@@ -11,7 +11,7 @@ import (
 	"strings"
 )
 
-type SubQuery struct {
+type SubValidator struct {
 	Sub           string               `form:"sub" binding:""`
 	Subs          []string             `form:"-" binding:""`
 	Proxy         string               `form:"proxy" binding:""`
@@ -40,19 +40,22 @@ type RuleStruct struct {
 	Prepend bool
 }
 
-func ParseQuery(c *gin.Context) (SubQuery, error) {
+func ParseQuery(c *gin.Context) (SubValidator, error) {
-	var query SubQuery
+	var query SubValidator
 	if err := c.ShouldBind(&query); err != nil {
-		return SubQuery{}, errors.New("参数错误: " + err.Error())
+		return SubValidator{}, errors.New("参数错误: " + err.Error())
 	}
 	if query.Sub == "" && query.Proxy == "" {
-		return SubQuery{}, errors.New("参数错误: sub 和 proxy 不能同时为空")
+		return SubValidator{}, errors.New("参数错误: sub 和 proxy 不能同时为空")
 	}
 	if query.Sub != "" {
 		query.Subs = strings.Split(query.Sub, ",")
 		for i := range query.Subs {
+			if !strings.HasPrefix(query.Subs[i], "http") {
+				return SubValidator{}, errors.New("参数错误: sub 格式错误")
+			}
 			if _, err := url.ParseRequestURI(query.Subs[i]); err != nil {
-				return SubQuery{}, errors.New("参数错误: " + err.Error())
+				return SubValidator{}, errors.New("参数错误: " + err.Error())
 			}
 		}
 	} else {
@@ -67,7 +70,7 @@ func ParseQuery(c *gin.Context) (SubQuery, error) {
 		uri, err := url.ParseRequestURI(query.Template)
 		if err != nil {
 			if strings.Contains(query.Template, string(os.PathSeparator)) {
-				return SubQuery{}, err
+				return SubValidator{}, err
 			}
 		}
 		query.Template = uri.String()
@@ -79,16 +82,16 @@ func ParseQuery(c *gin.Context) (SubQuery, error) {
 			length := len(ruleProviders)
 			parts := strings.Split(ruleProviders[length-i-1][1], ",")
 			if len(parts) < 4 {
-				return SubQuery{}, errors.New("参数错误: ruleProvider 格式错误")
+				return SubValidator{}, errors.New("参数错误: ruleProvider 格式错误")
 			}
 			u := parts[1]
 			uri, err := url.ParseRequestURI(u)
 			if err != nil {
-				return SubQuery{}, errors.New("参数错误: " + err.Error())
+				return SubValidator{}, errors.New("参数错误: " + err.Error())
 			}
 			u = uri.String()
 			if len(parts) == 4 {
-				hash := md5.Sum([]byte(u))
+				hash := sha256.Sum224([]byte(u))
 				parts = append(parts, hex.EncodeToString(hash[:]))
 			}
 			query.RuleProviders = append(
@@ -101,6 +104,14 @@ func ParseQuery(c *gin.Context) (SubQuery, error) {
 				},
 			)
 		}
+		// 校验 Rule-Provider 是否有重名
+		names := make(map[string]bool)
+		for _, ruleProvider := range query.RuleProviders {
+			if _, ok := names[ruleProvider.Name]; ok {
+				return SubValidator{}, errors.New("参数错误: Rule-Provider 名称重复")
+			}
+			names[ruleProvider.Name] = true
+		}
 	} else {
 		query.RuleProviders = nil
 	}