optimize add ab from peer #84

add batch update ab tags

.dockerignore

@@ -0,0 +1,29 @@
+# Ignore Docker Compose configuration files
+docker-compose.yaml
+docker-compose-dev.yaml
+
+# Ignore development Dockerfile
+Dockerfile
+Dockerfile.dev
+docker-dev.sh
+
+# Ignore the data directory
+data/
+
+# Ignore version control system directories
+.git/
+
+# Ignore log and temporary files
+*.log
+*.tmp
+*.swp
+
+# Ignore editor/IDE configuration files
+.vscode/
+.idea/
+
+# Ignore binaries and build cache
+release/
+bin/
+*.exe
+*.out

.gitattributes

@@ -1 +1,2 @@
 resources/web/**/* linguist-vendored
+resources/web2/**/* linguist-vendored

.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 }}

.gitignore

@@ -1,10 +1,13 @@
 .idea
 runtime/*
-!runtime/cache/.gitignore
+!runtime
+!runtime/cache
+!runtime/cache/.gitkeep
 go.sum
 resources/*
 !resources/public/upload/.gitignore
 !resources/web
+!resources/web2
 !resources/i18n
 release
 data

Dockerfile.dev

@@ -0,0 +1,94 @@
+# Use build arguments for Go version and architecture
+ARG GO_VERSION=1.22
+ARG BUILDARCH=amd64
+
+# Stage 1: Builder Stage
+# FROM golang:${GO_VERSION}-alpine AS builder
+FROM crazymax/xgo:${GO_VERSION} AS builder-backend
+
+# Set up working directory
+WORKDIR /app
+
+# Step 1: Copy the source code
+COPY . .
+
+# use --mount=type=cache,target=/go/pkg/mod to cache the go mod
+# Step 2: Download dependencies
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod tidy && go mod download && go install github.com/swaggo/swag/cmd/swag@latest
+
+# Step 3: Run swag build script
+RUN --mount=type=cache,target=/go/pkg/mod \
+    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 
+
+# Step 4: Build the Go application with CGO enabled and specified ldflags
+RUN --mount=type=cache,target=/go/pkg/mod \
+    CGO_ENABLED=1 GOOS=linux go build -a \
+    -ldflags "-s -w --extldflags '-static -fpic'" \
+    -installsuffix cgo -o release/apimain cmd/apimain.go
+
+# Stage 2: Frontend Build Stage (builder2)
+FROM node:18-alpine AS builder-admin-frontend
+
+# Set working directory
+WORKDIR /frontend
+
+ARG COUNTRY
+# Install required tools without caching index to minimize image size
+RUN if [ "$COUNTRY" = "CN" ] ; then \
+        echo "It is in China, updating the repositories"; \
+        sed -i 's#https\?://dl-cdn.alpinelinux.org/alpine#https://mirrors.tuna.tsinghua.edu.cn/alpine#g' /etc/apk/repositories; \
+    fi && \
+    apk update && apk add --no-cache git
+
+ARG FREONTEND_GIT_REPO=https://github.com/lejianwen/rustdesk-api-web.git
+ARG FRONTEND_GIT_BRANCH=master
+# Clone the frontend repository
+
+RUN git clone -b $FRONTEND_GIT_BRANCH $FREONTEND_GIT_REPO .
+
+# Install required tools without caching index to minimize image size
+RUN if [ "$COUNTRY" = "CN" ] ; then \
+        echo "It is in China, updating NPM_CONFIG_REGISTRY"; \
+        export NPM_CONFIG_REGISTRY="https://mirrors.huaweicloud.com/repository/npm/"; \
+    fi && \
+    npm install && npm run build
+
+
+# Stage 2: Final Image
+FROM alpine:latest
+
+# Set up working directory
+WORKDIR /app
+
+# Install necessary runtime dependencies
+# Install required tools without caching index to minimize image size
+ARG COUNTRY
+RUN if [ "$COUNTRY" = "CN" ] ; then \
+        echo "It is in China, updating the repositories"; \
+        sed -i 's#https\?://dl-cdn.alpinelinux.org/alpine#https://mirrors.tuna.tsinghua.edu.cn/alpine#g' /etc/apk/repositories; \
+    fi && \
+    apk update && apk add --no-cache tzdata file
+
+# Copy the built application and resources from the builder stage
+COPY --from=builder-backend /app/release /app/
+COPY --from=builder-backend /app/conf /app/conf/
+COPY --from=builder-backend /app/resources /app/resources/
+COPY --from=builder-backend /app/docs /app/docs/
+# Copy frontend build from builder2 stage
+COPY --from=builder-admin-frontend /frontend/dist/ /app/resources/admin/
+
+# Ensure the binary is correctly built and linked
+RUN file /app/apimain && \
+    mkdir -p /app/data && \
+    mkdir -p /app/runtime
+
+# Set up a volume for persistent data
+VOLUME /app/data
+
+# Expose the necessary port
+EXPOSE 21114
+
+# Define the command to run the application
+CMD ["./apimain"]

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024-present Lejianwen and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -19,7 +19,7 @@
     - 登录
     - 地址簿
     - 群组
-    - 授权登录，支持`github`和`google`登录，支持`web后台`授权登录
+    - 授权登录，支持`github`, `google` 和 `OIDC` 登录，支持`web后台`授权登录
     - i18n
 - Web Admin
     - 用户管理
@@ -39,6 +39,9 @@
     - 自动获取ID服务器和KEY
     - 自动获取地址簿
     - 游客通过临时分享链接直接远程到设备
+    - v2 Preview
+- CLI
+    - 重置管理员密码
 
 ## 使用前准备
 
@@ -92,7 +95,7 @@
 
 #### 登录
 
-- 添加了`github`和`google`授权登录，需要在后台配置好就可以用了，具体可看后台OAuth配置
+- 添加了`github`, `google` 以及`OIDC`授权登录，需要在后台配置好就可以用了，具体可看后台OAuth配置
 - 添加了web后台授权登录,点击后直接登录后台就自动登录客户端了
 
 ![pc_login](docs/pc_login.png)
@@ -124,8 +127,10 @@
 4. 可以直接打开webclient，方便使用；也可以分享给游客，游客可以直接通过webclient远程到设备
 
    ![web_webclient](docs/admin_webclient.png)
-5. Oauth,暂时只支持了`Github`和`Google`, 需要创建一个`OAuth App`，然后配置到后台
+5. Oauth,支持了`Github`, `Google` 以及 `OIDC`, 需要创建一个`OAuth App`，然后配置到后台
    ![web_admin_oauth](docs/web_admin_oauth.png)
+    - 对于`Google` 和 `Github`, `Issuer` 和 `Scopes`不需要填写.
+    - 对于`OIDC`, `Issuer`是必须的。`Scopes`是可选的，默认为 `openid,profile,email`. 确保可以获取 `sub`,`email` 和`preferred_username`
     - `github oauth app`在`Settings`->`Developer settings`->`OAuth Apps`->`New OAuth App`
       中创建,地址 [https://github.com/settings/developers](https://github.com/settings/developers)
     - `Authorization callback URL`填写`http://<your server[:port]>/api/oauth/callback`
@@ -135,9 +140,12 @@
 
 1. 如果已经登录了后台，web client将自动直接登录
 2. 如果没登录后台，点击右上角登录即可，api server已经自动配置好了
-   ![webclient_conf](docs/webclient_conf.png)
 3. 登录后，会自动同步ID服务器和KEY
 4. 登录后，会将地址簿自动保存到web client中，方便使用
+5. 现已支持`v2 Preview`，访问路径是`/webclient2`
+   ![webclientv2](./docs/webclientv2.png)
+6. `v2 preview` 部署，参考[WIKI](https://github.com/lejianwen/rustdesk-api/wiki)
+
 
 ### 自动化文档: 使用 Swag 生成 API 文档，方便开发者理解和使用 API。
 
@@ -145,6 +153,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>
+```
+
 ## 安装与运行
 
 ### 相关配置
@@ -157,6 +176,8 @@
 lang: "en"
 app:
   web-client: 1  # 1:启用 0:禁用
+  register: false #是否开启注册
+  show-swagger: 0 #是否显示swagger文档
 gin:
   api-addr: "0.0.0.0:21114"
   mode: "release"
@@ -189,31 +210,38 @@ proxy:
 ### 环境变量
 变量名前缀是`RUSTDESK_API`，环境变量如果存在将覆盖配置文件中的配置
 
-| 变量名                                | 说明                                   | 示例                          |
-|------------------------------------|--------------------------------------|-----------------------------|
-| TZ                                 | 时区                                   | Asia/Shanghai               |
-| RUSTDESK_API_LANG                  | 语言                                   | `en`,`zh-CN`                |
-| RUSTDESK_API_APP_WEB_CLIENT        | 是否启用web-client; 1:启用,0:不启用; 默认启用     | 1                           |
-| -----GIN配置-----                    | ----------                           | ----------                  |
-| RUSTDESK_API_GIN_TRUST_PROXY       | 信任的代理IP列表，以`,`分割，默认信任所有              | 192.168.1.2,192.168.1.3     |
-| -----------GORM配置----------------  | ------------------------------------ | --------------------------- |
-| RUSTDESK_API_GORM_TYPE             | 数据库类型sqlite或者mysql，默认sqlite          | sqlite                      |
-| RUSTDESK_API_GORM_MAX_IDLE_CONNS   | 数据库最大空闲连接数                           | 10                          |
-| RUSTDESK_API_GORM_MAX_OPEN_CONNS   | 数据库最大打开连接数                           | 100                         |
-| RUSTDESK_API_RUSTDESK_PERSONAL     | 是否启用个人版API， 1:启用,0:不启用； 默认启用         | 1                           |
-| -----MYSQL配置-----                  | ----------                           | ----------                  |
-| RUSTDESK_API_MYSQL_USERNAME        | mysql用户名                             | root                        |
-| RUSTDESK_API_MYSQL_PASSWORD        | mysql密码                              | 111111                      |
-| RUSTDESK_API_MYSQL_ADDR            | mysql地址                              | 192.168.1.66:3306           |
-| RUSTDESK_API_MYSQL_DBNAME          | mysql数据库名                            | rustdesk                    |
-| -----RUSTDESK配置-----               | ---------------                      | ----------                  |
-| RUSTDESK_API_RUSTDESK_ID_SERVER    | Rustdesk的id服务器地址                     | 192.168.1.66:21116          |
-| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk的relay服务器地址                  | 192.168.1.66:21117          |
-| RUSTDESK_API_RUSTDESK_API_SERVER   | Rustdesk的api服务器地址                    | http://192.168.1.66:21114   |
-| RUSTDESK_API_RUSTDESK_KEY          | Rustdesk的key                         | 123456789                   |
-| ----PROXY配置-----                   | ---------------                      | ----------                  |
-| RUSTDESK_API_PROXY_ENABLE          | 是否启用代理:`false`, `true`               | `false`                     |
-| RUSTDESK_API_PROXY_HOST            | 代理地址                                 | `http://127.0.0.1:1080`     |
+| 变量名                                | 说明                                                      | 示例                           |
+|------------------------------------|---------------------------------------------------------|------------------------------|
+| TZ                                 | 时区                                                      | Asia/Shanghai                |
+| RUSTDESK_API_LANG                  | 语言                                                      | `en`,`zh-CN`                 |
+| RUSTDESK_API_APP_WEB_CLIENT        | 是否启用web-client; 1:启用,0:不启用; 默认启用                        | 1                            |
+| RUSTDESK_API_APP_REGISTER          | 是否开启注册; `true`, `false`  默认`false`                      | `false`                      |
+| RUSTDESK_API_APP_SHOW_SWAGGER      | 是否可见swagger文档;`1`显示，`0`不显示，默认`0`不显示                     | `1`                          |
+| -----ADMIN配置-----                  | ----------                                              | ----------                   |
+| RUSTDESK_API_ADMIN_TITLE           | 后台标题                                                    | `RustDesk Api Admin`         |
+| RUSTDESK_API_ADMIN_HELLO           | 后台欢迎语，可以使用`html`                                        |                              |
+| RUSTDESK_API_ADMIN_HELLO_FILE      | 后台欢迎语文件，如果内容多，使用文件更方便。<br>会覆盖`RUSTDESK_API_ADMIN_HELLO` | `./conf/admin/hello.html`    |
+| -----GIN配置-----                    | ----------                                              | ----------                   |
+| RUSTDESK_API_GIN_TRUST_PROXY       | 信任的代理IP列表，以`,`分割，默认信任所有                                 | 192.168.1.2,192.168.1.3      |
+| -----------GORM配置----------------  | ------------------------------------                    | ---------------------------  |
+| RUSTDESK_API_GORM_TYPE             | 数据库类型sqlite或者mysql，默认sqlite                             | sqlite                       |
+| RUSTDESK_API_GORM_MAX_IDLE_CONNS   | 数据库最大空闲连接数                                              | 10                           |
+| RUSTDESK_API_GORM_MAX_OPEN_CONNS   | 数据库最大打开连接数                                              | 100                          |
+| RUSTDESK_API_RUSTDESK_PERSONAL     | 是否启用个人版API， 1:启用,0:不启用； 默认启用                            | 1                            |
+| -----MYSQL配置-----                  | ----------                                              | ----------                   |
+| RUSTDESK_API_MYSQL_USERNAME        | mysql用户名                                                | root                         |
+| RUSTDESK_API_MYSQL_PASSWORD        | mysql密码                                                 | 111111                       |
+| RUSTDESK_API_MYSQL_ADDR            | mysql地址                                                 | 192.168.1.66:3306            |
+| RUSTDESK_API_MYSQL_DBNAME          | mysql数据库名                                               | rustdesk                     |
+| -----RUSTDESK配置-----               | ---------------                                         | ----------                   |
+| RUSTDESK_API_RUSTDESK_ID_SERVER    | Rustdesk的id服务器地址                                        | 192.168.1.66:21116           |
+| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk的relay服务器地址                                     | 192.168.1.66:21117           |
+| RUSTDESK_API_RUSTDESK_API_SERVER   | Rustdesk的api服务器地址                                       | http://192.168.1.66:21114    |
+| RUSTDESK_API_RUSTDESK_KEY          | Rustdesk的key                                            | 123456789                    |
+| RUSTDESK_API_RUSTDESK_KEY_FILE     | Rustdesk存放key的文件                                        | `./conf/data/id_ed25519.pub` |
+| ----PROXY配置-----                   | ---------------                                         | ----------                   |
+| RUSTDESK_API_PROXY_ENABLE          | 是否启用代理:`false`, `true`                                  | `false`                      |
+| RUSTDESK_API_PROXY_HOST            | 代理地址                                                    | `http://127.0.0.1:1080`      |
 
 
 ### 运行
@@ -234,189 +262,8 @@ proxy:
     lejianwen/rustdesk-api
     ```
 
-2. 使用`docker compose`
-   - 简单示例
-   ```yaml
-   services:
-      rustdesk-api:
-       container_name: rustdesk-api
-       environment:
-         - TZ=Asia/Shanghai
-         - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-         - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-         - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-         - RUSTDESK_API_RUSTDESK_KEY=<key>
-       ports:
-         - 21114:21114
-       image: lejianwen/rustdesk-api
-       volumes:
-         - /data/rustdesk/api:/app/data #将数据库挂载出来方便备份
-       networks:
-         - rustdesk-net
-       restart: unless-stopped
-   ```
+2. 使用`docker compose`，参考[WIKI](https://github.com/lejianwen/rustdesk-api/wiki)
 
-   - 根据rustdesk官方提供的示例，加上自己的rustdesk-api
-     - 如果是使用的系统生成的KEY，去掉`-k <key>`参数，在启动后运行`docker-compose logs hbbs`或者`cat ./data/id_ed25519.pub`查看KEY，然后再修改`RUSTDESK_API_RUSTDESK_KEY=<key>`再执行`docker-compose up -d`
-      ```yaml
-      networks:
-        rustdesk-net:
-          external: false
-      services:
-        hbbs:
-          container_name: hbbs
-          ports:
-            - 21115:21115
-            - 21116:21116 # 自定义 hbbs 映射端口
-            - 21116:21116/udp # 自定义 hbbs 映射端口
-            - 21118:21118 # web client
-          image: rustdesk/rustdesk-server
-          command: hbbs -r <relay-server-ip[:port]> -k <key> # 填入个人域名或 IP + hbbr 暴露端口
-          volumes:
-            - ./data:/root # 自定义挂载目录
-          networks:
-            - rustdesk-net
-          depends_on:
-            - hbbr
-          restart: unless-stopped
-          deploy:
-            resources:
-              limits:
-                memory: 64M
-        hbbr:
-          container_name: hbbr
-          ports:
-            - 21117:21117 # 自定义 hbbr 映射端口
-            - 21119:21119 # web client
-          image: rustdesk/rustdesk-server
-          command: hbbr -k <key>
-          volumes:
-            - ./data:/root
-          networks:
-            - rustdesk-net
-          restart: unless-stopped
-          deploy:
-            resources:
-              limits:
-                memory: 64M
-        rustdesk-api:
-          container_name: rustdesk-api
-          environment:
-            - TZ=Asia/Shanghai
-            - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-            - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-            - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-            - RUSTDESK_API_RUSTDESK_KEY=<key>
-          ports:
-            - 21114:21114
-          image: lejianwen/rustdesk-api
-          volumes:
-            - /data/rustdesk/api:/app/data #将数据库挂载出来方便备份
-          networks:
-            - rustdesk-net
-          restart: unless-stopped
-      ```
-     
-   - S6的镜像
-     - 如果使用***自定义KEY***，会需要修改启动脚本，覆盖镜像中的`/etc/s6-overlay/s6-rc.d/hbbr/run`和`/etc/s6-overlay/s6-rc.d/hbbr/run`
-         1. 创建`hbbr/run`，自定义KEY才需要
-            ```bash
-            #!/command/with-contenv sh
-            cd /data
-            PARAMS=
-            [ "${ENCRYPTED_ONLY}" = "1" ] && PARAMS="-k ${KEY}"
-            /usr/bin/hbbr $PARAMS
-            ```
-         2. 创建`hbbs/run`，自定义KEY才需要
-             ```bash
-             #!/command/with-contenv sh
-             sleep 2
-             cd /data
-             PARAMS=
-             [ "${ENCRYPTED_ONLY}" = "1" ] && PARAMS="-k ${KEY}"
-             /usr/bin/hbbs -r $RELAY $PARAMS
-             ```
-         3. 修改`docker-compose.yml`中的`s6`部分
-         ```yaml
-         networks:
-           rustdesk-net:
-             external: false
-         services:
-           rustdesk-server:
-             container_name: rustdesk-server
-             ports:
-               - 21115:21115
-               - 21116:21116
-               - 21116:21116/udp
-               - 21117:21117
-               - 21118:21118
-               - 21119:21119
-             image: rustdesk/rustdesk-server-s6:latest
-             environment:
-               - RELAY=192.168.1.66:21117
-               - ENCRYPTED_ONLY=1
-               - KEY=<key>  #自定义KEY
-             volumes:
-               - ./data:/data
-               - ./hbbr/run:/etc/s6-overlay/s6-rc.d/hbbr/run 
-               - ./hbbs/run:/etc/s6-overlay/s6-rc.d/hbbs/run 
-             restart: unless-stopped
-           rustdesk-api:
-             container_name: rustdesk-api
-             ports:
-               - 21114:21114
-             image: lejianwen/rustdesk-api
-             environment:
-               - TZ=Asia/Shanghai
-               - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-               - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-               - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-               - RUSTDESK_API_RUSTDESK_KEY=<key>
-             volumes:
-               - /data/rustdesk/api:/app/data #将数据库挂载
-             networks:
-               - rustdesk-net
-             restart: unless-stopped
-         ```
-   - 如果使用***系统生成的KEY***或者***自定义KEY_PUB,KEY_PRIV***，不需要修改启动脚本，但要在生成KEY后获取到KEY再`docker-compose up -d`
-       ```yaml
-       networks:
-         rustdesk-net:
-           external: false
-       services:
-         rustdesk-server:
-           container_name: rustdesk-server
-           ports:
-             - 21115:21115
-             - 21116:21116
-             - 21116:21116/udp
-             - 21117:21117
-             - 21118:21118
-             - 21119:21119
-           image: rustdesk/rustdesk-server-s6:latest
-           environment:
-             - RELAY=192.168.1.66:21117
-             - ENCRYPTED_ONLY=1
-           volumes:
-             - ./data:/data
-           restart: unless-stopped
-         rustdesk-api:
-           container_name: rustdesk-api
-           ports:
-             - 21114:21114
-           image: lejianwen/rustdesk-api
-           environment:
-             - TZ=Asia/Shanghai
-             - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-             - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-             - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-             - RUSTDESK_API_RUSTDESK_KEY=<key> #系统生成的KEY
-           volumes:
-             - /data/rustdesk/api:/app/data #将数据库挂载
-           networks:
-             - rustdesk-net
-           restart: unless-stopped
-       ```
 #### 下载release直接运行
 
 [下载地址](https://github.com/lejianwen/rustdesk-api/releases)
@@ -459,21 +306,7 @@ proxy:
 
 6. 打开浏览器访问`http://<your server[:port]>/_admin/`，默认用户名密码为`admin`，请及时更改密码。
 
-#### nginx反代
-在`nginx`中配置反代
-```
-server {
-    listen <your port>;
-    server_name <your server>;
-    location / {
-        proxy_pass http://<api-server[:port]>;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
-```
+
 ## 其他
 
 - [修改客户端ID](https://github.com/abdullah-erturk/RustDesk-ID-Changer)

README_EN.md

@@ -18,7 +18,7 @@ desktop software that provides self-hosted solutions.
     - Login
     - Address Book
     - Groups
-    - Authorized login, supports `GitHub` and `Google` login, supports `web admin` authorized login
+    - Authorized login, supports `GitHub`, `Google` and `OIDC` login, supports `web admin` authorized login
     - i18n
 - Web Admin
     - User Management
@@ -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)
@@ -93,7 +94,7 @@ Basic implementation of the PC client's primary interfaces.Supports the Personal
 
 #### Login
 
-- Added `GitHub` and `Google` login, which can be used after configuration in the admin panel. See the OAuth
+- Added `GitHub`, `Google` and `OIDC` login, which can be used after configuration in the admin panel. See the OAuth
   configuration section for details.
 - Added authorization login for the web admin panel.
 
@@ -128,9 +129,11 @@ installation are `admin` `admin`, please change the password immediately.
 4. You can directly launch the client or open the web client for convenience; you can also share it with guests, who can remotely access the device via the web client.
 
    ![web_webclient](docs/en_img/admin_webclient.png)
-5. OAuth support: Currently, `GitHub` and `Google`  is supported. You need to create an `OAuth App` and configure it in
+5. OAuth support: Currently, `GitHub`, `Google` and `OIDC`  are supported. You need to create an `OAuth App` and configure it in
    the admin panel.
    ![web_admin_oauth](docs/en_img/web_admin_oauth.png)
+    - For `Google` and `Github`, you don't need to fill the `Issuer` and `Scpoes`
+    - For `OIDC`, you must set the `Issuer`. And `Scopes` is optional which default is `openid,email,profile`, please make sure this `Oauth App` can access `sub`, `email` and `preferred_username`
     - Create a `GitHub OAuth App`
       at `Settings` -> `Developer settings` -> `OAuth Apps` -> `New OAuth App` [here](https://github.com/settings/developers).
     - Set the `Authorization callback URL` to `http://<your server[:port]>/api/oauth/callback`,
@@ -141,9 +144,11 @@ installation are `admin` `admin`, please change the password immediately.
 1. If you're already logged into the admin panel, the web client will log in automatically.
 2. If you're not logged in, simply click the login button in the top right corner, and the API server will be
    pre-configured.
-   ![webclient_conf](docs/webclient_conf.png)
 3. After logging in, the ID server and key will be automatically synced.
 4. The address book will also be automatically saved to the web client for convenient use.
+5. Now supports `v2 Preview`, accessible at `/webclient2`
+   ![webclientv2](./docs/webclientv2.png)
+6. `v2 preview` deployment, [WIKI](https://github.com/lejianwen/rustdesk-api/wiki)
 
 ### Automated Documentation : API documentation is generated using Swag, making it easier for developers to understand and use the API.
 
@@ -151,6 +156,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
@@ -163,6 +179,8 @@ installation are `admin` `admin`, please change the password immediately.
 lang: "en"
 app:
   web-client: 1  # web client route 1:open 0:close  
+  register: false #register enable
+  show-swagger: 0 #show swagger 1:open 0:close
 gin:
   api-addr: "0.0.0.0:21114"
   mode: "release"
@@ -195,31 +213,38 @@ proxy:
 ### Environment Variables
 The prefix for variable names is `RUSTDESK_API`. If environment variables exist, they will override the configurations in the configuration file.
 
-| Variable Name                      | Description                                               | Example                       |
-|------------------------------------|-----------------------------------------------------------|-------------------------------|
-| TZ                                 | timezone                                                  | Asia/Shanghai                 |
-| RUSTDESK_API_LANG                  | Language                                                  | `en`,`zh-CN`                  |
-| RUSTDESK_API_APP_WEB_CLIENT        | web client on/off; 1: on, 0 off, deault 1                 | 1                             |
-| ----- GIN Configuration -----      | ---------------------------------------                   | ----------------------------- |
-| RUSTDESK_API_GIN_TRUST_PROXY       | Trusted proxy IPs, separated by commas.                   | 192.168.1.2,192.168.1.3       |
-| ----- GORM Configuration -----     | ---------------------------------------                   | ----------------------------- |
-| RUSTDESK_API_GORM_TYPE             | Database type (`sqlite` or `mysql`). Default is `sqlite`. | sqlite                        |
-| RUSTDESK_API_GORM_MAX_IDLE_CONNS   | Maximum idle connections                                  | 10                            |
-| RUSTDESK_API_GORM_MAX_OPEN_CONNS   | Maximum open connections                                  | 100                           |
-| RUSTDESK_API_RUSTDESK_PERSONAL     | Open Personal Api 1:Enable,0:Disable                      | 1                             |
-| ----- MYSQL Configuration -----    | ---------------------------------------                   | ----------------------------- |
-| RUSTDESK_API_MYSQL_USERNAME        | MySQL username                                            | root                          |
-| RUSTDESK_API_MYSQL_PASSWORD        | MySQL password                                            | 111111                        |
-| RUSTDESK_API_MYSQL_ADDR            | MySQL address                                             | 192.168.1.66:3306             |
-| RUSTDESK_API_MYSQL_DBNAME          | MySQL database name                                       | rustdesk                      |
-| ----- RUSTDESK Configuration ----- | ---------------------------------------                   | ----------------------------- |
-| RUSTDESK_API_RUSTDESK_ID_SERVER    | Rustdesk ID server address                                | 192.168.1.66:21116            |
-| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk relay server address                             | 192.168.1.66:21117            |
-| RUSTDESK_API_RUSTDESK_API_SERVER   | Rustdesk API server address                               | http://192.168.1.66:21114     |
-| RUSTDESK_API_RUSTDESK_KEY          | Rustdesk key                                              | 123456789                     |
-| ---- PROXY -----                   | ---------------                                           | ----------                    |
-| RUSTDESK_API_PROXY_ENABLE          | proxy_enable :`false`, `true`                             | `false`                       |
-| RUSTDESK_API_PROXY_HOST            | proxy_host                                                | `http://127.0.0.1:1080`       |
+| Variable Name                      | Description                                                             | Example                       |
+|------------------------------------|-------------------------------------------------------------------------|-------------------------------|
+| TZ                                 | timezone                                                                | Asia/Shanghai                 |
+| RUSTDESK_API_LANG                  | Language                                                                | `en`,`zh-CN`                  |
+| RUSTDESK_API_APP_WEB_CLIENT        | web client on/off; 1: on, 0 off, default: 1                             | 1                             |
+| RUSTDESK_API_APP_REGISTER          | register enable; `true`, `false`; default:`false`                       | `false`                       |
+| RUSTDESK_API_APP_SHOW_SWAGGER      | swagger visible; 1: yes, 0: no; default: 0                              | `0`                           |
+| ----- ADMIN Configuration-----     | ----------                                                              | ----------                    |
+| RUSTDESK_API_ADMIN_TITLE           | Admin Title                                                             | `RustDesk Api Admin`          |
+| RUSTDESK_API_ADMIN_HELLO           | Admin welcome message, you can use `html`                               |                               |
+| RUSTDESK_API_ADMIN_HELLO_FILE      | Admin welcome message file,<br>will override `RUSTDESK_API_ADMIN_HELLO` | `./conf/admin/hello.html`     |
+| ----- GIN Configuration -----      | ---------------------------------------                                 | ----------------------------- |
+| RUSTDESK_API_GIN_TRUST_PROXY       | Trusted proxy IPs, separated by commas.                                 | 192.168.1.2,192.168.1.3       |
+| ----- GORM Configuration -----     | ---------------------------------------                                 | ----------------------------- |
+| RUSTDESK_API_GORM_TYPE             | Database type (`sqlite` or `mysql`). Default is `sqlite`.               | sqlite                        |
+| RUSTDESK_API_GORM_MAX_IDLE_CONNS   | Maximum idle connections                                                | 10                            |
+| RUSTDESK_API_GORM_MAX_OPEN_CONNS   | Maximum open connections                                                | 100                           |
+| RUSTDESK_API_RUSTDESK_PERSONAL     | Open Personal Api 1:Enable,0:Disable                                    | 1                             |
+| ----- MYSQL Configuration -----    | ---------------------------------------                                 | ----------------------------- |
+| RUSTDESK_API_MYSQL_USERNAME        | MySQL username                                                          | root                          |
+| RUSTDESK_API_MYSQL_PASSWORD        | MySQL password                                                          | 111111                        |
+| RUSTDESK_API_MYSQL_ADDR            | MySQL address                                                           | 192.168.1.66:3306             |
+| RUSTDESK_API_MYSQL_DBNAME          | MySQL database name                                                     | rustdesk                      |
+| ----- RUSTDESK Configuration ----- | ---------------------------------------                                 | ----------------------------- |
+| RUSTDESK_API_RUSTDESK_ID_SERVER    | Rustdesk ID server address                                              | 192.168.1.66:21116            |
+| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk relay server address                                           | 192.168.1.66:21117            |
+| RUSTDESK_API_RUSTDESK_API_SERVER   | Rustdesk API server address                                             | http://192.168.1.66:21114     |
+| RUSTDESK_API_RUSTDESK_KEY          | Rustdesk key                                                            | 123456789                     |
+| RUSTDESK_API_RUSTDESK_KEY_FILE     | Rustdesk存放key的文件                                                        | `./conf/data/id_ed25519.pub`  |
+| ---- PROXY -----                   | ---------------                                                         | ----------                    |
+| RUSTDESK_API_PROXY_ENABLE          | proxy_enable :`false`, `true`                                           | `false`                       |
+| RUSTDESK_API_PROXY_HOST            | proxy_host                                                              | `http://127.0.0.1:1080`       |
 
 ### Installation Steps
 
@@ -239,189 +264,7 @@ The prefix for variable names is `RUSTDESK_API`. If environment variables exist,
     lejianwen/rustdesk-api
     ```
 
-2. Using `docker-compose`
-    - Simple example:
-       ```yaml
-       services:
-          rustdesk-api:
-           container_name: rustdesk-api
-           environment:
-             - RUSTDESK_API_LANG=en
-             - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-             - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-             - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-             - RUSTDESK_API_RUSTDESK_KEY=<key>
-           ports:
-             - 21114:21114
-           image: lejianwen/rustdesk-api
-           volumes:
-             - /data/rustdesk/api:/app/data # Mount the database for easy backup
-           networks:
-             - rustdesk-net
-           restart: unless-stopped
-       ```
-
-    - Example with RustDesk's official Docker Compose file, adding your `rustdesk-api` service:
-     - If you are using a system-generated KEY, remove the `-k <key>` parameter. However, after the first startup, run `docker-compose logs hbbs` or `cat ./data/id_ed25519.pub` to view the KEY, then modify `RUSTDESK_API_RUSTDESK_KEY=<key>` and execute `docker-compose up -d` again.
-       ```yaml
-          networks:
-            rustdesk-net:
-              external: false
-          services:
-            hbbs:
-              container_name: hbbs
-              ports:
-                - 21115:21115
-                - 21116:21116 # 自定义 hbbs 映射端口
-                - 21116:21116/udp # 自定义 hbbs 映射端口
-                - 21118:21118 # web client
-              image: rustdesk/rustdesk-server
-              command: hbbs -r <relay-server-ip[:port]> -k <key> # 填入个人域名或 IP + hbbr 暴露端口
-              volumes:
-                - ./data:/root # 自定义挂载目录
-              networks:
-                - rustdesk-net
-              depends_on:
-                - hbbr
-              restart: unless-stopped
-              deploy:
-                resources:
-                  limits:
-                    memory: 64M
-            hbbr:
-              container_name: hbbr
-              ports:
-                - 21117:21117 # 自定义 hbbr 映射端口
-                - 21119:21119 # web client
-              image: rustdesk/rustdesk-server
-              command: hbbr -k <key>
-              volumes:
-                - ./data:/root
-              networks:
-                - rustdesk-net
-              restart: unless-stopped
-              deploy:
-                resources:
-                  limits:
-                    memory: 64M
-            rustdesk-api:
-              container_name: rustdesk-api
-              environment:
-                - TZ=Asia/Shanghai
-                - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-                - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-                - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-                - RUSTDESK_API_RUSTDESK_KEY=<key>
-              ports:
-                - 21114:21114
-              image: lejianwen/rustdesk-api
-              volumes:
-                - /data/rustdesk/api:/app/data #将数据库挂载出来方便备份
-              networks:
-                - rustdesk-net
-              restart: unless-stopped
-          ```
-
-   - S6 image
-       - - If using ***custom KEY***, you will need to modify the startup script to override the `/etc/s6-overlay/s6-rc.d/hbbr/run` and `/etc/s6-overlay/s6-rc.d/hbbr/run` in the image.
-           1. Create `hbbr/run`, only needed for custom KEY
-              ```bash
-              #!/command/with-contenv sh
-              cd /data
-              PARAMS=
-              [ "${ENCRYPTED_ONLY}" = "1" ] && PARAMS="-k ${KEY}"
-              /usr/bin/hbbr $PARAMS
-              ```
-           2. Create `hbbs/run`, only needed for custom KEY
-               ```bash
-               #!/command/with-contenv sh
-               sleep 2
-               cd /data
-               PARAMS=
-               [ "${ENCRYPTED_ONLY}" = "1" ] && PARAMS="-k ${KEY}"
-               /usr/bin/hbbs -r $RELAY $PARAMS
-               ```
-           3. Modify the `s6` section in `docker-compose.yml`
-           ```yaml
-           networks:
-             rustdesk-net:
-               external: false
-           services:
-             rustdesk-server:
-               container_name: rustdesk-server
-               ports:
-                 - 21115:21115
-                 - 21116:21116
-                 - 21116:21116/udp
-                 - 21117:21117
-                 - 21118:21118
-                 - 21119:21119
-               image: rustdesk/rustdesk-server-s6:latest
-               environment:
-                 - RELAY=192.168.1.66:21117
-                 - ENCRYPTED_ONLY=1
-                 - KEY=<key>  #KEY
-               volumes:
-                 - ./data:/data
-                 - ./hbbr/run:/etc/s6-overlay/s6-rc.d/hbbr/run 
-                 - ./hbbs/run:/etc/s6-overlay/s6-rc.d/hbbs/run 
-               restart: unless-stopped
-             rustdesk-api:
-               container_name: rustdesk-api
-               ports:
-                 - 21114:21114
-               image: lejianwen/rustdesk-api
-               environment:
-                 - TZ=Asia/Shanghai
-                 - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-                 - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-                 - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-                 - RUSTDESK_API_RUSTDESK_KEY=<key>
-               volumes:
-                 - /data/rustdesk/api:/app/data 
-               networks:
-                 - rustdesk-net
-               restart: unless-stopped
-           ```
-   - If using ***system-generated KEY*** or ***custom KEY_PUB, KEY_PRIV***, you do not need to modify the startup script, but you need to obtain the KEY after it is generated and then run `docker-compose up -d`
-       ```yaml
-       networks:
-         rustdesk-net:
-           external: false
-       services:
-         rustdesk-server:
-           container_name: rustdesk-server
-           ports:
-             - 21115:21115
-             - 21116:21116
-             - 21116:21116/udp
-             - 21117:21117
-             - 21118:21118
-             - 21119:21119
-           image: rustdesk/rustdesk-server-s6:latest
-           environment:
-             - RELAY=192.168.1.66:21117
-             - ENCRYPTED_ONLY=1
-           volumes:
-             - ./data:/data
-           restart: unless-stopped
-         rustdesk-api:
-           container_name: rustdesk-api
-           ports:
-             - 21114:21114
-           image: lejianwen/rustdesk-api
-           environment:
-             - TZ=Asia/Shanghai
-             - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-             - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-             - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-             - RUSTDESK_API_RUSTDESK_KEY=<key>
-           volumes:
-             - /data/rustdesk/api:/app/data 
-           networks:
-             - rustdesk-net
-           restart: unless-stopped
-       ```
+2. Using `docker-compose`,look [WIKI](https://github.com/lejianwen/rustdesk-api/wiki)
 
 #### Running from Release
 
@@ -470,21 +313,7 @@ Download the release from [release](https://github.com/lejianwen/rustdesk-api/re
 6. Open your browser and visit `http://<your server[:port]>/_admin/`, with default credentials `admin admin`. Please
    change the password promptly.
 
-#### nginx reverse proxy
-Configure reverse proxy in `nginx`
-```
-server {
-    listen <your port>;
-    server_name <your server>;
-    location / {
-        proxy_pass http://<api-server[:port]>;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
-```
+
 ## Others
 
 - [Change client ID](https://github.com/abdullah-erturk/RustDesk-ID-Changer)

build.sh

@@ -1,16 +1,46 @@
 #!/bin/sh
 
-rm release -rf
+set -e
+# Automatically get the current environment's GOARCH; if not defined, use the detected system architecture
+GOARCH=${GOARCH:-$(go env GOARCH)}
+DOCS="true"
+# Safely remove the old release directory
+rm -rf release
+
+# Set Go environment variables
 go env -w GO111MODULE=on
 go env -w GOPROXY=https://goproxy.cn,direct
 go env -w CGO_ENABLED=1
 go env -w GOOS=linux
-go env -w GOARCH=amd64
-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
+go env -w GOARCH=${GOARCH}
+
+
+# Generate Swagger documentation if DOCS is not empty
+if [ -n "${DOCS}" ]; then
+    # Check if swag is installed
+    if ! command -v swag &> /dev/null; then
+        echo "swag command not found. Please install it using:"
+        echo "go install github.com/swaggo/swag/cmd/swag@latest"
+        echo "Skipping Swagger documentation generation due to missing swag tool."
+    else
+        echo "Generating Swagger documentation..."
+        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
+    fi
+else
+    echo "Skipping Swagger documentation generation due to DOCS is empty."
+fi
+
+# Compile the Go code and output it to the release directory
 go build -o release/apimain cmd/apimain.go
+
+# Copy resource files to the release directory
 cp -ar resources release/
 cp -ar docs release/
 cp -ar conf release/
+
+# Create necessary directory structures
 mkdir -p release/data
 mkdir -p release/runtime
+
+echo "Build and setup completed successfully."

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 := 241
+	version := 246
 
 	db := global.DB
 
@@ -146,6 +214,24 @@ func DatabaseAutoUpdate() {
 		if v.Version < uint(version) {
 			Migrate(uint(version))
 		}
+		// 245迁移
+		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'")
+			db.Exec("update user_thirds set oauth_type = third_type, op = third_type")
+			//通过email迁移旧的google授权
+			uts := make([]model.UserThird, 0)
+			db.Where("oauth_type = ?", "google").Find(&uts)
+			for _, ut := range uts {
+				if ut.UserId > 0 {
+					db.Model(&model.User{}).Where("id = ?", ut.UserId).Update("email", ut.OpenId)
+				}
+			}
+		}
+		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

@@ -1,6 +1,12 @@
 lang: "zh-CN"
 app:
   web-client: 1  # 1:启用 0:禁用
+  register: false #是否开启注册
+  show-swagger: 0 # 1:启用 0:禁用
+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
@@ -19,7 +25,8 @@ rustdesk:
   id-server: "192.168.1.66:21116"
   relay-server: "192.168.1.66:21117"
   api-server: "http://127.0.0.1:21114"
-  key: "123456789"
+  key: ""
+  key-file: "./conf/data/id_ed25519.pub"
   personal: 1
 logger:
   path: "./runtime/log.txt"

config/config.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"flag"
 	"fmt"
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/viper"
@@ -15,12 +14,19 @@ const (
 )
 
 type App struct {
-	WebClient int `mapstructure:"web-client"`
+	WebClient   int  `mapstructure:"web-client"`
+	Register    bool `mapstructure:"register"`
+	ShowSwagger int  `mapstructure:"show-swagger"`
+}
+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
@@ -34,18 +40,15 @@ type Config struct {
 }
 
 // Init 初始化配置
-func Init(rowVal interface{}) *viper.Viper {
-	var config string
-	flag.StringVar(&config, "c", "", "choose config file.")
-	flag.Parse()
-	if config == "" { // 优先级: 命令行 > 默认值
-		config = DefaultConfig
+func Init(rowVal interface{}, path string) *viper.Viper {
+	if path == "" {
+		path = 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 {
@@ -62,6 +65,7 @@ func Init(rowVal interface{}) *viper.Viper {
 	if err := v.Unmarshal(rowVal); err != nil {
 		fmt.Println(err)
 	}
+
 	return v
 }
 

config/oauth.go

@@ -11,3 +11,10 @@ type GoogleOauth struct {
 	ClientSecret string `mapstructure:"client-secret"`
 	RedirectUrl  string `mapstructure:"redirect-url"`
 }
+
+type OidcOauth struct {
+	Issuer       string `mapstructure:"issuer"`
+	ClientId     string `mapstructure:"client-id"`
+	ClientSecret string `mapstructure:"client-secret"`
+	RedirectUrl  string `mapstructure:"redirect-url"`
+}

config/rustdesk.go

@@ -1,9 +1,30 @@
 package config
 
+import (
+	"os"
+)
+
 type Rustdesk struct {
 	IdServer    string `mapstructure:"id-server"`
 	RelayServer string `mapstructure:"relay-server"`
 	ApiServer   string `mapstructure:"api-server"`
 	Key         string `mapstructure:"key"`
+	KeyFile     string `mapstructure:"key-file"`
 	Personal    int    `mapstructure:"personal"`
 }
+
+func LoadKeyFile(rustdesk *Rustdesk) {
+	// Load key file
+	if rustdesk.Key != "" {
+		return
+	}
+	if rustdesk.KeyFile != "" {
+		// Load key from file
+		b, err := os.ReadFile(rustdesk.KeyFile)
+		if err != nil {
+			return
+		}
+		rustdesk.Key = string(b)
+		return
+	}
+}

docker-compose-dev.yaml

@@ -0,0 +1,24 @@
+services:
+  rustdesk-api:
+    build: 
+      context: .
+      dockerfile: Dockerfile.dev
+      args:
+        COUNTRY: CN
+        FREONTEND_GIT_REPO: https://github.com/lejianwen/rustdesk-api-web.git
+        FRONTEND_GIT_BRANCH: master
+    # image: lejianwen/rustdesk-api
+    container_name: rustdesk-api
+    environment:
+      - TZ=Asia/Shanghai
+      - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
+      - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
+      - RUSTDESK_API_RUSTDESK_API_SERVER=http://127.0.0.1:21114
+      - RUSTDESK_API_RUSTDESK_KEY=123456789
+    ports:
+      - 21114:21114
+    volumes:
+      - ./data/rustdesk/api:/app/data #将数据库挂载出来方便备份
+      - ./conf:/app/conf # config
+      # - ./resources:/app/resources # 静态资源
+    restart: unless-stopped

docker-compose.yaml

@@ -6,10 +6,12 @@ services:
       - TZ=Asia/Shanghai
       - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
       - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-      - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
+      - RUSTDESK_API_RUSTDESK_API_SERVER=http://127.0.0.1:21114
       - RUSTDESK_API_RUSTDESK_KEY=123456789
     ports:
       - 21114:21114
     volumes:
-      - /data/rustdesk/api:/app/data #将数据库挂载出来方便备份
+      - ./data/rustdesk/api:/app/data # database
+      # - ./conf:/app/conf # config
+      # - ./resources:/app/resources # 静态资源
     restart: unless-stopped

docker-dev.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+set -e
+
+# Define Docker Compose file and cache option
+COMPOSE_FILE_NAME="docker-compose-dev.yaml"
+CACHE=""
+# Uncomment the next line to enable no-cache option
+# CACHE="--no-cache"
+
+# Define the base Docker Compose command
+DCS="docker compose -f ${COMPOSE_FILE_NAME}"
+
+# Function to build and start services
+build_and_run() {
+    echo "Building services..."
+    if ! $DCS build ${CACHE}; then
+        echo "Error: Failed to build services"
+        exit 1
+    fi
+
+    echo "Starting services..."
+    if ! $DCS up -d; then
+        echo "Error: Failed to start services"
+        exit 1
+    fi
+    echo "Services started successfully"
+    echo "If you want to stop the services, run"
+    echo "docker compose -f ${COMPOSE_FILE_NAME} down"
+
+    echo "If you want to see the logs, run"
+    echo "docker compose -f ${COMPOSE_FILE_NAME} logs -f"
+}
+
+# Execute build and start function
+build_and_run

docs/api/api_docs.go

@@ -834,7 +834,7 @@ const docTemplateapi = `{
             }
         },
         "/login-options": {
-            "post": {
+            "get": {
                 "description": "登录选项",
                 "consumes": [
                     "application/json"
@@ -1075,6 +1075,40 @@ const docTemplateapi = `{
                 }
             }
         },
+        "/server-config-v2": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "服务配置,给webclient提供api-server",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "WEBCLIENT_V2"
+                ],
+                "summary": "服务配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/shared-peer": {
             "post": {
                 "description": "分享的peer",
@@ -1356,7 +1390,7 @@ const docTemplateapi = `{
                 },
                 "password": {
                     "type": "string",
-                    "maxLength": 20,
+                    "maxLength": 32,
                     "minLength": 4
                 },
                 "type": {
@@ -1364,8 +1398,8 @@ const docTemplateapi = `{
                 },
                 "username": {
                     "type": "string",
-                    "maxLength": 10,
-                    "minLength": 4
+                    "maxLength": 32,
+                    "minLength": 2
                 },
                 "uuid": {
                     "type": "string"

docs/api/api_swagger.json

@@ -827,7 +827,7 @@
             }
         },
         "/login-options": {
-            "post": {
+            "get": {
                 "description": "登录选项",
                 "consumes": [
                     "application/json"
@@ -1068,6 +1068,40 @@
                 }
             }
         },
+        "/server-config-v2": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "服务配置,给webclient提供api-server",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "WEBCLIENT_V2"
+                ],
+                "summary": "服务配置",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/shared-peer": {
             "post": {
                 "description": "分享的peer",
@@ -1349,7 +1383,7 @@
                 },
                 "password": {
                     "type": "string",
-                    "maxLength": 20,
+                    "maxLength": 32,
                     "minLength": 4
                 },
                 "type": {
@@ -1357,8 +1391,8 @@
                 },
                 "username": {
                     "type": "string",
-                    "maxLength": 10,
-                    "minLength": 4
+                    "maxLength": 32,
+                    "minLength": 2
                 },
                 "uuid": {
                     "type": "string"

docs/api/api_swagger.yaml

@@ -62,14 +62,14 @@ definitions:
       id:
         type: string
       password:
-        maxLength: 20
+        maxLength: 32
         minLength: 4
         type: string
       type:
         type: string
       username:
-        maxLength: 10
-        minLength: 4
+        maxLength: 32
+        minLength: 2
         type: string
       uuid:
         type: string
@@ -715,7 +715,7 @@ paths:
       tags:
       - 登录
   /login-options:
-    post:
+    get:
       consumes:
       - application/json
       description: 登录选项
@@ -870,6 +870,27 @@ paths:
       summary: 服务配置
       tags:
       - WEBCLIENT
+  /server-config-v2:
+    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: 服务配置
+      tags:
+      - WEBCLIENT_V2
   /shared-peer:
     post:
       consumes:

global/apiValidator.go

@@ -3,6 +3,7 @@ package global
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/locales/en"
+	"github.com/go-playground/locales/es"
 	"github.com/go-playground/locales/ko"
 	"github.com/go-playground/locales/ru"
 	"github.com/go-playground/locales/zh_Hans_CN"
@@ -10,6 +11,7 @@ import (
 	ut "github.com/go-playground/universal-translator"
 	"github.com/go-playground/validator/v10"
 	en_translations "github.com/go-playground/validator/v10/translations/en"
+	es_translations "github.com/go-playground/validator/v10/translations/es"
 	ru_translations "github.com/go-playground/validator/v10/translations/ru"
 	zh_translations "github.com/go-playground/validator/v10/translations/zh"
 	"reflect"
@@ -23,13 +25,15 @@ func ApiInitValidator() {
 	cn := zh_Hans_CN.New()
 	koT := ko.New()
 	ruT := ru.New()
+	esT := es.New()
 
-	uni := ut.New(enT, cn, koT, ruT)
+	uni := ut.New(enT, cn, koT, ruT, esT)
 
 	enTrans, _ := uni.GetTranslator("en")
 	zhTrans, _ := uni.GetTranslator("zh_Hans_CN")
 	koTrans, _ := uni.GetTranslator("ko")
 	ruTrans, _ := uni.GetTranslator("ru")
+	esTrans, _ := uni.GetTranslator("es")
 
 	err := zh_translations.RegisterDefaultTranslations(validate, zhTrans)
 	if err != nil {
@@ -49,6 +53,10 @@ func ApiInitValidator() {
 	if err != nil {
 		panic(err)
 	}
+	err = es_translations.RegisterDefaultTranslations(validate, esTrans)
+	if err != nil {
+		panic(err)
+	}
 
 	validate.RegisterTagNameFunc(func(field reflect.StructField) string {
 		label := field.Tag.Get("label")
@@ -115,6 +123,9 @@ func getTranslatorForLang(lang string) ut.Translator {
 	case "ru":
 		trans, _ := Validator.UT.GetTranslator("ru")
 		return trans
+	case "es":
+		trans, _ := Validator.UT.GetTranslator("es")
+		return trans
 	case "en":
 		fallthrough
 	default:

global/global.go

@@ -17,13 +17,14 @@ import (
 )
 
 var (
-	DB        *gorm.DB
-	Logger    *logrus.Logger
-	Config    config.Config
-	Viper     *viper.Viper
-	Redis     *redis.Client
-	Cache     cache.Handler
-	Validator struct {
+	DB         *gorm.DB
+	Logger     *logrus.Logger
+	ConfigPath string = ""
+	Config     config.Config
+	Viper      *viper.Viper
+	Redis      *redis.Client
+	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
@@ -43,7 +43,9 @@ require (
 	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/goccy/go-json v0.10.0 // indirect
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // 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
@@ -57,6 +59,7 @@ require (
 	github.com/mitchellh/mapstructure v1.4.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mojocn/base64Captcha v1.3.6 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
@@ -68,6 +71,7 @@ require (
 	github.com/ugorji/go/codec v1.2.9 // indirect
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
 	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/image v0.13.0 // indirect
 	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect

http/controller/admin/addressBook.go

@@ -4,8 +4,8 @@ import (
 	"Gwen/global"
 	"Gwen/http/request/admin"
 	"Gwen/http/response"
-	"Gwen/model"
 	"Gwen/service"
+	"encoding/json"
 	_ "encoding/json"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -30,11 +30,6 @@ func (ct *AddressBook) Detail(c *gin.Context) {
 	id := c.Param("id")
 	iid, _ := strconv.Atoi(id)
 	t := service.AllService.AddressBookService.InfoByRowId(uint(iid))
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
-		return
-	}
 	if t.RowId > 0 {
 		response.Success(c, t)
 		return
@@ -66,9 +61,9 @@ func (ct *AddressBook) Create(c *gin.Context) {
 		return
 	}
 	t := f.ToAddressBook()
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) || t.UserId == 0 {
-		t.UserId = u.Id
+	if t.UserId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
 	}
 	if t.CollectionId > 0 && !service.AllService.AddressBookService.CheckCollectionOwner(t.UserId, t.CollectionId) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
@@ -98,7 +93,7 @@ func (ct *AddressBook) Create(c *gin.Context) {
 // @Param body body admin.AddressBookForm true "地址簿信息"
 // @Success 200 {object} response.Response{data=model.AddressBook}
 // @Failure 500 {object} response.Response
-// @Router /admin/address_book/create [post]
+// @Router /admin/address_book/batchCreate [post]
 // @Security token
 func (ct *AddressBook) BatchCreate(c *gin.Context) {
 	f := &admin.AddressBookForm{}
@@ -111,9 +106,21 @@ func (ct *AddressBook) BatchCreate(c *gin.Context) {
 		response.Fail(c, 101, errList[0])
 		return
 	}
+	ul := len(f.UserIds)
+
+	if ul == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	if ul > 1 {
+		//多用户置空标签
+		f.Tags = []string{}
+		//多用户只能创建到默认地址簿
+		f.CollectionId = 0
+	}
 
 	//创建标签
-	for _, fu := range f.UserIds {
+	/*for _, fu := range f.UserIds {
 		if fu == 0 {
 			continue
 		}
@@ -126,13 +133,13 @@ func (ct *AddressBook) BatchCreate(c *gin.Context) {
 				})
 			}
 		}
-	}
+	}*/
 	ts := f.ToAddressBooks()
 	for _, t := range ts {
 		if t.UserId == 0 {
 			continue
 		}
-		ex := service.AllService.AddressBookService.InfoByUserIdAndId(t.UserId, t.Id)
+		ex := service.AllService.AddressBookService.InfoByUserIdAndIdAndCid(t.UserId, t.Id, t.CollectionId)
 		if ex.RowId == 0 {
 			service.AllService.AddressBookService.Create(t)
 		}
@@ -161,10 +168,6 @@ func (ct *AddressBook) List(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) || query.IsMy == 1 {
-		query.UserId = int(u.Id)
-	}
 	res := service.AllService.AddressBookService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
 		tx.Preload("Collection", func(txc *gorm.DB) *gorm.DB {
 			return txc.Select("id,name")
@@ -190,11 +193,6 @@ func (ct *AddressBook) List(c *gin.Context) {
 	for _, ab := range res.AddressBooks {
 		abCIds = append(abCIds, ab.CollectionId)
 	}
-	//获取地址簿名称
-	//cRes := service.AllService.AddressBookService.ListCollection(1, 999, func(tx *gorm.DB) {
-	//		tx.Where("id in ?", abCIds)
-	//})
-	//
 	response.Success(c, res)
 }
 
@@ -221,15 +219,15 @@ func (ct *AddressBook) Update(c *gin.Context) {
 		return
 	}
 	if f.RowId == 0 {
-		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	ex := service.AllService.AddressBookService.InfoByRowId(f.RowId)
+	if ex.RowId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 		return
 	}
 	t := f.ToAddressBook()
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
-		return
-	}
 	if t.CollectionId > 0 && !service.AllService.AddressBookService.CheckCollectionOwner(t.UserId, t.CollectionId) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		return
@@ -270,21 +268,12 @@ func (ct *AddressBook) Delete(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 		return
 	}
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+	err := service.AllService.AddressBookService.Delete(t)
+	if err == nil {
+		response.Success(c, nil)
 		return
 	}
-	if u.Id > 0 {
-		err := service.AllService.AddressBookService.Delete(t)
-		if err == nil {
-			response.Success(c, nil)
-			return
-		}
-		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
-		return
-	}
-	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+	response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 }
 
 // ShareByWebClient
@@ -327,3 +316,47 @@ func (ct *AddressBook) ShareByWebClient(c *gin.Context) {
 		"share_token": m.ShareToken,
 	})
 }
