fix

2025-07-04 11:52:34 +08:00 · 2023-09-17 17:24:30 +08:00 · 2023-09-17 17:02:59 +08:00 · 2023-09-17 16:59:02 +08:00 · 2023-09-17 16:20:15 +08:00 · 2023-09-17 16:14:31 +08:00
32 changed files with 1081 additions and 232 deletions
--- a/.env.example
+++ b/.env.example
@ -4,4 +4,5 @@ CLASH_TEMPLATE=clash_template.json
 REQUEST_RETRY_TIMES=3
 REQUEST_MAX_FILE_SIZE=1048576
 CACHE_EXPIRE=300
-LOG_LEVEL=info
+LOG_LEVEL=info
+BASE_PATH=/
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@ -0,0 +1,63 @@
+name: Build and Push to GHCR
+
+on:
+  push:
+    branches:
+      - dev
+    tags:
+      - '*'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set tag name
+        id: set_tag
+        run: |
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            echo "::set-output name=tag::$(echo $GITHUB_REF | cut -d'/' -f3)"
+          else
+            echo "::set-output name=tag::${{ github.ref_name }}"
+          fi
+
+      - name: Check if triggered by tag
+        id: check_tag
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            echo "::set-output name=triggered_by_tag::true"
+          else
+            echo "::set-output name=triggered_by_tag::false"
+          fi
+
+      - name: Build and push Docker image for dev branch
+        if: steps.check_tag.outputs.triggered_by_tag == 'false'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ghcr.io/${{ github.repository }}:${{ steps.set_tag.outputs.tag }}
+
+      - name: Build and push Docker image for tags
+        if: steps.check_tag.outputs.triggered_by_tag == 'true'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}:${{ steps.set_tag.outputs.tag }}
+            ghcr.io/${{ github.repository }}:latest
+
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@ -7,114 +7,148 @@ on:
  push:
    tags:
      - '*'
-      
+  workflow_dispatch:
+
 jobs:

  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3

-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.21'
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'

-    - name: Build
-      run: |
+      - name: Build
+        run: |
          LDFLAGS="-s -w"
-  
+          
          # Linux
-          GOOS=linux GOARCH=amd64 go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-amd64 main.go
-          GOOS=linux GOARCH=arm go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-arm main.go
-          GOOS=linux GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-arm64 main.go
-  
+          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
-          GOOS=darwin GOARCH=amd64 go build -ldflags="$LDFLAGS" -o output/sub2clash-darwin-amd64 main.go
-          GOOS=darwin GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-darwin-arm64 main.go  # For Apple Silicon
-  
+          CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$LDFLAGS" -o output/sub2clash-darwin-amd64 main.go
+          CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-darwin-arm64 main.go
+          
          # Windows
-          GOOS=windows GOARCH=amd64 go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-amd64.exe main.go
-          GOOS=windows GOARCH=arm go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-arm.exe main.go
+          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
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref_name }}
-        release_name: Release ${{ github.ref_name }}
-        draft: false
-        prerelease: false
-        
-    - name: Upload Release Asset (Linux amd64)
-      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-amd64
-        asset_name: sub2clash-linux-amd64
-        asset_content_type: application/octet-stream
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref_name }}
+          release_name: Release ${{ github.ref_name }}
+          draft: false
+          prerelease: false

-    - 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 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 arm64)
-      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-arm64
-        asset_name: sub2clash-linux-arm64
-        asset_content_type: application/octet-stream
+      - name: Upload Release Asset (Linux amd64)
+        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-amd64
+          asset_name: sub2clash-linux-amd64
+          asset_content_type: application/octet-stream

-    - name: Upload Release Asset (Darwin amd64)
-      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-darwin-amd64
-        asset_name: sub2clash-darwin-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 (Darwin arm64)
-      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-darwin-arm64
-        asset_name: sub2clash-darwin-arm64
-        asset_content_type: application/octet-stream
+      - name: Upload Release Asset (Linux arm64)
+        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-arm64
+          asset_name: sub2clash-linux-arm64
+          asset_content_type: application/octet-stream

-    - name: Upload Release Asset (Windows amd64)
-      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-amd64.exe
-        asset_name: sub2clash-windows-amd64.exe
-        asset_content_type: application/octet-stream
+      - name: Upload Release Asset (Darwin amd64)
+        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-darwin-amd64
+          asset_name: sub2clash-darwin-amd64
+          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 (Darwin arm64)
+        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-darwin-arm64
+          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.upload_url }}
+          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:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./output/sub2clash-windows-amd64.exe
+          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.upload_url }}
+          asset_path: ./output/sub2clash-windows-arm64.exe
+          asset_name: sub2clash-windows-arm64.exe
+          asset_content_type: application/octet-stream

--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,5 @@
 dist
 subs
 test
