up gorm logger & add share to guest by web client

build.yml - Add GHCR & Dynamic Inputs

.gitattributes

@@ -0,0 +1 @@
+resources/web/**/* linguist-vendored

.github/workflows/build.yml

@@ -0,0 +1,290 @@
+name: Build
+
+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'
+  push:
+    tags:
+      - 'v*.*.*'  # 当推送带有版本号的 tag（例如 v1.0.0）时触发工作流
+      - 'test*'
+
+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 }}
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - { platform: "amd64", goos: "linux" }
+          - { platform: "arm64", goos: "linux" }
+          - { platform: "amd64", goos: "windows" }
+
+    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 }}.zip ./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
+            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 }}.tar.gz ./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 }}.tar.gz
+            ${{ matrix.job.goos}}-${{ matrix.job.platform }}.zip
+      - name: Upload to GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ${{ matrix.job.goos}}-${{ matrix.job.platform }}.tar.gz
+            ${{ matrix.job.goos}}-${{ matrix.job.platform }}.zip
+        #          tag_name: ${{ env.LATEST_TAG }}
+        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" }
+    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=latest" >> $GITHUB_ENV  # Default to 'latest' 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.LATEST_TAG }}-${{ matrix.job.platform }},
+            ${{ 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.LATEST_TAG }}-${{ matrix.job.platform }},
+            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=latest" >> $GITHUB_ENV  # Default to 'latest' 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 }}-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 }}-arm64
+          push: true
+          amend: true
+
+      - name: Create and push manifest Docker Hub (:latest)
+        if: ${{ env.SKIP_DOCKER_HUB == 'false' }}
+        uses: Noelware/docker-manifest-action@master
+        with:
+          base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
+          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
+            ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
+          push: true
+
+      - name: Create and push manifest GHCR (:latest)
+        if: ${{ env.SKIP_GHCR == 'false' }}
+        uses: Noelware/docker-manifest-action@master
+        with:
+          base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
+          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
+            ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
+          push: true
+          amend: true

.github/workflows/release.yml

@@ -0,0 +1,95 @@
+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