+
+func (ct *AddressBook) BatchCreateFromPeers(c *gin.Context) {
+	f := &admin.BatchCreateFromPeersForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+
+	if f.UserId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+
+	if f.CollectionId != 0 {
+		collection := service.AllService.AddressBookService.CollectionInfoById(f.CollectionId)
+		if collection.Id == 0 {
+			response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+			return
+		}
+	}
+
+	pl := int64(len(f.PeerIds))
+	peers := service.AllService.PeerService.List(1, uint(pl), func(tx *gorm.DB) {
+		tx.Where("row_id in ?", f.PeerIds)
+	})
+	if peers.Total == 0 || pl != peers.Total {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+
+	tags, _ := json.Marshal(f.Tags)
+	for _, peer := range peers.Peers {
+		ab := service.AllService.AddressBookService.FromPeer(peer)
+		ab.Tags = tags
+		ab.CollectionId = f.CollectionId
+		ab.UserId = f.UserId
+		ex := service.AllService.AddressBookService.InfoByUserIdAndIdAndCid(f.UserId, ab.Id, ab.CollectionId)
+		if ex.RowId != 0 {
+			continue
+		}
+		service.AllService.AddressBookService.Create(ab)
+	}
+	response.Success(c, nil)
+}

http/controller/admin/addressBookCollection.go

@@ -14,10 +14,10 @@ import (
 type AddressBookCollection struct {
 }
 
-// Detail 地址簿集合
-// @AddressBookCollections 地址簿集合
-// @Summary 地址簿集合详情
-// @Description 地址簿集合详情
+// Detail 地址簿名称
+// @Tags 地址簿名称
+// @Summary 地址簿名称详情
+// @Description 地址簿名称详情
 // @Accept  json
 // @Produce  json
 // @Param id path int true "ID"
@@ -29,11 +29,6 @@ func (abc *AddressBookCollection) Detail(c *gin.Context) {
 	id := c.Param("id")
 	iid, _ := strconv.Atoi(id)
 	t := service.AllService.AddressBookService.CollectionInfoById(uint(iid))
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
-		return
-	}
 	if t.Id > 0 {
 		response.Success(c, t)
 		return
@@ -42,13 +37,13 @@ func (abc *AddressBookCollection) Detail(c *gin.Context) {
 	return
 }
 
-// Create 创建地址簿集合
-// @AddressBookCollections 地址簿集合
-// @Summary 创建地址簿集合
-// @Description 创建地址簿集合
+// Create 创建地址簿名称
+// @Tags 地址簿名称
+// @Summary 创建地址簿名称
+// @Description 创建地址簿名称
 // @Accept  json
 // @Produce  json
-// @Param body body model.AddressBookCollection true "地址簿集合信息"
+// @Param body body model.AddressBookCollection true "地址簿名称信息"
 // @Success 200 {object} response.Response{data=model.AddressBookCollection}
 // @Failure 500 {object} response.Response
 // @Router /admin/address_book_collection/create [post]
@@ -64,12 +59,11 @@ func (abc *AddressBookCollection) Create(c *gin.Context) {
 		response.Fail(c, 101, errList[0])
 		return
 	}
-	//t := f.ToAddressBookCollection()
-	t := f
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) || t.UserId == 0 {
-		t.UserId = u.Id
+	if f.UserId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
 	}
+	t := f
 	err := service.AllService.AddressBookService.CreateCollection(t)
 	if err != nil {
 		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
@@ -79,9 +73,9 @@ func (abc *AddressBookCollection) Create(c *gin.Context) {
 }
 
 // List 列表
-// @AddressBookCollections 地址簿集合
-// @Summary 地址簿集合列表
-// @Description 地址簿集合列表
+// @Tags 地址簿名称
+// @Summary 地址簿名称列表
+// @Description 地址簿名称列表
 // @Accept  json
 // @Produce  json
 // @Param page query int false "页码"
@@ -98,10 +92,6 @@ func (abc *AddressBookCollection) List(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) || query.IsMy == 1 {
-		query.UserId = int(u.Id)
-	}
 	res := service.AllService.AddressBookService.ListCollection(query.Page, query.PageSize, func(tx *gorm.DB) {
 		if query.UserId > 0 {
 			tx.Where("user_id = ?", query.UserId)
@@ -111,12 +101,12 @@ func (abc *AddressBookCollection) List(c *gin.Context) {
 }
 
 // Update 编辑
-// @AddressBookCollections 地址簿集合
-// @Summary 地址簿集合编辑
-// @Description 地址簿集合编辑
+// @Tags 地址簿名称
+// @Summary 地址簿名称编辑
+// @Description 地址簿名称编辑
 // @Accept  json
 // @Produce  json
-// @Param body body model.AddressBookCollection true "地址簿集合信息"
+// @Param body body model.AddressBookCollection true "地址簿名称信息"
 // @Success 200 {object} response.Response{data=model.AddressBookCollection}
 // @Failure 500 {object} response.Response
 // @Router /admin/address_book_collection/update [post]
@@ -137,11 +127,6 @@ func (abc *AddressBookCollection) Update(c *gin.Context) {
 		return
 	}
 	t := f //f.ToAddressBookCollection()
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
-		return
-	}
 	err := service.AllService.AddressBookService.UpdateCollection(t)
 	if err != nil {
 		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
@@ -151,12 +136,12 @@ func (abc *AddressBookCollection) Update(c *gin.Context) {
 }
 
 // Delete 删除
-// @AddressBookCollections 地址簿集合
-// @Summary 地址簿集合删除
-// @Description 地址簿集合删除
+// @Tags 地址簿名称
+// @Summary 地址簿名称删除
+// @Description 地址簿名称删除
 // @Accept  json
 // @Produce  json
-// @Param body body model.AddressBookCollection true "地址簿集合信息"
+// @Param body body model.AddressBookCollection true "地址簿名称信息"
 // @Success 200 {object} response.Response
 // @Failure 500 {object} response.Response
 // @Router /admin/address_book_collection/delete [post]
@@ -173,20 +158,15 @@ func (abc *AddressBookCollection) Delete(c *gin.Context) {
 		response.Fail(c, 101, errList[0])
 		return
 	}
-	t := service.AllService.AddressBookService.CollectionInfoById(f.Id)
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+	ex := service.AllService.AddressBookService.CollectionInfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 		return
 	}
-	if u.Id > 0 {
-		err := service.AllService.AddressBookService.DeleteCollection(t)
-		if err == nil {
-			response.Success(c, nil)
-			return
-		}
-		response.Fail(c, 101, err.Error())
+	err := service.AllService.AddressBookService.DeleteCollection(ex)
+	if err == nil {
+		response.Success(c, nil)
 		return
 	}
-	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+	response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 }

http/controller/admin/addressBookCollectionRule.go

@@ -15,9 +15,9 @@ type AddressBookCollectionRule struct {
 }
 
 // List 列表
-// @AddressBookCollectionRule 地址簿集合规则
-// @Summary 地址簿集合规则列表
-// @Description 地址簿集合规则列表
+// @Tags 地址簿规则
+// @Summary 地址簿规则列表
+// @Description 地址簿规则列表
 // @Accept  json
 // @Produce  json
 // @Param page query int false "页码"
@@ -35,10 +35,6 @@ func (abcr *AddressBookCollectionRule) List(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) || query.IsMy == 1 {
-		query.UserId = int(u.Id)
-	}
 
 	res := service.AllService.AddressBookService.ListRules(query.Page, query.PageSize, func(tx *gorm.DB) {
 		if query.UserId > 0 {
@@ -51,10 +47,10 @@ func (abcr *AddressBookCollectionRule) List(c *gin.Context) {
 	response.Success(c, res)
 }
 
-// Detail 地址簿集合规则
-// @AddressBookCollectionRule 地址簿集合规则
-// @Summary 地址簿集合规则详情
-// @Description 地址簿集合规则详情
+// Detail 地址簿规则
+// @Tags 地址簿规则
+// @Summary 地址簿规则详情
+// @Description 地址簿规则详情
 // @Accept  json
 // @Produce  json
 // @Param id path int true "ID"
@@ -66,26 +62,20 @@ func (abcr *AddressBookCollectionRule) Detail(c *gin.Context) {
 	id := c.Param("id")
 	iid, _ := strconv.Atoi(id)
 	t := service.AllService.AddressBookService.RuleInfoById(uint(iid))
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
-		return
-	}
 	if t.Id > 0 {
 		response.Success(c, t)
 		return
 	}
 	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
-	return
 }
 
-// Create 创建地址簿集合规则
-// @AddressBookCollectionRule 地址簿集合规则
-// @Summary 创建地址簿集合规则
-// @Description 创建地址簿集合规则
+// Create 创建地址簿规则
+// @Tags 地址簿规则
+// @Summary 创建地址簿规则
+// @Description 创建地址簿规则
 // @Accept  json
 // @Produce  json
-// @Param body body model.AddressBookCollectionRule true "地址簿集合规则信息"
+// @Param body body model.AddressBookCollectionRule true "地址簿规则信息"
 // @Success 200 {object} response.Response{data=model.AddressBookCollection}
 // @Failure 500 {object} response.Response
 // @Router /admin/address_book_collection_rule/create [post]
@@ -105,13 +95,8 @@ func (abcr *AddressBookCollectionRule) Create(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		return
 	}
-	//t := f.ToAddressBookCollection()
 	t := f
-	u := service.AllService.UserService.CurUser(c)
-	if t.UserId == 0 {
-		t.UserId = u.Id
-	}
-	msg, res := abcr.CheckForm(u, t)
+	msg, res := abcr.CheckForm(t)
 	if !res {
 		response.Fail(c, 101, response.TranslateMsg(c, msg))
 		return
@@ -124,9 +109,9 @@ func (abcr *AddressBookCollectionRule) Create(c *gin.Context) {
 	response.Success(c, nil)
 }
 
-func (abcr *AddressBookCollectionRule) CheckForm(u *model.User, t *model.AddressBookCollectionRule) (string, bool) {
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		return "NoAccess", false
+func (abcr *AddressBookCollectionRule) CheckForm(t *model.AddressBookCollectionRule) (string, bool) {
+	if t.UserId == 0 {
+		return "ParamsError", false
 	}
 	if t.CollectionId > 0 && !service.AllService.AddressBookService.CheckCollectionOwner(t.UserId, t.CollectionId) {
 		return "ParamsError", false
@@ -141,15 +126,7 @@ func (abcr *AddressBookCollectionRule) CheckForm(u *model.User, t *model.Address
 		if tou.Id == 0 {
 			return "ItemNotFound", false
 		}
-		//非管理员不能分享给非本组织用户
-		if tou.GroupId != u.GroupId && !service.AllService.UserService.IsAdmin(u) {
-			return "NoAccess", false
-		}
 	} else if t.Type == model.ShareAddressBookRuleTypeGroup {
-		if t.ToId != u.GroupId && !service.AllService.UserService.IsAdmin(u) {
-			return "NoAccess", false
-		}
-
 		tog := service.AllService.GroupService.InfoById(t.ToId)
 		if tog.Id == 0 {
 			return "ItemNotFound", false
@@ -169,12 +146,12 @@ func (abcr *AddressBookCollectionRule) CheckForm(u *model.User, t *model.Address
 }
 
 // Update 编辑
-// @AddressBookCollectionRule 地址簿集合规则
-// @Summary 地址簿集合规则编辑
-// @Description 地址簿集合规则编辑
+// @Tags 地址簿规则
+// @Summary 地址簿规则编辑
+// @Description 地址簿规则编辑
 // @Accept  json
 // @Produce  json
-// @Param body body model.AddressBookCollectionRule true "地址簿集合规则信息"
+// @Param body body model.AddressBookCollectionRule true "地址簿规则信息"
 // @Success 200 {object} response.Response{data=model.AddressBookCollection}
 // @Failure 500 {object} response.Response
 // @Router /admin/address_book_collection_rule/update [post]
@@ -194,9 +171,8 @@ func (abcr *AddressBookCollectionRule) Update(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		return
 	}
-	t := f //f.ToAddressBookCollection()
-	u := service.AllService.UserService.CurUser(c)
-	msg, res := abcr.CheckForm(u, t)
+	t := f
+	msg, res := abcr.CheckForm(t)
 	if !res {
 		response.Fail(c, 101, response.TranslateMsg(c, msg))
 		return
@@ -210,12 +186,12 @@ func (abcr *AddressBookCollectionRule) Update(c *gin.Context) {
 }
 
 // Delete 删除
-// @AddressBookCollectionRule 地址簿集合规则
-// @Summary 地址簿集合规则删除
-// @Description 地址簿集合规则删除
+// @Tags 地址簿规则
+// @Summary 地址簿规则删除
+// @Description 地址簿规则删除
 // @Accept  json
 // @Produce  json
-// @Param body body model.AddressBookCollectionRule true "地址簿集合规则信息"
+// @Param body body model.AddressBookCollectionRule true "地址簿规则信息"
 // @Success 200 {object} response.Response
 // @Failure 500 {object} response.Response
 // @Router /admin/address_book_collection_rule/delete [post]
@@ -232,20 +208,15 @@ func (abcr *AddressBookCollectionRule) Delete(c *gin.Context) {
 		response.Fail(c, 101, errList[0])
 		return
 	}
-	t := service.AllService.AddressBookService.RuleInfoById(f.Id)
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+	ex := service.AllService.AddressBookService.RuleInfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 		return
 	}
-	if t.Id > 0 {
-		err := service.AllService.AddressBookService.DeleteRule(t)
-		if err == nil {
-			response.Success(c, nil)
-			return
-		}
-		response.Fail(c, 101, err.Error())
+	err := service.AllService.AddressBookService.DeleteRule(ex)
+	if err == nil {
+		response.Success(c, nil)
 		return
 	}
-	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+	response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 }

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/login.go

@@ -2,18 +2,144 @@ package admin
 
 import (
 	"Gwen/global"
+	"Gwen/http/controller/api"
 	"Gwen/http/request/admin"
+	apiReq "Gwen/http/request/api"
 	"Gwen/http/response"
 	adResp "Gwen/http/response/admin"
 	"Gwen/model"
 	"Gwen/service"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/mojocn/base64Captcha"
+	"sync"
+	"time"
 )
 
 type Login struct {
 }
 
+// Captcha 验证码结构
+type Captcha struct {
+	Id        string    `json:"id"`  // 验证码 ID
+	B64       string    `json:"b64"` // base64 验证码
+	Code      string    `json:"-"`   // 验证码内容
+	ExpiresAt time.Time `json:"-"`   // 过期时间
+}
+type LoginLimiter struct {
+	mu        sync.RWMutex
+	failCount map[string]int       // 记录每个 IP 的失败次数
+	timestamp map[string]time.Time // 记录每个 IP 的最后失败时间
+	captchas  map[string]Captcha   // 每个 IP 的验证码
+	threshold int                  // 失败阈值
+	expiry    time.Duration        // 失败记录过期时间
+}
+
+func NewLoginLimiter(threshold int, expiry time.Duration) *LoginLimiter {
+	return &LoginLimiter{
+		failCount: make(map[string]int),
+		timestamp: make(map[string]time.Time),
+		captchas:  make(map[string]Captcha),
+		threshold: threshold,
+		expiry:    expiry,
+	}
+}
+
+// RecordFailure 记录登录失败
+func (l *LoginLimiter) RecordFailure(ip string) {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+
+	// 如果该 IP 的记录已经过期，重置计数
+	if lastTime, exists := l.timestamp[ip]; exists && time.Since(lastTime) > l.expiry {
+		l.failCount[ip] = 0
+	}
+
+	// 更新失败次数和时间戳
+	l.failCount[ip]++
+	l.timestamp[ip] = time.Now()
+}
+
+// NeedsCaptcha 检查是否需要验证码
+func (l *LoginLimiter) NeedsCaptcha(ip string) bool {
+	l.mu.RLock()
+	defer l.mu.RUnlock()
+
+	// 检查记录是否存在且未过期
+	if lastTime, exists := l.timestamp[ip]; exists && time.Since(lastTime) <= l.expiry {
+		return l.failCount[ip] >= l.threshold
+	}
+	return false
+}
+
+// GenerateCaptcha 为指定 IP 生成验证码
+func (l *LoginLimiter) GenerateCaptcha(ip string) Captcha {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+
+	capd := base64Captcha.NewDriverString(50, 150, 5, 10, 4, "1234567890abcdefghijklmnopqrstuvwxyz", nil, nil, nil)
+	b64cap := base64Captcha.NewCaptcha(capd, base64Captcha.DefaultMemStore)
+	id, b64s, answer, err := b64cap.Generate()
+	if err != nil {
+		global.Logger.Error("Generate captcha failed: " + err.Error())
+		return Captcha{}
+	}
+	// 保存验证码到对应 IP
+	l.captchas[ip] = Captcha{
+		Id:        id,
+		B64:       b64s,
+		Code:      answer,
+		ExpiresAt: time.Now().Add(5 * time.Minute),
+	}
+	return l.captchas[ip]
+}
+
+// VerifyCaptcha 验证指定 IP 的验证码
+func (l *LoginLimiter) VerifyCaptcha(ip, code string) bool {
+	l.mu.RLock()
+	defer l.mu.RUnlock()
+
+	// 检查验证码是否存在且未过期
+	if captcha, exists := l.captchas[ip]; exists && time.Now().Before(captcha.ExpiresAt) {
+		return captcha.Code == code
+	}
+	return false
+}
+
+// RemoveCaptcha 移除指定 IP 的验证码
+func (l *LoginLimiter) RemoveCaptcha(ip string) {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+
+	delete(l.captchas, ip)
+}
+
+// CleanupExpired 清理过期的记录
+func (l *LoginLimiter) CleanupExpired() {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+
+	now := time.Now()
+	for ip, lastTime := range l.timestamp {
+		if now.Sub(lastTime) > l.expiry {
+			delete(l.failCount, ip)
+			delete(l.timestamp, ip)
+			delete(l.captchas, ip)
+		}
+	}
+}
+
+func (l *LoginLimiter) RemoveRecord(ip string) {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+
+	delete(l.failCount, ip)
+	delete(l.timestamp, ip)
+	delete(l.captchas, ip)
+}
+
+var loginLimiter = NewLoginLimiter(3, 5*time.Minute)
+
 // Login 登录
 // @Tags 登录
 // @Summary 登录
@@ -28,40 +154,69 @@ type Login struct {
 func (ct *Login) Login(c *gin.Context) {
 	f := &admin.Login{}
 	err := c.ShouldBindJSON(f)
+	clientIp := c.ClientIP()
 	if err != nil {
-		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "ParamsError", c.RemoteIP(), c.ClientIP()))
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "ParamsError", c.RemoteIP(), clientIp))
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 
 	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
-		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "ParamsError", c.RemoteIP(), c.ClientIP()))
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "ParamsError", c.RemoteIP(), clientIp))
 		response.Fail(c, 101, errList[0])
 		return
 	}
+
+	// 检查是否需要验证码
+	if loginLimiter.NeedsCaptcha(clientIp) {
+		if f.Captcha == "" || !loginLimiter.VerifyCaptcha(clientIp, f.Captcha) {
+			response.Fail(c, 101, response.TranslateMsg(c, "CaptchaError"))
+			return
+		}
+	}
+
 	u := service.AllService.UserService.InfoByUsernamePassword(f.Username, f.Password)
 
 	if u.Id == 0 {
-		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "UsernameOrPasswordError", c.RemoteIP(), c.ClientIP()))
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "UsernameOrPasswordError", c.RemoteIP(), clientIp))
+		loginLimiter.RecordFailure(clientIp)
+		if loginLimiter.NeedsCaptcha(clientIp) {
+			// 移除原验证码，重新生成
+			loginLimiter.RemoveCaptcha(clientIp)
+			response.Fail(c, 110, response.TranslateMsg(c, "UsernameOrPasswordError"))
+			return
+		}
 		response.Fail(c, 101, response.TranslateMsg(c, "UsernameOrPasswordError"))
 		return
 	}
 
 	ut := service.AllService.UserService.Login(u, &model.LoginLog{
 		UserId:   u.Id,
-		Client:   "webadmin",
-		Uuid:     "",
-		Ip:       c.ClientIP(),
-		Type:     "account",
+		Client:   model.LoginLogClientWebAdmin,
+		Uuid:     "", //must be empty
+		Ip:       clientIp,
+		Type:     model.LoginLogTypeAccount,
 		Platform: f.Platform,
 	})
 
-	response.Success(c, &adResp.LoginPayload{
-		Token:      ut.Token,
-		Username:   u.Username,
-		RouteNames: service.AllService.UserService.RouteNames(u),
-		Nickname:   u.Nickname,
+	// 成功后清除记录
+	loginLimiter.RemoveRecord(clientIp)
+
+	// 清理过期记录
+	go loginLimiter.CleanupExpired()
+
+	responseLoginSuccess(c, u, ut.Token)
+}
+func (ct *Login) Captcha(c *gin.Context) {
+	clientIp := c.ClientIP()
+	if !loginLimiter.NeedsCaptcha(clientIp) {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoCaptchaRequired"))
+		return
+	}
+	captcha := loginLimiter.GenerateCaptcha(clientIp)
+	response.Success(c, gin.H{
+		"captcha": captcha,
 	})
 }
 
@@ -82,3 +237,87 @@ func (ct *Login) Logout(c *gin.Context) {
 	}
 	response.Success(c, nil)
 }
+
+// LoginOptions
+// @Tags 登录
+// @Summary 登录选项
+// @Description 登录选项
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} []string
+// @Failure 500 {object} response.ErrorResponse
+// @Router /admin/login-options [post]
+func (ct *Login) LoginOptions(c *gin.Context) {
+	ip := c.ClientIP()
+	ops := service.AllService.OauthService.GetOauthProviders()
+	response.Success(c, gin.H{
+		"ops":          ops,
+		"register":     global.Config.App.Register,
+		"need_captcha": loginLimiter.NeedsCaptcha(ip),
+	})
+}
+
+// OidcAuth
+// @Tags Oauth
+// @Summary OidcAuth
+// @Description OidcAuth
+// @Accept  json
+// @Produce  json
+// @Router /admin/oidc/auth [post]
+func (ct *Login) OidcAuth(c *gin.Context) {
+	// o := &api.Oauth{}
+	// o.OidcAuth(c)
+	f := &apiReq.OidcAuthRequest{}
+	err := c.ShouldBindJSON(f)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+
+	err, code, url := service.AllService.OauthService.BeginAuth(f.Op)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, err.Error()))
+		return
+	}
+
+	service.AllService.OauthService.SetOauthCache(code, &service.OauthCacheItem{
+		Action:     service.OauthActionTypeLogin,
+		Op:         f.Op,
+		Id:         f.Id,
+		DeviceType: "webadmin",
+		// DeviceOs: ct.Platform(c),
+		DeviceOs: f.DeviceInfo.Os,
+		Uuid:     f.Uuid,
+	}, 5*60)
+
+	response.Success(c, gin.H{
+		"code": code,
+		"url":  url,
+	})
+}
+
+// OidcAuthQuery
+// @Tags Oauth
+// @Summary OidcAuthQuery
+// @Description OidcAuthQuery
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response{data=adResp.LoginPayload}
+// @Failure 500 {object} response.Response
+// @Router /admin/oidc/auth-query [get]
+func (ct *Login) OidcAuthQuery(c *gin.Context) {
+	o := &api.Oauth{}
+	u, ut := o.OidcAuthQueryPre(c)
+	if ut == nil {
+		return
+	}
+	responseLoginSuccess(c, u, ut.Token)
+}
+
+func responseLoginSuccess(c *gin.Context, u *model.User, token string) {
+	lp := &adResp.LoginPayload{}
+	lp.FromUser(u)
+	lp.Token = token
+	lp.RouteNames = service.AllService.UserService.RouteNames(u)
+	response.Success(c, lp)
+}