-logs
+logs
+sub2clash.db
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@ -0,0 +1,19 @@
+#before:
+#  hooks:
+#    - go mod tidy
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+    goarch:
+      - amd64
+      - arm
+      - arm64
+      - 386
+    ldflags:
+      - -s -w
+    no_unique_dist_dir: true
+    binary: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"
--- a/24
+++ b/24
@ -0,0 +1,24 @@
+# 使用官方 Golang 镜像作为构建环境
+FROM golang:1.21-alpine as builder
+LABEL authors="nite07"
+
+# 设置工作目录
+WORKDIR /app
+
+# 复制源代码到工作目录
+COPY . .
+RUN go mod download
+
+# 使用 -ldflags 参数进行编译
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o sub2clash main.go
+
+FROM alpine:latest
+
+# 设置工作目录
+WORKDIR /app
+
+# 从 builder 镜像中复制出编译好的二进制文件
+COPY --from=builder /app/sub2clash /app/sub2clash
+
+# 设置容器的默认启动命令
+ENTRYPOINT ["/app/sub2clash"]
--- a/README.md
+++ b/README.md
@ -8,31 +8,51 @@
 - 自动根据节点名称按国家划分策略组
 - 支持多订阅合并
 - 支持多种协议
-    -   [x] Shadowsocks
-    -   [x] ShadowsocksR
-    -   [x] Vmess
-    -   [x] Vless
-    -   [x] Trojan
-    -   [ ] Hysteria
-    -   [ ] TUIC
-    -   [ ] WireGuard
+    - Shadowsocks
+    - ShadowsocksR
+    - Vmess
+    - Vless
+    - Trojan

-## API
+## 使用

