Browse Source

fix build

ljw 1 year ago
parent
commit
71c44a501b

+ 9 - 9
.github/workflows/build.yml

@@ -34,7 +34,7 @@ on:
34 34
 
35 35
 env:
36 36
   LATEST_TAG: latest
37
-  WEBCLIENT_SOURCE_LOCATION: ${{ github.event.inputs.WEBCLIENT_SOURCE_LOCATION }}
37
+  WEBCLIENT_SOURCE_LOCATION: ${{ github.event.inputs.WEBCLIENT_SOURCE_LOCATION || 'https://github.com/lejianwen/rustdesk-api-web' }}
38 38
   BASE_IMAGE_NAMESPACE: ${{ github.event.inputs.BASE_IMAGE_NAMESPACE || github.actor }}
39 39
   DOCKERHUB_IMAGE_NAMESPACE: ${{ github.event.inputs.DOCKERHUB_IMAGE_NAMESPACE || github.actor }}
40 40
   GHCR_IMAGE_NAMESPACE: ${{ github.event.inputs.GHCR_IMAGE_NAMESPACE || github.actor }}
@@ -256,8 +256,8 @@ jobs:
256 256
         uses: Noelware/docker-manifest-action@master
257 257
         with:
258 258
           base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
259
-          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, 
260
-                        ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
259
+          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
260
+            ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
261 261
           push: true
262 262
 
263 263
       - name: Create and push manifest GHCR (:version)
@@ -265,8 +265,8 @@ jobs:
265 265
         uses: Noelware/docker-manifest-action@master
266 266
         with:
267 267
           base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}
268
-          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64, 
269
-                        ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
268
+          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-amd64,
269
+            ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:${{ env.TAG }}-arm64
270 270
           push: true
271 271
           amend: true
272 272
 
@@ -275,8 +275,8 @@ jobs:
275 275
         uses: Noelware/docker-manifest-action@master
276 276
         with:
