fix: order of proto

juanjiTech · Nov 8, 2023 · cb67b18 · cb67b18
1 parent ba93d18
commit cb67b18
Show file tree

Hide file tree

Showing 4 changed files with 139 additions and 46 deletions.
diff --git a/gen/openapi/sync/v1/sync_service.swagger.json b/gen/openapi/sync/v1/sync_service.swagger.json
@@ -255,10 +255,11 @@
         "groupBasic": {
           "$ref": "#/definitions/v1GroupBasic"
         },
-        "memberId": {
+        "groupKeychain": {
           "type": "array",
           "items": {
-            "type": "string"
+            "type": "object",
+            "$ref": "#/definitions/v1GroupKeyChain"
           }
         }
       }
@@ -300,6 +301,17 @@
         }
       }
     },
+    "v1GroupKeyChain": {
+      "type": "object",
+      "properties": {
+        "memberId": {
+          "type": "string"
+        },
+        "privateKey": {
+          "type": "string"
+        }
+      }
+    },
     "v1Host": {
       "type": "object",
       "properties": {

diff --git a/gen/proto/sync/v1/group.pb.go b/gen/proto/sync/v1/group.pb.go
diff --git a/gen/proto/sync/v1/group.pb.ts b/gen/proto/sync/v1/group.pb.ts
@@ -7,7 +7,7 @@
 import * as GoogleProtobufTimestamp from "../../google/protobuf/timestamp.pb"
 export type Group = {
   groupBasic?: GroupBasic
-  memberId?: string[]
+  groupKeychain?: GroupKeyChain[]
 }
 
 export type GroupBasic = {
@@ -20,4 +20,9 @@ export type GroupBasic = {
   avatar?: string
   uid?: string
   publicKey?: string
+}
+
+export type GroupKeyChain = {
+  memberId?: string
+  privateKey?: string
 }
diff --git a/proto/sync/v1/group.proto b/proto/sync/v1/group.proto
@@ -7,7 +7,7 @@ option go_package = "github.com/juanjiTech/jTerm-proto/gen/proto/sync/v1;syncV1"
 
 message Group {
     GroupBasic group_basic = 1;
-    repeated GroupKeyChain group_keychain = 3;
+    repeated GroupKeyChain group_keychain = 2;
 }
 
 message GroupBasic {
@@ -23,6 +23,6 @@ message GroupBasic {
 }
 
 message GroupKeyChain{
-    string member_id = 1;
-    string privateKey = 2;
+    string member_id = 11;
+    string privateKey = 12;
 }