-### `/clash`,`/meta`
+### 运行
+
+- [docker compose](./docker-compose.yml)
+- 运行[二进制文件](https://github.com/nitezs/sub2clash/releases/latest)
+
+### 配置
+
+可以通过编辑 .env 文件来修改默认配置，docker 直接添加环境变量
+
+| 变量名                   | 说明                                                        | 默认值                   |
+|-----------------------|-----------------------------------------------------------|-----------------------|
+| BASE_PATH             | 程序运行子路径，例如将服务反代在 `https://example.com/sub` 则此变量值应为 `/sub` | `/`                   |
+| PORT                  | 端口                                                        | `8011`                |
+| META_TEMPLATE         | meta 模板文件名                                                | `template_meta.yaml`  |
+| CLASH_TEMPLATE        | clash 模板文件名                                               | `template_clash.yaml` |
+| REQUEST_RETRY_TIMES   | Get 请求重试次数                                                | `3`                   |
+| REQUEST_MAX_FILE_SIZE | Get 请求订阅文件最大大小（byte）                                      | `1048576`             |
+| CACHE_EXPIRE          | 订阅缓存时间（秒）                                                 | `300`                 |
+| LOG_LEVEL             | 日志等级，可选值 `debug`,`info`,`warn`,`error`                    | `info`                |
+
+### API
+
+#### `/clash`, `/meta`

 获取 Clash/Clash.Meta 配置链接

-| Query 参数     | 类型     | 是否必须              | 说明                                                                                                                                                                 |
-|--------------|--------|-------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| sub          | string | sub/proxy 至少有一项存在 | 订阅链接（可以输入多个，用 `,` 分隔）                                                                                                                                              |
-| proxy        | string | sub/proxy 至少有一项存在 | 节点分享链接（可以输入多个，用 `,` 分隔）                                                                                                                                            |
-| refresh      | bool   | 否（默认 `false`）     | 强制刷新配置（默认缓存 5 分钟）                                                                                                                                                  |
-| template     | string | 否                 | 外部模板                                                                                                                                                               |
-| ruleProvider | string | 否                 | 格式 `[Behavior,Url,Group,Prepend],[Behavior,Url,Group,Prepend],...`，其中 `Group` 是该规则集所走的策略组名，`Prepend` 为 bool 类型，如果为 `true` 规则将被添加到规则列表顶部，否则添加到规则列表底部（会调整到MATCH规则之前） | 
-| rule         | string | 否                 | 格式 `[Rule,Prepend],[Rule,Prepend]...`，其中 `Prepend` 为 bool 类型，如果为 `true` 规则将被添加到规则列表顶部，否则添加到规则列表底部（会调整到MATCH规则之前）                                                   | 
-| autoTest     | bool   | 否（默认 `false`）     | 指定国家策略组是否自动测速                                                                                                                                                      |
-| lazy         | bool   | 否（默认 `false`）     | 自动测速是否启用 lazy                                                                                                                                                      |
+| Query 参数     | 类型     | 是否必须              | 默认值       | 说明                                                                                                                                                                          |
+|--------------|--------|-------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| sub          | string | sub/proxy 至少有一项存在 | -         | 订阅链接（可以输入多个，用 `,` 分隔）                                                                                                                                                       |
+| proxy        | string | sub/proxy 至少有一项存在 | -         | 节点分享链接（可以输入多个，用 `,` 分隔）                                                                                                                                                     |
+| refresh      | bool   | 否                 | `false`   | 强制刷新配置（默认缓存 5 分钟）                                                                                                                                                           |
+| 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`   | 国家策略组是否自动测速                                                                                                                                                                 |
+| lazy         | bool   | 否                 | `false`   | 自动测速是否启用 lazy                                                                                                                                                               |
+| sort         | string | 否                 | `nameasc` | 国家策略组排序策略，可选值 `nameasc`、`namedesc`、`sizeasc`、`sizedesc`                                                                                                                     |

 ## 默认模板

@ -44,4 +64,3 @@
 [代理链接解析](./parser)还没有经过严格测试，可能会出现解析错误的情况，如果出现问题请提交 issue

 ## TODO
-
--- a/api/controller/clash.go
+++ b/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
--- a/api/controller/default.go
+++ b/api/controller/default.go
@ -1,10 +1,11 @@
 package controller

 import (
-	"crypto/md5"
+	"crypto/sha256"
 	"encoding/hex"
 	"errors"
 	"gopkg.in/yaml.v3"
+	"net/url"
 	"regexp"
 	"strings"
 	"sub2clash/model"
@ -13,17 +14,20 @@ import (
 	"sub2clash/validator"
 )

-func BuildSub(query validator.SubQuery, template string) (
+func BuildSub(clashType model.ClashType, query validator.SubValidator, template string) (
 	*model.Subscription, error,
 ) {
 	// 定义变量
-	var externalTemplate = query.Template != ""
-	var temp *model.Subscription
-	var sub *model.Subscription
+	var temp = &model.Subscription{}
+	var sub = &model.Subscription{}
 	var err error
 	var templateBytes []byte
 	// 加载模板
-	if !externalTemplate {
+	if query.Template != "" {
+		template = query.Template
+	}
+	_, err = url.ParseRequestURI(template)
+	if err != nil {
 		templateBytes, err = utils.LoadTemplate(template)
 		if err != nil {
 			return nil, errors.New("加载模板失败: " + err.Error())
@ -63,10 +67,14 @@ func BuildSub(query validator.SubQuery, template string) (
 		} else {
 			proxyList = sub.Proxies
 		}
-		utils.AddProxy(temp, query.AutoTest, query.Lazy, proxyList...)
+		utils.AddProxy(sub, query.AutoTest, query.Lazy, query.Sort, clashType, proxyList...)
 	}
 	// 处理自定义代理
-	utils.AddProxy(temp, query.AutoTest, query.Lazy, utils.ParseProxy(query.Proxies...)...)
+	utils.AddProxy(
+		sub, query.AutoTest, query.Lazy, query.Sort, clashType,
+		utils.ParseProxy(query.Proxies...)...,
+	)
+	MergeSubAndTemplate(temp, sub)
 	// 处理自定义规则
 	for _, v := range query.Rules {
 		if v.Prepend {
@ -77,7 +85,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",
@ -88,13 +96,50 @@ func BuildSub(query validator.SubQuery, template string) (
 		}
 		if v.Prepend {
 			utils.PrependRuleProvider(
-				temp, name, v.Group, provider,
+				temp, v.Name, v.Group, provider,
 			)
 		} else {
 			utils.AppenddRuleProvider(
-				temp, name, v.Group, provider,
+				temp, v.Name, v.Group, provider,
 			)
 		}
 	}
 	return temp, nil
 }
+
+func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription) {
+	// 只合并节点、策略组
+	// 统计所有国家策略组名称
+	var countryGroupNames []string
+	for _, proxyGroup := range sub.ProxyGroups {
+		if proxyGroup.IsCountryGrop {
+			countryGroupNames = append(
+				countryGroupNames, proxyGroup.Name,
+			)
+		}
+	}
+	// 将订阅中的节点添加到模板中
+	temp.Proxies = append(temp.Proxies, sub.Proxies...)
+	// 将订阅中的策略组添加到模板中
+	skipGroups := []string{"全球直连", "广告拦截", "手动切换"}
+	for i := range temp.ProxyGroups {
+		skip := false
+		for _, v := range skipGroups {
+			if strings.Contains(temp.ProxyGroups[i].Name, v) {
+				if v == "手动切换" {
+					proxies := make([]string, 0, len(sub.Proxies))
+					for _, p := range sub.Proxies {
+						proxies = append(proxies, p.Name)
+					}
+					temp.ProxyGroups[i].Proxies = proxies
+				}
+				skip = true
+				continue
+			}
+		}
+		if !skip {
+			temp.ProxyGroups[i].Proxies = append(temp.ProxyGroups[i].Proxies, countryGroupNames...)
+		}
+	}
+	temp.ProxyGroups = append(temp.ProxyGroups, sub.ProxyGroups...)
+}
--- a/api/controller/meta.go
+++ b/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
--- a/api/controller/short_link.go
+++ b/api/controller/short_link.go
@ -0,0 +1,53 @@
+package controller
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"sub2clash/config"
+	"sub2clash/model"
+	"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())
+	}
+	// 生成短链接
+	//hash := utils.RandomString(6)
+	shortLink := sha256.Sum224([]byte(params.Url))
+	hash := hex.EncodeToString(shortLink[:])
+	// 存入数据库
+	database.DB.FirstOrCreate(
+		&model.ShortLink{
+			Hash:            hash,
+			Url:             params.Url,
+			LastRequestTime: -1,
+		},
+	)
+	// 返回短链接
+	c.String(200, hash)
+}
+
+func ShortLinkGetHandler(c *gin.Context) {
+	// 获取动态路由
+	hash := c.Param("hash")
+	// 查询数据库
+	var shortLink model.ShortLink
+	result := database.DB.Where("hash = ?", hash).First(&shortLink)
+	// 更新最后访问时间
+	shortLink.LastRequestTime = time.Now().Unix()
+	database.DB.Save(&shortLink)
+	// 重定向
+	if result.Error != nil {
+		c.String(404, "未找到短链接")
+		return
+	}
+	uri := config.Default.BasePath + shortLink.Url
+	c.Redirect(http.StatusTemporaryRedirect, uri)
+}
--- a/api/route.go
+++ b/api/route.go
@ -1,13 +1,25 @@
 package api

 import (
+	"embed"
 	"github.com/gin-gonic/gin"
+	"html/template"
 	"sub2clash/api/controller"
 	"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", nil)
+		},
+	)
 	r.GET(
 		"/clash", func(c *gin.Context) {
 			controller.SubmodHandler(c)
@ -18,4 +30,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)
+		},
+	)
 }
--- a/api/templates/index.html
+++ b/api/templates/index.html
@ -0,0 +1,317 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>sub2clash</title>
+
+    <!-- Bootstrap CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
+          integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+
+    <!-- Bootstrap JS -->
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+            integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+            crossorigin="anonymous"></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" rows="5" placeholder="每行输入一个订阅链接"></textarea>
+        </div>
+
+        <!-- Proxy Link -->
+        <div class="form-group mb-3">
+            <label for="proxy">节点分享链接:</label>
+            <textarea class="form-control" id="proxy" name="proxy" rows="5"
+                      placeholder="每行输入一个节点分享链接"></textarea>
+        </div>
+
+        <!-- Refresh -->
+        <div class="form-check mb-3">
+            <input type="checkbox" class="form-check-input" id="refresh" name="refresh">
+            <label class="form-check-label" for="refresh">强制刷新配置</label>
+        </div>
+
+        <!-- Template -->
+        <div class="form-group mb-3">
+            <label for="template">模板链接或名称（可选）:</label>
+            <input type="text" class="form-control" id="template" name="template"
+                   placeholder="输入外部模板链接或内部模板名称">
+        </div>
+
+        <!-- Rule Provider -->
+        <div class="form-group mb-3" id="ruleProviderGroup">
+            <label>Rule Provider:</label>
+            <button type="button" class="btn btn-primary mb-1 btn-xs" onclick="addRuleProvider()">+</button>
+        </div>
+
+        <!-- Rule -->
+        <div class="form-group mb-3" id="ruleGroup">
+            <label>规则:</label>
+            <button type="button" class="btn btn-primary mb-1 btn-xs" onclick="addRule()">+</button>
+        </div>
+
+        <!-- Auto Test -->
+        <div class="form-check mb-3">
+            <input type="checkbox" class="form-check-input" id="autoTest" name="autoTest">
+            <label class="form-check-label" for="autoTest">指定国家策略组是否自动测速</label>
+        </div>
+
+        <!-- Lazy -->
+        <div class="form-check mb-3">
+            <input type="checkbox" class="form-check-input" id="lazy" name="lazy">
+            <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 type="text" class="form-control" id="apiLink" readonly>
+            <button class="btn btn-primary" type="button" onclick="generateURL()">生成链接</button>
+            <button class="btn btn-primary" type="button" onclick="copyToClipboard('apiLink',this)">复制链接</button>
+        </div>
+        <div class="input-group">
+            <input type="text" class="form-control" id="apiShortLink" readonly>
+            <button class="btn btn-primary" type="button" onclick="generateShortLink()">生成短链</button>
+            <button class="btn btn-primary" type="button" onclick="copyToClipboard('apiShortLink',this)">复制短链
+            </button>
+        </div>
+    </div>
+
+    <!-- footer-->
+    <footer>
+        <p class="text-center">Powered by <a class="link-primary"
+                                             href="https://github.com/nitezs/sub2clash">sub2clash</a></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");
+        apiLink.value = `${window.location.origin}${window.location.pathname}${generateURI()}`;
+    }
+
+    function generateShortLink() {
+        const apiShortLink = document.getElementById("apiShortLink");
+
+        axios.post("./short", {
+            "url": generateURI()
+        }, {
+            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>
--- a/config/config.go
+++ b/config/config.go
@ -14,6 +14,7 @@ type Config struct {
 	RequestMaxFileSize int64
 	CacheExpire        int64
 	LogLevel           string
+	BasePath           string
 }

 var Default *Config
@ -27,11 +28,9 @@ func init() {
 		Port:               8011,
 		CacheExpire:        60 * 5,
 		LogLevel:           "info",
+		BasePath:           "/",
 	}
-	err := godotenv.Load()
-	if err != nil {
-		return
-	}
+	_ = godotenv.Load()
 	if os.Getenv("PORT") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("PORT"))
 		if err != nil {
@ -69,4 +68,10 @@ func init() {
 	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 += "/"
+		}
+	}
 }
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -0,0 +1,20 @@
+version: '3'
+
+services:
+  sub2clash:
+    container_name: sub2clash
+    restart: unless-stopped
+    image: ghcr.io/nitezs/sub2clash:latest
+    ports:
+      - "8011:8011"
+    volumes:
+      - ./logs:/app/logs
+      # - ./templates:/app/templates
+    # environment:
+    #   - PORT=8011
+    #   - META_TEMPLATE=template_meta.yaml
+    #   - PROXY_TEMPLATE=template_clash.yaml
+    #   - REQUEST_RETRY_TIMES=3
+    #   - REQUEST_MAX_FILE_SIZE=1048576
+    #   - CACHE_EXPIRE=300
+    #   - LOG_LEVEL=info
--- a/go.mod
+++ b/go.mod
@ -2,18 +2,32 @@ module sub2clash

 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.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/gin-gonic/gin v1.9.1 // 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/joho/godotenv v1.5.1 // 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
@ -21,15 +35,17 @@ 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
-	go.uber.org/zap v1.25.0 // indirect
 	golang.org/x/arch v0.5.0 // indirect
 	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
-	gopkg.in/yaml.v3 v3.0.1 // 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
 )
--- a/go.sum
+++ b/go.sum
@ -1,7 +1,5 @@
 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.0 h1:qtNZduETEIWJVIyDl01BeNxur2rW9OwTQ/yBqFRkKEk=
-github.com/bytedance/sonic v1.10.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/bytedance/sonic v1.10.1 h1:7a1wuFXL1cMy7a3f7/VFcEtriuXQnUBhtoVfOZiaysc=
 github.com/bytedance/sonic v1.10.1/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
@ -11,26 +9,43 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV
 github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
 github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 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=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.15.3 h1:S+sSpunYjNPDuXkWbK+x+bA7iXiW296KG4dL3X7xUZo=
-github.com/go-playground/validator/v10 v10.15.3/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-playground/validator/v10 v10.15.4 h1:zMXza4EpOdooxPel5xDqXEdXG5r+WggpvnAKMsalBjs=
 github.com/go-playground/validator/v10 v10.15.4/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 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/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=
@ -48,11 +63,13 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM=
-github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 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=
@ -62,15 +79,18 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+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.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+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,9 +108,20 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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=
--- a/main.go
+++ b/main.go
@ -12,6 +12,7 @@ import (
 	"sub2clash/config"
 	"sub2clash/logger"
 	"sub2clash/utils"
+	"sub2clash/utils/database"
 )

 //go:embed templates/template_meta.yaml
@ -53,6 +54,10 @@ func init() {
 	if err := writeTemplate(config.Default.ClashTemplate, templateClash); err != nil {
 		os.Exit(1)
 	}
+	err := database.ConnectDB()
+	if err != nil {
+		panic(err)
+	}
 }

 func main() {
--- a/model/clash.go
+++ b/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
+}
--- a/model/proxy_group.go
+++ b/model/proxy_group.go
@ -0,0 +1,58 @@
+package model
+
+import (
+	"golang.org/x/text/collate"
+	"golang.org/x/text/language"
+)
+
+type ProxyGroup struct {
+	Name          string   `yaml:"name,omitempty"`
+	Type          string   `yaml:"type,omitempty"`
+	Proxies       []string `yaml:"proxies,omitempty"`
+	IsCountryGrop bool     `yaml:"-"`
+	Url           string   `yaml:"url,omitempty"`
+	Interval      int      `yaml:"interval,omitempty"`
+	Tolerance     int      `yaml:"tolerance,omitempty"`
+	Lazy          bool     `yaml:"lazy"`
+	Size          int      `yaml:"-"`
+}
+
+type ProxyGroupsSortByName []ProxyGroup
+type ProxyGroupsSortBySize []ProxyGroup
+
+func (p ProxyGroupsSortByName) Len() int {
+	return len(p)
+}
+func (p ProxyGroupsSortBySize) Len() int {
+	return len(p)
+}
+
+func (p ProxyGroupsSortByName) Less(i, j int) bool {
+	// 定义一组备选语言：首选英语，其次中文
+	tags := []language.Tag{
+		language.English,
+		language.Chinese,
+	}
+	matcher := language.NewMatcher(tags)
+
+	// 假设我们的请求语言是 "zh"（中文），则使用匹配器找到最佳匹配的语言
+	bestMatch, _, _ := matcher.Match(language.Make("zh"))
+	// 使用最佳匹配的语言进行排序
+	c := collate.New(bestMatch)
+
+	return c.CompareString(p[i].Name, p[j].Name) < 0
+}
+
+func (p ProxyGroupsSortBySize) Less(i, j int) bool {
+	if p[i].Size == p[j].Size {
+		return p[i].Name < p[j].Name
+	}
+	return p[i].Size < p[j].Size
+}
+
+func (p ProxyGroupsSortByName) Swap(i, j int) {
+	p[i], p[j] = p[j], p[i]
+}
+func (p ProxyGroupsSortBySize) Swap(i, j int) {
+	p[i], p[j] = p[j], p[i]
+}
--- a/model/rule_provider.go
+++ b/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"`
+}
--- a/model/short_link.go
+++ b/model/short_link.go
@ -0,0 +1,7 @@
+package model
+
+type ShortLink struct {
+	Hash            string `gorm:"primary_key"`
+	Url             string
+	LastRequestTime int64
+}
--- a/model/sub.go
+++ b/model/sub.go
@ -12,26 +12,3 @@ type Subscription struct {
 	Rules              []string                `yaml:"rules,omitempty"`
 	RuleProviders      map[string]RuleProvider `yaml:"rule-providers,omitempty,omitempty"`
 }