277 277
           base-image: ${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
278
-          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64, 
279
-                        ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
278
+          extra-images: ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
279
+            ${{ env.DOCKERHUB_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
280 280
           push: true
281 281
 
282 282
       - name: Create and push manifest GHCR (:latest)
@@ -284,7 +284,7 @@ jobs:
284 284
         uses: Noelware/docker-manifest-action@master
285 285
         with:
286 286
           base-image: ghcr.io/${{ env.BASE_IMAGE_NAMESPACE }}/rustdesk-api:latest
287
-          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64, 
288
-                        ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
287
+          extra-images: ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-amd64,
288
+            ghcr.io/${{ env.GHCR_IMAGE_NAMESPACE }}/rustdesk-api:latest-arm64
289 289
           push: true
290 290
           amend: true

+ 32 - 6
docs/admin/admin_docs.go

@@ -22,7 +22,7 @@ const docTemplateadmin = `{
22 22
                         "token": []
23 23
                     }
24 24
                 ],
25
-                "description": "创建地址簿",
25
+                "description": "批量创建地址簿",
26 26
                 "consumes": [
27 27
                     "application/json"
28 28
                 ],
@@ -32,7 +32,7 @@ const docTemplateadmin = `{
32 32
                 "tags": [
33 33
                     "地址簿"
34 34
                 ],
35
-                "summary": "创建地址簿",
35
+                "summary": "批量创建地址簿",
36 36
                 "parameters": [
37 37
                     {
38 38
                         "description": "地址簿信息",
@@ -1242,7 +1242,7 @@ const docTemplateadmin = `{
1242 1242
                         "token": []
1243 1243
                     }
1244 1244
                 ],
1245
-                "description": "设备删除",
1245
+                "description": "批量设备删除",
1246 1246
                 "consumes": [
1247 1247
                     "application/json"
1248 1248
                 ],
@@ -1252,15 +1252,15 @@ const docTemplateadmin = `{
1252 1252
                 "tags": [
1253 1253
                     "设备"
1254 1254
                 ],
1255
-                "summary": "设备删除",
1255
+                "summary": "批量设备删除",
1256 1256
                 "parameters": [
1257 1257
                     {
1258
-                        "description": "设备信息",
1258
+                        "description": "设备id",
1259 1259
                         "name": "body",
1260 1260
                         "in": "body",
1261 1261
                         "required": true,
1262 1262
                         "schema": {
1263
-                            "$ref": "#/definitions/admin.PeerForm"
1263
+                            "$ref": "#/definitions/admin.PeerBatchDeleteForm"
1264 1264
                         }
1265 1265
                     }
1266 1266
                 ],
@@ -1365,6 +1365,12 @@ const docTemplateadmin = `{
1365 1365
                         "description": "页大小",
1366 1366
                         "name": "page_size",
1367 1367
                         "in": "query"
1368
+                    },
1369
+                    {
1370
+                        "type": "integer",
1371
+                        "description": "时间",
1372
+                        "name": "time_ago",
1373
+                        "in": "query"
1368 1374
                     }
1369 1375
                 ],
1370 1376
                 "responses": {
@@ -2311,6 +2317,12 @@ const docTemplateadmin = `{
2311 2317
                 "user_id": {
2312 2318
                     "type": "integer"
2313 2319
                 },
2320
+                "user_ids": {
2321
+                    "type": "array",
2322
+                    "items": {
2323
+                        "type": "integer"
2324
+                    }
2325
+                },
2314 2326
                 "username": {
2315 2327
                     "type": "string"
2316 2328
                 }
@@ -2398,6 +2410,20 @@ const docTemplateadmin = `{
2398 2410
                 }
2399 2411
             }
2400 2412
         },
2413
+        "admin.PeerBatchDeleteForm": {
2414
+            "type": "object",
2415
+            "required": [
2416
+                "row_ids"
2417
+            ],
2418
+            "properties": {
2419
+                "row_ids": {
2420
+                    "type": "array",
2421
+                    "items": {
2422
+                        "type": "integer"
2423
+                    }
2424
+                }
2425
+            }
2426
+        },
2401 2427
         "admin.PeerForm": {
2402 2428
             "type": "object",
2403 2429
             "properties": {

+ 32 - 6
docs/admin/admin_swagger.json

@@ -15,7 +15,7 @@
15 15
                         "token": []
16 16
                     }
17 17
                 ],
18
-                "description": "创建地址簿",
18
+                "description": "批量创建地址簿",
19 19
                 "consumes": [
20 20
                     "application/json"
21 21
                 ],
@@ -25,7 +25,7 @@
25 25
                 "tags": [
26 26
                     "地址簿"
27 27
                 ],
28
-                "summary": "创建地址簿",
28
+                "summary": "批量创建地址簿",
29 29
                 "parameters": [
30 30
                     {
31 31
                         "description": "地址簿信息",
@@ -1235,7 +1235,7 @@
1235 1235
                         "token": []
1236 1236
                     }
1237 1237
                 ],
1238
-                "description": "设备删除",
1238
+                "description": "批量设备删除",
1239 1239
                 "consumes": [
1240 1240
                     "application/json"
1241 1241
                 ],
@@ -1245,15 +1245,15 @@
1245 1245
                 "tags": [
1246 1246
                     "设备"
1247 1247
                 ],
1248
-                "summary": "设备删除",
1248
+                "summary": "批量设备删除",
1249 1249
                 "parameters": [
1250 1250
                     {
1251
-                        "description": "设备信息",
1251
+                        "description": "设备id",
1252 1252
                         "name": "body",
1253 1253
                         "in": "body",
1254 1254
                         "required": true,
1255 1255
                         "schema": {
1256
-                            "$ref": "#/definitions/admin.PeerForm"
1256
+                            "$ref": "#/definitions/admin.PeerBatchDeleteForm"
1257 1257
                         }
1258 1258
                     }
1259 1259
                 ],
@@ -1358,6 +1358,12 @@
1358 1358
                         "description": "页大小",
1359 1359
                         "name": "page_size",
1360 1360
                         "in": "query"
1361
+                    },
1362
+                    {
1363
+                        "type": "integer",
1364
+                        "description": "时间",
1365
+                        "name": "time_ago",
1366
+                        "in": "query"
1361 1367
                     }
1362 1368
                 ],
1363 1369
                 "responses": {
@@ -2304,6 +2310,12 @@
2304 2310
                 "user_id": {
2305 2311
                     "type": "integer"
2306 2312
                 },
2313
+                "user_ids": {
2314
+                    "type": "array",
2315
+                    "items": {
2316
+                        "type": "integer"
2317
+                    }
2318
+                },
2307 2319
                 "username": {
2308 2320
                     "type": "string"
2309 2321
                 }
@@ -2391,6 +2403,20 @@
2391 2403
                 }
2392 2404
             }
2393 2405
         },
2406
+        "admin.PeerBatchDeleteForm": {
2407
+            "type": "object",
2408
+            "required": [
2409
+                "row_ids"
2410
+            ],
2411
+            "properties": {
2412
+                "row_ids": {
2413
+                    "type": "array",
2414
+                    "items": {
2415
+                        "type": "integer"
2416
+                    }
2417
+                }
2418
+            }
2419
+        },
2394 2420
         "admin.PeerForm": {
2395 2421
             "type": "object",
2396 2422
             "properties": {

+ 23 - 6
docs/admin/admin_swagger.yaml

@@ -46,6 +46,10 @@ definitions:
46 46
         type: array
47 47
       user_id:
48 48
         type: integer
49
+      user_ids:
50
+        items:
51
+          type: integer
52
+        type: array
49 53
       username:
50 54
         type: string
51 55
     required:
@@ -107,6 +111,15 @@ definitions:
107 111
     - op
108 112
     - redirect_url
109 113
     type: object
114
+  admin.PeerBatchDeleteForm:
115
+    properties:
116
+      row_ids:
117
+        items:
118
+          type: integer
119
+        type: array
120
+    required:
121
+    - row_ids
122
+    type: object
110 123
   admin.PeerForm:
111 124
     properties:
112 125
       cpu:
@@ -473,7 +486,7 @@ paths:
473 486
     post:
474 487
       consumes:
475 488
       - application/json
476
-      description: 创建地址簿
489
+      description: 批量创建地址簿
477 490
       parameters:
478 491
       - description: 地址簿信息
479 492
         in: body
@@ -499,7 +512,7 @@ paths:
499 512
             $ref: '#/definitions/response.Response'
500 513
       security:
501 514
       - token: []
502
-      summary: 创建地址簿
515
+      summary: 批量创建地址簿
503 516
       tags:
504 517
       - 地址簿
505 518
   /admin/address_book/delete:
@@ -1196,14 +1209,14 @@ paths:
1196 1209
     post:
1197 1210
       consumes:
1198 1211
       - application/json
1199
-      description: 设备删除
1212
+      description: 批量设备删除
1200 1213
       parameters:
1201
-      - description: 设备信息
1214
+      - description: 设备id
1202 1215
         in: body
1203 1216
         name: body
1204 1217
         required: true
1205 1218
         schema:
1206
-          $ref: '#/definitions/admin.PeerForm'
1219
+          $ref: '#/definitions/admin.PeerBatchDeleteForm'
1207 1220
       produces:
1208 1221
       - application/json
1209 1222
       responses:
@@ -1217,7 +1230,7 @@ paths:
1217 1230
             $ref: '#/definitions/response.Response'
1218 1231
       security:
1219 1232
       - token: []
1220
-      summary: 设备删除
1233
+      summary: 批量设备删除
1221 1234
       tags:
1222 1235
       - 设备
1223 1236
   /admin/peer/detail/{id}:
@@ -1266,6 +1279,10 @@ paths:
1266 1279
         in: query
1267 1280
         name: page_size
1268 1281
         type: integer
1282
+      - description: 时间
1283
+        in: query
1284
+        name: time_ago
1285
+        type: integer
1269 1286
       produces:
1270 1287
       - application/json
1271 1288
       responses: