用户权益调用

pb/client/gogameclient/go_game_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gogameclient

pb/client/goplanclient/go_plan_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package goplanclient

pb/client/gopmpclient/go_pmp_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gopmpclient

pb/client/goshortdramaclient/go_short_drama_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package goshortdramaclient

pb/client/gosysclient/go_sys_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gosysclient

pb/client/gouserclient/go_user_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gouserclient

pb/client/govpnclient/go_vpn_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package govpnclient

pb/gorpc.proto

@@ -2594,15 +2594,15 @@ message  UserServiceVo {
   string userUuid = 2;          // 用户UUID
   string productCode = 3;       // 产品ID
   int64 ownerId = 4;            // 服务所有者ID
-  int64 servicePlanId = 5;      // 服务计划ID
-  int64 serviceTypeId = 6;      // 服务类型ID
+//  int64 servicePlanId = 5;      // 服务计划ID
+//  int64 serviceTypeId = 6;      // 服务类型ID
   int64 licenseDays = 7;        // 授权天数
   int64 licenseMinutes = 8;     // 授权分钟数
   int64 userLevel = 9;         // 用户等级
   int64 deviceLimit = 10;       // 设备数量限制
   int64 speedLimit = 11;        // 速度限制
   int64 trafficLimit = 12;      // 流量限制
-  int64 state = 13;             // 状态
+//  int64 state = 13;             // 状态
   Status status = 14;           // 状态
   int64 createTime = 15;        // 创建时间
   int64 updateTime = 16;        // 更新时间

pb/pb/gorpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.36.10
-// 	protoc        v6.33.0
+// 	protoc        v3.19.4
 // source: gorpc.proto
 
 package pb
@@ -21377,26 +21377,26 @@ func (x *UserTestDelReq) GetIds() []int64 {
 
 // 用户服务订阅权益表
 type UserServiceVo struct {
-	state          protoimpl.MessageState `protogen:"open.v1"`
-	Id             int64                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                            // 主键ID
-	UserUuid       string                 `protobuf:"bytes,2,opt,name=userUuid,proto3" json:"userUuid,omitempty"`                 // 用户UUID
-	ProductCode    string                 `protobuf:"bytes,3,opt,name=productCode,proto3" json:"productCode,omitempty"`           // 产品ID
-	OwnerId        int64                  `protobuf:"varint,4,opt,name=ownerId,proto3" json:"ownerId,omitempty"`                  // 服务所有者ID
-	ServicePlanId  int64                  `protobuf:"varint,5,opt,name=servicePlanId,proto3" json:"servicePlanId,omitempty"`      // 服务计划ID
-	ServiceTypeId  int64                  `protobuf:"varint,6,opt,name=serviceTypeId,proto3" json:"serviceTypeId,omitempty"`      // 服务类型ID
-	LicenseDays    int64                  `protobuf:"varint,7,opt,name=licenseDays,proto3" json:"licenseDays,omitempty"`          // 授权天数
-	LicenseMinutes int64                  `protobuf:"varint,8,opt,name=licenseMinutes,proto3" json:"licenseMinutes,omitempty"`    // 授权分钟数
-	UserLevel      int64                  `protobuf:"varint,9,opt,name=userLevel,proto3" json:"userLevel,omitempty"`              // 用户等级
-	DeviceLimit    int64                  `protobuf:"varint,10,opt,name=deviceLimit,proto3" json:"deviceLimit,omitempty"`         // 设备数量限制
-	SpeedLimit     int64                  `protobuf:"varint,11,opt,name=speedLimit,proto3" json:"speedLimit,omitempty"`           // 速度限制
-	TrafficLimit   int64                  `protobuf:"varint,12,opt,name=trafficLimit,proto3" json:"trafficLimit,omitempty"`       // 流量限制
-	State          int64                  `protobuf:"varint,13,opt,name=state,proto3" json:"state,omitempty"`                     // 状态
-	Status         Status                 `protobuf:"varint,14,opt,name=status,proto3,enum=gorpc.Status" json:"status,omitempty"` // 状态
-	CreateTime     int64                  `protobuf:"varint,15,opt,name=createTime,proto3" json:"createTime,omitempty"`           // 创建时间
-	UpdateTime     int64                  `protobuf:"varint,16,opt,name=updateTime,proto3" json:"updateTime,omitempty"`           // 更新时间
-	StartTime      int64                  `protobuf:"varint,17,opt,name=startTime,proto3" json:"startTime,omitempty"`             // 套餐开始时间
-	unknownFields  protoimpl.UnknownFields
-	sizeCache      protoimpl.SizeCache
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	Id          int64                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                  // 主键ID
+	UserUuid    string                 `protobuf:"bytes,2,opt,name=userUuid,proto3" json:"userUuid,omitempty"`       // 用户UUID
+	ProductCode string                 `protobuf:"bytes,3,opt,name=productCode,proto3" json:"productCode,omitempty"` // 产品ID
+	OwnerId     int64                  `protobuf:"varint,4,opt,name=ownerId,proto3" json:"ownerId,omitempty"`        // 服务所有者ID
+	// int64 servicePlanId = 5;      // 服务计划ID
+	// int64 serviceTypeId = 6;      // 服务类型ID
+	LicenseDays    int64 `protobuf:"varint,7,opt,name=licenseDays,proto3" json:"licenseDays,omitempty"`       // 授权天数
+	LicenseMinutes int64 `protobuf:"varint,8,opt,name=licenseMinutes,proto3" json:"licenseMinutes,omitempty"` // 授权分钟数
+	UserLevel      int64 `protobuf:"varint,9,opt,name=userLevel,proto3" json:"userLevel,omitempty"`           // 用户等级
+	DeviceLimit    int64 `protobuf:"varint,10,opt,name=deviceLimit,proto3" json:"deviceLimit,omitempty"`      // 设备数量限制
+	SpeedLimit     int64 `protobuf:"varint,11,opt,name=speedLimit,proto3" json:"speedLimit,omitempty"`        // 速度限制
+	TrafficLimit   int64 `protobuf:"varint,12,opt,name=trafficLimit,proto3" json:"trafficLimit,omitempty"`    // 流量限制
+	// int64 state = 13;             // 状态
+	Status        Status `protobuf:"varint,14,opt,name=status,proto3,enum=gorpc.Status" json:"status,omitempty"` // 状态
+	CreateTime    int64  `protobuf:"varint,15,opt,name=createTime,proto3" json:"createTime,omitempty"`           // 创建时间
+	UpdateTime    int64  `protobuf:"varint,16,opt,name=updateTime,proto3" json:"updateTime,omitempty"`           // 更新时间
+	StartTime     int64  `protobuf:"varint,17,opt,name=startTime,proto3" json:"startTime,omitempty"`             // 套餐开始时间
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
 }
 
 func (x *UserServiceVo) Reset() {
@@ -21457,20 +21457,6 @@ func (x *UserServiceVo) GetOwnerId() int64 {
 	return 0
 }
 
-func (x *UserServiceVo) GetServicePlanId() int64 {
-	if x != nil {
-		return x.ServicePlanId
-	}
-	return 0
-}
-
-func (x *UserServiceVo) GetServiceTypeId() int64 {
-	if x != nil {
-		return x.ServiceTypeId
-	}
-	return 0
-}
-
 func (x *UserServiceVo) GetLicenseDays() int64 {
 	if x != nil {
 		return x.LicenseDays
@@ -21513,13 +21499,6 @@ func (x *UserServiceVo) GetTrafficLimit() int64 {
 	return 0
 }
 
-func (x *UserServiceVo) GetState() int64 {
-	if x != nil {
-		return x.State
-	}
-	return 0
-}
-
 func (x *UserServiceVo) GetStatus() Status {
 	if x != nil {
 		return x.Status
@@ -34660,14 +34639,12 @@ const file_gorpc_proto_rawDesc = "" +
 	"\x12UserTestUpdateResp\x12!\n" +
 	"\x02vo\x18\x01 \x01(\v2\x11.gorpc.UserTestVoR\x02vo\"\"\n" +
 	"\x0eUserTestDelReq\x12\x10\n" +
-	"\x03ids\x18\x01 \x03(\x03R\x03ids\"\xac\x04\n" +
+	"\x03ids\x18\x01 \x03(\x03R\x03ids\"\xca\x03\n" +
 	"\rUserServiceVo\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" +
 	"\buserUuid\x18\x02 \x01(\tR\buserUuid\x12 \n" +
 	"\vproductCode\x18\x03 \x01(\tR\vproductCode\x12\x18\n" +
-	"\aownerId\x18\x04 \x01(\x03R\aownerId\x12$\n" +
-	"\rservicePlanId\x18\x05 \x01(\x03R\rservicePlanId\x12$\n" +
-	"\rserviceTypeId\x18\x06 \x01(\x03R\rserviceTypeId\x12 \n" +
+	"\aownerId\x18\x04 \x01(\x03R\aownerId\x12 \n" +
 	"\vlicenseDays\x18\a \x01(\x03R\vlicenseDays\x12&\n" +
 	"\x0elicenseMinutes\x18\b \x01(\x03R\x0elicenseMinutes\x12\x1c\n" +
 	"\tuserLevel\x18\t \x01(\x03R\tuserLevel\x12 \n" +
@@ -34676,8 +34653,7 @@ const file_gorpc_proto_rawDesc = "" +
 	"\n" +
 	"speedLimit\x18\v \x01(\x03R\n" +
 	"speedLimit\x12\"\n" +
-	"\ftrafficLimit\x18\f \x01(\x03R\ftrafficLimit\x12\x14\n" +
-	"\x05state\x18\r \x01(\x03R\x05state\x12%\n" +
+	"\ftrafficLimit\x18\f \x01(\x03R\ftrafficLimit\x12%\n" +
 	"\x06status\x18\x0e \x01(\x0e2\r.gorpc.StatusR\x06status\x12\x1e\n" +
 	"\n" +
 	"createTime\x18\x0f \x01(\x03R\n" +

pb/pb/gorpc_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.5.1
-// - protoc             v6.33.0
+// - protoc             v3.19.4
 // source: gorpc.proto
 
 package pb

pb/user.proto

@@ -149,15 +149,15 @@ message  UserServiceVo {
   string userUuid = 2;          // 用户UUID
   string productCode = 3;       // 产品ID
   int64 ownerId = 4;            // 服务所有者ID
-  int64 servicePlanId = 5;      // 服务计划ID
-  int64 serviceTypeId = 6;      // 服务类型ID
+//  int64 servicePlanId = 5;      // 服务计划ID
+//  int64 serviceTypeId = 6;      // 服务类型ID
   int64 licenseDays = 7;        // 授权天数
   int64 licenseMinutes = 8;     // 授权分钟数
   int64 userLevel = 9;         // 用户等级
   int64 deviceLimit = 10;       // 设备数量限制
   int64 speedLimit = 11;        // 速度限制
   int64 trafficLimit = 12;      // 流量限制
-  int64 state = 13;             // 状态
+//  int64 state = 13;             // 状态
   Status status = 14;           // 状态
   int64 createTime = 15;        // 创建时间
   int64 updateTime = 16;        // 更新时间