-
-type ProxyGroup struct {
-	Name          string   `yaml:"name,omitempty"`
-	Type          string   `yaml:"type,omitempty"`
-	Proxies       []string `yaml:"proxies,omitempty"`
-	IsCountryGrop bool     `yaml:"-"`
-	Url           string   `yaml:"url,omitempty"`
-	Interval      int      `yaml:"interval,omitempty"`
-	Tolerance     int      `yaml:"tolerance,omitempty"`
-	Lazy          bool     `yaml:"lazy"`
-}
-
-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"`
-}
--- a/parser/ssr.go
+++ b/parser/ssr.go
@ -14,6 +14,7 @@ func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 		return model.Proxy{}, fmt.Errorf("无效的 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"),
-		ProtocolParam: params.Get("protoparam"),
+		ObfsParam:     obfsParam,
+		ProtocolParam: protoParam,
 	}
+
+	if result.Name == "" {
+		result.Name = result.Server
+	}
+
 	return result, nil
 }
--- a/templates/template_meta.yaml
+++ b/templates/template_meta.yaml
@ -13,6 +13,12 @@ proxy-groups:
  - name: 手动切换
    type: select
    proxies:
+  - name: 微软服务
+    type: select
+    proxies:
+      - 节点选择
+      - 手动切换
+      - DIRECT
  - name: 游戏平台
    type: select
    proxies:
