Archived
修改部分小数数字精度(float->double),增加用户服务状态API
This commit is contained in:
@@ -17,6 +17,7 @@ message NodeTask {
|
||||
int64 version = 7;
|
||||
bool isPrimary = 8; // 是否为主节点,非主节点稍等再同步有利于提升同步速度
|
||||
int64 serverId = 9;
|
||||
int64 userId = 10;
|
||||
|
||||
Node node = 30;
|
||||
NodeCluster nodeCluster = 31;
|
||||
|
||||
@@ -13,7 +13,7 @@ message Plan {
|
||||
string priceType = 7;
|
||||
bytes trafficPriceJSON = 8;
|
||||
bytes bandwidthPriceJSON = 12;
|
||||
float monthlyPrice = 9;
|
||||
float seasonallyPrice = 10;
|
||||
float yearlyPrice = 11;
|
||||
double monthlyPrice = 9;
|
||||
double seasonallyPrice = 10;
|
||||
double yearlyPrice = 11;
|
||||
}
|
||||
@@ -8,5 +8,5 @@ message TrafficPackagePrice {
|
||||
int64 trafficPackageId = 1;
|
||||
int64 nodeRegionId = 2;
|
||||
int64 trafficPackagePeriodId = 3;
|
||||
float price = 4;
|
||||
double price = 4;
|
||||
}
|
||||
@@ -8,8 +8,8 @@ import "models/model_user.proto";
|
||||
message UserAccount {
|
||||
int64 id = 1;
|
||||
int64 userId = 2;
|
||||
float total = 3;
|
||||
float totalFrozen = 4;
|
||||
double total = 3;
|
||||
double totalFrozen = 4;
|
||||
|
||||
User user = 30;
|
||||
}
|
||||
@@ -10,10 +10,10 @@ message UserAccountLog {
|
||||
int64 id = 1;
|
||||
int64 userId = 2;
|
||||
int64 userAccountId = 3;
|
||||
float delta = 4;
|
||||
float deltaFrozen = 5;
|
||||
float total = 6;
|
||||
float totalFrozen = 7;
|
||||
double delta = 4;
|
||||
double deltaFrozen = 5;
|
||||
double total = 6;
|
||||
double totalFrozen = 7;
|
||||
string eventType = 8;
|
||||
string description = 9;
|
||||
int64 createdAt = 10;
|
||||
|
||||
@@ -11,7 +11,7 @@ message UserBill {
|
||||
string type = 3;
|
||||
string typeName = 4;
|
||||
string description = 5;
|
||||
float amount = 6;
|
||||
double amount = 6;
|
||||
string month = 7;
|
||||
bool isPaid = 8;
|
||||
int64 paidAt = 9;
|
||||
|
||||
@@ -10,13 +10,13 @@ message UserTrafficBill {
|
||||
int64 id = 1;
|
||||
int64 billId = 2;
|
||||
int64 nodeRegionId = 3;
|
||||
float amount = 4;
|
||||
float bandwidthMB = 5;
|
||||
double amount = 4;
|
||||
double bandwidthMB = 5;
|
||||
int32 bandwidthPercentile = 6;
|
||||
float trafficGB = 7;
|
||||
float trafficPackageGB = 8;
|
||||
double trafficGB = 7;
|
||||
double trafficPackageGB = 8;
|
||||
repeated int64 userTrafficPackageIds = 9;
|
||||
float pricePerUnit = 10;
|
||||
double pricePerUnit = 10;
|
||||
string priceType = 11;
|
||||
|
||||
NodeRegion nodeRegion = 30;
|
||||
|
||||
@@ -12,12 +12,12 @@ service PriceService {
|
||||
// 计算费用
|
||||
message CalculatePriceRequest {
|
||||
string priceType = 1;
|
||||
float trafficGB = 2;
|
||||
float bandwidthMB = 3;
|
||||
double trafficGB = 2;
|
||||
double bandwidthMB = 3;
|
||||
int64 nodeRegionId = 4;
|
||||
}
|
||||
|
||||
message CalculatePriceResponse {
|
||||
float amount = 1;
|
||||
double amount = 1;
|
||||
bool hasNodeRegionPrice = 2;
|
||||
}
|
||||
@@ -122,6 +122,9 @@ service ServerService {
|
||||
// 查找一个用户下的所有服务
|
||||
rpc findAllUserServers(FindAllUserServersRequest) returns (FindAllUserServersResponse);
|
||||
|
||||
// 查找某个用户下的服务配置
|
||||
rpc composeAllUserServersConfig(ComposeAllUserServersConfigRequest) returns (ComposeAllUserServersConfigResponse);
|
||||
|
||||
// 查找用户服务基本信息
|
||||
rpc findEnabledUserServerBasic (FindEnabledUserServerBasicRequest) returns (FindEnabledUserServerBasicResponse);
|
||||
|
||||
@@ -474,6 +477,15 @@ message FindAllUserServersResponse {
|
||||
repeated Server servers = 1; // 只返回一些简要信息
|
||||
}
|
||||
|
||||
// 查找某个用户下的服务配置
|
||||
message ComposeAllUserServersConfigRequest {
|
||||
int64 userId = 1;
|
||||
}
|
||||
|
||||
message ComposeAllUserServersConfigResponse {
|
||||
bytes serversConfigJSON = 1; // [server config1, server config2, ...]
|
||||
}
|
||||
|
||||
// 查找用户服务基本信息
|
||||
message FindEnabledUserServerBasicRequest {
|
||||
int64 serverId = 1;
|
||||
|
||||
@@ -29,7 +29,7 @@ message UpdateTrafficPackagePriceRequest {
|
||||
int64 trafficPackageId = 1;
|
||||
int64 nodeRegionId = 2;
|
||||
int64 trafficPackagePeriodId = 3;
|
||||
float price = 4;
|
||||
double price = 4;
|
||||
}
|
||||
|
||||
// 获取单个流量包具体价格
|
||||
@@ -41,8 +41,8 @@ message FindTrafficPackagePriceRequest {
|
||||
}
|
||||
|
||||
message FindTrafficPackagePriceResponse {
|
||||
float price = 1; // 单价
|
||||
float amount = 2; // 总价
|
||||
double price = 1; // 单价
|
||||
double amount = 2; // 总价
|
||||
}
|
||||
|
||||
// 计算流量包价格项数量
|
||||
|
||||
@@ -78,6 +78,12 @@ service UserService {
|
||||
|
||||
// 修改用户计费周期
|
||||
rpc updateUserPricePeriod(UpdateUserPricePeriodRequest) returns (RPCSuccess);
|
||||
|
||||
// 检查用户服务可用状态
|
||||
rpc checkUserServersState(CheckUserServersStateRequest) returns (CheckUserServersStateResponse);
|
||||
|
||||
// 更新用户服务可用状态
|
||||
rpc renewUserServersState(RenewUserServersStateRequest) returns (RPCSuccess);
|
||||
}
|
||||
|
||||
// 创建用户
|
||||
@@ -324,4 +330,18 @@ message UpdateUserPriceTypeRequest {
|
||||
message UpdateUserPricePeriodRequest {
|
||||
int64 userId = 1;
|
||||
string pricePeriod = 2;
|
||||
}
|
||||
|
||||
// 检查用户服务可用状态
|
||||
message CheckUserServersStateRequest {
|
||||
int64 userId = 1;
|
||||
}
|
||||
|
||||
message CheckUserServersStateResponse {
|
||||
bool isEnabled = 1;
|
||||
}
|
||||
|
||||
// 更新用户服务可用状态
|
||||
message RenewUserServersStateRequest {
|
||||
int64 userId = 1;
|
||||
}
|
||||
@@ -61,7 +61,7 @@ message FindEnabledUserAccountResponse {
|
||||
// 修改用户账户
|
||||
message UpdateUserAccountRequest {
|
||||
int64 userAccountId = 1;
|
||||
float delta = 2;
|
||||
double delta = 2;
|
||||
string eventType = 3;
|
||||
string description = 4;
|
||||
bytes paramsJSON = 5;
|
||||
|
||||
@@ -78,5 +78,5 @@ message SumUserUnpaidBillsRequest {
|
||||
}
|
||||
|
||||
message SumUserUnpaidBillsResponse {
|
||||
float amount = 1;
|
||||
double amount = 1;
|
||||
}
|
||||
@@ -34,7 +34,7 @@ service UserOrderService {
|
||||
message CreateUserOrderRequest {
|
||||
string type = 1;
|
||||
string orderMethodCode = 2;
|
||||
float amount = 3;
|
||||
double amount = 3;
|
||||
bytes paramsJSON = 4;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user