http/controller/admin/loginLog.go

@@ -23,7 +23,7 @@ type LoginLog struct {
 // @Param id path int true "ID"
 // @Success 200 {object} response.Response{data=model.LoginLog}
 // @Failure 500 {object} response.Response
-// @Router /admin/loginLog/detail/{id} [get]
+// @Router /admin/login_log/detail/{id} [get]
 // @Security token
 func (ct *LoginLog) Detail(c *gin.Context) {
 	id := c.Param("id")
@@ -48,7 +48,7 @@ func (ct *LoginLog) Detail(c *gin.Context) {
 // @Param user_id query int false "用户ID"
 // @Success 200 {object} response.Response{data=model.LoginLogList}
 // @Failure 500 {object} response.Response
-// @Router /admin/loginLog/list [get]
+// @Router /admin/login_log/list [get]
 // @Security token
 func (ct *LoginLog) List(c *gin.Context) {
 	query := &admin.LoginLogQuery{}
@@ -78,7 +78,7 @@ func (ct *LoginLog) List(c *gin.Context) {
 // @Param body body model.LoginLog true "登录日志信息"
 // @Success 200 {object} response.Response
 // @Failure 500 {object} response.Response
-// @Router /admin/loginLog/delete [post]
+// @Router /admin/login_log/delete [post]
 // @Security token
 func (ct *LoginLog) Delete(c *gin.Context) {
 	f := &model.LoginLog{}
@@ -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/my/addressBook.go

@@ -0,0 +1,271 @@
+package my
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/service"
+	"encoding/json"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type AddressBook struct{}
+
+// List 列表
+// @Tags 我的地址簿
+// @Summary 地址簿列表
+// @Description 地址簿列表
+// @Accept  json
+// @Produce  json
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Param user_id query int false "用户id"
+// @Success 200 {object} response.Response{data=model.AddressBookList}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book/list [get]
+// @Security token
+func (ct *AddressBook) List(c *gin.Context) {
+	query := &admin.AddressBookQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	query.UserId = int(u.Id)
+	res := service.AllService.AddressBookService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
+		//预加载地址簿名称
+		tx.Preload("Collection", func(txc *gorm.DB) *gorm.DB {
+			return txc.Select("id,name")
+		})
+		if query.Id != "" {
+			tx.Where("id like ?", "%"+query.Id+"%")
+		}
+		tx.Where("user_id = ?", query.UserId)
+		if query.Username != "" {
+			tx.Where("username like ?", "%"+query.Username+"%")
+		}
+		if query.Hostname != "" {
+			tx.Where("hostname like ?", "%"+query.Hostname+"%")
+		}
+		if query.CollectionId != nil && *query.CollectionId >= 0 {
+			tx.Where("collection_id = ?", query.CollectionId)
+		}
+	})
+
+	abCIds := make([]uint, 0)
+	for _, ab := range res.AddressBooks {
+		abCIds = append(abCIds, ab.CollectionId)
+	}
+	response.Success(c, res)
+}
+
+// Create 创建地址簿
+// @Tags 我的地址簿
+// @Summary 创建地址簿
+// @Description 创建地址簿
+// @Accept  json
+// @Produce  json
+// @Param body body admin.AddressBookForm true "地址簿信息"
+// @Success 200 {object} response.Response{data=model.AddressBook}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book/create [post]
+// @Security token
+func (ct *AddressBook) Create(c *gin.Context) {
+	f := &admin.AddressBookForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	t := f.ToAddressBook()
+	u := service.AllService.UserService.CurUser(c)
+	t.UserId = u.Id
+	if t.CollectionId > 0 && !service.AllService.AddressBookService.CheckCollectionOwner(t.UserId, t.CollectionId) {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+
+	ex := service.AllService.AddressBookService.InfoByUserIdAndIdAndCid(t.UserId, t.Id, t.CollectionId)
+	if ex.RowId > 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemExists"))
+		return
+	}
+
+	err := service.AllService.AddressBookService.Create(t)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+// Update 编辑
+// @Tags 我的地址簿
+// @Summary 地址簿编辑
+// @Description 地址簿编辑
+// @Accept  json
+// @Produce  json
+// @Param body body admin.AddressBookForm true "地址簿信息"
+// @Success 200 {object} response.Response{data=model.AddressBook}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book/update [post]
+// @Security token
+func (ct *AddressBook) Update(c *gin.Context) {
+	f := &admin.AddressBookForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	if f.RowId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	if f.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+
+	ex := service.AllService.AddressBookService.InfoByRowId(f.RowId)
+	if ex.RowId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	if ex.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+	t := f.ToAddressBook()
+	if t.CollectionId > 0 && !service.AllService.AddressBookService.CheckCollectionOwner(t.UserId, t.CollectionId) {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	err := service.AllService.AddressBookService.UpdateAll(t)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+// Delete 删除
+// @Tags 我的地址簿
+// @Summary 地址簿删除
+// @Description 地址簿删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.AddressBookForm true "地址簿信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book/delete [post]
+// @Security token
+func (ct *AddressBook) Delete(c *gin.Context) {
+	f := &admin.AddressBookForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	id := f.RowId
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	ex := service.AllService.AddressBookService.InfoByRowId(f.RowId)
+	if ex.RowId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	if ex.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+	err := service.AllService.AddressBookService.Delete(ex)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+	return
+}
+func (ct *AddressBook) BatchCreateFromPeers(c *gin.Context) {
+	f := &admin.BatchCreateFromPeersForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+
+	if f.CollectionId != 0 {
+		collection := service.AllService.AddressBookService.CollectionInfoById(f.CollectionId)
+		if collection.Id == 0 {
+			response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+			return
+		}
+		if collection.UserId != u.Id {
+			response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+			return
+		}
+	}
+	if len(f.PeerIds) == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	pl := int64(len(f.PeerIds))
+	peers := service.AllService.PeerService.List(1, uint(pl), func(tx *gorm.DB) {
+		tx.Where("row_id in ?", f.PeerIds)
+		tx.Where("user_id = ?", u.Id)
+	})
+	if peers.Total == 0 || pl != peers.Total {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+
+	tags, _ := json.Marshal(f.Tags)
+	for _, peer := range peers.Peers {
+		ab := service.AllService.AddressBookService.FromPeer(peer)
+		ab.Tags = tags
+		ab.CollectionId = f.CollectionId
+		ex := service.AllService.AddressBookService.InfoByUserIdAndIdAndCid(u.Id, ab.Id, ab.CollectionId)
+		if ex.RowId != 0 {
+			continue
+		}
+		service.AllService.AddressBookService.Create(ab)
+	}
+	response.Success(c, nil)
+}
+
+func (ct *AddressBook) BatchUpdateTags(c *gin.Context) {
+	f := &admin.BatchUpdateTagsForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+
+	abs := service.AllService.AddressBookService.List(1, 999, func(tx *gorm.DB) {
+		tx.Where("row_id in ?", f.RowIds)
+		tx.Where("user_id = ?", u.Id)
+	})
+	if abs.Total == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	err := service.AllService.AddressBookService.BatchUpdateTags(abs.AddressBooks, f.Tags)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}

http/controller/admin/my/addressBookCollection.go

@@ -0,0 +1,162 @@
+package my
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/model"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type AddressBookCollection struct {
+}
+
+// Create 创建地址簿名称
+// @Tags 我的地址簿名称
+// @Summary 创建地址簿名称
+// @Description 创建地址簿名称
+// @Accept  json
+// @Produce  json
+// @Param body body model.AddressBookCollection true "地址簿名称信息"
+// @Success 200 {object} response.Response{data=model.AddressBookCollection}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book_collection/create [post]
+// @Security token
+func (abc *AddressBookCollection) Create(c *gin.Context) {
+	f := &model.AddressBookCollection{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	f.UserId = u.Id
+	err := service.AllService.AddressBookService.CreateCollection(f)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+// List 列表
+// @Tags 我的地址簿名称
+// @Summary 地址簿名称列表
+// @Description 地址簿名称列表
+// @Accept  json
+// @Produce  json
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Success 200 {object} response.Response{data=model.AddressBookCollectionList}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book_collection/list [get]
+// @Security token
+func (abc *AddressBookCollection) List(c *gin.Context) {
+	query := &admin.AddressBookCollectionQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	query.UserId = int(u.Id)
+	res := service.AllService.AddressBookService.ListCollection(query.Page, query.PageSize, func(tx *gorm.DB) {
+		tx.Where("user_id = ?", query.UserId)
+	})
+	response.Success(c, res)
+}
+
+// Update 编辑
+// @Tags 我的地址簿名称
+// @Summary 地址簿名称编辑
+// @Description 地址簿名称编辑
+// @Accept  json
+// @Produce  json
+// @Param body body model.AddressBookCollection true "地址簿名称信息"
+// @Success 200 {object} response.Response{data=model.AddressBookCollection}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book_collection/update [post]
+// @Security token
+func (abc *AddressBookCollection) Update(c *gin.Context) {
+	f := &model.AddressBookCollection{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	if f.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	if f.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+	ex := service.AllService.AddressBookService.CollectionInfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	if ex.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+
+	err := service.AllService.AddressBookService.UpdateCollection(f)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+// Delete 删除
+// @Tags 我的地址簿名称
+// @Summary 地址簿名称删除
+// @Description 地址簿名称删除
+// @Accept  json
+// @Produce  json
+// @Param body body model.AddressBookCollection true "地址簿名称信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book_collection/delete [post]
+// @Security token
+func (abc *AddressBookCollection) Delete(c *gin.Context) {
+	f := &model.AddressBookCollection{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	id := f.Id
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	ex := service.AllService.AddressBookService.CollectionInfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	if ex.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+	err := service.AllService.AddressBookService.DeleteCollection(ex)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+}

http/controller/admin/my/addressBookCollectionRule.go

@@ -0,0 +1,228 @@
+package my
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/model"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type AddressBookCollectionRule struct {
+}
+
+// List 列表
+// @Tags 我的地址簿规则
+// @Summary 地址簿规则列表
+// @Description 地址簿规则列表
+// @Accept  json
+// @Produce  json
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Param is_my query int false "是否是我的"
+// @Param user_id query int false "用户id"
+// @Param collection_id query int false "地址簿集合id"
+// @Success 200 {object} response.Response{data=model.AddressBookCollectionList}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book_collection_rule/list [get]
+// @Security token
+func (abcr *AddressBookCollectionRule) List(c *gin.Context) {
+	query := &admin.AddressBookCollectionRuleQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	query.UserId = int(u.Id)
+
+	res := service.AllService.AddressBookService.ListRules(query.Page, query.PageSize, func(tx *gorm.DB) {
+		tx.Where("user_id = ?", query.UserId)
+		if query.CollectionId > 0 {
+			tx.Where("collection_id = ?", query.CollectionId)
+		}
+	})
+	response.Success(c, res)
+}
+
+// Create 创建地址簿规则
+// @Tags 我的地址簿规则
+// @Summary 创建地址簿规则
+// @Description 创建地址簿规则
+// @Accept  json
+// @Produce  json
+// @Param body body model.AddressBookCollectionRule true "地址簿规则信息"
+// @Success 200 {object} response.Response{data=model.AddressBookCollection}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book_collection_rule/create [post]
+// @Security token
+func (abcr *AddressBookCollectionRule) Create(c *gin.Context) {
+	f := &model.AddressBookCollectionRule{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	if f.Type != model.ShareAddressBookRuleTypePersonal && f.Type != model.ShareAddressBookRuleTypeGroup {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	//t := f.ToAddressBookCollection()
+	t := f
+	u := service.AllService.UserService.CurUser(c)
+	t.UserId = u.Id
+	msg, res := abcr.CheckForm(u, t)
+	if !res {
+		response.Fail(c, 101, response.TranslateMsg(c, msg))
+		return
+	}
+	err := service.AllService.AddressBookService.CreateRule(t)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+func (abcr *AddressBookCollectionRule) CheckForm(u *model.User, t *model.AddressBookCollectionRule) (string, bool) {
+	if t.UserId != u.Id {
+		return "NoAccess", false
+	}
+	if t.CollectionId > 0 && !service.AllService.AddressBookService.CheckCollectionOwner(t.UserId, t.CollectionId) {
+		return "ParamsError", false
+	}
+
+	//check to_id
+	if t.Type == model.ShareAddressBookRuleTypePersonal {
+		if t.ToId == t.UserId {
+			return "ParamsError", false
+		}
+		tou := service.AllService.UserService.InfoById(t.ToId)
+		if tou.Id == 0 {
+			return "ItemNotFound", false
+		}
+		//非管理员不能分享给非本组织用户
+		if tou.GroupId != u.GroupId {
+			return "NoAccess", false
+		}
+	} else if t.Type == model.ShareAddressBookRuleTypeGroup {
+		//非管理员不能分享给其他组
+		if t.ToId != u.GroupId {
+			return "NoAccess", false
+		}
+
+		tog := service.AllService.GroupService.InfoById(t.ToId)
+		if tog.Id == 0 {
+			return "ItemNotFound", false
+		}
+	} else {
+		return "ParamsError", false
+	}
+	// 重复检查
+	ex := service.AllService.AddressBookService.RulePersonalInfoByToIdAndCid(t.ToId, t.CollectionId)
+	if t.Id == 0 && ex.Id > 0 {
+		return "ItemExists", false
+	}
+	if t.Id > 0 && ex.Id > 0 && t.Id != ex.Id {
+		return "ItemExists", false
+	}
+	return "", true
+}
+
+// Update 编辑
+// @Tags 我的地址簿规则
+// @Summary 地址簿规则编辑
+// @Description 地址簿规则编辑
+// @Accept  json
+// @Produce  json
+// @Param body body model.AddressBookCollectionRule true "地址簿规则信息"
+// @Success 200 {object} response.Response{data=model.AddressBookCollection}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book_collection_rule/update [post]
+// @Security token
+func (abcr *AddressBookCollectionRule) Update(c *gin.Context) {
+	f := &model.AddressBookCollectionRule{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	if f.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+
+	ex := service.AllService.AddressBookService.RuleInfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	if ex.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+	t := f
+	msg, res := abcr.CheckForm(u, t)
+	if !res {
+		response.Fail(c, 101, response.TranslateMsg(c, msg))
+		return
+	}
+	err := service.AllService.AddressBookService.UpdateRule(t)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+// Delete 删除
+// @Tags 我的地址簿规则
+// @Summary 地址簿规则删除
+// @Description 地址簿规则删除
+// @Accept  json
+// @Produce  json
+// @Param body body model.AddressBookCollectionRule true "地址簿规则信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/my/address_book_collection_rule/delete [post]
+// @Security token
+func (abcr *AddressBookCollectionRule) Delete(c *gin.Context) {
+	f := &model.AddressBookCollectionRule{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	id := f.Id
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	ex := service.AllService.AddressBookService.RuleInfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	if ex.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+
+	err := service.AllService.AddressBookService.DeleteRule(ex)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+}

http/controller/admin/my/peer.go

@@ -0,0 +1,59 @@
+package my
+
+import (
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+	"time"
+)
+
+type Peer struct {
+}
+
+// List 列表
+// @Tags 我的设备
+// @Summary 设备列表
+// @Description 设备列表
+// @Accept  json
+// @Produce  json
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Param time_ago query int false "时间"
+// @Param id query string false "ID"
+// @Param hostname query string false "主机名"
+// @Param uuids query string false "uuids 用逗号分隔"
+// @Success 200 {object} response.Response{data=model.PeerList}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/peer/list [get]
+// @Security token
+func (ct *Peer) List(c *gin.Context) {
+	query := &admin.PeerQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	res := service.AllService.PeerService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
+		tx.Where("user_id = ?", u.Id)
+		if query.TimeAgo > 0 {
+			lt := time.Now().Unix() - int64(query.TimeAgo)
+			tx.Where("last_online_time < ?", lt)
+		}
+		if query.TimeAgo < 0 {
+			lt := time.Now().Unix() + int64(query.TimeAgo)
+			tx.Where("last_online_time > ?", lt)
+		}
+		if query.Id != "" {
+			tx.Where("id like ?", "%"+query.Id+"%")
+		}
+		if query.Hostname != "" {
+			tx.Where("hostname like ?", "%"+query.Hostname+"%")
+		}
+		if query.Uuids != "" {
+			tx.Where("uuid in (?)", query.Uuids)
+		}
+	})
+	response.Success(c, res)
+}

http/controller/admin/my/shareRecord.go

@@ -0,0 +1,119 @@
+package my
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type ShareRecord struct {
+}
+
+// List 分享记录列表
+// @Tags 我的分享记录
+// @Summary 分享记录列表
+// @Description 分享记录列表
+// @Accept  json
+// @Produce  json
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/my/share_record/list [get]
+// @Security token
+func (sr *ShareRecord) List(c *gin.Context) {
+	query := &admin.PageQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	res := service.AllService.ShareRecordService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
+		tx.Where("user_id = ?", u.Id)
+	})
+	response.Success(c, res)
+}
+
+// Delete 分享记录删除
+// @Tags 我的分享记录
+// @Summary 分享记录删除
+// @Description 分享记录删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.ShareRecordForm true "分享记录信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/my/share_record/delete [post]
+// @Security token
+func (sr *ShareRecord) Delete(c *gin.Context) {
+	f := &admin.ShareRecordForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	id := f.Id
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	i := service.AllService.ShareRecordService.InfoById(f.Id)
+	if i.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	if i.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	err := service.AllService.ShareRecordService.Delete(i)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+}
+
+// BatchDelete 批量删除我的分享记录
+// @Tags 我的
+// @Summary 批量删除我的分享记录
+// @Description 批量删除我的分享记录
+// @Accept  json
+// @Produce  json
+// @Param body body admin.PeerShareRecordBatchDeleteForm true "id"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/my/share_record/batchDelete [post]
+// @Security token
+func (sr *ShareRecord) BatchDelete(c *gin.Context) {
+	f := &admin.PeerShareRecordBatchDeleteForm{}
+	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
+	}
+	u := service.AllService.UserService.CurUser(c)
+	var l int64
+	l = int64(len(f.Ids))
+	res := service.AllService.ShareRecordService.List(1, uint(l), func(tx *gorm.DB) {
+		tx.Where("user_id = ?", u.Id)
+		tx.Where("id in ?", f.Ids)
+	})
+	if res.Total != l {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	err := service.AllService.ShareRecordService.BatchDelete(f.Ids)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}

http/controller/admin/my/tag.go

@@ -0,0 +1,176 @@
+package my
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type Tag struct{}
+
+// List 列表
+// @Tags 我的标签
+// @Summary 标签列表
+// @Description 标签列表
+// @Accept  json
+// @Produce  json
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Param is_my query int false "是否是我的"
+// @Param user_id query int false "用户id"
+// @Success 200 {object} response.Response{data=model.TagList}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/tag/list [get]
+// @Security token
+func (ct *Tag) List(c *gin.Context) {
+	query := &admin.TagQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	query.UserId = int(u.Id)
+	res := service.AllService.TagService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
+		tx.Preload("Collection", func(txc *gorm.DB) *gorm.DB {
+			return txc.Select("id,name")
+		})
+		tx.Where("user_id = ?", query.UserId)
+		if query.CollectionId != nil && *query.CollectionId >= 0 {
+			tx.Where("collection_id = ?", query.CollectionId)
+		}
+	})
+	response.Success(c, res)
+}
+
+// Create 创建标签
+// @Tags 我的标签
+// @Summary 创建标签
+// @Description 创建标签
+// @Accept  json
+// @Produce  json
+// @Param body body admin.TagForm true "标签信息"
+// @Success 200 {object} response.Response{data=model.Tag}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/tag/create [post]
+// @Security token
+func (ct *Tag) Create(c *gin.Context) {
+	f := &admin.TagForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	t := f.ToTag()
+	u := service.AllService.UserService.CurUser(c)
+	t.UserId = u.Id
+	err := service.AllService.TagService.Create(t)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+// Update 编辑
+// @Tags 我的标签
+// @Summary 标签编辑
+// @Description 标签编辑
+// @Accept  json
+// @Produce  json
+// @Param body body admin.TagForm true "标签信息"
+// @Success 200 {object} response.Response{data=model.Tag}
+// @Failure 500 {object} response.Response
+// @Router /admin/my/tag/update [post]
+// @Security token
+func (ct *Tag) Update(c *gin.Context) {
+	f := &admin.TagForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	if f.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+
+	u := service.AllService.UserService.CurUser(c)
+	if f.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+	ex := service.AllService.TagService.InfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	if ex.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+
+	t := f.ToTag()
+	if t.CollectionId > 0 && !service.AllService.AddressBookService.CheckCollectionOwner(t.UserId, t.CollectionId) {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	err := service.AllService.TagService.Update(t)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+// Delete 删除
+// @Tags 标签
+// @Summary 标签删除
+// @Description 标签删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.TagForm true "标签信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/my/tag/delete [post]
+// @Security token
+func (ct *Tag) Delete(c *gin.Context) {
+	f := &admin.TagForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	id := f.Id
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	ex := service.AllService.TagService.InfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	if ex.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+	err := service.AllService.TagService.Delete(ex)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, err.Error())
+	return
+}

http/controller/admin/oauth.go

@@ -5,7 +5,6 @@ import (
 	"Gwen/http/request/admin"
 	adminReq "Gwen/http/request/admin"
 	"Gwen/http/response"
-	"Gwen/model"
 	"Gwen/service"
 	"github.com/gin-gonic/gin"
 	"strconv"
@@ -96,21 +95,23 @@ func (o *Oauth) BindConfirm(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		return
 	}
-	v := service.AllService.OauthService.GetOauthCache(j.Code)
-	if v == nil {
+	oauthService := service.AllService.OauthService
+	oauthCache := oauthService.GetOauthCache(j.Code)
+	if oauthCache == nil {
 		response.Fail(c, 101, response.TranslateMsg(c, "OauthExpired"))
 		return
 	}
-	u := service.AllService.UserService.CurUser(c)
-	err = service.AllService.OauthService.BindGithubUser(v.ThirdOpenId, v.ThirdOpenId, u.Id)
+	oauthUser := oauthCache.ToOauthUser()
+	user := service.AllService.UserService.CurUser(c)
+	err = oauthService.BindOauthUser(user.Id, oauthUser, oauthCache.Op)
 	if err != nil {
 		response.Fail(c, 101, response.TranslateMsg(c, "BindFail"))
 		return
 	}
 
-	v.UserId = u.Id
-	service.AllService.OauthService.SetOauthCache(j.Code, v, 0)
-	response.Success(c, v)
+	oauthCache.UserId = user.Id
+	oauthService.SetOauthCache(j.Code, oauthCache, 0)
+	response.Success(c, oauthCache)
 }
 
 func (o *Oauth) Unbind(c *gin.Context) {
@@ -126,21 +127,11 @@ func (o *Oauth) Unbind(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 		return
 	}
-	if f.Op == model.OauthTypeGithub {
-		err = service.AllService.OauthService.UnBindGithubUser(u.Id)
-		if err != nil {
-			response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
-			return
-		}
+	err = service.AllService.OauthService.UnBindOauthUser(u.Id, f.Op)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
 	}
-	if f.Op == model.OauthTypeGoogle {
-		err = service.AllService.OauthService.UnBindGoogleUser(u.Id)
-		if err != nil {
-			response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
-			return
-		}
-	}
-
 	response.Success(c, nil)
 }
 
@@ -189,15 +180,18 @@ func (o *Oauth) Create(c *gin.Context) {
 		response.Fail(c, 101, errList[0])
 		return
 	}
-
-	ex := service.AllService.OauthService.InfoByOp(f.Op)
+	u := f.ToOauth()
+	err := u.FormatOauthInfo()
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	ex := service.AllService.OauthService.InfoByOp(u.Op)
 	if ex.Id > 0 {
 		response.Fail(c, 101, response.TranslateMsg(c, "ItemExists"))
 		return
 	}
-
-	u := f.ToOauth()
-	err := service.AllService.OauthService.Create(u)
+	err = service.AllService.OauthService.Create(u)
 	if err != nil {
 		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return

http/controller/admin/peer.go

@@ -79,6 +79,7 @@ func (ct *Peer) Create(c *gin.Context) {
 // @Param time_ago query int false "时间"
 // @Param id query string false "ID"
 // @Param hostname query string false "主机名"
+// @Param uuids query string false "uuids 用逗号分隔"
 // @Success 200 {object} response.Response{data=model.PeerList}
 // @Failure 500 {object} response.Response
 // @Router /admin/peer/list [get]
@@ -104,6 +105,9 @@ func (ct *Peer) List(c *gin.Context) {
 		if query.Hostname != "" {
 			tx.Where("hostname like ?", "%"+query.Hostname+"%")
 		}
+		if query.Uuids != "" {
+			tx.Where("uuid in (?)", query.Uuids)
+		}
 	})
 	response.Success(c, res)
 }
@@ -188,7 +192,7 @@ func (ct *Peer) Delete(c *gin.Context) {
 // @Param body body admin.PeerBatchDeleteForm true "设备id"
 // @Success 200 {object} response.Response
 // @Failure 500 {object} response.Response
-// @Router /admin/peer/delete [post]
+// @Router /admin/peer/batchDelete [post]
 // @Security token
 func (ct *Peer) BatchDelete(c *gin.Context) {
 	f := &admin.PeerBatchDeleteForm{}

http/controller/admin/shareRecord.go

@@ -0,0 +1,105 @@
+package admin
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type ShareRecord struct {
+}
+
+// List 列表
+// @Tags 分享记录
+// @Summary 分享记录列表
+// @Description 分享记录列表
+// @Accept  json
+// @Produce  json
+// @Param user_id query int false "用户ID"
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/share_record/list [get]
+// @Security token
+func (sr *ShareRecord) List(c *gin.Context) {
+	query := &admin.ShareRecordQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	res := service.AllService.ShareRecordService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
+		if query.UserId > 0 {
+			tx.Where("user_id = ?", query.UserId)
+		}
+	})
+	response.Success(c, res)
+}
+
+// Delete 删除
+// @Tags 分享记录
+// @Summary 分享记录删除
+// @Description 分享记录删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.ShareRecordForm true "分享记录信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/share_record/delete [post]
+// @Security token
+func (sr *ShareRecord) Delete(c *gin.Context) {
+	f := &admin.ShareRecordForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	id := f.Id
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	i := service.AllService.ShareRecordService.InfoById(f.Id)
+	if i.Id > 0 {
+		err := service.AllService.ShareRecordService.Delete(i)
+		if err == nil {
+			response.Success(c, nil)
+			return
+		}
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+}
+
+// BatchDelete 批量删除
+// @Tags 分享记录
+// @Summary 批量分享记录
+// @Description 批量分享记录
+// @Accept  json
+// @Produce  json
+// @Param body body admin.PeerShareRecordBatchDeleteForm true "id"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/share_record/batchDelete [post]
+// @Security token
+func (sr *ShareRecord) BatchDelete(c *gin.Context) {
+	f := &admin.PeerShareRecordBatchDeleteForm{}
+	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.ShareRecordService.BatchDelete(f.Ids)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}

http/controller/admin/tag.go

@@ -64,9 +64,9 @@ func (ct *Tag) Create(c *gin.Context) {
 		return
 	}
 	t := f.ToTag()
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) || t.UserId == 0 {
-		t.UserId = u.Id
+	if t.UserId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
 	}
 	err := service.AllService.TagService.Create(t)
 	if err != nil {
@@ -96,10 +96,6 @@ func (ct *Tag) List(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) || query.IsMy == 1 {
-		query.UserId = int(u.Id)
-	}
 	res := service.AllService.TagService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
 		tx.Preload("Collection", func(txc *gorm.DB) *gorm.DB {
 			return txc.Select("id,name")
@@ -140,12 +136,12 @@ func (ct *Tag) Update(c *gin.Context) {
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		return
 	}
-	t := f.ToTag()
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+	ex := service.AllService.TagService.InfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 		return
 	}
+	t := f.ToTag()
 	err := service.AllService.TagService.Update(t)
 	if err != nil {
 		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
@@ -177,20 +173,15 @@ func (ct *Tag) Delete(c *gin.Context) {
 		response.Fail(c, 101, errList[0])
 		return
 	}
-	t := service.AllService.TagService.InfoById(f.Id)
-	u := service.AllService.UserService.CurUser(c)
-	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+	ex := service.AllService.TagService.InfoById(f.Id)
+	if ex.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 		return
 	}
-	if u.Id > 0 {
-		err := service.AllService.TagService.Delete(t)
-		if err == nil {
-			response.Success(c, nil)
-			return
-		}
-		response.Fail(c, 101, err.Error())
+	err := service.AllService.TagService.Delete(ex)
+	if err == nil {
+		response.Success(c, nil)
 		return
 	}
-	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+	response.Fail(c, 101, err.Error())
 }

http/controller/admin/user.go

@@ -5,6 +5,7 @@ import (
 	"Gwen/http/request/admin"
 	"Gwen/http/response"
 	adResp "Gwen/http/response/admin"
+	"Gwen/model"
 	"Gwen/service"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -215,12 +216,7 @@ func (ct *User) Current(c *gin.Context) {
 	u := service.AllService.UserService.CurUser(c)
 	token, _ := c.Get("token")
 	t := token.(string)
-	response.Success(c, &adResp.LoginPayload{
-		Token:      t,
-		Username:   u.Username,
-		RouteNames: service.AllService.UserService.RouteNames(u),
-		Nickname:   u.Nickname,
-	})
+	responseLoginSuccess(c, u, t)
 }
 
 // ChangeCurPwd 修改当前用户密码
@@ -247,10 +243,14 @@ func (ct *User) ChangeCurPwd(c *gin.Context) {
 		return
 	}
 	u := service.AllService.UserService.CurUser(c)
-	oldPwd := service.AllService.UserService.EncryptPassword(f.OldPassword)
-	if u.Password != oldPwd {
-		response.Fail(c, 101, response.TranslateMsg(c, "OldPasswordError"))
-		return
+	// If the password is not empty, the old password is verified
+	// otherwise, the old password is not verified
+	if !service.AllService.UserService.IsPasswordEmptyByUser(u) {
+		oldPwd := service.AllService.UserService.EncryptPassword(f.OldPassword)
+		if u.Password != oldPwd {
+			response.Fail(c, 101, response.TranslateMsg(c, "OldPasswordError"))
+			return
+		}
 	}
 	err := service.AllService.UserService.UpdatePassword(u, f.NewPassword)
 	if err != nil {
@@ -281,10 +281,10 @@ func (ct *User) MyOauth(c *gin.Context) {
 	var res []*adResp.UserOauthItem
 	for _, oa := range oal.Oauths {
 		item := &adResp.UserOauthItem{
-			ThirdType: oa.Op,
+			Op: oa.Op,
 		}
 		for _, ut := range uts {
-			if ut.ThirdType == oa.Op {
+			if ut.Op == oa.Op {
 				item.Status = 1
 				break
 			}
@@ -323,3 +323,35 @@ func (ct *User) GroupUsers(c *gin.Context) {
 	}
 	response.Success(c, data)
 }
+
+// Register
+func (ct *User) Register(c *gin.Context) {
+	if !global.Config.App.Register {
+		response.Fail(c, 101, response.TranslateMsg(c, "RegisterClosed"))
+		return
+	}
+	f := &admin.RegisterForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	u := service.AllService.UserService.Register(f.Username, f.Email, f.Password)
+	if u == nil || u.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed"))
+		return
+	}
+	// 注册成功后自动登录
+	ut := service.AllService.UserService.Login(u, &model.LoginLog{
+		UserId: u.Id,
+		Client: model.LoginLogClientWebAdmin,
+		Uuid:   "",
+		Ip:     c.ClientIP(),
+		Type:   model.LoginLogTypeAccount,
+	})
+	responseLoginSuccess(c, u, ut.Token)
+}

http/controller/admin/userToken.go

@@ -0,0 +1,113 @@
+package admin
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/model"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type UserToken struct {
+}
+
+// List 列表
+// @Tags 登录凭证
+// @Summary 登录凭证列表
+// @Description 登录凭证列表
+// @Accept  json
+// @Produce  json
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Param user_id query int false "用户ID"
+// @Success 200 {object} response.Response{data=model.UserTokenList}
+// @Failure 500 {object} response.Response
+// @Router /admin/user_token/list [get]
+// @Security token
+func (ct *UserToken) List(c *gin.Context) {
+	query := &admin.LoginTokenQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	res := service.AllService.UserService.TokenList(query.Page, query.PageSize, func(tx *gorm.DB) {
+		if query.UserId > 0 {
+			tx.Where("user_id = ?", query.UserId)
+		}
+		tx.Order("id desc")
+	})
+	response.Success(c, res)
+}
+
+// Delete 删除
+// @Tags 登录凭证
+// @Summary 登录凭证删除
+// @Description 登录凭证删除
+// @Accept  json
+// @Produce  json
+// @Param body body model.UserToken true "登录凭证信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/user_token/delete [post]
+// @Security token
+func (ct *UserToken) Delete(c *gin.Context) {
+	f := &model.UserToken{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	id := f.Id
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	l := service.AllService.UserService.TokenInfoById(f.Id)
+	u := service.AllService.UserService.CurUser(c)
+	if !service.AllService.UserService.IsAdmin(u) && l.UserId != u.Id {
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
+		return
+	}
+	if l.Id > 0 {
+		err := service.AllService.UserService.DeleteToken(l)
+		if err == nil {
+			response.Success(c, nil)
+			return
+		}
+		response.Fail(c, 101, err.Error())
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+}
+
+// BatchDelete 批量删除
+// @Tags 登录凭证
+// @Summary 登录凭证批量删除
+// @Description 登录凭证批量删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.UserTokenBatchDeleteForm true "登录凭证信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/user_token/batchDelete [post]
+// @Security token
+func (ct *UserToken) BatchDelete(c *gin.Context) {
+	f := &admin.UserTokenBatchDeleteForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	ids := f.Ids
+	if len(ids) == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	err := service.AllService.UserService.BatchDeleteUserToken(ids)
+	if err == nil {
+		response.Success(c, nil)
+		return
+	}
+	response.Fail(c, 101, err.Error())
+}

http/controller/api/login.go

@@ -54,12 +54,13 @@ func (l *Login) Login(c *gin.Context) {
 	//根据refer判断是webclient还是app
 	ref := c.GetHeader("referer")
 	if ref != "" {
-		f.DeviceInfo.Type = "webclient"
+		f.DeviceInfo.Type = model.LoginLogClientWeb
 	}
 
 	ut := service.AllService.UserService.Login(u, &model.LoginLog{
 		UserId:   u.Id,
 		Client:   f.DeviceInfo.Type,
+		DeviceId: f.Id,
 		Uuid:     f.Uuid,
 		Ip:       c.ClientIP(),
 		Type:     model.LoginLogTypeAccount,
@@ -81,20 +82,12 @@ func (l *Login) Login(c *gin.Context) {
 // @Produce  json
 // @Success 200 {object} []string
 // @Failure 500 {object} response.ErrorResponse
-// @Router /login-options [post]
+// @Router /login-options [get]
 func (l *Login) LoginOptions(c *gin.Context) {
-	oauthOks := []string{}
-	err, _ := service.AllService.OauthService.GetOauthConfig(model.OauthTypeGithub)
-	if err == nil {
-		oauthOks = append(oauthOks, model.OauthTypeGithub)
-	}
-	err, _ = service.AllService.OauthService.GetOauthConfig(model.OauthTypeGoogle)
-	if err == nil {
-		oauthOks = append(oauthOks, model.OauthTypeGoogle)
-	}
-	oauthOks = append(oauthOks, model.OauthTypeWebauth)
+	ops := service.AllService.OauthService.GetOauthProviders()
+	ops = append(ops, model.OauthTypeWebauth)
 	var oidcItems []map[string]string
-	for _, v := range oauthOks {
+	for _, v := range ops {
 		oidcItems = append(oidcItems, map[string]string{"name": v})
 	}
 	common, err := json.Marshal(oidcItems)
@@ -104,7 +97,7 @@ func (l *Login) LoginOptions(c *gin.Context) {
 	}
 	var res []string
 	res = append(res, "common-oidc/"+string(common))
-	for _, v := range oauthOks {
+	for _, v := range ops {
 		res = append(res, "oidc/"+v)
 	}
 	c.JSON(http.StatusOK, res)

http/controller/api/ouath.go

@@ -9,8 +9,6 @@ import (
 	"Gwen/service"
 	"github.com/gin-gonic/gin"
 	"net/http"
-	"strconv"
-	"strings"
 )
 
 type Oauth struct {
@@ -32,12 +30,11 @@ func (o *Oauth) OidcAuth(c *gin.Context) {
 		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	if f.Op != model.OauthTypeWebauth && f.Op != model.OauthTypeGoogle && f.Op != model.OauthTypeGithub {
-		response.Error(c, response.TranslateMsg(c, "ParamsError"))
-		return
-	}
 
-	err, code, url := service.AllService.OauthService.BeginAuth(f.Op)
+	oauthService := service.AllService.OauthService
+	var code string
+	var url string
+	err, code, url = oauthService.BeginAuth(f.Op)
 	if err != nil {
 		response.Error(c, response.TranslateMsg(c, err.Error()))
 		return
@@ -59,6 +56,60 @@ func (o *Oauth) OidcAuth(c *gin.Context) {
 	})
 }
 
+func (o *Oauth) OidcAuthQueryPre(c *gin.Context) (*model.User, *model.UserToken) {
+	var u *model.User
+	var ut *model.UserToken
+	q := &api.OidcAuthQuery{}
+
+	// 解析查询参数并处理错误
+	if err := c.ShouldBindQuery(q); err != nil {
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+": "+err.Error())
+		return nil, nil
+	}
+
+	// 获取 OAuth 缓存
+	v := service.AllService.OauthService.GetOauthCache(q.Code)
+	if v == nil {
+		response.Error(c, response.TranslateMsg(c, "OauthExpired"))
+		return nil, nil
+	}
+
+	// 如果 UserId 为 0，说明还在授权中
+	if v.UserId == 0 {
+		c.JSON(http.StatusOK, gin.H{"message": "Authorization in progress, please login and bind"})
+		return nil, nil
+	}
+
+	// 获取用户信息
+	u = service.AllService.UserService.InfoById(v.UserId)
+	if u == nil {
+		response.Error(c, response.TranslateMsg(c, "UserNotFound"))
+		return nil, nil
+	}
+
+	// 删除 OAuth 缓存
+	service.AllService.OauthService.DeleteOauthCache(q.Code)
+
+	// 创建登录日志并生成用户令牌
+	ut = service.AllService.UserService.Login(u, &model.LoginLog{
+		UserId:   u.Id,
+		Client:   v.DeviceType,
+		DeviceId: v.Id,
+		Uuid:     v.Uuid,
+		Ip:       c.ClientIP(),
+		Type:     model.LoginLogTypeOauth,
+		Platform: v.DeviceOs,
+	})
+
+	if ut == nil {
+		response.Error(c, response.TranslateMsg(c, "LoginFailed"))
+		return nil, nil
+	}
+
+	// 返回用户令牌
+	return u, ut
+}
+
 // OidcAuthQuery
 // @Tags Oauth
 // @Summary OidcAuthQuery
@@ -69,33 +120,10 @@ func (o *Oauth) OidcAuth(c *gin.Context) {
 // @Failure 500 {object} response.ErrorResponse
 // @Router /oidc/auth-query [get]
 func (o *Oauth) OidcAuthQuery(c *gin.Context) {
-	q := &api.OidcAuthQuery{}
-	err := c.ShouldBindQuery(q)
-	if err != nil {
-		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
+	u, ut := o.OidcAuthQueryPre(c)
+	if u == nil || ut == nil {
 		return
 	}
-	v := service.AllService.OauthService.GetOauthCache(q.Code)
-	if v == nil {
-		response.Error(c, response.TranslateMsg(c, "OauthExpired"))
-		return
-	}
-	if v.UserId == 0 {
-		//正在授权
-		c.JSON(http.StatusOK, gin.H{})
-		return
-	}
-	u := service.AllService.UserService.InfoById(v.UserId)
-	//fmt.Println("auth success u", u)
-	service.AllService.OauthService.DeleteOauthCache(q.Code)
-	ut := service.AllService.UserService.Login(u, &model.LoginLog{
-		UserId:   u.Id,
-		Client:   v.DeviceType,
-		Uuid:     v.Uuid,
-		Ip:       c.ClientIP(),
-		Type:     model.LoginLogTypeOauth,
-		Platform: v.DeviceOs,
-	})
 	c.JSON(http.StatusOK, apiResp.LoginRes{
 		AccessToken: ut.Token,
 		Type:        "access_token",
@@ -118,142 +146,95 @@ func (o *Oauth) OauthCallback(c *gin.Context) {
 		c.String(http.StatusInternalServerError, response.TranslateParamMsg(c, "ParamIsEmpty", "state"))
 		return
 	}
-
 	cacheKey := state
+	oauthService := service.AllService.OauthService
 	//从缓存中获取
-	v := service.AllService.OauthService.GetOauthCache(cacheKey)
-	if v == nil {
+	oauthCache := oauthService.GetOauthCache(cacheKey)
+	if oauthCache == nil {
 		c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthExpired"))
 		return
 	}
-
-	ty := v.Op
-	ac := v.Action
-	//fmt.Println("ty ac ", ty, ac)
-	if ty == model.OauthTypeGithub {
-		code := c.Query("code")
-		err, userData := service.AllService.OauthService.GithubCallback(code)
-		if err != nil {
-			c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthFailed")+response.TranslateMsg(c, err.Error()))
-			return
-		}
-		if ac == service.OauthActionTypeBind {
-			//fmt.Println("bind", ty, userData)
-			utr := service.AllService.OauthService.UserThirdInfo(ty, strconv.Itoa(userData.Id))
-			if utr.UserId > 0 {
-				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthHasBindOtherUser"))
-				return
-			}
-			//绑定
-			u := service.AllService.UserService.InfoById(v.UserId)
-			if u == nil {
-				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "ItemNotFound"))
-				return
-			}
-			//绑定github
-			err = service.AllService.OauthService.BindGithubUser(strconv.Itoa(userData.Id), userData.Login, v.UserId)
-			if err != nil {
-				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "BindFail"))
-				return
-			}
-			c.String(http.StatusOK, response.TranslateMsg(c, "BindSuccess"))
-			return
-		} else if ac == service.OauthActionTypeLogin {
-			//登录
-			if v.UserId != 0 {
-				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthHasBeenSuccess"))
-				return
-			}
-			u := service.AllService.UserService.InfoByGithubId(strconv.Itoa(userData.Id))
-			if u == nil {
-				oa := service.AllService.OauthService.InfoByOp(ty)
-				if !*oa.AutoRegister {
-					//c.String(http.StatusInternalServerError, "还未绑定用户，请先绑定")
-					v.ThirdName = userData.Login
-					v.ThirdOpenId = strconv.Itoa(userData.Id)
-					url := global.Config.Rustdesk.ApiServer + "/_admin/#/oauth/bind/" + cacheKey
-					c.Redirect(http.StatusFound, url)
-					return
-				}
-
-				//自动注册
-				u = service.AllService.UserService.RegisterByGithub(userData.Login, strconv.Itoa(userData.Id))
-				if u.Id == 0 {
-					c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthRegisterFailed"))
-					return
-				}
-			}
-
-			v.UserId = u.Id
-			service.AllService.OauthService.SetOauthCache(cacheKey, v, 0)
-			c.String(http.StatusOK, response.TranslateMsg(c, "OauthSuccess"))
-			return
-		}
-
+	op := oauthCache.Op
+	action := oauthCache.Action
+	var user *model.User
+	// 获取用户信息
+	code := c.Query("code")
+	err, oauthUser := oauthService.Callback(code, op)
+	if err != nil {
+		c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthFailed")+response.TranslateMsg(c, err.Error()))
+		return
 	}
+	userId := oauthCache.UserId
+	openid := oauthUser.OpenId
+	if action == service.OauthActionTypeBind {
 
-	if ty == model.OauthTypeGoogle {
-		code := c.Query("code")
-		err, userData := service.AllService.OauthService.GoogleCallback(code)
+		//fmt.Println("bind", ty, userData)
+		// 检查此openid是否已经绑定过
+		utr := oauthService.UserThirdInfo(op, openid)
+		if utr.UserId > 0 {
+			c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthHasBindOtherUser"))
+			return
+		}
+		//绑定
+		user = service.AllService.UserService.InfoById(userId)
+		if user == nil {
+			c.String(http.StatusInternalServerError, response.TranslateMsg(c, "ItemNotFound"))
+			return
+		}
+		//绑定
+		err := oauthService.BindOauthUser(userId, oauthUser, op)
 		if err != nil {
-			c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthFailed")+response.TranslateMsg(c, err.Error()))
+			c.String(http.StatusInternalServerError, response.TranslateMsg(c, "BindFail"))
 			return
 		}
-		//将空格替换成_
-		googleName := strings.Replace(userData.Name, " ", "_", -1)
-		if ac == service.OauthActionTypeBind {
-			//fmt.Println("bind", ty, userData)
-			utr := service.AllService.OauthService.UserThirdInfo(ty, userData.Email)
-			if utr.UserId > 0 {
-				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthHasBindOtherUser"))
+		c.String(http.StatusOK, response.TranslateMsg(c, "BindSuccess"))
+		return
+
+	} else if action == service.OauthActionTypeLogin {
+		//登录
+		if userId != 0 {
+			c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthHasBeenSuccess"))
+			return
+		}
+		user = service.AllService.UserService.InfoByOauthId(op, openid)
+		if user == nil {
+			oauthConfig := oauthService.InfoByOp(op)
+			if !*oauthConfig.AutoRegister {
+				//c.String(http.StatusInternalServerError, "还未绑定用户，请先绑定")
+				oauthCache.UpdateFromOauthUser(oauthUser)
+				url := global.Config.Rustdesk.ApiServer + "/_admin/#/oauth/bind/" + cacheKey
+				c.Redirect(http.StatusFound, url)
 				return
 			}
-			//绑定
-			u := service.AllService.UserService.InfoById(v.UserId)
-			if u == nil {
-				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "ItemNotFound"))
-				return
-			}
-			//绑定
-			err = service.AllService.OauthService.BindGoogleUser(userData.Email, googleName, v.UserId)
+
+			//自动注册
+			err, user = service.AllService.UserService.RegisterByOauth(oauthUser, op)
 			if err != nil {
-				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "BindFail"))
+				c.String(http.StatusInternalServerError, response.TranslateMsg(c, err.Error()))
 				return
 			}
-			c.String(http.StatusOK, response.TranslateMsg(c, "BindSuccess"))
-			return
-		} else if ac == service.OauthActionTypeLogin {
-			if v.UserId != 0 {
-				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthHasBeenSuccess"))
-				return
-			}
-			u := service.AllService.UserService.InfoByGoogleEmail(userData.Email)
-			if u == nil {
-				oa := service.AllService.OauthService.InfoByOp(ty)
-				if !*oa.AutoRegister {
-					//c.String(http.StatusInternalServerError, "还未绑定用户，请先绑定")
-
-					v.ThirdName = googleName
-					v.ThirdOpenId = userData.Email
-					url := global.Config.Rustdesk.ApiServer + "/_admin/#/oauth/bind/" + cacheKey
-					c.Redirect(http.StatusFound, url)
-					return
-				}
-
-				//自动注册
-				u = service.AllService.UserService.RegisterByGoogle(googleName, userData.Email)
-				if u.Id == 0 {
-					c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthRegisterFailed"))
-					return
-				}
-			}
-
-			v.UserId = u.Id
-			service.AllService.OauthService.SetOauthCache(cacheKey, v, 0)
-			c.String(http.StatusOK, response.TranslateMsg(c, "OauthSuccess"))
+		}
+		oauthCache.UserId = user.Id
+		oauthService.SetOauthCache(cacheKey, oauthCache, 0)
+		// 如果是webadmin，登录成功后跳转到webadmin
+		if oauthCache.DeviceType == model.LoginLogClientWebAdmin {
+			/*service.AllService.UserService.Login(u, &model.LoginLog{
+				UserId:   u.Id,
+				Client:   "webadmin",
+				Uuid:     "", //must be empty
+				Ip:       c.ClientIP(),
+				Type:     model.LoginLogTypeOauth,
+				Platform: oauthService.DeviceOs,
+			})*/
+			url := global.Config.Rustdesk.ApiServer + "/_admin/#/"
+			c.Redirect(http.StatusFound, url)
 			return
 		}
+		c.String(http.StatusOK, response.TranslateMsg(c, "OauthSuccess"))
+		return
+	} else {
+		c.String(http.StatusInternalServerError, response.TranslateMsg(c, "ParamsError"))
+		return
 	}
-	c.String(http.StatusInternalServerError, response.TranslateMsg(c, "SystemError"))
 
 }

http/controller/api/webClient.go

@@ -85,3 +85,23 @@ func (i *WebClient) SharedPeer(c *gin.Context) {
 		"peer":      pp,
 	})
 }
+
+// ServerConfigV2 服务配置
+// @Tags WEBCLIENT_V2
+// @Summary 服务配置
+// @Description 服务配置,给webclient提供api-server
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /server-config-v2 [get]
+// @Security token
+func (i *WebClient) ServerConfigV2(c *gin.Context) {
+	response.Success(
+		c,
+		gin.H{
+			"id_server": global.Config.Rustdesk.IdServer,
+			"key":       global.Config.Rustdesk.Key,
+		},
+	)
+}

http/controller/web/index.go

@@ -17,6 +17,8 @@ func (i *Index) ConfigJs(c *gin.Context) {
 
 	tmp := `
 localStorage.setItem('api-server', "` + apiServer + `")
+const ws2_prefix = 'wc-'
+localStorage.setItem(ws2_prefix+'api-server', "` + apiServer + `")
 `
 	c.String(200, tmp)
 }

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/addressBook.go

@@ -122,3 +122,14 @@ type AddressBookCollectionRuleQuery struct {
 	IsMy         int `form:"is_my"`
 	PageQuery
 }
+
+type BatchCreateFromPeersForm struct {
+	CollectionId uint     `json:"collection_id"`
+	PeerIds      []uint   `json:"peer_ids"`
+	Tags         []string `json:"tags"`
+	UserId       uint     `json:"user_id"`
+}
+type BatchUpdateTagsForm struct {
+	RowIds []uint   `json:"row_ids"`
+	Tags   []string `json:"tags"`
+}

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

@@ -4,6 +4,7 @@ type Login struct {
 	Username string `json:"username" validate:"required" label:"用户名"`
 	Password string `json:"password,omitempty" validate:"required" label:"密码"`
 	Platform string `json:"platform" label:"平台"`
+	Captcha  string `json:"captcha,omitempty" label:"验证码"`
 }
 
 type LoginLogQuery struct {
@@ -11,3 +12,11 @@ type LoginLogQuery struct {
 	IsMy   int `form:"is_my"`
 	PageQuery
 }
+type LoginTokenQuery struct {
+	UserId int `form:"user_id"`
+	PageQuery
+}
+
+type LoginLogIds struct {
+	Ids []uint `json:"ids" validate:"required"`
+}

http/request/admin/oauth.go

@@ -1,6 +1,8 @@
 package admin
 
-import "Gwen/model"
+import (
+	"Gwen/model"
+)
 
 type BindOauthForm struct {
 	Op string `json:"op" binding:"required"`
@@ -13,21 +15,27 @@ type UnBindOauthForm struct {
 	Op string `json:"op" binding:"required"`
 }
 type OauthForm struct {
-	Id           uint   `json:"id"`
-	Op           string `json:"op" validate:"required"`
-	ClientId     string `json:"client_id" validate:"required"`
-	ClientSecret string `json:"client_secret" validate:"required"`
-	RedirectUrl  string `json:"redirect_url" validate:"required"`
-	AutoRegister *bool  `json:"auto_register"`
+	Id           uint   			`json:"id"`
+	Op           string 			`json:"op" validate:"omitempty"`
+	OauthType    string 			`json:"oauth_type" validate:"required"`
+	Issuer	     string 			`json:"issuer" validate:"omitempty,url"`
+	Scopes	   	 string 			`json:"scopes" validate:"omitempty"`
+	ClientId     string 			`json:"client_id" validate:"required"`
+	ClientSecret string 			`json:"client_secret" validate:"required"`
+	RedirectUrl  string 			`json:"redirect_url" validate:"required"`
+	AutoRegister *bool  			`json:"auto_register"`
 }
 
 func (of *OauthForm) ToOauth() *model.Oauth {
 	oa := &model.Oauth{
 		Op:           of.Op,
+		OauthType:	  of.OauthType,
 		ClientId:     of.ClientId,
 		ClientSecret: of.ClientSecret,
 		RedirectUrl:  of.RedirectUrl,
 		AutoRegister: of.AutoRegister,
+		Issuer:       of.Issuer,
+		Scopes:       of.Scopes,
 	}
 	oa.Id = of.Id
 	return oa

http/request/admin/peer.go

@@ -38,6 +38,7 @@ type PeerQuery struct {
 	TimeAgo  int    `json:"time_ago" form:"time_ago"`
 	Id       string `json:"id" form:"id"`
 	Hostname string `json:"hostname" form:"hostname"`
+	Uuids    string `json:"uuids" form:"uuids"`
 }
 
 type SimpleDataQuery struct {

http/request/admin/shareRecord.go

@@ -0,0 +1,15 @@
+package admin
+
+type ShareRecordQuery struct {
+	UserId uint `json:"user_id" form:"user_id"`
+	PageQuery
+}
+
+type ShareRecordForm struct {
+	Id     uint `json:"id" form:"id"`
+	UserId uint `json:"user_id" form:"user_id"`
+}
+
+type PeerShareRecordBatchDeleteForm struct {
+	Ids []uint `json:"ids" validate:"required"`
+}

http/request/admin/user.go

@@ -6,7 +6,8 @@ import (
 
 type UserForm struct {
 	Id       uint   `json:"id"`
-	Username string `json:"username" validate:"required,gte=4,lte=10"`
+	Username string `json:"username" validate:"required,gte=2,lte=32"`
+	Email    string `json:"email"` //validate:"required,email" email不强制
 	//Password string           `json:"password" validate:"required,gte=4,lte=20"`
 	Nickname string           `json:"nickname"`
 	Avatar   string           `json:"avatar"`
@@ -19,6 +20,7 @@ func (uf *UserForm) FromUser(user *model.User) *UserForm {
 	uf.Id = user.Id
 	uf.Username = user.Username
 	uf.Nickname = user.Nickname
+	uf.Email = user.Email
 	uf.Avatar = user.Avatar
 	uf.GroupId = user.GroupId
 	uf.IsAdmin = user.IsAdmin
@@ -30,6 +32,7 @@ func (uf *UserForm) ToUser() *model.User {
 	user.Id = uf.Id
 	user.Username = uf.Username
 	user.Nickname = uf.Nickname
+	user.Email = uf.Email
 	user.Avatar = uf.Avatar
 	user.GroupId = uf.GroupId
 	user.IsAdmin = uf.IsAdmin
@@ -48,14 +51,25 @@ type UserQuery struct {
 }
 type UserPasswordForm struct {
 	Id       uint   `json:"id" validate:"required"`
-	Password string `json:"password" validate:"required,gte=4,lte=20"`
+	Password string `json:"password" validate:"required,gte=4,lte=32"`
 }
 
 type ChangeCurPasswordForm struct {
-	OldPassword string `json:"old_password" validate:"required,gte=4,lte=20"`
-	NewPassword string `json:"new_password" validate:"required,gte=4,lte=20"`
+	OldPassword string `json:"old_password" validate:"required,gte=4,lte=32"`
+	NewPassword string `json:"new_password" validate:"required,gte=4,lte=32"`
 }
 type GroupUsersQuery struct {
 	IsMy   int  `json:"is_my"`
 	UserId uint `json:"user_id"`
 }
+
+type RegisterForm struct {
+	Username        string `json:"username" validate:"required,gte=2,lte=32"`
+	Email           string `json:"email"` // validate:"required,email"
+	Password        string `json:"password" validate:"required,gte=4,lte=32"`
+	ConfirmPassword string `json:"confirm_password" validate:"required,gte=4,lte=32"`
+}
+
+type UserTokenBatchDeleteForm struct {
+	Ids []uint `json:"ids" validate:"required"`
+}

http/request/api/user.go

@@ -34,8 +34,8 @@ type LoginForm struct {
 	Id         string            `json:"id"  label:"id"`
 	Type       string            `json:"type"  label:"type"`
 	Uuid       string            `json:"uuid"  label:"uuid"`
-	Username   string            `json:"username" validate:"required,gte=4,lte=10" label:"用户名"`
-	Password   string            `json:"password,omitempty" validate:"gte=4,lte=20" label:"密码"`
+	Username   string            `json:"username" validate:"required,gte=2,lte=32" label:"用户名"`
+	Password   string            `json:"password,omitempty" validate:"gte=4,lte=32" label:"密码"`
 }
 
 type UserListQuery struct {

http/response/admin/user.go

@@ -4,19 +4,28 @@ import "Gwen/model"
 
 type LoginPayload struct {
 	Username   string   `json:"username"`
+	Email      string   `json:"email"`
+	Avatar     string   `json:"avatar"`
 	Token      string   `json:"token"`
 	RouteNames []string `json:"route_names"`
 	Nickname   string   `json:"nickname"`
 }
 
+func (lp *LoginPayload) FromUser(user *model.User) {
+	lp.Username = user.Username
+	lp.Email = user.Email
+	lp.Avatar = user.Avatar
+	lp.Nickname = user.Nickname
+}
+
 var UserRouteNames = []string{
-	"MyTagList", "MyAddressBookList", "MyInfo", "MyAddressBookCollection",
+	"MyTagList", "MyAddressBookList", "MyInfo", "MyAddressBookCollection", "MyPeer", "MyShareRecordList",
 }
 var AdminRouteNames = []string{"*"}
 
 type UserOauthItem struct {
-	ThirdType string `json:"third_type"`
-	Status    int    `json:"status"`
+	Op     string `json:"op"`
+	Status int    `json:"status"`
 }
 
 type GroupUsersPayload struct {

http/response/api/user.go

@@ -29,6 +29,7 @@ type UserPayload struct {
 
 func (up *UserPayload) FromUser(user *model.User) *UserPayload {
 	up.Name = user.Username
+	up.Email = user.Email
 	up.IsAdmin = user.IsAdmin
 	up.Status = int(user.Status)
 	up.Info = map[string]interface{}{}

http/router/admin.go

@@ -2,7 +2,9 @@ package router
 
 import (
 	_ "Gwen/docs/admin"
+	"Gwen/global"
 	"Gwen/http/controller/admin"
+	"Gwen/http/controller/admin/my"
 	"Gwen/http/middleware"
 	"github.com/gin-gonic/gin"
 	swaggerFiles "github.com/swaggo/files"
@@ -13,11 +15,13 @@ func Init(g *gin.Engine) {
 
 	//swagger
 	//g.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
-	g.GET("/admin/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler, ginSwagger.InstanceName("admin")))
+	if global.Config.App.ShowSwagger == 1 {
+		g.GET("/admin/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler, ginSwagger.InstanceName("admin")))
+	}
 
 	adg := g.Group("/api/admin")
 	LoginBind(adg)
-
+	adg.POST("/user/register", (&admin.User{}).Register)
 	adg.Use(middleware.AdminAuth())
 	//FileBind(adg)
 	UserBind(adg)
@@ -30,9 +34,17 @@ func Init(g *gin.Engine) {
 	AuditBind(adg)
 	AddressBookCollectionBind(adg)
 	AddressBookCollectionRuleBind(adg)
-	rs := &admin.Rustdesk{}
-	adg.GET("/server-config", rs.ServerConfig)
-	adg.GET("/app-config", rs.AppConfig)
+	UserTokenBind(adg)
+	ConfigBind(adg)
+
+	//deprecated by ConfigBind
+	//rs := &admin.Rustdesk{}
+	//adg.GET("/server-config", rs.ServerConfig)
+	//adg.GET("/app-config", rs.AppConfig)
+	//deprecated end
+
+	ShareRecordBind(adg)
+	MyBind(adg)
 
 	//访问静态文件
 	//g.StaticFS("/upload", http.Dir(global.Config.Gin.ResourcesPath+"/upload"))
@@ -40,7 +52,11 @@ func Init(g *gin.Engine) {
 func LoginBind(rg *gin.RouterGroup) {
 	cont := &admin.Login{}
 	rg.POST("/login", cont.Login)
+	rg.GET("/captcha", cont.Captcha)
 	rg.POST("/logout", cont.Logout)
+	rg.GET("/login-options", cont.LoginOptions)
+	rg.POST("/oidc/auth", cont.OidcAuth)
+	rg.GET("/oidc/auth-query", cont.OidcAuthQuery)
 }
 
 func UserBind(rg *gin.RouterGroup) {
@@ -50,6 +66,7 @@ func UserBind(rg *gin.RouterGroup) {
 		aR.GET("/current", cont.Current)
 		aR.POST("/changeCurPwd", cont.ChangeCurPwd)
 		aR.POST("/myOauth", cont.MyOauth)
+		//aR.GET("/myPeer", cont.MyPeer)
 		aR.POST("/groupUsers", cont.GroupUsers)
 	}
 	aRP := rg.Group("/user").Use(middleware.AdminPrivilege())
@@ -77,7 +94,7 @@ func GroupBind(rg *gin.RouterGroup) {
 }
 
 func TagBind(rg *gin.RouterGroup) {
-	aR := rg.Group("/tag")
+	aR := rg.Group("/tag").Use(middleware.AdminPrivilege())
 	{
 		cont := &admin.Tag{}
 		aR.GET("/list", cont.List)
@@ -92,19 +109,23 @@ func AddressBookBind(rg *gin.RouterGroup) {
 	aR := rg.Group("/address_book")
 	{
 		cont := &admin.AddressBook{}
-		aR.GET("/list", cont.List)
-		aR.GET("/detail/:id", cont.Detail)
-		aR.POST("/create", cont.Create)
-		aR.POST("/update", cont.Update)
-		aR.POST("/delete", cont.Delete)
 		aR.POST("/shareByWebClient", cont.ShareByWebClient)
 
 		arp := aR.Use(middleware.AdminPrivilege())
+		arp.GET("/list", cont.List)
+		//arp.GET("/detail/:id", cont.Detail)
+		arp.POST("/create", cont.Create)
+		arp.POST("/update", cont.Update)
+		arp.POST("/delete", cont.Delete)
 		arp.POST("/batchCreate", cont.BatchCreate)
+		arp.POST("/batchCreateFromPeers", cont.BatchCreateFromPeers)
+
 	}
 }
 func PeerBind(rg *gin.RouterGroup) {
 	aR := rg.Group("/peer")
+	aR.POST("/simpleData", (&admin.Peer{}).SimpleData)
+	aR.Use(middleware.AdminPrivilege())
 	{
 		cont := &admin.Peer{}
 		aR.GET("/list", cont.List)
@@ -112,10 +133,7 @@ func PeerBind(rg *gin.RouterGroup) {
 		aR.POST("/create", cont.Create)
 		aR.POST("/update", cont.Update)
 		aR.POST("/delete", cont.Delete)
-		aR.POST("/simpleData", cont.SimpleData)
-
-		arp := aR.Use(middleware.AdminPrivilege())
-		arp.POST("/batchDelete", cont.BatchDelete)
+		aR.POST("/batchDelete", cont.BatchDelete)
 	}
 }
 
@@ -146,18 +164,21 @@ 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")
+	aR := rg.Group("/address_book_collection").Use(middleware.AdminPrivilege())
 	{
 		cont := &admin.AddressBookCollection{}
 		aR.GET("/list", cont.List)
@@ -169,7 +190,7 @@ func AddressBookCollectionBind(rg *gin.RouterGroup) {
 
 }
 func AddressBookCollectionRuleBind(rg *gin.RouterGroup) {
-	aR := rg.Group("/address_book_collection_rule")
+	aR := rg.Group("/address_book_collection_rule").Use(middleware.AdminPrivilege())
 	{
 		cont := &admin.AddressBookCollectionRule{}
 		aR.GET("/list", cont.List)
@@ -179,6 +200,20 @@ func AddressBookCollectionRuleBind(rg *gin.RouterGroup) {
 		aR.POST("/delete", cont.Delete)
 	}
 }
+func UserTokenBind(rg *gin.RouterGroup) {
+	aR := rg.Group("/user_token").Use(middleware.AdminPrivilege())
+	cont := &admin.UserToken{}
+	aR.GET("/list", cont.List)
+	aR.POST("/delete", cont.Delete)
+	aR.POST("/batchDelete", cont.BatchDelete)
+}
+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) {
@@ -192,3 +227,62 @@ func FileBind(rg *gin.RouterGroup) {
 		aR.POST("/upload", cont.Upload)
 	}
 }*/
+
+func MyBind(rg *gin.RouterGroup) {
+	{
+		cont := &my.ShareRecord{}
+		rg.GET("/my/share_record/list", cont.List)
+		rg.POST("/my/share_record/delete", cont.Delete)
+		rg.POST("/my/share_record/batchDelete", cont.BatchDelete)
+	}
+
+	{
+		cont := &my.AddressBook{}
+		rg.GET("/my/address_book/list", cont.List)
+		rg.POST("/my/address_book/create", cont.Create)
+		rg.POST("/my/address_book/update", cont.Update)
+		rg.POST("/my/address_book/delete", cont.Delete)
+		rg.POST("/my/address_book/batchCreateFromPeers", cont.BatchCreateFromPeers)
+		rg.POST("/my/address_book/batchUpdateTags", cont.BatchUpdateTags)
+	}
+
+	{
+		cont := &my.Tag{}
+		rg.GET("/my/tag/list", cont.List)
+		rg.POST("/my/tag/create", cont.Create)
+		rg.POST("/my/tag/update", cont.Update)
+		rg.POST("/my/tag/delete", cont.Delete)
+	}
+
+	{
+		cont := &my.AddressBookCollection{}
+		rg.GET("/my/address_book_collection/list", cont.List)
+		rg.POST("/my/address_book_collection/create", cont.Create)
+		rg.POST("/my/address_book_collection/update", cont.Update)
+		rg.POST("/my/address_book_collection/delete", cont.Delete)
+	}
+
+	{
+		cont := &my.AddressBookCollectionRule{}
+		rg.GET("/my/address_book_collection_rule/list", cont.List)
+		rg.POST("/my/address_book_collection_rule/create", cont.Create)
+		rg.POST("/my/address_book_collection_rule/update", cont.Update)
+		rg.POST("/my/address_book_collection_rule/delete", cont.Delete)
+	}
+	{
+		cont := &my.Peer{}
+		rg.GET("/my/peer/list", cont.List)
+
+	}
+}
+
+func ShareRecordBind(rg *gin.RouterGroup) {
+	aR := rg.Group("/share_record").Use(middleware.AdminPrivilege())
+	{
+		cont := &admin.ShareRecord{}
+		aR.GET("/list", cont.List)
+		aR.POST("/delete", cont.Delete)
+		aR.POST("/batchDelete", cont.BatchDelete)
+	}
+
+}

http/router/api.go

@@ -15,7 +15,9 @@ func ApiInit(g *gin.Engine) {
 
 	//g.Use(middleware.Cors())
 	//swagger
-	g.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler, ginSwagger.InstanceName("api")))
+	if global.Config.App.ShowSwagger == 1 {
+		g.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler, ginSwagger.InstanceName("api")))
+	}
 
 	frg := g.Group("/api")
 
@@ -121,6 +123,7 @@ func WebClientRoutes(frg *gin.RouterGroup) {
 	}
 	{
 		frg.POST("/server-config", middleware.RustAuth(), w.ServerConfig)
+		frg.POST("/server-config-v2", middleware.RustAuth(), w.ServerConfigV2)
 	}
 
 }

lib/lock/local_test.go

@@ -51,30 +51,22 @@ func TestLocal_GetLock(t *testing.T) {
 func TestLocal_Lock(t *testing.T) {
 	l := NewLocal()
 	wg := sync.WaitGroup{}
-	wg.Add(3)
+	m := 10
+	wg.Add(m)
 	i := 0
-	go func() {
-		l.Lock("key")
-		fmt.Println("l1", i)
-		i++
-		l.UnLock("key")
-		wg.Done()
-	}()
-	go func() {
-		l.Lock("key")
-		fmt.Println("l2", i)
-		i++
-		l.UnLock("key")
-		wg.Done()
-	}()
-	go func() {
-		l.Lock("key")
-		fmt.Println("l3", i)
-		i++
-		l.UnLock("key")
-		wg.Done()
-	}()
+	for j := 0; j < m; j++ {
+		go func() {
+			l.Lock("key")
+			//fmt.Println(j, i)
+			i++
+			fmt.Println(j, i)
+			l.UnLock("key")
+			wg.Done()
+		}()
+	}
+
 	wg.Wait()
+	fmt.Println(i)
 
 }
 func TestSyncMap(t *testing.T) {

model/loginLog.go

@@ -2,16 +2,23 @@ package model
 
 type LoginLog struct {
 	IdModel
-	UserId   uint   `json:"user_id"`
-	Client   string `json:"client"` //webadmin,webclient,app,
-	Uuid     string `json:"uuid"`
-	Ip       string `json:"ip"`
-	Type     string `json:"type"`     //account,oauth
-	Platform string `json:"platform"` //windows,linux,mac,android,ios
-
+	UserId      uint   `json:"user_id" gorm:"default:0;not null;"`
+	Client      string `json:"client"` //webadmin,webclient,app,
+	DeviceId	string `json:"device_id"`
+	Uuid        string `json:"uuid"`
+	Ip          string `json:"ip"`
+	Type        string `json:"type"`     //account,oauth
+	Platform    string `json:"platform"` //windows,linux,mac,android,ios
+	UserTokenId uint   `json:"user_token_id" gorm:"default:0;not null;"`
 	TimeModel
 }
 
+const (
+	LoginLogClientWebAdmin = "webadmin"
+	LoginLogClientWeb      = "webclient"
+	LoginLogClientApp      = "app"
+)
+
 const (
 	LoginLogTypeAccount = "account"
 	LoginLogTypeOauth   = "oauth"

model/oauth.go

@@ -1,20 +1,145 @@
 package model
 
+import (
+	"errors"
+	"strconv"
+	"strings"
+)
+
+const OIDC_DEFAULT_SCOPES = "openid,profile,email"
+
+const (
+	// make sure the value shouldbe lowercase
+	OauthTypeGithub  string = "github"
+	OauthTypeGoogle  string = "google"
+	OauthTypeOidc    string = "oidc"
+	OauthTypeWebauth string = "webauth"
+)
+
+// Validate the oauth type
+func ValidateOauthType(oauthType string) error {
+	switch oauthType {
+	case OauthTypeGithub, OauthTypeGoogle, OauthTypeOidc, OauthTypeWebauth:
+		return nil
+	default:
+		return errors.New("invalid Oauth type")
+	}
+}
+
+const (
+	UserEndpointGithub string = "https://api.github.com/user"
+	IssuerGoogle       string = "https://accounts.google.com"
+)
+
 type Oauth struct {
 	IdModel
 	Op           string `json:"op"`
+	OauthType    string `json:"oauth_type"`
 	ClientId     string `json:"client_id"`
 	ClientSecret string `json:"client_secret"`
 	RedirectUrl  string `json:"redirect_url"`
 	AutoRegister *bool  `json:"auto_register"`
+	Scopes       string `json:"scopes"`
+	Issuer       string `json:"issuer"`
 	TimeModel
 }
 
-const (
-	OauthTypeGithub  = "github"
-	OauthTypeGoogle  = "google"
-	OauthTypeWebauth = "webauth"
-)
+// Helper function to format oauth info, it's used in the update and create method
+func (oa *Oauth) FormatOauthInfo() error {
+	oauthType := strings.TrimSpace(oa.OauthType)
+	err := ValidateOauthType(oa.OauthType)
+	if err != nil {
+		return err
+	}
+	switch oauthType {
+	case OauthTypeGithub:
+		oa.Op = OauthTypeGithub
+	case OauthTypeGoogle:
+		oa.Op = OauthTypeGoogle
+	}
+	// check if the op is empty, set the default value
+	op := strings.TrimSpace(oa.Op)
+	if op == "" && oauthType == OauthTypeOidc {
+		oa.Op = OauthTypeOidc
+	}
+	// check the issuer, if the oauth type is google and the issuer is empty, set the issuer to the default value
+	issuer := strings.TrimSpace(oa.Issuer)
+	// If the oauth type is google and the issuer is empty, set the issuer to the default value
+	if oauthType == OauthTypeGoogle && issuer == "" {
+		oa.Issuer = IssuerGoogle
+	}
+	return nil
+}
+
+type OauthUser struct {
+	OpenId        string `json:"open_id" gorm:"not null;index"`
+	Name          string `json:"name"`
+	Username      string `json:"username"`
+	Email         string `json:"email"`
+	VerifiedEmail bool   `json:"verified_email,omitempty"`
+	Picture       string `json:"picture,omitempty"`
+}
+
+func (ou *OauthUser) ToUser(user *User, overideUsername bool) {
+	if overideUsername {
+		user.Username = ou.Username
+	}
+	user.Email = ou.Email
+	user.Nickname = ou.Name
+	user.Avatar = ou.Picture
+}
+
+type OauthUserBase struct {
+	Name  string `json:"name"`
+	Email string `json:"email"`
+}
+
+type OidcUser struct {
+	OauthUserBase
+	Sub               string `json:"sub"`
+	VerifiedEmail     bool   `json:"email_verified"`
+	PreferredUsername string `json:"preferred_username"`
+	Picture           string `json:"picture"`
+}
+
+func (ou *OidcUser) ToOauthUser() *OauthUser {
+	var username string
+	// 使用 PreferredUsername，如果不存在，降级到 Email 前缀
+	if ou.PreferredUsername != "" {
+		username = ou.PreferredUsername
+	} else {
+		username = strings.ToLower(ou.Email)
+	}
+
+	return &OauthUser{
+		OpenId:        ou.Sub,
+		Name:          ou.Name,
+		Username:      username,
+		Email:         ou.Email,
+		VerifiedEmail: ou.VerifiedEmail,
+		Picture:       ou.Picture,
+	}
+}
+
+type GithubUser struct {
+	OauthUserBase
+	Id            int    `json:"id"`
+	Login         string `json:"login"`
+	AvatarUrl     string `json:"avatar_url"`
+	VerifiedEmail bool   `json:"verified_email"`
+}
+
+func (gu *GithubUser) ToOauthUser() *OauthUser {
+	username := strings.ToLower(gu.Login)
+	return &OauthUser{
+		OpenId:        strconv.Itoa(gu.Id),
+		Name:          gu.Name,
+		Username:      username,
+		Email:         gu.Email,
+		VerifiedEmail: gu.VerifiedEmail,
+		Picture:       gu.AvatarUrl,
+	}
+}
 
 type OauthList struct {
 	Oauths []*Oauth `json:"list"`

model/shareRecord.go

@@ -10,3 +10,9 @@ type ShareRecord struct {
 	Expire       int64  `json:"expire" gorm:"default:0;not null;"`
 	TimeModel
 }
+
+// ShareRecordList 分享记录列表
+type ShareRecordList struct {
+	ShareRecords []*ShareRecord `json:"list,omitempty"`
+	Pagination
+}

model/user.go

@@ -2,7 +2,9 @@ package model
 
 type User struct {
 	IdModel
-	Username string     `json:"username" gorm:"default:'';not null;index,unique"`
+	Username string `json:"username" gorm:"default:'';not null;uniqueIndex"`
+	Email    string `json:"email" gorm:"default:'';not null;index"`
+	// Email	string     	`json:"email" `
 	Password string     `json:"-" gorm:"default:'';not null;"`
 	Nickname string     `json:"nickname" gorm:"default:'';not null;"`
 	Avatar   string     `json:"avatar" gorm:"default:'';not null;"`
@@ -12,6 +14,15 @@ type User struct {
 	TimeModel
 }
 
+// BeforeSave 钩子用于确保 email 字段有合理的默认值
+//func (u *User) BeforeSave(tx *gorm.DB) (err error) {
+//	// 如果 email 为空，设置为默认值
+//	if u.Email == "" {
+//		u.Email = fmt.Sprintf("%s@example.com", u.Username)
+//	}
+//	return nil
+//}
+
 type UserList struct {
 	Users []*User `json:"list,omitempty"`
 	Pagination

model/userThird.go

@@ -1,12 +1,26 @@
 package model
 
+import (
+	"strings"
+)
+
 type UserThird struct {
 	IdModel
-	UserId     uint   `json:"user_id" gorm:"not null;index"`
-	OpenId     string `json:"open_id" gorm:"not null;index"`
-	UnionId    string `json:"union_id" gorm:"not null;"`
-	ThirdType  string `json:"third_type" gorm:"not null;"`
-	ThirdEmail string `json:"third_email"`
-	ThirdName  string `json:"third_name"`
+	UserId uint `json:"user_id" gorm:"not null;index"`
+	OauthUser
+	UnionId string `json:"union_id" gorm:"default:'';not null;"`
+	// OauthType  	   	string 		`json:"oauth_type" gorm:"not null;"`
+	ThirdType string `json:"third_type" gorm:"default:'';not null;"` //deprecated
+	OauthType string `json:"oauth_type" gorm:"default:'';not null;"`
+	Op        string `json:"op" gorm:"default:'';not null;"`
 	TimeModel
 }
+
+func (u *UserThird) FromOauthUser(userId uint, oauthUser *OauthUser, oauthType string, op string) {
+	u.UserId = userId
+	u.OauthUser = *oauthUser
+	u.OauthType = oauthType
+	u.Op = op
+	// make sure email is lower case
+	u.Email = strings.ToLower(u.Email)
+}

model/userToken.go

@@ -2,8 +2,15 @@ package model
 
 type UserToken struct {
 	IdModel
-	UserId    uint   `json:"user_id" gorm:"default:0;not null;index"`
-	Token     string `json:"token" gorm:"default:'';not null;index"`
-	ExpiredAt int64  `json:"expired_at" gorm:"default:0;not null;"`
+	UserId    	uint   `json:"user_id" gorm:"default:0;not null;index"`
+	DeviceUuid 	string `json:"device_uuid" gorm:"default:'';omitempty;"`
+	DeviceId	string `json:"device_id" gorm:"default:'';omitempty;"`
+	Token     	string `json:"token" gorm:"default:'';not null;index"`
+	ExpiredAt 	int64  `json:"expired_at" gorm:"default:0;not null;"`
 	TimeModel
 }
+
+type UserTokenList struct {
+	UserTokens []UserToken `json:"list"`
+	Pagination
+}

resources/i18n/en.toml

@@ -119,3 +119,17 @@ other = "Default Group"
 description = "Share group"
 one = "Share Group"
 other = "Share Group"
+[RegisterClosed]
+description = "Register closed."
+one = "Register closed."
+other = "Register closed."
+
+[CaptchaRequired]
+description = "Captcha required."
+one = "Captcha required."
+other = "Captcha required."
+
+[CaptchaError]
+description = "Captcha error."
+one = "Captcha error."
+other = "Captcha error."

resources/i18n/es.toml

@@ -0,0 +1,144 @@
+[Test]
+description = "test"
+one = "prueba1"
+other = "Prueba2 {{.P0}}"
+
+[ParamsError]
+description = "Params validation failed."
+one = "La validación de los parámetros falló."
+other = "La validación de los parámetros falló."
+
+[OperationFailed]
+description = "OperationFailed."
+one = "La operación falló."
+other = "La operación falló."
+
+[OperationSuccess]
+description = "OperationSuccess."
+one = "La operación fue exitosa."
+other = "La operación fue exitosa."
+
+[ItemExists]
+description = "Item already exists."
+one = "El elemento ya existe."
+other = "El elemento ya existe."
+
+[ItemNotFound]
+description = "Item not found."
+one = "El elemento no fue encontrado."
+other = "El elemento no fue encontrado."
+
+[NoAccess]
+description = "No access."
+one = "Sin acceso."
+other = "Sin acceso."
+
+[UsernameOrPasswordError]
+description = "Username or password error."
+one = "Error de usuario o contraseña."
+other = "Error de usuario o contraseña."
+
+[SystemError]
+description = "System error."
+one = "Error del sistema."
+other = "Error del sistema."
+
+[ConfigNotFound]
+description = "Config not found."
+one = "Configuración no encontrada."
+other = "Configuración no encontrada."
+
+[OauthExpired]
+description = "Oauth expired."
+one = "Oauth expirado, por favor intente nuevamente."
+other = "Oauth expirado, por favor intente nuevamente."
+
+[OauthFailed]
+description = "Oauth failed."
+one = "Oauth falló."
+other = "Oauth falló."
+
+[OauthHasBindOtherUser]
+description = "Oauth has bind other user."
+one = "Oauth está vinculado a otro usuario."
+other = "Oauth está vinculado a otro usuario."
+
+[ParamIsEmpty]
+description = "Param is empty."
+one = "{{.P0}} está vacío."
+other = "{{.P0}} está vacío."
+
+[BindFail]
+description = "Bind fail."
+one = "Fallo al vincular."
+other = "Fallo al vincular."
+
+[BindSuccess]
+description = "Bind success."
+one = "Vinculación exitosa."
+other = "Vinculación exitosa."
+
+[OauthHasBeenSuccess]
+description = "Oauth has been success."
+one = "Oauth fue exitoso."
+other = "Oauth fue exitoso."
+
+[OauthSuccess]
+description = "Oauth success."
+one = "Oauth exitoso."
+other = "Oauth exitoso."
+
+[OauthRegisterSuccess]
+description = "Oauth register success."
+one = "Registro de Oauth exitoso."
+other = "Registro de Oauth exitoso."
+
+[OauthRegisterFailed]
+description = "Oauth register failed."
+one = "Registro de Oauth falló."
+other = "Registro de Oauth falló."
+
+[GetOauthTokenError]
+description = "Get oauth token error."
+one = "Error al obtener el token de Oauth."
+other = "Error al obtener el token de Oauth."
+
+[GetOauthUserInfoError]
+description = "Get oauth user info error."
+one = "Error al obtener la información del usuario de Oauth."
+other = "Error al obtener la información del usuario de Oauth."
+
+[DecodeOauthUserInfoError]
+description = "Decode oauth user info error."
+one = "Error al decodificar la información del usuario de Oauth."
+other = "Error al decodificar la información del usuario de Oauth."
+
+[OldPasswordError]
+description = "Old password error."
+one = "Error con la contraseña anterior."
+other = "Error con la contraseña anterior."
+
+[DefaultGroup]
+description = "Default group"
+one = "Grupo predeterminado"
+other = "Grupo predeterminado"
+
+[ShareGroup]
+description = "Share group"
+one = "Grupo compartido"
+other = "Grupo compartido"
+
+[RegisterClosed]
+description = "Register closed."
+one = "Registro cerrado."
+other = "Registro cerrado."
+
+[CaptchaRequired]
+description = "Captcha required."
+one = "Captcha requerido."
+other = "Captcha requerido."
+
+[CaptchaError]
+description = "Captcha error."
+one = "Error de captcha."
+other = "Error de captcha."

resources/i18n/ko.toml

@@ -121,3 +121,18 @@ other = "기본 그룹"
 description = "Share group."
 one = "공유 그룹"
 other = "공유 그룹"
+
+[RegisterClosed]
+description = "Register closed."
+one = "가입이 종료되었습니다."
+other = "가입이 종료되었습니다."
+
+[CaptchaRequired]
+description = "Captcha required."
+one = "Captcha가 필요합니다."
+other = "Captcha가 필요합니다."
+
+[CaptchaError]
+description = "Captcha error."
+one = "Captcha 오류."
+other = "Captcha 오류."

resources/i18n/ru.toml

@@ -127,3 +127,18 @@ other = "Группа по умолчанию"
 description = "Share group."
 one = "Общая группа"
 other = "Общая группа"
+
+[RegisterClosed]
+description = "Register closed."
+one = "Регистрация закрыта."
+other = "Регистрация закрыта."
+
+[CaptchaRequired]
+description = "Captcha required."
+one = "Требуется капча."
+other = "Требуется капча."
+
+[CaptchaError]
+description = "Captcha error."
+one = "Ошибка капчи."
+other = "Ошибка капчи."

resources/i18n/zh_CN.toml

@@ -121,3 +121,17 @@ other = "默认组"
 description = "Share group."
 one = "共享组"
 other = "共享组"
+[RegisterClosed]
+description = "Register closed."
+one = "注册已关闭。"
+other = "注册已关闭。"
+
+[CaptchaRequired]
+description = "Captcha required."
+one = "需要验证码。"
+other = "需要验证码。"
+
+[CaptchaError]
+description = "Captcha error."
+one = "验证码错误。"
+other = "验证码错误。"

resources/web/js/package-lock.json

@@ -1,114 +1,159 @@
 {
   "name": "web_hbb",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@esbuild/linux-loong64": {
+  "packages": {
+    "": {
+      "name": "web_hbb",
+      "version": "1.0.0",
+      "dependencies": {
+        "fast-sha256": "^1.3.0",
+        "libsodium": "^0.7.9",
+        "libsodium-wrappers": "^0.7.9",
+        "pcm-player": "^0.0.11",
+        "ts-proto": "^1.141.1",
+        "wasm-feature-detect": "^1.2.11",
+        "zstddec": "^0.0.2"
+      },
+      "devDependencies": {
+        "typescript": "4.4.4",
+        "vite": "2.8"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
       "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "@protobufjs/aspromise": {
+    "node_modules/@protobufjs/aspromise": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
       "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
     },
-    "@protobufjs/base64": {
+    "node_modules/@protobufjs/base64": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
       "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
     },
-    "@protobufjs/codegen": {
+    "node_modules/@protobufjs/codegen": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
       "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
     },
-    "@protobufjs/eventemitter": {
+    "node_modules/@protobufjs/eventemitter": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
       "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
     },
-    "@protobufjs/fetch": {
+    "node_modules/@protobufjs/fetch": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
       "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
-      "requires": {
+      "dependencies": {
         "@protobufjs/aspromise": "^1.1.1",
         "@protobufjs/inquire": "^1.1.0"
       }
     },
-    "@protobufjs/float": {
+    "node_modules/@protobufjs/float": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
       "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
     },
-    "@protobufjs/inquire": {
+    "node_modules/@protobufjs/inquire": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
       "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
     },
-    "@protobufjs/path": {
+    "node_modules/@protobufjs/path": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
       "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
     },
-    "@protobufjs/pool": {
+    "node_modules/@protobufjs/pool": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
       "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
     },
-    "@protobufjs/utf8": {
+    "node_modules/@protobufjs/utf8": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
       "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
     },
-    "@types/long": {
+    "node_modules/@types/long": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
       "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
     },
-    "@types/node": {
+    "node_modules/@types/node": {
       "version": "18.7.6",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz",
       "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A=="
     },
-    "@types/object-hash": {
+    "node_modules/@types/object-hash": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/@types/object-hash/-/object-hash-1.3.4.tgz",
       "integrity": "sha512-xFdpkAkikBgqBdG9vIlsqffDV8GpvnPEzs0IUtr1v3BEB97ijsFQ4RXVbUZwjFThhB4MDSTUfvmxUD5PGx0wXA=="
     },
-    "case-anything": {
+    "node_modules/case-anything": {
       "version": "2.1.10",
       "resolved": "https://registry.npmjs.org/case-anything/-/case-anything-2.1.10.tgz",
-      "integrity": "sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ=="
+      "integrity": "sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ==",
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
     },
-    "dataloader": {
+    "node_modules/dataloader": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz",
       "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw=="
     },
-    "detect-libc": {
+    "node_modules/detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "dprint-node": {
+    "node_modules/dprint-node": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/dprint-node/-/dprint-node-1.0.7.tgz",
       "integrity": "sha512-NTZOW9A7ipb0n7z7nC3wftvsbceircwVHSgzobJsEQa+7RnOMbhrfX5IflA6CtC4GA63DSAiHYXa4JKEy9F7cA==",
-      "requires": {
+      "dependencies": {
         "detect-libc": "^1.0.3"
       }
     },
-    "esbuild": {
+    "node_modules/esbuild": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
       "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
       "dev": true,
-      "requires": {
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
         "@esbuild/linux-loong64": "0.14.54",
         "esbuild-android-64": "0.14.54",
         "esbuild-android-arm64": "0.14.54",
@@ -132,244 +177,460 @@
         "esbuild-windows-arm64": "0.14.54"
       }
     },
-    "esbuild-android-64": {
+    "node_modules/esbuild-android-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
       "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-android-arm64": {
+    "node_modules/esbuild-android-arm64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
       "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-darwin-64": {
+    "node_modules/esbuild-darwin-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
       "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-darwin-arm64": {
+    "node_modules/esbuild-darwin-arm64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
       "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-freebsd-64": {
+    "node_modules/esbuild-freebsd-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
       "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-freebsd-arm64": {
+    "node_modules/esbuild-freebsd-arm64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
       "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-linux-32": {
+    "node_modules/esbuild-linux-32": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
       "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-linux-64": {
+    "node_modules/esbuild-linux-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
       "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-linux-arm": {
+    "node_modules/esbuild-linux-arm": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
       "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-linux-arm64": {
+    "node_modules/esbuild-linux-arm64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
       "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-linux-mips64le": {
+    "node_modules/esbuild-linux-mips64le": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
       "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
+      "cpu": [
+        "mips64el"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-linux-ppc64le": {
+    "node_modules/esbuild-linux-ppc64le": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
       "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-linux-riscv64": {
+    "node_modules/esbuild-linux-riscv64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
       "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-linux-s390x": {
+    "node_modules/esbuild-linux-s390x": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
       "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-netbsd-64": {
+    "node_modules/esbuild-netbsd-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
       "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-openbsd-64": {
+    "node_modules/esbuild-openbsd-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
       "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-sunos-64": {
+    "node_modules/esbuild-sunos-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
       "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-windows-32": {
+    "node_modules/esbuild-windows-32": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
       "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-windows-64": {
+    "node_modules/esbuild-windows-64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
       "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "esbuild-windows-arm64": {
+    "node_modules/esbuild-windows-arm64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
       "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "optional": true
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "fast-sha256": {
+    "node_modules/fast-sha256": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/fast-sha256/-/fast-sha256-1.3.0.tgz",
       "integrity": "sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ=="
     },
-    "fsevents": {
+    "node_modules/fsevents": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
-      "optional": true
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
     },
-    "function-bind": {
+    "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "has": {
+    "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
       }
     },
-    "is-core-module": {
+    "node_modules/is-core-module": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
       "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "libsodium": {
+    "node_modules/libsodium": {
       "version": "0.7.10",
       "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.10.tgz",
       "integrity": "sha512-eY+z7hDrDKxkAK+QKZVNv92A5KYkxfvIshtBJkmg5TSiCnYqZP3i9OO9whE79Pwgm4jGaoHgkM4ao/b9Cyu4zQ=="
     },
-    "libsodium-wrappers": {
+    "node_modules/libsodium-wrappers": {
       "version": "0.7.10",
       "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz",
       "integrity": "sha512-pO3F1Q9NPLB/MWIhehim42b/Fwb30JNScCNh8TcQ/kIc+qGLQch8ag8wb0keK3EP5kbGakk1H8Wwo7v+36rNQg==",
-      "requires": {
+      "dependencies": {
         "libsodium": "^0.7.0"
       }
     },
-    "long": {
+    "node_modules/long": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
       "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
     },
-    "nanoid": {
+    "node_modules/nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
       "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
     },
-    "object-hash": {
+    "node_modules/object-hash": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
-      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
+      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
+      "engines": {
+        "node": ">= 0.10.0"
+      }
     },
-    "path-parse": {
+    "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "pcm-player": {
+    "node_modules/pcm-player": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pcm-player/-/pcm-player-0.0.11.tgz",
       "integrity": "sha512-+FmX62jiqZa7wDCqSRQ1g3DuU6JNgpymgOLCWhmiE/Lj/M+rOUNqgNwVQX509LdA9dtBtVD3EQQUSp9JqU6upw=="
     },
-    "picocolors": {
+    "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
       "dev": true
     },
-    "postcss": {
+    "node_modules/postcss": {
       "version": "8.4.16",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
       "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
       "dev": true,
-      "requires": {
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "dependencies": {
         "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
       }
     },
-    "protobufjs": {
+    "node_modules/protobufjs": {
       "version": "6.11.3",
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
       "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
-      "requires": {
+      "hasInstallScript": true,
+      "dependencies": {
         "@protobufjs/aspromise": "^1.1.2",
         "@protobufjs/base64": "^1.1.2",
         "@protobufjs/codegen": "^2.0.4",
@@ -383,53 +644,78 @@
         "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
         "long": "^4.0.0"
+      },
+      "bin": {
+        "pbjs": "bin/pbjs",
+        "pbts": "bin/pbts"
       }
     },
-    "resolve": {
+    "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
       "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "rollup": {
+    "node_modules/rollup": {
       "version": "2.77.3",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.3.tgz",
       "integrity": "sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==",
       "dev": true,
-      "requires": {
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
     },
-    "source-map-js": {
+    "node_modules/source-map-js": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
       "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "supports-preserve-symlinks-flag": {
+    "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "ts-poet": {
+    "node_modules/ts-poet": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/ts-poet/-/ts-poet-6.4.1.tgz",
       "integrity": "sha512-AjZEs4h2w4sDfwpHMxQKHrTlNh2wRbM5NRXmLz0RiH+yPGtSQFbe9hBpNocU8vqVNgfh0BIOiXR80xDz3kKxUQ==",
-      "requires": {
+      "dependencies": {
         "dprint-node": "^1.0.7"
       }
     },
-    "ts-proto": {
+    "node_modules/ts-proto": {
       "version": "1.141.1",
       "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.141.1.tgz",
       "integrity": "sha512-1b7Ka6R96FvFZldHnYPTFy4rzwOo+OTpIP1mBFW0dDwq4WWtSkIVlZ+SokOQSC1TiccNshOJwQC9soVyWfQ7Zg==",
-      "requires": {
+      "dependencies": {
         "@types/object-hash": "^1.3.0",
         "case-anything": "^2.1.10",
         "dataloader": "^1.4.0",
@@ -437,42 +723,76 @@
         "protobufjs": "^6.11.3",
         "ts-poet": "^6.2.0",
         "ts-proto-descriptors": "1.7.1"
+      },
+      "bin": {
+        "protoc-gen-ts_proto": "protoc-gen-ts_proto"
       }
     },
-    "ts-proto-descriptors": {
+    "node_modules/ts-proto-descriptors": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.7.1.tgz",
       "integrity": "sha512-oIKUh3K4Xts4v29USGLfUG+2mEk32MsqpgZAOUyUlkrcIdv34yE+k2oZ2Nzngm6cV/JgFdOxRCqeyvmWHuYAyw==",
-      "requires": {
+      "dependencies": {
         "long": "^4.0.0",
         "protobufjs": "^6.8.8"
       }
     },
-    "typescript": {
+    "node_modules/typescript": {
       "version": "4.4.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
       "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
     },
-    "vite": {
+    "node_modules/vite": {
       "version": "2.8.6",
       "resolved": "https://registry.npmjs.org/vite/-/vite-2.8.6.tgz",
       "integrity": "sha512-e4H0QpludOVKkmOsRyqQ7LTcMUDF3mcgyNU4lmi0B5JUbe0ZxeBBl8VoZ8Y6Rfn9eFKYtdXNPcYK97ZwH+K2ug==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "esbuild": "^0.14.14",
-        "fsevents": "~2.3.2",
         "postcss": "^8.4.6",
         "resolve": "^1.22.0",
         "rollup": "^2.59.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": ">=12.2.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      },
+      "peerDependencies": {
+        "less": "*",
+        "sass": "*",
+        "stylus": "*"
+      },
+      "peerDependenciesMeta": {
+        "less": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        }
       }
     },
-    "wasm-feature-detect": {
+    "node_modules/wasm-feature-detect": {
       "version": "1.2.11",
       "resolved": "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.2.11.tgz",
       "integrity": "sha512-HUqwaodrQGaZgz1lZaNioIkog9tkeEJjrM3eq4aUL04whXOVDRc/o2EGb/8kV0QX411iAYWEqq7fMBmJ6dKS6w=="
     },
-    "zstddec": {
+    "node_modules/zstddec": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.0.2.tgz",
       "integrity": "sha512-DCo0oxvcvOTGP/f5FA6tz2Z6wF+FIcEApSTu0zV5sQgn9hoT5lZ9YRAKUraxt9oP7l4e8TnNdi8IZTCX6WCkwA=="

resources/web/js/src/connection.ts

@@ -753,12 +753,22 @@ function getDefaultUri(isRelay: Boolean = false): string {
   const host = localStorage.getItem("custom-rendezvous-server");
   return getrUriFromRs(host || HOST, isRelay);
 }
+/*
+function isHttps() {
+  return window.location.protocol === "https:"
+}
+
+function domain(uri: string) {
+    return uri.indexOf(":") > 0 ? uri.split(":")[0] : uri
+}*/
 
 function getrUriFromRs(
   uri: string,
   isRelay: Boolean = false,
   roffset: number = 0
 ): string {
+    //v2
+  //if (isHttps()) return "wss://" + domain(uri) + "/ws/" + (isRelay ? "relay" : "id");
   if (uri.indexOf(":") > 0) {
     const tmp = uri.split(":");
     const port = parseInt(tmp[1]);

resources/web/js/yarn.lock

@@ -92,10 +92,10 @@ dprint-node@^1.0.7:
   dependencies:
     detect-libc "^1.0.3"
 
-esbuild-linux-64@0.14.54:
+esbuild-windows-64@0.14.54:
   version "0.14.54"
-  resolved "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz"
-  integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==
+  resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz"
+  integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==
 
 esbuild@^0.14.14:
   version "0.14.54"

resources/web2/assets/AssetManifest.bin

@@ -0,0 +1 @@
+

resources/web2/assets/AssetManifest.json

@@ -0,0 +1 @@
+{"assets/actions.svg":["assets/actions.svg"],"assets/actions_mobile.svg":["assets/actions_mobile.svg"],"assets/address_book.ttf":["assets/address_book.ttf"],"assets/android.svg":["assets/android.svg"],"assets/arrow.svg":["assets/arrow.svg"],"assets/auth-apple.svg":["assets/auth-apple.svg"],"assets/auth-auth0.svg":["assets/auth-auth0.svg"],"assets/auth-azure.svg":["assets/auth-azure.svg"],"assets/auth-default.svg":["assets/auth-default.svg"],"assets/auth-facebook.svg":["assets/auth-facebook.svg"],"assets/auth-github.svg":["assets/auth-github.svg"],"assets/auth-gitlab.svg":["assets/auth-gitlab.svg"],"assets/auth-google.svg":["assets/auth-google.svg"],"assets/auth-okta.svg":["assets/auth-okta.svg"],"assets/call_end.svg":["assets/call_end.svg"],"assets/call_wait.svg":["assets/call_wait.svg"],"assets/chat.svg":["assets/chat.svg"],"assets/chat2.svg":["assets/chat2.svg"],"assets/checkbox-outline.svg":["assets/checkbox-outline.svg"],"assets/chevron_up_chevron_down.svg":["assets/chevron_up_chevron_down.svg"],"assets/close.svg":["assets/close.svg"],"assets/display.svg":["assets/display.svg"],"assets/dots.svg":["assets/dots.svg"],"assets/file.svg":["assets/file.svg"],"assets/file_transfer.svg":["assets/file_transfer.svg"],"assets/folder.svg":["assets/folder.svg"],"assets/folder_new.svg":["assets/folder_new.svg"],"assets/fullscreen.svg":["assets/fullscreen.svg"],"assets/fullscreen_exit.svg":["assets/fullscreen_exit.svg"],"assets/gestures.ttf":["assets/gestures.ttf"],"assets/home.svg":["assets/home.svg"],"assets/icon.svg":["assets/icon.svg"],"assets/insecure.svg":["assets/insecure.svg"],"assets/insecure_relay.svg":["assets/insecure_relay.svg"],"assets/kb_layout_iso.svg":["assets/kb_layout_iso.svg"],"assets/kb_layout_not_iso.svg":["assets/kb_layout_not_iso.svg"],"assets/keyboard.svg":["assets/keyboard.svg"],"assets/linux.svg":["assets/linux.svg"],"assets/mac.svg":["assets/mac.svg"],"assets/message_24dp_5F6368.svg":["assets/message_24dp_5F6368.svg"],"assets/peer_searchbar.ttf":["assets/peer_searchbar.ttf"],"assets/pinned.svg":["assets/pinned.svg"],"assets/rec.svg":["assets/rec.svg"],"assets/record_screen.svg":["assets/record_screen.svg"],"assets/refresh.svg":["assets/refresh.svg"],"assets/scam.png":["assets/scam.png"],"assets/screen.svg":["assets/screen.svg"],"assets/search.svg":["assets/search.svg"],"assets/secure.svg":["assets/secure.svg"],"assets/secure_relay.svg":["assets/secure_relay.svg"],"assets/tabbar.ttf":["assets/tabbar.ttf"],"assets/transfer.svg":["assets/transfer.svg"],"assets/trash.svg":["assets/trash.svg"],"assets/unpinned.svg":["assets/unpinned.svg"],"assets/voice_call.svg":["assets/voice_call.svg"],"assets/voice_call_waiting.svg":["assets/voice_call_waiting.svg"],"assets/win.svg":["assets/win.svg"],"packages/dash_chat_2/assets/placeholder.png":["packages/dash_chat_2/assets/placeholder.png"],"packages/dash_chat_2/assets/profile_placeholder.png":["packages/dash_chat_2/assets/profile_placeholder.png"],"packages/flex_color_picker/assets/opacity.png":["packages/flex_color_picker/assets/opacity.png"],"packages/wakelock_plus/assets/no_sleep.js":["packages/wakelock_plus/assets/no_sleep.js"],"packages/window_manager/images/ic_chrome_close.png":["packages/window_manager/images/ic_chrome_close.png"],"packages/window_manager/images/ic_chrome_maximize.png":["packages/window_manager/images/ic_chrome_maximize.png"],"packages/window_manager/images/ic_chrome_minimize.png":["packages/window_manager/images/ic_chrome_minimize.png"],"packages/window_manager/images/ic_chrome_unmaximize.png":["packages/window_manager/images/ic_chrome_unmaximize.png"]}

resources/web2/assets/FontManifest.json

@@ -0,0 +1,42 @@
+[
+  {
+    "family": "MaterialIcons",
+    "fonts": [
+      {
+        "asset": "fonts/MaterialIcons-Regular.otf"
+      }
+    ]
+  },
+  {
+    "family": "GestureIcons",
+    "fonts": [
+      {
+        "asset": "assets/gestures.ttf"
+      }
+    ]
+  },
+  {
+    "family": "Tabbar",
+    "fonts": [
+      {
+        "asset": "assets/tabbar.ttf"
+      }
+    ]
+  },
+  {
+    "family": "PeerSearchbar",
+    "fonts": [
+      {
+        "asset": "assets/peer_searchbar.ttf"
+      }
+    ]
+  },
+  {
+    "family": "AddressBook",
+    "fonts": [
+      {
+        "asset": "assets/address_book.ttf"
+      }
+    ]
+  }
+]

resources/web2/assets/assets/actions.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="496.063 521.772 32 32"><path fill="none" d="M496.063 521.772h32v32h-32v-32Z"/><path d="m513.817 535.858.87-8.052c.136-1.26-.279-1.399-.927-.31l-6.856 11.532c-.216.363-.049.658.374.658h3.031l-.87 8.052c-.136 1.26.279 1.399.927.309l6.856-11.531c.216-.363.048-.658-.374-.658h-3.031Z"/></svg>

resources/web2/assets/assets/actions_mobile.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="91.748 41.508 32 32"><path fill="none" d="M91.748 41.508h32v32h-32v-32Z"/><path fill-rule="evenodd" d="M104.884 48.3h5.728c1.363 0 2.47.94 2.47 2.098v11.448c0 1.158-1.107 2.098-2.47 2.098h-5.728c-1.363 0-2.469-.94-2.469-2.098V50.398c0-1.158 1.106-2.098 2.469-2.098Zm-.004-2.692h5.729a5.162 5.162 0 0 1 5.164 5.164v13.472a5.164 5.164 0 0 1-1.514 3.649 5.143 5.143 0 0 1-3.65 1.515h-5.729a5.164 5.164 0 0 1-5.157-5.164V50.772c0-1.374.538-2.687 1.508-3.656a5.182 5.182 0 0 1 3.649-1.508Zm1.407 21.076a1.462 1.462 0 0 1 2.922 0 1.461 1.461 0 0 1-2.922 0Z"/></svg>

resources/web2/assets/assets/android.svg

@@ -0,0 +1 @@
+<svg width="553" height="553"><path fill="#fff" d="M77 179a33 33 0 0 0-25 10 33 33 0 0 0-9 24v143a33 33 0 0 0 10 24 33 33 0 0 0 24 10c9 0 17-3 24-10a33 33 0 0 0 10-24V213c0-9-4-17-10-24a33 33 0 0 0-24-10zM352 51l24-44c1-3 1-5-2-6-3-2-5-1-7 2l-24 43a163 163 0 0 0-133 0L186 3c-2-3-4-4-7-2-2 1-3 3-1 6l23 44c-24 12-43 29-57 51a129 129 0 0 0-21 72h307c0-26-7-50-21-72a146 146 0 0 0-57-51zm-136 63a13 13 0 0 1-10 4 13 13 0 0 1-12-13c0-4 1-7 3-9 3-3 6-4 9-4s7 1 10 4c2 2 3 5 3 9s-1 7-3 9zm140 0a12 12 0 0 1-9 4c-4 0-7-1-9-4a12 12 0 0 1-4-9c0-4 1-7 4-9 2-3 5-4 9-4a12 12 0 0 1 9 4c2 2 3 5 3 9s-1 7-3 9zM124 407c0 10 4 19 11 26s15 10 26 10h24v76c0 9 4 17 10 24s15 10 24 10c10 0 18-3 25-10s10-15 10-24v-76h45v76c0 9 4 17 10 24s15 10 25 10c9 0 17-3 24-10s10-15 10-24v-76h25a35 35 0 0 0 25-10c7-7 11-16 11-26V185H124v222zm352-228a33 33 0 0 0-24 10 33 33 0 0 0-10 24v143a34 34 0 0 0 34 34c10 0 18-3 25-10s10-15 10-24V213c0-9-4-17-10-24a33 33 0 0 0-25-10z"/></svg>

resources/web2/assets/assets/arrow.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="305.118 110.478 32 32"><path fill="none" d="M305.118 110.478h32v32h-32v-32Z"/><path d="m322.26 126.052-5.963-5.962a1.48 1.48 0 1 1 2.093-2.093l7.63 7.63c.47.47.47 1.233 0 1.703l-7.63 7.629a1.48 1.48 0 0 1-2.093 0 1.482 1.482 0 0 1 0-2.093l5.963-5.962a.603.603 0 0 0 0-.852Z"/></svg>