You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/04/04 01:15:57 UTC
[dubbo-go-samples] 01/01: Id -> ID
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch fix/Id
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 867e84a442793d0b3821c9ef726691e2cd05d198
Author: AlexStocks <al...@foxmail.com>
AuthorDate: Sun Apr 4 09:15:43 2021 +0800
Id -> ID
---
async/go-client/pkg/user.go | 2 +-
async/go-server/pkg/user.go | 2 +-
async/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 4 +-
attachment/go-client/pkg/user.go | 2 +-
attachment/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
config-api/go-client/pkg/user.go | 2 +-
config-api/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
configcenter/apollo/go-client/pkg/user.go | 2 +-
.../apollo/go-server/docker/sql/apolloconfigdb.sql | 154 ++++++++++-----------
.../apollo/go-server/docker/sql/apolloportaldb.sql | 132 +++++++++---------
configcenter/apollo/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
configcenter/nacos/go-client/pkg/user.go | 2 +-
configcenter/nacos/go-server/pkg/user.go | 2 +-
.../nacos/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
configcenter/zookeeper/go-client/pkg/user.go | 2 +-
configcenter/zookeeper/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
direct/go-client/pkg/user.go | 2 +-
direct/go-server/pkg/user.go | 2 +-
direct/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
docker/go-client/pkg/user.go | 2 +-
docker/go-server/pkg/user.go | 2 +-
docker/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
filter/custom/go-client/pkg/user.go | 2 +-
filter/custom/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 4 +-
filter/sentinel/go-client/pkg/user.go | 2 +-
filter/sentinel/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
filter/tpslimit/go-client/pkg/user.go | 2 +-
filter/tpslimit/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
general/dubbo/go-client/pkg/user.go | 6 +-
general/dubbo/go-server/pkg/user.go | 14 +-
general/dubbo/go-server/pkg/user_provider.go | 8 +-
.../dubbo/go-server/tests/integration/main_test.go | 6 +-
.../tests/integration/userprovider_test.go | 10 +-
.../src/main/java/org/apache/dubbo/Consumer.java | 30 ++--
.../src/main/java/org/apache/dubbo/Consumer.java | 30 ++--
.../src/main/java/com/ikurento/user/Consumer.java | 22 +--
general/jsonrpc/go-server/app/user.go | 10 +-
general/jsonrpc/go-server/app/user_provider.go | 8 +-
general/jsonrpc/go-server/app/user_provider1.go | 8 +-
general/jsonrpc/go-server/app/user_provider2.go | 8 +-
.../src/main/java/com/ikurento/user/Consumer.java | 24 ++--
general/rest/go-server/pkg/user.go | 10 +-
generic/go-client/cmd/client.go | 2 +-
generic/go-client/pkg/user.go | 2 +-
generic/go-server/pkg/user.go | 8 +-
generic/go-server/tests/integration/main_test.go | 4 +-
.../tests/integration/userprovider_test.go | 2 +-
.../tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
.../src/main/java/org/apache/dubbo/Consumer.java | 2 +-
metric/go-client/pkg/user.go | 2 +-
metric/go-server/pkg/user.go | 4 +-
metric/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
multi-registry/go-client/pkg/user.go | 2 +-
multi-registry/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
multi-zone/go-client/cmd/client.go | 4 +-
multi-zone/go-client/pkg/user.go | 2 +-
.../tests/integration/userprovider_test.go | 4 +-
multi-zone/go-server-hz/pkg/user.go | 2 +-
multi-zone/go-server-sh/pkg/user.go | 2 +-
registry/etcd/go-client/pkg/user.go | 2 +-
registry/etcd/go-server/pkg/user.go | 2 +-
.../etcd/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
registry/nacos/go-client/pkg/user.go | 2 +-
registry/nacos/go-server/pkg/user.go | 2 +-
.../nacos/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
.../consul/go-client/pkg/pojo/user.go | 2 +-
.../consul/go-server/pkg/pojo/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
.../servicediscovery/etcd/go-client/pkg/user.go | 2 +-
.../servicediscovery/etcd/go-server/pkg/user.go | 2 +-
.../etcd/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
.../servicediscovery/file/go-client/pkg/user.go | 2 +-
.../servicediscovery/file/go-server/pkg/user.go | 2 +-
.../file/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
.../servicediscovery/nacos/go-client/pkg/user.go | 2 +-
.../servicediscovery/nacos/go-server/pkg/user.go | 2 +-
.../nacos/go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
.../zookeeper/go-client/pkg/user.go | 2 +-
.../zookeeper/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
.../tests/integration/userprovider_test.go | 2 +-
router/condition/go-client/pkg/user.go | 2 +-
router/condition/go-server/app/user.go | 2 +-
router/condition/go-server/pkg/user.go | 2 +-
.../go-server/tests/integration/main_test.go | 2 +-
router/tag/go-client/app/client.go | 2 +-
router/tag/go-server/app/user.go | 2 +-
.../src/main/java/com/ikurento/user/Consumer.java | 2 +-
shop/dubbo/go-service-order/app/order.go | 2 +-
shop/dubbo/go-service-order/app/product.go | 2 +-
shop/dubbo/go-service-product/app/product.go | 2 +-
shop/dubbo/go-service-user/app/order.go | 4 +-
tracing/dubbo/go-client/app/user.go | 2 +-
tracing/dubbo/go-server/app/user.go | 2 +-
.../src/main/java/com/ikurento/user/Consumer.java | 2 +-
tracing/jsonrpc/go-server/app/user.go | 10 +-
tracing/jsonrpc/go-server/app/user_provider.go | 10 +-
tracing/jsonrpc/go-server/app/user_provider1.go | 8 +-
tracing/jsonrpc/go-server/app/user_provider2.go | 8 +-
128 files changed, 376 insertions(+), 376 deletions(-)
diff --git a/async/go-client/pkg/user.go b/async/go-client/pkg/user.go
index 376b2fc..92239d6 100644
--- a/async/go-client/pkg/user.go
+++ b/async/go-client/pkg/user.go
@@ -30,7 +30,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/async/go-server/pkg/user.go b/async/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/async/go-server/pkg/user.go
+++ b/async/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/async/go-server/tests/integration/main_test.go b/async/go-server/tests/integration/main_test.go
index 5fc8ede..cb20b83 100644
--- a/async/go-server/tests/integration/main_test.go
+++ b/async/go-server/tests/integration/main_test.go
@@ -50,7 +50,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/async/go-server/tests/integration/userprovider_test.go b/async/go-server/tests/integration/userprovider_test.go
index 9fb3f65..947d2cb 100644
--- a/async/go-server/tests/integration/userprovider_test.go
+++ b/async/go-server/tests/integration/userprovider_test.go
@@ -38,14 +38,14 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "", user.Id)
+ assert.Equal(t, "", user.ID)
assert.Equal(t, "", user.Name)
assert.Equal(t, int32(0), user.Age)
user = <-userProvider.ch
assert.NotNil(t, user)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/attachment/go-client/pkg/user.go b/attachment/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/attachment/go-client/pkg/user.go
+++ b/attachment/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/attachment/go-server/pkg/user.go b/attachment/go-server/pkg/user.go
index fde9b0e..3ef5aa7 100644
--- a/attachment/go-server/pkg/user.go
+++ b/attachment/go-server/pkg/user.go
@@ -39,7 +39,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/attachment/go-server/tests/integration/main_test.go b/attachment/go-server/tests/integration/main_test.go
index beebca1..10bc5ca 100644
--- a/attachment/go-server/tests/integration/main_test.go
+++ b/attachment/go-server/tests/integration/main_test.go
@@ -54,7 +54,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/attachment/go-server/tests/integration/userprovider_test.go b/attachment/go-server/tests/integration/userprovider_test.go
index ce07f2d..5cc9943 100644
--- a/attachment/go-server/tests/integration/userprovider_test.go
+++ b/attachment/go-server/tests/integration/userprovider_test.go
@@ -36,7 +36,7 @@ func TestGetUser(t *testing.T) {
err := userProvider.GetUser(ctx, []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/config-api/go-client/pkg/user.go b/config-api/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/config-api/go-client/pkg/user.go
+++ b/config-api/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/config-api/go-server/pkg/user.go b/config-api/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/config-api/go-server/pkg/user.go
+++ b/config-api/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/config-api/go-server/tests/integration/main_test.go b/config-api/go-server/tests/integration/main_test.go
index ed8d290..f79029c 100644
--- a/config-api/go-server/tests/integration/main_test.go
+++ b/config-api/go-server/tests/integration/main_test.go
@@ -53,7 +53,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/config-api/go-server/tests/integration/userprovider_test.go b/config-api/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/config-api/go-server/tests/integration/userprovider_test.go
+++ b/config-api/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/configcenter/apollo/go-client/pkg/user.go b/configcenter/apollo/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/configcenter/apollo/go-client/pkg/user.go
+++ b/configcenter/apollo/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/apollo/go-server/docker/sql/apolloconfigdb.sql b/configcenter/apollo/go-server/docker/sql/apolloconfigdb.sql
index 890519f..a883f05 100644
--- a/configcenter/apollo/go-server/docker/sql/apolloconfigdb.sql
+++ b/configcenter/apollo/go-server/docker/sql/apolloconfigdb.sql
@@ -18,10 +18,10 @@ Use ApolloConfigDB;
DROP TABLE IF EXISTS `App`;
CREATE TABLE `App` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `AppID` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
- `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
+ `OrgID` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门ID',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
@@ -30,8 +30,8 @@ CREATE TABLE `App` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `AppId` (`AppId`(191)),
+ PRIMARY KEY (`ID`),
+ KEY `AppID` (`AppID`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Name` (`Name`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用表';
@@ -44,9 +44,9 @@ CREATE TABLE `App` (
DROP TABLE IF EXISTS `AppNamespace`;
CREATE TABLE `AppNamespace` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
- `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
+ `AppID` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
`Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT 'namespace的format类型',
`IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
`Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
@@ -55,9 +55,9 @@ CREATE TABLE `AppNamespace` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_AppId` (`AppId`),
- KEY `Name_AppId` (`Name`,`AppId`),
+ PRIMARY KEY (`ID`),
+ KEY `IX_AppID` (`AppID`),
+ KEY `Name_AppID` (`Name`,`AppID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用namespace定义';
@@ -69,9 +69,9 @@ CREATE TABLE `AppNamespace` (
DROP TABLE IF EXISTS `Audit`;
CREATE TABLE `Audit` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`EntityName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '表名',
- `EntityId` int(10) unsigned DEFAULT NULL COMMENT '记录ID',
+ `EntityID` int(10) unsigned DEFAULT NULL COMMENT '记录ID',
`OpName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '操作类型',
`Comment` varchar(500) DEFAULT NULL COMMENT '备注',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
@@ -79,7 +79,7 @@ CREATE TABLE `Audit` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='日志审计表';
@@ -91,18 +91,18 @@ CREATE TABLE `Audit` (
DROP TABLE IF EXISTS `Cluster`;
CREATE TABLE `Cluster` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT '集群名字',
- `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'App id',
- `ParentClusterId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '父cluster',
+ `AppID` varchar(64) NOT NULL DEFAULT '' COMMENT 'App id',
+ `ParentClusterID` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '父cluster',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_AppId_Name` (`AppId`,`Name`),
- KEY `IX_ParentClusterId` (`ParentClusterId`),
+ PRIMARY KEY (`ID`),
+ KEY `IX_AppID_Name` (`AppID`,`Name`),
+ KEY `IX_ParentClusterID` (`ParentClusterID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集群';
@@ -114,9 +114,9 @@ CREATE TABLE `Cluster` (
DROP TABLE IF EXISTS `Commit`;
CREATE TABLE `Commit` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`ChangeSets` longtext NOT NULL COMMENT '修改变更集',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `AppID` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`Comment` varchar(500) DEFAULT NULL COMMENT '备注',
@@ -125,9 +125,9 @@ CREATE TABLE `Commit` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
- KEY `AppId` (`AppId`(191)),
+ KEY `AppID` (`AppID`(191)),
KEY `ClusterName` (`ClusterName`(191)),
KEY `NamespaceName` (`NamespaceName`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='commit 历史表';
@@ -138,22 +138,22 @@ CREATE TABLE `Commit` (
DROP TABLE IF EXISTS `GrayReleaseRule`;
CREATE TABLE `GrayReleaseRule` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `AppID` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
`NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
`BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'branch name',
`Rules` varchar(16000) DEFAULT '[]' COMMENT '灰度规则',
- `ReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '灰度对应的release',
+ `ReleaseID` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '灰度对应的release',
`BranchStatus` tinyint(2) DEFAULT '1' COMMENT '灰度分支状态: 0:删除分支,1:正在使用的规则 2：全量发布',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`)
+ KEY `IX_Namespace` (`AppID`,`ClusterName`,`NamespaceName`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='灰度规则表';
@@ -163,15 +163,15 @@ CREATE TABLE `GrayReleaseRule` (
DROP TABLE IF EXISTS `Instance`;
CREATE TABLE `Instance` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `AppID` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`DataCenter` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Data Center Name',
`Ip` varchar(32) NOT NULL DEFAULT '' COMMENT 'instance ip',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `IX_UNIQUE_KEY` (`AppId`,`ClusterName`,`Ip`,`DataCenter`),
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `IX_UNIQUE_KEY` (`AppID`,`ClusterName`,`Ip`,`DataCenter`),
KEY `IX_IP` (`Ip`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='使用配置的应用实例';
@@ -184,20 +184,20 @@ CREATE TABLE `Instance` (
DROP TABLE IF EXISTS `InstanceConfig`;
CREATE TABLE `InstanceConfig` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `InstanceId` int(11) unsigned DEFAULT NULL COMMENT 'Instance Id',
- `ConfigAppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Config App Id',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `InstanceID` int(11) unsigned DEFAULT NULL COMMENT 'Instance ID',
+ `ConfigAppID` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Config App ID',
`ConfigClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config Cluster Name',
`ConfigNamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config Namespace Name',
`ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
`ReleaseDeliveryTime` timestamp NULL DEFAULT NULL COMMENT '配置获取时间',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `IX_UNIQUE_KEY` (`InstanceId`,`ConfigAppId`,`ConfigNamespaceName`),
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `IX_UNIQUE_KEY` (`InstanceID`,`ConfigAppID`,`ConfigNamespaceName`),
KEY `IX_ReleaseKey` (`ReleaseKey`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_Valid_Namespace` (`ConfigAppId`,`ConfigClusterName`,`ConfigNamespaceName`,`DataChange_LastTime`)
+ KEY `IX_Valid_Namespace` (`ConfigAppID`,`ConfigClusterName`,`ConfigNamespaceName`,`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用实例的配置信息';
@@ -208,8 +208,8 @@ CREATE TABLE `InstanceConfig` (
DROP TABLE IF EXISTS `Item`;
CREATE TABLE `Item` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `NamespaceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `NamespaceID` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceID',
`Key` varchar(128) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Value` longtext NOT NULL COMMENT '配置项值',
`Comment` varchar(1024) DEFAULT '' COMMENT '注释',
@@ -219,8 +219,8 @@ CREATE TABLE `Item` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_GroupId` (`NamespaceId`),
+ PRIMARY KEY (`ID`),
+ KEY `IX_GroupID` (`NamespaceID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置项目';
@@ -232,8 +232,8 @@ CREATE TABLE `Item` (
DROP TABLE IF EXISTS `Namespace`;
CREATE TABLE `Namespace` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+ `AppID` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
@@ -241,8 +241,8 @@ CREATE TABLE `Namespace` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `AppId_ClusterName_NamespaceName` (`AppId`(191),`ClusterName`(191),`NamespaceName`(191)),
+ PRIMARY KEY (`ID`),
+ KEY `AppID_ClusterName_NamespaceName` (`AppID`(191),`ClusterName`(191),`NamespaceName`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_NamespaceName` (`NamespaceName`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='命名空间';
@@ -255,15 +255,15 @@ CREATE TABLE `Namespace` (
DROP TABLE IF EXISTS `NamespaceLock`;
CREATE TABLE `NamespaceLock` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
- `NamespaceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
+ `NamespaceID` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceID',
`DataChange_CreatedBy` varchar(32) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT 'default' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
`IsDeleted` bit(1) DEFAULT b'0' COMMENT '软删除',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `IX_NamespaceId` (`NamespaceId`),
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `IX_NamespaceID` (`NamespaceID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='namespace的编辑锁';
@@ -275,11 +275,11 @@ CREATE TABLE `NamespaceLock` (
DROP TABLE IF EXISTS `Release`;
CREATE TABLE `Release` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
`Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
`Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `AppID` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`Configurations` longtext NOT NULL COMMENT '发布配置',
@@ -289,8 +289,8 @@ CREATE TABLE `Release` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `AppId_ClusterName_GroupName` (`AppId`(191),`ClusterName`(191),`NamespaceName`(191)),
+ PRIMARY KEY (`ID`),
+ KEY `AppID_ClusterName_GroupName` (`AppID`(191),`ClusterName`(191),`NamespaceName`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_ReleaseKey` (`ReleaseKey`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布';
@@ -302,13 +302,13 @@ CREATE TABLE `Release` (
DROP TABLE IF EXISTS `ReleaseHistory`;
CREATE TABLE `ReleaseHistory` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `AppID` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT '发布分支名',
- `ReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '关联的Release Id',
- `PreviousReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '前一次发布的ReleaseId',
+ `ReleaseID` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '关联的Release ID',
+ `PreviousReleaseID` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '前一次发布的ReleaseID',
`Operation` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '发布类型，0: 普通发布，1: 回滚，2: 灰度发布，3: 灰度规则更新，4: 灰度合并回主分支发布，5: 主分支发布灰度自动发布，6: 主分支回滚灰度自动发布，7: 放弃灰度',
`OperationContext` longtext NOT NULL COMMENT '发布上下文信息',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
@@ -316,9 +316,9 @@ CREATE TABLE `ReleaseHistory` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`,`BranchName`),
- KEY `IX_ReleaseId` (`ReleaseId`),
+ PRIMARY KEY (`ID`),
+ KEY `IX_Namespace` (`AppID`,`ClusterName`,`NamespaceName`,`BranchName`),
+ KEY `IX_ReleaseID` (`ReleaseID`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布历史';
@@ -329,10 +329,10 @@ CREATE TABLE `ReleaseHistory` (
DROP TABLE IF EXISTS `ReleaseMessage`;
CREATE TABLE `ReleaseMessage` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Message` varchar(1024) NOT NULL DEFAULT '' COMMENT '发布的消息内容',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Message` (`Message`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布消息';
@@ -345,7 +345,7 @@ CREATE TABLE `ReleaseMessage` (
DROP TABLE IF EXISTS `ServerConfig`;
CREATE TABLE `ServerConfig` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
`Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Cluster` varchar(32) NOT NULL DEFAULT 'default' COMMENT '配置对应的集群，default为不针对特定的集群',
`Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
@@ -355,7 +355,7 @@ CREATE TABLE `ServerConfig` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `IX_Key` (`Key`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置服务自身配置';
@@ -366,8 +366,8 @@ CREATE TABLE `ServerConfig` (
DROP TABLE IF EXISTS `AccessKey`;
CREATE TABLE `AccessKey` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+ `AppID` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Secret` varchar(128) NOT NULL DEFAULT '' COMMENT 'Secret',
`IsEnabled` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: enabled, 0: disabled',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
@@ -375,8 +375,8 @@ CREATE TABLE `AccessKey` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) NOT NULL DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `AppId` (`AppId`(191)),
+ PRIMARY KEY (`ID`),
+ KEY `AppID` (`AppID`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='访问密钥';
@@ -392,32 +392,32 @@ VALUES
# Sample Data
# ------------------------------------------------------------
-INSERT INTO `App` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`)
+INSERT INTO `App` (`AppID`, `Name`, `OrgID`, `OrgName`, `OwnerName`, `OwnerEmail`)
VALUES
('SampleApp', 'Sample App', 'TEST1', '样例部门1', 'apollo', 'apollo@acme.com');
-INSERT INTO `AppNamespace` (`Name`, `AppId`, `Format`, `IsPublic`, `Comment`)
+INSERT INTO `AppNamespace` (`Name`, `AppID`, `Format`, `IsPublic`, `Comment`)
VALUES
('application', 'SampleApp', 'properties', 0, 'default app namespace');
-INSERT INTO `Cluster` (`Name`, `AppId`)
+INSERT INTO `Cluster` (`Name`, `AppID`)
VALUES
('default', 'SampleApp');
-INSERT INTO `Namespace` (`Id`, `AppId`, `ClusterName`, `NamespaceName`)
+INSERT INTO `Namespace` (`ID`, `AppID`, `ClusterName`, `NamespaceName`)
VALUES
(1, 'SampleApp', 'default', 'application');
-INSERT INTO `Item` (`NamespaceId`, `Key`, `Value`, `Comment`, `LineNum`)
+INSERT INTO `Item` (`NamespaceID`, `Key`, `Value`, `Comment`, `LineNum`)
VALUES
(1, 'timeout', '100', 'sample timeout配置', 1);
-INSERT INTO `Release` (`ReleaseKey`, `Name`, `Comment`, `AppId`, `ClusterName`, `NamespaceName`, `Configurations`)
+INSERT INTO `Release` (`ReleaseKey`, `Name`, `Comment`, `AppID`, `ClusterName`, `NamespaceName`, `Configurations`)
VALUES
('20161009155425-d3a0749c6e20bc15', '20161009155424-release', 'Sample发布', 'SampleApp', 'default', 'application', '{\"timeout\":\"100\"}');
-INSERT INTO `ReleaseHistory` (`AppId`, `ClusterName`, `NamespaceName`, `BranchName`, `ReleaseId`, `PreviousReleaseId`, `Operation`, `OperationContext`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)
+INSERT INTO `ReleaseHistory` (`AppID`, `ClusterName`, `NamespaceName`, `BranchName`, `ReleaseID`, `PreviousReleaseID`, `Operation`, `OperationContext`, `DataChange_CreatedBy`, `DataChange_LastModifiedBy`)
VALUES
('SampleApp', 'default', 'application', 'default', 1, 0, 0, '{}', 'apollo', 'apollo');
@@ -430,4 +430,4 @@ VALUES
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
\ No newline at end of file
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/configcenter/apollo/go-server/docker/sql/apolloportaldb.sql b/configcenter/apollo/go-server/docker/sql/apolloportaldb.sql
index adbe664..f4c6f69 100644
--- a/configcenter/apollo/go-server/docker/sql/apolloportaldb.sql
+++ b/configcenter/apollo/go-server/docker/sql/apolloportaldb.sql
@@ -18,10 +18,10 @@ Use ApolloPortalDB;
DROP TABLE IF EXISTS `App`;
CREATE TABLE `App` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `AppID` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
- `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
+ `OrgID` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门ID',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
@@ -30,8 +30,8 @@ CREATE TABLE `App` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `AppId` (`AppId`(191)),
+ PRIMARY KEY (`ID`),
+ KEY `AppID` (`AppID`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Name` (`Name`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用表';
@@ -44,9 +44,9 @@ CREATE TABLE `App` (
DROP TABLE IF EXISTS `AppNamespace`;
CREATE TABLE `AppNamespace` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
- `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
+ `AppID` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
`Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT 'namespace的format类型',
`IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
`Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
@@ -55,9 +55,9 @@ CREATE TABLE `AppNamespace` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_AppId` (`AppId`),
- KEY `Name_AppId` (`Name`,`AppId`),
+ PRIMARY KEY (`ID`),
+ KEY `IX_AppID` (`AppID`),
+ KEY `Name_AppID` (`Name`,`AppID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用namespace定义';
@@ -69,10 +69,10 @@ CREATE TABLE `AppNamespace` (
DROP TABLE IF EXISTS `Consumer`;
CREATE TABLE `Consumer` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `AppID` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
- `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
+ `OrgID` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门ID',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
@@ -81,8 +81,8 @@ CREATE TABLE `Consumer` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `AppId` (`AppId`(191)),
+ PRIMARY KEY (`ID`),
+ KEY `AppID` (`AppID`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='开放API消费者';
@@ -94,15 +94,15 @@ CREATE TABLE `Consumer` (
DROP TABLE IF EXISTS `ConsumerAudit`;
CREATE TABLE `ConsumerAudit` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'Consumer Id',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `ConsumerID` int(11) unsigned DEFAULT NULL COMMENT 'Consumer ID',
`Uri` varchar(1024) NOT NULL DEFAULT '' COMMENT '访问的Uri',
`Method` varchar(16) NOT NULL DEFAULT '' COMMENT '访问的Method',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_ConsumerId` (`ConsumerId`)
+ KEY `IX_ConsumerID` (`ConsumerID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer审计表';
@@ -113,18 +113,18 @@ CREATE TABLE `ConsumerAudit` (
DROP TABLE IF EXISTS `ConsumerRole`;
CREATE TABLE `ConsumerRole` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'Consumer Id',
- `RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `ConsumerID` int(11) unsigned DEFAULT NULL COMMENT 'Consumer ID',
+ `RoleID` int(10) unsigned DEFAULT NULL COMMENT 'Role ID',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) DEFAULT '' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_RoleId` (`RoleId`),
- KEY `IX_ConsumerId_RoleId` (`ConsumerId`,`RoleId`)
+ KEY `IX_RoleID` (`RoleID`),
+ KEY `IX_ConsumerID_RoleID` (`ConsumerID`,`RoleID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer和role的绑定表';
@@ -135,8 +135,8 @@ CREATE TABLE `ConsumerRole` (
DROP TABLE IF EXISTS `ConsumerToken`;
CREATE TABLE `ConsumerToken` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'ConsumerId',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `ConsumerID` int(11) unsigned DEFAULT NULL COMMENT 'ConsumerID',
`Token` varchar(128) NOT NULL DEFAULT '' COMMENT 'token',
`Expires` datetime NOT NULL DEFAULT '2099-01-01 00:00:00' COMMENT 'token失效时间',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
@@ -144,7 +144,7 @@ CREATE TABLE `ConsumerToken` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
UNIQUE KEY `IX_Token` (`Token`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer token表';
@@ -155,18 +155,18 @@ CREATE TABLE `ConsumerToken` (
DROP TABLE IF EXISTS `Favorite`;
CREATE TABLE `Favorite` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `UserId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '收藏的用户',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `UserID` varchar(32) NOT NULL DEFAULT 'default' COMMENT '收藏的用户',
+ `AppID` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Position` int(32) NOT NULL DEFAULT '10000' COMMENT '收藏顺序',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `AppId` (`AppId`(191)),
- KEY `IX_UserId` (`UserId`),
+ PRIMARY KEY (`ID`),
+ KEY `AppID` (`AppID`(191)),
+ KEY `IX_UserID` (`UserID`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COMMENT='应用收藏表';
@@ -176,16 +176,16 @@ CREATE TABLE `Favorite` (
DROP TABLE IF EXISTS `Permission`;
CREATE TABLE `Permission` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
`PermissionType` varchar(32) NOT NULL DEFAULT '' COMMENT '权限类型',
- `TargetId` varchar(256) NOT NULL DEFAULT '' COMMENT '权限对象类型',
+ `TargetID` varchar(256) NOT NULL DEFAULT '' COMMENT '权限对象类型',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_TargetId_PermissionType` (`TargetId`(191),`PermissionType`),
+ PRIMARY KEY (`ID`),
+ KEY `IX_TargetID_PermissionType` (`TargetID`(191),`PermissionType`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='permission表';
@@ -197,14 +197,14 @@ CREATE TABLE `Permission` (
DROP TABLE IF EXISTS `Role`;
CREATE TABLE `Role` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
`RoleName` varchar(256) NOT NULL DEFAULT '' COMMENT 'Role name',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `IX_RoleName` (`RoleName`(191)),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色表';
@@ -217,18 +217,18 @@ CREATE TABLE `Role` (
DROP TABLE IF EXISTS `RolePermission`;
CREATE TABLE `RolePermission` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
- `PermissionId` int(10) unsigned DEFAULT NULL COMMENT 'Permission Id',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `RoleID` int(10) unsigned DEFAULT NULL COMMENT 'Role ID',
+ `PermissionID` int(10) unsigned DEFAULT NULL COMMENT 'Permission ID',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) DEFAULT '' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_RoleId` (`RoleId`),
- KEY `IX_PermissionId` (`PermissionId`)
+ KEY `IX_RoleID` (`RoleID`),
+ KEY `IX_PermissionID` (`PermissionID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色和权限的绑定表';
@@ -239,7 +239,7 @@ CREATE TABLE `RolePermission` (
DROP TABLE IF EXISTS `ServerConfig`;
CREATE TABLE `ServerConfig` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
`Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
`Comment` varchar(1024) DEFAULT '' COMMENT '注释',
@@ -248,7 +248,7 @@ CREATE TABLE `ServerConfig` (
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `IX_Key` (`Key`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置服务自身配置';
@@ -261,18 +261,18 @@ CREATE TABLE `ServerConfig` (
DROP TABLE IF EXISTS `UserRole`;
CREATE TABLE `UserRole` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `UserId` varchar(128) DEFAULT '' COMMENT '用户身份标识',
- `RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+ `UserID` varchar(128) DEFAULT '' COMMENT '用户身份标识',
+ `RoleID` int(10) unsigned DEFAULT NULL COMMENT 'Role ID',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) DEFAULT '' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
+ PRIMARY KEY (`ID`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_RoleId` (`RoleId`),
- KEY `IX_UserId_RoleId` (`UserId`,`RoleId`)
+ KEY `IX_RoleID` (`RoleID`),
+ KEY `IX_UserID_RoleID` (`UserID`,`RoleID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户和role的绑定表';
# Dump of table Users
@@ -281,12 +281,12 @@ CREATE TABLE `UserRole` (
DROP TABLE IF EXISTS `Users`;
CREATE TABLE `Users` (
- `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
+ `ID` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
`Username` varchar(64) NOT NULL DEFAULT 'default' COMMENT '用户名',
`Password` varchar(64) NOT NULL DEFAULT 'default' COMMENT '密码',
`Email` varchar(64) NOT NULL DEFAULT 'default' COMMENT '邮箱地址',
`Enabled` tinyint(4) DEFAULT NULL COMMENT '是否有效',
- PRIMARY KEY (`Id`)
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户表';
@@ -296,10 +296,10 @@ CREATE TABLE `Users` (
DROP TABLE IF EXISTS `Authorities`;
CREATE TABLE `Authorities` (
- `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
+ `ID` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID',
`Username` varchar(64) NOT NULL,
`Authority` varchar(50) NOT NULL,
- PRIMARY KEY (`Id`)
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -308,7 +308,7 @@ CREATE TABLE `Authorities` (
INSERT INTO `ServerConfig` (`Key`, `Value`, `Comment`)
VALUES
('apollo.portal.envs', 'dev', '可支持的环境列表'),
-('organizations', '[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
+('organizations', '[{\"orgID\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgID\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
('superAdmin', 'apollo', 'Portal超级管理员'),
('api.readTimeout', '10000', 'http接口read timeout'),
('consumer.token.salt', 'someSalt', 'consumer token salt'),
@@ -324,15 +324,15 @@ INSERT INTO `Authorities` (`Username`, `Authority`) VALUES ('apollo', 'ROLE_user
# Sample Data
# ------------------------------------------------------------
-INSERT INTO `App` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`)
+INSERT INTO `App` (`AppID`, `Name`, `OrgID`, `OrgName`, `OwnerName`, `OwnerEmail`)
VALUES
('SampleApp', 'Sample App', 'TEST1', '样例部门1', 'apollo', 'apollo@acme.com');
-INSERT INTO `AppNamespace` (`Name`, `AppId`, `Format`, `IsPublic`, `Comment`)
+INSERT INTO `AppNamespace` (`Name`, `AppID`, `Format`, `IsPublic`, `Comment`)
VALUES
('application', 'SampleApp', 'properties', 0, 'default app namespace');
-INSERT INTO `Permission` (`Id`, `PermissionType`, `TargetId`)
+INSERT INTO `Permission` (`ID`, `PermissionType`, `TargetID`)
VALUES
(1, 'CreateCluster', 'SampleApp'),
(2, 'CreateNamespace', 'SampleApp'),
@@ -340,13 +340,13 @@ VALUES
(4, 'ModifyNamespace', 'SampleApp+application'),
(5, 'ReleaseNamespace', 'SampleApp+application');
-INSERT INTO `Role` (`Id`, `RoleName`)
+INSERT INTO `Role` (`ID`, `RoleName`)
VALUES
(1, 'Master+SampleApp'),
(2, 'ModifyNamespace+SampleApp+application'),
(3, 'ReleaseNamespace+SampleApp+application');
-INSERT INTO `RolePermission` (`RoleId`, `PermissionId`)
+INSERT INTO `RolePermission` (`RoleID`, `PermissionID`)
VALUES
(1, 1),
(1, 2),
@@ -354,7 +354,7 @@ VALUES
(2, 4),
(3, 5);
-INSERT INTO `UserRole` (`UserId`, `RoleId`)
+INSERT INTO `UserRole` (`UserID`, `RoleID`)
VALUES
('apollo', 1),
('apollo', 2),
@@ -365,4 +365,4 @@ VALUES
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
\ No newline at end of file
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/configcenter/apollo/go-server/pkg/user.go b/configcenter/apollo/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/configcenter/apollo/go-server/pkg/user.go
+++ b/configcenter/apollo/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/apollo/go-server/tests/integration/main_test.go b/configcenter/apollo/go-server/tests/integration/main_test.go
index ed006cd..2e2d685 100644
--- a/configcenter/apollo/go-server/tests/integration/main_test.go
+++ b/configcenter/apollo/go-server/tests/integration/main_test.go
@@ -52,7 +52,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/apollo/go-server/tests/integration/userprovider_test.go b/configcenter/apollo/go-server/tests/integration/userprovider_test.go
index 625a907..7183e64 100644
--- a/configcenter/apollo/go-server/tests/integration/userprovider_test.go
+++ b/configcenter/apollo/go-server/tests/integration/userprovider_test.go
@@ -32,7 +32,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/configcenter/nacos/go-client/pkg/user.go b/configcenter/nacos/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/configcenter/nacos/go-client/pkg/user.go
+++ b/configcenter/nacos/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/nacos/go-server/pkg/user.go b/configcenter/nacos/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/configcenter/nacos/go-server/pkg/user.go
+++ b/configcenter/nacos/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/nacos/go-server/tests/integration/main_test.go b/configcenter/nacos/go-server/tests/integration/main_test.go
index 0de5a14..ffdc8e3 100644
--- a/configcenter/nacos/go-server/tests/integration/main_test.go
+++ b/configcenter/nacos/go-server/tests/integration/main_test.go
@@ -52,7 +52,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/nacos/go-server/tests/integration/userprovider_test.go b/configcenter/nacos/go-server/tests/integration/userprovider_test.go
index 625a907..7183e64 100644
--- a/configcenter/nacos/go-server/tests/integration/userprovider_test.go
+++ b/configcenter/nacos/go-server/tests/integration/userprovider_test.go
@@ -32,7 +32,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/configcenter/zookeeper/go-client/pkg/user.go b/configcenter/zookeeper/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/configcenter/zookeeper/go-client/pkg/user.go
+++ b/configcenter/zookeeper/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/zookeeper/go-server/pkg/user.go b/configcenter/zookeeper/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/configcenter/zookeeper/go-server/pkg/user.go
+++ b/configcenter/zookeeper/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/zookeeper/go-server/tests/integration/main_test.go b/configcenter/zookeeper/go-server/tests/integration/main_test.go
index 83577b6..69f9658 100644
--- a/configcenter/zookeeper/go-server/tests/integration/main_test.go
+++ b/configcenter/zookeeper/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/configcenter/zookeeper/go-server/tests/integration/userprovider_test.go b/configcenter/zookeeper/go-server/tests/integration/userprovider_test.go
index 625a907..7183e64 100644
--- a/configcenter/zookeeper/go-server/tests/integration/userprovider_test.go
+++ b/configcenter/zookeeper/go-server/tests/integration/userprovider_test.go
@@ -32,7 +32,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/direct/go-client/pkg/user.go b/direct/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/direct/go-client/pkg/user.go
+++ b/direct/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/direct/go-server/pkg/user.go b/direct/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/direct/go-server/pkg/user.go
+++ b/direct/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/direct/go-server/tests/integration/main_test.go b/direct/go-server/tests/integration/main_test.go
index 25552b7..b4a5139 100644
--- a/direct/go-server/tests/integration/main_test.go
+++ b/direct/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/direct/go-server/tests/integration/userprovider_test.go b/direct/go-server/tests/integration/userprovider_test.go
index e5da5e0..9dc1252 100644
--- a/direct/go-server/tests/integration/userprovider_test.go
+++ b/direct/go-server/tests/integration/userprovider_test.go
@@ -33,7 +33,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/docker/go-client/pkg/user.go b/docker/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/docker/go-client/pkg/user.go
+++ b/docker/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/docker/go-server/pkg/user.go b/docker/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/docker/go-server/pkg/user.go
+++ b/docker/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/docker/go-server/tests/integration/main_test.go b/docker/go-server/tests/integration/main_test.go
index 25552b7..b4a5139 100644
--- a/docker/go-server/tests/integration/main_test.go
+++ b/docker/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/docker/go-server/tests/integration/userprovider_test.go b/docker/go-server/tests/integration/userprovider_test.go
index 625a907..7183e64 100644
--- a/docker/go-server/tests/integration/userprovider_test.go
+++ b/docker/go-server/tests/integration/userprovider_test.go
@@ -32,7 +32,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/filter/custom/go-client/pkg/user.go b/filter/custom/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/filter/custom/go-client/pkg/user.go
+++ b/filter/custom/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/custom/go-server/pkg/user.go b/filter/custom/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/filter/custom/go-server/pkg/user.go
+++ b/filter/custom/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/custom/go-server/tests/integration/main_test.go b/filter/custom/go-server/tests/integration/main_test.go
index 25552b7..b4a5139 100644
--- a/filter/custom/go-server/tests/integration/main_test.go
+++ b/filter/custom/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/custom/go-server/tests/integration/userprovider_test.go b/filter/custom/go-server/tests/integration/userprovider_test.go
index be4ba2f..beefe1b 100644
--- a/filter/custom/go-server/tests/integration/userprovider_test.go
+++ b/filter/custom/go-server/tests/integration/userprovider_test.go
@@ -31,8 +31,8 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "ALEX STOCKS", user.Name)
assert.Equal(t, int32(28), user.Age)
assert.NotNil(t, user.Time)
-}
\ No newline at end of file
+}
diff --git a/filter/sentinel/go-client/pkg/user.go b/filter/sentinel/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/filter/sentinel/go-client/pkg/user.go
+++ b/filter/sentinel/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/sentinel/go-server/pkg/user.go b/filter/sentinel/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/filter/sentinel/go-server/pkg/user.go
+++ b/filter/sentinel/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/sentinel/go-server/tests/integration/main_test.go b/filter/sentinel/go-server/tests/integration/main_test.go
index 25552b7..b4a5139 100644
--- a/filter/sentinel/go-server/tests/integration/main_test.go
+++ b/filter/sentinel/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/sentinel/go-server/tests/integration/userprovider_test.go b/filter/sentinel/go-server/tests/integration/userprovider_test.go
index 6b2c871..d6a5ecc 100644
--- a/filter/sentinel/go-server/tests/integration/userprovider_test.go
+++ b/filter/sentinel/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/filter/tpslimit/go-client/pkg/user.go b/filter/tpslimit/go-client/pkg/user.go
index c1ac02f..a89abd7 100644
--- a/filter/tpslimit/go-client/pkg/user.go
+++ b/filter/tpslimit/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/tpslimit/go-server/pkg/user.go b/filter/tpslimit/go-server/pkg/user.go
index 2759d19..7a3231a 100644
--- a/filter/tpslimit/go-server/pkg/user.go
+++ b/filter/tpslimit/go-server/pkg/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/tpslimit/go-server/tests/integration/main_test.go b/filter/tpslimit/go-server/tests/integration/main_test.go
index 25552b7..b4a5139 100644
--- a/filter/tpslimit/go-server/tests/integration/main_test.go
+++ b/filter/tpslimit/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/filter/tpslimit/go-server/tests/integration/userprovider_test.go b/filter/tpslimit/go-server/tests/integration/userprovider_test.go
index 41b97ca..4791ae0 100644
--- a/filter/tpslimit/go-server/tests/integration/userprovider_test.go
+++ b/filter/tpslimit/go-server/tests/integration/userprovider_test.go
@@ -39,7 +39,7 @@ func TestGetUser(t *testing.T) {
break
}
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/general/dubbo/go-client/pkg/user.go b/general/dubbo/go-client/pkg/user.go
index 52e9326..59998af 100644
--- a/general/dubbo/go-client/pkg/user.go
+++ b/general/dubbo/go-client/pkg/user.go
@@ -69,7 +69,7 @@ func (g Gender) EnumValue(s string) hessian.JavaEnum {
type User struct {
// !!! Cannot define lowercase names of variable
- Id string
+ ID string
Name string
Age int32
Time time.Time
@@ -78,8 +78,8 @@ type User struct {
func (u User) String() string {
return fmt.Sprintf(
- "User{Id:%s, Name:%s, Age:%d, Time:%s, Sex:%s}",
- u.Id, u.Name, u.Age, u.Time, u.Sex,
+ "User{ID:%s, Name:%s, Age:%d, Time:%s, Sex:%s}",
+ u.ID, u.Name, u.Age, u.Time, u.Sex,
)
}
diff --git a/general/dubbo/go-server/pkg/user.go b/general/dubbo/go-server/pkg/user.go
index 176eb0b..06e6b2f 100644
--- a/general/dubbo/go-server/pkg/user.go
+++ b/general/dubbo/go-server/pkg/user.go
@@ -69,7 +69,7 @@ func (g Gender) EnumValue(s string) hessian.JavaEnum {
type (
User struct {
// !!! Cannot define lowercase names of variable
- Id string
+ ID string
Name string
Age int32
Time time.Time
@@ -79,7 +79,7 @@ type (
var (
DefaultUser = User{
- Id: "0", Name: "Alex Stocks", Age: 31,
+ ID: "0", Name: "Alex Stocks", Age: 31,
Sex: Gender(MAN),
}
@@ -88,9 +88,9 @@ var (
func init() {
userMap["A000"] = DefaultUser
- userMap["A001"] = User{Id: "001", Name: "ZhangSheng", Age: 18, Sex: Gender(MAN)}
- userMap["A002"] = User{Id: "002", Name: "Lily", Age: 20, Sex: Gender(WOMAN)}
- userMap["A003"] = User{Id: "113", Name: "Moorse", Age: 30, Sex: Gender(WOMAN)}
+ userMap["A001"] = User{ID: "001", Name: "ZhangSheng", Age: 18, Sex: Gender(MAN)}
+ userMap["A002"] = User{ID: "002", Name: "Lily", Age: 20, Sex: Gender(WOMAN)}
+ userMap["A003"] = User{ID: "113", Name: "Moorse", Age: 30, Sex: Gender(WOMAN)}
for k, v := range userMap {
v.Time = time.Now()
userMap[k] = v
@@ -99,8 +99,8 @@ func init() {
func (u User) String() string {
return fmt.Sprintf(
- "User{Id:%s, Name:%s, Age:%d, Time:%s, Sex:%s}",
- u.Id, u.Name, u.Age, u.Time, u.Sex,
+ "User{ID:%s, Name:%s, Age:%d, Time:%s, Sex:%s}",
+ u.ID, u.Name, u.Age, u.Time, u.Sex,
)
}
diff --git a/general/dubbo/go-server/pkg/user_provider.go b/general/dubbo/go-server/pkg/user_provider.go
index 2f8e4c6..6ccb0f1 100644
--- a/general/dubbo/go-server/pkg/user_provider.go
+++ b/general/dubbo/go-server/pkg/user_provider.go
@@ -41,12 +41,12 @@ func init() {
type UserProvider struct {
}
-func (u *UserProvider) getUser(userId string) (*User, error) {
- if user, ok := userMap[userId]; ok {
+func (u *UserProvider) getUser(userID string) (*User, error) {
+ if user, ok := userMap[userID]; ok {
return &user, nil
}
- return nil, fmt.Errorf("invalid user id:%s", userId)
+ return nil, fmt.Errorf("invalid user id:%s", userID)
}
func (u *UserProvider) GetUser(ctx context.Context, req []interface{}, rsp *User) error {
@@ -82,7 +82,7 @@ func (u *UserProvider) GetUser2(ctx context.Context, req []interface{}, rsp *Use
var err error
gxlog.CInfo("req:%#v", req)
- rsp.Id = strconv.Itoa(int(req[0].(int32)))
+ rsp.ID = strconv.Itoa(int(req[0].(int32)))
return err
}
diff --git a/general/dubbo/go-server/tests/integration/main_test.go b/general/dubbo/go-server/tests/integration/main_test.go
index c1d58d1..eaad5f4 100644
--- a/general/dubbo/go-server/tests/integration/main_test.go
+++ b/general/dubbo/go-server/tests/integration/main_test.go
@@ -100,7 +100,7 @@ func (g Gender) EnumValue(s string) hessian.JavaEnum {
type User struct {
// !!! Cannot define lowercase names of variable
- Id string
+ ID string
Name string
Age int32
Time time.Time
@@ -109,8 +109,8 @@ type User struct {
func (u User) String() string {
return fmt.Sprintf(
- "User{Id:%s, Name:%s, Age:%d, Time:%s, Sex:%s}",
- u.Id, u.Name, u.Age, u.Time, u.Sex,
+ "User{ID:%s, Name:%s, Age:%d, Time:%s, Sex:%s}",
+ u.ID, u.Name, u.Age, u.Time, u.Sex,
)
}
diff --git a/general/dubbo/go-server/tests/integration/userprovider_test.go b/general/dubbo/go-server/tests/integration/userprovider_test.go
index d4b5089..70e7617 100644
--- a/general/dubbo/go-server/tests/integration/userprovider_test.go
+++ b/general/dubbo/go-server/tests/integration/userprovider_test.go
@@ -33,7 +33,7 @@ func TestGetUserA000(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A000"}, user)
assert.Nil(t, err)
- assert.Equal(t, "0", user.Id)
+ assert.Equal(t, "0", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(31), user.Age)
assert.Equal(t, Gender(pkg.MAN), user.Sex)
@@ -44,7 +44,7 @@ func TestGetUserA001(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "001", user.Id)
+ assert.Equal(t, "001", user.ID)
assert.Equal(t, "ZhangSheng", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.Equal(t, Gender(pkg.MAN), user.Sex)
@@ -55,7 +55,7 @@ func TestGetUserA002(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A002"}, user)
assert.Nil(t, err)
- assert.Equal(t, "002", user.Id)
+ assert.Equal(t, "002", user.ID)
assert.Equal(t, "Lily", user.Name)
assert.Equal(t, int32(20), user.Age)
assert.Equal(t, Gender(pkg.WOMAN), user.Sex)
@@ -66,7 +66,7 @@ func TestGetUserA003(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A003"}, user)
assert.Nil(t, err)
- assert.Equal(t, "113", user.Id)
+ assert.Equal(t, "113", user.ID)
assert.Equal(t, "Moorse", user.Name)
assert.Equal(t, int32(30), user.Age)
assert.Equal(t, Gender(pkg.WOMAN), user.Sex)
@@ -86,7 +86,7 @@ func TestGetUser2(t *testing.T) {
user := &User{}
err := userProvider.GetUser2(context.TODO(), []interface{}{int32(64)}, user)
assert.Nil(t, err)
- assert.Equal(t, "64", user.Id)
+ assert.Equal(t, "64", user.ID)
}
func TestGetUser3(t *testing.T) {
diff --git a/general/dubbo/java-client/2.6/src/main/java/org/apache/dubbo/Consumer.java b/general/dubbo/java-client/2.6/src/main/java/org/apache/dubbo/Consumer.java
index d71039a..54e5b66 100644
--- a/general/dubbo/java-client/2.6/src/main/java/org/apache/dubbo/Consumer.java
+++ b/general/dubbo/java-client/2.6/src/main/java/org/apache/dubbo/Consumer.java
@@ -61,19 +61,19 @@ public class Consumer {
System.out.println("echo: "+status);
User user1 = userProvider.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime());
User user4 = userProvider.getUser(1, "name");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user4.getId() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ " UserInfo, ID:" + user4.getID() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ ", age:" + user4.getAge() + ", time:" + user4.getTime());
userProvider.GetUser3();
System.out.println("GetUser3 succ");
@@ -103,7 +103,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
@@ -118,19 +118,19 @@ public class Consumer {
System.out.println("echo: "+status);
User user1 = userProvider1.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider1.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider1.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime());
User user4 = userProvider1.getUser(1, "name");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user4.getId() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ " UserInfo, ID:" + user4.getID() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ ", age:" + user4.getAge() + ", time:" + user4.getTime());
userProvider1.GetUser3();
System.out.println("GetUser3 succ");
@@ -160,7 +160,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
@@ -175,19 +175,19 @@ public class Consumer {
System.out.println("echo: "+status);
User user1 = userProvider2.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider2.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider2.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime());
User user4 = userProvider2.getUser(1, "name");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user4.getId() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ " UserInfo, ID:" + user4.getID() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ ", age:" + user4.getAge() + ", time:" + user4.getTime());
userProvider2.GetUser3();
System.out.println("GetUser3 succ");
@@ -217,7 +217,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
diff --git a/general/dubbo/java-client/2.7/src/main/java/org/apache/dubbo/Consumer.java b/general/dubbo/java-client/2.7/src/main/java/org/apache/dubbo/Consumer.java
index d71039a..54e5b66 100644
--- a/general/dubbo/java-client/2.7/src/main/java/org/apache/dubbo/Consumer.java
+++ b/general/dubbo/java-client/2.7/src/main/java/org/apache/dubbo/Consumer.java
@@ -61,19 +61,19 @@ public class Consumer {
System.out.println("echo: "+status);
User user1 = userProvider.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime());
User user4 = userProvider.getUser(1, "name");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user4.getId() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ " UserInfo, ID:" + user4.getID() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ ", age:" + user4.getAge() + ", time:" + user4.getTime());
userProvider.GetUser3();
System.out.println("GetUser3 succ");
@@ -103,7 +103,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
@@ -118,19 +118,19 @@ public class Consumer {
System.out.println("echo: "+status);
User user1 = userProvider1.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider1.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider1.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime());
User user4 = userProvider1.getUser(1, "name");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user4.getId() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ " UserInfo, ID:" + user4.getID() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ ", age:" + user4.getAge() + ", time:" + user4.getTime());
userProvider1.GetUser3();
System.out.println("GetUser3 succ");
@@ -160,7 +160,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
@@ -175,19 +175,19 @@ public class Consumer {
System.out.println("echo: "+status);
User user1 = userProvider2.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider2.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider2.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime());
User user4 = userProvider2.getUser(1, "name");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user4.getId() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ " UserInfo, ID:" + user4.getID() + ", name:" + user4.getName() + ", sex:" + user4.getSex().toString()
+ ", age:" + user4.getAge() + ", time:" + user4.getTime());
userProvider2.GetUser3();
System.out.println("GetUser3 succ");
@@ -217,7 +217,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
diff --git a/general/grpc/unary/java-client/src/main/java/com/ikurento/user/Consumer.java b/general/grpc/unary/java-client/src/main/java/com/ikurento/user/Consumer.java
index 622f213..0eae3db 100644
--- a/general/grpc/unary/java-client/src/main/java/com/ikurento/user/Consumer.java
+++ b/general/grpc/unary/java-client/src/main/java/com/ikurento/user/Consumer.java
@@ -47,10 +47,10 @@ public class Consumer {
private void testGetUser() throws Exception {
try {
- UserId userId = UserId.newBuilder().setId("A003").build();
- User user1 = userProvider.getUser(userId);
+ UserID userID = UserID.newBuilder().setID("A003").build();
+ User user1 = userProvider.getUser(userID);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
} catch (Exception e) {
e.printStackTrace();
@@ -59,11 +59,11 @@ public class Consumer {
private void testGetUserList() throws Exception {
try {
- UserIdList userIdList = UserIdList.newBuilder().addId("A003").addId("A002").build();
- UserList userList = userProvider.getUserList(userIdList);
+ UserIDList userIDList = UserIDList.newBuilder().addID("A003").addID("A002").build();
+ UserList userList = userProvider.getUserList(userIDList);
for (User user : userList.getUserList()) {
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
@@ -73,8 +73,8 @@ public class Consumer {
private void testGetErr() throws Exception {
try {
- UserId userId = UserId.newBuilder().setId("A003").build();
- userProvider.getErr(userId);
+ UserID userID = UserID.newBuilder().setID("A003").build();
+ userProvider.getErr(userID);
} catch (Throwable t) {
System.out.println("*************exception***********");
t.printStackTrace();
@@ -83,12 +83,12 @@ public class Consumer {
private void testGetUserByStream() {
try {
- UserId userId = UserId.newBuilder().setId("A001").build();
- userProvider.getUserByStream(userId, new StreamObserver<User>() {
+ UserID userID = UserID.newBuilder().setID("A001").build();
+ userProvider.getUserByStream(userID, new StreamObserver<User>() {
@Override
public void onNext(User user) {
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
diff --git a/general/jsonrpc/go-server/app/user.go b/general/jsonrpc/go-server/app/user.go
index e1df07a..bf97053 100644
--- a/general/jsonrpc/go-server/app/user.go
+++ b/general/jsonrpc/go-server/app/user.go
@@ -39,7 +39,7 @@ func (g Gender) String() string {
type (
User struct {
- Id string `json:"id"`
+ ID string `json:"id"`
Name string `json:"name"`
Age int `json:"age"`
sex Gender
@@ -50,7 +50,7 @@ type (
var (
DefaultUser = User{
- Id: "0", Name: "Alex Stocks", Age: 31,
+ ID: "0", Name: "Alex Stocks", Age: 31,
// Birth: int(time.Date(1985, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
Birth: int(time.Date(1985, 11, 24, 15, 15, 0, 0, time.Local).Unix()),
sex: Gender(MAN),
@@ -62,9 +62,9 @@ var (
func init() {
DefaultUser.Sex = DefaultUser.sex.String()
userMap["A000"] = DefaultUser
- userMap["A001"] = User{Id: "001", Name: "ZhangSheng", Age: 18, sex: MAN}
- userMap["A002"] = User{Id: "002", Name: "Lily", Age: 20, sex: WOMAN}
- userMap["A003"] = User{Id: "113", Name: "Moorse", Age: 30, sex: MAN}
+ userMap["A001"] = User{ID: "001", Name: "ZhangSheng", Age: 18, sex: MAN}
+ userMap["A002"] = User{ID: "002", Name: "Lily", Age: 20, sex: WOMAN}
+ userMap["A003"] = User{ID: "113", Name: "Moorse", Age: 30, sex: MAN}
for k, v := range userMap {
v.Birth = int(time.Now().AddDate(-1*v.Age, 0, 0).Unix())
v.Sex = userMap[k].sex.String()
diff --git a/general/jsonrpc/go-server/app/user_provider.go b/general/jsonrpc/go-server/app/user_provider.go
index 0b878b3..3700daa 100644
--- a/general/jsonrpc/go-server/app/user_provider.go
+++ b/general/jsonrpc/go-server/app/user_provider.go
@@ -22,12 +22,12 @@ func init() {
type UserProvider struct {
}
-func (u *UserProvider) getUser(userId string) (*User, error) {
- if user, ok := userMap[userId]; ok {
+func (u *UserProvider) getUser(userID string) (*User, error) {
+ if user, ok := userMap[userID]; ok {
return &user, nil
}
- return nil, fmt.Errorf("invalid user id:%s", userId)
+ return nil, fmt.Errorf("invalid user id:%s", userID)
}
func (u *UserProvider) GetUser(ctx context.Context, req []interface{}, rsp *User) error {
@@ -63,7 +63,7 @@ func (u *UserProvider) GetUser2(ctx context.Context, req []interface{}, rsp *Use
var err error
gxlog.CInfo("req:%#v", req)
- rsp.Id = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
+ rsp.ID = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
rsp.Sex = Gender(MAN).String()
return err
}
diff --git a/general/jsonrpc/go-server/app/user_provider1.go b/general/jsonrpc/go-server/app/user_provider1.go
index fa591a3..4b7af5a 100644
--- a/general/jsonrpc/go-server/app/user_provider1.go
+++ b/general/jsonrpc/go-server/app/user_provider1.go
@@ -22,12 +22,12 @@ func init() {
type UserProvider1 struct {
}
-func (u *UserProvider1) getUser(userId string) (*User, error) {
- if user, ok := userMap[userId]; ok {
+func (u *UserProvider1) getUser(userID string) (*User, error) {
+ if user, ok := userMap[userID]; ok {
return &user, nil
}
- return nil, fmt.Errorf("invalid user id:%s", userId)
+ return nil, fmt.Errorf("invalid user id:%s", userID)
}
func (u *UserProvider1) GetUser(ctx context.Context, req []interface{}, rsp *User) error {
@@ -63,7 +63,7 @@ func (u *UserProvider1) GetUser2(ctx context.Context, req []interface{}, rsp *Us
var err error
gxlog.CInfo("req:%#v", req)
- rsp.Id = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
+ rsp.ID = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
rsp.Sex = Gender(MAN).String()
return err
}
diff --git a/general/jsonrpc/go-server/app/user_provider2.go b/general/jsonrpc/go-server/app/user_provider2.go
index 8561338..752eb8b 100644
--- a/general/jsonrpc/go-server/app/user_provider2.go
+++ b/general/jsonrpc/go-server/app/user_provider2.go
@@ -22,12 +22,12 @@ func init() {
type UserProvider2 struct {
}
-func (u *UserProvider2) getUser(userId string) (*User, error) {
- if user, ok := userMap[userId]; ok {
+func (u *UserProvider2) getUser(userID string) (*User, error) {
+ if user, ok := userMap[userID]; ok {
return &user, nil
}
- return nil, fmt.Errorf("invalid user id:%s", userId)
+ return nil, fmt.Errorf("invalid user id:%s", userID)
}
func (u *UserProvider2) GetUser(ctx context.Context, req []interface{}, rsp *User) error {
@@ -63,7 +63,7 @@ func (u *UserProvider2) GetUser2(ctx context.Context, req []interface{}, rsp *Us
var err error
gxlog.CInfo("req:%#v", req)
- rsp.Id = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
+ rsp.ID = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
rsp.Sex = Gender(MAN).String()
return err
}
diff --git a/general/jsonrpc/java-client/src/main/java/com/ikurento/user/Consumer.java b/general/jsonrpc/java-client/src/main/java/com/ikurento/user/Consumer.java
index d80fcf8..016794c 100644
--- a/general/jsonrpc/java-client/src/main/java/com/ikurento/user/Consumer.java
+++ b/general/jsonrpc/java-client/src/main/java/com/ikurento/user/Consumer.java
@@ -73,15 +73,15 @@ public class Consumer {
try {
User user1 = userProvider.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime().toString());
userProvider.GetUser3();
@@ -103,7 +103,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
@@ -122,15 +122,15 @@ public class Consumer {
try {
User user1 = userProvider1.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider1.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider1.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime().toString());
userProvider1.GetUser3();
@@ -152,7 +152,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
@@ -171,15 +171,15 @@ public class Consumer {
try {
User user1 = userProvider2.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName() + ", sex:" + user1.getSex().toString()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
User user2 = userProvider2.GetUser0("A003","Moorse");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user2.getId() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ " UserInfo, ID:" + user2.getID() + ", name:" + user2.getName() + ", sex:" + user2.getSex().toString()
+ ", age:" + user2.getAge() + ", time:" + user2.getTime().toString());
User user3 = userProvider2.getUser(1);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user3.getId() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ " UserInfo, ID:" + user3.getID() + ", name:" + user3.getName() + ", sex:" + user3.getSex().toString()
+ ", age:" + user3.getAge() + ", time:" + user3.getTime().toString());
userProvider2.GetUser3();
@@ -201,7 +201,7 @@ public class Consumer {
for (int i = 0; i < userList.size(); i++) {
User user = userList.get(i);
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user.getId() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ " UserInfo, ID:" + user.getID() + ", name:" + user.getName() + ", sex:" + user.getSex().toString()
+ ", age:" + user.getAge() + ", time:" + user.getTime().toString());
}
} catch (Exception e) {
diff --git a/general/rest/go-server/pkg/user.go b/general/rest/go-server/pkg/user.go
index 05c3b89..b8c3507 100644
--- a/general/rest/go-server/pkg/user.go
+++ b/general/rest/go-server/pkg/user.go
@@ -39,7 +39,7 @@ func (g Gender) String() string {
type (
User struct {
- Id string `json:"id"`
+ ID string `json:"id"`
Name string `json:"name"`
Age int `json:"age"`
sex Gender
@@ -50,7 +50,7 @@ type (
var (
DefaultUser = User{
- Id: "0", Name: "Alex Stocks", Age: 31,
+ ID: "0", Name: "Alex Stocks", Age: 31,
// Birth: int(time.Date(1985, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
Birth: int(time.Date(1985, 11, 24, 15, 15, 0, 0, time.Local).Unix()),
sex: Gender(MAN),
@@ -62,9 +62,9 @@ var (
func init() {
DefaultUser.Sex = DefaultUser.sex.String()
UserMap["A000"] = DefaultUser
- UserMap["A001"] = User{Id: "001", Name: "ZhangSheng", Age: 18, sex: MAN}
- UserMap["A002"] = User{Id: "002", Name: "Lily", Age: 20, sex: WOMAN}
- UserMap["A003"] = User{Id: "113", Name: "Moorse中文", Age: 30, sex: MAN}
+ UserMap["A001"] = User{ID: "001", Name: "ZhangSheng", Age: 18, sex: MAN}
+ UserMap["A002"] = User{ID: "002", Name: "Lily", Age: 20, sex: WOMAN}
+ UserMap["A003"] = User{ID: "113", Name: "Moorse中文", Age: 30, sex: MAN}
for k, v := range UserMap {
v.Birth = int(time.Now().AddDate(-1*v.Age, 0, 0).Unix())
v.Sex = UserMap[k].sex.String()
diff --git a/generic/go-client/cmd/client.go b/generic/go-client/cmd/client.go
index 154d68c..269988e 100644
--- a/generic/go-client/cmd/client.go
+++ b/generic/go-client/cmd/client.go
@@ -112,7 +112,7 @@ func callGetUser() {
func callQueryUser() {
gxlog.CInfo("\n\n\nstart to generic invoke")
user := pkg.User{
- Id: "3213",
+ ID: "3213",
Name: "panty",
Age: 25,
Time: time.Now(),
diff --git a/generic/go-client/pkg/user.go b/generic/go-client/pkg/user.go
index 0e79158..185b851 100644
--- a/generic/go-client/pkg/user.go
+++ b/generic/go-client/pkg/user.go
@@ -22,7 +22,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/generic/go-server/pkg/user.go b/generic/go-server/pkg/user.go
index 715b340..a7eef28 100644
--- a/generic/go-server/pkg/user.go
+++ b/generic/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
@@ -47,8 +47,8 @@ type User struct {
type UserProvider struct {
}
-func (u *UserProvider) GetUser(ctx context.Context, userId string) (*User, error) {
- gxlog.CInfo("req:%#v", userId)
+func (u *UserProvider) GetUser(ctx context.Context, userID string) (*User, error) {
+ gxlog.CInfo("req:%#v", userID)
rsp := User{"A001", "Alex Stocks", 18, time.Now()}
gxlog.CInfo("rsp:%#v", rsp)
return &rsp, nil
@@ -56,7 +56,7 @@ func (u *UserProvider) GetUser(ctx context.Context, userId string) (*User, error
func (u *UserProvider) QueryUser(ctx context.Context, user *User) (*User, error) {
gxlog.CInfo("req1:%#v", user)
- rsp := User{user.Id, user.Name, user.Age, time.Now()}
+ rsp := User{user.ID, user.Name, user.Age, time.Now()}
gxlog.CInfo("rsp1:%#v", rsp)
return &rsp, nil
}
diff --git a/generic/go-server/tests/integration/main_test.go b/generic/go-server/tests/integration/main_test.go
index 1cf9287..41fe4f0 100644
--- a/generic/go-server/tests/integration/main_test.go
+++ b/generic/go-server/tests/integration/main_test.go
@@ -54,7 +54,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
@@ -62,4 +62,4 @@ type User struct {
func (User) JavaClassName() string {
return "org.apache.dubbo.User"
-}
\ No newline at end of file
+}
diff --git a/generic/go-server/tests/integration/userprovider_test.go b/generic/go-server/tests/integration/userprovider_test.go
index d7c0880..76f05ec 100644
--- a/generic/go-server/tests/integration/userprovider_test.go
+++ b/generic/go-server/tests/integration/userprovider_test.go
@@ -49,7 +49,7 @@ func TestGetUser(t *testing.T) {
func TestQueryUser(t *testing.T) {
user := User{
- Id: "3213",
+ ID: "3213",
Name: "panty",
Age: 25,
Time: time.Now(),
diff --git a/group/go-server-group-a/tests/integration/main_test.go b/group/go-server-group-a/tests/integration/main_test.go
index f467e7d..4a75f7a 100644
--- a/group/go-server-group-a/tests/integration/main_test.go
+++ b/group/go-server-group-a/tests/integration/main_test.go
@@ -52,7 +52,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/group/go-server-group-a/tests/integration/userprovider_test.go b/group/go-server-group-a/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/group/go-server-group-a/tests/integration/userprovider_test.go
+++ b/group/go-server-group-a/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/group/go-server-group-b/tests/integration/userprovider_test.go b/group/go-server-group-b/tests/integration/userprovider_test.go
index 625a907..7183e64 100644
--- a/group/go-server-group-b/tests/integration/userprovider_test.go
+++ b/group/go-server-group-b/tests/integration/userprovider_test.go
@@ -32,7 +32,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/helloworld/java-client/src/main/java/org/apache/dubbo/Consumer.java b/helloworld/java-client/src/main/java/org/apache/dubbo/Consumer.java
index 36fc1d5..0183a67 100644
--- a/helloworld/java-client/src/main/java/org/apache/dubbo/Consumer.java
+++ b/helloworld/java-client/src/main/java/org/apache/dubbo/Consumer.java
@@ -48,7 +48,7 @@ public class Consumer {
try {
User user1 = userProvider.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
} catch (Exception e) {
diff --git a/metric/go-client/pkg/user.go b/metric/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/metric/go-client/pkg/user.go
+++ b/metric/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/metric/go-server/pkg/user.go b/metric/go-server/pkg/user.go
index 949d603..fb78eeb 100644
--- a/metric/go-server/pkg/user.go
+++ b/metric/go-server/pkg/user.go
@@ -39,7 +39,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
@@ -65,4 +65,4 @@ func (u *UserProvider) Reference() string {
func (u User) JavaClassName() string {
return "org.apache.dubbo.User"
-}
\ No newline at end of file
+}
diff --git a/metric/go-server/tests/integration/main_test.go b/metric/go-server/tests/integration/main_test.go
index 98bd630..45de1c7 100644
--- a/metric/go-server/tests/integration/main_test.go
+++ b/metric/go-server/tests/integration/main_test.go
@@ -52,7 +52,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/metric/go-server/tests/integration/userprovider_test.go b/metric/go-server/tests/integration/userprovider_test.go
index 14a04b5..0ee7a59 100644
--- a/metric/go-server/tests/integration/userprovider_test.go
+++ b/metric/go-server/tests/integration/userprovider_test.go
@@ -33,7 +33,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/multi-registry/go-client/pkg/user.go b/multi-registry/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/multi-registry/go-client/pkg/user.go
+++ b/multi-registry/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/multi-registry/go-server/pkg/user.go b/multi-registry/go-server/pkg/user.go
index 37fcb25..9920a59 100644
--- a/multi-registry/go-server/pkg/user.go
+++ b/multi-registry/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/multi-registry/go-server/tests/integration/main_test.go b/multi-registry/go-server/tests/integration/main_test.go
index 0f824e6..8a49f4f 100644
--- a/multi-registry/go-server/tests/integration/main_test.go
+++ b/multi-registry/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/multi-registry/go-server/tests/integration/userprovider_test.go b/multi-registry/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/multi-registry/go-server/tests/integration/userprovider_test.go
+++ b/multi-registry/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/multi-zone/go-client/cmd/client.go b/multi-zone/go-client/cmd/client.go
index 88360c0..6488f47 100644
--- a/multi-zone/go-client/cmd/client.go
+++ b/multi-zone/go-client/cmd/client.go
@@ -68,10 +68,10 @@ func main() {
if err != nil {
panic(err)
}
- if "dev-hz" == user.Id {
+ if "dev-hz" == user.ID {
hz++
}
- if "dev-sh" == user.Id {
+ if "dev-sh" == user.ID {
sh++
}
gxlog.CInfo("response %d result: %v\n", i, user)
diff --git a/multi-zone/go-client/pkg/user.go b/multi-zone/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/multi-zone/go-client/pkg/user.go
+++ b/multi-zone/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/multi-zone/go-client/tests/integration/userprovider_test.go b/multi-zone/go-client/tests/integration/userprovider_test.go
index 72a25a8..098445c 100644
--- a/multi-zone/go-client/tests/integration/userprovider_test.go
+++ b/multi-zone/go-client/tests/integration/userprovider_test.go
@@ -39,10 +39,10 @@ func TestGetUser(t *testing.T) {
if err != nil {
panic(err)
}
- if "dev-hz" == user.Id {
+ if "dev-hz" == user.ID {
hz++
}
- if "dev-sh" == user.Id {
+ if "dev-sh" == user.ID {
sh++
}
}
diff --git a/multi-zone/go-server-hz/pkg/user.go b/multi-zone/go-server-hz/pkg/user.go
index 3726873..5b88695 100644
--- a/multi-zone/go-server-hz/pkg/user.go
+++ b/multi-zone/go-server-hz/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/multi-zone/go-server-sh/pkg/user.go b/multi-zone/go-server-sh/pkg/user.go
index 3726873..5b88695 100644
--- a/multi-zone/go-server-sh/pkg/user.go
+++ b/multi-zone/go-server-sh/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/etcd/go-client/pkg/user.go b/registry/etcd/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/registry/etcd/go-client/pkg/user.go
+++ b/registry/etcd/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/etcd/go-server/pkg/user.go b/registry/etcd/go-server/pkg/user.go
index 37fcb25..9920a59 100644
--- a/registry/etcd/go-server/pkg/user.go
+++ b/registry/etcd/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/etcd/go-server/tests/integration/main_test.go b/registry/etcd/go-server/tests/integration/main_test.go
index b813c03..2611d11 100644
--- a/registry/etcd/go-server/tests/integration/main_test.go
+++ b/registry/etcd/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/etcd/go-server/tests/integration/userprovider_test.go b/registry/etcd/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/registry/etcd/go-server/tests/integration/userprovider_test.go
+++ b/registry/etcd/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/registry/nacos/go-client/pkg/user.go b/registry/nacos/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/registry/nacos/go-client/pkg/user.go
+++ b/registry/nacos/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/nacos/go-server/pkg/user.go b/registry/nacos/go-server/pkg/user.go
index 37fcb25..9920a59 100644
--- a/registry/nacos/go-server/pkg/user.go
+++ b/registry/nacos/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/nacos/go-server/tests/integration/main_test.go b/registry/nacos/go-server/tests/integration/main_test.go
index 8ac8b11..a6a81e4 100644
--- a/registry/nacos/go-server/tests/integration/main_test.go
+++ b/registry/nacos/go-server/tests/integration/main_test.go
@@ -51,7 +51,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/nacos/go-server/tests/integration/userprovider_test.go b/registry/nacos/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/registry/nacos/go-server/tests/integration/userprovider_test.go
+++ b/registry/nacos/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/registry/servicediscovery/consul/go-client/pkg/pojo/user.go b/registry/servicediscovery/consul/go-client/pkg/pojo/user.go
index f99d525..d4a119d 100644
--- a/registry/servicediscovery/consul/go-client/pkg/pojo/user.go
+++ b/registry/servicediscovery/consul/go-client/pkg/pojo/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/consul/go-server/pkg/pojo/user.go b/registry/servicediscovery/consul/go-server/pkg/pojo/user.go
index d1d77a9..e011f01 100644
--- a/registry/servicediscovery/consul/go-server/pkg/pojo/user.go
+++ b/registry/servicediscovery/consul/go-server/pkg/pojo/user.go
@@ -35,7 +35,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/consul/go-server/tests/integration/main_test.go b/registry/servicediscovery/consul/go-server/tests/integration/main_test.go
index c384101..1c6a64b 100644
--- a/registry/servicediscovery/consul/go-server/tests/integration/main_test.go
+++ b/registry/servicediscovery/consul/go-server/tests/integration/main_test.go
@@ -57,7 +57,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/consul/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/consul/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/registry/servicediscovery/consul/go-server/tests/integration/userprovider_test.go
+++ b/registry/servicediscovery/consul/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/registry/servicediscovery/etcd/go-client/pkg/user.go b/registry/servicediscovery/etcd/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/registry/servicediscovery/etcd/go-client/pkg/user.go
+++ b/registry/servicediscovery/etcd/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/etcd/go-server/pkg/user.go b/registry/servicediscovery/etcd/go-server/pkg/user.go
index 37fcb25..9920a59 100644
--- a/registry/servicediscovery/etcd/go-server/pkg/user.go
+++ b/registry/servicediscovery/etcd/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go b/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go
index 7113c1c..90d99a4 100644
--- a/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go
+++ b/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go
@@ -56,7 +56,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/etcd/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/etcd/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/registry/servicediscovery/etcd/go-server/tests/integration/userprovider_test.go
+++ b/registry/servicediscovery/etcd/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/registry/servicediscovery/file/go-client/pkg/user.go b/registry/servicediscovery/file/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/registry/servicediscovery/file/go-client/pkg/user.go
+++ b/registry/servicediscovery/file/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/file/go-server/pkg/user.go b/registry/servicediscovery/file/go-server/pkg/user.go
index 37fcb25..9920a59 100644
--- a/registry/servicediscovery/file/go-server/pkg/user.go
+++ b/registry/servicediscovery/file/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/file/go-server/tests/integration/main_test.go b/registry/servicediscovery/file/go-server/tests/integration/main_test.go
index 801c58f..feb6fe2 100644
--- a/registry/servicediscovery/file/go-server/tests/integration/main_test.go
+++ b/registry/servicediscovery/file/go-server/tests/integration/main_test.go
@@ -55,7 +55,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/file/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/file/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/registry/servicediscovery/file/go-server/tests/integration/userprovider_test.go
+++ b/registry/servicediscovery/file/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/registry/servicediscovery/nacos/go-client/pkg/user.go b/registry/servicediscovery/nacos/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/registry/servicediscovery/nacos/go-client/pkg/user.go
+++ b/registry/servicediscovery/nacos/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/nacos/go-server/pkg/user.go b/registry/servicediscovery/nacos/go-server/pkg/user.go
index 37fcb25..9920a59 100644
--- a/registry/servicediscovery/nacos/go-server/pkg/user.go
+++ b/registry/servicediscovery/nacos/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/nacos/go-server/tests/integration/main_test.go b/registry/servicediscovery/nacos/go-server/tests/integration/main_test.go
index 3f79691..cdc8b96 100644
--- a/registry/servicediscovery/nacos/go-server/tests/integration/main_test.go
+++ b/registry/servicediscovery/nacos/go-server/tests/integration/main_test.go
@@ -57,7 +57,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/nacos/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/nacos/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/registry/servicediscovery/nacos/go-server/tests/integration/userprovider_test.go
+++ b/registry/servicediscovery/nacos/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/registry/servicediscovery/zookeeper/go-client/pkg/user.go b/registry/servicediscovery/zookeeper/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/registry/servicediscovery/zookeeper/go-client/pkg/user.go
+++ b/registry/servicediscovery/zookeeper/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/zookeeper/go-server/pkg/user.go b/registry/servicediscovery/zookeeper/go-server/pkg/user.go
index 37fcb25..9920a59 100644
--- a/registry/servicediscovery/zookeeper/go-server/pkg/user.go
+++ b/registry/servicediscovery/zookeeper/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/zookeeper/go-server/tests/integration/main_test.go b/registry/servicediscovery/zookeeper/go-server/tests/integration/main_test.go
index 4baabcc..fa94ebc 100644
--- a/registry/servicediscovery/zookeeper/go-server/tests/integration/main_test.go
+++ b/registry/servicediscovery/zookeeper/go-server/tests/integration/main_test.go
@@ -57,7 +57,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/registry/servicediscovery/zookeeper/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/zookeeper/go-server/tests/integration/userprovider_test.go
index 09b09c3..dc29d9a 100644
--- a/registry/servicediscovery/zookeeper/go-server/tests/integration/userprovider_test.go
+++ b/registry/servicediscovery/zookeeper/go-server/tests/integration/userprovider_test.go
@@ -31,7 +31,7 @@ func TestGetUser(t *testing.T) {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
assert.Nil(t, err)
- assert.Equal(t, "A001", user.Id)
+ assert.Equal(t, "A001", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
diff --git a/router/condition/go-client/pkg/user.go b/router/condition/go-client/pkg/user.go
index 75c964f..7733ea4 100644
--- a/router/condition/go-client/pkg/user.go
+++ b/router/condition/go-client/pkg/user.go
@@ -23,7 +23,7 @@ import (
)
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/router/condition/go-server/app/user.go b/router/condition/go-server/app/user.go
index 1e52c9f..0ee093f 100644
--- a/router/condition/go-server/app/user.go
+++ b/router/condition/go-server/app/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/router/condition/go-server/pkg/user.go b/router/condition/go-server/pkg/user.go
index 37fcb25..9920a59 100644
--- a/router/condition/go-server/pkg/user.go
+++ b/router/condition/go-server/pkg/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/router/condition/go-server/tests/integration/main_test.go b/router/condition/go-server/tests/integration/main_test.go
index 72eb94b..758cc00 100644
--- a/router/condition/go-server/tests/integration/main_test.go
+++ b/router/condition/go-server/tests/integration/main_test.go
@@ -52,7 +52,7 @@ func TestMain(m *testing.M) {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/router/tag/go-client/app/client.go b/router/tag/go-client/app/client.go
index d9a637a..fe36eb1 100644
--- a/router/tag/go-client/app/client.go
+++ b/router/tag/go-client/app/client.go
@@ -109,7 +109,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/router/tag/go-server/app/user.go b/router/tag/go-server/app/user.go
index 072df4f..6f04386 100644
--- a/router/tag/go-server/app/user.go
+++ b/router/tag/go-server/app/user.go
@@ -38,7 +38,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/router/tag/java-client/src/main/java/com/ikurento/user/Consumer.java b/router/tag/java-client/src/main/java/com/ikurento/user/Consumer.java
index 6abfb93..7b0fbc7 100644
--- a/router/tag/java-client/src/main/java/com/ikurento/user/Consumer.java
+++ b/router/tag/java-client/src/main/java/com/ikurento/user/Consumer.java
@@ -49,7 +49,7 @@ public class Consumer {
try {
User user1 = userProvider.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
} catch (Exception e) {
diff --git a/shop/dubbo/go-service-order/app/order.go b/shop/dubbo/go-service-order/app/order.go
index 9f6074c..3acf40a 100644
--- a/shop/dubbo/go-service-order/app/order.go
+++ b/shop/dubbo/go-service-order/app/order.go
@@ -39,7 +39,7 @@ func init() {
}
type Order struct {
- Id string
+ ID string
Name string
Price int
Count int
diff --git a/shop/dubbo/go-service-order/app/product.go b/shop/dubbo/go-service-order/app/product.go
index 3527853..e5f2331 100644
--- a/shop/dubbo/go-service-order/app/product.go
+++ b/shop/dubbo/go-service-order/app/product.go
@@ -40,7 +40,7 @@ func init() {
}
type Product struct {
- Id string
+ ID string
Price int
Quantity int
}
diff --git a/shop/dubbo/go-service-product/app/product.go b/shop/dubbo/go-service-product/app/product.go
index 44457db..3cc72b3 100644
--- a/shop/dubbo/go-service-product/app/product.go
+++ b/shop/dubbo/go-service-product/app/product.go
@@ -40,7 +40,7 @@ func init() {
}
type Product struct {
- Id string
+ ID string
Price int
Quantity int
}
diff --git a/shop/dubbo/go-service-user/app/order.go b/shop/dubbo/go-service-user/app/order.go
index b824bcf..4f51e7a 100644
--- a/shop/dubbo/go-service-user/app/order.go
+++ b/shop/dubbo/go-service-user/app/order.go
@@ -38,7 +38,7 @@ func init() {
}
type Order struct {
- Id string
+ ID string
Name string
Price int
Product Product
@@ -49,7 +49,7 @@ func (u Order) JavaClassName() string {
}
type Product struct {
- Id string
+ ID string
Price int
Quantity int
}
diff --git a/tracing/dubbo/go-client/app/user.go b/tracing/dubbo/go-client/app/user.go
index 8158eed..aff39b3 100644
--- a/tracing/dubbo/go-client/app/user.go
+++ b/tracing/dubbo/go-client/app/user.go
@@ -37,7 +37,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/tracing/dubbo/go-server/app/user.go b/tracing/dubbo/go-server/app/user.go
index ed7e6b7..a96d42e 100644
--- a/tracing/dubbo/go-server/app/user.go
+++ b/tracing/dubbo/go-server/app/user.go
@@ -39,7 +39,7 @@ func init() {
}
type User struct {
- Id string
+ ID string
Name string
Age int32
Time time.Time
diff --git a/tracing/dubbo/java-client/src/main/java/com/ikurento/user/Consumer.java b/tracing/dubbo/java-client/src/main/java/com/ikurento/user/Consumer.java
index 51e3d67..9635d88 100644
--- a/tracing/dubbo/java-client/src/main/java/com/ikurento/user/Consumer.java
+++ b/tracing/dubbo/java-client/src/main/java/com/ikurento/user/Consumer.java
@@ -48,7 +48,7 @@ public class Consumer {
try {
User user1 = userProvider.GetUser("A003");
System.out.println("[" + new SimpleDateFormat("HH:mm:ss").format(new Date()) + "] " +
- " UserInfo, Id:" + user1.getId() + ", name:" + user1.getName()
+ " UserInfo, ID:" + user1.getID() + ", name:" + user1.getName()
+ ", age:" + user1.getAge() + ", time:" + user1.getTime().toString());
} catch (Exception e) {
diff --git a/tracing/jsonrpc/go-server/app/user.go b/tracing/jsonrpc/go-server/app/user.go
index e1df07a..bf97053 100644
--- a/tracing/jsonrpc/go-server/app/user.go
+++ b/tracing/jsonrpc/go-server/app/user.go
@@ -39,7 +39,7 @@ func (g Gender) String() string {
type (
User struct {
- Id string `json:"id"`
+ ID string `json:"id"`
Name string `json:"name"`
Age int `json:"age"`
sex Gender
@@ -50,7 +50,7 @@ type (
var (
DefaultUser = User{
- Id: "0", Name: "Alex Stocks", Age: 31,
+ ID: "0", Name: "Alex Stocks", Age: 31,
// Birth: int(time.Date(1985, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
Birth: int(time.Date(1985, 11, 24, 15, 15, 0, 0, time.Local).Unix()),
sex: Gender(MAN),
@@ -62,9 +62,9 @@ var (
func init() {
DefaultUser.Sex = DefaultUser.sex.String()
userMap["A000"] = DefaultUser
- userMap["A001"] = User{Id: "001", Name: "ZhangSheng", Age: 18, sex: MAN}
- userMap["A002"] = User{Id: "002", Name: "Lily", Age: 20, sex: WOMAN}
- userMap["A003"] = User{Id: "113", Name: "Moorse", Age: 30, sex: MAN}
+ userMap["A001"] = User{ID: "001", Name: "ZhangSheng", Age: 18, sex: MAN}
+ userMap["A002"] = User{ID: "002", Name: "Lily", Age: 20, sex: WOMAN}
+ userMap["A003"] = User{ID: "113", Name: "Moorse", Age: 30, sex: MAN}
for k, v := range userMap {
v.Birth = int(time.Now().AddDate(-1*v.Age, 0, 0).Unix())
v.Sex = userMap[k].sex.String()
diff --git a/tracing/jsonrpc/go-server/app/user_provider.go b/tracing/jsonrpc/go-server/app/user_provider.go
index 95d3256..cb6a60e 100644
--- a/tracing/jsonrpc/go-server/app/user_provider.go
+++ b/tracing/jsonrpc/go-server/app/user_provider.go
@@ -24,12 +24,12 @@ func init() {
type UserProvider struct {
}
-func (u *UserProvider) getUser(userId string) (*User, error) {
- if user, ok := userMap[userId]; ok {
+func (u *UserProvider) getUser(userID string) (*User, error) {
+ if user, ok := userMap[userID]; ok {
return &user, nil
}
- return nil, fmt.Errorf("invalid user id:%s", userId)
+ return nil, fmt.Errorf("invalid user id:%s", userID)
}
func (u *UserProvider) GetUser(ctx context.Context, req []interface{}, rsp *User) error {
@@ -46,7 +46,7 @@ func (u *UserProvider) GetUser(ctx context.Context, req []interface{}, rsp *User
defer span.Finish()
gxlog.CInfo("req:%#v", req)
if ctx != nil {
- gxlog.CInfo("tracing Id: %v", ctx.Value("TracingId"))
+ gxlog.CInfo("tracing ID: %v", ctx.Value("TracingID"))
}
time.Sleep(10 * time.Millisecond)
user, err = u.getUser(req[0].(string))
@@ -75,7 +75,7 @@ func (u *UserProvider) GetUser2(ctx context.Context, req []interface{}, rsp *Use
var err error
gxlog.CInfo("req:%#v", req)
- rsp.Id = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
+ rsp.ID = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
rsp.Sex = Gender(MAN).String()
return err
}
diff --git a/tracing/jsonrpc/go-server/app/user_provider1.go b/tracing/jsonrpc/go-server/app/user_provider1.go
index fa591a3..4b7af5a 100644
--- a/tracing/jsonrpc/go-server/app/user_provider1.go
+++ b/tracing/jsonrpc/go-server/app/user_provider1.go
@@ -22,12 +22,12 @@ func init() {
type UserProvider1 struct {
}
-func (u *UserProvider1) getUser(userId string) (*User, error) {
- if user, ok := userMap[userId]; ok {
+func (u *UserProvider1) getUser(userID string) (*User, error) {
+ if user, ok := userMap[userID]; ok {
return &user, nil
}
- return nil, fmt.Errorf("invalid user id:%s", userId)
+ return nil, fmt.Errorf("invalid user id:%s", userID)
}
func (u *UserProvider1) GetUser(ctx context.Context, req []interface{}, rsp *User) error {
@@ -63,7 +63,7 @@ func (u *UserProvider1) GetUser2(ctx context.Context, req []interface{}, rsp *Us
var err error
gxlog.CInfo("req:%#v", req)
- rsp.Id = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
+ rsp.ID = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
rsp.Sex = Gender(MAN).String()
return err
}
diff --git a/tracing/jsonrpc/go-server/app/user_provider2.go b/tracing/jsonrpc/go-server/app/user_provider2.go
index 64e0855..a5f9766 100644
--- a/tracing/jsonrpc/go-server/app/user_provider2.go
+++ b/tracing/jsonrpc/go-server/app/user_provider2.go
@@ -22,12 +22,12 @@ func init() {
type UserProvider2 struct {
}
-func (u *UserProvider2) getUser(userId string) (*User, error) {
- if user, ok := userMap[userId]; ok {
+func (u *UserProvider2) getUser(userID string) (*User, error) {
+ if user, ok := userMap[userID]; ok {
return &user, nil
}
- return nil, fmt.Errorf("invalid user id:%s", userId)
+ return nil, fmt.Errorf("invalid user id:%s", userID)
}
func (u *UserProvider2) GetUser(ctx context.Context, req []interface{}, rsp *User) error {
@@ -63,7 +63,7 @@ func (u *UserProvider2) GetUser2(ctx context.Context, req []interface{}, rsp *Us
var err error
gxlog.CInfo("req:%#v", req)
- rsp.Id = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
+ rsp.ID = strconv.FormatFloat(req[0].(float64), 'f', 0, 64)
rsp.Sex = Gender(MAN).String()
return err
}