add batch delete log #57

fix: cannot delete user

.github/workflows/build_test.yml

@@ -0,0 +1,271 @@
+name: Build Test
+
+on:
+  workflow_dispatch:
+    inputs:
+      BASE_IMAGE_NAMESPACE:
+        description: 'Base image namespace (Default: Your Github username)'
+        required: false
+        default: ''
+      DOCKERHUB_IMAGE_NAMESPACE:
+        description: 'Docker Hub image namespace (Default: Your Github username)'
+        required: false
+        default: ''
+      GHCR_IMAGE_NAMESPACE:
+        description: 'GitHub Container Registry image namespace (Default: Your Github username)'
+        required: false
+        default: ''
+      SKIP_DOCKER_HUB:
+        description: 'Set to true to skip pushing to Docker Hub (default: false)'
+        required: false
+        default: 'false'
+      SKIP_GHCR:
+        description: 'Set to true to skip pushing to GHCR (default: false)'
+        required: false
+        default: 'false'
+      WEBCLIENT_SOURCE_LOCATION:
+        description: 'Web Client API Repository'
+        required: true
+        default: 'https://github.com/lejianwen/rustdesk-api-web'
+
+env:
+  LATEST_TAG: latest
+  WEBCLIENT_SOURCE_LOCATION: ${{ github.event.inputs.WEBCLIENT_SOURCE_LOCATION || 'https://github.com/lejianwen/rustdesk-api-web' }}
+  BASE_IMAGE_NAMESPACE: ${{ github.event.inputs.BASE_IMAGE_NAMESPACE || github.actor }}
+  DOCKERHUB_IMAGE_NAMESPACE: ${{ github.event.inputs.DOCKERHUB_IMAGE_NAMESPACE || github.actor }}
+  GHCR_IMAGE_NAMESPACE: ${{ github.event.inputs.GHCR_IMAGE_NAMESPACE || github.actor }}
+  SKIP_DOCKER_HUB: ${{ github.event.inputs.SKIP_DOCKER_HUB || 'false' }}
+  SKIP_GHCR: ${{ github.event.inputs.SKIP_GHCR || 'false' }}
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - { platform: "amd64", goos: "linux", file_ext: "tar.gz" }
+          - { platform: "arm64", goos: "linux", file_ext: "tar.gz" }
+          - { platform: "armv7l", goos: "linux", file_ext: "tar.gz" }
+          - { platform: "amd64", goos: "windows", file_ext: "zip" }
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go environment
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.22'  # 选择 Go 版本
+
+      - name: Set up npm
+        uses: actions/setup-node@v2
+        with:
+          node-version: '20'
+
+
+      - name: build rustdesk-api-web
+        run: |
+          git clone ${{ env.WEBCLIENT_SOURCE_LOCATION }}
+          cd rustdesk-api-web
+          npm install
+          npm run build
+          mkdir ../resources/admin/ -p
+          cp -ar dist/* ../resources/admin/
+
+      - name: tidy
+        run: go mod tidy
+
+      - name: swag
+        run: |
+          go install github.com/swaggo/swag/cmd/swag@latest
+          swag init -g cmd/apimain.go --output docs/api --instanceName api --exclude http/controller/admin
+          swag init -g cmd/apimain.go --output docs/admin --instanceName admin --exclude http/controller/api
+
+      - name: Build for ${{ matrix.job.goos }}-${{ matrix.job.platform }}
+        run: |
+          mkdir release -p
+          cp -ar resources release/
+          cp -ar docs release/
+          cp -ar conf release/
+          mkdir -p release/data
+          mkdir -p release/runtime
+          if [ "${{ matrix.job.goos }}" = "windows" ]; then
+            sudo apt-get install gcc-mingw-w64-x86-64 zip -y
+            GOOS=${{ matrix.job.goos }} GOARCH=${{ matrix.job.platform }} CC=x86_64-w64-mingw32-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 go build -ldflags "-s -w" -o ./release/apimain.exe ./cmd/apimain.go
+            zip -r ${{ matrix.job.goos}}-${{ matrix.job.platform }}.${{matrix.job.file_ext}} ./release
+          else
+            if [ "${{ matrix.job.platform }}" = "arm64" ]; then
+                wget https://musl.cc/aarch64-linux-musl-cross.tgz
+                tar -xf aarch64-linux-musl-cross.tgz
+                export PATH=$PATH:$PWD/aarch64-linux-musl-cross/bin
+                GOOS=${{ matrix.job.goos }} GOARCH=${{ matrix.job.platform }} CC=aarch64-linux-musl-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 go build -ldflags "-s -w" -o ./release/apimain ./cmd/apimain.go
+            elif [ "${{ matrix.job.platform }}" = "armv7l" ]; then
+                wget https://musl.cc/armv7l-linux-musleabihf-cross.tgz
+                tar -xf armv7l-linux-musleabihf-cross.tgz
+                export PATH=$PATH:$PWD/armv7l-linux-musleabihf-cross/bin
+                GOOS=${{ matrix.job.goos }} GOARCH=arm GOARM=7 CC=armv7l-linux-musleabihf-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 go build -ldflags "-s -w" -o ./release/apimain ./cmd/apimain.go
+            else
+              sudo apt-get install musl musl-dev musl-tools -y
+              GOOS=${{ matrix.job.goos }} GOARCH=${{ matrix.job.platform }} CC=musl-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 go build -ldflags "-s -w" -o ./release/apimain ./cmd/apimain.go
+            fi
+            tar -czf ${{ matrix.job.goos}}-${{ matrix.job.platform }}.${{matrix.job.file_ext}} ./release
+          fi
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rustdesk-api-${{ matrix.job.goos }}-${{ matrix.job.platform }}
+          path: |
+            ${{ matrix.job.goos}}-${{ matrix.job.platform }}.${{matrix.job.file_ext}}
+      - name: Upload to GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ${{ matrix.job.goos}}-${{ matrix.job.platform }}.${{matrix.job.file_ext}}
+          tag_name: test
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  docker:
+    name: Push Docker Image
+    needs: build
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - { platform: "amd64", goos: "linux",  docker_platform: "linux/amd64" }
+          - { platform: "arm64", goos: "linux",  docker_platform: "linux/arm64" }
+          - { platform: "armv7l", goos: "linux",  docker_platform: "linux/arm/v7" }
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to Docker Hub
+        if: ${{ env.SKIP_DOCKER_HUB == 'false' }}  # Only log in if SKIP_DOCKER_HUB is false
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Log in to GitHub Container Registry
+        if: ${{ env.SKIP_GHCR == 'false' }}  # Only log in if GHCR push is enabled
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract version from tag
+        id: vars
+        run: |
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          else
+            echo "TAG=test" >> $GITHUB_ENV  # Default to 'test' if not a tag
+          fi
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api
+
+      - name: Download binaries
+        uses: actions/download-artifact@v4
+        with:
+          name: rustdesk-api-${{ matrix.job.goos }}-${{ matrix.job.platform }}
+          path: ./
+
+      - name: Unzip binaries
+        run: |
+          mkdir -p ${{ matrix.job.platform }}
+          tar -xzf ${{ matrix.job.goos }}-${{ matrix.job.platform }}.tar.gz -C ${{ matrix.job.platform }}
+          file ${{ matrix.job.platform }}/apimain
+
+      - name: Build and push Docker image to Docker Hub ${{ matrix.job.platform }}
+        if: ${{ env.SKIP_DOCKER_HUB == 'false' }}  # Only run this step if SKIP_DOCKER_HUB is false
+        uses: docker/build-push-action@v5
+        with:
+          context: "."
+          file: ./Dockerfile
+          platforms: ${{ matrix.job.docker_platform }}
+          push: true
+          provenance: false
+          build-args: |
+            BUILDARCH=${{ matrix.job.platform }}
+          tags: |
+            ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-${{ matrix.job.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Build and push Docker image to GHCR ${{ matrix.job.platform }}
+        if: ${{ env.SKIP_GHCR == 'false' }}  # Only run this step if SKIP_GHCR is false
+        uses: docker/build-push-action@v5
+        with:
+          context: "."
+          file: ./Dockerfile
+          platforms: ${{ matrix.job.docker_platform }}
+          push: true
+          provenance: false
+          build-args: |
+            BUILDARCH=${{ matrix.job.platform }}
+          tags: |
+            ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-${{ matrix.job.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  #
+  docker-manifest:
+    name: Push Docker Manifest
+    needs: docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Extract version from tag
+        id: vars
+        run: |
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          else
+            echo "TAG=test" >> $GITHUB_ENV  # Default to 'test' if not a tag
+          fi
+
+      - name: Log in to Docker Hub
+        if: ${{ env.SKIP_DOCKER_HUB == 'false' }}  # Only log in if Docker Hub push is enabled
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Log in to GitHub Container Registry
+        if: ${{ env.SKIP_GHCR == 'false' }}  # Only log in if GHCR push is enabled
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create and push manifest Docker Hub (:version)
+        if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
+        uses: Noelware/docker-manifest-action@master
+        with:
+          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
+          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
+            ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
+            ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
+          push: true
+
+      - name: Create and push manifest GHCR (:version)
+        if: ${{ env.SKIP_GHCR == 'false' }}
+        uses: Noelware/docker-manifest-action@master
+        with:
+          base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
+          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
+            ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-armv7l,
+            ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
+          push: true
+          amend: true

.github/workflows/release.yml

@@ -1,95 +0,0 @@
-name: Build and Release
-
-on:
-  workflow_dispatch:
-#    tags:
-#      - 'v*.*.*'  # 当推送带有版本号的 tag（例如 v1.0.0）时触发工作流
-#on:
-#  push:
-#    branches: [ "master" ]
-#  pull_request:
-#    branches: [ "master" ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        goos: [ linux, windows ] # 指定要构建的操作系统
-        goarch: [ amd64 ]         # 指定架构
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go environment
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.22'  # 选择 Go 版本
-
-      - name: Set up npm
-        uses: actions/setup-node@v2
-        with:
-          node-version: '20'
-
-      - name: install gcc zip musl
-        run: |
-          if [ "${{ matrix.goos }}" = "windows" ]; then
-            sudo apt-get install gcc-mingw-w64-x86-64 zip -y
-          else
-            sudo apt-get install musl musl-dev musl-tools -y
-          fi
-
-
-      - name: build rustdesk-api-web
-        run: |
-          git clone https://github.com/lejianwen/rustdesk-api-web
-          cd rustdesk-api-web
-          npm install
-          npm run build
-          mkdir ../resources/admin/ -p
-          cp -ar dist/* ../resources/admin/
-
-      - name: tidy
-        run: go mod tidy
-
-
-      - name: swag
-        run: |
-          go install github.com/swaggo/swag/cmd/swag@latest
-          swag init -g cmd/apimain.go --output docs/api --instanceName api --exclude http/controller/admin
-          swag init -g cmd/apimain.go --output docs/admin --instanceName admin --exclude http/controller/api
-
-      - name: Build for ${{ matrix.goos }}-${{ matrix.goarch }}
-        run: |
-          mkdir release -p
-          cp -ar resources release/
-          cp -ar docs release/
-          cp -ar conf release/
-          mkdir -p release/data
-          mkdir -p release/runtime
-          if [ "${{ matrix.goos }}" = "windows" ]; then
-            GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} CC=x86_64-w64-mingw32-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 go build -ldflags "-s -w" -o ./release/apimain.exe ./cmd/apimain.go
-            zip -r ${{ matrix.goos}}-${{ matrix.goarch }}.zip ./release
-          else
-            GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} CC=musl-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 go build -ldflags "-s -w" -o ./release/apimain ./cmd/apimain.go
-            tar -czf ${{ matrix.goos}}-${{ matrix.goarch }}.tar.gz ./release 
-          fi
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: myapp-${{ matrix.goos }}-${{ matrix.goarch }}
-          path: |
-            ${{ matrix.goos}}-${{ matrix.goarch }}.tar.gz
-            ${{ matrix.goos}}-${{ matrix.goarch }}.zip
-
-      - name: Upload to GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: |
-            ${{ matrix.goos}}-${{ matrix.goarch }}.tar.gz
-            ${{ matrix.goos}}-${{ matrix.goarch }}.zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -39,6 +39,8 @@
     - 自动获取ID服务器和KEY
     - 自动获取地址簿
     - 游客通过临时分享链接直接远程到设备
+- CLI
+    - 重置管理员密码
 
 ## 使用前准备
 
@@ -147,6 +149,17 @@
 2. PC端文档 `<youer server[:port]>/swagger/index.html`
    ![api_swag](docs/api_swag.png)
 
+### CLI
+```bash
+# 查看帮助
+./apimain -h
+```
+
+#### 重置管理员密码
+```bash
+./apimain reset-admin-pwd <pwd>
+```
+
 ## 安装与运行
 
 ### 相关配置

README_EN.md

@@ -38,7 +38,8 @@ desktop software that provides self-hosted solutions.
     - Automatically obtain ID server and KEY
     - Automatically obtain address book
     - Visitors are remotely to the device via a temporary sharing link
-
+- CLI
+    - Reset admin password
 ## Prerequisites
 
 ### [Rustdesk](https://github.com/rustdesk/rustdesk)
@@ -153,6 +154,17 @@ installation are `admin` `admin`, please change the password immediately.
 2. PC client docs: `<your server[:port]>/swagger/index.html`
    ![api_swag](docs/api_swag.png)
 
+### CLI
+```bash
+# help
+./apimain -h
+```
+
+#### Reset admin password
+```bash
+./apimain reset-admin-pwd <pwd>
+```
+
 ## Installation and Setup
 
 ### Configuration

cmd/apimain.go

@@ -14,6 +14,9 @@ import (
 	"fmt"
 	"github.com/go-redis/redis/v8"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
+	"github.com/spf13/cobra"
+	"os"
+	"strconv"
 )
 
 // @title 管理系统API
@@ -26,9 +29,79 @@ import (
 // @securitydefinitions.apikey BearerAuth
 // @in header
 // @name Authorization
+
+var rootCmd = &cobra.Command{
+	Use:   "apimain",
+	Short: "RUSTDESK API SERVER",
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		InitGlobal()
+	},
+	Run: func(cmd *cobra.Command, args []string) {
+		//gin
+		http.ApiInit()
+	},
+}
+
+var resetPwdCmd = &cobra.Command{
+	Use:     "reset-admin-pwd [pwd]",
+	Example: "reset-admin-pwd 123456",
+	Short:   "Reset Admin Password",
+	Args:    cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		pwd := args[0]
+		admin := service.AllService.UserService.InfoById(1)
+		err := service.AllService.UserService.UpdatePassword(admin, pwd)
+		if err != nil {
+			fmt.Printf("reset password fail! %v \n", err)
+			return
+		}
+		fmt.Printf("reset password success! \n")
+	},
+}
+var resetUserPwdCmd = &cobra.Command{
+	Use:     "reset-pwd [userId] [pwd]",
+	Example: "reset-pwd 2 123456",
+	Short:   "Reset User Password",
+	Args:    cobra.ExactArgs(2),
+	Run: func(cmd *cobra.Command, args []string) {
+		userId := args[0]
+		pwd := args[1]
+		uid, err := strconv.Atoi(userId)
+		if err != nil {
+			fmt.Printf("userId must be int! \n")
+			return
+		}
+		if uid <= 0 {
+			fmt.Printf("userId must be greater than 0! \n")
+			return
+		}
+		u := service.AllService.UserService.InfoById(uint(uid))
+		err = service.AllService.UserService.UpdatePassword(u, pwd)
+		if err != nil {
+			fmt.Printf("reset password fail! %v \n", err)
+			return
+		}
+		fmt.Printf("reset password success! \n")
+	},
+}
+
+func init() {
+	rootCmd.PersistentFlags().StringVarP(&global.ConfigPath, "config", "c", "./conf/config.yaml", "choose config file")
+	rootCmd.AddCommand(resetPwdCmd, resetUserPwdCmd)
+}
 func main() {
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func InitGlobal() {
 	//配置解析
-	global.Viper = config.Init(&global.Config)
+	global.Viper = config.Init(&global.Config, global.ConfigPath)
+
+	//从配置文件中加载密钥
+	config.LoadKeyFile(&global.Config.Rustdesk)
 
 	//日志
 	global.Logger = logger.New(&logger.Config{
@@ -94,14 +167,9 @@ func main() {
 
 	//locker
 	global.Lock = lock.NewLocal()
-
-	//gin
-	http.ApiInit()
-
 }
-
 func DatabaseAutoUpdate() {
-	version := 245
+	version := 246
 
 	db := global.DB
 
@@ -150,7 +218,7 @@ func DatabaseAutoUpdate() {
 		if v.Version < 245 {
 			//oauths 表的 oauth_type 字段设置为 op同样的值
 			db.Exec("update oauths set oauth_type = op")
-			db.Exec("update oauths set issuer = 'https://accounts.google.com' where op = 'google' and issuer = ''")
+			db.Exec("update oauths set issuer = 'https://accounts.google.com' where op = 'google'")
 			db.Exec("update user_thirds set oauth_type = third_type, op = third_type")
 			//通过email迁移旧的google授权
 			uts := make([]model.UserThird, 0)
@@ -161,6 +229,9 @@ func DatabaseAutoUpdate() {
 				}
 			}
 		}
+		if v.Version < 246 {
+			db.Exec("update oauths set issuer = 'https://accounts.google.com' where op = 'google' and issuer is null")
+		}
 	}
 
 }

conf/admin/hello.html

@@ -0,0 +1 @@
+👏👏👏 你好 <strong>{{username}}</strong>, 欢迎使用 <a href='https://github.com/lejianwen/rustdesk-api' target='_blank'>RustDesk Api Admin</a>

conf/config.yaml

@@ -2,6 +2,10 @@ lang: "zh-CN"
 app:
   web-client: 1  # 1:启用 0:禁用
   register: false #是否开启注册
+admin:
+  title: "RustDesk Api Admin"
+  hello-file: "./conf/admin/hello.html"  #优先使用file
+  hello: ""
 gin:
   api-addr: "0.0.0.0:21114"
   mode: "release" #release,debug,test

config/config.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"flag"
 	"fmt"
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/viper"
@@ -18,10 +17,15 @@ type App struct {
 	WebClient int  `mapstructure:"web-client"`
 	Register  bool `mapstructure:"register"`
 }
-
+type Admin struct {
+	Title     string `mapstructure:"title"`
+	Hello     string `mapstructure:"hello"`
+	HelloFile string `mapstructure:"hello-file"`
+}
 type Config struct {
 	Lang     string `mapstructure:"lang"`
 	App      App
+	Admin    Admin
 	Gorm     Gorm
 	Mysql    Mysql
 	Gin      Gin
@@ -35,18 +39,15 @@ type Config struct {
 }
 
 // Init 初始化配置
-func Init(rowVal interface{}) *viper.Viper {
+func Init(rowVal interface{}, path string) *viper.Viper {
-	var config string
+	if path == "" {
-	flag.StringVar(&config, "c", "", "choose config file.")
+		path = DefaultConfig
-	flag.Parse()
-	if config == "" { // 优先级: 命令行 > 默认值
-		config = DefaultConfig
 	}
-	v := viper.New()
+	v := viper.GetViper()
 	v.AutomaticEnv()
 	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
 	v.SetEnvPrefix("RUSTDESK_API")
-	v.SetConfigFile(config)
+	v.SetConfigFile(path)
 	v.SetConfigType("yaml")
 	err := v.ReadInConfig()
 	if err != nil {
@@ -63,7 +64,7 @@ func Init(rowVal interface{}) *viper.Viper {
 	if err := v.Unmarshal(rowVal); err != nil {
 		fmt.Println(err)
 	}
-	LoadKeyFile(&rowVal.(*Config).Rustdesk)
+
 	return v
 }
 

docs/admin/admin_docs.go

@@ -958,7 +958,214 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "/admin/audit_conn/batchDelete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "链接日志批量删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "链接日志"
+                ],
+                "summary": "链接日志批量删除",
+                "parameters": [
+                    {
+                        "description": "链接日志",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.AuditConnLogIds"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/audit_conn/delete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "链接日志删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "链接日志"
+                ],
+                "summary": "链接日志删除",
+                "parameters": [
+                    {
+                        "description": "链接日志信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/model.AuditConn"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/audit_conn/list": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "链接日志列表",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "链接日志"
+                ],
+                "summary": "链接日志列表",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "页大小",
+                        "name": "page_size",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "目标设备",
+                        "name": "peer_id",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "来源设备",
+                        "name": "from_peer",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.AuditConnList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/audit_file/batchDelete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "文件日志批量删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "文件日志"
+                ],
+                "summary": "文件日志批量删除",
+                "parameters": [
+                    {
+                        "description": "文件日志",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.AuditFileLogIds"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/audit_file/delete": {
             "post": {
                 "security": [
                     {
@@ -1003,7 +1210,7 @@ const docTemplateadmin = `{
                 }
             }
         },
-        "/admin/audit_conn/list": {
+        "/admin/audit_file/list": {
             "get": {
                 "security": [
                     {
@@ -1075,6 +1282,108 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "/admin/config/admin": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "ADMIN服务配置",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "ADMIN"
+                ],
+                "summary": "ADMIN服务配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/config/app": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "APP服务配置",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "ADMIN"
+                ],
+                "summary": "APP服务配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/config/server": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "服务配置,给webclient提供api-server",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "ADMIN"
+                ],
+                "summary": "RUSTDESK服务配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/file/oss_token": {
             "get": {
                 "security": [
@@ -1522,7 +1831,7 @@ const docTemplateadmin = `{
                         "token": []
                     }
                 ],
-                "description": "登录日志删除",
+                "description": "登录日志批量删除",
                 "consumes": [
                     "application/json"
                 ],
@@ -1532,15 +1841,15 @@ const docTemplateadmin = `{
                 "tags": [
                     "登录日志"
                 ],
-                "summary": "登录日志删除",
+                "summary": "登录日志批量删除",
                 "parameters": [
                     {
-                        "description": "登录日志信息",
+                        "description": "登录日志",
                         "name": "body",
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/model.LoginLog"
+                            "$ref": "#/definitions/admin.LoginLogIds"
                         }
                     }
                 ],
@@ -3067,6 +3376,90 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "/admin/user/myPeer": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "我的设备列表",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "设备"
+                ],
+                "summary": "我的设备列表",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "页大小",
+                        "name": "page_size",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "时间",
+                        "name": "time_ago",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "ID",
+                        "name": "id",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "主机名",
+                        "name": "hostname",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "uuids 用逗号分隔",
+                        "name": "uuids",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.PeerList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/user/update": {
             "post": {
                 "security": [
@@ -3368,6 +3761,34 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "admin.AuditConnLogIds": {
+            "type": "object",
+            "required": [
+                "ids"
+            ],
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
+        "admin.AuditFileLogIds": {
+            "type": "object",
+            "required": [
+                "ids"
+            ],
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "admin.ChangeCurPasswordForm": {
             "type": "object",
             "required": [
@@ -3404,9 +3825,29 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "admin.LoginLogIds": {
+            "type": "object",
+            "required": [
+                "ids"
+            ],
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "admin.LoginPayload": {
             "type": "object",
             "properties": {
+                "avatar": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
                 "nickname": {
                     "type": "string"
                 },
@@ -3429,7 +3870,7 @@ const docTemplateadmin = `{
             "required": [
                 "client_id",
                 "client_secret",
-                "op",
+                "oauth_type",
                 "redirect_url"
             ],
             "properties": {
@@ -3448,6 +3889,9 @@ const docTemplateadmin = `{
                 "issuer": {
                     "type": "string"
                 },
+                "oauth_type": {
+                    "type": "string"
+                },
                 "op": {
                     "type": "string"
                 },
@@ -3567,6 +4011,10 @@ const docTemplateadmin = `{
                 "avatar": {
                     "type": "string"
                 },
+                "email": {
+                    "description": "validate:\"required,email\" email不强制",
+                    "type": "string"
+                },
                 "group_id": {
                     "type": "integer"
                 },
@@ -3591,18 +4039,18 @@ const docTemplateadmin = `{
                 "username": {
                     "type": "string",
                     "maxLength": 10,
-                    "minLength": 4
+                    "minLength": 2
                 }
             }
         },
         "admin.UserOauthItem": {
             "type": "object",
             "properties": {
+                "op": {
+                    "type": "string"
+                },
                 "status": {
                     "type": "integer"
-                },
-                "third_type": {
-                    "type": "string"
                 }
             }
         },
@@ -3973,6 +4421,9 @@ const docTemplateadmin = `{
                 "created_at": {
                     "type": "string"
                 },
+                "device_id": {
+                    "type": "string"
+                },
                 "id": {
                     "type": "integer"
                 },
@@ -4042,6 +4493,9 @@ const docTemplateadmin = `{
                 "issuer": {
                     "type": "string"
                 },
+                "oauth_type": {
+                    "type": "string"
+                },
                 "op": {
                     "type": "string"
                 },
@@ -4220,6 +4674,9 @@ const docTemplateadmin = `{
                 "created_at": {
                     "type": "string"
                 },
+                "email": {
+                    "type": "string"
+                },
                 "group_id": {
                     "type": "integer"
                 },
@@ -4269,6 +4726,12 @@ const docTemplateadmin = `{
                 "created_at": {
                     "type": "string"
                 },
+                "device_id": {
+                    "type": "string"
+                },
+                "device_uuid": {
+                    "type": "string"
+                },
                 "expired_at": {
                     "type": "integer"
                 },

docs/admin/admin_swagger.json

@@ -951,7 +951,214 @@
                 }
             }
         },
+        "/admin/audit_conn/batchDelete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "链接日志批量删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "链接日志"
+                ],
+                "summary": "链接日志批量删除",
+                "parameters": [
+                    {
+                        "description": "链接日志",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.AuditConnLogIds"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/audit_conn/delete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "链接日志删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "链接日志"
+                ],
+                "summary": "链接日志删除",
+                "parameters": [
+                    {
+                        "description": "链接日志信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/model.AuditConn"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/audit_conn/list": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "链接日志列表",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "链接日志"
+                ],
+                "summary": "链接日志列表",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "页大小",
+                        "name": "page_size",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "目标设备",
+                        "name": "peer_id",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "来源设备",
+                        "name": "from_peer",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.AuditConnList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/audit_file/batchDelete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "文件日志批量删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "文件日志"
+                ],
+                "summary": "文件日志批量删除",
+                "parameters": [
+                    {
+                        "description": "文件日志",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.AuditFileLogIds"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/audit_file/delete": {
             "post": {
                 "security": [
                     {
@@ -996,7 +1203,7 @@
                 }
             }
         },
-        "/admin/audit_conn/list": {
+        "/admin/audit_file/list": {
             "get": {
                 "security": [
                     {
@@ -1068,6 +1275,108 @@
                 }
             }
         },
+        "/admin/config/admin": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "ADMIN服务配置",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "ADMIN"
+                ],
+                "summary": "ADMIN服务配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/config/app": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "APP服务配置",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "ADMIN"
+                ],
+                "summary": "APP服务配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/config/server": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "服务配置,给webclient提供api-server",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "ADMIN"
+                ],
+                "summary": "RUSTDESK服务配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/file/oss_token": {
             "get": {
                 "security": [
@@ -1515,7 +1824,7 @@
                         "token": []
                     }
                 ],
-                "description": "登录日志删除",
+                "description": "登录日志批量删除",
                 "consumes": [
                     "application/json"
                 ],
@@ -1525,15 +1834,15 @@
                 "tags": [
                     "登录日志"
                 ],
-                "summary": "登录日志删除",
+                "summary": "登录日志批量删除",
                 "parameters": [
                     {
-                        "description": "登录日志信息",
+                        "description": "登录日志",
                         "name": "body",
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/model.LoginLog"
+                            "$ref": "#/definitions/admin.LoginLogIds"
                         }
                     }
                 ],
@@ -3060,6 +3369,90 @@
                 }
             }
         },
+        "/admin/user/myPeer": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "我的设备列表",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "设备"
+                ],
+                "summary": "我的设备列表",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "页大小",
+                        "name": "page_size",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "时间",
+                        "name": "time_ago",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "ID",
+                        "name": "id",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "主机名",
+                        "name": "hostname",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "uuids 用逗号分隔",
+                        "name": "uuids",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.PeerList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/user/update": {
             "post": {
                 "security": [
@@ -3361,6 +3754,34 @@
                 }
             }
         },
+        "admin.AuditConnLogIds": {
+            "type": "object",
+            "required": [
+                "ids"
+            ],
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
+        "admin.AuditFileLogIds": {
+            "type": "object",
+            "required": [
+                "ids"
+            ],
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "admin.ChangeCurPasswordForm": {
             "type": "object",
             "required": [
@@ -3397,9 +3818,29 @@
                 }
             }
         },
+        "admin.LoginLogIds": {
+            "type": "object",
+            "required": [
+                "ids"
+            ],
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "admin.LoginPayload": {
             "type": "object",
             "properties": {
+                "avatar": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
                 "nickname": {
                     "type": "string"
                 },
@@ -3422,7 +3863,7 @@
             "required": [
                 "client_id",
                 "client_secret",
-                "op",
+                "oauth_type",
                 "redirect_url"
             ],
             "properties": {
@@ -3441,6 +3882,9 @@
                 "issuer": {
                     "type": "string"
                 },
+                "oauth_type": {
+                    "type": "string"
+                },
                 "op": {
                     "type": "string"
                 },
@@ -3560,6 +4004,10 @@
                 "avatar": {
                     "type": "string"
                 },
+                "email": {
+                    "description": "validate:\"required,email\" email不强制",
+                    "type": "string"
+                },
                 "group_id": {
                     "type": "integer"
                 },
@@ -3584,18 +4032,18 @@
                 "username": {
                     "type": "string",
                     "maxLength": 10,
-                    "minLength": 4
+                    "minLength": 2
                 }
             }
         },
         "admin.UserOauthItem": {
             "type": "object",
             "properties": {
+                "op": {
+                    "type": "string"
+                },
                 "status": {
                     "type": "integer"
-                },
-                "third_type": {
-                    "type": "string"
                 }
             }
         },
@@ -3966,6 +4414,9 @@
                 "created_at": {
                     "type": "string"
                 },
+                "device_id": {
+                    "type": "string"
+                },
                 "id": {
                     "type": "integer"
                 },
@@ -4035,6 +4486,9 @@
                 "issuer": {
                     "type": "string"
                 },
+                "oauth_type": {
+                    "type": "string"
+                },
                 "op": {
                     "type": "string"
                 },
@@ -4213,6 +4667,9 @@
                 "created_at": {
                     "type": "string"
                 },
+                "email": {
+                    "type": "string"
+                },
                 "group_id": {
                     "type": "integer"
                 },
@@ -4262,6 +4719,12 @@
                 "created_at": {
                     "type": "string"
                 },
+                "device_id": {
+                    "type": "string"
+                },
+                "device_uuid": {
+                    "type": "string"
+                },
                 "expired_at": {
                     "type": "integer"
                 },

docs/admin/admin_swagger.yaml

@@ -57,6 +57,24 @@ definitions:
     required:
     - id
     type: object
+  admin.AuditConnLogIds:
+    properties:
+      ids:
+        items:
+          type: integer
+        type: array
+    required:
+    - ids
+    type: object
+  admin.AuditFileLogIds:
+    properties:
+      ids:
+        items:
+          type: integer
+        type: array
+    required:
+    - ids
+    type: object
   admin.ChangeCurPasswordForm:
     properties:
       new_password:
@@ -82,8 +100,21 @@ definitions:
     required:
     - name
     type: object
+  admin.LoginLogIds:
+    properties:
+      ids:
+        items:
+          type: integer
+        type: array
+    required:
+    - ids
+    type: object
   admin.LoginPayload:
     properties:
+      avatar:
+        type: string
+      email:
+        type: string
       nickname:
         type: string
       route_names:
@@ -107,6 +138,8 @@ definitions:
         type: integer
       issuer:
         type: string
+      oauth_type:
+        type: string
       op:
         type: string
       redirect_url:
@@ -116,7 +149,7 @@ definitions:
     required:
     - client_id
     - client_secret
-    - op
+    - oauth_type
     - redirect_url
     type: object
   admin.PeerBatchDeleteForm:
@@ -188,6 +221,9 @@ definitions:
     properties:
       avatar:
         type: string
+      email:
+        description: validate:"required,email" email不强制
+        type: string
       group_id:
         type: integer
       id:
@@ -203,7 +239,7 @@ definitions:
         minimum: 0
       username:
         maxLength: 10
-        minLength: 4
+        minLength: 2
         type: string
     required:
     - group_id
@@ -212,10 +248,10 @@ definitions:
     type: object
   admin.UserOauthItem:
     properties:
+      op:
+        type: string
       status:
         type: integer
-      third_type:
-        type: string
     type: object
   admin.UserPasswordForm:
     properties:
@@ -462,6 +498,8 @@ definitions:
         type: string
       created_at:
         type: string
+      device_id:
+        type: string
       id:
         type: integer
       ip:
@@ -508,6 +546,8 @@ definitions:
         type: integer
       issuer:
         type: string
+      oauth_type:
+        type: string
       op:
         type: string
       redirect_url:
@@ -627,6 +667,8 @@ definitions:
         type: string
       created_at:
         type: string
+      email:
+        type: string
       group_id:
         type: integer
       id:
@@ -659,6 +701,10 @@ definitions:
     properties:
       created_at:
         type: string
+      device_id:
+        type: string
+      device_uuid:
+        type: string
       expired_at:
         type: integer
       id:
@@ -1262,7 +1308,134 @@ paths:
       summary: APP服务配置
       tags:
       - ADMIN
+  /admin/audit_conn/batchDelete:
+    post:
+      consumes:
+      - application/json
+      description: 链接日志批量删除
+      parameters:
+      - description: 链接日志
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/admin.AuditConnLogIds'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 链接日志批量删除
+      tags:
+      - 链接日志
   /admin/audit_conn/delete:
+    post:
+      consumes:
+      - application/json
+      description: 链接日志删除
+      parameters:
+      - description: 链接日志信息
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/model.AuditConn'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 链接日志删除
+      tags:
+      - 链接日志
+  /admin/audit_conn/list:
+    get:
+      consumes:
+      - application/json
+      description: 链接日志列表
+      parameters:
+      - description: 页码
+        in: query
+        name: page
+        type: integer
+      - description: 页大小
+        in: query
+        name: page_size
+        type: integer
+      - description: 目标设备
+        in: query
+        name: peer_id
+        type: integer
+      - description: 来源设备
+        in: query
+        name: from_peer
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.AuditConnList'
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 链接日志列表
+      tags:
+      - 链接日志
+  /admin/audit_file/batchDelete:
+    post:
+      consumes:
+      - application/json
+      description: 文件日志批量删除
+      parameters:
+      - description: 文件日志
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/admin.AuditFileLogIds'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 文件日志批量删除
+      tags:
+      - 文件日志
+  /admin/audit_file/delete:
     post:
       consumes:
       - application/json
@@ -1290,7 +1463,7 @@ paths:
       summary: 文件日志删除
       tags:
       - 文件日志
-  /admin/audit_conn/list:
+  /admin/audit_file/list:
     get:
       consumes:
       - application/json
@@ -1333,6 +1506,69 @@ paths:
       summary: 文件日志列表
       tags:
       - 文件日志
+  /admin/config/admin:
+    get:
+      consumes:
+      - application/json
+      description: ADMIN服务配置
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: ADMIN服务配置
+      tags:
+      - ADMIN
+  /admin/config/app:
+    get:
+      consumes:
+      - application/json
+      description: APP服务配置
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: APP服务配置
+      tags:
+      - ADMIN
+  /admin/config/server:
+    get:
+      consumes:
+      - application/json
+      description: 服务配置,给webclient提供api-server
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: RUSTDESK服务配置
+      tags:
+      - ADMIN
   /admin/file/oss_token:
     get:
       consumes:
@@ -1600,14 +1836,14 @@ paths:
     post:
       consumes:
       - application/json
-      description: 登录日志删除
+      description: 登录日志批量删除
       parameters:
-      - description: 登录日志信息
+      - description: 登录日志
         in: body
         name: body
         required: true
         schema:
-          $ref: '#/definitions/model.LoginLog'
+          $ref: '#/definitions/admin.LoginLogIds'
       produces:
       - application/json
       responses:
@@ -1621,7 +1857,7 @@ paths:
             $ref: '#/definitions/response.Response'
       security:
       - token: []
-      summary: 登录日志删除
+      summary: 登录日志批量删除
       tags:
       - 登录日志
   /admin/login_log/detail/{id}:
@@ -2519,6 +2755,57 @@ paths:
       summary: 我的授权
       tags:
       - 用户
+  /admin/user/myPeer:
+    get:
+      consumes:
+      - application/json
+      description: 我的设备列表
+      parameters:
+      - description: 页码
+        in: query
+        name: page
+        type: integer
+      - description: 页大小
+        in: query
+        name: page_size
+        type: integer
+      - description: 时间
+        in: query
+        name: time_ago
+        type: integer
+      - description: ID
+        in: query
+        name: id
+        type: string
+      - description: 主机名
+        in: query
+        name: hostname
+        type: string
+      - description: uuids 用逗号分隔
+        in: query
+        name: uuids
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.PeerList'
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 我的设备列表
+      tags:
+      - 设备
   /admin/user/update:
     post:
       consumes:

docs/api/api_docs.go

@@ -1365,7 +1365,7 @@ const docTemplateapi = `{
                 "username": {
                     "type": "string",
                     "maxLength": 10,
-                    "minLength": 4
+                    "minLength": 2
                 },
                 "uuid": {
                     "type": "string"

docs/api/api_swagger.json

@@ -1358,7 +1358,7 @@
                 "username": {
                     "type": "string",
                     "maxLength": 10,
-                    "minLength": 4
+                    "minLength": 2
                 },
                 "uuid": {
                     "type": "string"

docs/api/api_swagger.yaml

@@ -69,7 +69,7 @@ definitions:
         type: string
       username:
         maxLength: 10
-        minLength: 4
+        minLength: 2
         type: string
       uuid:
         type: string

global/global.go

@@ -17,13 +17,14 @@ import (
 )
 
 var (
-	DB        *gorm.DB
+	DB         *gorm.DB
-	Logger    *logrus.Logger
+	Logger     *logrus.Logger
-	Config    config.Config
+	ConfigPath string = ""
-	Viper     *viper.Viper
+	Config     config.Config
-	Redis     *redis.Client
+	Viper      *viper.Viper
-	Cache     cache.Handler
+	Redis      *redis.Client
-	Validator struct {
+	Cache      cache.Handler
+	Validator  struct {
 		Validate    *validator.Validate
 		UT          *ut.UniversalTranslator
 		VTrans      ut.Translator

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/google/uuid v1.1.2
 	github.com/nicksnyder/go-i18n/v2 v2.4.0
 	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.9.0
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
@@ -28,7 +29,6 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute/metadata v0.5.1 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -44,6 +44,7 @@ require (
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/goccy/go-json v0.10.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect

http/controller/admin/audit.go

@@ -81,6 +81,37 @@ func (a *Audit) ConnDelete(c *gin.Context) {
 	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 }
 
+// BatchConnDelete 删除
+// @Tags 链接日志
+// @Summary 链接日志批量删除
+// @Description 链接日志批量删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.AuditConnLogIds true "链接日志"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/audit_conn/batchDelete [post]
+// @Security token
+func (a *Audit) BatchConnDelete(c *gin.Context) {
+	f := &admin.AuditConnLogIds{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	if len(f.Ids) == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+
+	err := service.AllService.AuditService.BatchDeleteAuditConn(f.Ids)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, err.Error())
+	return
+}
+
 // FileList 列表
 // @Tags 文件日志
 // @Summary 文件日志列表
@@ -93,7 +124,7 @@ func (a *Audit) ConnDelete(c *gin.Context) {
 // @Param from_peer query int false "来源设备"
 // @Success 200 {object} response.Response{data=model.AuditFileList}
 // @Failure 500 {object} response.Response
-// @Router /admin/audit_conn/list [get]
+// @Router /admin/audit_file/list [get]
 // @Security token
 func (a *Audit) FileList(c *gin.Context) {
 	query := &admin.AuditQuery{}
@@ -122,7 +153,7 @@ func (a *Audit) FileList(c *gin.Context) {
 // @Param body body model.AuditFile true "文件日志信息"
 // @Success 200 {object} response.Response
 // @Failure 500 {object} response.Response
-// @Router /admin/audit_conn/delete [post]
+// @Router /admin/audit_file/delete [post]
 // @Security token
 func (a *Audit) FileDelete(c *gin.Context) {
 	f := &model.AuditFile{}
@@ -148,3 +179,34 @@ func (a *Audit) FileDelete(c *gin.Context) {
 	}
 	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 }
+
+// BatchFileDelete 删除
+// @Tags 文件日志
+// @Summary 文件日志批量删除
+// @Description 文件日志批量删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.AuditFileLogIds true "文件日志"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/audit_file/batchDelete [post]
+// @Security token
+func (a *Audit) BatchFileDelete(c *gin.Context) {
+	f := &admin.AuditFileLogIds{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	if len(f.Ids) == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+
+	err := service.AllService.AuditService.BatchDeleteAuditFile(f.Ids)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, err.Error())
+	return
+}

http/controller/admin/config.go

@@ -0,0 +1,79 @@
+package admin
+
+import (
+	"Gwen/global"
+	"Gwen/http/response"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"os"
+	"strings"
+)
+
+type Config struct {
+}
+
+// ServerConfig RUSTDESK服务配置
+// @Tags ADMIN
+// @Summary RUSTDESK服务配置
+// @Description 服务配置,给webclient提供api-server
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/config/server [get]
+// @Security token
+func (co *Config) ServerConfig(c *gin.Context) {
+	cf := &response.ServerConfigResponse{
+		IdServer:    global.Config.Rustdesk.IdServer,
+		Key:         global.Config.Rustdesk.Key,
+		RelayServer: global.Config.Rustdesk.RelayServer,
+		ApiServer:   global.Config.Rustdesk.ApiServer,
+	}
+	response.Success(c, cf)
+}
+
+// AppConfig APP服务配置
+// @Tags ADMIN
+// @Summary APP服务配置
+// @Description APP服务配置
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/config/app [get]
+// @Security token
+func (co *Config) AppConfig(c *gin.Context) {
+	response.Success(c, &gin.H{
+		"web_client": global.Config.App.WebClient,
+	})
+}
+
+// AdminConfig ADMIN服务配置
+// @Tags ADMIN
+// @Summary ADMIN服务配置
+// @Description ADMIN服务配置
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/config/admin [get]
+// @Security token
+func (co *Config) AdminConfig(c *gin.Context) {
+
+	u := service.AllService.UserService.CurUser(c)
+	hello := global.Config.Admin.Hello
+	helloFile := global.Config.Admin.HelloFile
+	if helloFile != "" {
+		b, err := os.ReadFile(helloFile)
+		if err == nil && len(b) > 0 {
+			hello = string(b)
+		}
+	}
+
+	//replace {{username}} to username
+	hello = strings.Replace(hello, "{{username}}", u.Username, -1)
+	response.Success(c, &gin.H{
+		"title": global.Config.Admin.Title,
+		"hello": hello,
+	})
+}

http/controller/admin/loginLog.go

@@ -109,3 +109,34 @@ func (ct *LoginLog) Delete(c *gin.Context) {
 	}
 	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 }
+
+// BatchDelete 删除
+// @Tags 登录日志
+// @Summary 登录日志批量删除
+// @Description 登录日志批量删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.LoginLogIds true "登录日志"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/login_log/delete [post]
+// @Security token
+func (ct *LoginLog) BatchDelete(c *gin.Context) {
+	f := &admin.LoginLogIds{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	if len(f.Ids) == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+
+	err := service.AllService.LoginLogService.BatchDelete(f.Ids)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, err.Error())
+	return
+}

http/controller/admin/user.go

@@ -295,10 +295,10 @@ func (ct *User) MyOauth(c *gin.Context) {
 	response.Success(c, res)
 }
 
-// List 列表
+// MyPeer 列表
 // @Tags 设备
-// @Summary 设备列表
+// @Summary 我的设备列表
-// @Description 设备列表
+// @Description 我的设备列表
 // @Accept  json
 // @Produce  json
 // @Param page query int false "页码"

http/middleware/admin.go

@@ -17,7 +17,7 @@ func AdminAuth() gin.HandlerFunc {
 			c.Abort()
 			return
 		}
-		user := service.AllService.UserService.InfoByAccessToken(token)
+		user, ut := service.AllService.UserService.InfoByAccessToken(token)
 		if user.Id == 0 {
 			response.Fail(c, 403, "请先登录")
 			c.Abort()
@@ -26,6 +26,8 @@ func AdminAuth() gin.HandlerFunc {
 
 		c.Set("curUser", user)
 		c.Set("token", token)
+		//如果时间小于1天,token自动续期
+		service.AllService.UserService.AutoRefreshAccessToken(ut)
 
 		c.Next()
 	}

http/middleware/rustauth.go

@@ -28,7 +28,7 @@ func RustAuth() gin.HandlerFunc {
 		//这里只是简单的提取
 		token = token[7:]
 		//验证token
-		user := service.AllService.UserService.InfoByAccessToken(token)
+		user, ut := service.AllService.UserService.InfoByAccessToken(token)
 		if user.Id == 0 {
 			c.JSON(401, gin.H{
 				"error": "Unauthorized",
@@ -46,6 +46,9 @@ func RustAuth() gin.HandlerFunc {
 
 		c.Set("curUser", user)
 		c.Set("token", token)
+
+		service.AllService.UserService.AutoRefreshAccessToken(ut)
+
 		c.Next()
 	}
 }

http/request/admin/audit.go

@@ -5,3 +5,10 @@ type AuditQuery struct {
 	FromPeer string `form:"from_peer"`
 	PageQuery
 }
+
+type AuditConnLogIds struct {
+	Ids []uint `json:"ids" validate:"required"`
+}
+type AuditFileLogIds struct {
+	Ids []uint `json:"ids" validate:"required"`
+}

http/request/admin/login.go

@@ -15,3 +15,7 @@ type LoginTokenQuery struct {
 	UserId int `form:"user_id"`
 	PageQuery
 }
+
+type LoginLogIds struct {
+	Ids []uint `json:"ids" validate:"required"`
+}

http/router/admin.go

@@ -31,9 +31,14 @@ func Init(g *gin.Engine) {
 	AddressBookCollectionBind(adg)
 	AddressBookCollectionRuleBind(adg)
 	UserTokenBind(adg)
+	ConfigBind(adg)
+
+	//deprecated by ConfigBind
 	rs := &admin.Rustdesk{}
 	adg.GET("/server-config", rs.ServerConfig)
 	adg.GET("/app-config", rs.AppConfig)
+	//deprecated end
+
 	//访问静态文件
 	//g.StaticFS("/upload", http.Dir(global.Config.Gin.ResourcesPath+"/upload"))
 }
@@ -149,15 +154,18 @@ func LoginLogBind(rg *gin.RouterGroup) {
 	cont := &admin.LoginLog{}
 	aR.GET("/list", cont.List)
 	aR.POST("/delete", cont.Delete)
+	aR.POST("/batchDelete", cont.BatchDelete)
 }
 func AuditBind(rg *gin.RouterGroup) {
 	cont := &admin.Audit{}
 	aR := rg.Group("/audit_conn").Use(middleware.AdminPrivilege())
 	aR.GET("/list", cont.ConnList)
 	aR.POST("/delete", cont.ConnDelete)
+	aR.POST("/batchDelete", cont.BatchConnDelete)
 	afR := rg.Group("/audit_file").Use(middleware.AdminPrivilege())
 	afR.GET("/list", cont.FileList)
 	afR.POST("/delete", cont.FileDelete)
+	afR.POST("/batchDelete", cont.BatchFileDelete)
 }
 func AddressBookCollectionBind(rg *gin.RouterGroup) {
 	aR := rg.Group("/address_book_collection")
@@ -188,6 +196,13 @@ func UserTokenBind(rg *gin.RouterGroup) {
 	aR.GET("/list", cont.List)
 	aR.POST("/delete", cont.Delete)
 }
+func ConfigBind(rg *gin.RouterGroup) {
+	aR := rg.Group("/config")
+	rs := &admin.Config{}
+	aR.GET("/server", rs.ServerConfig)
+	aR.GET("/app", rs.AppConfig)
+	aR.GET("/admin", rs.AdminConfig)
+}
 
 /*
 func FileBind(rg *gin.RouterGroup) {

service/audit.go

@@ -85,3 +85,11 @@ func (as *AuditService) DeleteAuditFile(u *model.AuditFile) error {
 func (as *AuditService) UpdateAuditFile(u *model.AuditFile) error {
 	return global.DB.Model(u).Updates(u).Error
 }
+
+func (as *AuditService) BatchDeleteAuditConn(ids []uint) error {
+	return global.DB.Where("id in (?)", ids).Delete(&model.AuditConn{}).Error
+}
+
+func (as *AuditService) BatchDeleteAuditFile(ids []uint) error {
+	return global.DB.Where("id in (?)", ids).Delete(&model.AuditFile{}).Error
+}

service/loginLog.go

@@ -43,3 +43,7 @@ func (us *LoginLogService) Delete(u *model.LoginLog) error {
 func (us *LoginLogService) Update(u *model.LoginLog) error {
 	return global.DB.Model(u).Updates(u).Error
 }
+
+func (us *LoginLogService) BatchDelete(ids []uint) error {
+	return global.DB.Where("id in (?)", ids).Delete(&model.LoginLog{}).Error
+}

service/peer.go

@@ -27,7 +27,7 @@ func (ps *PeerService) InfoByRowId(id uint) *model.Peer {
 }
 
 // FindByUserIdAndUuid 根据用户id和uuid查找peer
-func (ps *PeerService) FindByUserIdAndUuid(uuid string,userId uint) *model.Peer {
+func (ps *PeerService) FindByUserIdAndUuid(uuid string, userId uint) *model.Peer {
 	p := &model.Peer{}
 	global.DB.Where("uuid = ? and user_id = ?", uuid, userId).First(p)
 	return p
@@ -42,11 +42,13 @@ func (ps *PeerService) UuidBindUserId(deviceId string, uuid string, userId uint)
 		ps.Update(peer)
 	} else {
 		// 不存在则创建
-		global.DB.Create(&model.Peer{
+		/*if deviceId != "" {
-			Id: 		deviceId,
+			global.DB.Create(&model.Peer{
-			Uuid:     	uuid,
+				Id:     deviceId,
-			UserId:   	userId,
+				Uuid:   uuid,
-		})
+				UserId: userId,
+			})
+		}*/
 	}
 }
 