@@ -5,5 +5,6 @@ go.sum
 resources/*
 !resources/public/upload/.gitignore
 !resources/web
+!resources/i18n
 release
 data

Dockerfile

@@ -0,0 +1,11 @@
+FROM alpine
+
+ARG BUILDARCH
+WORKDIR /app
+RUN apk add --no-cache tzdata file
+COPY ./${BUILDARCH}/release /app/
+RUN file /app/apimain
+VOLUME /app/data
+
+EXPOSE 21114
+CMD ["./apimain"]

README.md

@@ -1,67 +1,131 @@
 # RustDesk API
 
-本项目使用 Go 实现了 RustDesk 的 API，并包含了 Web UI 和 Web 客户端。RustDesk 是一个远程桌面软件，提供了自托管的解决方案。
+[English Doc](README_EN.md)
+
+本项目使用 Go 实现了 RustDesk 的 API，并包含了 Web Admin 和 Web 客户端。RustDesk 是一个远程桌面软件，提供了自托管的解决方案。
+
+ <div align=center>
+<img src="https://img.shields.io/badge/golang-1.22-blue"/>
+<img src="https://img.shields.io/badge/gin-v1.9.0-lightBlue"/>
+<img src="https://img.shields.io/badge/gorm-v1.25.7-green"/>
+<img src="https://img.shields.io/badge/swag-v1.16.3-yellow"/>
+<img src="https://github.com/lejianwen/rustdesk-api/actions/workflows/build.yml/badge.svg"/>
+</div>
+
+# 特性
+
+- PC端API
+    - 个人版API
+    - 登录
+    - 地址簿
+    - 群组
+    - 授权登录，支持`github`和`google`登录，支持`web后台`授权登录
+    - i18n
+- Web Admin
+    - 用户管理
+    - 设备管理
+    - 地址簿管理
+    - 标签管理
+    - 群组管理
+    - Oauth 管理
+    - 快速使用web client
+    - i18n
+- Web Client
+    - 自动获取API server
+    - 自动获取ID服务器和KEY
+    - 自动获取地址簿
 
 ## 使用前准备
 
-### Rustdesk
+### [Rustdesk](https://github.com/rustdesk/rustdesk)
 
 1. PC客户端使用的是 ***1.3.0***，经测试 ***1.2.6+*** 都可以
 2. server端必须指定key，不能用自带的生成的key,否则可能链接不上或者超时
 
-```bash
-hbbs -r <relay-server-ip[:port]> -k 123456789
-hbbr -k 123456789
-```
+   ```bash
+   hbbs -r <relay-server-ip[:port]> -k <key>
+   hbbr -k <key>
+   ```
+
+   比如
+
+   ```bash
+   hbbs -r <relay-server-ip[:port]> -k abc1234567
+   hbbr -k abc1234567
+   ```
 
 ## 功能
 
-### **API 服务**: 基本实现了PC端基础的接口。
+### API 服务: 基本实现了PC端基础的接口。支持Personal版本接口，可以通过配置文件`rustdesk.personal`或环境变量`RUSTDESK_API_RUSTDESK_PERSONAL`来控制是否启用
+
+#### 登录
+
+- 添加了`github`和`google`授权登录，需要在后台配置好就可以用了，具体可看后台OAuth配置
+- 添加了web后台授权登录,点击后直接登录后台就自动登录客户端了
+
+![pc_login](docs/pc_login.png)
+
+#### 地址簿
 
 ![pc_ab](docs/pc_ab.png)
+
+#### 群组,群组分为`共享组`和`普通组`，共享组中所有人都能看到小组成员的设备，普通组只有管理员能看到所有小组成员的设备
+
 ![pc_gr](docs/pc_gr.png)
 
-### **Web UI**: 使用前后端分离，提供用户友好的管理界面，主要用来管理和展示。
+### Web Admin:
 
-***前端代码在[rustdesk-api-web](https://github.com/lejianwen/rustdesk-api-web)***
+***使用前后端分离，提供用户友好的管理界面，主要用来管理和展示。前端代码在[rustdesk-api-web](https://github.com/lejianwen/rustdesk-api-web)***
 
-***初次安装管理员为用户名密码为admin admin，请即时更改密码***
+***后台访问地址是`http://<your server>[:port]/_admin/`初次安装管理员为用户名密码为`admin` `admin`，请即时更改密码***
 
 1. 管理员界面
    ![web_admin](docs/web_admin.png)
 2. 普通用户界面
-   ![web_user](docs/web_user.png)
-3. 更改密码在右上角
+   ![web_user](docs/web_admin_user.png)
+   右上角也可以更改密码
+   ![web_resetpwd](docs/web_resetpwd.png)
 
-![web_resetpwd](docs/web_resetpwd.png)
-
-4. 分组可以自定义，方便管理，暂时支持两种类型: `共享组` 和 `普通组`
+3. 分组可以自定义，方便管理，暂时支持两种类型: `共享组` 和 `普通组`
    ![web_admin_gr](docs/web_admin_gr.png)
+4. 可以直接打开webclient，方便使用
+   ![web_webclient](docs/admin_webclient.png)
+5. Oauth,暂时只支持了`Github`和`Google`, 需要创建一个`OAuth App`，然后配置到后台
+   ![web_admin_oauth](docs/web_admin_oauth.png)
+    - `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`
+      ，比如`http://127.0.0.1:21114/api/oauth/callback`
 
-### **Web 客户端**:
+### Web Client:
 
 1. 如果已经登录了后台，web client将自动直接登录
 2. 如果没登录后台，点击右上角登录即可，api server已经自动配置好了
-3. 登录后台后，会将地址簿自动保存到web client中，方便使用
    ![webclient_conf](docs/webclient_conf.png)
+3. 登录后，会自动同步ID服务器和KEY
+4. 登录后，会将地址簿自动保存到web client中，方便使用
 
-### **自动化文档**: 使用 Swag 生成 API 文档，方便开发者理解和使用 API。
+### 自动化文档: 使用 Swag 生成 API 文档，方便开发者理解和使用 API。
 
-1. 后台文档 <youer server>/admin/swagger/index.html
-2. PC端文档 <youer server>/swagger/index.html
+1. 后台文档 `<youer server[:port]>/admin/swagger/index.html`
+2. PC端文档 `<youer server[:port]>/swagger/index.html`
    ![api_swag](docs/api_swag.png)
 
 ## 安装与运行
 
 ### 相关配置
 
-* 参考`conf/config.yaml`配置文件，修改相关配置。如果`gorm.type`是`sqlite`，则不需要配置mysql相关配置。
+* 参考`conf/config.yaml`配置文件，修改相关配置。
+* 如果`gorm.type`是`sqlite`，则不需要配置mysql相关配置。
+* 语言如果不设置默认为`zh-CN`
 
 ```yaml
+lang: "en"
 gin:
   api-addr: "0.0.0.0:21114"
   mode: "release"
   resources-path: 'resources'
+  trust-proxy: ""
 gorm:
   type: "sqlite"
   max-idle-conns: 10
@@ -76,14 +140,207 @@ rustdesk:
   relay-server: "192.168.1.66:21117"
   api-server: "http://192.168.1.66:21114"
   key: "123456789"
+  personal: 1
 ```
 
+* 环境变量,变量名前缀是RUSTDESK_API，环境变量如果存在将覆盖配置文件中的配置
+
+| 变量名                                 | 说明                                   | 示例                          |
+|-------------------------------------|--------------------------------------|-----------------------------|
+| TZ                                  | 时区                                   | Asia/Shanghai               |
+| RUSTDESK_API_LANG                   | 语言                                   | `en`,`zh-CN`                |
+| -----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                   |
+
 ### 安装步骤
 
 #### docker运行
 
+1. 直接docker运行,配置可以通过挂载配置文件`/app/conf/config.yaml`来修改,或者通过环境变量覆盖配置文件中的配置
+
+```bash
+docker run -d --name rustdesk-api -p 21114:21114 \
+-v /data/rustdesk/api:/app/data \
+-e TZ=Asia/Shanghai \
+-e RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116 \
+-e RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117 \
+-e RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114 \
+-e RUSTDESK_API_RUSTDESK_KEY=123456789 \
+lejianwen/rustdesk-api
+```
+
+2. 使用`docker compose`
+
+    - 简单示例
+
+   ```docker-compose
+   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=123456789
+       ports:
+         - 21114:21114
+       image: lejianwen/rustdesk-api
+       volumes:
+         - /data/rustdesk/api:/app/data #将数据库挂载出来方便备份
+       networks:
+         - rustdesk-net
+       restart: unless-stopped
+   ```
+
+    - 根据rustdesk提供的示例加上自己的rustdesk-api
+
+   ```docker-compose
+   networks:
+     rustdesk-net:
+       external: false
+   services:
+     hbbs:
+       container_name: hbbs
+       ports:
+         - 21115:21115
+         - 21116:21116 # 自定义 hbbs 映射端口
+         - 21116:21116/udp # 自定义 hbbs 映射端口
+         - 21118:21118 # web client
+         - 21119:21119 # web client
+       image: rustdesk/rustdesk-server
+       command: hbbs -r <relay-server-ip[:port]> -k 123456789 # 填入个人域名或 IP + hbbr 暴露端口
+       volumes:
+         - /data/rustdesk/hbbs:/root # 自定义挂载目录
+       networks:
+         - rustdesk-net
+       depends_on:
+         - hbbr
+       restart: unless-stopped
+       deploy:
+         resources:
+           limits:
+             memory: 64M
+     hbbr:
+       container_name: hbbr
+       ports:
+         - 21117:21117 # 自定义 hbbr 映射端口
+       image: rustdesk/rustdesk-server
+       command: hbbr -k 123456789
+       #command: hbbr
+       volumes:
+         - /data/rustdesk/hbbr:/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=123456789
+       ports:
+         - 21114:21114
+       image: lejianwen/rustdesk-api
+       volumes:
+         - /data/rustdesk/api:/app/data #将数据库挂载出来方便备份
+       networks:
+         - rustdesk-net
+       restart: unless-stopped
+   
+   ```
+
+    - 如果使用的是S6的镜像，会需要修改启动脚本，覆盖镜像中的`/etc/s6-overlay/s6-rc.d/hbbr/run`
+      和`/etc/s6-overlay/s6-rc.d/hbbr/run`
+
+        1. 创建`hbbr/run`
+
+            ```bash
+            #!/command/with-contenv sh
+            cd /data
+            PARAMS=
+            [ "${ENCRYPTED_ONLY}" = "1" ] && PARAMS="-k ${KEY}"
+            /usr/bin/hbbr $PARAMS
+            ```
+
+        2. 创建`hbbs/run`
+            ```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`部分
+
+            ```
+            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=abc123456789
+                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=abc123456789
+                volumes:
+                  - /data/rustdesk/api:/app/data #将数据库挂载
+                networks:
+                  - rustdesk-net
+                restart: unless-stopped
+            ```
+
 #### 下载release直接运行
 
+下载地址[release](https://github.com/lejianwen/rustdesk-api/releases)
+
 #### 源码安装
 
 1. 克隆仓库
@@ -91,15 +348,19 @@ rustdesk:
    git clone https://github.com/lejianwen/rustdesk-api.git
    cd rustdesk-api
    ```
+
 2. 安装依赖
+
     ```bash
     go mod tidy
     #安装swag，如果不需要生成文档，可以不安装
     go install github.com/swaggo/swag/cmd/swag@latest
     ```
+
 3. 编译后台前端，前端代码在[rustdesk-api-web](https://github.com/lejianwen/rustdesk-api-web)中
    ```bash
    cd resources
+   mkdir -p admin
    git clone https://github.com/lejianwen/rustdesk-api-web
    cd rustdesk-api-web
    npm install
@@ -114,5 +375,11 @@ rustdesk:
     go generate generate_api.go
     ```
 5. 编译，如果想自己编译,先cd到项目根目录，然后windows下直接运行`build.bat`,linux下运行`build.sh`,编译后会在`release`
-   目录下生成对应的可执行文件。
+   目录下生成对应的可执行文件。直接运行编译后的可执行文件即可。
 
+6. 打开浏览器访问`http://<your server[:port]>/_admin/`，默认用户名密码为`admin`，请及时更改密码。
+
+## 其他
+
+- [修改客户端ID](https://github.com/abdullah-erturk/RustDesk-ID-Changer)
+- [webclient](https://hub.docker.com/r/keyurbhole/flutter_web_desk)

README_EN.md

@@ -0,0 +1,394 @@
+# RustDesk API
+
+This project implements the RustDesk API using Go, and includes both a web UI and web client. RustDesk is a remote
+desktop software that provides self-hosted solutions.
+
+<div align=center>
+<img src="https://img.shields.io/badge/golang-1.22-blue"/>
+<img src="https://img.shields.io/badge/gin-v1.9.0-lightBlue"/>
+<img src="https://img.shields.io/badge/gorm-v1.25.7-green"/>
+<img src="https://img.shields.io/badge/swag-v1.16.3-yellow"/>
+<img src="https://github.com/lejianwen/rustdesk-api/actions/workflows/build.yml/badge.svg"/>
+</div>
+
+# Features
+
+- PC API
+    - Personal API
+    - Login
+    - Address Book
+    - Groups
+    - Authorized login, supports `GitHub` and `Google` login, supports `web admin` authorized login
+    - i18n
+- Web Admin
+    - User Management
+    - Device Management
+    - Address Book Management
+    - Tag Management
+    - Group Management
+    - OAuth Management
+    - Quick access to web client
+    - i18n
+- Web Client
+    - Automatically obtain API server
+    - Automatically obtain ID server and KEY
+    - Automatically obtain address book
+
+## Prerequisites
+
+### [Rustdesk](https://github.com/rustdesk/rustdesk)
+
+1. The PC client version used is ***1.3.0***, and versions ***1.2.6+*** have been tested to work.
+2. The server must specify a key, and not use the auto-generated key, otherwise there may be connection failures or
+   timeouts.
+
+   ```bash
+   hbbs -r <relay-server-ip[:port]> -k <key>
+   hbbr -k <key>
+   ```
+
+   Example:
+
+   ```bash
+   hbbs -r <relay-server-ip[:port]> -k abc1234567
+   hbbr -k abc1234567
+   ```
+
+## Overview
+
+### API Service: Basic implementation of the PC client's primary interfaces.Supports the Personal version api, which can be enabled by configuring the `rustdesk.personal` file or the `RUSTDESK_API_RUSTDESK_PERSONAL` environment variable.
+
+#### Login
+
+- Added `GitHub` and `Google` 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.
+
+![pc_login](docs/en_img/pc_login.png)
+
+#### Address Book
+
+![pc_ab](docs/en_img/pc_ab.png)
+
+#### Groups: Groups are divided into `shared groups` and `regular groups`. In shared groups, everyone can see the peers of all group members, while in regular groups, only administrators can see all members' peers.
+
+![pc_gr](docs/en_img/pc_gr.png)
+
+### Web Admin
+
+***The frontend and backend are separated to provide a user-friendly management interface, primarily for managing and
+displaying data.Frontend code is available at [rustdesk-api-web](https://github.com/lejianwen/rustdesk-api-web)***
+
+***Admin panel URL: `http://<your server[:port]>/_admin/`. The default username and password for the initial
+installation are `admin` `admin`, please change the password immediately.***
+
+1. Admin interface:
+   ![web_admin](docs/en_img/web_admin.png)
+2. Regular user interface:
+   ![web_user](docs/en_img/web_admin_user.png)
+   You can change your password from the top right corner:
+   ![web_resetpwd](docs/en_img/web_resetpwd.png)
+3. Groups can be customized for easy management. Currently, two types are supported: `shared group` and `regular group`.
+   ![web_admin_gr](docs/en_img/web_admin_gr.png)
+4. You can open the web client directly for convenience:
+   ![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
+   the admin
+   panel.
+   ![web_admin_oauth](docs/en_img/web_admin_oauth.png)
+    - 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`,
+      e.g., `http://127.0.0.1:21114/api/oauth/callback`.
+
+### Web Client:
+
+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 at 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.
+
+### Automated Documentation : API documentation is generated using Swag, making it easier for developers to understand and use the API.
+
+1. Admin panel docs: `<your server[:port]>/admin/swagger/index.html`
+2. PC client docs: `<your server[:port]>/swagger/index.html`
+   ![api_swag](docs/api_swag.png)
+
+## Installation and Setup
+
+### Configuration
+
+* Modify the configuration in `conf/config.yaml`. 
+* If `gorm.type` is set to `sqlite`, MySQL-related configurations are not required.
+* Language support: `en` and `zh-CN` are supported. The default is `zh-CN`.
+
+```yaml
+lang: "en"
+gin:
+  api-addr: "0.0.0.0:21114"
+  mode: "release"
+  resources-path: 'resources'
+  trust-proxy: ""
+gorm:
+  type: "sqlite"
+  max-idle-conns: 10
+  max-open-conns: 100
+mysql:
+  username: "root"
+  password: "111111"
+  addr: "192.168.1.66:3308"
+  dbname: "rustdesk"
+rustdesk:
+  id-server: "192.168.1.66:21116"
+  relay-server: "192.168.1.66:21117"
+  api-server: "http://192.168.1.66:21114"
+  key: "123456789"
+  personal: 1
+```
+
+* Environment variables, with the prefix `RUSTDESK_API_RUSTDESK_PERSONAL`, will override the settings in the
+  configuration file if
+  present.
+
+| Variable Name                      | Description                                               | Example                        |
+|------------------------------------|-----------------------------------------------------------|--------------------------------|
+| TZ                                 | timezone                                                  | Asia/Shanghai                  |
+| RUSTDESK_API_LANG                  | Language                                                  | `en`,`zh-CN`                   |
+| ----- 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                      |
+
+### Installation Steps
+
+#### Running via Docker
+
+1. Run directly with Docker. Configuration can be modified by mounting the config file `/app/conf/config.yaml`, or by
+   using environment variables to override settings.
+
+```bash
+docker run -d --name rustdesk-api -p 21114:21114 \
+-v /data/rustdesk/api:/app/data \
+-e RUSTDESK_API_LANG=en \
+-e RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116 \
+-e RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117 \
+-e RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114 \
+-e RUSTDESK_API_RUSTDESK_KEY=123456789 \
+lejianwen/rustdesk-api
+```
+
+2. Using `docker-compose`
+
+    - Simple example:
+
+   ```docker-compose
+   services:
+      rustdesk-api:
+       container_name: rustdesk-api
+       environment:
+         - 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=123456789
+       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:
+
+   ```docker-compose
+   networks:
+     rustdesk-net:
+       external: false
+   services:
+     hbbs:
+       container_name: hbbs
+       ports:
+         - 21115:21115
+         - 21116:21116 # 自定义 hbbs 映射端口
+         - 21116:21116/udp # 自定义 hbbs 映射端口
+         - 21118:21118 # web client
+         - 21119:21119 # web client
+       image: rustdesk/rustdesk-server
+       command: hbbs -r <relay-server-ip[:port]> -k 123456789 # 填入个人域名或 IP + hbbr 暴露端口
+       volumes:
+         - /data/rustdesk/hbbs:/root # 自定义挂载目录
+       networks:
+         - rustdesk-net
+       depends_on:
+         - hbbr
+       restart: unless-stopped
+       deploy:
+         resources:
+           limits:
+             memory: 64M
+     hbbr:
+       container_name: hbbr
+       ports:
+         - 21117:21117 # 自定义 hbbr 映射端口
+       image: rustdesk/rustdesk-server
+       command: hbbr -k 123456789
+       #command: hbbr
+       volumes:
+         - /data/rustdesk/hbbr:/root # 自定义挂载目录
+       networks:
+         - rustdesk-net
+       restart: unless-stopped
+       deploy:
+         resources:
+           limits:
+             memory: 64M
+     rustdesk-api:
+       container_name: rustdesk-api
+       environment:
+         - 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=123456789
+       ports:
+         - 21114:21114
+       image: lejianwen/rustdesk-api
+       volumes:
+         - /data/rustdesk/api:/app/data #将数据库挂载出来方便备份
+       networks:
+         - rustdesk-net
+       restart: unless-stopped
+   
+   ```
+    - If you are using an S6 image, you need to modify the startup script `/etc/s6-overlay/s6-rc.d/hbbr/run`
+      and `/etc/s6-overlay/s6-rc.d/hbbr/run`
+
+        1. create `hbbr/run`
+
+            ```bash
+            #!/command/with-contenv sh
+            cd /data
+            PARAMS=
+            [ "${ENCRYPTED_ONLY}" = "1" ] && PARAMS="-k ${KEY}"
+            /usr/bin/hbbr $PARAMS
+            ```
+
+        2. create `hbbs/run`
+            ```bash
+            #!/command/with-contenv sh
+            sleep 2
+            cd /data
+            PARAMS=
+            [ "${ENCRYPTED_ONLY}" = "1" ] && PARAMS="-k ${KEY}"
+            /usr/bin/hbbs -r $RELAY $PARAMS
+            ```
+        3. edit `docker-compose.yml`
+            ```
+            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=abc123456789
+                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=abc123456789
+                volumes:
+                  - /data/rustdesk/api:/app/data #将数据库挂载
+                networks:
+                  - rustdesk-net
+                restart: unless-stopped
+            ```
+
+#### Running from Release
+
+Download the release from [release](https://github.com/lejianwen/rustdesk-api/releases).
+
+#### Source Installation
+
+1. Clone the repository:
+   ```bash
+   git clone https://github.com/lejianwen/rustdesk-api.git
+   cd rustdesk-api
+   ```
+
+2. Install dependencies:
+
+    ```bash
+    go mod tidy
+    # Install Swag if you need to generate documentation; otherwise, you can skip this step
+    go install github.com/swaggo/swag/cmd/swag@latest
+    ```
+
+3. Build the admin front-end (the front-end code is
+   in [rustdesk-api-web](https://github.com/lejianwen/rustdesk-api-web)):
+   ```bash
+   cd resources
+   mkdir -p admin
+   git clone https://github.com/lejianwen/rustdesk-api-web
+   cd rustdesk-api-web
+   npm install
+   npm run build
+   cp -ar dist/* ../admin/
+   ```
+
+4. Run:
+    ```bash
+    # Run directly
+    go run cmd/apimain.go
+    # Or generate and run the API using generate_api.go
+    go generate generate_api.go
+    ```
+
+5. To compile, change to the project root directory. For Windows, run `build.bat`, and for Linux, run `build.sh`. After
+   compiling, the corresponding executables will be generated in the `release` directory. Run the compiled executables
+   directly.
+
+6. Open your browser and visit `http://<your server[:port]>/_admin/`, with default credentials `admin admin`. Please
+   change the password promptly.
+
+## Miscellaneous
+
+- [Change client ID](https://github.com/abdullah-erturk/RustDesk-ID-Changer)
+- [webclient](https://hub.docker.com/r/keyurbhole/flutter_web_desk)

build.bat

@@ -1,4 +1,5 @@
 @echo off
+rmdir /s /q release
 go env -w GO111MODULE=on
 go env -w GOPROXY=https://goproxy.cn,direct
 go env -w CGO_ENABLED=1

build.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+rm release -rf
 go env -w GO111MODULE=on
 go env -w GOPROXY=https://goproxy.cn,direct
 go env -w CGO_ENABLED=1
@@ -11,5 +12,5 @@ go build -o release/apimain cmd/apimain.go
 cp -ar resources release/
 cp -ar docs release/
 cp -ar conf release/
-mkdir release/data
-mkdir release/runtime
+mkdir -p release/data
+mkdir -p release/runtime

cmd/apimain.go

@@ -12,12 +12,18 @@ import (
 	"Gwen/model"
 	"Gwen/service"
 	"fmt"
+	"github.com/BurntSushi/toml"
+	"github.com/gin-gonic/gin"
 	"github.com/go-playground/locales/en"
 	"github.com/go-playground/locales/zh_Hans_CN"
 	ut "github.com/go-playground/universal-translator"
 	"github.com/go-playground/validator/v10"
+	en_translations "github.com/go-playground/validator/v10/translations/en"
 	zh_translations "github.com/go-playground/validator/v10/translations/zh"
 	"github.com/go-redis/redis/v8"
+	"github.com/nicksnyder/go-i18n/v2/i18n"
+	"golang.org/x/text/language"
+	nethttp "net/http"
 	"reflect"
 )
 
@@ -33,9 +39,7 @@ import (
 // @name Authorization
 func main() {
 	//配置解析
-	global.Viper = config.Init(&global.Config, func() {
-		fmt.Println(global.Config)
-	})
+	global.Viper = config.Init(&global.Config)
 
 	//日志
 	global.Logger = logger.New(&logger.Config{
@@ -44,6 +48,8 @@ func main() {
 		ReportCaller: global.Config.Logger.ReportCaller,
 	})
 
+	InitI18n()
+
 	//redis
 	global.Redis = redis.NewClient(&redis.Options{
 		Addr:     global.Config.Redis.Addr,
@@ -107,15 +113,25 @@ func main() {
 
 func ApiInitValidator() {
 	validate := validator.New()
+
+	// 定义不同的语言翻译
 	enT := en.New()
 	cn := zh_Hans_CN.New()
+
 	uni := ut.New(enT, cn)
-	trans, _ := uni.GetTranslator("cn")
-	err := zh_translations.RegisterDefaultTranslations(validate, trans)
+
+	enTrans, _ := uni.GetTranslator("en")
+	zhTrans, _ := uni.GetTranslator("zh_Hans_CN")
+
+	err := zh_translations.RegisterDefaultTranslations(validate, zhTrans)
 	if err != nil {
-		//退出
 		panic(err)
 	}
+	err = en_translations.RegisterDefaultTranslations(validate, enTrans)
+	if err != nil {
+		panic(err)
+	}
+
 	validate.RegisterTagNameFunc(func(field reflect.StructField) string {
 		label := field.Tag.Get("label")
 		if label == "" {
@@ -124,10 +140,16 @@ func ApiInitValidator() {
 		return label
 	})
 	global.Validator.Validate = validate
-	global.Validator.VTrans = trans
+	global.Validator.UT = uni // 存储 Universal Translator
+	global.Validator.VTrans = zhTrans
 
-	global.Validator.ValidStruct = func(i interface{}) []string {
+	global.Validator.ValidStruct = func(ctx *gin.Context, i interface{}) []string {
 		err := global.Validator.Validate.Struct(i)
+		lang := ctx.GetHeader("Accept-Language")
+		if lang == "" {
+			lang = global.Config.Lang
+		}
+		trans := getTranslatorForLang(lang)
 		errList := make([]string, 0, 10)
 		if err != nil {
 			if _, ok := err.(*validator.InvalidValidationError); ok {
@@ -135,14 +157,18 @@ func ApiInitValidator() {
 				return errList
 			}
 			for _, err2 := range err.(validator.ValidationErrors) {
-				errList = append(errList, err2.Translate(global.Validator.VTrans))
+				errList = append(errList, err2.Translate(trans))
 			}
 		}
 		return errList
 	}
-	global.Validator.ValidVar = func(field interface{}, tag string) []string {
+	global.Validator.ValidVar = func(ctx *gin.Context, field interface{}, tag string) []string {
 		err := global.Validator.Validate.Var(field, tag)
-		fmt.Println(err)
+		lang := ctx.GetHeader("Accept-Language")
+		if lang == "" {
+			lang = global.Config.Lang
+		}
+		trans := getTranslatorForLang(lang)
 		errList := make([]string, 0, 10)
 		if err != nil {
 			if _, ok := err.(*validator.InvalidValidationError); ok {
@@ -150,16 +176,31 @@ func ApiInitValidator() {
 				return errList
 			}
 			for _, err2 := range err.(validator.ValidationErrors) {
-				errList = append(errList, err2.Translate(global.Validator.VTrans))
+				errList = append(errList, err2.Translate(trans))
 			}
 		}
 		return errList
 	}
 
 }
-
+func getTranslatorForLang(lang string) ut.Translator {
+	switch lang {
+	case "zh_CN":
+		fallthrough
+	case "zh-CN":
+		fallthrough
+	case "zh":
+		trans, _ := global.Validator.UT.GetTranslator("zh_Hans_CN")
+		return trans
+	case "en":
+		fallthrough
+	default:
+		trans, _ := global.Validator.UT.GetTranslator("en")
+		return trans
+	}
+}
 func DatabaseAutoUpdate() {
-	version := 100
+	version := 220
 
 	db := global.DB
 
@@ -217,6 +258,10 @@ func Migrate(version uint) {
 		&model.AddressBook{},
 		&model.Peer{},
 		&model.Group{},
+		&model.UserThird{},
+		&model.Oauth{},
+		&model.LoginLog{},
+		&model.ShareRecord{},
 	)
 	if err != nil {
 		fmt.Println("migrate err :=>", err)
@@ -226,13 +271,23 @@ func Migrate(version uint) {
 	var vc int64
 	global.DB.Model(&model.Version{}).Count(&vc)
 	if vc == 1 {
+		localizer := global.Localizer(&gin.Context{
+			Request: &nethttp.Request{},
+		})
+		defaultGroup, _ := localizer.LocalizeMessage(&i18n.Message{
+			ID: "DefaultGroup",
+		})
 		group := &model.Group{
-			Name: "默认组",
+			Name: defaultGroup,
 			Type: model.GroupTypeDefault,
 		}
 		service.AllService.GroupService.Create(group)
+
+		shareGroup, _ := localizer.LocalizeMessage(&i18n.Message{
+			ID: "ShareGroup",
+		})
 		groupShare := &model.Group{
-			Name: "共享组",
+			Name: shareGroup,
 			Type: model.GroupTypeShare,
 		}
 		service.AllService.GroupService.Create(groupShare)
@@ -240,7 +295,7 @@ func Migrate(version uint) {
 		is_admin := true
 		admin := &model.User{
 			Username: "admin",
-			Nickname: "管理员",
+			Nickname: "Admin",
 			Status:   model.COMMON_STATUS_ENABLE,
 			IsAdmin:  &is_admin,
 			GroupId:  1,
@@ -250,3 +305,37 @@ func Migrate(version uint) {
 	}
 
 }
+
+func InitI18n() {
+	bundle := i18n.NewBundle(language.English)
+	bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
+	bundle.LoadMessageFile(global.Config.Gin.ResourcesPath + "/i18n/en.toml")
+	bundle.LoadMessageFile(global.Config.Gin.ResourcesPath + "/i18n/zh_CN.toml")
+	global.Localizer = func(ctx *gin.Context) *i18n.Localizer {
+		lang := ctx.GetHeader("Accept-Language")
+		if lang == "" {
+			lang = global.Config.Lang
+		}
+		if lang == "en" {
+			return i18n.NewLocalizer(bundle, "en")
+		} else {
+			return i18n.NewLocalizer(bundle, lang, "en")
+		}
+	}
+
+	//personUnreadEmails := localizer.MustLocalize(&i18n.LocalizeConfig{
+	//	DefaultMessage: &i18n.Message{
+	//		ID: "PersonUnreadEmails",
+	//	},
+	//	PluralCount: 6,
+	//	TemplateData: map[string]interface{}{
+	//		"Name":        "LE",
+	//		"PluralCount": 6,
+	//	},
+	//})
+	//personUnreadEmails, err := global.Localizer.LocalizeMessage(&i18n.Message{
+	//	ID: "ParamsError",
+	//})
+	//fmt.Println(err, personUnreadEmails)
+
+}

conf/config.yaml

@@ -1,34 +1,37 @@
+lang: "zh-CN"
 gin:
   api-addr: "0.0.0.0:21114"
   mode: "release" #release,debug,test
   resources-path: 'resources'  #对外静态文件目录
+  trust-proxy: ""
 gorm:
   type: "sqlite"
   max-idle-conns: 10
   max-open-conns: 100
 mysql:
-  username: "root"
-  password: "111111"
-  addr: "192.168.1.66:3308"
-  dbname: "rustdesk2"
+  username: ""
+  password: ""
+  addr: ""
+  dbname: ""
 rustdesk:
-  id-server: "124.220.134.240:21116"
-  relay-server: "124.220.134.240:21117"
-  api-server: "http://127.0.0.1:21114"
-  key: "ljw19891989"
+  id-server: "192.168.1.66:21116"
+  relay-server: "192.168.1.66:21117"
+  api-server: "http://192.168.1.66:21114"
+  key: "123456789"
+  personal: 1
+logger:
+  path: "./runtime/log.txt"
+  level: "warn" #trace,debug,info,warn,error,fatal
+  report-caller: true
 redis:
   addr: "127.0.0.1:6379"
   password: ""
   db: 0
-logger:
-  path: "./runtime/log.txt"
-  level: "error" #trace,debug,info,warn,error,fatal
-  report-caller: true
 cache:
   type: "file"
   file-dir: "./runtime/cache"
   redis-addr: "127.0.0.1:6379"
-  redis-pwd: "ljw19891989"
+  redis-pwd: ""
   redis-db: 0
 oss:
   access-key-id: ""

config/config.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/viper"
+	"strings"
 )
 
 const (
@@ -14,6 +15,7 @@ const (
 )
 
 type Config struct {
+	Lang     string `mapstructure:"lang"`
 	Gorm     Gorm
 	Mysql    Mysql
 	Gin      Gin
@@ -26,7 +28,7 @@ type Config struct {
 }
 
 // Init 初始化配置
-func Init(rowVal interface{}, cb func()) *viper.Viper {
+func Init(rowVal interface{}) *viper.Viper {
 	var config string
 	flag.StringVar(&config, "c", "", "choose config file.")
 	flag.Parse()
@@ -34,6 +36,9 @@ func Init(rowVal interface{}, cb func()) *viper.Viper {
 		config = DefaultConfig
 	}
 	v := viper.New()
+	v.AutomaticEnv()
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
+	v.SetEnvPrefix("RUSTDESK_API")
 	v.SetConfigFile(config)
 	v.SetConfigType("yaml")
 	err := v.ReadInConfig()
@@ -47,10 +52,19 @@ func Init(rowVal interface{}, cb func()) *viper.Viper {
 		if err2 := v.Unmarshal(rowVal); err2 != nil {
 			fmt.Println(err2)
 		}
-		cb()
 	})
 	if err := v.Unmarshal(rowVal); err != nil {
 		fmt.Println(err)
 	}
 	return v
 }
+
+// ReadEnv 读取环境变量
+func ReadEnv(rowVal interface{}) *viper.Viper {
+	v := viper.New()
+	v.AutomaticEnv()
+	if err := v.Unmarshal(rowVal); err != nil {
+		fmt.Println(err)
+	}
+	return v
+}

config/gin.go

@@ -5,4 +5,5 @@ type Gin struct {
 	AdminAddr     string `mapstructure:"admin-addr"`
 	Mode          string
 	ResourcesPath string `mapstructure:"resources-path"`
+	TrustProxy    string `mapstructure:"trust-proxy"`
 }

config/oauth.go

@@ -0,0 +1,13 @@
+package config
+
+type GithubOauth struct {
+	ClientId     string `mapstructure:"client-id"`
+	ClientSecret string `mapstructure:"client-secret"`
+	RedirectUrl  string `mapstructure:"redirect-url"`
+}
+
+type GoogleOauth struct {
+	ClientId     string `mapstructure:"client-id"`
+	ClientSecret string `mapstructure:"client-secret"`
+	RedirectUrl  string `mapstructure:"redirect-url"`
+}

config/rustdesk.go

@@ -5,4 +5,5 @@ type Rustdesk struct {
 	RelayServer string `mapstructure:"relay-server"`
 	ApiServer   string `mapstructure:"api-server"`
 	Key         string `mapstructure:"key"`
+	Personal    int    `mapstructure:"personal"`
 }

docker-compose.yaml

@@ -0,0 +1,15 @@
+services:
+  rustdesk-api:
+    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://192.168.1.66:21114
+      - RUSTDESK_API_RUSTDESK_KEY=123456789
+    ports:
+      - 21114:21114
+    volumes:
+      - /data/rustdesk/api:/app/data #将数据库挂载出来方便备份
+    restart: unless-stopped

docs/admin/admin_docs.go

@@ -22,7 +22,7 @@ const docTemplateadmin = `{
                         "token": []
                     }
                 ],
-                "description": "创建地址簿",
+                "description": "批量创建地址簿",
                 "consumes": [
                     "application/json"
                 ],
@@ -32,7 +32,7 @@ const docTemplateadmin = `{
                 "tags": [
                     "地址簿"
                 ],
-                "summary": "创建地址簿",
+                "summary": "批量创建地址簿",
                 "parameters": [
                     {
                         "description": "地址簿信息",
@@ -709,6 +709,172 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "/admin/loginLog/delete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "登录日志删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "登录日志"
+                ],
+                "summary": "登录日志删除",
+                "parameters": [
+                    {
+                        "description": "登录日志信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/model.LoginLog"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/loginLog/detail/{id}": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "登录日志详情",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "登录日志"
+                ],
+                "summary": "登录日志详情",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "ID",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.LoginLog"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/loginLog/list": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "登录日志列表",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "登录日志"
+                ],
+                "summary": "登录日志列表",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "页大小",
+                        "name": "page_size",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "用户ID",
+                        "name": "user_id",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.LoginLogList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/logout": {
             "post": {
                 "description": "登出",
@@ -738,14 +904,14 @@ const docTemplateadmin = `{
                 }
             }
         },
-        "/admin/peer/create": {
+        "/admin/oauth/create": {
             "post": {
                 "security": [
                     {
                         "token": []
                     }
                 ],
-                "description": "创建机器",
+                "description": "创建Oauth",
                 "consumes": [
                     "application/json"
                 ],
@@ -753,12 +919,286 @@ const docTemplateadmin = `{
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "Oauth"
                 ],
-                "summary": "创建机器",
+                "summary": "创建Oauth",
                 "parameters": [
                     {
-                        "description": "机器信息",
+                        "description": "Oauth信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.OauthForm"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.Oauth"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/oauth/delete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "Oauth删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "Oauth删除",
+                "parameters": [
+                    {
+                        "description": "Oauth信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.OauthForm"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/oauth/detail/{id}": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "Oauth详情",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "Oauth详情",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "ID",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.Oauth"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/oauth/list": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "Oauth列表",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "Oauth列表",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "页大小",
+                        "name": "page_size",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.OauthList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/oauth/update": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "Oauth编辑",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "Oauth编辑",
+                "parameters": [
+                    {
+                        "description": "Oauth信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.OauthForm"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.OauthList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/peer/create": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "创建设备",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "设备"
+                ],
+                "summary": "创建设备",
+                "parameters": [
+                    {
+                        "description": "设备信息",
                         "name": "body",
                         "in": "body",
                         "required": true,
@@ -802,7 +1242,7 @@ const docTemplateadmin = `{
                         "token": []
                     }
                 ],
-                "description": "机器删除",
+                "description": "批量设备删除",
                 "consumes": [
                     "application/json"
                 ],
@@ -810,17 +1250,17 @@ const docTemplateadmin = `{
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "设备"
                 ],
-                "summary": "机器删除",
+                "summary": "批量设备删除",
                 "parameters": [
                     {
-                        "description": "机器信息",
+                        "description": "设备id",
                         "name": "body",
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/admin.PeerForm"
+                            "$ref": "#/definitions/admin.PeerBatchDeleteForm"
                         }
                     }
                 ],
@@ -847,7 +1287,7 @@ const docTemplateadmin = `{
                         "token": []
                     }
                 ],
-                "description": "机器详情",
+                "description": "设备详情",
                 "consumes": [
                     "application/json"
                 ],
@@ -855,9 +1295,9 @@ const docTemplateadmin = `{
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "设备"
                 ],
-                "summary": "机器详情",
+                "summary": "设备详情",
                 "parameters": [
                     {
                         "type": "integer",
@@ -902,7 +1342,7 @@ const docTemplateadmin = `{
                         "token": []
                     }
                 ],
-                "description": "机器列表",
+                "description": "设备列表",
                 "consumes": [
                     "application/json"
                 ],
@@ -910,9 +1350,9 @@ const docTemplateadmin = `{
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "设备"
                 ],
-                "summary": "机器列表",
+                "summary": "设备列表",
                 "parameters": [
                     {
                         "type": "integer",
@@ -925,6 +1365,12 @@ const docTemplateadmin = `{
                         "description": "页大小",
                         "name": "page_size",
                         "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "时间",
+                        "name": "time_ago",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -962,7 +1408,7 @@ const docTemplateadmin = `{
                         "token": []
                     }
                 ],
-                "description": "机器编辑",
+                "description": "设备编辑",
                 "consumes": [
                     "application/json"
                 ],
@@ -970,12 +1416,12 @@ const docTemplateadmin = `{
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "设备"
                 ],
-                "summary": "机器编辑",
+                "summary": "设备编辑",
                 "parameters": [
                     {
-                        "description": "机器信息",
+                        "description": "设备信息",
                         "name": "body",
                         "in": "body",
                         "required": true,
@@ -1646,6 +2092,55 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "/admin/user/myOauth": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "我的授权",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "用户"
+                ],
+                "summary": "我的授权",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/admin.UserOauthItem"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/user/update": {
             "post": {
                 "security": [
@@ -1760,6 +2255,9 @@ const docTemplateadmin = `{
                 "password": {
                     "type": "string"
                 },
+                "platform": {
+                    "type": "string"
+                },
                 "username": {
                     "type": "string"
                 }
@@ -1774,7 +2272,7 @@ const docTemplateadmin = `{
                 "alias": {
                     "type": "string"
                 },
-                "force_always_relay": {
+                "forceAlwaysRelay": {
                     "type": "boolean"
                 },
                 "hash": {
@@ -1786,7 +2284,7 @@ const docTemplateadmin = `{
                 "id": {
                     "type": "string"
                 },
-                "login_name": {
+                "loginName": {
                     "type": "string"
                 },
                 "online": {
@@ -1798,16 +2296,16 @@ const docTemplateadmin = `{
                 "platform": {
                     "type": "string"
                 },
-                "rdp_port": {
+                "rdpPort": {
                     "type": "string"
                 },
-                "rdp_username": {
+                "rdpUsername": {
                     "type": "string"
                 },
                 "row_id": {
                     "type": "integer"
                 },
-                "same_server": {
+                "sameServer": {
                     "type": "boolean"
                 },
                 "tags": {
@@ -1819,6 +2317,12 @@ const docTemplateadmin = `{
                 "user_id": {
                     "type": "integer"
                 },
+                "user_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
                 "username": {
                     "type": "string"
                 }
@@ -1877,6 +2381,49 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "admin.OauthForm": {
+            "type": "object",
+            "required": [
+                "client_id",
+                "client_secret",
+                "op",
+                "redirect_url"
+            ],
+            "properties": {
+                "auto_register": {
+                    "type": "boolean"
+                },
+                "client_id": {
+                    "type": "string"
+                },
+                "client_secret": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "op": {
+                    "type": "string"
+                },
+                "redirect_url": {
+                    "type": "string"
+                }
+            }
+        },
+        "admin.PeerBatchDeleteForm": {
+            "type": "object",
+            "required": [
+                "row_ids"
+            ],
+            "properties": {
+                "row_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "admin.PeerForm": {
             "type": "object",
             "properties": {
@@ -1913,8 +2460,7 @@ const docTemplateadmin = `{
             "type": "object",
             "required": [
                 "color",
-                "name",
-                "user_id"
+                "name"
             ],
             "properties": {
                 "color": {
@@ -1935,7 +2481,6 @@ const docTemplateadmin = `{
             "type": "object",
             "required": [
                 "group_id",
-                "nickname",
                 "status",
                 "username"
             ],
@@ -1971,6 +2516,17 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "admin.UserOauthItem": {
+            "type": "object",
+            "properties": {
+                "status": {
+                    "type": "integer"
+                },
+                "third_type": {
+                    "type": "string"
+                }
+            }
+        },
         "admin.UserPasswordForm": {
             "type": "object",
             "required": [
@@ -2110,6 +2666,110 @@ const docTemplateadmin = `{
                 }
             }
         },
+        "model.LoginLog": {
+            "type": "object",
+            "properties": {
+                "client": {
+                    "description": "webadmin,webclient,app,",
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "ip": {
+                    "type": "string"
+                },
+                "platform": {
+                    "description": "windows,linux,mac,android,ios",
+                    "type": "string"
+                },
+                "type": {
+                    "description": "account,oauth",
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "integer"
+                },
+                "uuid": {
+                    "type": "string"
+                }
+            }
+        },
+        "model.LoginLogList": {
+            "type": "object",
+            "properties": {
+                "list": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.LoginLog"
+                    }
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "page_size": {
+                    "type": "integer"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            }
+        },
+        "model.Oauth": {
+            "type": "object",
+            "properties": {
+                "auto_register": {
+                    "type": "boolean"
+                },
+                "client_id": {
+                    "type": "string"
+                },
+                "client_secret": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "op": {
+                    "type": "string"
+                },
+                "redirect_url": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                }
+            }
+        },
+        "model.OauthList": {
+            "type": "object",
+            "properties": {
+                "list": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.Oauth"
+                    }
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "page_size": {
+                    "type": "integer"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            }
+        },
         "model.Peer": {
             "type": "object",
             "properties": {
@@ -2125,6 +2785,9 @@ const docTemplateadmin = `{
                 "id": {
                     "type": "string"
                 },
+                "last_online_time": {
+                    "type": "integer"
+                },
                 "memory": {
                     "type": "string"
                 },

docs/admin/admin_swagger.json

@@ -15,7 +15,7 @@
                         "token": []
                     }
                 ],
-                "description": "创建地址簿",
+                "description": "批量创建地址簿",
                 "consumes": [
                     "application/json"
                 ],
@@ -25,7 +25,7 @@
                 "tags": [
                     "地址簿"
                 ],
-                "summary": "创建地址簿",
+                "summary": "批量创建地址簿",
                 "parameters": [
                     {
                         "description": "地址簿信息",
@@ -702,6 +702,172 @@
                 }
             }
         },
+        "/admin/loginLog/delete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "登录日志删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "登录日志"
+                ],
+                "summary": "登录日志删除",
+                "parameters": [
+                    {
+                        "description": "登录日志信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/model.LoginLog"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/loginLog/detail/{id}": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "登录日志详情",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "登录日志"
+                ],
+                "summary": "登录日志详情",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "ID",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.LoginLog"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/loginLog/list": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "登录日志列表",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "登录日志"
+                ],
+                "summary": "登录日志列表",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "页大小",
+                        "name": "page_size",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "用户ID",
+                        "name": "user_id",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.LoginLogList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/logout": {
             "post": {
                 "description": "登出",
@@ -731,14 +897,14 @@
                 }
             }
         },
-        "/admin/peer/create": {
+        "/admin/oauth/create": {
             "post": {
                 "security": [
                     {
                         "token": []
                     }
                 ],
-                "description": "创建机器",
+                "description": "创建Oauth",
                 "consumes": [
                     "application/json"
                 ],
@@ -746,12 +912,286 @@
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "Oauth"
                 ],
-                "summary": "创建机器",
+                "summary": "创建Oauth",
                 "parameters": [
                     {
-                        "description": "机器信息",
+                        "description": "Oauth信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.OauthForm"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.Oauth"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/oauth/delete": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "Oauth删除",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "Oauth删除",
+                "parameters": [
+                    {
+                        "description": "Oauth信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.OauthForm"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/oauth/detail/{id}": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "Oauth详情",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "Oauth详情",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "ID",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.Oauth"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/oauth/list": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "Oauth列表",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "Oauth列表",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "页大小",
+                        "name": "page_size",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.OauthList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/oauth/update": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "Oauth编辑",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "Oauth编辑",
+                "parameters": [
+                    {
+                        "description": "Oauth信息",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/admin.OauthForm"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/model.OauthList"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/admin/peer/create": {
+            "post": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "创建设备",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "设备"
+                ],
+                "summary": "创建设备",
+                "parameters": [
+                    {
+                        "description": "设备信息",
                         "name": "body",
                         "in": "body",
                         "required": true,
@@ -795,7 +1235,7 @@
                         "token": []
                     }
                 ],
-                "description": "机器删除",
+                "description": "批量设备删除",
                 "consumes": [
                     "application/json"
                 ],
@@ -803,17 +1243,17 @@
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "设备"
                 ],
-                "summary": "机器删除",
+                "summary": "批量设备删除",
                 "parameters": [
                     {
-                        "description": "机器信息",
+                        "description": "设备id",
                         "name": "body",
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/admin.PeerForm"
+                            "$ref": "#/definitions/admin.PeerBatchDeleteForm"
                         }
                     }
                 ],
@@ -840,7 +1280,7 @@
                         "token": []
                     }
                 ],
-                "description": "机器详情",
+                "description": "设备详情",
                 "consumes": [
                     "application/json"
                 ],
@@ -848,9 +1288,9 @@
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "设备"
                 ],
-                "summary": "机器详情",
+                "summary": "设备详情",
                 "parameters": [
                     {
                         "type": "integer",
@@ -895,7 +1335,7 @@
                         "token": []
                     }
                 ],
-                "description": "机器列表",
+                "description": "设备列表",
                 "consumes": [
                     "application/json"
                 ],
@@ -903,9 +1343,9 @@
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "设备"
                 ],
-                "summary": "机器列表",
+                "summary": "设备列表",
                 "parameters": [
                     {
                         "type": "integer",
@@ -918,6 +1358,12 @@
                         "description": "页大小",
                         "name": "page_size",
                         "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "时间",
+                        "name": "time_ago",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -955,7 +1401,7 @@
                         "token": []
                     }
                 ],
-                "description": "机器编辑",
+                "description": "设备编辑",
                 "consumes": [
                     "application/json"
                 ],
@@ -963,12 +1409,12 @@
                     "application/json"
                 ],
                 "tags": [
-                    "机器"
+                    "设备"
                 ],
-                "summary": "机器编辑",
+                "summary": "设备编辑",
                 "parameters": [
                     {
-                        "description": "机器信息",
+                        "description": "设备信息",
                         "name": "body",
                         "in": "body",
                         "required": true,
@@ -1639,6 +2085,55 @@
                 }
             }
         },
+        "/admin/user/myOauth": {
+            "get": {
+                "security": [
+                    {
+                        "token": []
+                    }
+                ],
+                "description": "我的授权",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "用户"
+                ],
+                "summary": "我的授权",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/admin.UserOauthItem"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/admin/user/update": {
             "post": {
                 "security": [
@@ -1753,6 +2248,9 @@
                 "password": {
                     "type": "string"
                 },
+                "platform": {
+                    "type": "string"
+                },
                 "username": {
                     "type": "string"
                 }
@@ -1767,7 +2265,7 @@
                 "alias": {
                     "type": "string"
                 },
-                "force_always_relay": {
+                "forceAlwaysRelay": {
                     "type": "boolean"
                 },
                 "hash": {
@@ -1779,7 +2277,7 @@
                 "id": {
                     "type": "string"
                 },
-                "login_name": {
+                "loginName": {
                     "type": "string"
                 },
                 "online": {
@@ -1791,16 +2289,16 @@
                 "platform": {
                     "type": "string"
                 },
-                "rdp_port": {
+                "rdpPort": {
                     "type": "string"
                 },
-                "rdp_username": {
+                "rdpUsername": {
                     "type": "string"
                 },
                 "row_id": {
                     "type": "integer"
                 },
-                "same_server": {
+                "sameServer": {
                     "type": "boolean"
                 },
                 "tags": {
@@ -1812,6 +2310,12 @@
                 "user_id": {
                     "type": "integer"
                 },
+                "user_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
                 "username": {
                     "type": "string"
                 }
@@ -1870,6 +2374,49 @@
                 }
             }
         },
+        "admin.OauthForm": {
+            "type": "object",
+            "required": [
+                "client_id",
+                "client_secret",
+                "op",
+                "redirect_url"
+            ],
+            "properties": {
+                "auto_register": {
+                    "type": "boolean"
+                },
+                "client_id": {
+                    "type": "string"
+                },
+                "client_secret": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "op": {
+                    "type": "string"
+                },
+                "redirect_url": {
+                    "type": "string"
+                }
+            }
+        },
+        "admin.PeerBatchDeleteForm": {
+            "type": "object",
+            "required": [
+                "row_ids"
+            ],
+            "properties": {
+                "row_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "admin.PeerForm": {
             "type": "object",
             "properties": {
@@ -1906,8 +2453,7 @@
             "type": "object",
             "required": [
                 "color",
-                "name",
-                "user_id"
+                "name"
             ],
             "properties": {
                 "color": {
@@ -1928,7 +2474,6 @@
             "type": "object",
             "required": [
                 "group_id",
-                "nickname",
                 "status",
                 "username"
             ],
@@ -1964,6 +2509,17 @@
                 }
             }
         },
+        "admin.UserOauthItem": {
+            "type": "object",
+            "properties": {
+                "status": {
+                    "type": "integer"
+                },
+                "third_type": {
+                    "type": "string"
+                }
+            }
+        },
         "admin.UserPasswordForm": {
             "type": "object",
             "required": [
@@ -2103,6 +2659,110 @@
                 }
             }
         },
+        "model.LoginLog": {
+            "type": "object",
+            "properties": {
+                "client": {
+                    "description": "webadmin,webclient,app,",
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "ip": {
+                    "type": "string"
+                },
+                "platform": {
+                    "description": "windows,linux,mac,android,ios",
+                    "type": "string"
+                },
+                "type": {
+                    "description": "account,oauth",
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "integer"
+                },
+                "uuid": {
+                    "type": "string"
+                }
+            }
+        },
+        "model.LoginLogList": {
+            "type": "object",
+            "properties": {
+                "list": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.LoginLog"
+                    }
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "page_size": {
+                    "type": "integer"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            }
+        },
+        "model.Oauth": {
+            "type": "object",
+            "properties": {
+                "auto_register": {
+                    "type": "boolean"
+                },
+                "client_id": {
+                    "type": "string"
+                },
+                "client_secret": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "op": {
+                    "type": "string"
+                },
+                "redirect_url": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                }
+            }
+        },
+        "model.OauthList": {
+            "type": "object",
+            "properties": {
+                "list": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.Oauth"
+                    }
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "page_size": {
+                    "type": "integer"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            }
+        },
         "model.Peer": {
             "type": "object",
             "properties": {
@@ -2118,6 +2778,9 @@
                 "id": {
                     "type": "string"
                 },
+                "last_online_time": {
+                    "type": "integer"
+                },
                 "memory": {
                     "type": "string"
                 },

docs/admin/admin_swagger.yaml

@@ -4,6 +4,8 @@ definitions:
     properties:
       password:
         type: string
+      platform:
+        type: string
       username:
         type: string
     required:
@@ -14,7 +16,7 @@ definitions:
     properties:
       alias:
         type: string
-      force_always_relay:
+      forceAlwaysRelay:
         type: boolean
       hash:
         type: string
@@ -22,7 +24,7 @@ definitions:
         type: string
       id:
         type: string
-      login_name:
+      loginName:
         type: string
       online:
         type: boolean
@@ -30,13 +32,13 @@ definitions:
         type: string
       platform:
         type: string
-      rdp_port:
+      rdpPort:
         type: string
-      rdp_username:
+      rdpUsername:
         type: string
       row_id:
         type: integer
-      same_server:
+      sameServer:
         type: boolean
       tags:
         items:
@@ -44,6 +46,10 @@ definitions:
         type: array
       user_id:
         type: integer
+      user_ids:
+        items:
+          type: integer
+        type: array
       username:
         type: string
     required:
@@ -85,6 +91,35 @@ definitions:
       username:
         type: string
     type: object
+  admin.OauthForm:
+    properties:
+      auto_register:
+        type: boolean
+      client_id:
+        type: string
+      client_secret:
+        type: string
+      id:
+        type: integer
+      op:
+        type: string
+      redirect_url:
+        type: string
+    required:
+    - client_id
+    - client_secret
+    - op
+    - redirect_url
+    type: object
+  admin.PeerBatchDeleteForm:
+    properties:
+      row_ids:
+        items:
+          type: integer
+        type: array
+    required:
+    - row_ids
+    type: object
   admin.PeerForm:
     properties:
       cpu:
@@ -119,7 +154,6 @@ definitions:
     required:
     - color
     - name
-    - user_id
     type: object
   admin.UserForm:
     properties:
@@ -144,10 +178,16 @@ definitions:
         type: string
     required:
     - group_id
-    - nickname
     - status
     - username
     type: object
+  admin.UserOauthItem:
+    properties:
+      status:
+        type: integer
+      third_type:
+        type: string
+    type: object
   admin.UserPasswordForm:
     properties:
       id:
@@ -240,6 +280,75 @@ definitions:
       total:
         type: integer
     type: object
+  model.LoginLog:
+    properties:
+      client:
+        description: webadmin,webclient,app,
+        type: string
+      created_at:
+        type: string
+      id:
+        type: integer
+      ip:
+        type: string
+      platform:
+        description: windows,linux,mac,android,ios
+        type: string
+      type:
+        description: account,oauth
+        type: string
+      updated_at:
+        type: string
+      user_id:
+        type: integer
+      uuid:
+        type: string
+    type: object
+  model.LoginLogList:
+    properties:
+      list:
+        items:
+          $ref: '#/definitions/model.LoginLog'
+        type: array
+      page:
+        type: integer
+      page_size:
+        type: integer
+      total:
+        type: integer
+    type: object
+  model.Oauth:
+    properties:
+      auto_register:
+        type: boolean
+      client_id:
+        type: string
+      client_secret:
+        type: string
+      created_at:
+        type: string
+      id:
+        type: integer
+      op:
+        type: string
+      redirect_url:
+        type: string
+      updated_at:
+        type: string
+    type: object
+  model.OauthList:
+    properties:
+      list:
+        items:
+          $ref: '#/definitions/model.Oauth'
+        type: array
+      page:
+        type: integer
+      page_size:
+        type: integer
+      total:
+        type: integer
+    type: object
   model.Peer:
     properties:
       cpu:
@@ -250,6 +359,8 @@ definitions:
         type: string
       id:
         type: string
+      last_online_time:
+        type: integer
       memory:
         type: string
       os:
@@ -375,7 +486,7 @@ paths:
     post:
       consumes:
       - application/json
-      description: 创建地址簿
+      description: 批量创建地址簿
       parameters:
       - description: 地址簿信息
         in: body
@@ -401,7 +512,7 @@ paths:
             $ref: '#/definitions/response.Response'
       security:
       - token: []
-      summary: 创建地址簿
+      summary: 批量创建地址簿
       tags:
       - 地址簿
   /admin/address_book/delete:
@@ -782,6 +893,105 @@ paths:
       summary: 登录
       tags:
       - 登录
+  /admin/loginLog/delete:
+    post:
+      consumes:
+      - application/json
+      description: 登录日志删除
+      parameters:
+      - description: 登录日志信息
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/model.LoginLog'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 登录日志删除
+      tags:
+      - 登录日志
+  /admin/loginLog/detail/{id}:
+    get:
+      consumes:
+      - application/json
+      description: 登录日志详情
+      parameters:
+      - description: ID
+        in: path
+        name: id
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.LoginLog'
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 登录日志详情
+      tags:
+      - 登录日志
+  /admin/loginLog/list:
+    get:
+      consumes:
+      - application/json
+      description: 登录日志列表
+      parameters:
+      - description: 页码
+        in: query
+        name: page
+        type: integer
+      - description: 页大小
+        in: query
+        name: page_size
+        type: integer
+      - description: 用户ID
+        in: query
+        name: user_id
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.LoginLogList'
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 登录日志列表
+      tags:
+      - 登录日志
   /admin/logout:
     post:
       consumes:
@@ -801,13 +1011,174 @@ paths:
       summary: 登出
       tags:
       - 登录
+  /admin/oauth/create:
+    post:
+      consumes:
+      - application/json
+      description: 创建Oauth
+      parameters:
+      - description: Oauth信息
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/admin.OauthForm'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.Oauth'
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 创建Oauth
+      tags:
+      - Oauth
+  /admin/oauth/delete:
+    post:
+      consumes:
+      - application/json
+      description: Oauth删除
+      parameters:
+      - description: Oauth信息
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/admin.OauthForm'
+      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: Oauth删除
+      tags:
+      - Oauth
+  /admin/oauth/detail/{id}:
+    get:
+      consumes:
+      - application/json
+      description: Oauth详情
+      parameters:
+      - description: ID
+        in: path
+        name: id
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.Oauth'
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: Oauth详情
+      tags:
+      - Oauth
+  /admin/oauth/list:
+    get:
+      consumes:
+      - application/json
+      description: Oauth列表
+      parameters:
+      - description: 页码
+        in: query
+        name: page
+        type: integer
+      - description: 页大小
+        in: query
+        name: page_size
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.OauthList'
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: Oauth列表
+      tags:
+      - Oauth
+  /admin/oauth/update:
+    post:
+      consumes:
+      - application/json
+      description: Oauth编辑
+      parameters:
+      - description: Oauth信息
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/admin.OauthForm'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.OauthList'
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: Oauth编辑
+      tags:
+      - Oauth
   /admin/peer/create:
     post:
       consumes:
       - application/json
-      description: 创建机器
+      description: 创建设备
       parameters:
-      - description: 机器信息
+      - description: 设备信息
         in: body
         name: body
         required: true
@@ -831,21 +1202,21 @@ paths:
             $ref: '#/definitions/response.Response'
       security:
       - token: []
-      summary: 创建机器
+      summary: 创建设备
       tags:
-      - 机器
+      - 设备
   /admin/peer/delete:
     post:
       consumes:
       - application/json
-      description: 机器删除
+      description: 批量设备删除
       parameters:
-      - description: 机器信息
+      - description: 设备id
         in: body
         name: body
         required: true
         schema:
-          $ref: '#/definitions/admin.PeerForm'
+          $ref: '#/definitions/admin.PeerBatchDeleteForm'
       produces:
       - application/json
       responses:
@@ -859,14 +1230,14 @@ paths:
             $ref: '#/definitions/response.Response'
       security:
       - token: []
-      summary: 机器删除
+      summary: 批量设备删除
       tags:
-      - 机器
+      - 设备
   /admin/peer/detail/{id}:
     get:
       consumes:
       - application/json
-      description: 机器详情
+      description: 设备详情
       parameters:
       - description: ID
         in: path
@@ -891,14 +1262,14 @@ paths:
             $ref: '#/definitions/response.Response'
       security:
       - token: []
-      summary: 机器详情
+      summary: 设备详情
       tags:
-      - 机器
+      - 设备
   /admin/peer/list:
     get:
       consumes:
       - application/json
-      description: 机器列表
+      description: 设备列表
       parameters:
       - description: 页码
         in: query
@@ -908,6 +1279,10 @@ paths:
         in: query
         name: page_size
         type: integer
+      - description: 时间
+        in: query
+        name: time_ago
+        type: integer
       produces:
       - application/json
       responses:
@@ -926,16 +1301,16 @@ paths:
             $ref: '#/definitions/response.Response'
       security:
       - token: []
-      summary: 机器列表
+      summary: 设备列表
       tags:
-      - 机器
+      - 设备
   /admin/peer/update:
     post:
       consumes:
       - application/json
-      description: 机器编辑
+      description: 设备编辑
       parameters:
-      - description: 机器信息
+      - description: 设备信息
         in: body
         name: body
         required: true
@@ -959,9 +1334,9 @@ paths:
             $ref: '#/definitions/response.Response'
       security:
       - token: []
-      summary: 机器编辑
+      summary: 设备编辑
       tags:
-      - 机器
+      - 设备
   /admin/server-config:
     get:
       consumes:
@@ -1338,6 +1713,34 @@ paths:
       summary: 管理员列表
       tags:
       - 用户
+  /admin/user/myOauth:
+    get:
+      consumes:
+      - application/json
+      description: 我的授权
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/admin.UserOauthItem'
+                  type: array
+              type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - token: []
+      summary: 我的授权
+      tags:
+      - 用户
   /admin/user/update:
     post:
       consumes:

docs/api/api_docs.go

@@ -136,7 +136,7 @@ const docTemplateapi = `{
                     "application/json"
                 ],
                 "tags": [
-                    "地址"
+                    "地址[Personal]"
                 ],
                 "summary": "标签添加",
                 "responses": {
@@ -155,14 +155,14 @@ const docTemplateapi = `{
                 }
             }
         },
-        "/ab/personal": {
+        "/ab/peer/add/{guid}": {
             "post": {
                 "security": [
                     {
                         "BearerAuth": []
                     }
                 ],
-                "description": "个人信息",
+                "description": "添加地址",
                 "consumes": [
                     "application/json"
                 ],
@@ -170,9 +170,136 @@ const docTemplateapi = `{
                     "application/json"
                 ],
                 "tags": [
-                    "用户"
+                    "地址[Personal]"
                 ],
-                "summary": "个人信息",
+                "summary": "添加地址",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "删除地址",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "删除地址",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/peer/update/{guid}": {
+            "put": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "更新地址",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "更新地址",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/peers": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "地址",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "地址列表",
                 "parameters": [
                     {
                         "description": "string valid",
@@ -199,14 +326,14 @@ const docTemplateapi = `{
                 }
             }
         },
-        "/api": {
-            "get": {
+        "/ab/personal": {
+            "post": {
                 "security": [
                     {
-                        "token": []
+                        "BearerAuth": []
                     }
                 ],
-                "description": "用户信息",
+                "description": "个人地址",
                 "consumes": [
                     "application/json"
                 ],
@@ -214,14 +341,24 @@ const docTemplateapi = `{
                     "application/json"
                 ],
                 "tags": [
-                    "用户"
+                    "地址[Personal]"
+                ],
+                "summary": "个人地址",
+                "parameters": [
+                    {
+                        "description": "string valid",
+                        "name": "string",
+                        "in": "body",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
                 ],
-                "summary": "用户信息",
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/api.UserPayload"
+                            "$ref": "#/definitions/response.Response"
                         }
                     },
                     "500": {
@@ -233,7 +370,240 @@ const docTemplateapi = `{
                 }
             }
         },
-        "/currentUser": {
+        "/ab/settings": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "设置",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "设置",
+                "parameters": [
+                    {
+                        "description": "string valid",
+                        "name": "string",
+                        "in": "body",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/shared/profiles": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "共享",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "共享地址簿",
+                "parameters": [
+                    {
+                        "description": "string valid",
+                        "name": "string",
+                        "in": "body",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/tag/rename/{guid}": {
+            "put": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "标签",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "标签重命名",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/tag/update/{guid}": {
+            "put": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "标签",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "标签修改颜色",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/tag/{guid}": {
+            "delete": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "标签",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "标签删除",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/tags/{guid}": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "标签",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "标签",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/model.TagList"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/api": {
             "get": {
                 "security": [
                     {
@@ -394,6 +764,93 @@ const docTemplateapi = `{
                 }
             }
         },
+        "/oauth/callback": {
+            "get": {
+                "description": "OauthCallback",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "OauthCallback",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/api.LoginRes"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/oidc/auth": {
+            "post": {
+                "description": "OidcAuth",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "OidcAuth",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/api.LoginRes"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/oidc/auth-query": {
+            "get": {
+                "description": "OidcAuthQuery",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "OidcAuthQuery",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/api.LoginRes"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/peers": {
             "get": {
                 "security": [
@@ -656,21 +1113,50 @@ const docTemplateapi = `{
                 }
             }
         },
+        "api.DeviceInfoInLogin": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "os": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            }
+        },
         "api.LoginForm": {
             "type": "object",
             "required": [
                 "username"
             ],
             "properties": {
+                "autoLogin": {
+                    "type": "boolean"
+                },
+                "deviceInfo": {
+                    "$ref": "#/definitions/api.DeviceInfoInLogin"
+                },
+                "id": {
+                    "type": "string"
+                },
                 "password": {
                     "type": "string",
                     "maxLength": 20,
                     "minLength": 4
                 },
+                "type": {
+                    "type": "string"
+                },
                 "username": {
                     "type": "string",
                     "maxLength": 10,
                     "minLength": 4
+                },
+                "uuid": {
+                    "type": "string"
                 }
             }
         },
@@ -729,6 +1215,10 @@ const docTemplateapi = `{
                 "email": {
                     "type": "string"
                 },
+                "info": {
+                    "type": "object",
+                    "additionalProperties": true
+                },
                 "is_admin": {
                     "type": "boolean"
                 },
@@ -767,6 +1257,26 @@ const docTemplateapi = `{
                 }
             }
         },
+        "model.TagList": {
+            "type": "object",
+            "properties": {
+                "list": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.Tag"
+                    }
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "page_size": {
+                    "type": "integer"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            }
+        },
         "response.DataResponse": {
             "type": "object",
             "properties": {

docs/api/api_swagger.json

@@ -129,7 +129,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "地址"
+                    "地址[Personal]"
                 ],
                 "summary": "标签添加",
                 "responses": {
@@ -148,14 +148,14 @@
                 }
             }
         },
-        "/ab/personal": {
+        "/ab/peer/add/{guid}": {
             "post": {
                 "security": [
                     {
                         "BearerAuth": []
                     }
                 ],
-                "description": "个人信息",
+                "description": "添加地址",
                 "consumes": [
                     "application/json"
                 ],
@@ -163,9 +163,136 @@
                     "application/json"
                 ],
                 "tags": [
-                    "用户"
+                    "地址[Personal]"
                 ],
-                "summary": "个人信息",
+                "summary": "添加地址",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "删除地址",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "删除地址",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/peer/update/{guid}": {
+            "put": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "更新地址",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "更新地址",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/peers": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "地址",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "地址列表",
                 "parameters": [
                     {
                         "description": "string valid",
@@ -192,14 +319,14 @@
                 }
             }
         },
-        "/api": {
-            "get": {
+        "/ab/personal": {
+            "post": {
                 "security": [
                     {
-                        "token": []
+                        "BearerAuth": []
                     }
                 ],
-                "description": "用户信息",
+                "description": "个人地址",
                 "consumes": [
                     "application/json"
                 ],
@@ -207,14 +334,24 @@
                     "application/json"
                 ],
                 "tags": [
-                    "用户"
+                    "地址[Personal]"
+                ],
+                "summary": "个人地址",
+                "parameters": [
+                    {
+                        "description": "string valid",
+                        "name": "string",
+                        "in": "body",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
                 ],
-                "summary": "用户信息",
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/api.UserPayload"
+                            "$ref": "#/definitions/response.Response"
                         }
                     },
                     "500": {
@@ -226,7 +363,240 @@
                 }
             }
         },
-        "/currentUser": {
+        "/ab/settings": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "设置",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "设置",
+                "parameters": [
+                    {
+                        "description": "string valid",
+                        "name": "string",
+                        "in": "body",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/shared/profiles": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "共享",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "共享地址簿",
+                "parameters": [
+                    {
+                        "description": "string valid",
+                        "name": "string",
+                        "in": "body",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/tag/rename/{guid}": {
+            "put": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "标签",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "标签重命名",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/tag/update/{guid}": {
+            "put": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "标签",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "标签修改颜色",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/tag/{guid}": {
+            "delete": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "标签",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "标签删除",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/ab/tags/{guid}": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "标签",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "地址[Personal]"
+                ],
+                "summary": "标签",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/model.TagList"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/api": {
             "get": {
                 "security": [
                     {
@@ -387,6 +757,93 @@
                 }
             }
         },
+        "/oauth/callback": {
+            "get": {
+                "description": "OauthCallback",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "OauthCallback",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/api.LoginRes"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/oidc/auth": {
+            "post": {
+                "description": "OidcAuth",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "OidcAuth",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/api.LoginRes"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/oidc/auth-query": {
+            "get": {
+                "description": "OidcAuthQuery",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Oauth"
+                ],
+                "summary": "OidcAuthQuery",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/api.LoginRes"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/response.ErrorResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/peers": {
             "get": {
                 "security": [
@@ -649,21 +1106,50 @@
                 }
             }
         },
+        "api.DeviceInfoInLogin": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "os": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            }
+        },
         "api.LoginForm": {
             "type": "object",
             "required": [
                 "username"
             ],
             "properties": {
+                "autoLogin": {
+                    "type": "boolean"
+                },
+                "deviceInfo": {
+                    "$ref": "#/definitions/api.DeviceInfoInLogin"
+                },
+                "id": {
+                    "type": "string"
+                },
                 "password": {
                     "type": "string",
                     "maxLength": 20,
                     "minLength": 4
                 },
+                "type": {
+                    "type": "string"
+                },
                 "username": {
                     "type": "string",
                     "maxLength": 10,
                     "minLength": 4
+                },
+                "uuid": {
+                    "type": "string"
                 }
             }
         },
@@ -722,6 +1208,10 @@
                 "email": {
                     "type": "string"
                 },
+                "info": {
+                    "type": "object",
+                    "additionalProperties": true
+                },
                 "is_admin": {
                     "type": "boolean"
                 },
@@ -760,6 +1250,26 @@
                 }
             }
         },
+        "model.TagList": {
+            "type": "object",
+            "properties": {
+                "list": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.Tag"
+                    }
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "page_size": {
+                    "type": "integer"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            }
+        },
         "response.DataResponse": {
             "type": "object",
             "properties": {

docs/api/api_swagger.yaml

@@ -6,16 +6,35 @@ definitions:
         example: '{"tags":["tag1","tag2","tag3"],"peers":[{"id":"abc","username":"abv-l","hostname":"","platform":"Windows","alias":"","tags":["tag1","tag2"],"hash":"hash"}],"tag_colors":"{\"tag1\":4288585374,\"tag2\":4278238420,\"tag3\":4291681337}"}'
         type: string
     type: object
+  api.DeviceInfoInLogin:
+    properties:
+      name:
+        type: string
+      os:
+        type: string
+      type:
+        type: string
+    type: object
   api.LoginForm:
     properties:
+      autoLogin:
+        type: boolean
+      deviceInfo:
+        $ref: '#/definitions/api.DeviceInfoInLogin'
+      id:
+        type: string
       password:
         maxLength: 20
         minLength: 4
         type: string
+      type:
+        type: string
       username:
         maxLength: 10
         minLength: 4
         type: string
+      uuid:
+        type: string
     required:
     - username
     type: object
@@ -55,6 +74,9 @@ definitions:
     properties:
       email:
         type: string
+      info:
+        additionalProperties: true
+        type: object
       is_admin:
         type: boolean
       name:
@@ -81,6 +103,19 @@ definitions:
       user_id:
         type: integer
     type: object
+  model.TagList:
+    properties:
+      list:
+        items:
+          $ref: '#/definitions/model.Tag'
+        type: array
+      page:
+        type: integer
+      page_size:
+        type: integer
+      total:
+        type: integer
+    type: object
   response.DataResponse:
     properties:
       data: {}
@@ -193,12 +228,92 @@ paths:
       - BearerAuth: []
       summary: 标签添加
       tags:
-      - 地址
-  /ab/personal:
+      - 地址[Personal]
+  /ab/peer/add/{guid}:
+    delete:
+      consumes:
+      - application/json
+      description: 删除地址
+      parameters:
+      - description: id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            type: string
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      security:
+      - BearerAuth: []
+      summary: 删除地址
+      tags:
+      - 地址[Personal]
     post:
       consumes:
       - application/json
-      description: 个人信息
+      description: 添加地址
+      parameters:
+      - description: id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            type: string
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      security:
+      - BearerAuth: []
+      summary: 添加地址
+      tags:
+      - 地址[Personal]
+  /ab/peer/update/{guid}:
+    put:
+      consumes:
+      - application/json
+      description: 更新地址
+      parameters:
+      - description: id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            type: string
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      security:
+      - BearerAuth: []
+      summary: 更新地址
+      tags:
+      - 地址[Personal]
+  /ab/peers:
+    post:
+      consumes:
+      - application/json
+      description: 地址
       parameters:
       - description: string valid
         in: body
@@ -218,31 +333,181 @@ paths:
             $ref: '#/definitions/response.Response'
       security:
       - BearerAuth: []
-      summary: 个人信息
+      summary: 地址列表
       tags:
-      - 用户
-  /api:
-    get:
+      - 地址[Personal]
+  /ab/personal:
+    post:
       consumes:
       - application/json
-      description: 用户信息
+      description: 个人地址
+      parameters:
+      - description: string valid
+        in: body
+        name: string
+        schema:
+          type: string
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/api.UserPayload'
+            $ref: '#/definitions/response.Response'
         "500":
           description: Internal Server Error
           schema:
             $ref: '#/definitions/response.Response'
       security:
-      - token: []
-      summary: 用户信息
+      - BearerAuth: []
+      summary: 个人地址
       tags:
-      - 用户
-  /currentUser:
+      - 地址[Personal]
+  /ab/settings:
+    post:
+      consumes:
+      - application/json
+      description: 设置
+      parameters:
+      - description: string valid
+        in: body
+        name: string
+        schema:
+          type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - BearerAuth: []
+      summary: 设置
+      tags:
+      - 地址[Personal]
+  /ab/shared/profiles:
+    post:
+      consumes:
+      - application/json
+      description: 共享
+      parameters:
+      - description: string valid
+        in: body
+        name: string
+        schema:
+          type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/response.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - BearerAuth: []
+      summary: 共享地址簿
+      tags:
+      - 地址[Personal]
+  /ab/tag/{guid}:
+    delete:
+      consumes:
+      - application/json
+      description: 标签
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            type: string
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      security:
+      - BearerAuth: []
+      summary: 标签删除
+      tags:
+      - 地址[Personal]
+  /ab/tag/rename/{guid}:
+    put:
+      consumes:
+      - application/json
+      description: 标签
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            type: string
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      security:
+      - BearerAuth: []
+      summary: 标签重命名
+      tags:
+      - 地址[Personal]
+  /ab/tag/update/{guid}:
+    put:
+      consumes:
+      - application/json
+      description: 标签
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            type: string
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      security:
+      - BearerAuth: []
+      summary: 标签修改颜色
+      tags:
+      - 地址[Personal]
+  /ab/tags/{guid}:
+    post:
+      consumes:
+      - application/json
+      description: 标签
+      parameters:
+      - description: id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/model.TagList'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      security:
+      - BearerAuth: []
+      summary: 标签
+      tags:
+      - 地址[Personal]
+  /api:
     get:
       consumes:
       - application/json
@@ -346,6 +611,63 @@ paths:
       summary: 登出
       tags:
       - 登录
+  /oauth/callback:
+    get:
+      consumes:
+      - application/json
+      description: OauthCallback
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/api.LoginRes'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      summary: OauthCallback
+      tags:
+      - Oauth
+  /oidc/auth:
+    post:
+      consumes:
+      - application/json
+      description: OidcAuth
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/api.LoginRes'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      summary: OidcAuth
+      tags:
+      - Oauth
+  /oidc/auth-query:
+    get:
+      consumes:
+      - application/json
+      description: OidcAuthQuery
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/api.LoginRes'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/response.ErrorResponse'
+      summary: OidcAuthQuery
+      tags:
+      - Oauth
   /peers:
     get:
       consumes:

generate_run.go

@@ -0,0 +1,3 @@
+package Gwen
+
+//go:generate go run cmd/apimain.go

global/global.go

@@ -6,9 +6,11 @@ import (
 	"Gwen/lib/jwt"
 	"Gwen/lib/lock"
 	"Gwen/lib/upload"
+	"github.com/gin-gonic/gin"
 	ut "github.com/go-playground/universal-translator"
 	"github.com/go-playground/validator/v10"
 	"github.com/go-redis/redis/v8"
+	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"gorm.io/gorm"
@@ -23,11 +25,13 @@ var (
 	Cache     cache.Handler
 	Validator struct {
 		Validate    *validator.Validate
+		UT          *ut.UniversalTranslator
 		VTrans      ut.Translator
-		ValidStruct func(interface{}) []string
-		ValidVar    func(field interface{}, tag string) []string
+		ValidStruct func(*gin.Context, interface{}) []string
+		ValidVar    func(ctx *gin.Context, field interface{}, tag string) []string
 	}
-	Oss  *upload.Oss
-	Jwt  *jwt.Jwt
-	Lock lock.Locker
+	Oss       *upload.Oss
+	Jwt       *jwt.Jwt
+	Lock      lock.Locker
+	Localizer func(ctx *gin.Context) *i18n.Localizer
 )

go.mod

@@ -3,6 +3,7 @@ module Gwen
 go 1.22
 
 require (
+	github.com/BurntSushi/toml v1.3.2
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6
@@ -12,17 +13,22 @@ require (
 	github.com/go-playground/validator/v10 v10.11.2
 	github.com/go-redis/redis/v8 v8.11.4
 	github.com/golang-jwt/jwt/v5 v5.2.1
+	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/viper v1.9.0
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
 	github.com/swaggo/swag v1.16.3
+	golang.org/x/oauth2 v0.23.0
+	golang.org/x/text v0.18.0
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/driver/sqlite v1.5.6
 	gorm.io/gorm v1.25.7
 )
 
 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
@@ -61,12 +67,11 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.9 // indirect
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	golang.org/x/crypto v0.23.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
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/ini.v1 v1.63.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

http/controller/admin/addressBook.go

@@ -4,6 +4,7 @@ import (
 	"Gwen/global"
 	"Gwen/http/request/admin"
 	"Gwen/http/response"
+	"Gwen/model"
 	"Gwen/service"
 	_ "encoding/json"
 	"github.com/gin-gonic/gin"
@@ -31,14 +32,14 @@ func (ct *AddressBook) Detail(c *gin.Context) {
 	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.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
 		return
 	}
 	if t.RowId > 0 {
 		response.Success(c, t)
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 	return
 }
 
@@ -56,10 +57,10 @@ func (ct *AddressBook) Detail(c *gin.Context) {
 func (ct *AddressBook) Create(c *gin.Context) {
 	f := &admin.AddressBookForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -69,14 +70,72 @@ func (ct *AddressBook) Create(c *gin.Context) {
 	if !service.AllService.UserService.IsAdmin(u) || t.UserId == 0 {
 		t.UserId = u.Id
 	}
+	ex := service.AllService.AddressBookService.InfoByUserIdAndId(t.UserId, t.Id)
+	if ex.RowId > 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemExist"))
+		return
+	}
+
 	err := service.AllService.AddressBookService.Create(t)
 	if err != nil {
-		response.Fail(c, 101, "创建失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, u)
 }
 
+// BatchCreate 批量创建地址簿
+// @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/address_book/create [post]
+// @Security token
+func (ct *AddressBook) BatchCreate(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
+	}
+
+	//创建标签
+	for _, fu := range f.UserIds {
+		if fu == 0 {
+			continue
+		}
+		for _, ft := range f.Tags {
+			exTag := service.AllService.TagService.InfoByUserIdAndName(fu, ft)
+			if exTag.Id == 0 {
+				service.AllService.TagService.Create(&model.Tag{
+					UserId: fu,
+					Name:   ft,
+				})
+			}
+		}
+	}
+	ts := f.ToAddressBooks()
+	for _, t := range ts {
+		if t.UserId == 0 {
+			continue
+		}
+		ex := service.AllService.AddressBookService.InfoByUserIdAndId(t.UserId, t.Id)
+		if ex.RowId == 0 {
+			service.AllService.AddressBookService.Create(t)
+		}
+	}
+
+	response.Success(c, nil)
+}
+
 // List 列表
 // @Tags 地址簿
 // @Summary 地址簿列表
@@ -94,7 +153,7 @@ func (ct *AddressBook) Create(c *gin.Context) {
 func (ct *AddressBook) List(c *gin.Context) {
 	query := &admin.AddressBookQuery{}
 	if err := c.ShouldBindQuery(query); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	u := service.AllService.UserService.CurUser(c)
@@ -102,9 +161,18 @@ func (ct *AddressBook) List(c *gin.Context) {
 		query.UserId = int(u.Id)
 	}
 	res := service.AllService.AddressBookService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
+		if query.Id != "" {
+			tx.Where("id like ?", "%"+query.Id+"%")
+		}
 		if query.UserId > 0 {
 			tx.Where("user_id = ?", query.UserId)
 		}
+		if query.Username != "" {
+			tx.Where("username like ?", "%"+query.Username+"%")
+		}
+		if query.Hostname != "" {
+			tx.Where("hostname like ?", "%"+query.Hostname+"%")
+		}
 	})
 	response.Success(c, res)
 }
@@ -123,27 +191,27 @@ func (ct *AddressBook) List(c *gin.Context) {
 func (ct *AddressBook) Update(c *gin.Context) {
 	f := &admin.AddressBookForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	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.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		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.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
 		return
 	}
 	err := service.AllService.AddressBookService.Update(t)
 	if err != nil {
-		response.Fail(c, 101, "更新失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, nil)
@@ -163,11 +231,11 @@ func (ct *AddressBook) Update(c *gin.Context) {
 func (ct *AddressBook) Delete(c *gin.Context) {
 	f := &admin.AddressBookForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "系统错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	id := f.RowId
-	errList := global.Validator.ValidVar(id, "required,gt=0")
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -175,7 +243,7 @@ func (ct *AddressBook) Delete(c *gin.Context) {
 	t := service.AllService.AddressBookService.InfoByRowId(f.RowId)
 	u := service.AllService.UserService.CurUser(c)
 	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, "无权限")
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
 		return
 	}
 	if u.Id > 0 {
@@ -184,8 +252,49 @@ func (ct *AddressBook) Delete(c *gin.Context) {
 			response.Success(c, nil)
 			return
 		}
-		response.Fail(c, 101, err.Error())
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+}
+
+// ShareByWebClient
+// @Tags 地址簿
+// @Summary 地址簿分享
+// @Description 地址簿分享
+// @Accept  json
+// @Produce  json
+// @Param body body admin.ShareByWebClientForm true "地址簿信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/address_book/share [post]
+// @Security token
+func (ct *AddressBook) ShareByWebClient(c *gin.Context) {
+	f := &admin.ShareByWebClientForm{}
+	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)
+	ab := service.AllService.AddressBookService.InfoByUserIdAndId(u.Id, f.Id)
+	if ab.RowId == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	m := f.ToShareRecord()
+	m.UserId = u.Id
+	err := service.AllService.AddressBookService.ShareByWebClient(m)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, &gin.H{
+		"share_token": m.ShareToken,
+	})
 }

http/controller/admin/group.go

@@ -31,7 +31,7 @@ func (ct *Group) Detail(c *gin.Context) {
 		response.Success(c, u)
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 	return
 }
 
@@ -49,10 +49,10 @@ func (ct *Group) Detail(c *gin.Context) {
 func (ct *Group) Create(c *gin.Context) {
 	f := &admin.GroupForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -60,7 +60,7 @@ func (ct *Group) Create(c *gin.Context) {
 	u := f.ToGroup()
 	err := service.AllService.GroupService.Create(u)
 	if err != nil {
-		response.Fail(c, 101, "创建失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, u)
@@ -81,7 +81,7 @@ func (ct *Group) Create(c *gin.Context) {
 func (ct *Group) List(c *gin.Context) {
 	query := &admin.PageQuery{}
 	if err := c.ShouldBindQuery(query); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	res := service.AllService.GroupService.List(query.Page, query.PageSize, nil)
@@ -102,14 +102,14 @@ func (ct *Group) List(c *gin.Context) {
 func (ct *Group) Update(c *gin.Context) {
 	f := &admin.GroupForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	if f.Id == 0 {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -117,7 +117,7 @@ func (ct *Group) Update(c *gin.Context) {
 	u := f.ToGroup()
 	err := service.AllService.GroupService.Update(u)
 	if err != nil {
-		response.Fail(c, 101, "更新失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, nil)
@@ -137,11 +137,11 @@ func (ct *Group) Update(c *gin.Context) {
 func (ct *Group) Delete(c *gin.Context) {
 	f := &admin.GroupForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "系统错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	id := f.Id
-	errList := global.Validator.ValidVar(id, "required,gt=0")
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -153,8 +153,8 @@ func (ct *Group) Delete(c *gin.Context) {
 			response.Success(c, nil)
 			return
 		}
-		response.Fail(c, 101, err.Error())
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 }

http/controller/admin/login.go

@@ -5,8 +5,8 @@ import (
 	"Gwen/http/request/admin"
 	"Gwen/http/response"
 	adResp "Gwen/http/response/admin"
+	"Gwen/model"
 	"Gwen/service"
-	"fmt"
 	"github.com/gin-gonic/gin"
 )
 
@@ -25,15 +25,14 @@ type Login struct {
 // @Router /admin/login [post]
 // @Security token
 func (ct *Login) Login(c *gin.Context) {
-	fmt.Println("login")
 	f := &admin.Login{}
 	err := c.ShouldBindJSON(f)
 	if err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -41,11 +40,18 @@ func (ct *Login) Login(c *gin.Context) {
 	u := service.AllService.UserService.InfoByUsernamePassword(f.Username, f.Password)
 
 	if u.Id == 0 {
-		response.Fail(c, 101, "用户名或密码错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "UsernameOrPasswordError"))
 		return
 	}
 
-	ut := service.AllService.UserService.Login(u)
+	ut := service.AllService.UserService.Login(u, &model.LoginLog{
+		UserId:   u.Id,
+		Client:   "webadmin",
+		Uuid:     "",
+		Ip:       c.ClientIP(),
+		Type:     "account",
+		Platform: f.Platform,
+	})
 
 	response.Success(c, &adResp.LoginPayload{
 		Token:      ut.Token,

http/controller/admin/loginLog.go

@@ -0,0 +1,110 @@
+package admin
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/model"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+	"strconv"
+)
+
+type LoginLog struct {
+}
+
+// Detail 登录日志
+// @Tags 登录日志
+// @Summary 登录日志详情
+// @Description 登录日志详情
+// @Accept  json
+// @Produce  json
+// @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]
+// @Security token
+func (ct *LoginLog) Detail(c *gin.Context) {
+	id := c.Param("id")
+	iid, _ := strconv.Atoi(id)
+	u := service.AllService.LoginLogService.InfoById(uint(iid))
+	if u.Id > 0 {
+		response.Success(c, u)
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+	return
+}
+
+// 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.LoginLogList}
+// @Failure 500 {object} response.Response
+// @Router /admin/loginLog/list [get]
+// @Security token
+func (ct *LoginLog) List(c *gin.Context) {
+	query := &admin.LoginLogQuery{}
+	if err := c.ShouldBindQuery(query); err != nil {
+		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.LoginLogService.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 model.LoginLog true "登录日志信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/loginLog/delete [post]
+// @Security token
+func (ct *LoginLog) Delete(c *gin.Context) {
+	f := &model.LoginLog{}
+	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.LoginLogService.InfoById(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.LoginLogService.Delete(l)
+		if err == nil {
+			response.Success(c, nil)
+			return
+		}
+		response.Fail(c, 101, err.Error())
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+}

http/controller/admin/oauth.go

@@ -0,0 +1,299 @@
+package admin
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/admin"
+	adminReq "Gwen/http/request/admin"
+	"Gwen/http/response"
+	"Gwen/model"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"strconv"
+)
+
+type Oauth struct {
+}
+
+// Info
+func (o *Oauth) Info(c *gin.Context) {
+	code := c.Query("code")
+	if code == "" {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	v := service.AllService.OauthService.GetOauthCache(code)
+	if v == nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	response.Success(c, v)
+}
+
+func (o *Oauth) ToBind(c *gin.Context) {
+	f := &adminReq.BindOauthForm{}
+	err := c.ShouldBindJSON(f)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+
+	utr := service.AllService.UserService.UserThirdInfo(u.Id, f.Op)
+	if utr.Id > 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "OauthHasBindOtherUser"))
+		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.OauthActionTypeBind,
+		Op:     f.Op,
+		UserId: u.Id,
+	}, 5*60)
+
+	response.Success(c, gin.H{
+		"code": code,
+		"url":  url,
+	})
+}
+
+// Confirm 确认授权登录
+func (o *Oauth) Confirm(c *gin.Context) {
+	j := &adminReq.OauthConfirmForm{}
+	err := c.ShouldBindJSON(j)
+	if err != nil {
+		response.Fail(c, 101, "参数错误"+err.Error())
+		return
+	}
+	if j.Code == "" {
+		response.Fail(c, 101, "参数错误: code 不存在")
+		return
+	}
+	v := service.AllService.OauthService.GetOauthCache(j.Code)
+	if v == nil {
+		response.Fail(c, 101, "授权已过期")
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	v.UserId = u.Id
+	service.AllService.OauthService.SetOauthCache(j.Code, v, 0)
+	response.Success(c, v)
+}
+
+func (o *Oauth) BindConfirm(c *gin.Context) {
+	j := &adminReq.OauthConfirmForm{}
+	err := c.ShouldBindJSON(j)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	if j.Code == "" {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	v := service.AllService.OauthService.GetOauthCache(j.Code)
+	if v == 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)
+	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)
+}
+
+func (o *Oauth) Unbind(c *gin.Context) {
+	f := &adminReq.UnBindOauthForm{}
+	err := c.ShouldBindJSON(f)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	utr := service.AllService.UserService.UserThirdInfo(u.Id, f.Op)
+	if utr.Id == 0 {
+		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
+		}
+	}
+	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)
+}
+
+// Detail Oauth
+// @Tags Oauth
+// @Summary Oauth详情
+// @Description Oauth详情
+// @Accept  json
+// @Produce  json
+// @Param id path int true "ID"
+// @Success 200 {object} response.Response{data=model.Oauth}
+// @Failure 500 {object} response.Response
+// @Router /admin/oauth/detail/{id} [get]
+// @Security token
+func (o *Oauth) Detail(c *gin.Context) {
+	id := c.Param("id")
+	iid, _ := strconv.Atoi(id)
+	u := service.AllService.OauthService.InfoById(uint(iid))
+	if u.Id > 0 {
+		response.Success(c, u)
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+	return
+}
+
+// Create 创建Oauth
+// @Tags Oauth
+// @Summary 创建Oauth
+// @Description 创建Oauth
+// @Accept  json
+// @Produce  json
+// @Param body body admin.OauthForm true "Oauth信息"
+// @Success 200 {object} response.Response{data=model.Oauth}
+// @Failure 500 {object} response.Response
+// @Router /admin/oauth/create [post]
+// @Security token
+func (o *Oauth) Create(c *gin.Context) {
+	f := &admin.OauthForm{}
+	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
+	}
+
+	ex := service.AllService.OauthService.InfoByOp(f.Op)
+	if ex.Id > 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemExists"))
+		return
+	}
+
+	u := f.ToOauth()
+	err := service.AllService.OauthService.Create(u)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, u)
+}
+
+// List 列表
+// @Tags Oauth
+// @Summary Oauth列表
+// @Description Oauth列表
+// @Accept  json
+// @Produce  json
+// @Param page query int false "页码"
+// @Param page_size query int false "页大小"
+// @Success 200 {object} response.Response{data=model.OauthList}
+// @Failure 500 {object} response.Response
+// @Router /admin/oauth/list [get]
+// @Security token
+func (o *Oauth) 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
+	}
+	res := service.AllService.OauthService.List(query.Page, query.PageSize, nil)
+	response.Success(c, res)
+}
+
+// Update 编辑
+// @Tags Oauth
+// @Summary Oauth编辑
+// @Description Oauth编辑
+// @Accept  json
+// @Produce  json
+// @Param body body admin.OauthForm true "Oauth信息"
+// @Success 200 {object} response.Response{data=model.OauthList}
+// @Failure 500 {object} response.Response
+// @Router /admin/oauth/update [post]
+// @Security token
+func (o *Oauth) Update(c *gin.Context) {
+	f := &admin.OauthForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	if f.Id == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	errList := global.Validator.ValidStruct(c, f)
+	if len(errList) > 0 {
+		response.Fail(c, 101, errList[0])
+		return
+	}
+	u := f.ToOauth()
+	err := service.AllService.OauthService.Update(u)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
+}
+
+// Delete 删除
+// @Tags Oauth
+// @Summary Oauth删除
+// @Description Oauth删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.OauthForm true "Oauth信息"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/oauth/delete [post]
+// @Security token
+func (o *Oauth) Delete(c *gin.Context) {
+	f := &admin.OauthForm{}
+	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.OauthService.InfoById(f.Id)
+	if u.Id > 0 {
+		err := service.AllService.OauthService.Delete(u)
+		if err == nil {
+			response.Success(c, nil)
+			return
+		}
+		response.Fail(c, 101, err.Error())
+		return
+	}
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+}

http/controller/admin/peer.go

@@ -6,16 +6,18 @@ import (
 	"Gwen/http/response"
 	"Gwen/service"
 	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
 	"strconv"
+	"time"
 )
 
 type Peer struct {
 }
 
-// Detail 机器
-// @Tags 机器
-// @Summary 机器详情
-// @Description 机器详情
+// Detail 设备
+// @Tags 设备
+// @Summary 设备详情
+// @Description 设备详情
 // @Accept  json
 // @Produce  json
 // @Param id path int true "ID"
@@ -31,17 +33,17 @@ func (ct *Peer) Detail(c *gin.Context) {
 		response.Success(c, u)
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 	return
 }
 
-// Create 创建机器
-// @Tags 机器
-// @Summary 创建机器
-// @Description 创建机器
+// Create 创建设备
+// @Tags 设备
+// @Summary 创建设备
+// @Description 创建设备
 // @Accept  json
 // @Produce  json
-// @Param body body admin.PeerForm true "机器信息"
+// @Param body body admin.PeerForm true "设备信息"
 // @Success 200 {object} response.Response{data=model.Peer}
 // @Failure 500 {object} response.Response
 // @Router /admin/peer/create [post]
@@ -49,10 +51,10 @@ func (ct *Peer) Detail(c *gin.Context) {
 func (ct *Peer) Create(c *gin.Context) {
 	f := &admin.PeerForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -60,41 +62,51 @@ func (ct *Peer) Create(c *gin.Context) {
 	u := f.ToPeer()
 	err := service.AllService.PeerService.Create(u)
 	if err != nil {
-		response.Fail(c, 101, "创建失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, u)
 }
 
 // List 列表
-// @Tags 机器
-// @Summary 机器列表
-// @Description 机器列表
+// @Tags 设备
+// @Summary 设备列表
+// @Description 设备列表
 // @Accept  json
 // @Produce  json
 // @Param page query int false "页码"
 // @Param page_size query int false "页大小"
+// @Param time_ago query int false "时间"
 // @Success 200 {object} response.Response{data=model.PeerList}
 // @Failure 500 {object} response.Response
 // @Router /admin/peer/list [get]
 // @Security token
 func (ct *Peer) List(c *gin.Context) {
-	query := &admin.PageQuery{}
+	query := &admin.PeerQuery{}
 	if err := c.ShouldBindQuery(query); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	res := service.AllService.PeerService.List(query.Page, query.PageSize, nil)
+	res := service.AllService.PeerService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
+		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)
+		}
+	})
 	response.Success(c, res)
 }
 
 // Update 编辑
-// @Tags 机器
-// @Summary 机器编辑
-// @Description 机器编辑
+// @Tags 设备
+// @Summary 设备编辑
+// @Description 设备编辑
 // @Accept  json
 // @Produce  json
-// @Param body body admin.PeerForm true "机器信息"
+// @Param body body admin.PeerForm true "设备信息"
 // @Success 200 {object} response.Response{data=model.Peer}
 // @Failure 500 {object} response.Response
 // @Router /admin/peer/update [post]
@@ -102,14 +114,14 @@ func (ct *Peer) List(c *gin.Context) {
 func (ct *Peer) Update(c *gin.Context) {
 	f := &admin.PeerForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	if f.RowId == 0 {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -117,19 +129,19 @@ func (ct *Peer) Update(c *gin.Context) {
 	u := f.ToPeer()
 	err := service.AllService.PeerService.Update(u)
 	if err != nil {
-		response.Fail(c, 101, "更新失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, nil)
 }
 
 // Delete 删除
-// @Tags 机器
-// @Summary 机器删除
-// @Description 机器删除
+// @Tags 设备
+// @Summary 设备删除
+// @Description 设备删除
 // @Accept  json
 // @Produce  json
-// @Param body body admin.PeerForm true "机器信息"
+// @Param body body admin.PeerForm true "设备信息"
 // @Success 200 {object} response.Response
 // @Failure 500 {object} response.Response
 // @Router /admin/peer/delete [post]
@@ -137,11 +149,11 @@ func (ct *Peer) Update(c *gin.Context) {
 func (ct *Peer) Delete(c *gin.Context) {
 	f := &admin.PeerForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "系统错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	id := f.RowId
-	errList := global.Validator.ValidVar(id, "required,gt=0")
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -153,8 +165,37 @@ func (ct *Peer) Delete(c *gin.Context) {
 			response.Success(c, nil)
 			return
 		}
-		response.Fail(c, 101, err.Error())
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
+}
+
+// BatchDelete 批量删除
+// @Tags 设备
+// @Summary 批量设备删除
+// @Description 批量设备删除
+// @Accept  json
+// @Produce  json
+// @Param body body admin.PeerBatchDeleteForm true "设备id"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/peer/delete [post]
+// @Security token
+func (ct *Peer) BatchDelete(c *gin.Context) {
+	f := &admin.PeerBatchDeleteForm{}
+	if err := c.ShouldBindJSON(f); err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	if len(f.RowIds) == 0 {
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
+		return
+	}
+	err := service.AllService.PeerService.BatchDelete(f.RowIds)
+	if err != nil {
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	response.Success(c, nil)
 }

http/controller/admin/tag.go

@@ -30,14 +30,14 @@ func (ct *Tag) Detail(c *gin.Context) {
 	t := service.AllService.TagService.InfoById(uint(iid))
 	u := service.AllService.UserService.CurUser(c)
 	if !service.AllService.UserService.IsAdmin(u) && t.UserId != u.Id {
-		response.Fail(c, 101, "无权限")
+		response.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
 		return
 	}
 	if t.Id > 0 {
 		response.Success(c, t)
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 	return
 }
 
@@ -55,22 +55,22 @@ func (ct *Tag) Detail(c *gin.Context) {
 func (ct *Tag) Create(c *gin.Context) {
 	f := &admin.TagForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	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)
-	if !service.AllService.UserService.IsAdmin(u) {
+	if !service.AllService.UserService.IsAdmin(u) || t.UserId == 0 {
 		t.UserId = u.Id
 	}
 	err := service.AllService.TagService.Create(t)
 	if err != nil {
-		response.Fail(c, 101, "创建失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, u)
@@ -93,7 +93,7 @@ func (ct *Tag) Create(c *gin.Context) {
 func (ct *Tag) List(c *gin.Context) {
 	query := &admin.TagQuery{}
 	if err := c.ShouldBindQuery(query); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	u := service.AllService.UserService.CurUser(c)
@@ -122,27 +122,27 @@ func (ct *Tag) List(c *gin.Context) {
 func (ct *Tag) Update(c *gin.Context) {
 	f := &admin.TagForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	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.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.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
 		return
 	}
 	err := service.AllService.TagService.Update(t)
 	if err != nil {
-		response.Fail(c, 101, "更新失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, nil)
@@ -162,11 +162,11 @@ func (ct *Tag) Update(c *gin.Context) {
 func (ct *Tag) Delete(c *gin.Context) {
 	f := &admin.TagForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "系统错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	id := f.Id
-	errList := global.Validator.ValidVar(id, "required,gt=0")
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -174,7 +174,7 @@ func (ct *Tag) Delete(c *gin.Context) {
 	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.Fail(c, 101, response.TranslateMsg(c, "NoAccess"))
 		return
 	}
 	if u.Id > 0 {
@@ -186,5 +186,5 @@ func (ct *Tag) Delete(c *gin.Context) {
 		response.Fail(c, 101, err.Error())
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 }

http/controller/admin/user.go

@@ -33,7 +33,7 @@ func (ct *User) Detail(c *gin.Context) {
 		response.Success(c, u)
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 	return
 }
 
@@ -51,10 +51,10 @@ func (ct *User) Detail(c *gin.Context) {
 func (ct *User) Create(c *gin.Context) {
 	f := &admin.UserForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -62,7 +62,7 @@ func (ct *User) Create(c *gin.Context) {
 	u := f.ToUser()
 	err := service.AllService.UserService.Create(u)
 	if err != nil {
-		response.Fail(c, 101, "创建失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, u)
@@ -84,7 +84,7 @@ func (ct *User) Create(c *gin.Context) {
 func (ct *User) List(c *gin.Context) {
 	query := &admin.UserQuery{}
 	if err := c.ShouldBindQuery(query); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	res := service.AllService.UserService.List(query.Page, query.PageSize, func(tx *gorm.DB) {
@@ -109,14 +109,14 @@ func (ct *User) List(c *gin.Context) {
 func (ct *User) Update(c *gin.Context) {
 	f := &admin.UserForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误:"+err.Error())
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	if f.Id == 0 {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -124,7 +124,7 @@ func (ct *User) Update(c *gin.Context) {
 	u := f.ToUser()
 	err := service.AllService.UserService.Update(u)
 	if err != nil {
-		response.Fail(c, 101, "更新失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, nil)
@@ -144,11 +144,11 @@ func (ct *User) Update(c *gin.Context) {
 func (ct *User) Delete(c *gin.Context) {
 	f := &admin.UserForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "系统错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	id := f.Id
-	errList := global.Validator.ValidVar(id, "required,gt=0")
+	errList := global.Validator.ValidVar(c, id, "required,gt=0")
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -163,7 +163,7 @@ func (ct *User) Delete(c *gin.Context) {
 		response.Fail(c, 101, err.Error())
 		return
 	}
-	response.Fail(c, 101, "信息不存在")
+	response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 }
 
 // UpdatePassword 修改密码
@@ -180,22 +180,22 @@ func (ct *User) Delete(c *gin.Context) {
 func (ct *User) UpdatePassword(c *gin.Context) {
 	f := &admin.UserPasswordForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
 	}
 	u := service.AllService.UserService.InfoById(f.Id)
 	if u.Id == 0 {
-		response.Fail(c, 101, "信息不存在")
+		response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound"))
 		return
 	}
 	err := service.AllService.UserService.UpdatePassword(u, f.Password)
 	if err != nil {
-		response.Fail(c, 101, "更新失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, nil)
@@ -237,11 +237,11 @@ func (ct *User) Current(c *gin.Context) {
 func (ct *User) ChangeCurPwd(c *gin.Context) {
 	f := &admin.ChangeCurPasswordForm{}
 	if err := c.ShouldBindJSON(f); err != nil {
-		response.Fail(c, 101, "参数错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Fail(c, 101, errList[0])
 		return
@@ -249,13 +249,47 @@ func (ct *User) ChangeCurPwd(c *gin.Context) {
 	u := service.AllService.UserService.CurUser(c)
 	oldPwd := service.AllService.UserService.EncryptPassword(f.OldPassword)
 	if u.Password != oldPwd {
-		response.Fail(c, 101, "旧密码错误")
+		response.Fail(c, 101, response.TranslateMsg(c, "OldPasswordError"))
 		return
 	}
 	err := service.AllService.UserService.UpdatePassword(u, f.NewPassword)
 	if err != nil {
-		response.Fail(c, 101, "更新失败")
+		response.Fail(c, 101, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 	response.Success(c, nil)
 }
+
+// MyOauth
+// @Tags 用户
+// @Summary 我的授权
+// @Description 我的授权
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response{data=[]adResp.UserOauthItem}
+// @Failure 500 {object} response.Response
+// @Router /admin/user/myOauth [get]
+// @Security token
+func (ct *User) MyOauth(c *gin.Context) {
+	u := service.AllService.UserService.CurUser(c)
+	oal := service.AllService.OauthService.List(1, 100, nil)
+	ops := make([]string, 0)
+	for _, oa := range oal.Oauths {
+		ops = append(ops, oa.Op)
+	}
+	uts := service.AllService.UserService.UserThirdsByUserId(u.Id)
+	var res []*adResp.UserOauthItem
+	for _, oa := range oal.Oauths {
+		item := &adResp.UserOauthItem{
+			ThirdType: oa.Op,
+		}
+		for _, ut := range uts {
+			if ut.ThirdType == oa.Op {
+				item.Status = 1
+				break
+			}
+		}
+		res = append(res, item)
+	}
+	response.Success(c, res)
+}

http/controller/api/ab.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"Gwen/global"
 	requstform "Gwen/http/request/api"
 	"Gwen/http/response"
 	"Gwen/http/response/api"
@@ -10,6 +11,7 @@ import (
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"strconv"
 )
 
 type Ab struct {
@@ -66,39 +68,30 @@ func (a *Ab) UpAb(c *gin.Context) {
 	abf := &requstform.AddressBookForm{}
 	err := c.ShouldBindJSON(&abf)
 	if err != nil {
-		fmt.Println(err)
-		response.Error(c, "参数错误")
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 	abd := &requstform.AddressBookFormData{}
 	err = json.Unmarshal([]byte(abf.Data), abd)
 	if err != nil {
-		response.Error(c, "系统错误")
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	tc := map[string]uint{}
+	err = json.Unmarshal([]byte(abd.TagColors), &tc)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-
-	//fmt.Println(abd)
-	//for _, peer := range abd.Peers {
-	//	fmt.Println(peer)
-	//}
-
 	user := service.AllService.UserService.CurUser(c)
 
 	err = service.AllService.AddressBookService.UpdateAddressBook(abd.Peers, user.Id)
 	if err != nil {
-		c.Abort()
+		response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
 		return
 	}
 
-	tc := map[string]uint{}
-	err = json.Unmarshal([]byte(abd.TagColors), &tc)
-	if err != nil {
-		fmt.Println(err)
-		response.Error(c, "系统错误")
-		return
-	} else {
-		service.AllService.TagService.UpdateTags(user.Id, tc)
-	}
+	service.AllService.TagService.UpdateTags(user.Id, tc)
 
 	c.JSON(http.StatusOK, nil)
 }
@@ -121,7 +114,7 @@ func (a *Ab) Tags(c *gin.Context) {
 }
 
 // TagAdd
-// @Tags 地址
+// @Tags 地址[Personal]
 // @Summary 标签添加
 // @Description 标签
 // @Accept  json
@@ -134,17 +127,361 @@ func (a *Ab) TagAdd(c *gin.Context) {
 	t := &model.Tag{}
 	err := c.ShouldBindJSON(t)
 	if err != nil {
-		fmt.Println(err)
-		response.Error(c, "参数错误")
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
-
 	}
-	//u := service.AllService.UserService.CurUser(c)
-
-	//err = service.AllService.TagService.UpdateTags(t.Name, t.Color, user.Id)
-	//if err != nil {
-	//	response.Error(c, "操作失败")
-	//	return
-	//}
-	c.JSON(http.StatusOK, "")
+	u := service.AllService.UserService.CurUser(c)
+	tag := service.AllService.TagService.InfoByUserIdAndName(u.Id, t.Name)
+	if tag != nil && tag.Id != 0 {
+		response.Error(c, response.TranslateMsg(c, "ItemExists"))
+		return
+	}
+	t.UserId = u.Id
+	err = service.AllService.TagService.Create(t)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	c.String(http.StatusOK, "")
+}
+
+// TagRename
+// @Tags 地址[Personal]
+// @Summary 标签重命名
+// @Description 标签
+// @Accept  json
+// @Produce  json
+// @Success 200 {string} string
+// @Failure 500 {object} response.ErrorResponse
+// @Router /ab/tag/rename/{guid} [put]
+// @Security BearerAuth
+func (a *Ab) TagRename(c *gin.Context) {
+	t := &requstform.TagRenameForm{}
+	err := c.ShouldBindJSON(t)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	tag := service.AllService.TagService.InfoByUserIdAndName(u.Id, t.Old)
+	if tag == nil || tag.Id == 0 {
+		response.Error(c, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	ntag := service.AllService.TagService.InfoByUserIdAndName(u.Id, t.New)
+	if ntag != nil && ntag.Id != 0 {
+		response.Error(c, response.TranslateMsg(c, "ItemExists"))
+		return
+	}
+	tag.Name = t.New
+	err = service.AllService.TagService.Update(tag)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	c.String(http.StatusOK, "")
+}
+
+// TagUpdate
+// @Tags 地址[Personal]
+// @Summary 标签修改颜色
+// @Description 标签
+// @Accept  json
+// @Produce  json
+// @Success 200 {string} string
+// @Failure 500 {object} response.ErrorResponse
+// @Router /ab/tag/update/{guid} [put]
+// @Security BearerAuth
+func (a *Ab) TagUpdate(c *gin.Context) {
+	t := &requstform.TagColorForm{}
+	err := c.ShouldBindJSON(t)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	tag := service.AllService.TagService.InfoByUserIdAndName(u.Id, t.Name)
+	if tag == nil || tag.Id == 0 {
+		response.Error(c, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	tag.Color = t.Color
+	err = service.AllService.TagService.Update(tag)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	c.String(http.StatusOK, "")
+}
+
+// TagDel
+// @Tags 地址[Personal]
+// @Summary 标签删除
+// @Description 标签
+// @Accept  json
+// @Produce  json
+// @Success 200 {string} string
+// @Failure 500 {object} response.ErrorResponse
+// @Router /ab/tag/{guid} [delete]
+// @Security BearerAuth
+func (a *Ab) TagDel(c *gin.Context) {
+	t := &[]string{}
+	err := c.ShouldBind(t)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	//fmt.Println(t)
+	u := service.AllService.UserService.CurUser(c)
+	for _, name := range *t {
+		tag := service.AllService.TagService.InfoByUserIdAndName(u.Id, name)
+		if tag == nil || tag.Id == 0 {
+			response.Error(c, response.TranslateMsg(c, "ItemNotFound"))
+			return
+		}
+		err = service.AllService.TagService.Delete(tag)
+		if err != nil {
+			response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
+			return
+		}
+	}
+	c.String(http.StatusOK, "")
+}
+
+// Personal
+// @Tags 地址[Personal]
+// @Summary 个人地址
+// @Description 个人地址
+// @Accept  json
+// @Produce  json
+// @Param string body string false  "string valid"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /ab/personal [post]
+// @Security BearerAuth
+func (a *Ab) Personal(c *gin.Context) {
+	user := service.AllService.UserService.CurUser(c)
+	/**
+	guid = json['guid'] ?? '',
+	       name = json['name'] ?? '',
+	       owner = json['owner'] ?? '',
+	       note = json['note'] ?? '',
+	       rule = json['rule'] ?? 0;
+	*/
+	if global.Config.Rustdesk.Personal == 1 {
+		guid := strconv.Itoa(int(user.GroupId)) + "-" + strconv.Itoa(int(user.Id))
+		//如果返回了guid，后面的请求会有变化
+		c.JSON(http.StatusOK, gin.H{
+			"guid": guid,
+			"name": user.Username,
+			"rule": 0,
+		})
+	} else {
+		c.JSON(http.StatusOK, nil)
+	}
+
+}
+
+// Settings
+// @Tags 地址[Personal]
+// @Summary 设置
+// @Description 设置
+// @Accept  json
+// @Produce  json
+// @Param string body string false  "string valid"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /ab/settings [post]
+// @Security BearerAuth
+func (a *Ab) Settings(c *gin.Context) {
+	c.JSON(http.StatusOK, gin.H{
+		"max_peer_one_ab": 0, //最大peer数，0表示不限制
+	})
+}
+
+// SharedProfiles
+// @Tags 地址[Personal]
+// @Summary 共享地址簿
+// @Description 共享
+// @Accept  json
+// @Produce  json
+// @Param string body string false  "string valid"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /ab/shared/profiles [post]
+// @Security BearerAuth
+func (a *Ab) SharedProfiles(c *gin.Context) {
+	//AbProfile.fromJson(Map<String, dynamic> json)
+	//: guid = json['guid'] ?? '',
+	//	name = json['name'] ?? '',
+	//	owner = json['owner'] ?? '',
+	//	note = json['note'] ?? '',
+	//	rule = json['rule'] ?? 0;
+	//暂时没必要返回数据，可能是为了共享地址簿
+	/*item := map[string]interface{}{
+		"guid":  "1",
+		"name":  "admin",
+		"owner": "admin",
+		"note":  "admin11",
+		"rule":  0,
+	}
+	item2 := map[string]interface{}{
+		"guid":  "2",
+		"name":  "admin2",
+		"owner": "admin2",
+		"note":  "admin22",
+		"rule":  0,
+	}
+	c.JSON(http.StatusOK, gin.H{
+		"total": 2,
+		"data":  []interface{}{item, item2},
+	})*/
+
+	c.JSON(http.StatusOK, gin.H{
+		"total": 0,
+		"data":  nil,
+	})
+}
+
+// Peers
+// @Tags 地址[Personal]
+// @Summary 地址列表
+// @Description 地址
+// @Accept  json
+// @Produce  json
+// @Param string body string false  "string valid"
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /ab/peers [post]
+// @Security BearerAuth
+func (a *Ab) Peers(c *gin.Context) {
+	user := service.AllService.UserService.CurUser(c)
+	al := service.AllService.AddressBookService.ListByUserId(user.Id, 1, 1000)
+	c.JSON(http.StatusOK, gin.H{
+		"total":            al.Total,
+		"data":             al.AddressBooks,
+		"licensed_devices": 99999,
+	})
+}
+
+// PTags
+// @Tags 地址[Personal]
+// @Summary 标签
+// @Description 标签
+// @Accept  json
+// @Produce  json
+// @Param id path string true "id"
+// @Success 200 {object} model.TagList
+// @Failure 500 {object} response.ErrorResponse
+// @Router /ab/tags/{guid} [post]
+// @Security BearerAuth
+func (a *Ab) PTags(c *gin.Context) {
+	user := service.AllService.UserService.CurUser(c)
+
+	tags := service.AllService.TagService.ListByUserId(user.Id)
+	c.JSON(http.StatusOK, tags.Tags)
+}
+
+// PeerAdd
+// @Tags 地址[Personal]
+// @Summary 添加地址
+// @Description 添加地址
+// @Accept  json
+// @Produce  json
+// @Param id path string true "id"
+// @Success 200 {string} string
+// @Failure 500 {object} response.ErrorResponse
+// @Router /ab/peer/add/{guid} [post]
+// @Security BearerAuth
+func (a *Ab) PeerAdd(c *gin.Context) {
+	// forceAlwaysRelay永远是字符串"false"，真是坑
+	//f := &gin.H{}
+	f := &requstform.PersonalAddressBookForm{}
+	err := c.ShouldBindJSON(f)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	fmt.Println(f)
+	u := service.AllService.UserService.CurUser(c)
+	f.UserId = u.Id
+	ab := f.ToAddressBook()
+	err = service.AllService.AddressBookService.AddAddressBook(ab)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	c.String(http.StatusOK, "")
+}
+
+// PeerDel
+// @Tags 地址[Personal]
+// @Summary 删除地址
+// @Description 删除地址
+// @Accept  json
+// @Produce  json
+// @Param id path string true "id"
+// @Success 200 {string} string
+// @Failure 500 {object} response.ErrorResponse
+// @Router /ab/peer/add/{guid} [delete]
+// @Security BearerAuth
+func (a *Ab) PeerDel(c *gin.Context) {
+	f := &[]string{}
+	err := c.ShouldBind(f)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	u := service.AllService.UserService.CurUser(c)
+	for _, id := range *f {
+		ab := service.AllService.AddressBookService.InfoByUserIdAndId(u.Id, id)
+		if ab == nil || ab.RowId == 0 {
+			response.Error(c, response.TranslateMsg(c, "ItemNotFound"))
+			return
+		}
+		err = service.AllService.AddressBookService.Delete(ab)
+		if err != nil {
+			response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
+			return
+		}
+	}
+
+	c.String(http.StatusOK, "")
+}
+
+// PeerUpdate
+// @Tags 地址[Personal]
+// @Summary 更新地址
+// @Description 更新地址
+// @Accept  json
+// @Produce  json
+// @Param id path string true "id"
+// @Success 200 {string} string
+// @Failure 500 {object} response.ErrorResponse
+// @Router /ab/peer/update/{guid} [put]
+// @Security BearerAuth
+func (a *Ab) PeerUpdate(c *gin.Context) {
+	//f := &gin.H{}
+	f := &requstform.PersonalAddressBookForm{}
+	err := c.ShouldBindJSON(f)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
+		return
+	}
+	//fmt.Println(f)
+	//return
+	u := service.AllService.UserService.CurUser(c)
+	ab := service.AllService.AddressBookService.InfoByUserIdAndId(u.Id, f.Id)
+	if ab == nil || ab.RowId == 0 {
+		response.Error(c, response.TranslateMsg(c, "ItemNotFound"))
+		return
+	}
+	nab := f.ToAddressBook()
+	nab.RowId = ab.RowId
+	err = service.AllService.AddressBookService.Update(nab)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
+		return
+	}
+	c.String(http.StatusOK, "")
 }

