diff --git a/dart/passport/account.pb.dart b/dart/passport/account.pb.dart index 30c3eb1..761a384 100644 --- a/dart/passport/account.pb.dart +++ b/dart/passport/account.pb.dart @@ -285,12 +285,12 @@ class GetFullReply extends $pb.GeneratedMessage { class TagItem extends $pb.GeneratedMessage { factory TagItem({ - $core.String? key, - $core.String? title, + $core.String? name, + $core.String? icon, }) { final result = create(); - if (key != null) result.key = key; - if (title != null) result.title = title; + if (name != null) result.name = name; + if (icon != null) result.icon = icon; return result; } @@ -307,8 +307,8 @@ class TagItem extends $pb.GeneratedMessage { _omitMessageNames ? '' : 'TagItem', package: const $pb.PackageName(_omitMessageNames ? '' : 'passport'), createEmptyInstance: create) - ..aOS(1, _omitFieldNames ? '' : 'key') - ..aOS(2, _omitFieldNames ? '' : 'title') + ..aOS(1, _omitFieldNames ? '' : 'name') + ..aOS(2, _omitFieldNames ? '' : 'icon') ..hasRequiredFields = false; @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') @@ -331,22 +331,22 @@ class TagItem extends $pb.GeneratedMessage { static TagItem? _defaultInstance; @$pb.TagNumber(1) - $core.String get key => $_getSZ(0); + $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set key($core.String value) => $_setString(0, value); + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) - $core.bool hasKey() => $_has(0); + $core.bool hasName() => $_has(0); @$pb.TagNumber(1) - void clearKey() => $_clearField(1); + void clearName() => $_clearField(1); @$pb.TagNumber(2) - $core.String get title => $_getSZ(1); + $core.String get icon => $_getSZ(1); @$pb.TagNumber(2) - set title($core.String value) => $_setString(1, value); + set icon($core.String value) => $_setString(1, value); @$pb.TagNumber(2) - $core.bool hasTitle() => $_has(1); + $core.bool hasIcon() => $_has(1); @$pb.TagNumber(2) - void clearTitle() => $_clearField(2); + void clearIcon() => $_clearField(2); } class SetDataRequest extends $pb.GeneratedMessage { @@ -355,20 +355,28 @@ class SetDataRequest extends $pb.GeneratedMessage { $core.String? avatar, $core.String? birthday, $core.int? sex, + $core.int? country, $core.int? province, $core.int? city, $core.int? area, $core.String? sign, + $core.String? cover, + $core.int? score, + $core.int? level, }) { final result = create(); if (nickname != null) result.nickname = nickname; if (avatar != null) result.avatar = avatar; if (birthday != null) result.birthday = birthday; if (sex != null) result.sex = sex; + if (country != null) result.country = country; if (province != null) result.province = province; if (city != null) result.city = city; if (area != null) result.area = area; if (sign != null) result.sign = sign; + if (cover != null) result.cover = cover; + if (score != null) result.score = score; + if (level != null) result.level = level; return result; } @@ -389,10 +397,14 @@ class SetDataRequest extends $pb.GeneratedMessage { ..aOS(2, _omitFieldNames ? '' : 'avatar') ..aOS(3, _omitFieldNames ? '' : 'birthday') ..a<$core.int>(4, _omitFieldNames ? '' : 'sex', $pb.PbFieldType.O3) - ..a<$core.int>(5, _omitFieldNames ? '' : 'province', $pb.PbFieldType.O3) - ..a<$core.int>(6, _omitFieldNames ? '' : 'city', $pb.PbFieldType.O3) - ..a<$core.int>(7, _omitFieldNames ? '' : 'area', $pb.PbFieldType.O3) - ..aOS(8, _omitFieldNames ? '' : 'sign') + ..a<$core.int>(5, _omitFieldNames ? '' : 'country', $pb.PbFieldType.O3) + ..a<$core.int>(6, _omitFieldNames ? '' : 'province', $pb.PbFieldType.O3) + ..a<$core.int>(7, _omitFieldNames ? '' : 'city', $pb.PbFieldType.O3) + ..a<$core.int>(8, _omitFieldNames ? '' : 'area', $pb.PbFieldType.O3) + ..aOS(9, _omitFieldNames ? '' : 'sign') + ..aOS(10, _omitFieldNames ? '' : 'cover') + ..a<$core.int>(11, _omitFieldNames ? '' : 'score', $pb.PbFieldType.O3) + ..a<$core.int>(12, _omitFieldNames ? '' : 'level', $pb.PbFieldType.O3) ..hasRequiredFields = false; @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') @@ -453,40 +465,76 @@ class SetDataRequest extends $pb.GeneratedMessage { void clearSex() => $_clearField(4); @$pb.TagNumber(5) - $core.int get province => $_getIZ(4); + $core.int get country => $_getIZ(4); @$pb.TagNumber(5) - set province($core.int value) => $_setSignedInt32(4, value); + set country($core.int value) => $_setSignedInt32(4, value); @$pb.TagNumber(5) - $core.bool hasProvince() => $_has(4); + $core.bool hasCountry() => $_has(4); @$pb.TagNumber(5) - void clearProvince() => $_clearField(5); + void clearCountry() => $_clearField(5); @$pb.TagNumber(6) - $core.int get city => $_getIZ(5); + $core.int get province => $_getIZ(5); @$pb.TagNumber(6) - set city($core.int value) => $_setSignedInt32(5, value); + set province($core.int value) => $_setSignedInt32(5, value); @$pb.TagNumber(6) - $core.bool hasCity() => $_has(5); + $core.bool hasProvince() => $_has(5); @$pb.TagNumber(6) - void clearCity() => $_clearField(6); + void clearProvince() => $_clearField(6); @$pb.TagNumber(7) - $core.int get area => $_getIZ(6); + $core.int get city => $_getIZ(6); @$pb.TagNumber(7) - set area($core.int value) => $_setSignedInt32(6, value); + set city($core.int value) => $_setSignedInt32(6, value); @$pb.TagNumber(7) - $core.bool hasArea() => $_has(6); + $core.bool hasCity() => $_has(6); @$pb.TagNumber(7) - void clearArea() => $_clearField(7); + void clearCity() => $_clearField(7); @$pb.TagNumber(8) - $core.String get sign => $_getSZ(7); + $core.int get area => $_getIZ(7); @$pb.TagNumber(8) - set sign($core.String value) => $_setString(7, value); + set area($core.int value) => $_setSignedInt32(7, value); @$pb.TagNumber(8) - $core.bool hasSign() => $_has(7); + $core.bool hasArea() => $_has(7); @$pb.TagNumber(8) - void clearSign() => $_clearField(8); + void clearArea() => $_clearField(8); + + @$pb.TagNumber(9) + $core.String get sign => $_getSZ(8); + @$pb.TagNumber(9) + set sign($core.String value) => $_setString(8, value); + @$pb.TagNumber(9) + $core.bool hasSign() => $_has(8); + @$pb.TagNumber(9) + void clearSign() => $_clearField(9); + + @$pb.TagNumber(10) + $core.String get cover => $_getSZ(9); + @$pb.TagNumber(10) + set cover($core.String value) => $_setString(9, value); + @$pb.TagNumber(10) + $core.bool hasCover() => $_has(9); + @$pb.TagNumber(10) + void clearCover() => $_clearField(10); + + @$pb.TagNumber(11) + $core.int get score => $_getIZ(10); + @$pb.TagNumber(11) + set score($core.int value) => $_setSignedInt32(10, value); + @$pb.TagNumber(11) + $core.bool hasScore() => $_has(10); + @$pb.TagNumber(11) + void clearScore() => $_clearField(11); + + @$pb.TagNumber(12) + $core.int get level => $_getIZ(11); + @$pb.TagNumber(12) + set level($core.int value) => $_setSignedInt32(11, value); + @$pb.TagNumber(12) + $core.bool hasLevel() => $_has(11); + @$pb.TagNumber(12) + void clearLevel() => $_clearField(12); } class SetPasswordRequest extends $pb.GeneratedMessage { diff --git a/dart/passport/account.pbgrpc.dart b/dart/passport/account.pbgrpc.dart index 169576d..d63c603 100644 --- a/dart/passport/account.pbgrpc.dart +++ b/dart/passport/account.pbgrpc.dart @@ -58,6 +58,22 @@ class AccountClient extends $grpc.Client { return $createUnaryCall(_$setPassword, request, options: options); } + /// 新增标签 + $grpc.ResponseFuture<$0.StatusReply> tagCreate( + $1.TagItem request, { + $grpc.CallOptions? options, + }) { + return $createUnaryCall(_$tagCreate, request, options: options); + } + + /// 删除标签 + $grpc.ResponseFuture<$0.StatusReply> tagRemove( + $0.IdentRequest request, { + $grpc.CallOptions? options, + }) { + return $createUnaryCall(_$tagRemove, request, options: options); + } + /// 获取会员的相关统计数据 $grpc.ResponseFuture<$1.StatisticsReply> statistics( $1.StatisticsRequest request, { @@ -82,6 +98,15 @@ class AccountClient extends $grpc.Client { '/passport.Account/SetPassword', ($1.SetPasswordRequest value) => value.writeToBuffer(), $0.StatusReply.fromBuffer); + static final _$tagCreate = $grpc.ClientMethod<$1.TagItem, $0.StatusReply>( + '/passport.Account/TagCreate', + ($1.TagItem value) => value.writeToBuffer(), + $0.StatusReply.fromBuffer); + static final _$tagRemove = + $grpc.ClientMethod<$0.IdentRequest, $0.StatusReply>( + '/passport.Account/TagRemove', + ($0.IdentRequest value) => value.writeToBuffer(), + $0.StatusReply.fromBuffer); static final _$statistics = $grpc.ClientMethod<$1.StatisticsRequest, $1.StatisticsReply>( '/passport.Account/Statistics', @@ -116,6 +141,20 @@ abstract class AccountServiceBase extends $grpc.Service { ($core.List<$core.int> value) => $1.SetPasswordRequest.fromBuffer(value), ($0.StatusReply value) => value.writeToBuffer())); + $addMethod($grpc.ServiceMethod<$1.TagItem, $0.StatusReply>( + 'TagCreate', + tagCreate_Pre, + false, + false, + ($core.List<$core.int> value) => $1.TagItem.fromBuffer(value), + ($0.StatusReply value) => value.writeToBuffer())); + $addMethod($grpc.ServiceMethod<$0.IdentRequest, $0.StatusReply>( + 'TagRemove', + tagRemove_Pre, + false, + false, + ($core.List<$core.int> value) => $0.IdentRequest.fromBuffer(value), + ($0.StatusReply value) => value.writeToBuffer())); $addMethod($grpc.ServiceMethod<$1.StatisticsRequest, $1.StatisticsReply>( 'Statistics', statistics_Pre, @@ -148,6 +187,22 @@ abstract class AccountServiceBase extends $grpc.Service { $async.Future<$0.StatusReply> setPassword( $grpc.ServiceCall call, $1.SetPasswordRequest request); + $async.Future<$0.StatusReply> tagCreate_Pre( + $grpc.ServiceCall $call, $async.Future<$1.TagItem> $request) async { + return tagCreate($call, await $request); + } + + $async.Future<$0.StatusReply> tagCreate( + $grpc.ServiceCall call, $1.TagItem request); + + $async.Future<$0.StatusReply> tagRemove_Pre( + $grpc.ServiceCall $call, $async.Future<$0.IdentRequest> $request) async { + return tagRemove($call, await $request); + } + + $async.Future<$0.StatusReply> tagRemove( + $grpc.ServiceCall call, $0.IdentRequest request); + $async.Future<$1.StatisticsReply> statistics_Pre($grpc.ServiceCall $call, $async.Future<$1.StatisticsRequest> $request) async { return statistics($call, await $request); diff --git a/dart/passport/account.pbjson.dart b/dart/passport/account.pbjson.dart index 39563f3..db3ee35 100644 --- a/dart/passport/account.pbjson.dart +++ b/dart/passport/account.pbjson.dart @@ -83,14 +83,14 @@ final $typed_data.Uint8List getFullReplyDescriptor = $convert.base64Decode( const TagItem$json = { '1': 'TagItem', '2': [ - {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'}, - {'1': 'title', '3': 2, '4': 1, '5': 9, '10': 'title'}, + {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'}, + {'1': 'icon', '3': 2, '4': 1, '5': 9, '10': 'icon'}, ], }; /// Descriptor for `TagItem`. Decode as a `google.protobuf.DescriptorProto`. final $typed_data.Uint8List tagItemDescriptor = $convert.base64Decode( - 'CgdUYWdJdGVtEhAKA2tleRgBIAEoCVIDa2V5EhQKBXRpdGxlGAIgASgJUgV0aXRsZQ=='); + 'CgdUYWdJdGVtEhIKBG5hbWUYASABKAlSBG5hbWUSEgoEaWNvbhgCIAEoCVIEaWNvbg=='); @$core.Deprecated('Use setDataRequestDescriptor instead') const SetDataRequest$json = { @@ -100,10 +100,14 @@ const SetDataRequest$json = { {'1': 'avatar', '3': 2, '4': 1, '5': 9, '10': 'avatar'}, {'1': 'birthday', '3': 3, '4': 1, '5': 9, '10': 'birthday'}, {'1': 'sex', '3': 4, '4': 1, '5': 5, '10': 'sex'}, - {'1': 'province', '3': 5, '4': 1, '5': 5, '10': 'province'}, - {'1': 'city', '3': 6, '4': 1, '5': 5, '10': 'city'}, - {'1': 'area', '3': 7, '4': 1, '5': 5, '10': 'area'}, - {'1': 'sign', '3': 8, '4': 1, '5': 9, '10': 'sign'}, + {'1': 'country', '3': 5, '4': 1, '5': 5, '10': 'country'}, + {'1': 'province', '3': 6, '4': 1, '5': 5, '10': 'province'}, + {'1': 'city', '3': 7, '4': 1, '5': 5, '10': 'city'}, + {'1': 'area', '3': 8, '4': 1, '5': 5, '10': 'area'}, + {'1': 'sign', '3': 9, '4': 1, '5': 9, '10': 'sign'}, + {'1': 'cover', '3': 10, '4': 1, '5': 9, '10': 'cover'}, + {'1': 'score', '3': 11, '4': 1, '5': 5, '10': 'score'}, + {'1': 'level', '3': 12, '4': 1, '5': 5, '10': 'level'}, ], }; @@ -111,8 +115,10 @@ const SetDataRequest$json = { final $typed_data.Uint8List setDataRequestDescriptor = $convert.base64Decode( 'Cg5TZXREYXRhUmVxdWVzdBIaCghuaWNrbmFtZRgBIAEoCVIIbmlja25hbWUSFgoGYXZhdGFyGA' 'IgASgJUgZhdmF0YXISGgoIYmlydGhkYXkYAyABKAlSCGJpcnRoZGF5EhAKA3NleBgEIAEoBVID' - 'c2V4EhoKCHByb3ZpbmNlGAUgASgFUghwcm92aW5jZRISCgRjaXR5GAYgASgFUgRjaXR5EhIKBG' - 'FyZWEYByABKAVSBGFyZWESEgoEc2lnbhgIIAEoCVIEc2lnbg=='); + 'c2V4EhgKB2NvdW50cnkYBSABKAVSB2NvdW50cnkSGgoIcHJvdmluY2UYBiABKAVSCHByb3Zpbm' + 'NlEhIKBGNpdHkYByABKAVSBGNpdHkSEgoEYXJlYRgIIAEoBVIEYXJlYRISCgRzaWduGAkgASgJ' + 'UgRzaWduEhQKBWNvdmVyGAogASgJUgVjb3ZlchIUCgVzY29yZRgLIAEoBVIFc2NvcmUSFAoFbG' + 'V2ZWwYDCABKAVSBWxldmVs'); @$core.Deprecated('Use setPasswordRequestDescriptor instead') const SetPasswordRequest$json = { diff --git a/dart/passport/blocks.pb.dart b/dart/passport/blocks.pb.dart index 9e52247..1e5017c 100644 --- a/dart/passport/blocks.pb.dart +++ b/dart/passport/blocks.pb.dart @@ -277,15 +277,11 @@ class SearchRequest extends $pb.GeneratedMessage { class StatusReply extends $pb.GeneratedMessage { factory StatusReply({ - $fixnum.Int64? status, - $core.String? identity, - $core.String? message, + $core.String? data, $fixnum.Int64? timeseq, }) { final result = create(); - if (status != null) result.status = status; - if (identity != null) result.identity = identity; - if (message != null) result.message = message; + if (data != null) result.data = data; if (timeseq != null) result.timeseq = timeseq; return result; } @@ -303,10 +299,8 @@ class StatusReply extends $pb.GeneratedMessage { _omitMessageNames ? '' : 'StatusReply', package: const $pb.PackageName(_omitMessageNames ? '' : 'passport'), createEmptyInstance: create) - ..aInt64(1, _omitFieldNames ? '' : 'status') - ..aOS(2, _omitFieldNames ? '' : 'identity') - ..aOS(3, _omitFieldNames ? '' : 'message') - ..aInt64(4, _omitFieldNames ? '' : 'timeseq') + ..aOS(1, _omitFieldNames ? '' : 'data') + ..aInt64(2, _omitFieldNames ? '' : 'timeseq') ..hasRequiredFields = false; @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') @@ -330,40 +324,22 @@ class StatusReply extends $pb.GeneratedMessage { static StatusReply? _defaultInstance; @$pb.TagNumber(1) - $fixnum.Int64 get status => $_getI64(0); + $core.String get data => $_getSZ(0); @$pb.TagNumber(1) - set status($fixnum.Int64 value) => $_setInt64(0, value); + set data($core.String value) => $_setString(0, value); @$pb.TagNumber(1) - $core.bool hasStatus() => $_has(0); + $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearStatus() => $_clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(2) - $core.String get identity => $_getSZ(1); + $fixnum.Int64 get timeseq => $_getI64(1); @$pb.TagNumber(2) - set identity($core.String value) => $_setString(1, value); + set timeseq($fixnum.Int64 value) => $_setInt64(1, value); @$pb.TagNumber(2) - $core.bool hasIdentity() => $_has(1); + $core.bool hasTimeseq() => $_has(1); @$pb.TagNumber(2) - void clearIdentity() => $_clearField(2); - - @$pb.TagNumber(3) - $core.String get message => $_getSZ(2); - @$pb.TagNumber(3) - set message($core.String value) => $_setString(2, value); - @$pb.TagNumber(3) - $core.bool hasMessage() => $_has(2); - @$pb.TagNumber(3) - void clearMessage() => $_clearField(3); - - @$pb.TagNumber(4) - $fixnum.Int64 get timeseq => $_getI64(3); - @$pb.TagNumber(4) - set timeseq($fixnum.Int64 value) => $_setInt64(3, value); - @$pb.TagNumber(4) - $core.bool hasTimeseq() => $_has(3); - @$pb.TagNumber(4) - void clearTimeseq() => $_clearField(4); + void clearTimeseq() => $_clearField(2); } class Empty extends $pb.GeneratedMessage { diff --git a/dart/passport/blocks.pbjson.dart b/dart/passport/blocks.pbjson.dart index c38cb46..706d1a6 100644 --- a/dart/passport/blocks.pbjson.dart +++ b/dart/passport/blocks.pbjson.dart @@ -91,18 +91,15 @@ final $typed_data.Uint8List searchRequestDescriptor = $convert const StatusReply$json = { '1': 'StatusReply', '2': [ - {'1': 'status', '3': 1, '4': 1, '5': 3, '10': 'status'}, - {'1': 'identity', '3': 2, '4': 1, '5': 9, '10': 'identity'}, - {'1': 'message', '3': 3, '4': 1, '5': 9, '10': 'message'}, - {'1': 'timeseq', '3': 4, '4': 1, '5': 3, '10': 'timeseq'}, + {'1': 'data', '3': 1, '4': 1, '5': 9, '10': 'data'}, + {'1': 'timeseq', '3': 2, '4': 1, '5': 3, '10': 'timeseq'}, ], }; /// Descriptor for `StatusReply`. Decode as a `google.protobuf.DescriptorProto`. final $typed_data.Uint8List statusReplyDescriptor = $convert.base64Decode( - 'CgtTdGF0dXNSZXBseRIWCgZzdGF0dXMYASABKANSBnN0YXR1cxIaCghpZGVudGl0eRgCIAEoCV' - 'IIaWRlbnRpdHkSGAoHbWVzc2FnZRgDIAEoCVIHbWVzc2FnZRIYCgd0aW1lc2VxGAQgASgDUgd0' - 'aW1lc2Vx'); + 'CgtTdGF0dXNSZXBseRISCgRkYXRhGAEgASgJUgRkYXRhEhgKB3RpbWVzZXEYAiABKANSB3RpbW' + 'VzZXE='); @$core.Deprecated('Use emptyDescriptor instead') const Empty$json = { diff --git a/docs/passport/account.md b/docs/passport/account.md index f4a7152..b2647ef 100644 --- a/docs/passport/account.md +++ b/docs/passport/account.md @@ -5,6 +5,8 @@ - [/passport.Account/Get](#passportaccountget) - [/passport.Account/SetData](#passportaccountsetdata) - [/passport.Account/SetPassword](#passportaccountsetpassword) +- [/passport.Account/TagCreate](#passportaccounttagcreate) +- [/passport.Account/TagRemove](#passportaccounttagremove) - [/passport.Account/Statistics](#passportaccountstatistics) ## /passport.Account/Get @@ -41,8 +43,8 @@ "": false }, // map, 数据 tags: [{ - key: "", // type - title: "", // type + name: "", // type + icon: "", // type }], // list } ``` @@ -58,19 +60,21 @@ avatar: "", // type, 头像 birthday: "", // type, 生日 sex: 0, // type, 性别,1为男性,2为女性 + country: 0, // type, 国家 province: 0, // type, 省 city: 0, // type, 市 area: 0, // type, 区 sign: "", // type, 签名 + cover: "", // type, 背景&封面 + score: 0, // type, 积分 + level: 0, // type, 等级 } ``` ### Reply ```javascript { - status: "0", // type, 状态码 - identity: "", // type, 标识码 - message: "", // type, 状态说明 + data: "", // type, 数据 timeseq: "0", // type, 响应时间序列 } ``` @@ -90,9 +94,47 @@ ### Reply ```javascript { - status: "0", // type, 状态码 - identity: "", // type, 标识码 - message: "", // type, 状态说明 + data: "", // type, 数据 + timeseq: "0", // type, 响应时间序列 +} +``` +## /passport.Account/TagCreate + + 新增标签 + + +### Request +```javascript +{ + name: "", // type + icon: "", // type +} +``` + +### Reply +```javascript +{ + data: "", // type, 数据 + timeseq: "0", // type, 响应时间序列 +} +``` +## /passport.Account/TagRemove + + 删除标签 + + +### Request +```javascript +{ + id: "0", // type, 唯一ID + identity: "", // type, 唯一码 +} +``` + +### Reply +```javascript +{ + data: "", // type, 数据 timeseq: "0", // type, 响应时间序列 } ``` diff --git a/docs/passport/forget.md b/docs/passport/forget.md index fcebb08..d17c7e6 100644 --- a/docs/passport/forget.md +++ b/docs/passport/forget.md @@ -21,9 +21,7 @@ ### Reply ```javascript { - status: "0", // type, 状态码 - identity: "", // type, 标识码 - message: "", // type, 状态说明 + data: "", // type, 数据 timeseq: "0", // type, 响应时间序列 } ``` diff --git a/docs/passport/passport.swagger.json b/docs/passport/passport.swagger.json index 245ff4c..c40d6e7 100644 --- a/docs/passport/passport.swagger.json +++ b/docs/passport/passport.swagger.json @@ -209,18 +209,9 @@ "passportStatusReply": { "type": "object", "properties": { - "status": { + "data": { "type": "string", - "format": "int64", - "title": "状态码" - }, - "identity": { - "type": "string", - "title": "标识码" - }, - "message": { - "type": "string", - "title": "状态说明" + "title": "数据" }, "timeseq": { "type": "string", @@ -232,10 +223,10 @@ "passportTagItem": { "type": "object", "properties": { - "key": { + "name": { "type": "string" }, - "title": { + "icon": { "type": "string" } } diff --git a/golnag/passport/account.pb.go b/golnag/passport/account.pb.go index e7a76cc..63cba01 100644 --- a/golnag/passport/account.pb.go +++ b/golnag/passport/account.pb.go @@ -212,8 +212,8 @@ func (x *GetFullReply) GetTags() []*TagItem { type TagItem struct { state protoimpl.MessageState `protogen:"open.v1"` - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Icon string `protobuf:"bytes,2,opt,name=icon,proto3" json:"icon,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -248,16 +248,16 @@ func (*TagItem) Descriptor() ([]byte, []int) { return file_account_proto_rawDescGZIP(), []int{1} } -func (x *TagItem) GetKey() string { +func (x *TagItem) GetName() string { if x != nil { - return x.Key + return x.Name } return "" } -func (x *TagItem) GetTitle() string { +func (x *TagItem) GetIcon() string { if x != nil { - return x.Title + return x.Icon } return "" } @@ -268,10 +268,14 @@ type SetDataRequest struct { Avatar string `protobuf:"bytes,2,opt,name=avatar,proto3" json:"avatar,omitempty"` //头像 Birthday string `protobuf:"bytes,3,opt,name=birthday,proto3" json:"birthday,omitempty"` //生日 Sex int32 `protobuf:"varint,4,opt,name=sex,proto3" json:"sex,omitempty"` //性别,1为男性,2为女性 - Province int32 `protobuf:"varint,5,opt,name=province,proto3" json:"province,omitempty"` //省 - City int32 `protobuf:"varint,6,opt,name=city,proto3" json:"city,omitempty"` //市 - Area int32 `protobuf:"varint,7,opt,name=area,proto3" json:"area,omitempty"` //区 - Sign string `protobuf:"bytes,8,opt,name=sign,proto3" json:"sign,omitempty"` //签名 + Country int32 `protobuf:"varint,5,opt,name=country,proto3" json:"country,omitempty"` // 国家 + Province int32 `protobuf:"varint,6,opt,name=province,proto3" json:"province,omitempty"` //省 + City int32 `protobuf:"varint,7,opt,name=city,proto3" json:"city,omitempty"` //市 + Area int32 `protobuf:"varint,8,opt,name=area,proto3" json:"area,omitempty"` //区 + Sign string `protobuf:"bytes,9,opt,name=sign,proto3" json:"sign,omitempty"` //签名 + Cover string `protobuf:"bytes,10,opt,name=cover,proto3" json:"cover,omitempty"` // 背景&封面 + Score int32 `protobuf:"varint,11,opt,name=score,proto3" json:"score,omitempty"` // 积分 + Level int32 `protobuf:"varint,12,opt,name=level,proto3" json:"level,omitempty"` // 等级 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -334,6 +338,13 @@ func (x *SetDataRequest) GetSex() int32 { return 0 } +func (x *SetDataRequest) GetCountry() int32 { + if x != nil { + return x.Country + } + return 0 +} + func (x *SetDataRequest) GetProvince() int32 { if x != nil { return x.Province @@ -362,6 +373,27 @@ func (x *SetDataRequest) GetSign() string { return "" } +func (x *SetDataRequest) GetCover() string { + if x != nil { + return x.Cover + } + return "" +} + +func (x *SetDataRequest) GetScore() int32 { + if x != nil { + return x.Score + } + return 0 +} + +func (x *SetDataRequest) GetLevel() int32 { + if x != nil { + return x.Level + } + return 0 +} + type SetPasswordRequest struct { state protoimpl.MessageState `protogen:"open.v1"` OldPassword string `protobuf:"bytes,3,opt,name=old_password,json=oldPassword,proto3" json:"old_password,omitempty"` // 旧密码 @@ -531,18 +563,23 @@ const file_account_proto_rawDesc = "" + "\vVerifyEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\bR\x05value:\x028\x01\"1\n" + - "\aTagItem\x12\x10\n" + - "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05title\x18\x02 \x01(\tR\x05title\"\xca\x01\n" + + "\aTagItem\x12\x12\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n" + + "\x04icon\x18\x02 \x01(\tR\x04icon\"\xa6\x02\n" + "\x0eSetDataRequest\x12\x1a\n" + "\bnickname\x18\x01 \x01(\tR\bnickname\x12\x16\n" + "\x06avatar\x18\x02 \x01(\tR\x06avatar\x12\x1a\n" + "\bbirthday\x18\x03 \x01(\tR\bbirthday\x12\x10\n" + - "\x03sex\x18\x04 \x01(\x05R\x03sex\x12\x1a\n" + - "\bprovince\x18\x05 \x01(\x05R\bprovince\x12\x12\n" + - "\x04city\x18\x06 \x01(\x05R\x04city\x12\x12\n" + - "\x04area\x18\a \x01(\x05R\x04area\x12\x12\n" + - "\x04sign\x18\b \x01(\tR\x04sign\"Z\n" + + "\x03sex\x18\x04 \x01(\x05R\x03sex\x12\x18\n" + + "\acountry\x18\x05 \x01(\x05R\acountry\x12\x1a\n" + + "\bprovince\x18\x06 \x01(\x05R\bprovince\x12\x12\n" + + "\x04city\x18\a \x01(\x05R\x04city\x12\x12\n" + + "\x04area\x18\b \x01(\x05R\x04area\x12\x12\n" + + "\x04sign\x18\t \x01(\tR\x04sign\x12\x14\n" + + "\x05cover\x18\n" + + " \x01(\tR\x05cover\x12\x14\n" + + "\x05score\x18\v \x01(\x05R\x05score\x12\x14\n" + + "\x05level\x18\f \x01(\x05R\x05level\"Z\n" + "\x12SetPasswordRequest\x12!\n" + "\fold_password\x18\x03 \x01(\tR\voldPassword\x12!\n" + "\fnew_password\x18\x04 \x01(\tR\vnewPassword\")\n" + @@ -552,11 +589,13 @@ const file_account_proto_rawDesc = "" + "\x04Data\x18\x01 \x03(\v2#.passport.StatisticsReply.DataEntryR\x04Data\x1a7\n" + "\tDataEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\x03R\x05value:\x028\x012\x87\x02\n" + + "\x05value\x18\x02 \x01(\x03R\x05value:\x028\x012\xfe\x02\n" + "\aAccount\x120\n" + "\x03Get\x12\x0f.passport.Empty\x1a\x16.passport.GetFullReply\"\x00\x12<\n" + "\aSetData\x12\x18.passport.SetDataRequest\x1a\x15.passport.StatusReply\"\x00\x12D\n" + - "\vSetPassword\x12\x1c.passport.SetPasswordRequest\x1a\x15.passport.StatusReply\"\x00\x12F\n" + + "\vSetPassword\x12\x1c.passport.SetPasswordRequest\x1a\x15.passport.StatusReply\"\x00\x127\n" + + "\tTagCreate\x12\x11.passport.TagItem\x1a\x15.passport.StatusReply\"\x00\x12<\n" + + "\tTagRemove\x12\x16.passport.IdentRequest\x1a\x15.passport.StatusReply\"\x00\x12F\n" + "\n" + "Statistics\x12\x1b.passport.StatisticsRequest\x1a\x19.passport.StatisticsReply\"\x00B\fZ\n" + ".;passportb\x06proto3" @@ -584,25 +623,30 @@ var file_account_proto_goTypes = []any{ nil, // 6: passport.GetFullReply.VerifyEntry nil, // 7: passport.StatisticsReply.DataEntry (*Empty)(nil), // 8: passport.Empty - (*StatusReply)(nil), // 9: passport.StatusReply + (*IdentRequest)(nil), // 9: passport.IdentRequest + (*StatusReply)(nil), // 10: passport.StatusReply } var file_account_proto_depIdxs = []int32{ - 6, // 0: passport.GetFullReply.verify:type_name -> passport.GetFullReply.VerifyEntry - 1, // 1: passport.GetFullReply.tags:type_name -> passport.TagItem - 7, // 2: passport.StatisticsReply.Data:type_name -> passport.StatisticsReply.DataEntry - 8, // 3: passport.Account.Get:input_type -> passport.Empty - 2, // 4: passport.Account.SetData:input_type -> passport.SetDataRequest - 3, // 5: passport.Account.SetPassword:input_type -> passport.SetPasswordRequest - 4, // 6: passport.Account.Statistics:input_type -> passport.StatisticsRequest - 0, // 7: passport.Account.Get:output_type -> passport.GetFullReply - 9, // 8: passport.Account.SetData:output_type -> passport.StatusReply - 9, // 9: passport.Account.SetPassword:output_type -> passport.StatusReply - 5, // 10: passport.Account.Statistics:output_type -> passport.StatisticsReply - 7, // [7:11] is the sub-list for method output_type - 3, // [3:7] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name + 6, // 0: passport.GetFullReply.verify:type_name -> passport.GetFullReply.VerifyEntry + 1, // 1: passport.GetFullReply.tags:type_name -> passport.TagItem + 7, // 2: passport.StatisticsReply.Data:type_name -> passport.StatisticsReply.DataEntry + 8, // 3: passport.Account.Get:input_type -> passport.Empty + 2, // 4: passport.Account.SetData:input_type -> passport.SetDataRequest + 3, // 5: passport.Account.SetPassword:input_type -> passport.SetPasswordRequest + 1, // 6: passport.Account.TagCreate:input_type -> passport.TagItem + 9, // 7: passport.Account.TagRemove:input_type -> passport.IdentRequest + 4, // 8: passport.Account.Statistics:input_type -> passport.StatisticsRequest + 0, // 9: passport.Account.Get:output_type -> passport.GetFullReply + 10, // 10: passport.Account.SetData:output_type -> passport.StatusReply + 10, // 11: passport.Account.SetPassword:output_type -> passport.StatusReply + 10, // 12: passport.Account.TagCreate:output_type -> passport.StatusReply + 10, // 13: passport.Account.TagRemove:output_type -> passport.StatusReply + 5, // 14: passport.Account.Statistics:output_type -> passport.StatisticsReply + 9, // [9:15] is the sub-list for method output_type + 3, // [3:9] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_account_proto_init() } diff --git a/golnag/passport/account_grpc.pb.go b/golnag/passport/account_grpc.pb.go index 12e3690..7a2ec9b 100644 --- a/golnag/passport/account_grpc.pb.go +++ b/golnag/passport/account_grpc.pb.go @@ -22,6 +22,8 @@ const ( Account_Get_FullMethodName = "/passport.Account/Get" Account_SetData_FullMethodName = "/passport.Account/SetData" Account_SetPassword_FullMethodName = "/passport.Account/SetPassword" + Account_TagCreate_FullMethodName = "/passport.Account/TagCreate" + Account_TagRemove_FullMethodName = "/passport.Account/TagRemove" Account_Statistics_FullMethodName = "/passport.Account/Statistics" ) @@ -37,6 +39,10 @@ type AccountClient interface { SetData(ctx context.Context, in *SetDataRequest, opts ...grpc.CallOption) (*StatusReply, error) // 更新会员的密码 SetPassword(ctx context.Context, in *SetPasswordRequest, opts ...grpc.CallOption) (*StatusReply, error) + // 新增标签 + TagCreate(ctx context.Context, in *TagItem, opts ...grpc.CallOption) (*StatusReply, error) + // 删除标签 + TagRemove(ctx context.Context, in *IdentRequest, opts ...grpc.CallOption) (*StatusReply, error) // 获取会员的相关统计数据 Statistics(ctx context.Context, in *StatisticsRequest, opts ...grpc.CallOption) (*StatisticsReply, error) } @@ -79,6 +85,26 @@ func (c *accountClient) SetPassword(ctx context.Context, in *SetPasswordRequest, return out, nil } +func (c *accountClient) TagCreate(ctx context.Context, in *TagItem, opts ...grpc.CallOption) (*StatusReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(StatusReply) + err := c.cc.Invoke(ctx, Account_TagCreate_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *accountClient) TagRemove(ctx context.Context, in *IdentRequest, opts ...grpc.CallOption) (*StatusReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(StatusReply) + err := c.cc.Invoke(ctx, Account_TagRemove_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *accountClient) Statistics(ctx context.Context, in *StatisticsRequest, opts ...grpc.CallOption) (*StatisticsReply, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(StatisticsReply) @@ -101,6 +127,10 @@ type AccountServer interface { SetData(context.Context, *SetDataRequest) (*StatusReply, error) // 更新会员的密码 SetPassword(context.Context, *SetPasswordRequest) (*StatusReply, error) + // 新增标签 + TagCreate(context.Context, *TagItem) (*StatusReply, error) + // 删除标签 + TagRemove(context.Context, *IdentRequest) (*StatusReply, error) // 获取会员的相关统计数据 Statistics(context.Context, *StatisticsRequest) (*StatisticsReply, error) mustEmbedUnimplementedAccountServer() @@ -122,6 +152,12 @@ func (UnimplementedAccountServer) SetData(context.Context, *SetDataRequest) (*St func (UnimplementedAccountServer) SetPassword(context.Context, *SetPasswordRequest) (*StatusReply, error) { return nil, status.Errorf(codes.Unimplemented, "method SetPassword not implemented") } +func (UnimplementedAccountServer) TagCreate(context.Context, *TagItem) (*StatusReply, error) { + return nil, status.Errorf(codes.Unimplemented, "method TagCreate not implemented") +} +func (UnimplementedAccountServer) TagRemove(context.Context, *IdentRequest) (*StatusReply, error) { + return nil, status.Errorf(codes.Unimplemented, "method TagRemove not implemented") +} func (UnimplementedAccountServer) Statistics(context.Context, *StatisticsRequest) (*StatisticsReply, error) { return nil, status.Errorf(codes.Unimplemented, "method Statistics not implemented") } @@ -200,6 +236,42 @@ func _Account_SetPassword_Handler(srv interface{}, ctx context.Context, dec func return interceptor(ctx, in, info, handler) } +func _Account_TagCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(TagItem) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AccountServer).TagCreate(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Account_TagCreate_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AccountServer).TagCreate(ctx, req.(*TagItem)) + } + return interceptor(ctx, in, info, handler) +} + +func _Account_TagRemove_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdentRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AccountServer).TagRemove(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Account_TagRemove_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AccountServer).TagRemove(ctx, req.(*IdentRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Account_Statistics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(StatisticsRequest) if err := dec(in); err != nil { @@ -237,6 +309,14 @@ var Account_ServiceDesc = grpc.ServiceDesc{ MethodName: "SetPassword", Handler: _Account_SetPassword_Handler, }, + { + MethodName: "TagCreate", + Handler: _Account_TagCreate_Handler, + }, + { + MethodName: "TagRemove", + Handler: _Account_TagRemove_Handler, + }, { MethodName: "Statistics", Handler: _Account_Statistics_Handler, diff --git a/golnag/passport/blocks.pb.go b/golnag/passport/blocks.pb.go index f1e19f3..7ee6638 100644 --- a/golnag/passport/blocks.pb.go +++ b/golnag/passport/blocks.pb.go @@ -223,10 +223,8 @@ func (x *SearchRequest) GetKeyword() string { type StatusReply struct { state protoimpl.MessageState `protogen:"open.v1"` - Status int64 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"` // 状态码 - Identity string `protobuf:"bytes,2,opt,name=identity,proto3" json:"identity,omitempty"` // 标识码 - Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` //状态说明 - Timeseq int64 `protobuf:"varint,4,opt,name=timeseq,proto3" json:"timeseq,omitempty"` // 响应时间序列 + Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` // 数据 + Timeseq int64 `protobuf:"varint,2,opt,name=timeseq,proto3" json:"timeseq,omitempty"` // 响应时间序列 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -261,23 +259,9 @@ func (*StatusReply) Descriptor() ([]byte, []int) { return file_blocks_proto_rawDescGZIP(), []int{4} } -func (x *StatusReply) GetStatus() int64 { +func (x *StatusReply) GetData() string { if x != nil { - return x.Status - } - return 0 -} - -func (x *StatusReply) GetIdentity() string { - if x != nil { - return x.Identity - } - return "" -} - -func (x *StatusReply) GetMessage() string { - if x != nil { - return x.Message + return x.Data } return "" } @@ -343,12 +327,10 @@ const file_blocks_proto_rawDesc = "" + "\x0eVersionRequest\x12\x18\n" + "\aversion\x18\x01 \x01(\x03R\aversion\")\n" + "\rSearchRequest\x12\x18\n" + - "\akeyword\x18\x01 \x01(\tR\akeyword\"u\n" + - "\vStatusReply\x12\x16\n" + - "\x06status\x18\x01 \x01(\x03R\x06status\x12\x1a\n" + - "\bidentity\x18\x02 \x01(\tR\bidentity\x12\x18\n" + - "\amessage\x18\x03 \x01(\tR\amessage\x12\x18\n" + - "\atimeseq\x18\x04 \x01(\x03R\atimeseq\"\a\n" + + "\akeyword\x18\x01 \x01(\tR\akeyword\";\n" + + "\vStatusReply\x12\x12\n" + + "\x04data\x18\x01 \x01(\tR\x04data\x12\x18\n" + + "\atimeseq\x18\x02 \x01(\x03R\atimeseq\"\a\n" + "\x05EmptyB\fZ\n" + ".;passportb\x06proto3" diff --git a/typescript/passport/index.ts b/typescript/passport/index.ts index f66a17c..29c3a6a 100644 --- a/typescript/passport/index.ts +++ b/typescript/passport/index.ts @@ -29,12 +29,8 @@ export type SearchRequest = { }; export type StatusReply = { - /** 状态码 */ - status?: number; - /** 标识码 */ - identity?: string; - /** 状态说明 */ - message?: string; + /** 数据 */ + data?: string; /** 响应时间序列 */ timeseq?: number; }; @@ -84,8 +80,8 @@ export type GetFullReply = { }; export type TagItem = { - key?: string; - title?: string; + name?: string; + icon?: string; }; export type SetDataRequest = { @@ -97,6 +93,8 @@ export type SetDataRequest = { birthday?: string; /** 性别,1为男性,2为女性 */ sex?: number; + /** 国家 */ + country?: number; /** 省 */ province?: number; /** 市 */ @@ -105,6 +103,12 @@ export type SetDataRequest = { area?: number; /** 签名 */ sign?: string; + /** 背景&封面 */ + cover?: string; + /** 积分 */ + score?: number; + /** 等级 */ + level?: number; }; export type SetPasswordRequest = {