@ -48,15 +54,14 @@ proxy-groups:
      - 手动切换
      - DIRECT
 rules:
-  - GEOSITE,private,全球直连
+  - GEOSITE,private,全球直连,no-resolve
  - GEOIP,private,全球直连
-  - GEOSITE,biliintl,哔哩哔哩
+  - GEOSITE,category-ads-all,广告拦截
+  - GEOSITE,microsoft,微软服务
  - GEOSITE,bilibili,哔哩哔哩
  - GEOSITE,bahamut,巴哈姆特
-  - GEOSITE,CN,全球直连
-  - GEOIP,CN,全球直连
  - GEOSITE,category-games,游戏平台
  - GEOSITE,geolocation-!cn,节点选择
-  - GEOIP,ad,广告拦截
-  - GEOSITE,category-ads-all,广告拦截
+  - GEOSITE,CN,全球直连
+  - GEOIP,CN,全球直连
  - MATCH,漏网之鱼
--- a/utils/database/database.go
+++ b/utils/database/database.go
@ -0,0 +1,26 @@
+package database
+
+import (
+	"github.com/glebarez/sqlite"
+	"gorm.io/gorm"
+	"sub2clash/model"
+)
+
+var DB *gorm.DB
+
+func ConnectDB() error {
+	// 用上面的数据库连接初始化 gorm
+	db, err := gorm.Open(sqlite.Open("sub2clash.db"), &gorm.Config{})
+	if err != nil {
+		panic(err)
+	}
+	if err != nil {
+		return err
+	}
+	DB = db
+	err = db.AutoMigrate(&model.ShortLink{})
+	if err != nil {
+		return err
+	}
+	return nil
+}
--- a/utils/proxy.go
+++ b/utils/proxy.go
@ -1,6 +1,7 @@
 package utils

 import (
+	"sort"
 	"strings"
 	"sub2clash/model"
 	"sub2clash/parser"
@ -27,35 +28,36 @@ func GetContryName(proxy model.Proxy) string {
 	return "其他地区"
 }

-var skipGroups = map[string]bool{
-	"手动切换": true,
-	"全球直连": true,
-	"广告拦截": true,
-	"应用净化": true,
-}
-
-func AddProxy(sub *model.Subscription, autotest bool, lazy bool, proxies ...model.Proxy) {
+func AddProxy(
+	sub *model.Subscription, autotest bool,
+	lazy bool, sortStrategy string,
+	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)
-
 		for i := range sub.ProxyGroups {
 			group := &sub.ProxyGroups[i]

 			if group.Name == countryName {
 				group.Proxies = append(group.Proxies, proxy.Name)
+				group.Size++
 				haveProxyGroup = true
 			}

 			if group.Name == "手动切换" {
 				group.Proxies = append(group.Proxies, proxy.Name)
+				group.Size++
 			}
 		}
-
 		if !haveProxyGroup {
 			var newGroup model.ProxyGroup
 			if !autotest {
@ -64,6 +66,7 @@ func AddProxy(sub *model.Subscription, autotest bool, lazy bool, proxies ...mode
 					Type:          "select",
 					Proxies:       []string{proxy.Name},
 					IsCountryGrop: true,
+					Size:          1,
 				}
 			} else {
 				newGroup = model.ProxyGroup{
@ -75,24 +78,33 @@ func AddProxy(sub *model.Subscription, autotest bool, lazy bool, proxies ...mode
 					Interval:      300,
 					Tolerance:     50,
 					Lazy:          lazy,
+					Size:          1,
 				}
 			}
 			sub.ProxyGroups = append(sub.ProxyGroups, newGroup)
 			newCountryGroupNames = append(newCountryGroupNames, countryName)
 		}
 	}
-
+	// 统计国家策略组数量
+	countryGroupCount := 0
 	for i := range sub.ProxyGroups {
 		if sub.ProxyGroups[i].IsCountryGrop {
-			continue
-		}
-		if !skipGroups[sub.ProxyGroups[i].Name] {
-			combined := make([]string, len(newCountryGroupNames)+len(sub.ProxyGroups[i].Proxies))
-			copy(combined, newCountryGroupNames)
-			copy(combined[len(newCountryGroupNames):], sub.ProxyGroups[i].Proxies)
-			sub.ProxyGroups[i].Proxies = combined
+			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 {
--- a/utils/random_string.go
+++ b/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)
+}
--- a/utils/sub.go
+++ b/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 {
--- a/utils/template.go
+++ b/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 {
--- a/validator/short_link.go
+++ b/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"`
+}
--- a/validator/sub.go
+++ b/validator/sub.go
@ -1,14 +1,17 @@
 package validator

 import (
+	"crypto/sha256"
+	"encoding/hex"
 	"errors"
 	"github.com/gin-gonic/gin"
 	"net/url"
+	"os"
 	"regexp"
 	"strings"
 )

-type SubQuery struct {
+type SubValidator struct {
 	Sub           string               `form:"sub" binding:""`
 	Subs          []string             `form:"-" binding:""`
 	Proxy         string               `form:"proxy" binding:""`
@ -21,6 +24,7 @@ type SubQuery struct {
 	Rules         []RuleStruct         `form:"-" binding:""`
 	AutoTest      bool                 `form:"autoTest,default=false" binding:""`
 	Lazy          bool                 `form:"lazy,default=false" binding:""`
+	Sort          string               `form:"sort" binding:""`
 }

 type RuleProviderStruct struct {
@ -28,6 +32,7 @@ type RuleProviderStruct struct {
 	Url      string
 	Group    string
 	Prepend  bool
+	Name     string
 }

 type RuleStruct struct {
@ -35,20 +40,22 @@ type RuleStruct struct {
 	Prepend bool
 }

-func ParseQuery(c *gin.Context) (SubQuery, error) {
-	var query SubQuery
+func ParseQuery(c *gin.Context) (SubValidator, error) {
+	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 {
-			query.Subs[i], _ = url.QueryUnescape(query.Subs[i])
+			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 {
@ -56,49 +63,36 @@ func ParseQuery(c *gin.Context) (SubQuery, error) {
 	}
 	if query.Proxy != "" {
 		query.Proxies = strings.Split(query.Proxy, ",")
-		for i := range query.Proxies {
-			query.Proxies[i], _ = url.QueryUnescape(query.Proxies[i])
-			if _, err := url.ParseRequestURI(query.Proxies[i]); err != nil {
-				return SubQuery{}, errors.New("参数错误: " + err.Error())
-			}
-		}
 	} else {
 		query.Proxies = nil
 	}
 	if query.Template != "" {
-		unescape, err := url.QueryUnescape(query.Template)
+		uri, err := url.ParseRequestURI(query.Template)
 		if err != nil {
-			return SubQuery{}, errors.New("参数错误: " + err.Error())
+			if strings.Contains(query.Template, string(os.PathSeparator)) {
+				return SubValidator{}, err
+			}
 		}
-		uri, err := url.ParseRequestURI(unescape)
 		query.Template = uri.String()
-		if err != nil {
-			return SubQuery{}, errors.New("参数错误: " + err.Error())
-		}
 	}
 	if query.RuleProvider != "" {
-		var err error
-		query.RuleProvider, err = url.QueryUnescape(query.RuleProvider)
-		if err != nil {
-			return SubQuery{}, errors.New("参数错误: " + err.Error())
-		}
 		reg := regexp.MustCompile(`\[(.*?)\]`)
 		ruleProviders := reg.FindAllStringSubmatch(query.RuleProvider, -1)
 		for i := range ruleProviders {
 			length := len(ruleProviders)
 			parts := strings.Split(ruleProviders[length-i-1][1], ",")
-			if len(parts) != 4 {
-				return SubQuery{}, errors.New("参数错误: ruleProvider 格式错误")
+			if len(parts) < 4 {
+				return SubValidator{}, errors.New("参数错误: ruleProvider 格式错误")
 			}
 			u := parts[1]
-			u, err = url.QueryUnescape(u)
-			if err != nil {
-				return SubQuery{}, errors.New("参数错误: " + err.Error())
-			}
 			uri, err := url.ParseRequestURI(u)
-			u = uri.String()
 			if err != nil {
-				return SubQuery{}, errors.New("参数错误: " + err.Error())
+				return SubValidator{}, errors.New("参数错误: " + err.Error())
+			}
+			u = uri.String()
+			if len(parts) == 4 {
+				hash := sha256.Sum224([]byte(u))
+				parts = append(parts, hex.EncodeToString(hash[:]))
 			}
 			query.RuleProviders = append(
 				query.RuleProviders, RuleProviderStruct{
@ -106,9 +100,18 @@ func ParseQuery(c *gin.Context) (SubQuery, error) {
 					Url:      u,
 					Group:    parts[2],
 					Prepend:  parts[3] == "true",
+					Name:     parts[4],
 				},
 			)
 		}
+		// 校验 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
 	}
Author	SHA1	Message	Date
nitezs	f166c6a54a	fix	2023-09-17 17:24:30 +08:00
nitezs	c0e6b62625	fix	2023-09-17 17:02:59 +08:00
nitezs	354379b12a	fix	2023-09-17 16:59:02 +08:00
nitezs	4f4a633035	fix	2023-09-17 16:20:15 +08:00
nitezs	be9bdd269e	update: 使用glebarez/sqlite替代gorm.io/driver/sqlite实现无需CGO运行	2023-09-17 16:14:31 +08:00
nitezs	6b08b2cb86	feat: 增加短链生成	2023-09-17 15:52:37 +08:00
nitezs	38dbea4a2a	fix: 修复只提供节点链接时空指针的问题 fix: 修复ssr分享链接加密时无法解析的问题 fix: 修复ssr解析缺少Name属性的问题 fix: 修复ssr解析时没有解码参数的问题	2023-09-17 13:21:01 +08:00
nitezs	1788541e04	fix	2023-09-17 10:46:49 +08:00
nitezs	d38d5bcb70	feat: Web UI update: 校验Rule-Provider是否有重名 modify: 修改meta默认模板 modify: 根据Clash筛选返回配置中的节点类型	2023-09-17 10:36:40 +08:00
nitezs	918521682c	modify: 根据Clash筛选返回配置中的节点类型	2023-09-16 21:46:59 +08:00
Nite07	3318f5f2db	Update go.yml	2023-09-15 10:47:23 +08:00
Nite07	300bb4931d	Merge pull request #1 from nitezs/dev Dev	2023-09-15 10:39:44 +08:00
nitezs	8e53183685	fix: 修复规则列表顺序错误，导致无法拦截广告的问题	2023-09-15 10:29:10 +08:00
nitezs	1f38125e85	update: 修改 docker.yml 镜像构建规则	2023-09-15 09:59:21 +08:00
nitezs	4e7d84499f	fix: 修改 Dockerfile 工作目录	2023-09-15 09:15:24 +08:00
nitezs	282649aca0	fix	2023-09-15 08:51:22 +08:00
nitezs	fe2f47865e	fix	2023-09-15 08:26:48 +08:00
nitezs	f6273947e7	mod	2023-09-15 00:31:57 +08:00
nitezs	0f2dba21eb	mod: 增加 dev 分支的 docker 镜像构建	2023-09-15 00:17:32 +08:00
nitezs	72635ce0fc	feat: 增加国家策略组排序策略 feat: 支持指定本地模板 mod: Rule-Provider 可以自定义名称	2023-09-15 00:13:45 +08:00
Nite07	fd1ff69711	Update README.md	2023-09-14 18:02:04 +08:00
nitezs	52e609298a	add:goreleaser.yaml mod:docker.yml mod:go.yml mod:docker-compose.yml mod:README.md	2023-09-14 17:59:17 +08:00
nitezs	d6539a0707	update	2023-09-13 15:52:37 +08:00
nitezs	070d8b5eb5	update	2023-09-13 15:44:48 +08:00
Nite07	5c71c54276	Rename docker to docker.yaml	2023-09-13 15:27:23 +08:00
Nite07	83ce5349c9	Create docker	2023-09-13 15:26:56 +08:00
Nite07	f1bdeddfba	Update go.yml	2023-09-13 15:15:46 +08:00
nitezs	1866e6bf67	update	2023-09-13 15:06:44 +08:00