http/controller/api/group.go

@@ -33,7 +33,7 @@ func (g *Group) Users(c *gin.Context) {
 	if !*u.IsAdmin {
 		gr := service.AllService.GroupService.InfoById(u.GroupId)
 		if gr.Type != model.GroupTypeShare {
-			response.Error(c, "不是管理员也不在分享组")
+			response.Error(c, response.TranslateMsg(c, "NoAccess"))
 			return
 		}
 	}
@@ -77,7 +77,7 @@ func (g *Group) Peers(c *gin.Context) {
 	if !*u.IsAdmin {
 		gr := service.AllService.GroupService.InfoById(u.GroupId)
 		if gr.Type != model.GroupTypeShare {
-			response.Error(c, "不是管理员也不在分享组")
+			response.Error(c, response.TranslateMsg(c, "NoAccess"))
 			return
 		}
 	}
@@ -96,15 +96,15 @@ func (g *Group) Peers(c *gin.Context) {
 		namesById[user.Id] = user.Username
 		userIds = append(userIds, user.Id)
 	}
-	peerList := service.AllService.AddressBookService.ListByUserIds(userIds, q.Page, q.PageSize)
+	peerList := service.AllService.PeerService.ListByUserIds(userIds, q.Page, q.PageSize)
 	var data []*apiResp.GroupPeerPayload
-	for _, ab := range peerList.AddressBooks {
-		uname, ok := namesById[ab.UserId]
+	for _, peer := range peerList.Peers {
+		uname, ok := namesById[peer.UserId]
 		if !ok {
 			uname = ""
 		}
 		pp := &apiResp.GroupPeerPayload{}
-		pp.FromAddressBook(ab, uname)
+		pp.FromPeer(peer, uname)
 		data = append(data, pp)
 
 	}

http/controller/api/index.go

@@ -1,9 +1,12 @@
 package api
 
 import (
+	requstform "Gwen/http/request/api"
 	"Gwen/http/response"
+	"Gwen/service"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"time"
 )
 
 type Index struct {
@@ -35,5 +38,22 @@ func (i *Index) Index(c *gin.Context) {
 // @Failure 500 {object} response.Response
 // @Router /heartbeat [post]
 func (i *Index) Heartbeat(c *gin.Context) {
+	info := &requstform.PeerInfoInHeartbeat{}
+	err := c.ShouldBindJSON(info)
+	if err != nil {
+		c.JSON(http.StatusOK, gin.H{})
+		return
+	}
+	if info.Uuid == "" {
+		c.JSON(http.StatusOK, gin.H{})
+		return
+	}
+	peer := service.AllService.PeerService.FindByUuid(info.Uuid)
+	if peer == nil {
+		c.JSON(http.StatusOK, gin.H{})
+		return
+	}
+	peer.LastOnlineTime = time.Now().Unix()
+	service.AllService.PeerService.Update(peer)
 	c.JSON(http.StatusOK, gin.H{})
 }

http/controller/api/login.go

@@ -5,7 +5,9 @@ import (
 	"Gwen/http/request/api"
 	"Gwen/http/response"
 	apiResp "Gwen/http/response/api"
+	"Gwen/model"
 	"Gwen/service"
+	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -26,12 +28,13 @@ type Login struct {
 func (l *Login) Login(c *gin.Context) {
 	f := &api.LoginForm{}
 	err := c.ShouldBindJSON(f)
+	//fmt.Println(f)
 	if err != nil {
-		response.Error(c, "系统错误")
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 
-	errList := global.Validator.ValidStruct(f)
+	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
 		response.Error(c, errList[0])
 		return
@@ -40,11 +43,24 @@ func (l *Login) Login(c *gin.Context) {
 	u := service.AllService.UserService.InfoByUsernamePassword(f.Username, f.Password)
 
 	if u.Id == 0 {
-		response.Error(c, "用户名或密码错误")
+		response.Error(c, response.TranslateMsg(c, "UsernameOrPasswordError"))
 		return
 	}
 
-	ut := service.AllService.UserService.Login(u)
+	//根据refer判断是webclient还是app
+	ref := c.GetHeader("referer")
+	if ref != "" {
+		f.DeviceInfo.Type = "webclient"
+	}
+
+	ut := service.AllService.UserService.Login(u, &model.LoginLog{
+		UserId:   u.Id,
+		Client:   f.DeviceInfo.Type,
+		Uuid:     f.Uuid,
+		Ip:       c.ClientIP(),
+		Type:     model.LoginLogTypeAccount,
+		Platform: f.DeviceInfo.Os,
+	})
 
 	c.JSON(http.StatusOK, apiResp.LoginRes{
 		AccessToken: ut.Token,
@@ -63,11 +79,31 @@ func (l *Login) Login(c *gin.Context) {
 // @Failure 500 {object} response.ErrorResponse
 // @Router /login-options [post]
 func (l *Login) LoginOptions(c *gin.Context) {
-	test := []string{
-		//"common-oidc/[{\"name\":\"google\"},{\"name\":\"github\"},{\"name\":\"facebook\"},{\"name\":\"网页授权登录\",\"icon\":\"\"}]",
-		//"oidc/myapp",
+	oauthOks := []string{}
+	err, _ := service.AllService.OauthService.GetOauthConfig(model.OauthTypeGithub)
+	if err == nil {
+		oauthOks = append(oauthOks, model.OauthTypeGithub)
 	}
-	c.JSON(http.StatusOK, test)
+	err, _ = service.AllService.OauthService.GetOauthConfig(model.OauthTypeGoogle)
+	if err == nil {
+		oauthOks = append(oauthOks, model.OauthTypeGoogle)
+	}
+	oauthOks = append(oauthOks, model.OauthTypeWebauth)
+	var oidcItems []map[string]string
+	for _, v := range oauthOks {
+		oidcItems = append(oidcItems, map[string]string{"name": v})
+	}
+	common, err := json.Marshal(oidcItems)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, "SystemError")+err.Error())
+		return
+	}
+	var res []string
+	res = append(res, "common-oidc/"+string(common))
+	for _, v := range oauthOks {
+		res = append(res, "oidc/"+v)
+	}
+	c.JSON(http.StatusOK, res)
 }
 
 // Logout

http/controller/api/ouath.go

@@ -0,0 +1,259 @@
+package api
+
+import (
+	"Gwen/global"
+	"Gwen/http/request/api"
+	"Gwen/http/response"
+	apiResp "Gwen/http/response/api"
+	"Gwen/model"
+	"Gwen/service"
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"strconv"
+	"strings"
+)
+
+type Oauth struct {
+}
+
+// OidcAuth
+// @Tags Oauth
+// @Summary OidcAuth
+// @Description OidcAuth
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} apiResp.LoginRes
+// @Failure 500 {object} response.ErrorResponse
+// @Router /oidc/auth [post]
+func (o *Oauth) OidcAuth(c *gin.Context) {
+	f := &api.OidcAuthRequest{}
+	err := c.ShouldBindJSON(&f)
+	if err != nil {
+		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)
+	if err != nil {
+		response.Error(c, response.TranslateMsg(c, err.Error()))
+		return
+	}
+
+	service.AllService.OauthService.SetOauthCache(code, &service.OauthCacheItem{
+		Action:     service.OauthActionTypeLogin,
+		Id:         f.Id,
+		Op:         f.Op,
+		Uuid:       f.Uuid,
+		DeviceName: f.DeviceInfo.Name,
+		DeviceOs:   f.DeviceInfo.Os,
+		DeviceType: f.DeviceInfo.Type,
+	}, 5*60)
+	//fmt.Println("code url", code, url)
+	c.JSON(http.StatusOK, gin.H{
+		"code": code,
+		"url":  url,
+	})
+}
+
+// OidcAuthQuery
+// @Tags Oauth
+// @Summary OidcAuthQuery
+// @Description OidcAuthQuery
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} apiResp.LoginRes
+// @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())
+		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",
+		User:        *(&apiResp.UserPayload{}).FromUser(u),
+	})
+}
+
+// OauthCallback 回调
+// @Tags Oauth
+// @Summary OauthCallback
+// @Description OauthCallback
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} apiResp.LoginRes
+// @Failure 500 {object} response.ErrorResponse
+// @Router /oauth/callback [get]
+func (o *Oauth) OauthCallback(c *gin.Context) {
+	state := c.Query("state")
+	if state == "" {
+		c.String(http.StatusInternalServerError, response.TranslateParamMsg(c, "ParamIsEmpty", "state"))
+		return
+	}
+
+	cacheKey := state
+	//从缓存中获取
+	v := service.AllService.OauthService.GetOauthCache(cacheKey)
+	if v == 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
+		}
+
+	}
+
+	if ty == model.OauthTypeGoogle {
+		code := c.Query("code")
+		err, userData := service.AllService.OauthService.GoogleCallback(code)
+		if err != nil {
+			c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthFailed")+response.TranslateMsg(c, err.Error()))
+			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"))
+				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)
+			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.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"))
+			return
+		}
+	}
+	c.String(http.StatusInternalServerError, response.TranslateMsg(c, "SystemError"))
+
+}

http/controller/api/peer.go

@@ -27,7 +27,7 @@ func (p *Peer) SysInfo(c *gin.Context) {
 	f := &requstform.PeerForm{}
 	err := c.ShouldBindBodyWith(f, binding.JSON)
 	if err != nil {
-		response.Error(c, err.Error())
+		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 
@@ -36,7 +36,7 @@ func (p *Peer) SysInfo(c *gin.Context) {
 		pe = f.ToPeer()
 		err = service.AllService.PeerService.Create(pe)
 		if err != nil {
-			response.Error(c, err.Error())
+			response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
 			return
 		}
 	}

http/controller/api/user.go

@@ -3,7 +3,6 @@ package api
 import (
 	apiResp "Gwen/http/response/api"
 	"Gwen/service"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -21,11 +20,11 @@ type User struct {
 // @Failure 500 {object} response.Response
 // @Router /currentUser [get]
 // @Security token
-func (u *User) currentUser(c *gin.Context) {
-	user := service.AllService.UserService.CurUser(c)
-	up := (&apiResp.UserPayload{}).FromUser(user)
-	c.JSON(http.StatusOK, up)
-}
+//func (u *User) currentUser(c *gin.Context) {
+//	user := service.AllService.UserService.CurUser(c)
+//	up := (&apiResp.UserPayload{}).FromUser(user)
+//	c.JSON(http.StatusOK, up)
+//}
 
 // Info 用户信息
 // @Tags 用户
@@ -42,33 +41,3 @@ func (u *User) Info(c *gin.Context) {
 	up := (&apiResp.UserPayload{}).FromUser(user)
 	c.JSON(http.StatusOK, up)
 }
-
-// Personal
-// @Tags 用户
-// @Summary 个人信息
-// @Description 个人信息
-// @Accept  json
-// @Produce  json
-// @Param string body string false  "string valid"
-// @Success 200 {object} response.Response
-// @Failure 500 {object} response.Response
-// @Router /ab/personal [post]
-// @Security BearerAuth
-func (u *User) Personal(c *gin.Context) {
-	//打印全部body
-	fmt.Println(c.Request.Body)
-
-	/**
-	guid = json['guid'] ?? '',
-	       name = json['name'] ?? '',
-	       owner = json['owner'] ?? '',
-	       note = json['note'] ?? '',
-	       rule = json['rule'] ?? 0;
-	*/
-	//如果返回了guid，后面的请求会有变化
-	c.JSON(http.StatusOK, gin.H{
-		//"guid": "123456",
-		//"name": "admindddd",
-		//"rule": 1,
-	})
-}

http/controller/api/webClient.go

@@ -6,6 +6,7 @@ import (
 	"Gwen/http/response/api"
 	"Gwen/service"
 	"github.com/gin-gonic/gin"
+	"time"
 )
 
 type WebClient struct {
@@ -36,7 +37,51 @@ func (i *WebClient) ServerConfig(c *gin.Context) {
 		gin.H{
 			"id_server": global.Config.Rustdesk.IdServer,
 			"key":       global.Config.Rustdesk.Key,
-			//"peers":     peers,
+			"peers":     peers,
 		},
 	)
 }
+
+// SharedPeer 分享的peer
+// @Tags WEBCLIENT
+// @Summary 分享的peer
+// @Description 分享的peer
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /shared-peer [post]
+func (i *WebClient) SharedPeer(c *gin.Context) {
+	j := &gin.H{}
+	c.ShouldBindJSON(j)
+	t := (*j)["share_token"].(string)
+	if t == "" {
+		response.Fail(c, 101, "share_token is required")
+		return
+	}
+	sr := service.AllService.AddressBookService.SharedPeer(t)
+	if sr == nil || sr.Id == 0 {
+		response.Fail(c, 101, "share not found")
+		return
+	}
+	//判断是否过期,created_at + expire > now
+	ca := time.Time(sr.CreatedAt)
+	if ca.Add(time.Second * time.Duration(sr.Expire)).Before(time.Now()) {
+		response.Fail(c, 101, "share expired")
+		return
+	}
+	ab := service.AllService.AddressBookService.InfoByUserIdAndId(sr.UserId, sr.PeerId)
+	if ab.RowId == 0 {
+		response.Fail(c, 101, "peer not found")
+		return
+	}
+	pp := &api.WebClientPeerPayload{}
+	pp.FromShareRecord(sr)
+	pp.Info.Username = ab.Username
+	pp.Info.Hostname = ab.Hostname
+	response.Success(c, gin.H{
+		"id_server": global.Config.Rustdesk.IdServer,
+		"key":       global.Config.Rustdesk.Key,
+		"peer":      pp,
+	})
+}

http/controller/web/index.go

@@ -8,61 +8,15 @@ import (
 type Index struct {
 }
 
+func (i *Index) Index(c *gin.Context) {
+	c.Redirect(302, "/_admin/")
+}
+
 func (i *Index) ConfigJs(c *gin.Context) {
 	apiServer := global.Config.Rustdesk.ApiServer
 
 	tmp := `
- 	  window._gwen = {}
-      window._gwen.kv = {}
-      function getQueryVariable() {
-          const query = window.location.hash.substring(3);
-          const vars = query.split("&");
-          for (var i = 0; i < vars.length; i++) {
-              var pair = vars[i].split("=");
-              window._gwen.kv[pair[0]] = pair[1]
-          }
-      }
-      getQueryVariable()
-      const id = window._gwen.kv.id || ''
-      if (id) {
-        localStorage.setItem('remote-id', id)
-      }
-      window._gwen.hosts = [
-        "rs-sg.rustdesk.com",
-        "rs-cn.rustdesk.com",
-        "rs-us.rustdesk.com",
-      ]
 localStorage.setItem('api-server', "` + apiServer + `")
-const autoWriteServer = () => {
-          return setTimeout(() => {
-              const token = localStorage.getItem('access_token')
-              const apiserver = localStorage.getItem('api-server')
-              if (token && apiserver) {
-                  fetch(apiserver + "/api/server-config", {
-                          method: 'POST',
-                          headers: {
-                              'Content-Type': 'application/json',
-                              'Authorization': 'Bearer ' + token
-                          }
-                      }
-                  ).then(res => res.json()).then(res => {
-                      if (res.code === 0) {
-						  if(!localStorage.getItem('custom-rendezvous-server')  || !localStorage.getItem('key') ) {
-	 						localStorage.setItem('custom-rendezvous-server', res.data.id_server)
-							localStorage.setItem('key', res.data.key)
-							}	
-                         
-						  if (res.data.peers) {
-							  localStorage.setItem('peers', JSON.stringify(res.data.peers))
-					      }
-                      }
-                  })
-              } else {
-                  autoWriteServer()
-              }
-          }, 1000)
-      }
-		autoWriteServer()
 `
 	c.String(200, tmp)
 }

http/http.go

@@ -7,12 +7,23 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 	"net/http"
+	"strings"
 )
 
 func ApiInit() {
 	gin.SetMode(global.Config.Gin.Mode)
 	g := gin.New()
 
+	//[WARNING] You trusted all proxies, this is NOT safe. We recommend you to set a value.
+	//Please check https://pkg.go.dev/github.com/gin-gonic/gin#readme-don-t-trust-all-proxies for details.
+	if global.Config.Gin.TrustProxy != "" {
+		pro := strings.Split(global.Config.Gin.TrustProxy, ",")
+		err := g.SetTrustedProxies(pro)
+		if err != nil {
+			panic(err)
+		}
+	}
+
 	if global.Config.Gin.Mode == gin.ReleaseMode {
 		//修改gin Recovery日志 输出为logger的输出点
 		if global.Logger != nil {

http/middleware/rustauth.go

@@ -7,7 +7,7 @@ import (
 
 func RustAuth() gin.HandlerFunc {
 	return func(c *gin.Context) {
-
+		//fmt.Println(c.Request.Header)
 		//获取HTTP_AUTHORIZATION
 		token := c.GetHeader("Authorization")
 		if token == "" {
@@ -17,6 +17,13 @@ func RustAuth() gin.HandlerFunc {
 			c.Abort()
 			return
 		}
+		if len(token) <= 7 {
+			c.JSON(401, gin.H{
+				"error": "Unauthorized",
+			})
+			c.Abort()
+			return
+		}
 		//提取token，格式是Bearer {token}
 		//这里只是简单的提取
 		token = token[7:]

http/request/admin/addressBook.go

@@ -16,12 +16,13 @@ type AddressBookForm struct {
 	Tags             []string `json:"tags"`
 	Hash             string   `json:"hash"`
 	UserId           uint     `json:"user_id"`
-	ForceAlwaysRelay bool     `json:"force_always_relay"`
-	RdpPort          string   `json:"rdp_port"`
-	RdpUsername      string   `json:"rdp_username"`
+	UserIds          []uint   `json:"user_ids"`
+	ForceAlwaysRelay bool     `json:"forceAlwaysRelay"`
+	RdpPort          string   `json:"rdpPort"`
+	RdpUsername      string   `json:"rdpUsername"`
 	Online           bool     `json:"online"`
-	LoginName        string   `json:"login_name" `
-	SameServer       bool     `json:"same_server"`
+	LoginName        string   `json:"loginName" `
+	SameServer       bool     `json:"sameServer"`
 }
 
 func (a AddressBookForm) ToAddressBook() *model.AddressBook {
@@ -48,9 +49,56 @@ func (a AddressBookForm) ToAddressBook() *model.AddressBook {
 	}
 
 }
+func (a AddressBookForm) ToAddressBooks() []*model.AddressBook {
+	//tags转换
+	tags, _ := json.Marshal(a.Tags)
+
+	abs := make([]*model.AddressBook, 0, len(a.UserIds))
+	for _, userId := range a.UserIds {
+		abs = append(abs, &model.AddressBook{
+			RowId:            a.RowId,
+			Id:               a.Id,
+			Username:         a.Username,
+			Password:         a.Password,
+			Hostname:         a.Hostname,
+			Alias:            a.Alias,
+			Platform:         a.Platform,
+			Tags:             tags,
+			Hash:             a.Hash,
+			UserId:           userId,
+			ForceAlwaysRelay: a.ForceAlwaysRelay,
+			RdpPort:          a.RdpPort,
+			RdpUsername:      a.RdpUsername,
+			Online:           a.Online,
+			LoginName:        a.LoginName,
+			SameServer:       a.SameServer,
+		})
+	}
+	return abs
+}
 
 type AddressBookQuery struct {
-	UserId int `form:"user_id"`
-	IsMy   int `form:"is_my"`
+	UserId   int    `form:"user_id"`
+	IsMy     int    `form:"is_my"`
+	Username string `form:"username"`
+	Hostname string `form:"hostname"`
+	Id       string `form:"id"`
 	PageQuery
 }
+
+type ShareByWebClientForm struct {
+	Id           string `json:"id" validate:"required"`
+	PasswordType string `json:"password_type" validate:"required,oneof=once fixed"` //只能是once,fixed
+	Password     string `json:"password" validate:"required"`
+	Expire       int64  `json:"expire"`
+}
+
+func (sbwcf ShareByWebClientForm) ToShareRecord() *model.ShareRecord {
+	return &model.ShareRecord{
+		UserId:       0,
+		PeerId:       sbwcf.Id,
+		PasswordType: sbwcf.PasswordType,
+		Password:     sbwcf.Password,
+		Expire:       sbwcf.Expire,
+	}
+}

http/request/admin/login.go

@@ -3,4 +3,11 @@ package admin
 type Login struct {
 	Username string `json:"username" validate:"required" label:"用户名"`
 	Password string `json:"password,omitempty" validate:"required" label:"密码"`
+	Platform string `json:"platform" label:"平台"`
+}
+
+type LoginLogQuery struct {
+	UserId int `form:"user_id"`
+	IsMy   int `form:"is_my"`
+	PageQuery
 }

http/request/admin/oauth.go

@@ -0,0 +1,34 @@
+package admin
+
+import "Gwen/model"
+
+type BindOauthForm struct {
+	Op string `json:"op" binding:"required"`
+}
+
+type OauthConfirmForm struct {
+	Code string `json:"code" binding:"required"`
+}
+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"`
+}
+
+func (of *OauthForm) ToOauth() *model.Oauth {
+	oa := &model.Oauth{
+		Op:           of.Op,
+		ClientId:     of.ClientId,
+		ClientSecret: of.ClientSecret,
+		RedirectUrl:  of.RedirectUrl,
+		AutoRegister: of.AutoRegister,
+	}
+	oa.Id = of.Id
+	return oa
+}

http/request/admin/peer.go

@@ -14,6 +14,10 @@ type PeerForm struct {
 	Version  string `json:"version"`
 }
 
+type PeerBatchDeleteForm struct {
+	RowIds []uint `json:"row_ids" validate:"required"`
+}
+
 // ToPeer
 func (f *PeerForm) ToPeer() *model.Peer {
 	return &model.Peer{
@@ -28,3 +32,8 @@ func (f *PeerForm) ToPeer() *model.Peer {
 		Version:  f.Version,
 	}
 }
+
+type PeerQuery struct {
+	PageQuery
+	TimeAgo int `json:"time_ago" form:"time_ago"`
+}

http/request/admin/tag.go

@@ -6,7 +6,7 @@ type TagForm struct {
 	Id     uint   `json:"id"`
 	Name   string `json:"name" validate:"required"`
 	Color  uint   `json:"color" validate:"required"`
-	UserId uint   `json:"user_id" validate:"required"`
+	UserId uint   `json:"user_id"`
 }
 
 func (f *TagForm) FromTag(group *model.Tag) *TagForm {

http/request/admin/user.go

@@ -8,7 +8,7 @@ type UserForm struct {
 	Id       uint   `json:"id"`
 	Username string `json:"username" validate:"required,gte=4,lte=10"`
 	//Password string           `json:"password" validate:"required,gte=4,lte=20"`
-	Nickname string           `json:"nickname" validate:"required"`
+	Nickname string           `json:"nickname"`
 	Avatar   string           `json:"avatar"`
 	GroupId  uint             `json:"group_id" validate:"required"`
 	IsAdmin  *bool            `json:"is_admin" `

http/request/api/oauth.go

@@ -0,0 +1,14 @@
+package api
+
+type OidcAuthRequest struct {
+	DeviceInfo DeviceInfoInLogin `json:"deviceInfo" label:"设备信息"`
+	Id         string            `json:"id"  label:"id"`
+	Op         string            `json:"op" label:"op"`
+	Uuid       string            `json:"uuid"  label:"uuid"`
+}
+
+type OidcAuthQuery struct {
+	Code string `json:"code" form:"code" label:"code"`
+	Id   string `json:"id" form:"id" label:"id"`
+	Uuid string `json:"uuid" form:"uuid" label:"uuid"`
+}

http/request/api/peer.go

@@ -35,3 +35,45 @@ func (pf *PeerForm) ToPeer() *model.Peer {
 		Version:  pf.Version,
 	}
 }
+
+// PersonalAddressBookForm 个人地址簿表单
+type PersonalAddressBookForm struct {
+	model.AddressBook
+	ForceAlwaysRelay string `json:"forceAlwaysRelay"`
+}
+
+func (pabf *PersonalAddressBookForm) ToAddressBook() *model.AddressBook {
+	return &model.AddressBook{
+		RowId:            pabf.RowId,
+		Id:               pabf.Id,
+		Username:         pabf.Username,
+		Password:         pabf.Password,
+		Hostname:         pabf.Hostname,
+		Alias:            pabf.Alias,
+		Platform:         pabf.Platform,
+		Tags:             pabf.Tags,
+		Hash:             pabf.Hash,
+		UserId:           pabf.UserId,
+		ForceAlwaysRelay: pabf.ForceAlwaysRelay == "true",
+		RdpPort:          pabf.RdpPort,
+		RdpUsername:      pabf.RdpUsername,
+		Online:           pabf.Online,
+		LoginName:        pabf.LoginName,
+		SameServer:       pabf.SameServer,
+	}
+}
+
+type TagRenameForm struct {
+	Old string `json:"old"`
+	New string `json:"new"`
+}
+type TagColorForm struct {
+	Name  string `json:"name"`
+	Color uint   `json:"color"`
+}
+
+type PeerInfoInHeartbeat struct {
+	Id   string `json:"id"`
+	Uuid string `json:"uuid"`
+	Ver  int    `json:"ver"`
+}

http/request/api/user.go

@@ -21,9 +21,21 @@ package api
 	  bytes hwid = 14;
 	}
 */
+
+type DeviceInfoInLogin struct {
+	Name string `json:"name" label:"name"`
+	Os   string `json:"os" label:"os"`
+	Type string `json:"type" label:"type"`
+}
+
 type LoginForm struct {
-	Username string `json:"username" validate:"required,gte=4,lte=10" label:"用户名"`
-	Password string `json:"password,omitempty" validate:"gte=4,lte=20" label:"密码"`
+	AutoLogin  bool              `json:"autoLogin" label:"自动登录"`
+	DeviceInfo DeviceInfoInLogin `json:"deviceInfo" label:"设备信息"`
+	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:"密码"`
 }
 
 type UserListQuery struct {

http/response/admin/user.go

@@ -8,6 +8,11 @@ type LoginPayload struct {
 }
 
 var UserRouteNames = []string{
-	"MyTagList", "MyAddressBookList",
+	"MyTagList", "MyAddressBookList", "MyInfo",
 }
 var AdminRouteNames = []string{"*"}
+
+type UserOauthItem struct {
+	ThirdType string `json:"third_type"`
+	Status    int    `json:"status"`
+}

http/response/api/peer.go

@@ -59,16 +59,13 @@ func (gpp *GroupPeerPayload) FromAddressBook(a *model.AddressBook, username stri
 	gpp.UserName = username
 }
 
-//func (gpp *GroupPeerPayload) FromPeer(p *model.Peer) {
-//	gpp.Id = p.Id
-//	gpp.Info = &PeerPayloadInfo{
-//		DeviceName: p.Hostname,
-//		Os:         p.Os,
-//		Username:   p.Username,
-//	}
-//	gpp.Note = ""
-//	if p.User.Id != 0 {
-//		//gpp.User = p.User.Username
-//		gpp.UserName = p.User.Username
-//	}
-//}
+func (gpp *GroupPeerPayload) FromPeer(p *model.Peer, username string) {
+	gpp.Id = p.Id
+	gpp.Info = &PeerPayloadInfo{
+		DeviceName: p.Hostname,
+		Os:         p.Os,
+		Username:   p.Username,
+	}
+	gpp.Note = ""
+	gpp.UserName = username
+}

http/response/api/user.go

@@ -19,17 +19,19 @@ UserStatus status;
 bool isAdmin = false;
 */
 type UserPayload struct {
-	Name    string `json:"name"`
-	Email   string `json:"email"`
-	Note    string `json:"note"`
-	IsAdmin *bool  `json:"is_admin"`
-	Status  int    `json:"status"`
+	Name    string                 `json:"name"`
+	Email   string                 `json:"email"`
+	Note    string                 `json:"note"`
+	IsAdmin *bool                  `json:"is_admin"`
+	Status  int                    `json:"status"`
+	Info    map[string]interface{} `json:"info"`
 }
 
 func (up *UserPayload) FromUser(user *model.User) *UserPayload {
 	up.Name = user.Username
 	up.IsAdmin = user.IsAdmin
 	up.Status = int(user.Status)
+	up.Info = map[string]interface{}{}
 	return up
 }
 
@@ -50,6 +52,6 @@ type LoginRes struct {
 	Type        string      `json:"type"`
 	AccessToken string      `json:"access_token"`
 	User        UserPayload `json:"user"`
-	Secret      string      `json:"secret"`
-	TfaType     string      `json:"tfa_type"`
+	Secret      string      `json:"secret,omitempty"`
+	TfaType     string      `json:"tfa_type,omitempty"`
 }

http/response/api/webClient.go

@@ -5,51 +5,42 @@ import (
 	"time"
 )
 
-//	type T struct {
-//		Field1 struct {
-//			ViewStyle string `json:"view-style"`
-//			Tm        int64  `json:"tm"`
-//			Info      struct {
-//				Username string `json:"username"`
-//				Hostname string `json:"hostname"`
-//				Platform string `json:"platform"`
-//				Displays []struct {
-//					X      int    `json:"x"`
-//					Y      int    `json:"y"`
-//					Width  int    `json:"width"`
-//					Height int    `json:"height"`
-//					Name   string `json:"name"`
-//					Online bool   `json:"online"`
-//				} `json:"displays"`
-//				CurrentDisplay int    `json:"current_display"`
-//				SasEnabled     bool   `json:"sas_enabled"`
-//				Version        string `json:"version"`
-//				ConnId         int    `json:"conn_id"`
-//				Features       struct {
-//					PrivacyMode bool `json:"privacy_mode"`
-//				} `json:"features"`
-//			} `json:"info"`
-//		} `json:"1799928825"`
-//	}
-
 type WebClientPeerPayload struct {
 	ViewStyle string                   `json:"view-style"`
 	Tm        int64                    `json:"tm"`
 	Info      WebClientPeerInfoPayload `json:"info"`
+	Tmppwd    string                   `json:"tmppwd"`
 }
 
 type WebClientPeerInfoPayload struct {
 	Username string `json:"username"`
 	Hostname string `json:"hostname"`
 	Platform string `json:"platform"`
+	Hash     string `json:"hash"`
+	Id       string `json:"id"`
 }
 
 func (wcpp *WebClientPeerPayload) FromAddressBook(a *model.AddressBook) {
 	wcpp.ViewStyle = "shrink"
-	wcpp.Tm = time.Now().UnixNano()
+	//24小时前
+	wcpp.Tm = time.Now().Add(-time.Hour * 24).UnixNano()
 	wcpp.Info = WebClientPeerInfoPayload{
 		Username: a.Username,
 		Hostname: a.Hostname,
 		Platform: a.Platform,
+		Hash:     a.Hash,
+	}
+}
+
+func (wcpp *WebClientPeerPayload) FromShareRecord(sr *model.ShareRecord) {
+	wcpp.ViewStyle = "shrink"
+	//24小时前
+	wcpp.Tm = time.Now().UnixNano()
+	wcpp.Tmppwd = sr.Password
+	wcpp.Info = WebClientPeerInfoPayload{
+		Username: "",
+		Hostname: "",
+		Platform: "",
+		Id:       sr.PeerId,
 	}
 }

http/response/response.go

@@ -1,7 +1,10 @@
 package response
 
 import (
+	"Gwen/global"
+	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"net/http"
 )
 
@@ -51,3 +54,48 @@ type ServerConfigResponse struct {
 	RelayServer string `json:"relay_server"`
 	ApiServer   string `json:"api_server"`
 }
+
+func TranslateMsg(c *gin.Context, messageId string) string {
+	localizer := global.Localizer(c)
+	errMsg, err := localizer.LocalizeMessage(&i18n.Message{
+		ID: messageId,
+	})
+	if err != nil {
+		global.Logger.Warn("LocalizeMessage Error: " + err.Error())
+		errMsg = messageId
+	}
+	return errMsg
+}
+func TranslateTempMsg(c *gin.Context, messageId string, templateData map[string]interface{}) string {
+	localizer := global.Localizer(c)
+	errMsg, err := localizer.Localize(&i18n.LocalizeConfig{
+		DefaultMessage: &i18n.Message{
+			ID: messageId,
+		},
+		TemplateData: templateData,
+	})
+	if err != nil {
+		global.Logger.Warn("LocalizeMessage Error: " + err.Error())
+		errMsg = messageId
+	}
+	return errMsg
+}
+func TranslateParamMsg(c *gin.Context, messageId string, params ...string) string {
+	localizer := global.Localizer(c)
+	templateData := make(map[string]interface{})
+	for i, v := range params {
+		k := fmt.Sprintf("P%d", i)
+		templateData[k] = v
+	}
+	errMsg, err := localizer.Localize(&i18n.LocalizeConfig{
+		DefaultMessage: &i18n.Message{
+			ID: messageId,
+		},
+		TemplateData: templateData,
+	})
+	if err != nil {
+		global.Logger.Warn("LocalizeMessage Error: " + err.Error())
+		errMsg = messageId
+	}
+	return errMsg
+}

http/router/admin.go

@@ -25,6 +25,8 @@ func Init(g *gin.Engine) {
 	TagBind(adg)
 	AddressBookBind(adg)
 	PeerBind(adg)
+	OauthBind(adg)
+	LoginLogBind(adg)
 
 	rs := &admin.Rustdesk{}
 	adg.GET("/server-config", rs.ServerConfig)
@@ -44,6 +46,7 @@ func UserBind(rg *gin.RouterGroup) {
 		cont := &admin.User{}
 		aR.GET("/current", cont.Current)
 		aR.POST("/changeCurPwd", cont.ChangeCurPwd)
+		aR.POST("/myOauth", cont.MyOauth)
 	}
 	aRP := rg.Group("/user").Use(middleware.AdminPrivilege())
 	{
@@ -90,6 +93,10 @@ func AddressBookBind(rg *gin.RouterGroup) {
 		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.POST("/batchCreate", cont.BatchCreate)
 	}
 }
 func PeerBind(rg *gin.RouterGroup) {
@@ -101,9 +108,41 @@ func PeerBind(rg *gin.RouterGroup) {
 		aR.POST("/create", cont.Create)
 		aR.POST("/update", cont.Update)
 		aR.POST("/delete", cont.Delete)
+
+		arp := aR.Use(middleware.AdminPrivilege())
+		arp.POST("/batchDelete", cont.BatchDelete)
 	}
 }
 
+func OauthBind(rg *gin.RouterGroup) {
+	aR := rg.Group("/oauth")
+	{
+		cont := &admin.Oauth{}
+		aR.POST("/confirm", cont.Confirm)
+		aR.POST("/bind", cont.ToBind)
+		aR.POST("/bindConfirm", cont.BindConfirm)
+		aR.POST("/unbind", cont.Unbind)
+		aR.GET("/info", cont.Info)
+	}
+	arp := aR.Use(middleware.AdminPrivilege())
+	{
+		cont := &admin.Oauth{}
+		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)
+
+	}
+
+}
+func LoginLogBind(rg *gin.RouterGroup) {
+	aR := rg.Group("/login_log")
+	cont := &admin.LoginLog{}
+	aR.GET("/list", cont.List)
+	aR.POST("/delete", cont.Delete)
+}
+
 /*
 func FileBind(rg *gin.RouterGroup) {
 	aR := rg.Group("/file")

http/router/api.go

@@ -19,9 +19,6 @@ func ApiInit(g *gin.Engine) {
 
 	frg := g.Group("/api")
 
-	frg.Use(middleware.Cors())
-	frg.OPTIONS("/*any", nil)
-
 	i := &api.Index{}
 	frg.GET("/", i.Index)
 
@@ -34,11 +31,27 @@ func ApiInit(g *gin.Engine) {
 		frg.POST("/login", l.Login)
 
 	}
+	{
+		o := &api.Oauth{}
+		// [method:POST] [uri:/api/oidc/auth]
+		frg.POST("/oidc/auth", o.OidcAuth)
+		// [method:GET] [uri:/api/oidc/auth-query?code=abc&id=xxxxx&uuid=xxxxx]
+		frg.GET("/oidc/auth-query", o.OidcAuthQuery)
+		//api/oauth/callback
+		frg.GET("/oauth/callback", o.OauthCallback)
+		frg.GET("/oauth/login", o.OauthCallback)
+	}
 	{
 		pe := &api.Peer{}
 		//提交系统信息
 		frg.POST("/sysinfo", pe.SysInfo)
 	}
+
+	{
+		w := &api.WebClient{}
+		frg.POST("/shared-peer", w.SharedPeer)
+	}
+
 	frg.Use(middleware.RustAuth())
 	{
 		w := &api.WebClient{}
@@ -67,7 +80,38 @@ func ApiInit(g *gin.Engine) {
 		//更新地址
 		frg.POST("/ab", ab.UpAb)
 	}
-
+	PersonalRoutes(frg)
 	//访问静态文件
 	g.StaticFS("/upload", http.Dir(global.Config.Gin.ResourcesPath+"/public/upload"))
 }
+
+func PersonalRoutes(frg *gin.RouterGroup) {
+	{
+		ab := &api.Ab{}
+		frg.POST("/ab/personal", ab.Personal)
+		//[method:POST] [uri:/api/ab/settings] Request
+		frg.POST("/ab/settings", ab.Settings)
+		// [method:POST] [uri:/api/ab/shared/profiles?current=1&pageSize=100]
+		frg.POST("/ab/shared/profiles", ab.SharedProfiles)
+		//[method:POST] [uri:/api/ab/peers?current=1&pageSize=100&ab=1]
+		frg.POST("/ab/peers", ab.Peers)
+		// [method:POST] [uri:/api/ab/tags/1]
+		frg.POST("/ab/tags/:guid", ab.PTags)
+		//[method:POST] api/ab/peer/add/1
+		frg.POST("/ab/peer/add/:guid", ab.PeerAdd)
+		//[method:DELETE] [uri:/api/ab/peer/1]
+		frg.DELETE("/ab/peer/:guid", ab.PeerDel)
+		//[method:PUT] [uri:/api/ab/peer/update/1]
+		frg.PUT("/ab/peer/update/:guid", ab.PeerUpdate)
+		//[method:POST] [uri:/api/ab/tag/add/1]
+		frg.POST("/ab/tag/add/:guid", ab.TagAdd)
+		//[method:PUT] [uri:/api/ab/tag/rename/1]
+		frg.PUT("/ab/tag/rename/:guid", ab.TagRename)
+		//[method:PUT] [uri:/api/ab/tag/update/1]
+		frg.PUT("/ab/tag/update/:guid", ab.TagUpdate)
+		//[method:DELETE] [uri:/api/ab/tag/1]
+		frg.DELETE("/ab/tag/:guid", ab.TagDel)
+
+	}
+
+}

http/router/router.go

@@ -9,6 +9,7 @@ import (
 
 func WebInit(g *gin.Engine) {
 	i := &web.Index{}
+	g.GET("/", i.Index)
 	g.GET("/webclient-config/index.js", i.ConfigJs)
 	g.StaticFS("/webclient", http.Dir(global.Config.Gin.ResourcesPath+"/web"))
 	g.StaticFS("/_admin", http.Dir(global.Config.Gin.ResourcesPath+"/admin"))

lib/orm/mysql.go

@@ -1,9 +1,12 @@
 package orm
 
 import (
+	"Gwen/global"
 	"fmt"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"time"
 )
 
 type MysqlConfig struct {
@@ -22,6 +25,16 @@ func NewMysql(mysqlConf *MysqlConfig) *gorm.DB {
 		//SkipInitializeWithVersion: false,                   // 根据当前 MySQL 版本自动配置
 	}), &gorm.Config{
 		DisableForeignKeyConstraintWhenMigrating: true,
+		Logger: logger.New(
+			global.Logger, // io writer
+			logger.Config{
+				SlowThreshold:             time.Second, // Slow SQL threshold
+				LogLevel:                  logger.Warn, // Log level
+				IgnoreRecordNotFoundError: true,        // Ignore ErrRecordNotFound error for logger
+				ParameterizedQueries:      true,        // Don't include params in the SQL log
+				Colorful:                  true,
+			},
+		),
 	})
 	if err != nil {
 		fmt.Println(err)

lib/orm/sqlite.go

@@ -1,9 +1,12 @@
 package orm
 
 import (
+	"Gwen/global"
 	"fmt"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"time"
 )
 
 type SqliteConfig struct {
@@ -12,7 +15,18 @@ type SqliteConfig struct {
 }
 
 func NewSqlite(sqliteConf *SqliteConfig) *gorm.DB {
-	db, err := gorm.Open(sqlite.Open("./data/rustdeskapi.db"), &gorm.Config{})
+	db, err := gorm.Open(sqlite.Open("./data/rustdeskapi.db"), &gorm.Config{
+		Logger: logger.New(
+			global.Logger, // io writer
+			logger.Config{
+				SlowThreshold:             time.Second, // Slow SQL threshold
+				LogLevel:                  logger.Warn, // Log level
+				IgnoreRecordNotFoundError: true,        // Ignore ErrRecordNotFound error for logger
+				ParameterizedQueries:      true,        // Don't include params in the SQL log
+				Colorful:                  true,
+			},
+		),
+	})
 	if err != nil {
 		fmt.Println(err)
 	}

model/loginLog.go

@@ -0,0 +1,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
+
+	TimeModel
+}
+
+const (
+	LoginLogTypeAccount = "account"
+	LoginLogTypeOauth   = "oauth"
+)
+
+type LoginLogList struct {
+	LoginLogs []*LoginLog `json:"list"`
+	Pagination
+}

model/oauth.go

@@ -0,0 +1,22 @@
+package model
+
+type Oauth struct {
+	IdModel
+	Op           string `json:"op"`
+	ClientId     string `json:"client_id"`
+	ClientSecret string `json:"client_secret"`
+	RedirectUrl  string `json:"redirect_url"`
+	AutoRegister *bool  `json:"auto_register"`
+	TimeModel
+}
+
+const (
+	OauthTypeGithub  = "github"
+	OauthTypeGoogle  = "google"
+	OauthTypeWebauth = "webauth"
+)
+
+type OauthList struct {
+	Oauths []*Oauth `json:"list"`
+	Pagination
+}

model/peer.go

@@ -1,17 +1,18 @@
 package model
 
 type Peer struct {
-	RowId    uint   `json:"row_id" gorm:"primaryKey;"`
-	Id       string `json:"id"  gorm:"default:'';not null;index"`
-	Cpu      string `json:"cpu"  gorm:"default:'';not null;"`
-	Hostname string `json:"hostname"  gorm:"default:'';not null;"`
-	Memory   string `json:"memory"  gorm:"default:'';not null;"`
-	Os       string `json:"os"  gorm:"default:'';not null;"`
-	Username string `json:"username"  gorm:"default:'';not null;"`
-	Uuid     string `json:"uuid"  gorm:"default:'';not null;index"`
-	Version  string `json:"version"  gorm:"default:'';not null;"`
-	UserId   uint   `json:"user_id"  gorm:"default:0;not null;index"`
-	User     User   `json:"user,omitempty" gorm:""`
+	RowId          uint   `json:"row_id" gorm:"primaryKey;"`
+	Id             string `json:"id"  gorm:"default:'';not null;index"`
+	Cpu            string `json:"cpu"  gorm:"default:'';not null;"`
+	Hostname       string `json:"hostname"  gorm:"default:'';not null;"`
+	Memory         string `json:"memory"  gorm:"default:'';not null;"`
+	Os             string `json:"os"  gorm:"default:'';not null;"`
+	Username       string `json:"username"  gorm:"default:'';not null;"`
+	Uuid           string `json:"uuid"  gorm:"default:'';not null;index"`
+	Version        string `json:"version"  gorm:"default:'';not null;"`
+	UserId         uint   `json:"user_id"  gorm:"default:0;not null;index"`
+	User           User   `json:"user,omitempty" gorm:""`
+	LastOnlineTime int64  `json:"last_online_time"  gorm:"default:0;not null;"`
 	TimeModel
 }
 

model/shareRecord.go

@@ -0,0 +1,12 @@
+package model
+
+type ShareRecord struct {
+	IdModel
+	UserId       uint   `json:"user_id" gorm:"default:0;not null;index"`
+	PeerId       string `json:"peer_id" gorm:"default:'';not null;index"`
+	ShareToken   string `json:"share_token" gorm:"default:'';not null;index"`
+	PasswordType string `json:"password_type" gorm:"default:'';not null;"`
+	Password     string `json:"password" gorm:"default:'';not null;"`
+	Expire       int64  `json:"expire" gorm:"default:0;not null;"`
+	TimeModel
+}

model/userThird.go

@@ -0,0 +1,12 @@
+package model
+
+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"`
+	TimeModel
+}

resources/i18n/en.toml

@@ -0,0 +1,121 @@
+[Test]
+description = "test"
+one = "test1 "
+other = "Test2 {{.P0}}"
+
+[ParamsError]
+description = "Params validation failed."
+one = "Params validation failed."
+other = "Params validation failed."
+
+[OperationFailed]
+description = "OperationFailed."
+one = "the operation failed."
+other = "the operation failed."
+
+[OperationSuccess]
+description = "OperationSuccess."
+one = "the operation success."
+other = "the operation success."
+
+[ItemExists]
+description = "Item already exists."
+one = "Item already exists."
+other = "Item already exists."
+
+[ItemNotFound]
+description = "Item not found."
+one = "Item not found."
+other = "Item not found."
+
+[NoAccess]
+description = "No access."
+one = "No access."
+other = "No access."
+
+[UsernameOrPasswordError]
+description = "Username or password error."
+one = "Username or password error."
+other = "Username or password error."
+
+[SystemError]
+description = "System error."
+one = "System error."
+other = "System error."
+
+[ConfigNotFound]
+description = "Config not found."
+one = "Config not found."
+other = "Config not found."
+
+[OauthExpired]
+description = "Oauth expired."
+one = "Oauth expired, please try again."
+other = "Oauth expired,please try again."
+
+[OauthFailed]
+description = "Oauth failed."
+one = "Oauth failed."
+other = "Oauth failed."
+
+[OauthHasBindOtherUser]
+description = "Oauth has bind other user."
+one = "Oauth has bind other user."
+other = "Oauth has bind other user."
+
+[ParamIsEmpty]
+description = "Param is empty."
+one = "{{.P0}} is empty."
+other = "{{.P0}} is empty."
+
+[BindFail]
+description = "Bind fail."
+one = "Bind fail."
+other = "Bind fail."
+[BindSuccess]
+description = "Bind success."
+one = "Bind success."
+other = "Bind success."
+[OauthHasBeenSuccess]
+description = "Oauth has been success."
+one = "Oauth has been success."
+other = "Oauth has been success."
+[OauthSuccess]
+description = "Oauth success."
+one = "Oauth success."
+other = "Oauth success."
+[OauthRegisterSuccess]
+description = "Oauth register success."
+one = "Oauth register success."
+other = "Oauth register success."
+[OauthRegisterFailed]
+description = "Oauth register failed."
+one = "Oauth register failed."
+other = "Oauth register failed."
+[GetOauthTokenError]
+description = "Get oauth token error."
+one = "Get oauth token error."
+other = "Get oauth token error."
+[GetOauthUserInfoError]
+description = "Get oauth user info error."
+one = "Get oauth user info error."
+other = "Get oauth user info error."
+[DecodeOauthUserInfoError]
+description = "Decode oauth user info error."
+one = "Decode oauth user info error."
+other = "Decode oauth user info error."
+
+[OldPasswordError]
+description = "Old password error."
+one = "Old password error."
+other = "Old password error."
+
+[DefaultGroup]
+description = "Default group"
+one = "Default Group"
+other = "Default Group"
+
+[ShareGroup]
+description = "Share group"
+one = "Share Group"
+other = "Share Group"

resources/i18n/zh_CN.toml

@@ -0,0 +1,123 @@
+[Test]
+description = "test"
+one = "测试1 {{.P0}}"
+other = "测试2 {{.P0}}"
+
+[ParamsError]
+description = "Params validation failed."
+one = "参数错误。"
+other = "参数错误。"
+
+[OperationFailed]
+description = "OperationFailed."
+one = "操作失败。"
+other = "操作失败。"
+
+[OperationSuccess]
+description = "OperationSuccess."
+one = "操作成功。"
+other = "操作成功。"
+
+[ItemExists]
+description = "Item already exists."
+one = "数据已存在。"
+other = "数据已存在。"
+
+[ItemNotFound]
+description = "Item not found."
+one = "数据不存在。"
+other = "数据不存在。"
+
+[NoAccess]
+description = "No access."
+one = "无权限。"
+other = "无权限。"
+
+[UsernameOrPasswordError]
+description = "Username or password error."
+one = "用户名或密码错误。"
+other = "用户名或密码错误。"
+
+[SystemError]
+description = "System error."
+one = "系统错误。"
+other = "系统错误。"
+
+[ConfigNotFound]
+description = "Config not found."
+one = "配置不存在。"
+other = "配置不存在。"
+
+#授权过期
+[OauthExpired]
+description = "Oauth expired."
+one = "授权过期，请重新授权。"
+other = "授权过期，请重新授权。"
+
+[OauthFailed]
+description = "Oauth failed."
+one = "授权失败。"
+other = "授权失败。"
+
+[OauthHasBindOtherUser]
+description = "Oauth has bind other user."
+one = "授权已绑定其他用户。"
+other = "授权已绑定其他用户。"
+
+[ParamIsEmpty]
+description = "Param is empty."
+one = "{{.P0}} 为空。"
+other = "{{.P0}} 为空。"
+
+[BindFail]
+description = "Bind fail."
+one = "绑定失败。"
+other = "绑定失败。"
+[BindSuccess]
+description = "Bind success."
+one = "绑定成功。"
+other = "绑定成功。"
+[OauthHasBeenSuccess]
+description = "Oauth has been success."
+one = "授权已成功。"
+other = "授权已成功。"
+[OauthSuccess]
+description = "Oauth success."
+one = "授权成功。"
+other = "授权成功。"
+[OauthRegisterSuccess]
+description = "Oauth register success."
+one = "授权注册成功。"
+other = "授权注册成功。"
+[OauthRegisterFailed]
+description = "Oauth register failed."
+one = "授权注册失败。"
+other = "授权注册失败。"
+[GetOauthTokenError]
+description = "Get oauth token error."
+one = "获取授权token失败。"
+other = "获取授权token失败。"
+[GetOauthUserInfoError]
+description = "Get oauth user info error."
+one = "获取授权用户信息失败。"
+other = "获取授权用户信息失败。"
+[DecodeOauthUserInfoError]
+description = "Decode oauth user info error."
+one = "解析授权用户信息失败。"
+other = "解析授权用户信息失败。"
+
+[OldPasswordError]
+description = "Old password error."
+one = "旧密码错误。"
+other = "旧密码错误。"
+
+
+[DefaultGroup]
+description = "Default group."
+one = "默认组"
+other = "默认组"
+
+[ShareGroup]
+description = "Share group."
+one = "共享组"
+other = "共享组"

resources/web/index.html

@@ -2,207 +2,188 @@
 <html>
 
 <head>
-  <!--
-    If you are serving your web app in a path other than the root, change the
-    href value below to reflect the base path you are serving from.
+    <!--
+      If you are serving your web app in a path other than the root, change the
+      href value below to reflect the base path you are serving from.
 
-    The path provided below has to start and end with a slash "/" in order for
-    it to work correctly.
+      The path provided below has to start and end with a slash "/" in order for
+      it to work correctly.
 
-    For more details:
-    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+      For more details:
+      * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
 
-    This is a placeholder for base href that will be replaced by the value of
-    the `--base-href` argument provided to `flutter build`.
-  -->
-  <base href="/webclient/">
+      This is a placeholder for base href that will be replaced by the value of
+      the `--base-href` argument provided to `flutter build`.
+    -->
+    <base href="/webclient/">
 
-  <meta charset="UTF-8">
-  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="Remote Desktop.">
+    <meta charset="UTF-8">
+    <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+    <meta name="description" content="Remote Desktop.">
 
-  <!-- iOS meta tags & icons -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="RustDesk">
-  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+    <!-- iOS meta tags & icons -->
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-title" content="RustDesk">
+    <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
-  <!-- Favicon -->
-  <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <!-- Favicon -->
+    <link rel="icon" type="image/svg+xml" href="favicon.svg"/>
 
-  <title>RustDesk</title>
-  <link rel="manifest" href="manifest.json">
-  <script src="/webclient-config/index.js"></script>
-  <script>
+    <title>RustDesk</title>
+    <link rel="manifest" href="manifest.json">
+    <script src="/webclient-config/index.js"></script>
+    <script src="ogvjs-1.8.6/ogv.js"></script>
+    <script type="module" crossorigin src="js/dist/index.js"></script>
+    <script>
+    </script>
+    <link rel="modulepreload" href="js/dist/vendor.js">
+    <script src="yuv-canvas-1.2.6.js"></script>
 
+    <style>
+        .loading {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin: 0;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            -ms-transform: translate(-50%, -50%);
+            transform: translate(-50%, -50%);
+        }
 
-  </script>
-  <script src="ogvjs-1.8.6/ogv.js"></script>
-  <script type="module" crossorigin src="js/dist/index.js"></script>
-  <link rel="modulepreload" href="js/dist/vendor.js">
-  <script src="yuv-canvas-1.2.6.js"></script>
+        .loader {
+            border: 16px solid #f3f3f3;
+            border-radius: 50%;
+            border: 15px solid;
+            border-top: 16px solid #024eff;
+            border-right: 16px solid white;
+            border-bottom: 16px solid #024eff;
+            border-left: 16px solid white;
+            width: 120px;
+            height: 120px;
+            -webkit-animation: spin 2s linear infinite;
+            animation: spin 2s linear infinite;
+        }
 
-  <script>
-    // localStorage.setItem('api-server','http://127.0.0.1:21114')
-    // localStorage.setItem('access_token','0bf218eefa2ac1cdfd72b67f14862bb8')
-    // window.setByName
-    // localStorage.setItem('user_info', JSON.stringify({name: "admin", email: "", note: "", is_admin: true, status: 1}))
-    //peers
-    // localStorage.setItem('peers',JSON.stringify(
-    //         {
-    //           "1799928825":{"view-style":"shrink","tm":1726154051748,"info":{"username":"android","hostname":"Xiaomi-MI 8 SE","platform":"Android","displays":[{"x":0,"y":0,"width":1080,"height":2244,"name":"Android","online":true}],"current_display":0,"sas_enabled":false,"version":"1.3.0","conn_id":0,"features":{"privacy_mode":false}}},
-    //           "ljwzhuwo":{"view-style":"shrink","tm":1726153696760,"info":{"username":"lejianwen","hostname":"zhuwo","platform":"Windows","displays":[{"x":0,"y":0,"width":2560,"height":1440,"name":"\\\\.\\DISPLAY1","online":true}],"current_display":0,"sas_enabled":false,"version":"1.2.6","conn_id":0,"features":{"privacy_mode":true}}},
-    //           "shenglan":{"view-style":"shrink","tm":1726154006341,"info":{"username":"ttt","hostname":"test","platform":"Windows"}}
-    //         }
-    //         )
-    // )
-    //{"1799928825":{"view-style":"shrink","tm":1726154051748,"info":{"username":"android","hostname":"Xiaomi-MI 8 SE","platform":"Android","displays":[{"x":0,"y":0,"width":1080,"height":2244,"name":"Android","online":true}],"current_display":0,"sas_enabled":false,"version":"1.3.0","conn_id":0,"features":{"privacy_mode":false}}},"ljwzhuwo":{"view-style":"shrink","tm":1726153696760,"info":{"username":"lejianwen","hostname":"zhuwo","platform":"Windows","displays":[{"x":0,"y":0,"width":2560,"height":1440,"name":"\\\\.\\DISPLAY1","online":true}],"current_display":0,"sas_enabled":false,"version":"1.2.6","conn_id":0,"features":{"privacy_mode":true}}},"shenglan":{"view-style":"shrink","tm":1726154006341}}
+        @-webkit-keyframes spin {
+            0% {
+                -webkit-transform: rotate(0deg);
+            }
 
+            100% {
+                -webkit-transform: rotate(360deg);
+            }
+        }
 
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+            }
 
-  </script>
-  <style>
-    .loading {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin: 0;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      -ms-transform: translate(-50%, -50%);
-      transform: translate(-50%, -50%);
-    }
-
-    .loader {
-      border: 16px solid #f3f3f3;
-      border-radius: 50%;
-      border: 15px solid;
-      border-top: 16px solid #024eff;
-      border-right: 16px solid white;
-      border-bottom: 16px solid #024eff;
-      border-left: 16px solid white;
-      width: 120px;
-      height: 120px;
-      -webkit-animation: spin 2s linear infinite;
-      animation: spin 2s linear infinite;
-    }
-
-    @-webkit-keyframes spin {
-      0% {
-        -webkit-transform: rotate(0deg);
-      }
-
-      100% {
-        -webkit-transform: rotate(360deg);
-      }
-    }
-
-    @keyframes spin {
-      0% {
-        transform: rotate(0deg);
-      }
-
-      100% {
-        transform: rotate(360deg);
-      }
-    }
-  </style>
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+    </style>
 
 </head>
 
 <body>
-  <div class="loading">
+<div class="loading">
     <div class="loader"></div>
-  </div>
-  <!-- This script installs service_worker.js to provide PWA functionality to
-       application. For more information, see:
-       https://developers.google.com/web/fundamentals/primers/service-workers -->
-  <script>
+</div>
+<!-- This script installs service_worker.js to provide PWA functionality to
+     application. For more information, see:
+     https://developers.google.com/web/fundamentals/primers/service-workers -->
+<script>
     var serviceWorkerVersion = '1200232272';
     var scriptLoaded = false;
+
     function loadMainDartJs() {
-      if (scriptLoaded) {
-        return;
-      }
-      scriptLoaded = true;
-      var scriptTag = document.createElement('script');
-      scriptTag.src = 'main.dart.js';
-      scriptTag.type = 'application/javascript';
-      document.body.append(scriptTag);
+        if (scriptLoaded) {
+            return;
+        }
+        scriptLoaded = true;
+        var scriptTag = document.createElement('script');
+        scriptTag.src = 'main.dart.js';
+        scriptTag.type = 'application/javascript';
+        document.body.append(scriptTag);
     }
 
     if ('serviceWorker' in navigator) {
-      // Service workers are supported. Use them.
-      window.addEventListener('load', function () {
-        // Wait for registration to finish before dropping the <script> tag.
-        // Otherwise, the browser will load the script multiple times,
-        // potentially different versions.
-        var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
-        navigator.serviceWorker.register(serviceWorkerUrl)
-          .then((reg) => {
-            function waitForActivation(serviceWorker) {
-              serviceWorker.addEventListener('statechange', () => {
-                if (serviceWorker.state == 'activated') {
-                  console.log('Installed new service worker.');
-                  loadMainDartJs();
+        // Service workers are supported. Use them.
+        window.addEventListener('load', function () {
+            // Wait for registration to finish before dropping the <script> tag.
+            // Otherwise, the browser will load the script multiple times,
+            // potentially different versions.
+            var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
+            navigator.serviceWorker.register(serviceWorkerUrl)
+                .then((reg) => {
+                    function waitForActivation(serviceWorker) {
+                        serviceWorker.addEventListener('statechange', () => {
+                            if (serviceWorker.state == 'activated') {
+                                console.log('Installed new service worker.');
+                                loadMainDartJs();
+                            }
+                        });
+                    }
+
+                    if (!reg.active && (reg.installing || reg.waiting)) {
+                        // No active web worker and we have installed or are installing
+                        // one for the first time. Simply wait for it to activate.
+                        waitForActivation(reg.installing || reg.waiting);
+                    } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
+                        // When the app updates the serviceWorkerVersion changes, so we
+                        // need to ask the service worker to update.
+                        console.log('New service worker available.');
+                        reg.update();
+                        waitForActivation(reg.installing);
+                    } else {
+                        // Existing service worker is still good.
+                        console.log('Loading app from service worker.');
+                        loadMainDartJs();
+                    }
+                });
+
+            // If service worker doesn't succeed in a reasonable amount of time,
+            // fallback to plaint <script> tag.
+            setTimeout(() => {
+                if (!scriptLoaded) {
+                    console.warn(
+                        'Failed to load app from service worker. Falling back to plain <script> tag.',
+                    );
+                    loadMainDartJs();
                 }
-              });
-            }
-            if (!reg.active && (reg.installing || reg.waiting)) {
-              // No active web worker and we have installed or are installing
-              // one for the first time. Simply wait for it to activate.
-              waitForActivation(reg.installing || reg.waiting);
-            } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
-              // When the app updates the serviceWorkerVersion changes, so we
-              // need to ask the service worker to update.
-              console.log('New service worker available.');
-              reg.update();
-              waitForActivation(reg.installing);
-            } else {
-              // Existing service worker is still good.
-              console.log('Loading app from service worker.');
-              loadMainDartJs();
-            }
-          });
-
-        // If service worker doesn't succeed in a reasonable amount of time,
-        // fallback to plaint <script> tag.
-        setTimeout(() => {
-          if (!scriptLoaded) {
-            console.warn(
-              'Failed to load app from service worker. Falling back to plain <script> tag.',
-            );
-            loadMainDartJs();
-          }
-        }, 4000);
-      });
+            }, 4000);
+        });
     } else {
-      // Service workers not supported. Just drop the <script> tag.
-      loadMainDartJs();
+        // Service workers not supported. Just drop the <script> tag.
+        loadMainDartJs();
     }
-  </script>
-  <script src="libs/firebase-app.js?8.10.1"></script>
-  <script src="libs/firebase-analytics.js?8.10.1"></script>
+</script>
+<script src="libs/firebase-app.js?8.10.1"></script>
+<script src="libs/firebase-analytics.js?8.10.1"></script>
 
-  <script>
+<script>
     // Your web app's Firebase configuration
     // For Firebase JS SDK v7.20.0 and later, measurementId is optional
     const firebaseConfig = {
-      apiKey: "AIzaSyCgehIZk1aFP0E7wZtYRRqrfvNiNAF39-A",
-      authDomain: "rustdesk.firebaseapp.com",
-      databaseURL: "https://rustdesk.firebaseio.com",
-      projectId: "rustdesk",
-      storageBucket: "rustdesk.appspot.com",
-      messagingSenderId: "768133699366",
-      appId: "1:768133699366:web:d50faf0792cb208d7993e7",
-      measurementId: "G-9PEH85N6ZQ"
+        apiKey: "AIzaSyCgehIZk1aFP0E7wZtYRRqrfvNiNAF39-A",
+        authDomain: "rustdesk.firebaseapp.com",
+        databaseURL: "https://rustdesk.firebaseio.com",
+        projectId: "rustdesk",
+        storageBucket: "rustdesk.appspot.com",
+        messagingSenderId: "768133699366",
+        appId: "1:768133699366:web:d50faf0792cb208d7993e7",
+        measurementId: "G-9PEH85N6ZQ"
     };
 
     // Initialize Firebase
     firebase.initializeApp(firebaseConfig);
     firebase.analytics();
-  </script>
+</script>
 </body>
 
 </html>

resources/web/js/dist/index.html

@@ -7,9 +7,12 @@
     <script src="ogvjs-1.8.6/ogv.js"></script>
     <script src="./yuv-canvas-1.2.6.js"></script>
     <title>Vite App</title>
+    <script type="module" crossorigin src="/index.js"></script>
+    <link rel="modulepreload" href="/vendor.js">
+    <link rel="stylesheet" href="/index.css">
   </head>
   <body>
     <div id="app"></div>
-
+    
   </body>
 </html>

resources/web/js/package-lock.json

@@ -1,803 +1,8 @@
 {
   "name": "web_hbb",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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=="
-    },
-    "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=="
-    },
-    "node_modules/@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
-    },
-    "node_modules/@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
-    },
-    "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==",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.1",
-        "@protobufjs/inquire": "^1.1.0"
-      }
-    },
-    "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=="
-    },
-    "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=="
-    },
-    "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=="
-    },
-    "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=="
-    },
-    "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=="
-    },
-    "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=="
-    },
-    "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=="
-    },
-    "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=="
-    },
-    "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==",
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
-    "node_modules/dataloader": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz",
-      "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw=="
-    },
-    "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==",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "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==",
-      "dependencies": {
-        "detect-libc": "^1.0.3"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
-      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
-      "dev": true,
-      "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",
-        "esbuild-darwin-64": "0.14.54",
-        "esbuild-darwin-arm64": "0.14.54",
-        "esbuild-freebsd-64": "0.14.54",
-        "esbuild-freebsd-arm64": "0.14.54",
-        "esbuild-linux-32": "0.14.54",
-        "esbuild-linux-64": "0.14.54",
-        "esbuild-linux-arm": "0.14.54",
-        "esbuild-linux-arm64": "0.14.54",
-        "esbuild-linux-mips64le": "0.14.54",
-        "esbuild-linux-ppc64le": "0.14.54",
-        "esbuild-linux-riscv64": "0.14.54",
-        "esbuild-linux-s390x": "0.14.54",
-        "esbuild-netbsd-64": "0.14.54",
-        "esbuild-openbsd-64": "0.14.54",
-        "esbuild-sunos-64": "0.14.54",
-        "esbuild-windows-32": "0.14.54",
-        "esbuild-windows-64": "0.14.54",
-        "esbuild-windows-arm64": "0.14.54"
-      }
-    },
-    "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,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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=="
-    },
-    "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,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "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
-    },
-    "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,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "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,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/libsodium": {
-      "version": "0.7.10",
-      "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.10.tgz",
-      "integrity": "sha512-eY+z7hDrDKxkAK+QKZVNv92A5KYkxfvIshtBJkmg5TSiCnYqZP3i9OO9whE79Pwgm4jGaoHgkM4ao/b9Cyu4zQ=="
-    },
-    "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==",
-      "dependencies": {
-        "libsodium": "^0.7.0"
-      }
-    },
-    "node_modules/long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
-    },
-    "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,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "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==",
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "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
-    },
-    "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=="
-    },
-    "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
-    },
-    "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,
-      "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"
-      }
-    },
-    "node_modules/protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
-        "@types/node": ">=13.7.0",
-        "long": "^4.0.0"
-      },
-      "bin": {
-        "pbjs": "bin/pbjs",
-        "pbts": "bin/pbts"
-      }
-    },
-    "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,
-      "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"
-      }
-    },
-    "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,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "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,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "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,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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==",
-      "dependencies": {
-        "dprint-node": "^1.0.7"
-      }
-    },
-    "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==",
-      "dependencies": {
-        "@types/object-hash": "^1.3.0",
-        "case-anything": "^2.1.10",
-        "dataloader": "^1.4.0",
-        "object-hash": "^1.3.1",
-        "protobufjs": "^6.11.3",
-        "ts-poet": "^6.2.0",
-        "ts-proto-descriptors": "1.7.1"
-      },
-      "bin": {
-        "protoc-gen-ts_proto": "protoc-gen-ts_proto"
-      }
-    },
-    "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==",
-      "dependencies": {
-        "long": "^4.0.0",
-        "protobufjs": "^6.8.8"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/vite": {
-      "version": "2.8.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.8.6.tgz",
-      "integrity": "sha512-e4H0QpludOVKkmOsRyqQ7LTcMUDF3mcgyNU4lmi0B5JUbe0ZxeBBl8VoZ8Y6Rfn9eFKYtdXNPcYK97ZwH+K2ug==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.14.14",
-        "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
-        }
-      }
-    },
-    "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=="
-    },
-    "node_modules/zstddec": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.0.2.tgz",
-      "integrity": "sha512-DCo0oxvcvOTGP/f5FA6tz2Z6wF+FIcEApSTu0zV5sQgn9hoT5lZ9YRAKUraxt9oP7l4e8TnNdi8IZTCX6WCkwA=="
-    }
-  },
   "dependencies": {
     "@esbuild/linux-loong64": {
       "version": "0.14.54",

resources/web/js/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "scripts": {
     "dev": "vite",
-    "build": "python ./gen_js_from_hbb.py > src/gen_js_from_hbb.ts && python ./ts_proto.py && tsc && yarn vite build",
+    "build": "vite build",
     "preview": "vite preview"
   },
   "devDependencies": {

resources/web/js/src/connection.ts

@@ -14,7 +14,8 @@ const HOSTS = [
   "rs-us.rustdesk.com",
 ];
 let HOST = localStorage.getItem("rendezvous-server") || HOSTS[0];
-const SCHEMA = "ws://";
+//根据协议设置为ws或wss
+const SCHEMA=location.protocol=="https:"?"wss://":"ws://";
 
 type MsgboxCallback = (type: string, title: string, text: string) => void;
 type DrawCallback = (data: Uint8Array) => void;
@@ -99,7 +100,7 @@ export default class Connection {
     ws.sendRendezvous({ punch_hole_request });
     const msg = (await ws.next()) as rendezvous.RendezvousMessage;
     ws.close();
-    console.log(new Date() + ": Got relay response");
+    console.log(new Date() + ": Got relay response", msg);
     const phr = msg.punch_hole_response;
     const rr = msg.relay_response;
     if (phr) {
@@ -236,8 +237,14 @@ export default class Connection {
   async msgLoop() {
     while (true) {
       const msg = (await this._ws?.next()) as message.Message;
+      // console.log("msg", msg);
       if (msg?.hash) {
         this._hash = msg?.hash;
+        const tmp = this.getOption('tmppwd')
+        if(!this._password && tmp){
+          this._password = Uint8Array.from(JSON.parse("[" + tmp + "]"));
+          this.setOption('tmppwd', '')
+        }
         if (!this._password)
           this.msgbox("input-password", "Password Required", "");
         this.login();

resources/web/js/src/ljw.js

@@ -0,0 +1,100 @@
+window._gwen = {}
+window._gwen.kv = {}
+const apiserver = localStorage.getItem('api-server')
+
+function stringToUint8Array(str) {
+    var arr = [];
+    for (var i = 0, j = str.length; i < j; ++i) {
+        arr.push(str.charCodeAt(i));
+    }
+
+    var tmpUint8Array = new Uint8Array(arr);
+    return tmpUint8Array
+}
+
+function getQueryVariable() {
+    const query = window.location.hash.substring(3);
+    const vars = query.split("&");
+    for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split("=");
+        window._gwen.kv[pair[0]] = pair[1]
+    }
+}
+
+getQueryVariable()
+
+const id = window._gwen.kv.id || ''
+if (id) {
+    localStorage.setItem('remote-id', id)
+}
+const share_token = window._gwen.kv.share_token || ''
+if (share_token) {
+    fetch(apiserver + "/api/shared-peer", {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({share_token})
+    }).then(res => res.json()).then(res => {
+        if (res.code === 0) {
+            localStorage.setItem('custom-rendezvous-server', res.data.id_server)
+            localStorage.setItem('key', res.data.key)
+            const peer = res.data.peer
+            localStorage.setItem('remote-id', peer.info.id)
+            peer.tmppwd = stringToUint8Array(window.atob(peer.tmppwd)).toString()
+            const oldPeers = JSON.parse(localStorage.getItem('peers')) || {}
+            oldPeers[peer.info.id] = peer
+            localStorage.setItem('peers', JSON.stringify(oldPeers))
+        }
+    })
+}
+
+
+const autoWriteServer = () => {
+    return setTimeout(() => {
+        const token = localStorage.getItem('access_token')
+        if (token && apiserver) {
+            fetch(apiserver + "/api/server-config", {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Authorization': 'Bearer ' + token
+                    }
+                }
+            ).then(res => res.json()).then(res => {
+                if (res.code === 0) {
+                    if (!localStorage.getItem('custom-rendezvous-server') || !localStorage.getItem('key')) {
+                        localStorage.setItem('custom-rendezvous-server', res.data.id_server)
+                        localStorage.setItem('key', res.data.key)
+                    }
+
+                    if (res.data.peers) {
+                        const oldPeers = JSON.parse(localStorage.getItem('peers')) || {}
+                        let needUpdate = false
+                        Object.keys(res.data.peers).forEach(k => {
+                            if (!oldPeers[k]) {
+                                oldPeers[k] = res.data.peers[k]
+                                needUpdate = true
+                            } else {
+                                oldPeers[k].info = res.data.peers[k].info
+                            }
+                            if (oldPeers[k].info && oldPeers[k].info.hash && !oldPeers[k].password) {
+                                let p1 = window.atob(oldPeers[k].info.hash)
+                                const pwd = stringToUint8Array(p1)
+                                oldPeers[k].password = pwd.toString()
+                                oldPeers[k].remember = true
+                            }
+                        })
+                        localStorage.setItem('peers', JSON.stringify(oldPeers))
+                        if (needUpdate) {
+                            window.location.reload()
+                        }
+                    }
+                }
+            })
+        } else {
+            autoWriteServer()
+        }
+    }, 1000)
+}
+autoWriteServer()

resources/web/js/src/main.ts

@@ -1,2 +1,3 @@
+import "./ljw";
 import "./globals";
-import "./ui";
+import "./ui";

service/addressBook.go

@@ -3,17 +3,24 @@ package service
 import (
 	"Gwen/global"
 	"Gwen/model"
+	"github.com/google/uuid"
 	"gorm.io/gorm"
 )
 
 type AddressBookService struct {
 }
 
-func (s *AddressBookService) Info(id uint) *model.AddressBook {
+func (s *AddressBookService) Info(id string) *model.AddressBook {
 	p := &model.AddressBook{}
 	global.DB.Where("id = ?", id).First(p)
 	return p
 }
+
+func (s *AddressBookService) InfoByUserIdAndId(userid uint, id string) *model.AddressBook {
+	p := &model.AddressBook{}
+	global.DB.Where("user_id = ? and id = ?", userid, id).First(p)
+	return p
+}
 func (s *AddressBookService) InfoByRowId(id uint) *model.AddressBook {
 	p := &model.AddressBook{}
 	global.DB.Where("row_id = ?", id).First(p)
@@ -107,3 +114,16 @@ func (t *AddressBookService) Delete(u *model.AddressBook) error {
 func (t *AddressBookService) Update(u *model.AddressBook) error {
 	return global.DB.Model(u).Updates(u).Error
 }
+
+// ShareByWebClient 分享
+func (t *AddressBookService) ShareByWebClient(m *model.ShareRecord) error {
+	m.ShareToken = uuid.New().String()
+	return global.DB.Create(m).Error
+}
+
+// SharedPeer
+func (t *AddressBookService) SharedPeer(shareToken string) *model.ShareRecord {
+	m := &model.ShareRecord{}
+	global.DB.Where("share_token = ?", shareToken).First(m)
+	return m
+}

service/loginLog.go

@@ -0,0 +1,45 @@
+package service
+
+import (
+	"Gwen/global"
+	"Gwen/model"
+	"gorm.io/gorm"
+)
+
+type LoginLogService struct {
+}
+
+// InfoById 根据用户id取用户信息
+func (us *LoginLogService) InfoById(id uint) *model.LoginLog {
+	u := &model.LoginLog{}
+	global.DB.Where("id = ?", id).First(u)
+	return u
+}
+
+func (us *LoginLogService) List(page, pageSize uint, where func(tx *gorm.DB)) (res *model.LoginLogList) {
+	res = &model.LoginLogList{}
+	res.Page = int64(page)
+	res.PageSize = int64(pageSize)
+	tx := global.DB.Model(&model.LoginLog{})
+	if where != nil {
+		where(tx)
+	}
+	tx.Count(&res.Total)
+	tx.Scopes(Paginate(page, pageSize))
+	tx.Find(&res.LoginLogs)
+	return
+}
+
+// Create 创建
+func (us *LoginLogService) Create(u *model.LoginLog) error {
+	res := global.DB.Create(u).Error
+	return res
+}
+func (us *LoginLogService) Delete(u *model.LoginLog) error {
+	return global.DB.Delete(u).Error
+}
+
+// Update 更新
+func (us *LoginLogService) Update(u *model.LoginLog) error {
+	return global.DB.Model(u).Updates(u).Error
+}

service/oauth.go

@@ -0,0 +1,309 @@
+package service
+
+import (
+	"Gwen/global"
+	"Gwen/model"
+	"Gwen/utils"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/github"
+	"golang.org/x/oauth2/google"
+	"gorm.io/gorm"
+	"io"
+	"strconv"
+	"sync"
+	"time"
+)
+
+type OauthService struct {
+}
+
+type GithubUserdata struct {
+	AvatarUrl         string      `json:"avatar_url"`
+	Bio               string      `json:"bio"`
+	Blog              string      `json:"blog"`
+	Collaborators     int         `json:"collaborators"`
+	Company           interface{} `json:"company"`
+	CreatedAt         time.Time   `json:"created_at"`
+	DiskUsage         int         `json:"disk_usage"`
+	Email             interface{} `json:"email"`
+	EventsUrl         string      `json:"events_url"`
+	Followers         int         `json:"followers"`
+	FollowersUrl      string      `json:"followers_url"`
+	Following         int         `json:"following"`
+	FollowingUrl      string      `json:"following_url"`
+	GistsUrl          string      `json:"gists_url"`
+	GravatarId        string      `json:"gravatar_id"`
+	Hireable          interface{} `json:"hireable"`
+	HtmlUrl           string      `json:"html_url"`
+	Id                int         `json:"id"`
+	Location          interface{} `json:"location"`
+	Login             string      `json:"login"`
+	Name              string      `json:"name"`
+	NodeId            string      `json:"node_id"`
+	NotificationEmail interface{} `json:"notification_email"`
+	OrganizationsUrl  string      `json:"organizations_url"`
+	OwnedPrivateRepos int         `json:"owned_private_repos"`
+	Plan              struct {
+		Collaborators int    `json:"collaborators"`
+		Name          string `json:"name"`
+		PrivateRepos  int    `json:"private_repos"`
+		Space         int    `json:"space"`
+	} `json:"plan"`
+	PrivateGists      int    `json:"private_gists"`
+	PublicGists       int    `json:"public_gists"`
+	PublicRepos       int    `json:"public_repos"`
+	ReceivedEventsUrl string `json:"received_events_url"`
+	ReposUrl          string `json:"repos_url"`
+	SiteAdmin         bool   `json:"site_admin"`
+	StarredUrl        string `json:"starred_url"`
+	SubscriptionsUrl  string `json:"subscriptions_url"`
+	TotalPrivateRepos int    `json:"total_private_repos"`
+	//TwitterUsername         interface{} `json:"twitter_username"`
+	TwoFactorAuthentication bool      `json:"two_factor_authentication"`
+	Type                    string    `json:"type"`
+	UpdatedAt               time.Time `json:"updated_at"`
+	Url                     string    `json:"url"`
+}
+type GoogleUserdata struct {
+	Email         string `json:"email"`
+	FamilyName    string `json:"family_name"`
+	GivenName     string `json:"given_name"`
+	Id            string `json:"id"`
+	Name          string `json:"name"`
+	Picture       string `json:"picture"`
+	VerifiedEmail bool   `json:"verified_email"`
+}
+type OauthCacheItem struct {
+	UserId      uint   `json:"user_id"`
+	Id          string `json:"id"` //rustdesk的设备ID
+	Op          string `json:"op"`
+	Action      string `json:"action"`
+	Uuid        string `json:"uuid"`
+	DeviceName  string `json:"device_name"`
+	DeviceOs    string `json:"device_os"`
+	DeviceType  string `json:"device_type"`
+	ThirdOpenId string `json:"third_open_id"`
+	ThirdName   string `json:"third_name"`
+	ThirdEmail  string `json:"third_email"`
+}
+
+var OauthCache = &sync.Map{}
+
+const (
+	OauthActionTypeLogin = "login"
+	OauthActionTypeBind  = "bind"
+)
+
+func (os *OauthService) GetOauthCache(key string) *OauthCacheItem {
+	v, ok := OauthCache.Load(key)
+	if !ok {
+		return nil
+	}
+	return v.(*OauthCacheItem)
+}
+
+func (os *OauthService) SetOauthCache(key string, item *OauthCacheItem, expire uint) {
+	OauthCache.Store(key, item)
+	if expire > 0 {
+		go func() {
+			time.Sleep(time.Duration(expire) * time.Second)
+			os.DeleteOauthCache(key)
+		}()
+	}
+}
+
+func (os *OauthService) DeleteOauthCache(key string) {
+	OauthCache.Delete(key)
+}
+
+func (os *OauthService) BeginAuth(op string) (error error, code, url string) {
+	code = utils.RandomString(10) + strconv.FormatInt(time.Now().Unix(), 10)
+
+	if op == model.OauthTypeWebauth {
+		url = global.Config.Rustdesk.ApiServer + "/_admin/#/oauth/" + code
+		//url = "http://localhost:8888/_admin/#/oauth/" + code
+		return nil, code, url
+	}
+	err, conf := os.GetOauthConfig(op)
+	if err == nil {
+		return err, code, conf.AuthCodeURL(code)
+	}
+
+	return err, code, ""
+}
+
+// GetOauthConfig 获取配置
+func (os *OauthService) GetOauthConfig(op string) (error, *oauth2.Config) {
+	if op == model.OauthTypeGithub {
+		g := os.InfoByOp(model.OauthTypeGithub)
+		if g.Id == 0 || g.ClientId == "" || g.ClientSecret == "" || g.RedirectUrl == "" {
+			return errors.New("ConfigNotFound"), nil
+		}
+		return nil, &oauth2.Config{
+			ClientID:     g.ClientId,
+			ClientSecret: g.ClientSecret,
+			RedirectURL:  g.RedirectUrl,
+			Endpoint:     github.Endpoint,
+			Scopes:       []string{"read:user", "user:email"},
+		}
+	}
+	if op == model.OauthTypeGoogle {
+		g := os.InfoByOp(model.OauthTypeGoogle)
+		if g.Id == 0 || g.ClientId == "" || g.ClientSecret == "" || g.RedirectUrl == "" {
+			return errors.New("ConfigNotFound"), nil
+		}
+		return nil, &oauth2.Config{
+			ClientID:     g.ClientId,
+			ClientSecret: g.ClientSecret,
+			RedirectURL:  g.RedirectUrl,
+			Endpoint:     google.Endpoint,
+			Scopes:       []string{"https://www.googleapis.com/auth/userinfo.profile", "https://www.googleapis.com/auth/userinfo.email"},
+		}
+	}
+	return errors.New("ConfigNotFound"), nil
+}
+
+func (os *OauthService) GithubCallback(code string) (error error, userData *GithubUserdata) {
+	err, oauthConfig := os.GetOauthConfig(model.OauthTypeGithub)
+	if err != nil {
+		return err, nil
+	}
+	token, err := oauthConfig.Exchange(context.Background(), code)
+	if err != nil {
+		global.Logger.Warn(fmt.Printf("oauthConfig.Exchange() failed: %s\n", err))
+		error = errors.New("GetOauthTokenError")
+		return
+	}
+
+	// 创建一个 HTTP 客户端，并将 access_token 添加到 Authorization 头中
+	client := oauthConfig.Client(context.Background(), token)
+	resp, err := client.Get("https://api.github.com/user")
+	if err != nil {
+		global.Logger.Warn("failed getting user info: %s\n", err)
+		error = errors.New("GetOauthUserInfoError")
+		return
+	}
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+			global.Logger.Warn("failed closing response body: %s\n", err)
+		}
+	}(resp.Body)
+
+	// 在这里处理 GitHub 用户信息
+	if err = json.NewDecoder(resp.Body).Decode(&userData); err != nil {
+		global.Logger.Warn("failed decoding user info: %s\n", err)
+		error = errors.New("DecodeOauthUserInfoError")
+		return
+	}
+	return
+}
+
+func (os *OauthService) GoogleCallback(code string) (error error, userData *GoogleUserdata) {
+	err, oauthConfig := os.GetOauthConfig(model.OauthTypeGoogle)
+	token, err := oauthConfig.Exchange(context.Background(), code)
+	if err != nil {
+		global.Logger.Warn(fmt.Printf("oauthConfig.Exchange() failed: %s\n", err))
+		error = errors.New("GetOauthTokenError")
+		return
+	}
+	// 创建 HTTP 客户端，并将 access_token 添加到 Authorization 头中
+	client := oauthConfig.Client(context.Background(), token)
+	resp, err := client.Get("https://www.googleapis.com/oauth2/v2/userinfo")
+	if err != nil {
+		global.Logger.Warn("failed getting user info: %s\n", err)
+		error = errors.New("GetOauthUserInfoError")
+		return
+	}
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+			global.Logger.Warn("failed closing response body: %s\n", err)
+		}
+	}(resp.Body)
+
+	if err = json.NewDecoder(resp.Body).Decode(&userData); err != nil {
+		global.Logger.Warn("failed decoding user info: %s\n", err)
+		error = errors.New("DecodeOauthUserInfoError")
+		return
+	}
+	return
+}
+
+func (os *OauthService) UserThirdInfo(op, openid string) *model.UserThird {
+	ut := &model.UserThird{}
+	global.DB.Where("open_id = ? and third_type = ?", openid, op).First(ut)
+	return ut
+}
+
+func (os *OauthService) BindGithubUser(openid, username string, userId uint) error {
+	return os.BindOauthUser(model.OauthTypeGithub, openid, username, userId)
+}
+
+func (os *OauthService) BindGoogleUser(email, username string, userId uint) error {
+	return os.BindOauthUser(model.OauthTypeGoogle, email, username, userId)
+}
+func (os *OauthService) BindOauthUser(thirdType, openid, username string, userId uint) error {
+	utr := &model.UserThird{
+		OpenId:    openid,
+		ThirdType: thirdType,
+		ThirdName: username,
+		UserId:    userId,
+	}
+	return global.DB.Create(utr).Error
+}
+
+func (os *OauthService) UnBindGithubUser(userid uint) error {
+	return os.UnBindThird(model.OauthTypeGithub, userid)
+}
+func (os *OauthService) UnBindGoogleUser(userid uint) error {
+	return os.UnBindThird(model.OauthTypeGoogle, userid)
+}
+func (os *OauthService) UnBindThird(thirdType string, userid uint) error {
+	return global.DB.Where("user_id = ? and third_type = ?", userid, thirdType).Delete(&model.UserThird{}).Error
+}
+
+// InfoById 根据id取用户信息
+func (os *OauthService) InfoById(id uint) *model.Oauth {
+	u := &model.Oauth{}
+	global.DB.Where("id = ?", id).First(u)
+	return u
+}
+
+// InfoByOp 根据op取用户信息
+func (os *OauthService) InfoByOp(op string) *model.Oauth {
+	u := &model.Oauth{}
+	global.DB.Where("op = ?", op).First(u)
+	return u
+}
+func (os *OauthService) List(page, pageSize uint, where func(tx *gorm.DB)) (res *model.OauthList) {
+	res = &model.OauthList{}
+	res.Page = int64(page)
+	res.PageSize = int64(pageSize)
+	tx := global.DB.Model(&model.Oauth{})
+	if where != nil {
+		where(tx)
+	}
+	tx.Count(&res.Total)
+	tx.Scopes(Paginate(page, pageSize))
+	tx.Find(&res.Oauths)
+	return
+}
+
+// Create 创建
+func (os *OauthService) Create(u *model.Oauth) error {
+	res := global.DB.Create(u).Error
+	return res
+}
+func (os *OauthService) Delete(u *model.Oauth) error {
+	return global.DB.Delete(u).Error
+}
+
+// Update 更新
+func (os *OauthService) Update(u *model.Oauth) error {
+	return global.DB.Model(u).Updates(u).Error
+}

service/peer.go

@@ -15,24 +15,38 @@ func (ps *PeerService) FindById(id string) *model.Peer {
 	global.DB.Where("id = ?", id).First(p)
 	return p
 }
+func (ps *PeerService) FindByUuid(uuid string) *model.Peer {
+	p := &model.Peer{}
+	global.DB.Where("uuid = ?", uuid).First(p)
+	return p
+}
 func (ps *PeerService) InfoByRowId(id uint) *model.Peer {
 	p := &model.Peer{}
 	global.DB.Where("row_id = ?", id).First(p)
 	return p
 }
 
-//// ListByUserIds 根据用户id取列表
-//func (ps *PeerService) ListByUserIds(userIds []uint, page, pageSize uint) (res *model.PeerList) {
-//	res = &model.PeerList{}
-//	res.Page = int64(page)
-//	res.PageSize = int64(pageSize)
-//	tx := global.DB.Model(&model.Peer{}).Preload("User")
-//	tx.Where("user_id in (?)", userIds)
-//	tx.Count(&res.Total)
-//	tx.Scopes(Paginate(page, pageSize))
-//	tx.Find(&res.Peers)
-//	return
-//}
+// UuidBindUserId 绑定用户id
+func (ps *PeerService) UuidBindUserId(uuid string, userId uint) {
+	peer := ps.FindByUuid(uuid)
+	if peer.RowId > 0 {
+		peer.UserId = userId
+		ps.Update(peer)
+	}
+}
+
+// ListByUserIds 根据用户id取列表
+func (ps *PeerService) ListByUserIds(userIds []uint, page, pageSize uint) (res *model.PeerList) {
+	res = &model.PeerList{}
+	res.Page = int64(page)
+	res.PageSize = int64(pageSize)
+	tx := global.DB.Model(&model.Peer{})
+	tx.Where("user_id in (?)", userIds)
+	tx.Count(&res.Total)
+	tx.Scopes(Paginate(page, pageSize))
+	tx.Find(&res.Peers)
+	return
+}
 
 func (ps *PeerService) List(page, pageSize uint, where func(tx *gorm.DB)) (res *model.PeerList) {
 	res = &model.PeerList{}
@@ -57,6 +71,11 @@ func (ps *PeerService) Delete(u *model.Peer) error {
 	return global.DB.Delete(u).Error
 }
 
+// BatchDelete
+func (ps *PeerService) BatchDelete(ids []uint) error {
+	return global.DB.Where("row_id in (?)", ids).Delete(&model.Peer{}).Error
+}
+
 // Update 更新
 func (ps *PeerService) Update(u *model.Peer) error {
 	return global.DB.Model(u).Updates(u).Error