@@ -143,4 +145,3 @@ func (ps *PeerService) BatchDelete(ids []uint) error {
 func (ps *PeerService) Update(u *model.Peer) error {
 	return global.DB.Model(u).Updates(u).Error
 }
-

service/user.go

@@ -53,18 +53,18 @@ func (us *UserService) InfoByUsernamePassword(username, password string) *model.
 }
 
 // InfoByAccesstoken 根据accesstoken取用户信息
-func (us *UserService) InfoByAccessToken(token string) *model.User {
+func (us *UserService) InfoByAccessToken(token string) (*model.User, *model.UserToken) {
 	u := &model.User{}
 	ut := &model.UserToken{}
 	global.DB.Where("token = ?", token).First(ut)
 	if ut.Id == 0 {
-		return u
+		return u, ut
 	}
 	if ut.ExpiredAt < time.Now().Unix() {
-		return u
+		return u, ut
 	}
 	global.DB.Where("id = ?", ut.UserId).First(u)
-	return u
+	return u, ut
 }
 
 // GenerateToken 生成token
@@ -215,12 +215,12 @@ func (us *UserService) Delete(u *model.User) error {
 		tx.Rollback()
 		return err
 	}
+	tx.Commit()
 	// 删除关联的peer
 	if err := AllService.PeerService.EraseUserId(u.Id); err != nil {
-		tx.Rollback()
+		global.Logger.Warn("User deleted successfully, but failed to unlink peer.")
-		return err
+		return nil
 	}
-	tx.Commit()
 	return nil
 }
 
@@ -448,3 +448,13 @@ func (us *UserService) getAdminUserCount() int64 {
 	global.DB.Model(&model.User{}).Where("is_admin = ?", true).Count(&count)
 	return count
 }
+
+func (us *UserService) RefreshAccessToken(ut *model.UserToken) {
+	ut.ExpiredAt = time.Now().Add(time.Hour * 24 * 7).Unix()
+	global.DB.Model(ut).Update("expired_at", ut.ExpiredAt)
+}
+func (us *UserService) AutoRefreshAccessToken(ut *model.UserToken) {
+	if ut.ExpiredAt-time.Now().Unix() < 86400 {
+		us.RefreshAccessToken(ut)
+	}
+}