From fe511ae7e5e7f82db7d9da6d3bd879adbb33cf9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Fri, 22 Jul 2022 15:05:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nameservers/service_ns_access_log.go | 10 +- .../services/nameservers/service_ns_node.go | 18 +-- .../nameservers/service_ns_node_stream.go | 4 +- .../services/service_acme_authentication.go | 2 +- internal/rpc/services/service_acme_task.go | 47 ++++--- internal/rpc/services/service_acme_user.go | 49 ++++--- internal/rpc/services/service_admin.go | 30 ++--- .../rpc/services/service_api_access_token.go | 2 +- internal/rpc/services/service_api_node.go | 18 +-- .../rpc/services/service_authority_node.go | 16 +-- internal/rpc/services/service_base.go | 12 +- internal/rpc/services/service_db_node.go | 12 +- internal/rpc/services/service_dns_domain.go | 36 ++--- internal/rpc/services/service_dns_provider.go | 40 ++++-- internal/rpc/services/service_file.go | 8 +- internal/rpc/services/service_file_chunk.go | 6 +- .../rpc/services/service_http_access_log.go | 16 +-- .../rpc/services/service_http_cache_policy.go | 20 +-- .../rpc/services/service_http_cache_task.go | 12 +- .../services/service_http_cache_task_key.go | 2 +- internal/rpc/services/service_http_fastcgi.go | 8 +- .../services/service_http_firewall_policy.go | 38 +++--- .../service_http_firewall_rule_group.go | 28 ++-- .../service_http_firewall_rule_set.go | 16 +-- internal/rpc/services/service_http_header.go | 12 +- .../services/service_http_header_policy.go | 30 ++--- .../rpc/services/service_http_location.go | 18 +-- internal/rpc/services/service_http_page.go | 6 +- .../rpc/services/service_http_rewrite_rule.go | 4 +- internal/rpc/services/service_http_web.go | 90 ++++++------- .../rpc/services/service_http_websocket.go | 8 +- internal/rpc/services/service_ip_item.go | 26 ++-- internal/rpc/services/service_ip_library.go | 16 +-- internal/rpc/services/service_ip_list.go | 6 +- internal/rpc/services/service_log.go | 12 +- internal/rpc/services/service_login.go | 4 +- internal/rpc/services/service_message.go | 20 +-- internal/rpc/services/service_monitor_node.go | 18 +-- internal/rpc/services/service_node.go | 60 ++++----- internal/rpc/services/service_node_cluster.go | 54 ++++---- internal/rpc/services/service_node_grant.go | 10 +- internal/rpc/services/service_node_group.go | 12 +- .../rpc/services/service_node_ip_address.go | 16 +-- internal/rpc/services/service_node_log.go | 6 +- .../rpc/services/service_node_price_item.go | 12 +- internal/rpc/services/service_node_region.go | 16 +-- internal/rpc/services/service_node_stream.go | 4 +- internal/rpc/services/service_origin.go | 10 +- .../rpc/services/service_region_country.go | 4 +- .../rpc/services/service_region_province.go | 4 +- .../rpc/services/service_reverse_proxy.go | 24 ++-- internal/rpc/services/service_server.go | 124 +++++++++--------- internal/rpc/services/service_server_bill.go | 4 +- ...vice_server_client_browser_monthly_stat.go | 2 +- ...rvice_server_client_system_monthly_stat.go | 2 +- .../rpc/services/service_server_daily_stat.go | 14 +- internal/rpc/services/service_server_group.go | 40 +++--- ...service_server_http_firewall_daily_stat.go | 2 +- ...service_server_region_city_monthly_stat.go | 2 +- ...vice_server_region_country_monthly_stat.go | 2 +- ...ice_server_region_provider_monthly_stat.go | 2 +- ...ice_server_region_province_monthly_stat.go | 2 +- internal/rpc/services/service_ssl_cert.go | 24 ++-- internal/rpc/services/service_ssl_policy.go | 10 +- internal/rpc/services/service_sys_locker.go | 4 +- internal/rpc/services/service_sys_setting.go | 4 +- internal/rpc/services/service_user.go | 37 +++--- .../rpc/services/service_user_access_key.go | 30 +++-- internal/rpc/services/service_user_bill.go | 22 ++-- .../rpc/services/service_user_identity.go | 2 +- internal/rpc/services/service_user_node.go | 16 +-- internal/rpc/services/sevice_http_gzip.go | 6 +- 72 files changed, 675 insertions(+), 628 deletions(-) diff --git a/internal/rpc/services/nameservers/service_ns_access_log.go b/internal/rpc/services/nameservers/service_ns_access_log.go index 6bbd1342..103a23bb 100644 --- a/internal/rpc/services/nameservers/service_ns_access_log.go +++ b/internal/rpc/services/nameservers/service_ns_access_log.go @@ -27,7 +27,7 @@ func (this *NSAccessLogService) CreateNSAccessLogs(ctx context.Context, req *pb. return &pb.CreateNSAccessLogsResponse{}, nil } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNSAccessLogDAO.CreateNSAccessLogs(tx, req.NsAccessLogs) if err != nil { @@ -40,12 +40,12 @@ func (this *NSAccessLogService) CreateNSAccessLogs(ctx context.Context, req *pb. // ListNSAccessLogs 列出单页访问日志 func (this *NSAccessLogService) ListNSAccessLogs(ctx context.Context, req *pb.ListNSAccessLogsRequest) (*pb.ListNSAccessLogsResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查服务ID if userId > 0 { @@ -97,12 +97,12 @@ func (this *NSAccessLogService) ListNSAccessLogs(ctx context.Context, req *pb.Li // FindNSAccessLog 查找单个日志 func (this *NSAccessLogService) FindNSAccessLog(ctx context.Context, req *pb.FindNSAccessLogRequest) (*pb.FindNSAccessLogResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() accessLog, err := models.SharedNSAccessLogDAO.FindAccessLogWithRequestId(tx, req.RequestId) if err != nil { diff --git a/internal/rpc/services/nameservers/service_ns_node.go b/internal/rpc/services/nameservers/service_ns_node.go index dd9eab89..62bae4e8 100644 --- a/internal/rpc/services/nameservers/service_ns_node.go +++ b/internal/rpc/services/nameservers/service_ns_node.go @@ -144,7 +144,7 @@ func (this *NSNodeService) CountAllUpgradeNSNodesWithNSClusterId(ctx context.Con return nil, err } - tx := this.NullTx() + var tx = this.NullTx() deployFiles := installers.SharedDeployManager.LoadNSNodeFiles() total := int64(0) @@ -166,7 +166,7 @@ func (this *NSNodeService) CreateNSNode(ctx context.Context, req *pb.CreateNSNod return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodeId, err := models.SharedNSNodeDAO.CreateNode(tx, adminId, req.Name, req.NodeClusterId) if err != nil { @@ -193,7 +193,7 @@ func (this *NSNodeService) DeleteNSNode(ctx context.Context, req *pb.DeleteNSNod return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNSNodeDAO.DisableNSNode(tx, req.NsNodeId) if err != nil { @@ -216,7 +216,7 @@ func (this *NSNodeService) FindEnabledNSNode(ctx context.Context, req *pb.FindEn return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedNSNodeDAO.FindEnabledNSNode(tx, req.NsNodeId) if err != nil { @@ -290,7 +290,7 @@ func (this *NSNodeService) UpdateNSNode(ctx context.Context, req *pb.UpdateNSNod return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNSNodeDAO.UpdateNode(tx, req.NsNodeId, req.Name, req.NsClusterId, req.IsOn) if err != nil { @@ -345,7 +345,7 @@ func (this *NSNodeService) FindNSNodeInstallStatus(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() installStatus, err := models.SharedNSNodeDAO.FindNodeInstallStatus(tx, req.NsNodeId) if err != nil { @@ -373,7 +373,7 @@ func (this *NSNodeService) UpdateNSNodeIsInstalled(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNSNodeDAO.UpdateNodeIsInstalled(tx, req.NsNodeId, req.IsInstalled) if err != nil { @@ -502,7 +502,7 @@ func (this *NSNodeService) UpdateNSNodeConnectedAPINodes(ctx context.Context, re return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNSNodeDAO.UpdateNodeConnectedAPINodes(tx, nodeId, req.ApiNodeIds) if err != nil { @@ -520,7 +520,7 @@ func (this *NSNodeService) UpdateNSNodeLogin(ctx context.Context, req *pb.Update return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if req.NodeLogin.Id <= 0 { _, err := models.SharedNodeLoginDAO.CreateNodeLogin(tx, nodeconfigs.NodeRoleDNS, req.NsNodeId, req.NodeLogin.Name, req.NodeLogin.Type, req.NodeLogin.Params) diff --git a/internal/rpc/services/nameservers/service_ns_node_stream.go b/internal/rpc/services/nameservers/service_ns_node_stream.go index 68ad9e5e..b04aa2fe 100644 --- a/internal/rpc/services/nameservers/service_ns_node_stream.go +++ b/internal/rpc/services/nameservers/service_ns_node_stream.go @@ -118,7 +118,7 @@ func (this *NSNodeService) NsNodeStream(server pb.NSNodeService_NsNodeStreamServ //logs.Println("[RPC]accepted ns node '" + types.String(nodeId) + "' connection") - tx := this.NullTx() + var tx = this.NullTx() // 标记为活跃状态 oldIsActive, err := models.SharedNSNodeDAO.FindNodeActive(tx, nodeId) @@ -227,7 +227,7 @@ func (this *NSNodeService) NsNodeStream(server pb.NSNodeService_NsNodeStreamServ // SendCommandToNSNode 向节点发送命令 func (this *NSNodeService) SendCommandToNSNode(ctx context.Context, req *pb.NSNodeStreamMessage) (*pb.NSNodeStreamMessage, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_acme_authentication.go b/internal/rpc/services/service_acme_authentication.go index 9580a4d0..b43b35ad 100644 --- a/internal/rpc/services/service_acme_authentication.go +++ b/internal/rpc/services/service_acme_authentication.go @@ -22,7 +22,7 @@ func (this *ACMEAuthenticationService) FindACMEAuthenticationKeyWithToken(ctx co return nil, errors.New("'token' should not be empty") } - tx := this.NullTx() + var tx = this.NullTx() auth, err := acme.SharedACMEAuthenticationDAO.FindAuthWithToken(tx, req.Token) if err != nil { diff --git a/internal/rpc/services/service_acme_task.go b/internal/rpc/services/service_acme_task.go index 9dd51e51..0d7288d5 100644 --- a/internal/rpc/services/service_acme_task.go +++ b/internal/rpc/services/service_acme_task.go @@ -17,14 +17,16 @@ type ACMETaskService struct { // CountAllEnabledACMETasksWithACMEUserId 计算某个ACME用户相关的任务数量 func (this *ACMETaskService) CountAllEnabledACMETasksWithACMEUserId(ctx context.Context, req *pb.CountAllEnabledACMETasksWithACMEUserIdRequest) (*pb.RPCCountResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - // TODO 校验权限 + var tx = this.NullTx() - tx := this.NullTx() + if userId > 0 { + // TODO 校验权限 + } count, err := acmemodels.SharedACMETaskDAO.CountACMETasksWithACMEUserId(tx, req.AcmeUserId) if err != nil { @@ -35,14 +37,14 @@ func (this *ACMETaskService) CountAllEnabledACMETasksWithACMEUserId(ctx context. // CountEnabledACMETasksWithDNSProviderId 计算跟某个DNS服务商相关的任务数量 func (this *ACMETaskService) CountEnabledACMETasksWithDNSProviderId(ctx context.Context, req *pb.CountEnabledACMETasksWithDNSProviderIdRequest) (*pb.RPCCountResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } // TODO 校验权限 - tx := this.NullTx() + var tx = this.NullTx() count, err := acmemodels.SharedACMETaskDAO.CountACMETasksWithDNSProviderId(tx, req.DnsProviderId) if err != nil { @@ -53,12 +55,15 @@ func (this *ACMETaskService) CountEnabledACMETasksWithDNSProviderId(ctx context. // CountAllEnabledACMETasks 计算所有任务数量 func (this *ACMETaskService) CountAllEnabledACMETasks(ctx context.Context, req *pb.CountAllEnabledACMETasksRequest) (*pb.RPCCountResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } count, err := acmemodels.SharedACMETaskDAO.CountAllEnabledACMETasks(tx, req.AdminId, req.UserId, req.IsAvailable, req.IsExpired, int64(req.ExpiringDays), req.Keyword) if err != nil { @@ -69,12 +74,16 @@ func (this *ACMETaskService) CountAllEnabledACMETasks(ctx context.Context, req * // ListEnabledACMETasks 列出单页任务 func (this *ACMETaskService) ListEnabledACMETasks(ctx context.Context, req *pb.ListEnabledACMETasksRequest) (*pb.ListEnabledACMETasksResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + + if userId > 0 { + req.UserId = userId + } tasks, err := acmemodels.SharedACMETaskDAO.ListEnabledACMETasks(tx, req.AdminId, req.UserId, req.IsAvailable, req.IsExpired, int64(req.ExpiringDays), req.Keyword, req.Offset, req.Size) if err != nil { @@ -214,7 +223,7 @@ func (this *ACMETaskService) ListEnabledACMETasks(ctx context.Context, req *pb.L // CreateACMETask 创建任务 func (this *ACMETaskService) CreateACMETask(ctx context.Context, req *pb.CreateACMETaskRequest) (*pb.CreateACMETaskResponse, error) { - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -223,7 +232,7 @@ func (this *ACMETaskService) CreateACMETask(ctx context.Context, req *pb.CreateA req.AuthType = acme.AuthTypeDNS } - tx := this.NullTx() + var tx = this.NullTx() taskId, err := acmemodels.SharedACMETaskDAO.CreateACMETask(tx, adminId, userId, req.AuthType, req.AcmeUserId, req.DnsProviderId, req.DnsDomain, req.Domains, req.AutoRenew, req.AuthURL) if err != nil { return nil, err @@ -233,12 +242,12 @@ func (this *ACMETaskService) CreateACMETask(ctx context.Context, req *pb.CreateA // UpdateACMETask 修改任务 func (this *ACMETaskService) UpdateACMETask(ctx context.Context, req *pb.UpdateACMETaskRequest) (*pb.RPCSuccess, error) { - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() canAccess, err := acmemodels.SharedACMETaskDAO.CheckACMETask(tx, adminId, userId, req.AcmeTaskId) if err != nil { @@ -257,12 +266,12 @@ func (this *ACMETaskService) UpdateACMETask(ctx context.Context, req *pb.UpdateA // DeleteACMETask 删除任务 func (this *ACMETaskService) DeleteACMETask(ctx context.Context, req *pb.DeleteACMETaskRequest) (*pb.RPCSuccess, error) { - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() canAccess, err := acmemodels.SharedACMETaskDAO.CheckACMETask(tx, adminId, userId, req.AcmeTaskId) if err != nil { @@ -281,12 +290,12 @@ func (this *ACMETaskService) DeleteACMETask(ctx context.Context, req *pb.DeleteA // RunACMETask 运行某个任务 func (this *ACMETaskService) RunACMETask(ctx context.Context, req *pb.RunACMETaskRequest) (*pb.RunACMETaskResponse, error) { - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() canAccess, err := acmemodels.SharedACMETaskDAO.CheckACMETask(tx, adminId, userId, req.AcmeTaskId) if err != nil { @@ -307,12 +316,12 @@ func (this *ACMETaskService) RunACMETask(ctx context.Context, req *pb.RunACMETas // FindEnabledACMETask 查找单个任务信息 func (this *ACMETaskService) FindEnabledACMETask(ctx context.Context, req *pb.FindEnabledACMETaskRequest) (*pb.FindEnabledACMETaskResponse, error) { - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() canAccess, err := acmemodels.SharedACMETaskDAO.CheckACMETask(tx, adminId, userId, req.AcmeTaskId) if err != nil { diff --git a/internal/rpc/services/service_acme_user.go b/internal/rpc/services/service_acme_user.go index 32cc56db..cf980e2b 100644 --- a/internal/rpc/services/service_acme_user.go +++ b/internal/rpc/services/service_acme_user.go @@ -15,12 +15,12 @@ type ACMEUserService struct { // CreateACMEUser 创建用户 func (this *ACMEUserService) CreateACMEUser(ctx context.Context, req *pb.CreateACMEUserRequest) (*pb.CreateACMEUserResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() acmeUserId, err := acmemodels.SharedACMEUserDAO.CreateACMEUser(tx, adminId, userId, req.AcmeProviderCode, req.AcmeProviderAccountId, req.Email, req.Description) if err != nil { @@ -32,12 +32,12 @@ func (this *ACMEUserService) CreateACMEUser(ctx context.Context, req *pb.CreateA // UpdateACMEUser 修改用户 func (this *ACMEUserService) UpdateACMEUser(ctx context.Context, req *pb.UpdateACMEUserRequest) (*pb.RPCSuccess, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查是否有权限 b, err := acmemodels.SharedACMEUserDAO.CheckACMEUser(tx, req.AcmeUserId, adminId, userId) @@ -58,12 +58,12 @@ func (this *ACMEUserService) UpdateACMEUser(ctx context.Context, req *pb.UpdateA // DeleteACMEUser 删除用户 func (this *ACMEUserService) DeleteACMEUser(ctx context.Context, req *pb.DeleteACMEUserRequest) (*pb.RPCSuccess, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查是否有权限 b, err := acmemodels.SharedACMEUserDAO.CheckACMEUser(tx, req.AcmeUserId, adminId, userId) @@ -84,14 +84,17 @@ func (this *ACMEUserService) DeleteACMEUser(ctx context.Context, req *pb.DeleteA // CountACMEUsers 计算用户数量 func (this *ACMEUserService) CountACMEUsers(ctx context.Context, req *pb.CountAcmeUsersRequest) (*pb.RPCCountResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } - count, err := acmemodels.SharedACMEUserDAO.CountACMEUsersWithAdminId(tx, adminId, userId, req.AcmeProviderAccountId) + count, err := acmemodels.SharedACMEUserDAO.CountACMEUsersWithAdminId(tx, adminId, req.UserId, req.AcmeProviderAccountId) if err != nil { return nil, err } @@ -101,18 +104,22 @@ func (this *ACMEUserService) CountACMEUsers(ctx context.Context, req *pb.CountAc // ListACMEUsers 列出单页用户 func (this *ACMEUserService) ListACMEUsers(ctx context.Context, req *pb.ListACMEUsersRequest) (*pb.ListACMEUsersResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() - acmeUsers, err := acmemodels.SharedACMEUserDAO.ListACMEUsers(tx, adminId, userId, req.Offset, req.Size) + if userId > 0 { + req.UserId = userId + } + + acmeUsers, err := acmemodels.SharedACMEUserDAO.ListACMEUsers(tx, adminId, req.UserId, req.Offset, req.Size) if err != nil { return nil, err } - result := []*pb.ACMEUser{} + var result = []*pb.ACMEUser{} for _, user := range acmeUsers { var pbUser = &pb.ACMEUser{ Id: int64(user.Id), @@ -173,12 +180,12 @@ func (this *ACMEUserService) ListACMEUsers(ctx context.Context, req *pb.ListACME // FindEnabledACMEUser 查找单个用户 func (this *ACMEUserService) FindEnabledACMEUser(ctx context.Context, req *pb.FindEnabledACMEUserRequest) (*pb.FindEnabledACMEUserResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查是否有权限 b, err := acmemodels.SharedACMEUserDAO.CheckACMEUser(tx, req.AcmeUserId, adminId, userId) @@ -253,18 +260,22 @@ func (this *ACMEUserService) FindEnabledACMEUser(ctx context.Context, req *pb.Fi // FindAllACMEUsers 查找所有用户 func (this *ACMEUserService) FindAllACMEUsers(ctx context.Context, req *pb.FindAllACMEUsersRequest) (*pb.FindAllACMEUsersResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() - acmeUsers, err := acmemodels.SharedACMEUserDAO.FindAllACMEUsers(tx, adminId, userId, req.AcmeProviderCode) + if userId > 0 { + req.UserId = userId + } + + acmeUsers, err := acmemodels.SharedACMEUserDAO.FindAllACMEUsers(tx, adminId, req.UserId, req.AcmeProviderCode) if err != nil { return nil, err } - result := []*pb.ACMEUser{} + var result = []*pb.ACMEUser{} for _, user := range acmeUsers { result = append(result, &pb.ACMEUser{ Id: int64(user.Id), diff --git a/internal/rpc/services/service_admin.go b/internal/rpc/services/service_admin.go index b98913fd..360d82eb 100644 --- a/internal/rpc/services/service_admin.go +++ b/internal/rpc/services/service_admin.go @@ -41,7 +41,7 @@ func (this *AdminService) LoginAdmin(ctx context.Context, req *pb.LoginAdminRequ }, nil } - tx := this.NullTx() + var tx = this.NullTx() adminId, err := models.SharedAdminDAO.CheckAdminPassword(tx, req.Username, req.Password) if err != nil { @@ -76,7 +76,7 @@ func (this *AdminService) CheckAdminExists(ctx context.Context, req *pb.CheckAdm }, nil } - tx := this.NullTx() + var tx = this.NullTx() ok, err := models.SharedAdminDAO.ExistEnabledAdmin(tx, req.AdminId) if err != nil { @@ -96,7 +96,7 @@ func (this *AdminService) CheckAdminUsername(ctx context.Context, req *pb.CheckA return nil, err } - tx := this.NullTx() + var tx = this.NullTx() exists, err := models.SharedAdminDAO.CheckAdminUsername(tx, req.AdminId, req.Username) if err != nil { @@ -114,7 +114,7 @@ func (this *AdminService) FindAdminFullname(ctx context.Context, req *pb.FindAdm return nil, err } - tx := this.NullTx() + var tx = this.NullTx() fullname, err := models.SharedAdminDAO.FindAdminFullname(tx, req.AdminId) if err != nil { @@ -136,7 +136,7 @@ func (this *AdminService) FindEnabledAdmin(ctx context.Context, req *pb.FindEnab // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() admin, err := models.SharedAdminDAO.FindEnabledAdmin(tx, req.AdminId) if err != nil { @@ -200,7 +200,7 @@ func (this *AdminService) CreateOrUpdateAdmin(ctx context.Context, req *pb.Creat return nil, err } - tx := this.NullTx() + var tx = this.NullTx() adminId, err := models.SharedAdminDAO.FindAdminIdWithUsername(tx, req.Username) if err != nil { @@ -228,7 +228,7 @@ func (this *AdminService) UpdateAdminInfo(ctx context.Context, req *pb.UpdateAdm return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedAdminDAO.UpdateAdminInfo(tx, req.AdminId, req.Fullname) if err != nil { @@ -245,7 +245,7 @@ func (this *AdminService) UpdateAdminLogin(ctx context.Context, req *pb.UpdateAd return nil, err } - tx := this.NullTx() + var tx = this.NullTx() exists, err := models.SharedAdminDAO.CheckAdminUsername(tx, req.AdminId, req.Username) if err != nil { @@ -271,7 +271,7 @@ func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindA // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() admins, err := models.SharedAdminDAO.FindAllAdminModules(tx) if err != nil { @@ -318,7 +318,7 @@ func (this *AdminService) CreateAdmin(ctx context.Context, req *pb.CreateAdminRe // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() adminId, err := models.SharedAdminDAO.CreateAdmin(tx, req.Username, req.CanLogin, req.Password, req.Fullname, req.IsSuper, req.ModulesJSON) if err != nil { @@ -337,7 +337,7 @@ func (this *AdminService) UpdateAdmin(ctx context.Context, req *pb.UpdateAdminRe // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedAdminDAO.UpdateAdmin(tx, req.AdminId, req.Username, req.CanLogin, req.Password, req.Fullname, req.IsSuper, req.ModulesJSON, req.IsOn) if err != nil { @@ -356,7 +356,7 @@ func (this *AdminService) CountAllEnabledAdmins(ctx context.Context, req *pb.Cou // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedAdminDAO.CountAllEnabledAdmins(tx) if err != nil { @@ -374,7 +374,7 @@ func (this *AdminService) ListEnabledAdmins(ctx context.Context, req *pb.ListEna // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() admins, err := models.SharedAdminDAO.ListEnabledAdmins(tx, req.Offset, req.Size) if err != nil { @@ -423,7 +423,7 @@ func (this *AdminService) DeleteAdmin(ctx context.Context, req *pb.DeleteAdminRe // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() // TODO 超级管理员用户是不能删除的，或者要至少留一个超级管理员用户 @@ -446,7 +446,7 @@ func (this *AdminService) CheckAdminOTPWithUsername(ctx context.Context, req *pb return &pb.CheckAdminOTPWithUsernameResponse{RequireOTP: false}, nil } - tx := this.NullTx() + var tx = this.NullTx() adminId, err := models.SharedAdminDAO.FindAdminIdWithUsername(tx, req.Username) if err != nil { diff --git a/internal/rpc/services/service_api_access_token.go b/internal/rpc/services/service_api_access_token.go index ed298a30..4859abe8 100644 --- a/internal/rpc/services/service_api_access_token.go +++ b/internal/rpc/services/service_api_access_token.go @@ -15,7 +15,7 @@ type APIAccessTokenService struct { // GetAPIAccessToken 获取AccessToken func (this *APIAccessTokenService) GetAPIAccessToken(ctx context.Context, req *pb.GetAPIAccessTokenRequest) (*pb.GetAPIAccessTokenResponse, error) { if req.Type == "user" || req.Type == "admin" { // 用户或管理员 - tx := this.NullTx() + var tx = this.NullTx() accessKey, err := models.SharedUserAccessKeyDAO.FindAccessKeyWithUniqueId(tx, req.AccessKeyId) if err != nil { diff --git a/internal/rpc/services/service_api_node.go b/internal/rpc/services/service_api_node.go index baf2f7c9..137b2150 100644 --- a/internal/rpc/services/service_api_node.go +++ b/internal/rpc/services/service_api_node.go @@ -20,7 +20,7 @@ func (this *APINodeService) CreateAPINode(ctx context.Context, req *pb.CreateAPI return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodeId, err := models.SharedAPINodeDAO.CreateAPINode(tx, req.Name, req.Description, req.HttpJSON, req.HttpsJSON, req.RestIsOn, req.RestHTTPJSON, req.RestHTTPSJSON, req.AccessAddrsJSON, req.IsOn) if err != nil { @@ -37,7 +37,7 @@ func (this *APINodeService) UpdateAPINode(ctx context.Context, req *pb.UpdateAPI return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedAPINodeDAO.UpdateAPINode(tx, req.ApiNodeId, req.Name, req.Description, req.HttpJSON, req.HttpsJSON, req.RestIsOn, req.RestHTTPJSON, req.RestHTTPSJSON, req.AccessAddrsJSON, req.IsOn, req.IsPrimary) if err != nil { @@ -54,7 +54,7 @@ func (this *APINodeService) DeleteAPINode(ctx context.Context, req *pb.DeleteAPI return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedAPINodeDAO.DisableAPINode(tx, req.ApiNodeId) if err != nil { @@ -71,7 +71,7 @@ func (this *APINodeService) FindAllEnabledAPINodes(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedAPINodeDAO.FindAllEnabledAPINodes(tx) if err != nil { @@ -111,7 +111,7 @@ func (this *APINodeService) CountAllEnabledAPINodes(ctx context.Context, req *pb return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedAPINodeDAO.CountAllEnabledAPINodes(tx) if err != nil { @@ -128,7 +128,7 @@ func (this *APINodeService) CountAllEnabledAndOnAPINodes(ctx context.Context, re return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedAPINodeDAO.CountAllEnabledAndOnAPINodes(tx) if err != nil { @@ -145,7 +145,7 @@ func (this *APINodeService) ListEnabledAPINodes(ctx context.Context, req *pb.Lis return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedAPINodeDAO.ListEnabledAPINodes(tx, req.Offset, req.Size) if err != nil { @@ -184,12 +184,12 @@ func (this *APINodeService) ListEnabledAPINodes(ctx context.Context, req *pb.Lis // FindEnabledAPINode 根据ID查找节点 func (this *APINodeService) FindEnabledAPINode(ctx context.Context, req *pb.FindEnabledAPINodeRequest) (*pb.FindEnabledAPINodeResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedAPINodeDAO.FindEnabledAPINode(tx, req.ApiNodeId, nil) if err != nil { diff --git a/internal/rpc/services/service_authority_node.go b/internal/rpc/services/service_authority_node.go index 45c7d609..0831d279 100644 --- a/internal/rpc/services/service_authority_node.go +++ b/internal/rpc/services/service_authority_node.go @@ -23,7 +23,7 @@ func (this *AuthorityNodeService) CreateAuthorityNode(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodeId, err := authority.SharedAuthorityNodeDAO.CreateAuthorityNode(tx, req.Name, req.Description, req.IsOn) if err != nil { @@ -40,7 +40,7 @@ func (this *AuthorityNodeService) UpdateAuthorityNode(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = authority.SharedAuthorityNodeDAO.UpdateAuthorityNode(tx, req.AuthorityNodeId, req.Name, req.Description, req.IsOn) if err != nil { @@ -57,7 +57,7 @@ func (this *AuthorityNodeService) DeleteAuthorityNode(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = authority.SharedAuthorityNodeDAO.DisableAuthorityNode(tx, req.AuthorityNodeId) if err != nil { @@ -74,7 +74,7 @@ func (this *AuthorityNodeService) FindAllEnabledAuthorityNodes(ctx context.Conte return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := authority.SharedAuthorityNodeDAO.FindAllEnabledAuthorityNodes(tx) if err != nil { @@ -103,7 +103,7 @@ func (this *AuthorityNodeService) CountAllEnabledAuthorityNodes(ctx context.Cont return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := authority.SharedAuthorityNodeDAO.CountAllEnabledAuthorityNodes(tx) if err != nil { @@ -120,7 +120,7 @@ func (this *AuthorityNodeService) ListEnabledAuthorityNodes(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := authority.SharedAuthorityNodeDAO.ListEnabledAuthorityNodes(tx, req.Offset, req.Size) if err != nil { @@ -150,7 +150,7 @@ func (this *AuthorityNodeService) FindEnabledAuthorityNode(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := authority.SharedAuthorityNodeDAO.FindEnabledAuthorityNode(tx, req.AuthorityNodeId) if err != nil { @@ -179,7 +179,7 @@ func (this *AuthorityNodeService) FindCurrentAuthorityNode(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() md, ok := metadata.FromIncomingContext(ctx) if !ok { diff --git a/internal/rpc/services/service_base.go b/internal/rpc/services/service_base.go index bd997a95..fc922273 100644 --- a/internal/rpc/services/service_base.go +++ b/internal/rpc/services/service_base.go @@ -32,7 +32,7 @@ func (this *BaseService) ValidateAdmin(ctx context.Context) (adminId int64, err } // ValidateAdminAndUser 校验管理员和用户 -func (this *BaseService) ValidateAdminAndUser(ctx context.Context, requireAdminId int64, requireUserId int64) (adminId int64, userId int64, err error) { +func (this *BaseService) ValidateAdminAndUser(ctx context.Context) (adminId int64, userId int64, err error) { reqUserType, _, reqUserId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser) if err != nil { return @@ -47,20 +47,12 @@ func (this *BaseService) ValidateAdminAndUser(ctx context.Context, requireAdminI err = errors.New("invalid 'adminId'") return } - if requireAdminId > 0 && adminId != requireAdminId { - err = this.PermissionError() - return - } case rpcutils.UserTypeUser: userId = reqUserId - if requireUserId >= 0 && userId <= 0 { + if userId < 0 { // 允许等于0 err = errors.New("invalid 'userId'") return } - if requireUserId > 0 && userId != requireUserId { - err = this.PermissionError() - return - } default: err = errors.New("invalid user type") } diff --git a/internal/rpc/services/service_db_node.go b/internal/rpc/services/service_db_node.go index b8d48558..153e23f6 100644 --- a/internal/rpc/services/service_db_node.go +++ b/internal/rpc/services/service_db_node.go @@ -24,7 +24,7 @@ func (this *DBNodeService) CreateDBNode(ctx context.Context, req *pb.CreateDBNod return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodeId, err := models.SharedDBNodeDAO.CreateDBNode(tx, req.IsOn, req.Name, req.Description, req.Host, req.Port, req.Database, req.Username, req.Password, req.Charset) if err != nil { @@ -41,7 +41,7 @@ func (this *DBNodeService) UpdateDBNode(ctx context.Context, req *pb.UpdateDBNod return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedDBNodeDAO.UpdateNode(tx, req.DbNodeId, req.IsOn, req.Name, req.Description, req.Host, req.Port, req.Database, req.Username, req.Password, req.Charset) if err != nil { @@ -58,7 +58,7 @@ func (this *DBNodeService) DeleteDBNode(ctx context.Context, req *pb.DeleteDBNod return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedDBNodeDAO.DisableDBNode(tx, req.DbNodeId) if err != nil { @@ -75,7 +75,7 @@ func (this *DBNodeService) CountAllEnabledDBNodes(ctx context.Context, req *pb.C return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedDBNodeDAO.CountAllEnabledNodes(tx) if err != nil { @@ -92,7 +92,7 @@ func (this *DBNodeService) ListEnabledDBNodes(ctx context.Context, req *pb.ListE return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedDBNodeDAO.ListEnabledNodes(tx, req.Offset, req.Size) if err != nil { @@ -153,7 +153,7 @@ func (this *DBNodeService) FindEnabledDBNode(ctx context.Context, req *pb.FindEn return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedDBNodeDAO.FindEnabledDBNode(tx, req.DbNodeId) if err != nil { diff --git a/internal/rpc/services/service_dns_domain.go b/internal/rpc/services/service_dns_domain.go index 90823e9e..dc5d1749 100644 --- a/internal/rpc/services/service_dns_domain.go +++ b/internal/rpc/services/service_dns_domain.go @@ -28,12 +28,12 @@ type DNSDomainService struct { // CreateDNSDomain 创建域名 func (this *DNSDomainService) CreateDNSDomain(ctx context.Context, req *pb.CreateDNSDomainRequest) (*pb.CreateDNSDomainResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 查询Provider provider, err := dns.SharedDNSProviderDAO.FindEnabledDNSProvider(tx, req.DnsProviderId) @@ -104,7 +104,7 @@ func (this *DNSDomainService) UpdateDNSDomain(ctx context.Context, req *pb.Updat return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = dns.SharedDNSDomainDAO.UpdateDomain(tx, req.DnsDomainId, req.Name, req.IsOn) if err != nil { @@ -121,7 +121,7 @@ func (this *DNSDomainService) DeleteDNSDomain(ctx context.Context, req *pb.Delet return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = dns.SharedDNSDomainDAO.UpdateDomainIsDeleted(tx, req.DnsDomainId, true) if err != nil { @@ -138,7 +138,7 @@ func (this *DNSDomainService) RecoverDNSDomain(ctx context.Context, req *pb.Reco return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = dns.SharedDNSDomainDAO.UpdateDomainIsDeleted(tx, req.DnsDomainId, false) if err != nil { @@ -155,7 +155,7 @@ func (this *DNSDomainService) FindEnabledDNSDomain(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, req.DnsDomainId, nil) if err != nil { @@ -177,7 +177,7 @@ func (this *DNSDomainService) FindEnabledBasicDNSDomain(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, req.DnsDomainId, nil) if err != nil { @@ -203,7 +203,7 @@ func (this *DNSDomainService) CountAllEnabledDNSDomainsWithDNSProviderId(ctx con return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := dns.SharedDNSDomainDAO.CountAllEnabledDomainsWithProviderId(tx, req.DnsProviderId) if err != nil { @@ -220,7 +220,7 @@ func (this *DNSDomainService) FindAllEnabledDNSDomainsWithDNSProviderId(ctx cont return nil, err } - tx := this.NullTx() + var tx = this.NullTx() domains, err := dns.SharedDNSDomainDAO.FindAllEnabledDomainsWithProviderId(tx, req.DnsProviderId) if err != nil { @@ -247,7 +247,7 @@ func (this *DNSDomainService) FindAllEnabledBasicDNSDomainsWithDNSProviderId(ctx return nil, err } - tx := this.NullTx() + var tx = this.NullTx() domains, err := dns.SharedDNSDomainDAO.FindAllEnabledDomainsWithProviderId(tx, req.DnsProviderId) if err != nil { @@ -286,7 +286,7 @@ func (this *DNSDomainService) FindAllDNSDomainRoutes(ctx context.Context, req *p return nil, err } - tx := this.NullTx() + var tx = this.NullTx() routes, err := dns.SharedDNSDomainDAO.FindDomainRoutes(tx, req.DnsDomainId) if err != nil { @@ -312,7 +312,7 @@ func (this *DNSDomainService) ExistAvailableDomains(ctx context.Context, req *pb return nil, err } - tx := this.NullTx() + var tx = this.NullTx() exist, err := dns.SharedDNSDomainDAO.ExistAvailableDomains(tx) if err != nil { @@ -421,7 +421,7 @@ func (this *DNSDomainService) findClusterDNSChanges(cluster *models.NodeCluster, clusterDnsName := cluster.DnsName clusterDomain := clusterDnsName + "." + domainName - tx := this.NullTx() + var tx = this.NullTx() // 自动设置的cname记录 var cnameRecords = []string{} @@ -601,7 +601,7 @@ func (this *DNSDomainService) findClusterDNSChanges(cluster *models.NodeCluster, // 执行同步 func (this *DNSDomainService) syncClusterDNS(req *pb.SyncDNSDomainDataRequest) (*pb.SyncDNSDomainDataResponse, error) { - tx := this.NullTx() + var tx = this.NullTx() // 查询集群信息 var err error @@ -765,12 +765,12 @@ func (this *DNSDomainService) syncClusterDNS(req *pb.SyncDNSDomainDataRequest) ( // ExistDNSDomainRecord 检查域名是否在记录中 func (this *DNSDomainService) ExistDNSDomainRecord(ctx context.Context, req *pb.ExistDNSDomainRecordRequest) (*pb.ExistDNSDomainRecordResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() isOk, err := dns.SharedDNSDomainDAO.ExistDomainRecord(tx, req.DnsDomainId, req.Name, req.Type, req.Route, req.Value) if err != nil { @@ -781,12 +781,12 @@ func (this *DNSDomainService) ExistDNSDomainRecord(ctx context.Context, req *pb. // SyncDNSDomainsFromProvider 从服务商同步域名 func (this *DNSDomainService) SyncDNSDomainsFromProvider(ctx context.Context, req *pb.SyncDNSDomainsFromProviderRequest) (*pb.SyncDNSDomainsFromProviderResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() provider, err := dns.SharedDNSProviderDAO.FindEnabledDNSProvider(tx, req.DnsProviderId) if err != nil { return nil, err diff --git a/internal/rpc/services/service_dns_provider.go b/internal/rpc/services/service_dns_provider.go index 502e5ce6..9d64e6d4 100644 --- a/internal/rpc/services/service_dns_provider.go +++ b/internal/rpc/services/service_dns_provider.go @@ -15,12 +15,12 @@ type DNSProviderService struct { // CreateDNSProvider 创建服务商 func (this *DNSProviderService) CreateDNSProvider(ctx context.Context, req *pb.CreateDNSProviderRequest) (*pb.CreateDNSProviderResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() providerId, err := dns.SharedDNSProviderDAO.CreateDNSProvider(tx, adminId, userId, req.Type, req.Name, req.ApiParamsJSON) if err != nil { @@ -33,14 +33,14 @@ func (this *DNSProviderService) CreateDNSProvider(ctx context.Context, req *pb.C // UpdateDNSProvider 修改服务商 func (this *DNSProviderService) UpdateDNSProvider(ctx context.Context, req *pb.UpdateDNSProviderRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } // TODO 校验权限 - tx := this.NullTx() + var tx = this.NullTx() err = dns.SharedDNSProviderDAO.UpdateDNSProvider(tx, req.DnsProviderId, req.Name, req.ApiParamsJSON) if err != nil { @@ -52,12 +52,15 @@ func (this *DNSProviderService) UpdateDNSProvider(ctx context.Context, req *pb.U // CountAllEnabledDNSProviders 计算服务商数量 func (this *DNSProviderService) CountAllEnabledDNSProviders(ctx context.Context, req *pb.CountAllEnabledDNSProvidersRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } count, err := dns.SharedDNSProviderDAO.CountAllEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Keyword, req.Domain, req.Type) if err != nil { @@ -69,7 +72,7 @@ func (this *DNSProviderService) CountAllEnabledDNSProviders(ctx context.Context, // ListEnabledDNSProviders 列出单页服务商信息 func (this *DNSProviderService) ListEnabledDNSProviders(ctx context.Context, req *pb.ListEnabledDNSProvidersRequest) (*pb.ListEnabledDNSProvidersResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -77,6 +80,9 @@ func (this *DNSProviderService) ListEnabledDNSProviders(ctx context.Context, req // TODO 校验权限 var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } providers, err := dns.SharedDNSProviderDAO.ListEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Keyword, req.Domain, req.Type, req.Offset, req.Size) if err != nil { @@ -99,14 +105,18 @@ func (this *DNSProviderService) ListEnabledDNSProviders(ctx context.Context, req // FindAllEnabledDNSProviders 查找所有的DNS服务商 func (this *DNSProviderService) FindAllEnabledDNSProviders(ctx context.Context, req *pb.FindAllEnabledDNSProvidersRequest) (*pb.FindAllEnabledDNSProvidersResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } // TODO 校验权限 - tx := this.NullTx() + var tx = this.NullTx() + + if userId > 0 { + req.UserId = userId + } providers, err := dns.SharedDNSProviderDAO.FindAllEnabledDNSProviders(tx, req.AdminId, req.UserId) if err != nil { @@ -129,14 +139,16 @@ func (this *DNSProviderService) FindAllEnabledDNSProviders(ctx context.Context, // DeleteDNSProvider 删除服务商 func (this *DNSProviderService) DeleteDNSProvider(ctx context.Context, req *pb.DeleteDNSProviderRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - // TODO 校验权限 + var tx = this.NullTx() - tx := this.NullTx() + if userId > 0 { + // TODO 校验权限 + } err = dns.SharedDNSProviderDAO.DisableDNSProvider(tx, req.DnsProviderId) if err != nil { @@ -153,7 +165,7 @@ func (this *DNSProviderService) FindEnabledDNSProvider(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() provider, err := dns.SharedDNSProviderDAO.FindEnabledDNSProvider(tx, req.DnsProviderId) if err != nil { @@ -200,7 +212,7 @@ func (this *DNSProviderService) FindAllEnabledDNSProvidersWithType(ctx context.C return nil, err } - tx := this.NullTx() + var tx = this.NullTx() providers, err := dns.SharedDNSProviderDAO.FindAllEnabledDNSProvidersWithType(tx, req.ProviderTypeCode) if err != nil { diff --git a/internal/rpc/services/service_file.go b/internal/rpc/services/service_file.go index 6c3a97d1..4a9ba486 100644 --- a/internal/rpc/services/service_file.go +++ b/internal/rpc/services/service_file.go @@ -13,7 +13,7 @@ type FileService struct { // FindEnabledFile 查找文件 func (this *FileService) FindEnabledFile(ctx context.Context, req *pb.FindEnabledFileRequest) (*pb.FindEnabledFileResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, -1) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -49,12 +49,12 @@ func (this *FileService) FindEnabledFile(ctx context.Context, req *pb.FindEnable // CreateFile 创建文件 func (this *FileService) CreateFile(ctx context.Context, req *pb.CreateFileRequest) (*pb.CreateFileResponse, error) { - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() fileId, err := models.SharedFileDAO.CreateFile(tx, adminId, userId, "ipLibrary", "", req.Filename, req.Size, req.IsPublic) if err != nil { @@ -70,7 +70,7 @@ func (this *FileService) UpdateFileFinished(ctx context.Context, req *pb.UpdateF return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedFileDAO.UpdateFileIsFinished(tx, req.FileId) if err != nil { diff --git a/internal/rpc/services/service_file_chunk.go b/internal/rpc/services/service_file_chunk.go index 85d2434b..19062910 100644 --- a/internal/rpc/services/service_file_chunk.go +++ b/internal/rpc/services/service_file_chunk.go @@ -20,7 +20,7 @@ func (this *FileChunkService) CreateFileChunk(ctx context.Context, req *pb.Creat return nil, err } - tx := this.NullTx() + var tx = this.NullTx() chunkId, err := models.SharedFileChunkDAO.CreateFileChunk(tx, req.FileId, req.Data) if err != nil { @@ -39,7 +39,7 @@ func (this *FileChunkService) FindAllFileChunkIds(ctx context.Context, req *pb.F // TODO 校验用户 - tx := this.NullTx() + var tx = this.NullTx() chunkIds, err := models.SharedFileChunkDAO.FindAllFileChunkIds(tx, req.FileId) if err != nil { @@ -58,7 +58,7 @@ func (this *FileChunkService) DownloadFileChunk(ctx context.Context, req *pb.Dow // TODO 校验用户 - tx := this.NullTx() + var tx = this.NullTx() chunk, err := models.SharedFileChunkDAO.FindFileChunk(tx, req.FileChunkId) if err != nil { diff --git a/internal/rpc/services/service_http_access_log.go b/internal/rpc/services/service_http_access_log.go index 0e7bbe66..0627d76e 100644 --- a/internal/rpc/services/service_http_access_log.go +++ b/internal/rpc/services/service_http_access_log.go @@ -30,7 +30,7 @@ func (this *HTTPAccessLogService) CreateHTTPAccessLogs(ctx context.Context, req return &pb.CreateHTTPAccessLogsResponse{}, nil } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPAccessLogDAO.CreateHTTPAccessLogs(tx, req.HttpAccessLogs) if err != nil { @@ -55,18 +55,16 @@ func (this *HTTPAccessLogService) CreateHTTPAccessLogs(ctx context.Context, req // ListHTTPAccessLogs 列出单页访问日志 func (this *HTTPAccessLogService) ListHTTPAccessLogs(ctx context.Context, req *pb.ListHTTPAccessLogsRequest) (*pb.ListHTTPAccessLogsResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查服务ID if userId > 0 { - if req.UserId > 0 && userId != req.UserId { - return nil, this.PermissionError() - } + req.UserId = userId // 这里不用担心serverId <= 0 的情况，因为如果userId>0，则只会查询当前用户下的服务，不会产生安全问题 if req.ServerId > 0 { @@ -82,7 +80,7 @@ func (this *HTTPAccessLogService) ListHTTPAccessLogs(ctx context.Context, req *p return nil, err } - result := []*pb.HTTPAccessLog{} + var result = []*pb.HTTPAccessLog{} var pbNodeMap = map[int64]*pb.Node{} var pbClusterMap = map[int64]*pb.NodeCluster{} for _, accessLog := range accessLogs { @@ -141,12 +139,12 @@ func (this *HTTPAccessLogService) ListHTTPAccessLogs(ctx context.Context, req *p // FindHTTPAccessLog 查找单个日志 func (this *HTTPAccessLogService) FindHTTPAccessLog(ctx context.Context, req *pb.FindHTTPAccessLogRequest) (*pb.FindHTTPAccessLogResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() accessLog, err := models.SharedHTTPAccessLogDAO.FindAccessLogWithRequestId(tx, req.RequestId) if err != nil { diff --git a/internal/rpc/services/service_http_cache_policy.go b/internal/rpc/services/service_http_cache_policy.go index 062c76d5..cd31770e 100644 --- a/internal/rpc/services/service_http_cache_policy.go +++ b/internal/rpc/services/service_http_cache_policy.go @@ -19,7 +19,7 @@ func (this *HTTPCachePolicyService) FindAllEnabledHTTPCachePolicies(ctx context. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() policies, err := models.SharedHTTPCachePolicyDAO.FindAllEnabledCachePolicies(tx) if err != nil { @@ -44,7 +44,7 @@ func (this *HTTPCachePolicyService) CreateHTTPCachePolicy(ctx context.Context, r return nil, err } - tx := this.NullTx() + var tx = this.NullTx() policyId, err := models.SharedHTTPCachePolicyDAO.CreateCachePolicy(tx, req.IsOn, req.Name, req.Description, req.CapacityJSON, req.MaxKeys, req.MaxSizeJSON, req.Type, req.OptionsJSON, req.SyncCompressionCache) if err != nil { @@ -61,7 +61,7 @@ func (this *HTTPCachePolicyService) UpdateHTTPCachePolicy(ctx context.Context, r return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPCachePolicyDAO.UpdateCachePolicy(tx, req.HttpCachePolicyId, req.IsOn, req.Name, req.Description, req.CapacityJSON, req.MaxKeys, req.MaxSizeJSON, req.Type, req.OptionsJSON, req.SyncCompressionCache) if err != nil { @@ -79,7 +79,7 @@ func (this *HTTPCachePolicyService) DeleteHTTPCachePolicy(ctx context.Context, r return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPCachePolicyDAO.DisableHTTPCachePolicy(tx, req.HttpCachePolicyId) if err != nil { @@ -97,7 +97,7 @@ func (this *HTTPCachePolicyService) CountAllEnabledHTTPCachePolicies(ctx context return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedHTTPCachePolicyDAO.CountAllEnabledHTTPCachePolicies(tx, req.NodeClusterId, req.Keyword, req.Type) if err != nil { @@ -114,7 +114,7 @@ func (this *HTTPCachePolicyService) ListEnabledHTTPCachePolicies(ctx context.Con return nil, err } - tx := this.NullTx() + var tx = this.NullTx() cachePolicies, err := models.SharedHTTPCachePolicyDAO.ListEnabledHTTPCachePolicies(tx, req.NodeClusterId, req.Keyword, req.Type, req.Offset, req.Size) if err != nil { @@ -130,12 +130,12 @@ func (this *HTTPCachePolicyService) ListEnabledHTTPCachePolicies(ctx context.Con // FindEnabledHTTPCachePolicyConfig 查找单个缓存策略配置 func (this *HTTPCachePolicyService) FindEnabledHTTPCachePolicyConfig(ctx context.Context, req *pb.FindEnabledHTTPCachePolicyConfigRequest) (*pb.FindEnabledHTTPCachePolicyConfigResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() cachePolicy, err := models.SharedHTTPCachePolicyDAO.ComposeCachePolicy(tx, req.HttpCachePolicyId, nil) if err != nil { @@ -152,7 +152,7 @@ func (this *HTTPCachePolicyService) FindEnabledHTTPCachePolicy(ctx context.Conte return nil, err } - tx := this.NullTx() + var tx = this.NullTx() policy, err := models.SharedHTTPCachePolicyDAO.FindEnabledHTTPCachePolicy(tx, req.HttpCachePolicyId) if err != nil { @@ -175,7 +175,7 @@ func (this *HTTPCachePolicyService) UpdateHTTPCachePolicyRefs(ctx context.Contex return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPCachePolicyDAO.UpdatePolicyRefs(tx, req.HttpCachePolicyId, req.RefsJSON) if err != nil { return nil, err diff --git a/internal/rpc/services/service_http_cache_task.go b/internal/rpc/services/service_http_cache_task.go index 483e03f6..9bdcd75b 100644 --- a/internal/rpc/services/service_http_cache_task.go +++ b/internal/rpc/services/service_http_cache_task.go @@ -20,7 +20,7 @@ type HTTPCacheTaskService struct { // CreateHTTPCacheTask 创建任务 func (this *HTTPCacheTaskService) CreateHTTPCacheTask(ctx context.Context, req *pb.CreateHTTPCacheTaskRequest) (*pb.CreateHTTPCacheTaskResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -161,7 +161,7 @@ func (this *HTTPCacheTaskService) CreateHTTPCacheTask(ctx context.Context, req * // CountHTTPCacheTasks 计算任务数量 func (this *HTTPCacheTaskService) CountHTTPCacheTasks(ctx context.Context, req *pb.CountHTTPCacheTasksRequest) (*pb.RPCCountResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -176,7 +176,7 @@ func (this *HTTPCacheTaskService) CountHTTPCacheTasks(ctx context.Context, req * // CountDoingHTTPCacheTasks 计算正在执行的任务数量 func (this *HTTPCacheTaskService) CountDoingHTTPCacheTasks(ctx context.Context, req *pb.CountDoingHTTPCacheTasksRequest) (*pb.RPCCountResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -191,7 +191,7 @@ func (this *HTTPCacheTaskService) CountDoingHTTPCacheTasks(ctx context.Context, // ListHTTPCacheTasks 列出单页任务 func (this *HTTPCacheTaskService) ListHTTPCacheTasks(ctx context.Context, req *pb.ListHTTPCacheTasksRequest) (*pb.ListHTTPCacheTasksResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -253,7 +253,7 @@ func (this *HTTPCacheTaskService) ListHTTPCacheTasks(ctx context.Context, req *p // FindEnabledHTTPCacheTask 查找单个任务 func (this *HTTPCacheTaskService) FindEnabledHTTPCacheTask(ctx context.Context, req *pb.FindEnabledHTTPCacheTaskRequest) (*pb.FindEnabledHTTPCacheTaskResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -336,7 +336,7 @@ func (this *HTTPCacheTaskService) FindEnabledHTTPCacheTask(ctx context.Context, // DeleteHTTPCacheTask 删除任务 func (this *HTTPCacheTaskService) DeleteHTTPCacheTask(ctx context.Context, req *pb.DeleteHTTPCacheTaskRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_cache_task_key.go b/internal/rpc/services/service_http_cache_task_key.go index eb23d1dc..47e88f01 100644 --- a/internal/rpc/services/service_http_cache_task_key.go +++ b/internal/rpc/services/service_http_cache_task_key.go @@ -18,7 +18,7 @@ type HTTPCacheTaskKeyService struct { // ValidateHTTPCacheTaskKeys 校验缓存Key func (this *HTTPCacheTaskKeyService) ValidateHTTPCacheTaskKeys(ctx context.Context, req *pb.ValidateHTTPCacheTaskKeysRequest) (*pb.ValidateHTTPCacheTaskKeysResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_fastcgi.go b/internal/rpc/services/service_http_fastcgi.go index fe44c1dd..ff95addc 100644 --- a/internal/rpc/services/service_http_fastcgi.go +++ b/internal/rpc/services/service_http_fastcgi.go @@ -17,7 +17,7 @@ type HTTPFastcgiService struct { // CreateHTTPFastcgi 创建Fastcgi func (this *HTTPFastcgiService) CreateHTTPFastcgi(ctx context.Context, req *pb.CreateHTTPFastcgiRequest) (*pb.CreateHTTPFastcgiResponse, error) { - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -32,7 +32,7 @@ func (this *HTTPFastcgiService) CreateHTTPFastcgi(ctx context.Context, req *pb.C // UpdateHTTPFastcgi 修改Fastcgi func (this *HTTPFastcgiService) UpdateHTTPFastcgi(ctx context.Context, req *pb.UpdateHTTPFastcgiRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func (this *HTTPFastcgiService) UpdateHTTPFastcgi(ctx context.Context, req *pb.U // FindEnabledHTTPFastcgi 获取Fastcgi详情 func (this *HTTPFastcgiService) FindEnabledHTTPFastcgi(ctx context.Context, req *pb.FindEnabledHTTPFastcgiRequest) (*pb.FindEnabledHTTPFastcgiResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -87,7 +87,7 @@ func (this *HTTPFastcgiService) FindEnabledHTTPFastcgi(ctx context.Context, req // FindEnabledHTTPFastcgiConfig 获取Fastcgi配置 func (this *HTTPFastcgiService) FindEnabledHTTPFastcgiConfig(ctx context.Context, req *pb.FindEnabledHTTPFastcgiConfigRequest) (*pb.FindEnabledHTTPFastcgiConfigResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_firewall_policy.go b/internal/rpc/services/service_http_firewall_policy.go index c7eeee61..65031bfd 100644 --- a/internal/rpc/services/service_http_firewall_policy.go +++ b/internal/rpc/services/service_http_firewall_policy.go @@ -27,7 +27,7 @@ func (this *HTTPFirewallPolicyService) FindAllEnabledHTTPFirewallPolicies(ctx co return nil, err } - tx := this.NullTx() + var tx = this.NullTx() policies, err := models.SharedHTTPFirewallPolicyDAO.FindAllEnabledFirewallPolicies(tx) if err != nil { @@ -54,12 +54,12 @@ func (this *HTTPFirewallPolicyService) FindAllEnabledHTTPFirewallPolicies(ctx co // CreateHTTPFirewallPolicy 创建防火墙策略 func (this *HTTPFirewallPolicyService) CreateHTTPFirewallPolicy(ctx context.Context, req *pb.CreateHTTPFirewallPolicyRequest) (*pb.CreateHTTPFirewallPolicyResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() policyId, err := models.SharedHTTPFirewallPolicyDAO.CreateFirewallPolicy(tx, userId, req.ServerGroupId, req.ServerId, req.IsOn, req.Name, req.Description, nil, nil) if err != nil { @@ -122,7 +122,7 @@ func (this *HTTPFirewallPolicyService) CreateHTTPFirewallPolicy(ctx context.Cont // CreateEmptyHTTPFirewallPolicy 创建空防火墙策略 func (this *HTTPFirewallPolicyService) CreateEmptyHTTPFirewallPolicy(ctx context.Context, req *pb.CreateEmptyHTTPFirewallPolicyRequest) (*pb.CreateEmptyHTTPFirewallPolicyResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -136,7 +136,7 @@ func (this *HTTPFirewallPolicyService) CreateEmptyHTTPFirewallPolicy(ctx context } } - tx := this.NullTx() + var tx = this.NullTx() policyId, err := models.SharedHTTPFirewallPolicyDAO.CreateFirewallPolicy(tx, userId, req.ServerGroupId, req.ServerId, req.IsOn, req.Name, req.Description, nil, nil) if err != nil { @@ -175,7 +175,7 @@ func (this *HTTPFirewallPolicyService) UpdateHTTPFirewallPolicy(ctx context.Cont var templatePolicy = firewallconfigs.HTTPFirewallTemplate() - tx := this.NullTx() + var tx = this.NullTx() // 已经有的数据 firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.ComposeFirewallPolicy(tx, req.HttpFirewallPolicyId, nil) @@ -312,7 +312,7 @@ func (this *HTTPFirewallPolicyService) UpdateHTTPFirewallPolicy(ctx context.Cont // UpdateHTTPFirewallPolicyGroups 修改分组信息 func (this *HTTPFirewallPolicyService) UpdateHTTPFirewallPolicyGroups(ctx context.Context, req *pb.UpdateHTTPFirewallPolicyGroupsRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -324,7 +324,7 @@ func (this *HTTPFirewallPolicyService) UpdateHTTPFirewallPolicyGroups(ctx contex } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPFirewallPolicyDAO.UpdateFirewallPolicyInboundAndOutbound(tx, req.HttpFirewallPolicyId, req.InboundJSON, req.OutboundJSON, true) if err != nil { @@ -337,12 +337,12 @@ func (this *HTTPFirewallPolicyService) UpdateHTTPFirewallPolicyGroups(ctx contex // UpdateHTTPFirewallInboundConfig 修改inbound信息 func (this *HTTPFirewallPolicyService) UpdateHTTPFirewallInboundConfig(ctx context.Context, req *pb.UpdateHTTPFirewallInboundConfigRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedHTTPFirewallPolicyDAO.CheckUserFirewallPolicy(tx, userId, req.HttpFirewallPolicyId) @@ -367,7 +367,7 @@ func (this *HTTPFirewallPolicyService) CountAllEnabledHTTPFirewallPolicies(ctx c return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedHTTPFirewallPolicyDAO.CountAllEnabledFirewallPolicies(tx, req.NodeClusterId, req.Keyword) if err != nil { @@ -384,7 +384,7 @@ func (this *HTTPFirewallPolicyService) ListEnabledHTTPFirewallPolicies(ctx conte return nil, err } - tx := this.NullTx() + var tx = this.NullTx() policies, err := models.SharedHTTPFirewallPolicyDAO.ListEnabledFirewallPolicies(tx, req.NodeClusterId, req.Keyword, req.Offset, req.Size) if err != nil { @@ -416,7 +416,7 @@ func (this *HTTPFirewallPolicyService) DeleteHTTPFirewallPolicy(ctx context.Cont return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPFirewallPolicyDAO.DisableHTTPFirewallPolicy(tx, req.HttpFirewallPolicyId) if err != nil { @@ -429,7 +429,7 @@ func (this *HTTPFirewallPolicyService) DeleteHTTPFirewallPolicy(ctx context.Cont // FindEnabledHTTPFirewallPolicyConfig 查找单个防火墙配置 func (this *HTTPFirewallPolicyService) FindEnabledHTTPFirewallPolicyConfig(ctx context.Context, req *pb.FindEnabledHTTPFirewallPolicyConfigRequest) (*pb.FindEnabledHTTPFirewallPolicyConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -442,7 +442,7 @@ func (this *HTTPFirewallPolicyService) FindEnabledHTTPFirewallPolicyConfig(ctx c } } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedHTTPFirewallPolicyDAO.ComposeFirewallPolicy(tx, req.HttpFirewallPolicyId, nil) if err != nil { @@ -463,7 +463,7 @@ func (this *HTTPFirewallPolicyService) FindEnabledHTTPFirewallPolicyConfig(ctx c // FindEnabledHTTPFirewallPolicy 获取防火墙的基本信息 func (this *HTTPFirewallPolicyService) FindEnabledHTTPFirewallPolicy(ctx context.Context, req *pb.FindEnabledHTTPFirewallPolicyRequest) (*pb.FindEnabledHTTPFirewallPolicyResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -475,7 +475,7 @@ func (this *HTTPFirewallPolicyService) FindEnabledHTTPFirewallPolicy(ctx context } } - tx := this.NullTx() + var tx = this.NullTx() policy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicy(tx, req.HttpFirewallPolicyId) if err != nil { @@ -506,7 +506,7 @@ func (this *HTTPFirewallPolicyService) ImportHTTPFirewallPolicy(ctx context.Cont // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() oldConfig, err := models.SharedHTTPFirewallPolicyDAO.ComposeFirewallPolicy(tx, req.HttpFirewallPolicyId, nil) if err != nil { @@ -670,7 +670,7 @@ func (this *HTTPFirewallPolicyService) CheckHTTPFirewallPolicyIPStatus(ctx conte } ipLong := utils.IP2Long(req.Ip) - tx := this.NullTx() + var tx = this.NullTx() firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.ComposeFirewallPolicy(tx, req.HttpFirewallPolicyId, nil) if err != nil { return nil, err diff --git a/internal/rpc/services/service_http_firewall_rule_group.go b/internal/rpc/services/service_http_firewall_rule_group.go index d5ae54dd..2eebb641 100644 --- a/internal/rpc/services/service_http_firewall_rule_group.go +++ b/internal/rpc/services/service_http_firewall_rule_group.go @@ -17,7 +17,7 @@ type HTTPFirewallRuleGroupService struct { // UpdateHTTPFirewallRuleGroupIsOn 设置是否启用分组 func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroupIsOn(ctx context.Context, req *pb.UpdateHTTPFirewallRuleGroupIsOnRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -30,7 +30,7 @@ func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroupIsOn(ctx co } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPFirewallRuleGroupDAO.UpdateGroupIsOn(tx, req.FirewallRuleGroupId, req.IsOn) if err != nil { @@ -43,12 +43,12 @@ func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroupIsOn(ctx co // CreateHTTPFirewallRuleGroup 创建分组 func (this *HTTPFirewallRuleGroupService) CreateHTTPFirewallRuleGroup(ctx context.Context, req *pb.CreateHTTPFirewallRuleGroupRequest) (*pb.CreateHTTPFirewallRuleGroupResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() groupId, err := models.SharedHTTPFirewallRuleGroupDAO.CreateGroup(tx, req.IsOn, req.Name, req.Code, req.Description) if err != nil { @@ -60,7 +60,7 @@ func (this *HTTPFirewallRuleGroupService) CreateHTTPFirewallRuleGroup(ctx contex // UpdateHTTPFirewallRuleGroup 修改分组 func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroup(ctx context.Context, req *pb.UpdateHTTPFirewallRuleGroupRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -73,7 +73,7 @@ func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroup(ctx contex } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPFirewallRuleGroupDAO.UpdateGroup(tx, req.FirewallRuleGroupId, req.IsOn, req.Name, req.Code, req.Description) if err != nil { @@ -86,7 +86,7 @@ func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroup(ctx contex // FindEnabledHTTPFirewallRuleGroupConfig 获取分组配置 func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroupConfig(ctx context.Context, req *pb.FindEnabledHTTPFirewallRuleGroupConfigRequest) (*pb.FindEnabledHTTPFirewallRuleGroupConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -99,7 +99,7 @@ func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroupConfig } } - tx := this.NullTx() + var tx = this.NullTx() groupConfig, err := models.SharedHTTPFirewallRuleGroupDAO.ComposeFirewallRuleGroup(tx, req.FirewallRuleGroupId) if err != nil { @@ -118,7 +118,7 @@ func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroupConfig // FindEnabledHTTPFirewallRuleGroup 获取分组信息 func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroup(ctx context.Context, req *pb.FindEnabledHTTPFirewallRuleGroupRequest) (*pb.FindEnabledHTTPFirewallRuleGroupResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -131,7 +131,7 @@ func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroup(ctx c } } - tx := this.NullTx() + var tx = this.NullTx() group, err := models.SharedHTTPFirewallRuleGroupDAO.FindEnabledHTTPFirewallRuleGroup(tx, req.FirewallRuleGroupId) if err != nil { @@ -157,7 +157,7 @@ func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroup(ctx c // UpdateHTTPFirewallRuleGroupSets 修改分组的规则集 func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroupSets(ctx context.Context, req *pb.UpdateHTTPFirewallRuleGroupSetsRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -170,7 +170,7 @@ func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroupSets(ctx co } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPFirewallRuleGroupDAO.UpdateGroupSets(tx, req.GetFirewallRuleGroupId(), req.FirewallRuleSetsJSON) if err != nil { @@ -182,7 +182,7 @@ func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroupSets(ctx co // AddHTTPFirewallRuleGroupSet 添加规则集 func (this *HTTPFirewallRuleGroupService) AddHTTPFirewallRuleGroupSet(ctx context.Context, req *pb.AddHTTPFirewallRuleGroupSetRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -195,7 +195,7 @@ func (this *HTTPFirewallRuleGroupService) AddHTTPFirewallRuleGroupSet(ctx contex } } - tx := this.NullTx() + var tx = this.NullTx() // 已经有的规则 config, err := models.SharedHTTPFirewallRuleGroupDAO.ComposeFirewallRuleGroup(tx, req.FirewallRuleGroupId) diff --git a/internal/rpc/services/service_http_firewall_rule_set.go b/internal/rpc/services/service_http_firewall_rule_set.go index 5e0f1958..63281c9e 100644 --- a/internal/rpc/services/service_http_firewall_rule_set.go +++ b/internal/rpc/services/service_http_firewall_rule_set.go @@ -16,7 +16,7 @@ type HTTPFirewallRuleSetService struct { // CreateOrUpdateHTTPFirewallRuleSetFromConfig 根据配置创建规则集 func (this *HTTPFirewallRuleSetService) CreateOrUpdateHTTPFirewallRuleSetFromConfig(ctx context.Context, req *pb.CreateOrUpdateHTTPFirewallRuleSetFromConfigRequest) (*pb.CreateOrUpdateHTTPFirewallRuleSetFromConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -34,7 +34,7 @@ func (this *HTTPFirewallRuleSetService) CreateOrUpdateHTTPFirewallRuleSetFromCon } } - tx := this.NullTx() + var tx = this.NullTx() setId, err := models.SharedHTTPFirewallRuleSetDAO.CreateOrUpdateSetFromConfig(tx, setConfig) if err != nil { @@ -47,7 +47,7 @@ func (this *HTTPFirewallRuleSetService) CreateOrUpdateHTTPFirewallRuleSetFromCon // UpdateHTTPFirewallRuleSetIsOn 修改是否开启 func (this *HTTPFirewallRuleSetService) UpdateHTTPFirewallRuleSetIsOn(ctx context.Context, req *pb.UpdateHTTPFirewallRuleSetIsOnRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -59,7 +59,7 @@ func (this *HTTPFirewallRuleSetService) UpdateHTTPFirewallRuleSetIsOn(ctx contex } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPFirewallRuleSetDAO.UpdateRuleSetIsOn(tx, req.FirewallRuleSetId, req.IsOn) if err != nil { @@ -72,7 +72,7 @@ func (this *HTTPFirewallRuleSetService) UpdateHTTPFirewallRuleSetIsOn(ctx contex // FindEnabledHTTPFirewallRuleSetConfig 查找规则集配置 func (this *HTTPFirewallRuleSetService) FindEnabledHTTPFirewallRuleSetConfig(ctx context.Context, req *pb.FindEnabledHTTPFirewallRuleSetConfigRequest) (*pb.FindEnabledHTTPFirewallRuleSetConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -84,7 +84,7 @@ func (this *HTTPFirewallRuleSetService) FindEnabledHTTPFirewallRuleSetConfig(ctx } } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedHTTPFirewallRuleSetDAO.ComposeFirewallRuleSet(tx, req.FirewallRuleSetId) if err != nil { @@ -103,7 +103,7 @@ func (this *HTTPFirewallRuleSetService) FindEnabledHTTPFirewallRuleSetConfig(ctx // FindEnabledHTTPFirewallRuleSet 查找规则集 func (this *HTTPFirewallRuleSetService) FindEnabledHTTPFirewallRuleSet(ctx context.Context, req *pb.FindEnabledHTTPFirewallRuleSetRequest) (*pb.FindEnabledHTTPFirewallRuleSetResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -115,7 +115,7 @@ func (this *HTTPFirewallRuleSetService) FindEnabledHTTPFirewallRuleSet(ctx conte } } - tx := this.NullTx() + var tx = this.NullTx() set, err := models.SharedHTTPFirewallRuleSetDAO.FindEnabledHTTPFirewallRuleSet(tx, req.FirewallRuleSetId) if err != nil { diff --git a/internal/rpc/services/service_http_header.go b/internal/rpc/services/service_http_header.go index 979be145..2a5b89fa 100644 --- a/internal/rpc/services/service_http_header.go +++ b/internal/rpc/services/service_http_header.go @@ -16,7 +16,7 @@ type HTTPHeaderService struct { // CreateHTTPHeader 创建Header func (this *HTTPHeaderService) CreateHTTPHeader(ctx context.Context, req *pb.CreateHTTPHeaderRequest) (*pb.CreateHTTPHeaderResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -25,7 +25,7 @@ func (this *HTTPHeaderService) CreateHTTPHeader(ctx context.Context, req *pb.Cre // TODO 检查用户权限 } - tx := this.NullTx() + var tx = this.NullTx() // status var newStatus = []int{} @@ -53,7 +53,7 @@ func (this *HTTPHeaderService) CreateHTTPHeader(ctx context.Context, req *pb.Cre // UpdateHTTPHeader 修改Header func (this *HTTPHeaderService) UpdateHTTPHeader(ctx context.Context, req *pb.UpdateHTTPHeaderRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -62,7 +62,7 @@ func (this *HTTPHeaderService) UpdateHTTPHeader(ctx context.Context, req *pb.Upd // TODO 检查用户权限 } - tx := this.NullTx() + var tx = this.NullTx() // status var newStatus = []int{} @@ -90,7 +90,7 @@ func (this *HTTPHeaderService) UpdateHTTPHeader(ctx context.Context, req *pb.Upd // FindEnabledHTTPHeaderConfig 查找配置 func (this *HTTPHeaderService) FindEnabledHTTPHeaderConfig(ctx context.Context, req *pb.FindEnabledHTTPHeaderConfigRequest) (*pb.FindEnabledHTTPHeaderConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -99,7 +99,7 @@ func (this *HTTPHeaderService) FindEnabledHTTPHeaderConfig(ctx context.Context, // TODO 检查用户权限 } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedHTTPHeaderDAO.ComposeHeaderConfig(tx, req.HeaderId) if err != nil { diff --git a/internal/rpc/services/service_http_header_policy.go b/internal/rpc/services/service_http_header_policy.go index 977c9f16..72d2edd1 100644 --- a/internal/rpc/services/service_http_header_policy.go +++ b/internal/rpc/services/service_http_header_policy.go @@ -11,14 +11,14 @@ type HTTPHeaderPolicyService struct { BaseService } -// 查找策略配置 +// FindEnabledHTTPHeaderPolicyConfig 查找策略配置 func (this *HTTPHeaderPolicyService) FindEnabledHTTPHeaderPolicyConfig(ctx context.Context, req *pb.FindEnabledHTTPHeaderPolicyConfigRequest) (*pb.FindEnabledHTTPHeaderPolicyConfigResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedHTTPHeaderPolicyDAO.ComposeHeaderPolicyConfig(tx, req.HeaderPolicyId) if err != nil { @@ -35,12 +35,12 @@ func (this *HTTPHeaderPolicyService) FindEnabledHTTPHeaderPolicyConfig(ctx conte // 创建策略 func (this *HTTPHeaderPolicyService) CreateHTTPHeaderPolicy(ctx context.Context, req *pb.CreateHTTPHeaderPolicyRequest) (*pb.CreateHTTPHeaderPolicyResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() headerPolicyId, err := models.SharedHTTPHeaderPolicyDAO.CreateHeaderPolicy(tx) if err != nil { @@ -52,12 +52,12 @@ func (this *HTTPHeaderPolicyService) CreateHTTPHeaderPolicy(ctx context.Context, // 修改AddHeaders func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyAddingHeaders(ctx context.Context, req *pb.UpdateHTTPHeaderPolicyAddingHeadersRequest) (*pb.RPCSuccess, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPHeaderPolicyDAO.UpdateAddingHeaders(tx, req.HeaderPolicyId, req.HeadersJSON) if err != nil { @@ -69,12 +69,12 @@ func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyAddingHeaders(ctx con // 修改SetHeaders func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicySettingHeaders(ctx context.Context, req *pb.UpdateHTTPHeaderPolicySettingHeadersRequest) (*pb.RPCSuccess, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPHeaderPolicyDAO.UpdateSettingHeaders(tx, req.HeaderPolicyId, req.HeadersJSON) if err != nil { @@ -86,12 +86,12 @@ func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicySettingHeaders(ctx co // 修改AddTrailers func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyAddingTrailers(ctx context.Context, req *pb.UpdateHTTPHeaderPolicyAddingTrailersRequest) (*pb.RPCSuccess, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPHeaderPolicyDAO.UpdateAddingTrailers(tx, req.HeaderPolicyId, req.HeadersJSON) if err != nil { @@ -103,12 +103,12 @@ func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyAddingTrailers(ctx co // 修改ReplaceHeaders func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyReplacingHeaders(ctx context.Context, req *pb.UpdateHTTPHeaderPolicyReplacingHeadersRequest) (*pb.RPCSuccess, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPHeaderPolicyDAO.UpdateReplacingHeaders(tx, req.HeaderPolicyId, req.HeadersJSON) if err != nil { @@ -120,12 +120,12 @@ func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyReplacingHeaders(ctx // 修改删除的Headers func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyDeletingHeaders(ctx context.Context, req *pb.UpdateHTTPHeaderPolicyDeletingHeadersRequest) (*pb.RPCSuccess, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPHeaderPolicyDAO.UpdateDeletingHeaders(tx, req.HeaderPolicyId, req.HeaderNames) if err != nil { diff --git a/internal/rpc/services/service_http_location.go b/internal/rpc/services/service_http_location.go index af4834cc..e9c7b38c 100644 --- a/internal/rpc/services/service_http_location.go +++ b/internal/rpc/services/service_http_location.go @@ -22,7 +22,7 @@ func (this *HTTPLocationService) CreateHTTPLocation(ctx context.Context, req *pb return nil, err } - tx := this.NullTx() + var tx = this.NullTx() locationId, err := models.SharedHTTPLocationDAO.CreateLocation(tx, req.ParentId, req.Name, req.Pattern, req.Description, req.IsBreak, req.CondsJSON, req.Domains) if err != nil { @@ -40,7 +40,7 @@ func (this *HTTPLocationService) UpdateHTTPLocation(ctx context.Context, req *pb return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPLocationDAO.UpdateLocation(tx, req.LocationId, req.Name, req.Pattern, req.Description, req.IsOn, req.IsBreak, req.CondsJSON, req.Domains) if err != nil { @@ -58,7 +58,7 @@ func (this *HTTPLocationService) FindEnabledHTTPLocationConfig(ctx context.Conte return nil, err } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedHTTPLocationDAO.ComposeLocationConfig(tx, req.LocationId, nil) if err != nil { @@ -79,7 +79,7 @@ func (this *HTTPLocationService) DeleteHTTPLocation(ctx context.Context, req *pb return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPLocationDAO.DisableHTTPLocation(tx, req.LocationId) if err != nil { @@ -91,12 +91,12 @@ func (this *HTTPLocationService) DeleteHTTPLocation(ctx context.Context, req *pb // FindAndInitHTTPLocationReverseProxyConfig 查找反向代理设置 func (this *HTTPLocationService) FindAndInitHTTPLocationReverseProxyConfig(ctx context.Context, req *pb.FindAndInitHTTPLocationReverseProxyConfigRequest) (*pb.FindAndInitHTTPLocationReverseProxyConfigResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() reverseProxyRef, err := models.SharedHTTPLocationDAO.FindLocationReverseProxy(tx, req.LocationId) if err != nil { @@ -144,12 +144,12 @@ func (this *HTTPLocationService) FindAndInitHTTPLocationReverseProxyConfig(ctx c // FindAndInitHTTPLocationWebConfig 初始化Web设置 func (this *HTTPLocationService) FindAndInitHTTPLocationWebConfig(ctx context.Context, req *pb.FindAndInitHTTPLocationWebConfigRequest) (*pb.FindAndInitHTTPLocationWebConfigResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, rpcutils.Wrap("ValidateRequest()", err) } - tx := this.NullTx() + var tx = this.NullTx() webId, err := models.SharedHTTPLocationDAO.FindLocationWebId(tx, req.LocationId) if err != nil { @@ -188,7 +188,7 @@ func (this *HTTPLocationService) UpdateHTTPLocationReverseProxy(ctx context.Cont return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPLocationDAO.UpdateLocationReverseProxy(tx, req.LocationId, req.ReverseProxyJSON) if err != nil { diff --git a/internal/rpc/services/service_http_page.go b/internal/rpc/services/service_http_page.go index ff5e3dd9..3a215111 100644 --- a/internal/rpc/services/service_http_page.go +++ b/internal/rpc/services/service_http_page.go @@ -15,7 +15,7 @@ type HTTPPageService struct { // CreateHTTPPage 创建Page func (this *HTTPPageService) CreateHTTPPage(ctx context.Context, req *pb.CreateHTTPPageRequest) (*pb.CreateHTTPPageResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -33,7 +33,7 @@ func (this *HTTPPageService) CreateHTTPPage(ctx context.Context, req *pb.CreateH // UpdateHTTPPage 修改Page func (this *HTTPPageService) UpdateHTTPPage(ctx context.Context, req *pb.UpdateHTTPPageRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -57,7 +57,7 @@ func (this *HTTPPageService) UpdateHTTPPage(ctx context.Context, req *pb.UpdateH // FindEnabledHTTPPageConfig 查找单个Page配置 func (this *HTTPPageService) FindEnabledHTTPPageConfig(ctx context.Context, req *pb.FindEnabledHTTPPageConfigRequest) (*pb.FindEnabledHTTPPageConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_rewrite_rule.go b/internal/rpc/services/service_http_rewrite_rule.go index 243d316d..8ab66025 100644 --- a/internal/rpc/services/service_http_rewrite_rule.go +++ b/internal/rpc/services/service_http_rewrite_rule.go @@ -20,7 +20,7 @@ func (this *HTTPRewriteRuleService) CreateHTTPRewriteRule(ctx context.Context, r return nil, err } - tx := this.NullTx() + var tx = this.NullTx() rewriteRuleId, err := models.SharedHTTPRewriteRuleDAO.CreateRewriteRule(tx, req.Pattern, req.Replace, req.Mode, types.Int(req.RedirectStatus), req.IsBreak, req.ProxyHost, req.WithQuery, req.IsOn, req.CondsJSON) if err != nil { @@ -38,7 +38,7 @@ func (this *HTTPRewriteRuleService) UpdateHTTPRewriteRule(ctx context.Context, r return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPRewriteRuleDAO.UpdateRewriteRule(tx, req.RewriteRuleId, req.Pattern, req.Replace, req.Mode, types.Int(req.RedirectStatus), req.IsBreak, req.ProxyHost, req.WithQuery, req.IsOn, req.CondsJSON) if err != nil { diff --git a/internal/rpc/services/service_http_web.go b/internal/rpc/services/service_http_web.go index 10576cfa..eba5b836 100644 --- a/internal/rpc/services/service_http_web.go +++ b/internal/rpc/services/service_http_web.go @@ -17,12 +17,12 @@ type HTTPWebService struct { // CreateHTTPWeb 创建Web配置 func (this *HTTPWebService) CreateHTTPWeb(ctx context.Context, req *pb.CreateHTTPWebRequest) (*pb.CreateHTTPWebResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() webId, err := models.SharedHTTPWebDAO.CreateWeb(tx, adminId, userId, req.RootJSON) if err != nil { @@ -35,7 +35,7 @@ func (this *HTTPWebService) CreateHTTPWeb(ctx context.Context, req *pb.CreateHTT // FindEnabledHTTPWeb 查找Web配置 func (this *HTTPWebService) FindEnabledHTTPWeb(ctx context.Context, req *pb.FindEnabledHTTPWebRequest) (*pb.FindEnabledHTTPWebResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -48,7 +48,7 @@ func (this *HTTPWebService) FindEnabledHTTPWeb(ctx context.Context, req *pb.Find } } - tx := this.NullTx() + var tx = this.NullTx() web, err := models.SharedHTTPWebDAO.FindEnabledHTTPWeb(tx, req.HttpWebId) if err != nil { @@ -68,7 +68,7 @@ func (this *HTTPWebService) FindEnabledHTTPWeb(ctx context.Context, req *pb.Find // FindEnabledHTTPWebConfig 查找Web配置 func (this *HTTPWebService) FindEnabledHTTPWebConfig(ctx context.Context, req *pb.FindEnabledHTTPWebConfigRequest) (*pb.FindEnabledHTTPWebConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -81,7 +81,7 @@ func (this *HTTPWebService) FindEnabledHTTPWebConfig(ctx context.Context, req *p } } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, req.HttpWebId, nil) if err != nil { @@ -98,7 +98,7 @@ func (this *HTTPWebService) FindEnabledHTTPWebConfig(ctx context.Context, req *p // UpdateHTTPWeb 修改Web配置 func (this *HTTPWebService) UpdateHTTPWeb(ctx context.Context, req *pb.UpdateHTTPWebRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -111,7 +111,7 @@ func (this *HTTPWebService) UpdateHTTPWeb(ctx context.Context, req *pb.UpdateHTT } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWeb(tx, req.HttpWebId, req.RootJSON) if err != nil { @@ -124,7 +124,7 @@ func (this *HTTPWebService) UpdateHTTPWeb(ctx context.Context, req *pb.UpdateHTT // UpdateHTTPWebCompression 修改压缩配置 func (this *HTTPWebService) UpdateHTTPWebCompression(ctx context.Context, req *pb.UpdateHTTPWebCompressionRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -137,7 +137,7 @@ func (this *HTTPWebService) UpdateHTTPWebCompression(ctx context.Context, req *p } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebCompression(tx, req.HttpWebId, req.CompressionJSON) if err != nil { @@ -150,7 +150,7 @@ func (this *HTTPWebService) UpdateHTTPWebCompression(ctx context.Context, req *p // UpdateHTTPWebWebP 修改WebP配置 func (this *HTTPWebService) UpdateHTTPWebWebP(ctx context.Context, req *pb.UpdateHTTPWebWebPRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -163,7 +163,7 @@ func (this *HTTPWebService) UpdateHTTPWebWebP(ctx context.Context, req *pb.Updat } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebWebP(tx, req.HttpWebId, req.WebpJSON) if err != nil { @@ -176,7 +176,7 @@ func (this *HTTPWebService) UpdateHTTPWebWebP(ctx context.Context, req *pb.Updat // UpdateHTTPWebRemoteAddr 更改RemoteAddr配置 func (this *HTTPWebService) UpdateHTTPWebRemoteAddr(ctx context.Context, req *pb.UpdateHTTPWebRemoteAddrRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -201,7 +201,7 @@ func (this *HTTPWebService) UpdateHTTPWebRemoteAddr(ctx context.Context, req *pb // UpdateHTTPWebCharset 修改字符集配置 func (this *HTTPWebService) UpdateHTTPWebCharset(ctx context.Context, req *pb.UpdateHTTPWebCharsetRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -214,7 +214,7 @@ func (this *HTTPWebService) UpdateHTTPWebCharset(ctx context.Context, req *pb.Up } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebCharset(tx, req.HttpWebId, req.CharsetJSON) if err != nil { @@ -226,7 +226,7 @@ func (this *HTTPWebService) UpdateHTTPWebCharset(ctx context.Context, req *pb.Up // UpdateHTTPWebRequestHeader 更改请求Header策略 func (this *HTTPWebService) UpdateHTTPWebRequestHeader(ctx context.Context, req *pb.UpdateHTTPWebRequestHeaderRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -239,7 +239,7 @@ func (this *HTTPWebService) UpdateHTTPWebRequestHeader(ctx context.Context, req } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebRequestHeaderPolicy(tx, req.HttpWebId, req.HeaderJSON) if err != nil { @@ -252,7 +252,7 @@ func (this *HTTPWebService) UpdateHTTPWebRequestHeader(ctx context.Context, req // UpdateHTTPWebResponseHeader 更改响应Header策略 func (this *HTTPWebService) UpdateHTTPWebResponseHeader(ctx context.Context, req *pb.UpdateHTTPWebResponseHeaderRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -265,7 +265,7 @@ func (this *HTTPWebService) UpdateHTTPWebResponseHeader(ctx context.Context, req } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebResponseHeaderPolicy(tx, req.HttpWebId, req.HeaderJSON) if err != nil { @@ -278,7 +278,7 @@ func (this *HTTPWebService) UpdateHTTPWebResponseHeader(ctx context.Context, req // UpdateHTTPWebShutdown 更改Shutdown func (this *HTTPWebService) UpdateHTTPWebShutdown(ctx context.Context, req *pb.UpdateHTTPWebShutdownRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -291,7 +291,7 @@ func (this *HTTPWebService) UpdateHTTPWebShutdown(ctx context.Context, req *pb.U } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebShutdown(tx, req.HttpWebId, req.ShutdownJSON) if err != nil { @@ -303,7 +303,7 @@ func (this *HTTPWebService) UpdateHTTPWebShutdown(ctx context.Context, req *pb.U // UpdateHTTPWebPages 更改Pages func (this *HTTPWebService) UpdateHTTPWebPages(ctx context.Context, req *pb.UpdateHTTPWebPagesRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -316,7 +316,7 @@ func (this *HTTPWebService) UpdateHTTPWebPages(ctx context.Context, req *pb.Upda } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebPages(tx, req.HttpWebId, req.PagesJSON) if err != nil { @@ -328,7 +328,7 @@ func (this *HTTPWebService) UpdateHTTPWebPages(ctx context.Context, req *pb.Upda // UpdateHTTPWebAccessLog 更改访问日志配置 func (this *HTTPWebService) UpdateHTTPWebAccessLog(ctx context.Context, req *pb.UpdateHTTPWebAccessLogRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -341,7 +341,7 @@ func (this *HTTPWebService) UpdateHTTPWebAccessLog(ctx context.Context, req *pb. } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebAccessLogConfig(tx, req.HttpWebId, req.AccessLogJSON) if err != nil { @@ -353,7 +353,7 @@ func (this *HTTPWebService) UpdateHTTPWebAccessLog(ctx context.Context, req *pb. // UpdateHTTPWebStat 更改统计配置 func (this *HTTPWebService) UpdateHTTPWebStat(ctx context.Context, req *pb.UpdateHTTPWebStatRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -366,7 +366,7 @@ func (this *HTTPWebService) UpdateHTTPWebStat(ctx context.Context, req *pb.Updat } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebStat(tx, req.HttpWebId, req.StatJSON) if err != nil { @@ -378,7 +378,7 @@ func (this *HTTPWebService) UpdateHTTPWebStat(ctx context.Context, req *pb.Updat // UpdateHTTPWebCache 更改缓存配置 func (this *HTTPWebService) UpdateHTTPWebCache(ctx context.Context, req *pb.UpdateHTTPWebCacheRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -391,7 +391,7 @@ func (this *HTTPWebService) UpdateHTTPWebCache(ctx context.Context, req *pb.Upda } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebCache(tx, req.HttpWebId, req.CacheJSON) if err != nil { @@ -404,7 +404,7 @@ func (this *HTTPWebService) UpdateHTTPWebCache(ctx context.Context, req *pb.Upda // UpdateHTTPWebFirewall 更改防火墙设置 func (this *HTTPWebService) UpdateHTTPWebFirewall(ctx context.Context, req *pb.UpdateHTTPWebFirewallRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -417,7 +417,7 @@ func (this *HTTPWebService) UpdateHTTPWebFirewall(ctx context.Context, req *pb.U } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebFirewall(tx, req.HttpWebId, req.FirewallJSON) if err != nil { @@ -430,7 +430,7 @@ func (this *HTTPWebService) UpdateHTTPWebFirewall(ctx context.Context, req *pb.U // UpdateHTTPWebLocations 更改路由规则设置 func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb.UpdateHTTPWebLocationsRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -443,7 +443,7 @@ func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb. } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebLocations(tx, req.HttpWebId, req.LocationsJSON) if err != nil { @@ -456,7 +456,7 @@ func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb. // UpdateHTTPWebRedirectToHTTPS 更改跳转到HTTPS设置 func (this *HTTPWebService) UpdateHTTPWebRedirectToHTTPS(ctx context.Context, req *pb.UpdateHTTPWebRedirectToHTTPSRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -469,7 +469,7 @@ func (this *HTTPWebService) UpdateHTTPWebRedirectToHTTPS(ctx context.Context, re } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebRedirectToHTTPS(tx, req.HttpWebId, req.RedirectToHTTPSJSON) if err != nil { @@ -481,7 +481,7 @@ func (this *HTTPWebService) UpdateHTTPWebRedirectToHTTPS(ctx context.Context, re // UpdateHTTPWebWebsocket 更改Websocket设置 func (this *HTTPWebService) UpdateHTTPWebWebsocket(ctx context.Context, req *pb.UpdateHTTPWebWebsocketRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -493,7 +493,7 @@ func (this *HTTPWebService) UpdateHTTPWebWebsocket(ctx context.Context, req *pb. } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebsocket(tx, req.HttpWebId, req.WebsocketJSON) if err != nil { @@ -505,7 +505,7 @@ func (this *HTTPWebService) UpdateHTTPWebWebsocket(ctx context.Context, req *pb. // UpdateHTTPWebFastcgi 更改Fastcgi设置 func (this *HTTPWebService) UpdateHTTPWebFastcgi(ctx context.Context, req *pb.UpdateHTTPWebFastcgiRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -517,7 +517,7 @@ func (this *HTTPWebService) UpdateHTTPWebFastcgi(ctx context.Context, req *pb.Up } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebFastcgi(tx, req.HttpWebId, req.FastcgiJSON) if err != nil { @@ -529,7 +529,7 @@ func (this *HTTPWebService) UpdateHTTPWebFastcgi(ctx context.Context, req *pb.Up // UpdateHTTPWebRewriteRules 更改重写规则设置 func (this *HTTPWebService) UpdateHTTPWebRewriteRules(ctx context.Context, req *pb.UpdateHTTPWebRewriteRulesRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -541,7 +541,7 @@ func (this *HTTPWebService) UpdateHTTPWebRewriteRules(ctx context.Context, req * } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebDAO.UpdateWebRewriteRules(tx, req.HttpWebId, req.RewriteRulesJSON) if err != nil { @@ -553,7 +553,7 @@ func (this *HTTPWebService) UpdateHTTPWebRewriteRules(ctx context.Context, req * // UpdateHTTPWebHostRedirects 更改主机跳转设置 func (this *HTTPWebService) UpdateHTTPWebHostRedirects(ctx context.Context, req *pb.UpdateHTTPWebHostRedirectsRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -593,7 +593,7 @@ func (this *HTTPWebService) UpdateHTTPWebHostRedirects(ctx context.Context, req // FindHTTPWebHostRedirects 查找主机跳转设置 func (this *HTTPWebService) FindHTTPWebHostRedirects(ctx context.Context, req *pb.FindHTTPWebHostRedirectsRequest) (*pb.FindHTTPWebHostRedirectsResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -616,7 +616,7 @@ func (this *HTTPWebService) FindHTTPWebHostRedirects(ctx context.Context, req *p // UpdateHTTPWebAuth 更改认证设置 func (this *HTTPWebService) UpdateHTTPWebAuth(ctx context.Context, req *pb.UpdateHTTPWebAuthRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -639,7 +639,7 @@ func (this *HTTPWebService) UpdateHTTPWebAuth(ctx context.Context, req *pb.Updat // UpdateHTTPWebCommon 更改通用设置 func (this *HTTPWebService) UpdateHTTPWebCommon(ctx context.Context, req *pb.UpdateHTTPWebCommonRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_websocket.go b/internal/rpc/services/service_http_websocket.go index f34a6412..c3b4dad9 100644 --- a/internal/rpc/services/service_http_websocket.go +++ b/internal/rpc/services/service_http_websocket.go @@ -13,12 +13,12 @@ type HTTPWebsocketService struct { // 创建Websocket配置 func (this *HTTPWebsocketService) CreateHTTPWebsocket(ctx context.Context, req *pb.CreateHTTPWebsocketRequest) (*pb.CreateHTTPWebsocketResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() websocketId, err := models.SharedHTTPWebsocketDAO.CreateWebsocket(tx, req.HandshakeTimeoutJSON, req.AllowAllOrigins, req.AllowedOrigins, req.RequestSameOrigin, req.RequestOrigin) if err != nil { @@ -30,14 +30,14 @@ func (this *HTTPWebsocketService) CreateHTTPWebsocket(ctx context.Context, req * // 修改Websocket配置 func (this *HTTPWebsocketService) UpdateHTTPWebsocket(ctx context.Context, req *pb.UpdateHTTPWebsocketRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } // TODO 用户不能修改别人的WebSocket设置 - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPWebsocketDAO.UpdateWebsocket(tx, req.WebsocketId, req.HandshakeTimeoutJSON, req.AllowAllOrigins, req.AllowedOrigins, req.RequestSameOrigin, req.RequestOrigin) if err != nil { diff --git a/internal/rpc/services/service_ip_item.go b/internal/rpc/services/service_ip_item.go index 81c75a57..4ace9e1a 100644 --- a/internal/rpc/services/service_ip_item.go +++ b/internal/rpc/services/service_ip_item.go @@ -41,7 +41,7 @@ func (this *IPItemService) CreateIPItem(ctx context.Context, req *pb.CreateIPIte } } - tx := this.NullTx() + var tx = this.NullTx() if userType == rpcutils.UserTypeUser { if userId <= 0 { @@ -75,12 +75,12 @@ func (this *IPItemService) CreateIPItem(ctx context.Context, req *pb.CreateIPIte // UpdateIPItem 修改IP func (this *IPItemService) UpdateIPItem(ctx context.Context, req *pb.UpdateIPItemRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { listId, err := models.SharedIPItemDAO.FindItemListId(tx, req.IpItemId) @@ -109,7 +109,7 @@ func (this *IPItemService) UpdateIPItem(ctx context.Context, req *pb.UpdateIPIte // DeleteIPItem 删除IP func (this *IPItemService) DeleteIPItem(ctx context.Context, req *pb.DeleteIPItemRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -162,7 +162,7 @@ func (this *IPItemService) DeleteIPItems(ctx context.Context, req *pb.DeleteIPIt return nil, err } - tx := this.NullTx() + var tx = this.NullTx() for _, itemId := range req.IpItemIds { err = models.SharedIPItemDAO.DisableIPItem(tx, itemId) if err != nil { @@ -175,12 +175,12 @@ func (this *IPItemService) DeleteIPItems(ctx context.Context, req *pb.DeleteIPIt // CountIPItemsWithListId 计算IP数量 func (this *IPItemService) CountIPItemsWithListId(ctx context.Context, req *pb.CountIPItemsWithListIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedIPListDAO.CheckUserIPList(tx, userId, req.IpListId) @@ -199,12 +199,12 @@ func (this *IPItemService) CountIPItemsWithListId(ctx context.Context, req *pb.C // ListIPItemsWithListId 列出单页的IP func (this *IPItemService) ListIPItemsWithListId(ctx context.Context, req *pb.ListIPItemsWithListIdRequest) (*pb.ListIPItemsWithListIdResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedIPListDAO.CheckUserIPList(tx, userId, req.IpListId) @@ -309,12 +309,12 @@ func (this *IPItemService) ListIPItemsWithListId(ctx context.Context, req *pb.Li // FindEnabledIPItem 查找单个IP func (this *IPItemService) FindEnabledIPItem(ctx context.Context, req *pb.FindEnabledIPItemRequest) (*pb.FindEnabledIPItemResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() item, err := models.SharedIPItemDAO.FindEnabledIPItem(tx, req.IpItemId) if err != nil { @@ -358,7 +358,7 @@ func (this *IPItemService) ListIPItemsAfterVersion(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() result := []*pb.IPItem{} items, err := models.SharedIPItemDAO.ListIPItemsAfterVersion(tx, req.Version, req.Size) @@ -428,7 +428,7 @@ func (this *IPItemService) CheckIPItemStatus(ctx context.Context, req *pb.CheckI } ipLong := utils.IP2Long(req.Ip) - tx := this.NullTx() + var tx = this.NullTx() // 名单类型 list, err := models.SharedIPListDAO.FindEnabledIPList(tx, req.IpListId, nil) diff --git a/internal/rpc/services/service_ip_library.go b/internal/rpc/services/service_ip_library.go index 0c6d33ab..7ec56af3 100644 --- a/internal/rpc/services/service_ip_library.go +++ b/internal/rpc/services/service_ip_library.go @@ -22,7 +22,7 @@ func (this *IPLibraryService) CreateIPLibrary(ctx context.Context, req *pb.Creat return nil, err } - tx := this.NullTx() + var tx = this.NullTx() ipLibraryId, err := models.SharedIPLibraryDAO.CreateIPLibrary(tx, req.Type, req.FileId) if err != nil { @@ -42,7 +42,7 @@ func (this *IPLibraryService) FindEnabledIPLibrary(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() ipLibrary, err := models.SharedIPLibraryDAO.FindEnabledIPLibrary(tx, req.IpLibraryId) if err != nil { @@ -84,7 +84,7 @@ func (this *IPLibraryService) FindLatestIPLibraryWithType(ctx context.Context, r return nil, err } - tx := this.NullTx() + var tx = this.NullTx() ipLibrary, err := models.SharedIPLibraryDAO.FindLatestIPLibraryWithType(tx, req.Type) if err != nil { @@ -126,7 +126,7 @@ func (this *IPLibraryService) FindAllEnabledIPLibrariesWithType(ctx context.Cont return nil, err } - tx := this.NullTx() + var tx = this.NullTx() ipLibraries, err := models.SharedIPLibraryDAO.FindAllEnabledIPLibrariesWithType(tx, req.Type) if err != nil { @@ -166,7 +166,7 @@ func (this *IPLibraryService) DeleteIPLibrary(ctx context.Context, req *pb.Delet return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedIPLibraryDAO.DisableIPLibrary(tx, req.IpLibraryId) if err != nil { @@ -178,7 +178,7 @@ func (this *IPLibraryService) DeleteIPLibrary(ctx context.Context, req *pb.Delet // LookupIPRegion 查询某个IP信息 func (this *IPLibraryService) LookupIPRegion(ctx context.Context, req *pb.LookupIPRegionRequest) (*pb.LookupIPRegionResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -191,7 +191,7 @@ func (this *IPLibraryService) LookupIPRegion(ctx context.Context, req *pb.Lookup return &pb.LookupIPRegionResponse{IpRegion: nil}, nil } - tx := this.NullTx() + var tx = this.NullTx() countryId, err := regions.SharedRegionCountryDAO.FindCountryIdWithNameCacheable(tx, result.Country) if err != nil { @@ -218,7 +218,7 @@ func (this *IPLibraryService) LookupIPRegion(ctx context.Context, req *pb.Lookup // LookupIPRegions 查询一组IP信息 func (this *IPLibraryService) LookupIPRegions(ctx context.Context, req *pb.LookupIPRegionsRequest) (*pb.LookupIPRegionsResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_ip_list.go b/internal/rpc/services/service_ip_list.go index 2e449ad1..b346360d 100644 --- a/internal/rpc/services/service_ip_list.go +++ b/internal/rpc/services/service_ip_list.go @@ -16,7 +16,7 @@ type IPListService struct { // CreateIPList 创建IP列表 func (this *IPListService) CreateIPList(ctx context.Context, req *pb.CreateIPListRequest) (*pb.CreateIPListResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -49,7 +49,7 @@ func (this *IPListService) UpdateIPList(ctx context.Context, req *pb.UpdateIPLis return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedIPListDAO.UpdateIPList(tx, req.IpListId, req.Name, req.Code, req.TimeoutJSON, req.Description) if err != nil { @@ -61,7 +61,7 @@ func (this *IPListService) UpdateIPList(ctx context.Context, req *pb.UpdateIPLis // FindEnabledIPList 查找IP列表 func (this *IPListService) FindEnabledIPList(ctx context.Context, req *pb.FindEnabledIPListRequest) (*pb.FindEnabledIPListResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_log.go b/internal/rpc/services/service_log.go index 386aa4ea..c811d253 100644 --- a/internal/rpc/services/service_log.go +++ b/internal/rpc/services/service_log.go @@ -20,7 +20,7 @@ func (this *LogService) CreateLog(ctx context.Context, req *pb.CreateLogRequest) return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedLogDAO.CreateLog(tx, userType, userId, req.Level, req.Description, req.Action, req.Ip) if err != nil { @@ -37,7 +37,7 @@ func (this *LogService) CountLogs(ctx context.Context, req *pb.CountLogRequest) return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedLogDAO.CountLogs(tx, req.DayFrom, req.DayTo, req.Keyword, req.UserType) if err != nil { @@ -54,7 +54,7 @@ func (this *LogService) ListLogs(ctx context.Context, req *pb.ListLogsRequest) ( return nil, err } - tx := this.NullTx() + var tx = this.NullTx() logs, err := models.SharedLogDAO.ListLogs(tx, req.Offset, req.Size, req.DayFrom, req.DayTo, req.Keyword, req.UserType) if err != nil { @@ -103,7 +103,7 @@ func (this *LogService) DeleteLogPermanently(ctx context.Context, req *pb.Delete // TODO 校验权限 - tx := this.NullTx() + var tx = this.NullTx() // 执行物理删除 err = models.SharedLogDAO.DeleteLogPermanently(tx, req.LogId) @@ -123,7 +123,7 @@ func (this *LogService) DeleteLogsPermanently(ctx context.Context, req *pb.Delet // TODO 校验权限 - tx := this.NullTx() + var tx = this.NullTx() // 执行物理删除 for _, logId := range req.LogIds { @@ -145,7 +145,7 @@ func (this *LogService) CleanLogsPermanently(ctx context.Context, req *pb.CleanL // TODO 校验权限 - tx := this.NullTx() + var tx = this.NullTx() if req.ClearAll { err = models.SharedLogDAO.DeleteAllLogsPermanently(tx) diff --git a/internal/rpc/services/service_login.go b/internal/rpc/services/service_login.go index 080eeffd..4ace362a 100644 --- a/internal/rpc/services/service_login.go +++ b/internal/rpc/services/service_login.go @@ -21,7 +21,7 @@ func (this *LoginService) FindEnabledLogin(ctx context.Context, req *pb.FindEnab return nil, err } - tx := this.NullTx() + var tx = this.NullTx() login, err := models.SharedLoginDAO.FindEnabledLoginWithAdminId(tx, req.AdminId, req.Type) if err != nil { @@ -51,7 +51,7 @@ func (this *LoginService) UpdateLogin(ctx context.Context, req *pb.UpdateLoginRe return nil, errors.New("'login' should not be nil") } - tx := this.NullTx() + var tx = this.NullTx() if req.Login.IsOn { params := maps.Map{} diff --git a/internal/rpc/services/service_message.go b/internal/rpc/services/service_message.go index ae52e617..53d460b3 100644 --- a/internal/rpc/services/service_message.go +++ b/internal/rpc/services/service_message.go @@ -15,12 +15,12 @@ type MessageService struct { // CountUnreadMessages 计算未读消息数 func (this *MessageService) CountUnreadMessages(ctx context.Context, req *pb.CountUnreadMessagesRequest) (*pb.RPCCountResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedMessageDAO.CountUnreadMessages(tx, adminId, userId) if err != nil { @@ -32,12 +32,12 @@ func (this *MessageService) CountUnreadMessages(ctx context.Context, req *pb.Cou // ListUnreadMessages 列出单页未读消息 func (this *MessageService) ListUnreadMessages(ctx context.Context, req *pb.ListUnreadMessagesRequest) (*pb.ListUnreadMessagesResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() messages, err := models.SharedMessageDAO.ListUnreadMessages(tx, adminId, userId, req.Offset, req.Size) if err != nil { @@ -122,12 +122,12 @@ func (this *MessageService) ListUnreadMessages(ctx context.Context, req *pb.List // UpdateMessageRead 设置消息已读状态 func (this *MessageService) UpdateMessageRead(ctx context.Context, req *pb.UpdateMessageReadRequest) (*pb.RPCSuccess, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 校验权限 exists, err := models.SharedMessageDAO.CheckMessageUser(tx, req.MessageId, adminId, userId) @@ -148,12 +148,12 @@ func (this *MessageService) UpdateMessageRead(ctx context.Context, req *pb.Updat // UpdateMessagesRead 设置一组消息已读状态 func (this *MessageService) UpdateMessagesRead(ctx context.Context, req *pb.UpdateMessagesReadRequest) (*pb.RPCSuccess, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 校验权限 for _, messageId := range req.MessageIds { @@ -177,12 +177,12 @@ func (this *MessageService) UpdateMessagesRead(ctx context.Context, req *pb.Upda func (this *MessageService) UpdateAllMessagesRead(ctx context.Context, req *pb.UpdateAllMessagesReadRequest) (*pb.RPCSuccess, error) { // 校验请求 // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedMessageDAO.UpdateAllMessagesRead(tx, adminId, userId) if err != nil { diff --git a/internal/rpc/services/service_monitor_node.go b/internal/rpc/services/service_monitor_node.go index 935ce151..7083e00a 100644 --- a/internal/rpc/services/service_monitor_node.go +++ b/internal/rpc/services/service_monitor_node.go @@ -20,7 +20,7 @@ func (this *MonitorNodeService) CreateMonitorNode(ctx context.Context, req *pb.C return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodeId, err := models.SharedMonitorNodeDAO.CreateMonitorNode(tx, req.Name, req.Description, req.IsOn) if err != nil { @@ -37,7 +37,7 @@ func (this *MonitorNodeService) UpdateMonitorNode(ctx context.Context, req *pb.U return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedMonitorNodeDAO.UpdateMonitorNode(tx, req.MonitorNodeId, req.Name, req.Description, req.IsOn) if err != nil { @@ -54,7 +54,7 @@ func (this *MonitorNodeService) DeleteMonitorNode(ctx context.Context, req *pb.D return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedMonitorNodeDAO.DisableMonitorNode(tx, req.MonitorNodeId) if err != nil { @@ -71,7 +71,7 @@ func (this *MonitorNodeService) FindAllEnabledMonitorNodes(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedMonitorNodeDAO.FindAllEnabledMonitorNodes(tx) if err != nil { @@ -100,7 +100,7 @@ func (this *MonitorNodeService) CountAllEnabledMonitorNodes(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedMonitorNodeDAO.CountAllEnabledMonitorNodes(tx) if err != nil { @@ -117,7 +117,7 @@ func (this *MonitorNodeService) ListEnabledMonitorNodes(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedMonitorNodeDAO.ListEnabledMonitorNodes(tx, req.Offset, req.Size) if err != nil { @@ -147,7 +147,7 @@ func (this *MonitorNodeService) FindEnabledMonitorNode(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedMonitorNodeDAO.FindEnabledMonitorNode(tx, req.MonitorNodeId) if err != nil { @@ -176,7 +176,7 @@ func (this *MonitorNodeService) FindCurrentMonitorNode(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() md, ok := metadata.FromIncomingContext(ctx) if !ok { @@ -223,7 +223,7 @@ func (this *MonitorNodeService) UpdateMonitorNodeStatus(ctx context.Context, req return nil, errors.New("'nodeId' should be greater than 0") } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedMonitorNodeDAO.UpdateNodeStatus(tx, nodeId, req.StatusJSON) if err != nil { diff --git a/internal/rpc/services/service_node.go b/internal/rpc/services/service_node.go index 3b511e40..fa7663f8 100644 --- a/internal/rpc/services/service_node.go +++ b/internal/rpc/services/service_node.go @@ -52,7 +52,7 @@ func (this *NodeService) CreateNode(ctx context.Context, req *pb.CreateNodeReque return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodeId, err := models.SharedNodeDAO.CreateNode(tx, adminId, req.Name, req.NodeClusterId, req.NodeGroupId, req.NodeRegionId) if err != nil { @@ -103,7 +103,7 @@ func (this *NodeService) RegisterClusterNode(ctx context.Context, req *pb.Regist return nil, err } - tx := this.NullTx() + var tx = this.NullTx() adminId, err := models.SharedNodeClusterDAO.FindClusterAdminId(tx, clusterId) if err != nil { @@ -148,7 +148,7 @@ func (this *NodeService) CountAllEnabledNodes(ctx context.Context, req *pb.Count return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeDAO.CountAllEnabledNodes(tx) if err != nil { @@ -165,7 +165,7 @@ func (this *NodeService) CountAllEnabledNodesMatch(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeDAO.CountAllEnabledNodesMatch(tx, req.NodeClusterId, configutils.ToBoolState(req.InstallState), configutils.ToBoolState(req.ActiveState), req.Keyword, req.NodeGroupId, req.NodeRegionId, req.Level, true) if err != nil { @@ -181,7 +181,7 @@ func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.List return nil, err } - tx := this.NullTx() + var tx = this.NullTx() var dnsDomainId = int64(0) var domainRoutes = []*dnstypes.Route{} @@ -389,7 +389,7 @@ func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.List // FindAllEnabledNodesWithNodeClusterId 查找一个集群下的所有节点 func (this *NodeService) FindAllEnabledNodesWithNodeClusterId(ctx context.Context, req *pb.FindAllEnabledNodesWithNodeClusterIdRequest) (*pb.FindAllEnabledNodesWithNodeClusterIdResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -398,7 +398,7 @@ func (this *NodeService) FindAllEnabledNodesWithNodeClusterId(ctx context.Contex // TODO 检查权限 } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedNodeDAO.FindAllEnabledNodesWithClusterId(tx, req.NodeClusterId, req.IncludeSecondary) if err != nil { @@ -434,7 +434,7 @@ func (this *NodeService) DeleteNode(ctx context.Context, req *pb.DeleteNodeReque return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeDAO.DisableNode(tx, req.NodeId) if err != nil { @@ -457,7 +457,7 @@ func (this *NodeService) DeleteNodeFromNodeCluster(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeDAO.DeleteNodeFromCluster(tx, req.NodeId, req.NodeClusterId) if err != nil { return nil, err @@ -473,7 +473,7 @@ func (this *NodeService) UpdateNode(ctx context.Context, req *pb.UpdateNodeReque return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeDAO.UpdateNode(tx, req.NodeId, req.Name, req.NodeClusterId, req.SecondaryNodeClusterIds, req.NodeGroupId, req.NodeRegionId, req.IsOn, int(req.Level)) if err != nil { @@ -490,7 +490,7 @@ func (this *NodeService) FindEnabledNode(ctx context.Context, req *pb.FindEnable return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedNodeDAO.FindEnabledNode(tx, req.NodeId) if err != nil { @@ -684,7 +684,7 @@ func (this *NodeService) FindEnabledBasicNode(ctx context.Context, req *pb.FindE return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedNodeDAO.FindEnabledBasicNode(tx, req.NodeId) if err != nil { return nil, err @@ -719,7 +719,7 @@ func (this *NodeService) FindCurrentNodeConfig(ctx context.Context, req *pb.Find return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查版本号 currentVersion, err := models.SharedNodeDAO.FindNodeVersion(tx, nodeId) @@ -813,7 +813,7 @@ func (this *NodeService) UpdateNodeIsInstalled(ctx context.Context, req *pb.Upda return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeDAO.UpdateNodeIsInstalled(tx, req.NodeId, req.IsInstalled) if err != nil { @@ -849,7 +849,7 @@ func (this *NodeService) UpgradeNode(ctx context.Context, req *pb.UpgradeNodeReq return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeDAO.UpdateNodeIsInstalled(tx, req.NodeId, false) if err != nil { @@ -927,7 +927,7 @@ func (this *NodeService) UpdateNodeConnectedAPINodes(ctx context.Context, req *p return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeDAO.UpdateNodeConnectedAPINodes(tx, nodeId, req.ApiNodeIds) if err != nil { @@ -945,7 +945,7 @@ func (this *NodeService) CountAllEnabledNodesWithNodeGrantId(ctx context.Context return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeDAO.CountAllEnabledNodesWithGrantId(tx, req.NodeGrantId) if err != nil { @@ -962,7 +962,7 @@ func (this *NodeService) FindAllEnabledNodesWithNodeGrantId(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedNodeDAO.FindAllEnabledNodesWithGrantId(tx, req.NodeGrantId) if err != nil { @@ -1000,7 +1000,7 @@ func (this *NodeService) CountAllNotInstalledNodesWithNodeClusterId(ctx context. if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeDAO.CountAllNotInstalledNodesWithClusterId(tx, req.NodeClusterId) if err != nil { return nil, err @@ -1015,7 +1015,7 @@ func (this *NodeService) FindAllNotInstalledNodesWithNodeClusterId(ctx context.C return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedNodeDAO.FindAllNotInstalledNodesWithClusterId(tx, req.NodeClusterId) if err != nil { @@ -1098,7 +1098,7 @@ func (this *NodeService) CountAllUpgradeNodesWithNodeClusterId(ctx context.Conte return nil, err } - tx := this.NullTx() + var tx = this.NullTx() var deployFiles = installers.SharedDeployManager.LoadNodeFiles() total := int64(0) @@ -1121,7 +1121,7 @@ func (this *NodeService) FindAllUpgradeNodesWithNodeClusterId(ctx context.Contex return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 获取当前能升级到的最新版本 deployFiles := installers.SharedDeployManager.LoadNodeFiles() @@ -1227,7 +1227,7 @@ func (this *NodeService) FindNodeInstallStatus(ctx context.Context, req *pb.Find return nil, err } - tx := this.NullTx() + var tx = this.NullTx() installStatus, err := models.SharedNodeDAO.FindNodeInstallStatus(tx, req.NodeId) if err != nil { @@ -1256,7 +1256,7 @@ func (this *NodeService) UpdateNodeLogin(ctx context.Context, req *pb.UpdateNode return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if req.NodeLogin.Id <= 0 { _, err := models.SharedNodeLoginDAO.CreateNodeLogin(tx, nodeconfigs.NodeRoleNode, req.NodeId, req.NodeLogin.Name, req.NodeLogin.Type, req.NodeLogin.Params) @@ -1278,7 +1278,7 @@ func (this *NodeService) CountAllEnabledNodesWithNodeGroupId(ctx context.Context return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeDAO.CountAllEnabledNodesWithGroupId(tx, req.NodeGroupId) if err != nil { @@ -1295,7 +1295,7 @@ func (this *NodeService) FindAllEnabledNodesDNSWithNodeClusterId(ctx context.Con return nil, err } - tx := this.NullTx() + var tx = this.NullTx() clusterDNS, err := models.SharedNodeClusterDAO.FindClusterDNSInfo(tx, req.NodeClusterId, nil) if err != nil { @@ -1368,7 +1368,7 @@ func (this *NodeService) FindEnabledNodeDNS(ctx context.Context, req *pb.FindEna return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedNodeDAO.FindEnabledNodeDNS(tx, req.NodeId) if err != nil { @@ -1444,7 +1444,7 @@ func (this *NodeService) UpdateNodeDNS(ctx context.Context, req *pb.UpdateNodeDN return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedNodeDAO.FindEnabledNodeDNS(tx, req.NodeId) if err != nil { @@ -1527,7 +1527,7 @@ func (this *NodeService) CountAllEnabledNodesWithNodeRegionId(ctx context.Contex return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeDAO.CountAllEnabledNodesWithRegionId(tx, req.NodeRegionId) if err != nil { @@ -1543,7 +1543,7 @@ func (this *NodeService) FindEnabledNodesWithIds(ctx context.Context, req *pb.Fi return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedNodeDAO.FindEnabledNodesWithIds(tx, req.NodeIds) if err != nil { diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go index f750d120..cb3c9e42 100644 --- a/internal/rpc/services/service_node_cluster.go +++ b/internal/rpc/services/service_node_cluster.go @@ -82,7 +82,7 @@ func (this *NodeClusterService) UpdateNodeCluster(ctx context.Context, req *pb.U return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeClusterDAO.UpdateCluster(tx, req.NodeClusterId, req.Name, req.NodeGrantId, req.InstallDir, req.TimeZone, req.NodeMaxThreads, req.AutoOpenPorts) if err != nil { @@ -103,7 +103,7 @@ func (this *NodeClusterService) DeleteNodeCluster(ctx context.Context, req *pb.D return this.Success() } - tx := this.NullTx() + var tx = this.NullTx() // 转移节点 err = models.SharedNodeDAO.TransferPrimaryClusterNodes(tx, req.NodeClusterId) @@ -128,7 +128,7 @@ func (this *NodeClusterService) DeleteNodeCluster(ctx context.Context, req *pb.D // FindEnabledNodeCluster 查找单个集群 func (this *NodeClusterService) FindEnabledNodeCluster(ctx context.Context, req *pb.FindEnabledNodeClusterRequest) (*pb.FindEnabledNodeClusterResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -137,7 +137,7 @@ func (this *NodeClusterService) FindEnabledNodeCluster(ctx context.Context, req // TODO 检查用户是否有权限 } - tx := this.NullTx() + var tx = this.NullTx() cluster, err := models.SharedNodeClusterDAO.FindEnabledNodeCluster(tx, req.NodeClusterId) if err != nil { @@ -175,7 +175,7 @@ func (this *NodeClusterService) FindAPINodesWithNodeCluster(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() cluster, err := models.SharedNodeClusterDAO.FindEnabledNodeCluster(tx, req.NodeClusterId) if err != nil { @@ -229,7 +229,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClusters(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() clusters, err := models.SharedNodeClusterDAO.FindAllEnableClusters(tx) if err != nil { @@ -260,7 +260,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClusters(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeClusterDAO.CountAllEnabledClusters(tx, req.Keyword) if err != nil { @@ -277,7 +277,7 @@ func (this *NodeClusterService) ListEnabledNodeClusters(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() clusters, err := models.SharedNodeClusterDAO.ListEnabledClusters(tx, req.Keyword, req.Offset, req.Size) if err != nil { @@ -337,7 +337,7 @@ func (this *NodeClusterService) UpdateNodeClusterHealthCheck(ctx context.Context return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeClusterDAO.UpdateClusterHealthCheck(tx, req.NodeClusterId, req.HealthCheckJSON) if err != nil { @@ -383,7 +383,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClustersWithNodeGrantId(ctx c return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeClusterDAO.CountAllEnabledClustersWithGrantId(tx, req.NodeGrantId) if err != nil { @@ -400,7 +400,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithNodeGrantId(ctx co return nil, err } - tx := this.NullTx() + var tx = this.NullTx() clusters, err := models.SharedNodeClusterDAO.FindAllEnabledClustersWithGrantId(tx, req.NodeGrantId) if err != nil { @@ -424,7 +424,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithNodeGrantId(ctx co // FindEnabledNodeClusterDNS 查找集群的DNS配置 func (this *NodeClusterService) FindEnabledNodeClusterDNS(ctx context.Context, req *pb.FindEnabledNodeClusterDNSRequest) (*pb.FindEnabledNodeClusterDNSResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -625,7 +625,7 @@ func (this *NodeClusterService) CheckNodeClusterDNSChanges(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() cluster, err := models.SharedNodeClusterDAO.FindClusterDNSInfo(tx, req.NodeClusterId, nil) if err != nil { @@ -672,7 +672,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterTOA(ctx context.Context, r // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedNodeClusterDAO.FindClusterTOAConfig(tx, req.NodeClusterId, nil) if err != nil { @@ -694,7 +694,7 @@ func (this *NodeClusterService) UpdateNodeClusterTOA(ctx context.Context, req *p // TODO 检查权限 - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeClusterDAO.UpdateClusterTOA(tx, req.NodeClusterId, req.ToaJSON) if err != nil { @@ -711,7 +711,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClustersWithHTTPCachePolicyId return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeClusterDAO.CountAllEnabledNodeClustersWithHTTPCachePolicyId(tx, req.HttpCachePolicyId) if err != nil { @@ -727,7 +727,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithHTTPCachePolicyId( return nil, err } - tx := this.NullTx() + var tx = this.NullTx() result := []*pb.NodeCluster{} clusters, err := models.SharedNodeClusterDAO.FindAllEnabledNodeClustersWithHTTPCachePolicyId(tx, req.HttpCachePolicyId) @@ -753,7 +753,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClustersWithHTTPFirewallPolic return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeClusterDAO.CountAllEnabledNodeClustersWithHTTPFirewallPolicyId(tx, req.HttpFirewallPolicyId) if err != nil { @@ -769,7 +769,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithHTTPFirewallPolicy return nil, err } - tx := this.NullTx() + var tx = this.NullTx() result := []*pb.NodeCluster{} clusters, err := models.SharedNodeClusterDAO.FindAllEnabledNodeClustersWithHTTPFirewallPolicyId(tx, req.HttpFirewallPolicyId) @@ -795,7 +795,7 @@ func (this *NodeClusterService) UpdateNodeClusterHTTPCachePolicyId(ctx context.C return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeClusterDAO.UpdateNodeClusterHTTPCachePolicyId(tx, req.NodeClusterId, req.HttpCachePolicyId) if err != nil { @@ -812,7 +812,7 @@ func (this *NodeClusterService) UpdateNodeClusterHTTPFirewallPolicyId(ctx contex return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeClusterDAO.UpdateNodeClusterHTTPFirewallPolicyId(tx, req.NodeClusterId, req.HttpFirewallPolicyId) if err != nil { @@ -837,7 +837,7 @@ func (this *NodeClusterService) UpdateNodeClusterSystemService(ctx context.Conte } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeClusterDAO.UpdateNodeClusterSystemService(tx, req.NodeClusterId, req.Type, params) if err != nil { return nil, err @@ -853,7 +853,7 @@ func (this *NodeClusterService) FindNodeClusterSystemService(ctx context.Context return nil, err } - tx := this.NullTx() + var tx = this.NullTx() params, err := models.SharedNodeClusterDAO.FindNodeClusterSystemServiceParams(tx, req.NodeClusterId, req.Type) if err != nil { return nil, err @@ -870,7 +870,7 @@ func (this *NodeClusterService) FindNodeClusterSystemService(ctx context.Context // FindFreePortInNodeCluster 获取集群中可以使用的端口 func (this *NodeClusterService) FindFreePortInNodeCluster(ctx context.Context, req *pb.FindFreePortInNodeClusterRequest) (*pb.FindFreePortInNodeClusterResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -928,7 +928,7 @@ func (this *NodeClusterService) FindFreePortInNodeCluster(ctx context.Context, r // CheckPortIsUsingInNodeCluster 检查端口是否已经被使用 func (this *NodeClusterService) CheckPortIsUsingInNodeCluster(ctx context.Context, req *pb.CheckPortIsUsingInNodeClusterRequest) (*pb.CheckPortIsUsingInNodeClusterResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1092,7 +1092,7 @@ func (this *NodeClusterService) UpdateNodeClusterPinned(ctx context.Context, req // FindEnabledNodeClusterWebPPolicy 读取集群WebP策略 func (this *NodeClusterService) FindEnabledNodeClusterWebPPolicy(ctx context.Context, req *pb.FindEnabledNodeClusterWebPPolicyRequest) (*pb.FindEnabledNodeClusterWebPPolicyResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1139,7 +1139,7 @@ func (this *NodeClusterService) UpdateNodeClusterWebPPolicy(ctx context.Context, // FindEnabledNodeClusterUAMPolicy 读取集群UAM策略 func (this *NodeClusterService) FindEnabledNodeClusterUAMPolicy(ctx context.Context, req *pb.FindEnabledNodeClusterUAMPolicyRequest) (*pb.FindEnabledNodeClusterUAMPolicyResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_grant.go b/internal/rpc/services/service_node_grant.go index 8d967b58..65891175 100644 --- a/internal/rpc/services/service_node_grant.go +++ b/internal/rpc/services/service_node_grant.go @@ -24,7 +24,7 @@ func (this *NodeGrantService) CreateNodeGrant(ctx context.Context, req *pb.Creat return nil, err } - tx := this.NullTx() + var tx = this.NullTx() grantId, err := models.SharedNodeGrantDAO.CreateGrant(tx, adminId, req.Name, req.Method, req.Username, req.Password, req.PrivateKey, req.Passphrase, req.Description, req.NodeId, req.Su) if err != nil { @@ -46,7 +46,7 @@ func (this *NodeGrantService) UpdateNodeGrant(ctx context.Context, req *pb.Updat return nil, errors.New("wrong grantId") } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeGrantDAO.UpdateGrant(tx, req.NodeGrantId, req.Name, req.Method, req.Username, req.Password, req.PrivateKey, req.Passphrase, req.Description, req.NodeId, req.Su) return this.Success() @@ -59,7 +59,7 @@ func (this *NodeGrantService) DisableNodeGrant(ctx context.Context, req *pb.Disa return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeGrantDAO.DisableNodeGrant(tx, req.NodeGrantId) return &pb.DisableNodeGrantResponse{}, err @@ -72,7 +72,7 @@ func (this *NodeGrantService) CountAllEnabledNodeGrants(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeGrantDAO.CountAllEnabledGrants(tx, req.Keyword) if err != nil { @@ -88,7 +88,7 @@ func (this *NodeGrantService) ListEnabledNodeGrants(ctx context.Context, req *pb return nil, err } - tx := this.NullTx() + var tx = this.NullTx() grants, err := models.SharedNodeGrantDAO.ListEnabledGrants(tx, req.Keyword, req.Offset, req.Size) if err != nil { diff --git a/internal/rpc/services/service_node_group.go b/internal/rpc/services/service_node_group.go index a1aa0a7c..a6484adc 100644 --- a/internal/rpc/services/service_node_group.go +++ b/internal/rpc/services/service_node_group.go @@ -19,7 +19,7 @@ func (this *NodeGroupService) CreateNodeGroup(ctx context.Context, req *pb.Creat return nil, err } - tx := this.NullTx() + var tx = this.NullTx() groupId, err := models.SharedNodeGroupDAO.CreateNodeGroup(tx, req.NodeClusterId, req.Name) if err != nil { @@ -36,7 +36,7 @@ func (this *NodeGroupService) UpdateNodeGroup(ctx context.Context, req *pb.Updat return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeGroupDAO.UpdateNodeGroup(tx, req.NodeGroupId, req.Name) if err != nil { @@ -54,7 +54,7 @@ func (this *NodeGroupService) DeleteNodeGroup(ctx context.Context, req *pb.Delet return nil, err } - tx := this.NullTx() + var tx = this.NullTx() _, err = models.SharedNodeGroupDAO.DisableNodeGroup(tx, req.NodeGroupId) if err != nil { @@ -72,7 +72,7 @@ func (this *NodeGroupService) FindAllEnabledNodeGroupsWithNodeClusterId(ctx cont return nil, err } - tx := this.NullTx() + var tx = this.NullTx() groups, err := models.SharedNodeGroupDAO.FindAllEnabledGroupsWithClusterId(tx, req.NodeClusterId) if err != nil { @@ -96,7 +96,7 @@ func (this *NodeGroupService) UpdateNodeGroupOrders(ctx context.Context, req *pb return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeGroupDAO.UpdateGroupOrders(tx, req.NodeGroupIds) if err != nil { @@ -113,7 +113,7 @@ func (this *NodeGroupService) FindEnabledNodeGroup(ctx context.Context, req *pb. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() group, err := models.SharedNodeGroupDAO.FindEnabledNodeGroup(tx, req.NodeGroupId) if err != nil { diff --git a/internal/rpc/services/service_node_ip_address.go b/internal/rpc/services/service_node_ip_address.go index 393b8573..9f9f6a04 100644 --- a/internal/rpc/services/service_node_ip_address.go +++ b/internal/rpc/services/service_node_ip_address.go @@ -19,7 +19,7 @@ func (this *NodeIPAddressService) CreateNodeIPAddress(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() addressId, err := models.SharedNodeIPAddressDAO.CreateAddress(tx, adminId, req.NodeId, req.Role, req.Name, req.Ip, req.CanAccess, req.IsUp, 0) if err != nil { @@ -37,7 +37,7 @@ func (this *NodeIPAddressService) CreateNodeIPAddresses(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 创建分组 groupId, err := models.SharedNodeIPAddressGroupDAO.CreateGroup(tx, req.GroupValue, req.GroupValue) @@ -65,7 +65,7 @@ func (this *NodeIPAddressService) UpdateNodeIPAddress(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeIPAddressDAO.UpdateAddress(tx, adminId, req.NodeIPAddressId, req.Name, req.Ip, req.CanAccess, req.IsOn, req.IsUp) if err != nil { @@ -83,7 +83,7 @@ func (this *NodeIPAddressService) UpdateNodeIPAddressNodeId(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeIPAddressDAO.UpdateAddressNodeId(tx, req.NodeIPAddressId, req.NodeId) if err != nil { @@ -101,7 +101,7 @@ func (this *NodeIPAddressService) DisableNodeIPAddress(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeIPAddressDAO.DisableAddress(tx, req.NodeIPAddressId) if err != nil { @@ -119,7 +119,7 @@ func (this *NodeIPAddressService) DisableAllNodeIPAddressesWithNodeId(ctx contex return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeIPAddressDAO.DisableAllAddressesWithNodeId(tx, req.NodeId, req.Role) if err != nil { @@ -137,7 +137,7 @@ func (this *NodeIPAddressService) FindEnabledNodeIPAddress(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() address, err := models.SharedNodeIPAddressDAO.FindEnabledAddress(tx, req.NodeIPAddressId) if err != nil { @@ -174,7 +174,7 @@ func (this *NodeIPAddressService) FindAllEnabledNodeIPAddressesWithNodeId(ctx co return nil, err } - tx := this.NullTx() + var tx = this.NullTx() addresses, err := models.SharedNodeIPAddressDAO.FindAllEnabledAddressesWithNode(tx, req.NodeId, req.Role) if err != nil { diff --git a/internal/rpc/services/service_node_log.go b/internal/rpc/services/service_node_log.go index 1c42bc2f..45e669fa 100644 --- a/internal/rpc/services/service_node_log.go +++ b/internal/rpc/services/service_node_log.go @@ -21,7 +21,7 @@ func (this *NodeLogService) CreateNodeLogs(ctx context.Context, req *pb.CreateNo return nil, err } - tx := this.NullTx() + var tx = this.NullTx() for _, nodeLog := range req.NodeLogs { err := models.SharedNodeLogDAO.CreateLog(tx, nodeLog.Role, nodeLog.NodeId, nodeLog.ServerId, nodeLog.OriginId, nodeLog.Level, nodeLog.Tag, nodeLog.Description, nodeLog.CreatedAt, nodeLog.Type, nodeLog.ParamsJSON) @@ -39,7 +39,7 @@ func (this *NodeLogService) CountNodeLogs(ctx context.Context, req *pb.CountNode return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedNodeLogDAO.CountNodeLogs(tx, req.Role, req.NodeClusterId, req.NodeId, req.ServerId, req.OriginId, req.AllServers, req.DayFrom, req.DayTo, req.Keyword, req.Level, types.Int8(req.FixedState), req.IsUnread, req.Tag) if err != nil { @@ -55,7 +55,7 @@ func (this *NodeLogService) ListNodeLogs(ctx context.Context, req *pb.ListNodeLo return nil, err } - tx := this.NullTx() + var tx = this.NullTx() logs, err := models.SharedNodeLogDAO.ListNodeLogs(tx, req.Role, req.NodeClusterId, req.NodeId, req.ServerId, req.OriginId, req.AllServers, req.DayFrom, req.DayTo, req.Keyword, req.Level, types.Int8(req.FixedState), req.IsUnread, req.Tag, req.Offset, req.Size) if err != nil { diff --git a/internal/rpc/services/service_node_price_item.go b/internal/rpc/services/service_node_price_item.go index ca1164b7..ece31058 100644 --- a/internal/rpc/services/service_node_price_item.go +++ b/internal/rpc/services/service_node_price_item.go @@ -18,7 +18,7 @@ func (this *NodePriceItemService) CreateNodePriceItem(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() itemId, err := models.SharedNodePriceItemDAO.CreateItem(tx, req.Name, req.Type, req.BitsFrom, req.BitsTo) if err != nil { @@ -34,7 +34,7 @@ func (this *NodePriceItemService) UpdateNodePriceItem(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodePriceItemDAO.UpdateItem(tx, req.NodePriceItemId, req.Name, req.BitsFrom, req.BitsTo) if err != nil { @@ -50,7 +50,7 @@ func (this *NodePriceItemService) DeleteNodePriceItem(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodePriceItemDAO.DisableNodePriceItem(tx, req.NodePriceItemId) if err != nil { @@ -66,7 +66,7 @@ func (this *NodePriceItemService) FindAllEnabledNodePriceItems(ctx context.Conte return nil, err } - tx := this.NullTx() + var tx = this.NullTx() prices, err := models.SharedNodePriceItemDAO.FindAllEnabledRegionPrices(tx, req.Type) if err != nil { @@ -94,7 +94,7 @@ func (this *NodePriceItemService) FindAllEnabledAndOnNodePriceItems(ctx context. return nil, err } - tx := this.NullTx() + var tx = this.NullTx() prices, err := models.SharedNodePriceItemDAO.FindAllEnabledAndOnRegionPrices(tx, req.Type) if err != nil { @@ -122,7 +122,7 @@ func (this *NodePriceItemService) FindEnabledNodePriceItem(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() price, err := models.SharedNodePriceItemDAO.FindEnabledNodePriceItem(tx, req.NodePriceItemId) if err != nil { diff --git a/internal/rpc/services/service_node_region.go b/internal/rpc/services/service_node_region.go index 311faade..efa60c61 100644 --- a/internal/rpc/services/service_node_region.go +++ b/internal/rpc/services/service_node_region.go @@ -18,7 +18,7 @@ func (this *NodeRegionService) CreateNodeRegion(ctx context.Context, req *pb.Cre return nil, err } - tx := this.NullTx() + var tx = this.NullTx() regionId, err := models.SharedNodeRegionDAO.CreateRegion(tx, adminId, req.Name, req.Description) if err != nil { @@ -34,7 +34,7 @@ func (this *NodeRegionService) UpdateNodeRegion(ctx context.Context, req *pb.Upd return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeRegionDAO.UpdateRegion(tx, req.NodeRegionId, req.Name, req.Description, req.IsOn) if err != nil { @@ -50,7 +50,7 @@ func (this *NodeRegionService) DeleteNodeRegion(ctx context.Context, req *pb.Del return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeRegionDAO.DisableNodeRegion(tx, req.NodeRegionId) if err != nil { @@ -66,7 +66,7 @@ func (this *NodeRegionService) FindAllEnabledNodeRegions(ctx context.Context, re return nil, err } - tx := this.NullTx() + var tx = this.NullTx() regions, err := models.SharedNodeRegionDAO.FindAllEnabledRegions(tx) if err != nil { @@ -92,7 +92,7 @@ func (this *NodeRegionService) FindAllEnabledAndOnNodeRegions(ctx context.Contex return nil, err } - tx := this.NullTx() + var tx = this.NullTx() regions, err := models.SharedNodeRegionDAO.FindAllEnabledAndOnRegions(tx) if err != nil { @@ -118,7 +118,7 @@ func (this *NodeRegionService) UpdateNodeRegionOrders(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeRegionDAO.UpdateRegionOrders(tx, req.NodeRegionIds) if err != nil { @@ -134,7 +134,7 @@ func (this *NodeRegionService) FindEnabledNodeRegion(ctx context.Context, req *p return nil, err } - tx := this.NullTx() + var tx = this.NullTx() region, err := models.SharedNodeRegionDAO.FindEnabledNodeRegion(tx, req.NodeRegionId) if err != nil { @@ -159,7 +159,7 @@ func (this *NodeRegionService) UpdateNodeRegionPrice(ctx context.Context, req *p return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedNodeRegionDAO.UpdateRegionItemPrice(tx, req.NodeRegionId, req.NodeItemId, req.Price) if err != nil { diff --git a/internal/rpc/services/service_node_stream.go b/internal/rpc/services/service_node_stream.go index 7e2f69df..307f0576 100644 --- a/internal/rpc/services/service_node_stream.go +++ b/internal/rpc/services/service_node_stream.go @@ -112,7 +112,7 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro //logs.Println("[RPC]accepted node '" + numberutils.FormatInt64(nodeId) + "' connection") - tx := this.NullTx() + var tx = this.NullTx() // 标记为活跃状态 oldIsActive, err := models.SharedNodeDAO.FindNodeActive(tx, nodeId) @@ -222,7 +222,7 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro // SendCommandToNode 向节点发送命令 func (this *NodeService) SendCommandToNode(ctx context.Context, req *pb.NodeStreamMessage) (*pb.NodeStreamMessage, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_origin.go b/internal/rpc/services/service_origin.go index 7f4f0acc..13a3d7f8 100644 --- a/internal/rpc/services/service_origin.go +++ b/internal/rpc/services/service_origin.go @@ -18,7 +18,7 @@ type OriginService struct { // CreateOrigin 创建源站 func (this *OriginService) CreateOrigin(ctx context.Context, req *pb.CreateOriginRequest) (*pb.CreateOriginResponse, error) { - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -32,7 +32,7 @@ func (this *OriginService) CreateOrigin(ctx context.Context, req *pb.CreateOrigi "host": req.Addr.Host, } - tx := this.NullTx() + var tx = this.NullTx() // 校验参数 var connTimeout = &shared.TimeDuration{} @@ -82,7 +82,7 @@ func (this *OriginService) CreateOrigin(ctx context.Context, req *pb.CreateOrigi // UpdateOrigin 修改源站 func (this *OriginService) UpdateOrigin(ctx context.Context, req *pb.UpdateOriginRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -152,7 +152,7 @@ func (this *OriginService) UpdateOrigin(ctx context.Context, req *pb.UpdateOrigi // FindEnabledOrigin 查找单个源站信息 func (this *OriginService) FindEnabledOrigin(ctx context.Context, req *pb.FindEnabledOriginRequest) (*pb.FindEnabledOriginResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -197,7 +197,7 @@ func (this *OriginService) FindEnabledOrigin(ctx context.Context, req *pb.FindEn // FindEnabledOriginConfig 查找源站配置 func (this *OriginService) FindEnabledOriginConfig(ctx context.Context, req *pb.FindEnabledOriginConfigRequest) (*pb.FindEnabledOriginConfigResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_region_country.go b/internal/rpc/services/service_region_country.go index 40883490..c9d19205 100644 --- a/internal/rpc/services/service_region_country.go +++ b/internal/rpc/services/service_region_country.go @@ -20,7 +20,7 @@ func (this *RegionCountryService) FindAllEnabledRegionCountries(ctx context.Cont return nil, err } - tx := this.NullTx() + var tx = this.NullTx() countries, err := regions.SharedRegionCountryDAO.FindAllEnabledCountriesOrderByPinyin(tx) if err != nil { @@ -58,7 +58,7 @@ func (this *RegionCountryService) FindEnabledRegionCountry(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() country, err := regions.SharedRegionCountryDAO.FindEnabledRegionCountry(tx, req.RegionCountryId) if err != nil { diff --git a/internal/rpc/services/service_region_province.go b/internal/rpc/services/service_region_province.go index c1a7bac2..d436e413 100644 --- a/internal/rpc/services/service_region_province.go +++ b/internal/rpc/services/service_region_province.go @@ -19,7 +19,7 @@ func (this *RegionProvinceService) FindAllEnabledRegionProvincesWithCountryId(ct return nil, err } - tx := this.NullTx() + var tx = this.NullTx() provinces, err := regions.SharedRegionProvinceDAO.FindAllEnabledProvincesWithCountryId(tx, req.RegionCountryId) if err != nil { @@ -47,7 +47,7 @@ func (this *RegionProvinceService) FindEnabledRegionProvince(ctx context.Context return nil, err } - tx := this.NullTx() + var tx = this.NullTx() province, err := regions.SharedRegionProvinceDAO.FindEnabledRegionProvince(tx, req.RegionProvinceId) if err != nil { diff --git a/internal/rpc/services/service_reverse_proxy.go b/internal/rpc/services/service_reverse_proxy.go index 285125be..58efb9a2 100644 --- a/internal/rpc/services/service_reverse_proxy.go +++ b/internal/rpc/services/service_reverse_proxy.go @@ -16,7 +16,7 @@ type ReverseProxyService struct { // CreateReverseProxy 创建反向代理 func (this *ReverseProxyService) CreateReverseProxy(ctx context.Context, req *pb.CreateReverseProxyRequest) (*pb.CreateReverseProxyResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -25,7 +25,7 @@ func (this *ReverseProxyService) CreateReverseProxy(ctx context.Context, req *pb // TODO 校验源站 } - tx := this.NullTx() + var tx = this.NullTx() reverseProxyId, err := models.SharedReverseProxyDAO.CreateReverseProxy(tx, adminId, userId, req.SchedulingJSON, req.PrimaryOriginsJSON, req.BackupOriginsJSON) if err != nil { @@ -38,7 +38,7 @@ func (this *ReverseProxyService) CreateReverseProxy(ctx context.Context, req *pb // FindEnabledReverseProxy 查找反向代理 func (this *ReverseProxyService) FindEnabledReverseProxy(ctx context.Context, req *pb.FindEnabledReverseProxyRequest) (*pb.FindEnabledReverseProxyResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func (this *ReverseProxyService) FindEnabledReverseProxy(ctx context.Context, re } } - tx := this.NullTx() + var tx = this.NullTx() reverseProxy, err := models.SharedReverseProxyDAO.FindEnabledReverseProxy(tx, req.ReverseProxyId) if err != nil { @@ -72,7 +72,7 @@ func (this *ReverseProxyService) FindEnabledReverseProxy(ctx context.Context, re // FindEnabledReverseProxyConfig 查找反向代理配置 func (this *ReverseProxyService) FindEnabledReverseProxyConfig(ctx context.Context, req *pb.FindEnabledReverseProxyConfigRequest) (*pb.FindEnabledReverseProxyConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -102,7 +102,7 @@ func (this *ReverseProxyService) FindEnabledReverseProxyConfig(ctx context.Conte // UpdateReverseProxyScheduling 修改反向代理调度算法 func (this *ReverseProxyService) UpdateReverseProxyScheduling(ctx context.Context, req *pb.UpdateReverseProxySchedulingRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -114,7 +114,7 @@ func (this *ReverseProxyService) UpdateReverseProxyScheduling(ctx context.Contex } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedReverseProxyDAO.UpdateReverseProxyScheduling(tx, req.ReverseProxyId, req.SchedulingJSON) if err != nil { @@ -127,7 +127,7 @@ func (this *ReverseProxyService) UpdateReverseProxyScheduling(ctx context.Contex // UpdateReverseProxyPrimaryOrigins 修改主要源站信息 func (this *ReverseProxyService) UpdateReverseProxyPrimaryOrigins(ctx context.Context, req *pb.UpdateReverseProxyPrimaryOriginsRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -139,7 +139,7 @@ func (this *ReverseProxyService) UpdateReverseProxyPrimaryOrigins(ctx context.Co } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedReverseProxyDAO.UpdateReverseProxyPrimaryOrigins(tx, req.ReverseProxyId, req.OriginsJSON) if err != nil { @@ -152,7 +152,7 @@ func (this *ReverseProxyService) UpdateReverseProxyPrimaryOrigins(ctx context.Co // UpdateReverseProxyBackupOrigins 修改备用源站信息 func (this *ReverseProxyService) UpdateReverseProxyBackupOrigins(ctx context.Context, req *pb.UpdateReverseProxyBackupOriginsRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -164,7 +164,7 @@ func (this *ReverseProxyService) UpdateReverseProxyBackupOrigins(ctx context.Con } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedReverseProxyDAO.UpdateReverseProxyBackupOrigins(tx, req.ReverseProxyId, req.OriginsJSON) if err != nil { @@ -177,7 +177,7 @@ func (this *ReverseProxyService) UpdateReverseProxyBackupOrigins(ctx context.Con // UpdateReverseProxy 修改是否启用 func (this *ReverseProxyService) UpdateReverseProxy(ctx context.Context, req *pb.UpdateReverseProxyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go index 75eb2f74..54c670cf 100644 --- a/internal/rpc/services/service_server.go +++ b/internal/rpc/services/service_server.go @@ -24,12 +24,15 @@ type ServerService struct { // CreateServer 创建服务 func (this *ServerService) CreateServer(ctx context.Context, req *pb.CreateServerRequest) (*pb.CreateServerResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } // 校验用户相关数据 if userId > 0 { @@ -173,7 +176,7 @@ func (this *ServerService) UpdateServerBasic(ctx context.Context, req *pb.Update return nil, errors.New("invalid serverId") } - tx := this.NullTx() + var tx = this.NullTx() // 查询老的节点信息 server, err := models.SharedServerDAO.FindEnabledServer(tx, req.ServerId) @@ -194,7 +197,7 @@ func (this *ServerService) UpdateServerBasic(ctx context.Context, req *pb.Update // UpdateServerGroupIds 修改服务所在分组 func (this *ServerService) UpdateServerGroupIds(ctx context.Context, req *pb.UpdateServerGroupIdsRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -244,7 +247,7 @@ func (this *ServerService) UpdateServerGroupIds(ctx context.Context, req *pb.Upd // UpdateServerIsOn 修改服务是否启用 func (this *ServerService) UpdateServerIsOn(ctx context.Context, req *pb.UpdateServerIsOnRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -267,12 +270,12 @@ func (this *ServerService) UpdateServerIsOn(ctx context.Context, req *pb.UpdateS // UpdateServerHTTP 修改HTTP服务 func (this *ServerService) UpdateServerHTTP(ctx context.Context, req *pb.UpdateServerHTTPRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId) @@ -293,12 +296,12 @@ func (this *ServerService) UpdateServerHTTP(ctx context.Context, req *pb.UpdateS // UpdateServerHTTPS 修改HTTPS服务 func (this *ServerService) UpdateServerHTTPS(ctx context.Context, req *pb.UpdateServerHTTPSRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId) @@ -319,7 +322,7 @@ func (this *ServerService) UpdateServerHTTPS(ctx context.Context, req *pb.Update // UpdateServerTCP 修改TCP服务 func (this *ServerService) UpdateServerTCP(ctx context.Context, req *pb.UpdateServerTCPRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -331,7 +334,7 @@ func (this *ServerService) UpdateServerTCP(ctx context.Context, req *pb.UpdateSe } } - tx := this.NullTx() + var tx = this.NullTx() // 修改配置 err = models.SharedServerDAO.UpdateServerTCP(tx, req.ServerId, req.TcpJSON) @@ -345,7 +348,7 @@ func (this *ServerService) UpdateServerTCP(ctx context.Context, req *pb.UpdateSe // UpdateServerTLS 修改TLS服务 func (this *ServerService) UpdateServerTLS(ctx context.Context, req *pb.UpdateServerTLSRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -357,7 +360,7 @@ func (this *ServerService) UpdateServerTLS(ctx context.Context, req *pb.UpdateSe } } - tx := this.NullTx() + var tx = this.NullTx() // 修改配置 err = models.SharedServerDAO.UpdateServerTLS(tx, req.ServerId, req.TlsJSON) @@ -380,7 +383,7 @@ func (this *ServerService) UpdateServerUnix(ctx context.Context, req *pb.UpdateS return nil, errors.New("invalid serverId") } - tx := this.NullTx() + var tx = this.NullTx() // 修改配置 err = models.SharedServerDAO.UpdateServerUnix(tx, req.ServerId, req.UnixJSON) @@ -394,7 +397,7 @@ func (this *ServerService) UpdateServerUnix(ctx context.Context, req *pb.UpdateS // UpdateServerUDP 修改UDP服务 func (this *ServerService) UpdateServerUDP(ctx context.Context, req *pb.UpdateServerUDPRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -410,7 +413,7 @@ func (this *ServerService) UpdateServerUDP(ctx context.Context, req *pb.UpdateSe return nil, errors.New("invalid serverId") } - tx := this.NullTx() + var tx = this.NullTx() // 修改配置 err = models.SharedServerDAO.UpdateServerUDP(tx, req.ServerId, req.UdpJSON) @@ -424,12 +427,12 @@ func (this *ServerService) UpdateServerUDP(ctx context.Context, req *pb.UpdateSe // UpdateServerWeb 修改Web服务 func (this *ServerService) UpdateServerWeb(ctx context.Context, req *pb.UpdateServerWebRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId) @@ -450,12 +453,12 @@ func (this *ServerService) UpdateServerWeb(ctx context.Context, req *pb.UpdateSe // UpdateServerReverseProxy 修改反向代理服务 func (this *ServerService) UpdateServerReverseProxy(ctx context.Context, req *pb.UpdateServerReverseProxyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId) @@ -475,12 +478,12 @@ func (this *ServerService) UpdateServerReverseProxy(ctx context.Context, req *pb // FindServerNames 查找服务的域名设置 func (this *ServerService) FindServerNames(ctx context.Context, req *pb.FindServerNamesRequest) (*pb.FindServerNamesResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId) @@ -517,12 +520,12 @@ func (this *ServerService) FindServerNames(ctx context.Context, req *pb.FindServ // UpdateServerNames 修改域名服务 func (this *ServerService) UpdateServerNames(ctx context.Context, req *pb.UpdateServerNamesRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查用户 if userId > 0 { @@ -572,7 +575,7 @@ func (this *ServerService) UpdateServerNamesAuditing(ctx context.Context, req *p return nil, errors.New("'result' should not be nil") } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedServerDAO.UpdateServerAuditing(tx, req.ServerId, req.AuditingResult) if err != nil { @@ -640,7 +643,7 @@ func (this *ServerService) RegenerateServerCNAME(ctx context.Context, req *pb.Re // CountAllEnabledServersMatch 计算服务数量 func (this *ServerService) CountAllEnabledServersMatch(ctx context.Context, req *pb.CountAllEnabledServersMatchRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -662,7 +665,7 @@ func (this *ServerService) CountAllEnabledServersMatch(ctx context.Context, req // ListEnabledServersMatch 列出单页服务 func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.ListEnabledServersMatchRequest) (*pb.ListEnabledServersMatchResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -809,12 +812,12 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb. // DeleteServer 禁用某服务 func (this *ServerService) DeleteServer(ctx context.Context, req *pb.DeleteServerRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId) @@ -835,12 +838,12 @@ func (this *ServerService) DeleteServer(ctx context.Context, req *pb.DeleteServe // FindEnabledServer 查找单个服务 func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEnabledServerRequest) (*pb.FindEnabledServerResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查权限 if userId > 0 { @@ -951,12 +954,12 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn // FindEnabledServerConfig 查找服务配置 func (this *ServerService) FindEnabledServerConfig(ctx context.Context, req *pb.FindEnabledServerConfigRequest) (*pb.FindEnabledServerConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查权限 if userId > 0 { @@ -984,12 +987,12 @@ func (this *ServerService) FindEnabledServerConfig(ctx context.Context, req *pb. // FindEnabledServerType 查找服务的服务类型 func (this *ServerService) FindEnabledServerType(ctx context.Context, req *pb.FindEnabledServerTypeRequest) (*pb.FindEnabledServerTypeResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查权限 if userId > 0 { @@ -1010,12 +1013,12 @@ func (this *ServerService) FindEnabledServerType(ctx context.Context, req *pb.Fi // FindAndInitServerReverseProxyConfig 查找反向代理设置 func (this *ServerService) FindAndInitServerReverseProxyConfig(ctx context.Context, req *pb.FindAndInitServerReverseProxyConfigRequest) (*pb.FindAndInitServerReverseProxyConfigResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() reverseProxyRef, err := models.SharedServerDAO.FindReverseProxyRef(tx, req.ServerId) if err != nil { @@ -1063,12 +1066,12 @@ func (this *ServerService) FindAndInitServerReverseProxyConfig(ctx context.Conte // FindAndInitServerWebConfig 初始化Web设置 func (this *ServerService) FindAndInitServerWebConfig(ctx context.Context, req *pb.FindAndInitServerWebConfigRequest) (*pb.FindAndInitServerWebConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId) @@ -1104,7 +1107,7 @@ func (this *ServerService) FindAndInitServerWebConfig(ctx context.Context, req * // CountAllEnabledServersWithSSLCertId 计算使用某个SSL证书的服务数量 func (this *ServerService) CountAllEnabledServersWithSSLCertId(ctx context.Context, req *pb.CountAllEnabledServersWithSSLCertIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1112,7 +1115,7 @@ func (this *ServerService) CountAllEnabledServersWithSSLCertId(ctx context.Conte // TODO 校验权限 } - tx := this.NullTx() + var tx = this.NullTx() policyIds, err := models.SharedSSLPolicyDAO.FindAllEnabledPolicyIdsWithCertId(tx, req.SslCertId) if err != nil { @@ -1134,7 +1137,7 @@ func (this *ServerService) CountAllEnabledServersWithSSLCertId(ctx context.Conte // FindAllEnabledServersWithSSLCertId 查找使用某个SSL证书的所有服务 func (this *ServerService) FindAllEnabledServersWithSSLCertId(ctx context.Context, req *pb.FindAllEnabledServersWithSSLCertIdRequest) (*pb.FindAllEnabledServersWithSSLCertIdResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1143,7 +1146,7 @@ func (this *ServerService) FindAllEnabledServersWithSSLCertId(ctx context.Contex // TODO 校验权限 } - tx := this.NullTx() + var tx = this.NullTx() policyIds, err := models.SharedSSLPolicyDAO.FindAllEnabledPolicyIdsWithCertId(tx, req.SslCertId) if err != nil { @@ -1177,7 +1180,7 @@ func (this *ServerService) CountAllEnabledServersWithNodeClusterId(ctx context.C return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedServerDAO.CountAllEnabledServersWithNodeClusterId(tx, req.NodeClusterId) if err != nil { @@ -1189,12 +1192,12 @@ func (this *ServerService) CountAllEnabledServersWithNodeClusterId(ctx context.C // CountAllEnabledServersWithServerGroupId 计算使用某个分组的服务数量 func (this *ServerService) CountAllEnabledServersWithServerGroupId(ctx context.Context, req *pb.CountAllEnabledServersWithServerGroupIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedServerDAO.CountAllEnabledServersWithGroupId(tx, req.ServerGroupId, userId) if err != nil { @@ -1211,7 +1214,7 @@ func (this *ServerService) NotifyServersChange(ctx context.Context, _ *pb.Notify return nil, err } - tx := this.NullTx() + var tx = this.NullTx() clusterIds, err := models.SharedNodeClusterDAO.FindAllEnableClusterIds(tx) if err != nil { @@ -1235,7 +1238,7 @@ func (this *ServerService) FindAllEnabledServersDNSWithNodeClusterId(ctx context return nil, err } - tx := this.NullTx() + var tx = this.NullTx() servers, err := models.SharedServerDAO.FindAllServersDNSWithClusterId(tx, req.NodeClusterId) if err != nil { @@ -1266,12 +1269,12 @@ func (this *ServerService) FindAllEnabledServersDNSWithNodeClusterId(ctx context // FindEnabledServerDNS 查找单个服务的DNS信息 func (this *ServerService) FindEnabledServerDNS(ctx context.Context, req *pb.FindEnabledServerDNSRequest) (*pb.FindEnabledServerDNSResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() dnsName, err := models.SharedServerDAO.FindServerDNSName(tx, req.ServerId) if err != nil { @@ -1324,7 +1327,7 @@ func (this *ServerService) CheckUserServer(ctx context.Context, req *pb.CheckUse return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId) if err != nil { @@ -1335,12 +1338,15 @@ func (this *ServerService) CheckUserServer(ctx context.Context, req *pb.CheckUse // FindAllEnabledServerNamesWithUserId 查找一个用户下的所有域名列表 func (this *ServerService) FindAllEnabledServerNamesWithUserId(ctx context.Context, req *pb.FindAllEnabledServerNamesWithUserIdRequest) (*pb.FindAllEnabledServerNamesWithUserIdResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } servers, err := models.SharedServerDAO.FindAllEnabledServersWithUserId(tx, req.UserId) if err != nil { @@ -1368,7 +1374,7 @@ func (this *ServerService) FindAllEnabledServerNamesWithUserId(ctx context.Conte // FindEnabledUserServerBasic 查找服务基本信息 func (this *ServerService) FindEnabledUserServerBasic(ctx context.Context, req *pb.FindEnabledUserServerBasicRequest) (*pb.FindEnabledUserServerBasicResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1410,7 +1416,7 @@ func (this *ServerService) FindEnabledUserServerBasic(ctx context.Context, req * // UpdateEnabledUserServerBasic 修改用户服务基本信息 func (this *ServerService) UpdateEnabledUserServerBasic(ctx context.Context, req *pb.UpdateEnabledUserServerBasicRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1615,7 +1621,7 @@ func (this *ServerService) UploadServerHTTPRequestStat(ctx context.Context, req // CheckServerNameDuplicationInNodeCluster 检查域名是否已经存在 func (this *ServerService) CheckServerNameDuplicationInNodeCluster(ctx context.Context, req *pb.CheckServerNameDuplicationInNodeClusterRequest) (*pb.CheckServerNameDuplicationInNodeClusterResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1852,7 +1858,7 @@ func (this *ServerService) PurgeServerCache(ctx context.Context, req *pb.PurgeSe // FindEnabledServerTrafficLimit 查找流量限制 func (this *ServerService) FindEnabledServerTrafficLimit(ctx context.Context, req *pb.FindEnabledServerTrafficLimitRequest) (*pb.FindEnabledServerTrafficLimitResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1896,7 +1902,7 @@ func (this *ServerService) UpdateServerTrafficLimit(ctx context.Context, req *pb // UpdateServerUserPlan 修改服务套餐 func (this *ServerService) UpdateServerUserPlan(ctx context.Context, req *pb.UpdateServerUserPlanRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -1965,7 +1971,7 @@ func (this *ServerService) UpdateServerUserPlan(ctx context.Context, req *pb.Upd // FindServerUserPlan 获取服务套餐信息 func (this *ServerService) FindServerUserPlan(ctx context.Context, req *pb.FindServerUserPlanRequest) (*pb.FindServerUserPlanResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_bill.go b/internal/rpc/services/service_server_bill.go index e43e3517..c8eb80ae 100644 --- a/internal/rpc/services/service_server_bill.go +++ b/internal/rpc/services/service_server_bill.go @@ -16,7 +16,7 @@ type ServerBillService struct { // CountAllServerBills 查询服务账单数量 func (this *ServerBillService) CountAllServerBills(ctx context.Context, req *pb.CountAllServerBillsRequest) (*pb.RPCCountResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -35,7 +35,7 @@ func (this *ServerBillService) CountAllServerBills(ctx context.Context, req *pb. // ListServerBills 查询服务账单列表 func (this *ServerBillService) ListServerBills(ctx context.Context, req *pb.ListServerBillsRequest) (*pb.ListServerBillsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_client_browser_monthly_stat.go b/internal/rpc/services/service_server_client_browser_monthly_stat.go index bdcf1182..bcc60b0b 100644 --- a/internal/rpc/services/service_server_client_browser_monthly_stat.go +++ b/internal/rpc/services/service_server_client_browser_monthly_stat.go @@ -14,7 +14,7 @@ type ServerClientBrowserMonthlyStatService struct { // FindTopServerClientBrowserMonthlyStats 查找前N个操作系统 func (this *ServerClientBrowserMonthlyStatService) FindTopServerClientBrowserMonthlyStats(ctx context.Context, req *pb.FindTopServerClientBrowserMonthlyStatsRequest) (*pb.FindTopServerClientBrowserMonthlyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_client_system_monthly_stat.go b/internal/rpc/services/service_server_client_system_monthly_stat.go index 86efe68b..90d16a9d 100644 --- a/internal/rpc/services/service_server_client_system_monthly_stat.go +++ b/internal/rpc/services/service_server_client_system_monthly_stat.go @@ -14,7 +14,7 @@ type ServerClientSystemMonthlyStatService struct { // FindTopServerClientSystemMonthlyStats 查找前N个操作系统 func (this *ServerClientSystemMonthlyStatService) FindTopServerClientSystemMonthlyStats(ctx context.Context, req *pb.FindTopServerClientSystemMonthlyStatsRequest) (*pb.FindTopServerClientSystemMonthlyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_daily_stat.go b/internal/rpc/services/service_server_daily_stat.go index df5dec50..42724dd5 100644 --- a/internal/rpc/services/service_server_daily_stat.go +++ b/internal/rpc/services/service_server_daily_stat.go @@ -25,7 +25,7 @@ func (this *ServerDailyStatService) UploadServerDailyStats(ctx context.Context, return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 保存统计数据 err = models.SharedServerDailyStatDAO.SaveStats(tx, req.Stats) @@ -111,7 +111,7 @@ func (this *ServerDailyStatService) FindLatestServerHourlyStats(ctx context.Cont return nil, err } - tx := this.NullTx() + var tx = this.NullTx() result := []*pb.FindLatestServerHourlyStatsResponse_HourlyStat{} if req.Hours > 0 { @@ -142,7 +142,7 @@ func (this *ServerDailyStatService) FindLatestServerMinutelyStats(ctx context.Co return nil, err } - tx := this.NullTx() + var tx = this.NullTx() result := []*pb.FindLatestServerMinutelyStatsResponse_MinutelyStat{} cache := map[string]*pb.FindLatestServerMinutelyStatsResponse_MinutelyStat{} // minute => stat @@ -199,7 +199,7 @@ func (this *ServerDailyStatService) FindLatestServerDailyStats(ctx context.Conte return nil, err } - tx := this.NullTx() + var tx = this.NullTx() result := []*pb.FindLatestServerDailyStatsResponse_DailyStat{} if req.Days > 0 { @@ -225,7 +225,7 @@ func (this *ServerDailyStatService) FindLatestServerDailyStats(ctx context.Conte // SumCurrentServerDailyStats 查找单个服务当前统计数据 func (this *ServerDailyStatService) SumCurrentServerDailyStats(ctx context.Context, req *pb.SumCurrentServerDailyStatsRequest) (*pb.SumCurrentServerDailyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -266,7 +266,7 @@ func (this *ServerDailyStatService) SumCurrentServerDailyStats(ctx context.Conte // SumServerDailyStats 计算单个服务的日统计 func (this *ServerDailyStatService) SumServerDailyStats(ctx context.Context, req *pb.SumServerDailyStatsRequest) (*pb.SumServerDailyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -311,7 +311,7 @@ func (this *ServerDailyStatService) SumServerDailyStats(ctx context.Context, req // SumServerMonthlyStats 计算单个服务的月统计 func (this *ServerDailyStatService) SumServerMonthlyStats(ctx context.Context, req *pb.SumServerMonthlyStatsRequest) (*pb.SumServerMonthlyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_group.go b/internal/rpc/services/service_server_group.go index 8f824edb..a35a22f7 100644 --- a/internal/rpc/services/service_server_group.go +++ b/internal/rpc/services/service_server_group.go @@ -16,12 +16,12 @@ type ServerGroupService struct { // CreateServerGroup 创建分组 func (this *ServerGroupService) CreateServerGroup(ctx context.Context, req *pb.CreateServerGroupRequest) (*pb.CreateServerGroupResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() groupId, err := models.SharedServerGroupDAO.CreateGroup(tx, req.Name, userId) if err != nil { @@ -33,12 +33,12 @@ func (this *ServerGroupService) CreateServerGroup(ctx context.Context, req *pb.C // UpdateServerGroup 修改分组 func (this *ServerGroupService) UpdateServerGroup(ctx context.Context, req *pb.UpdateServerGroupRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查用户权限 if userId > 0 { @@ -59,12 +59,12 @@ func (this *ServerGroupService) UpdateServerGroup(ctx context.Context, req *pb.U // DeleteServerGroup 删除分组 func (this *ServerGroupService) DeleteServerGroup(ctx context.Context, req *pb.DeleteServerGroupRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查用户权限 if userId > 0 { @@ -85,12 +85,12 @@ func (this *ServerGroupService) DeleteServerGroup(ctx context.Context, req *pb.D // FindAllEnabledServerGroups 查询所有分组 func (this *ServerGroupService) FindAllEnabledServerGroups(ctx context.Context, req *pb.FindAllEnabledServerGroupsRequest) (*pb.FindAllEnabledServerGroupsResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() groups, err := models.SharedServerGroupDAO.FindAllEnabledGroups(tx, userId) if err != nil { @@ -109,12 +109,12 @@ func (this *ServerGroupService) FindAllEnabledServerGroups(ctx context.Context, // UpdateServerGroupOrders 修改分组排序 func (this *ServerGroupService) UpdateServerGroupOrders(ctx context.Context, req *pb.UpdateServerGroupOrdersRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedServerGroupDAO.UpdateGroupOrders(tx, req.ServerGroupIds, userId) if err != nil { @@ -126,12 +126,12 @@ func (this *ServerGroupService) UpdateServerGroupOrders(ctx context.Context, req // FindEnabledServerGroup 查找单个分组信息 func (this *ServerGroupService) FindEnabledServerGroup(ctx context.Context, req *pb.FindEnabledServerGroupRequest) (*pb.FindEnabledServerGroupResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() group, err := models.SharedServerGroupDAO.FindEnabledServerGroup(tx, req.ServerGroupId) if err != nil { @@ -166,7 +166,7 @@ func (this *ServerGroupService) FindAndInitServerGroupHTTPReverseProxyConfig(ctx return nil, err } - tx := this.NullTx() + var tx = this.NullTx() reverseProxyRef, err := models.SharedServerGroupDAO.FindHTTPReverseProxyRef(tx, req.ServerGroupId) if err != nil { @@ -219,7 +219,7 @@ func (this *ServerGroupService) FindAndInitServerGroupTCPReverseProxyConfig(ctx return nil, err } - tx := this.NullTx() + var tx = this.NullTx() reverseProxyRef, err := models.SharedServerGroupDAO.FindTCPReverseProxyRef(tx, req.ServerGroupId) if err != nil { @@ -272,7 +272,7 @@ func (this *ServerGroupService) FindAndInitServerGroupUDPReverseProxyConfig(ctx return nil, err } - tx := this.NullTx() + var tx = this.NullTx() reverseProxyRef, err := models.SharedServerGroupDAO.FindUDPReverseProxyRef(tx, req.ServerGroupId) if err != nil { @@ -325,7 +325,7 @@ func (this *ServerGroupService) UpdateServerGroupHTTPReverseProxy(ctx context.Co return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 修改配置 err = models.SharedServerGroupDAO.UpdateHTTPReverseProxy(tx, req.ServerGroupId, req.ReverseProxyJSON) @@ -344,7 +344,7 @@ func (this *ServerGroupService) UpdateServerGroupTCPReverseProxy(ctx context.Con return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 修改配置 err = models.SharedServerGroupDAO.UpdateTCPReverseProxy(tx, req.ServerGroupId, req.ReverseProxyJSON) @@ -363,7 +363,7 @@ func (this *ServerGroupService) UpdateServerGroupUDPReverseProxy(ctx context.Con return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 修改配置 err = models.SharedServerGroupDAO.UpdateUDPReverseProxy(tx, req.ServerGroupId, req.ReverseProxyJSON) @@ -377,12 +377,12 @@ func (this *ServerGroupService) UpdateServerGroupUDPReverseProxy(ctx context.Con // FindEnabledServerGroupConfigInfo 取得分组的配置概要信息 func (this *ServerGroupService) FindEnabledServerGroupConfigInfo(ctx context.Context, req *pb.FindEnabledServerGroupConfigInfoRequest) (*pb.FindEnabledServerGroupConfigInfoResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查用户权限 if userId > 0 { diff --git a/internal/rpc/services/service_server_http_firewall_daily_stat.go b/internal/rpc/services/service_server_http_firewall_daily_stat.go index ceabbf69..b9af08fe 100644 --- a/internal/rpc/services/service_server_http_firewall_daily_stat.go +++ b/internal/rpc/services/service_server_http_firewall_daily_stat.go @@ -19,7 +19,7 @@ type ServerHTTPFirewallDailyStatService struct { // ComposeServerHTTPFirewallDashboard 组合Dashboard func (this *ServerHTTPFirewallDailyStatService) ComposeServerHTTPFirewallDashboard(ctx context.Context, req *pb.ComposeServerHTTPFirewallDashboardRequest) (*pb.ComposeServerHTTPFirewallDashboardResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_region_city_monthly_stat.go b/internal/rpc/services/service_server_region_city_monthly_stat.go index 0d04d8a4..82c2cfdb 100644 --- a/internal/rpc/services/service_server_region_city_monthly_stat.go +++ b/internal/rpc/services/service_server_region_city_monthly_stat.go @@ -15,7 +15,7 @@ type ServerRegionCityMonthlyStatService struct { // 查找前N个城市 func (this *ServerRegionCityMonthlyStatService) FindTopServerRegionCityMonthlyStats(ctx context.Context, req *pb.FindTopServerRegionCityMonthlyStatsRequest) (*pb.FindTopServerRegionCityMonthlyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_region_country_monthly_stat.go b/internal/rpc/services/service_server_region_country_monthly_stat.go index 215b7916..c23be36c 100644 --- a/internal/rpc/services/service_server_region_country_monthly_stat.go +++ b/internal/rpc/services/service_server_region_country_monthly_stat.go @@ -15,7 +15,7 @@ type ServerRegionCountryMonthlyStatService struct { // 查找前N个地区 func (this *ServerRegionCountryMonthlyStatService) FindTopServerRegionCountryMonthlyStats(ctx context.Context, req *pb.FindTopServerRegionCountryMonthlyStatsRequest) (*pb.FindTopServerRegionCountryMonthlyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_region_provider_monthly_stat.go b/internal/rpc/services/service_server_region_provider_monthly_stat.go index 6d661554..9455b3c4 100644 --- a/internal/rpc/services/service_server_region_provider_monthly_stat.go +++ b/internal/rpc/services/service_server_region_provider_monthly_stat.go @@ -15,7 +15,7 @@ type ServerRegionProviderMonthlyStatService struct { // 查找前N个运营商 func (this *ServerRegionProviderMonthlyStatService) FindTopServerRegionProviderMonthlyStats(ctx context.Context, req *pb.FindTopServerRegionProviderMonthlyStatsRequest) (*pb.FindTopServerRegionProviderMonthlyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_region_province_monthly_stat.go b/internal/rpc/services/service_server_region_province_monthly_stat.go index f7cf9c17..e73966a9 100644 --- a/internal/rpc/services/service_server_region_province_monthly_stat.go +++ b/internal/rpc/services/service_server_region_province_monthly_stat.go @@ -15,7 +15,7 @@ type ServerRegionProvinceMonthlyStatService struct { // 查找前N个省份 func (this *ServerRegionProvinceMonthlyStatService) FindTopServerRegionProvinceMonthlyStats(ctx context.Context, req *pb.FindTopServerRegionProvinceMonthlyStatsRequest) (*pb.FindTopServerRegionProvinceMonthlyStatsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_ssl_cert.go b/internal/rpc/services/service_ssl_cert.go index a953d416..61471cc0 100644 --- a/internal/rpc/services/service_ssl_cert.go +++ b/internal/rpc/services/service_ssl_cert.go @@ -19,7 +19,7 @@ type SSLCertService struct { // CreateSSLCert 创建Cert func (this *SSLCertService) CreateSSLCert(ctx context.Context, req *pb.CreateSSLCertRequest) (*pb.CreateSSLCertResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -44,7 +44,7 @@ func (this *SSLCertService) CreateSSLCert(ctx context.Context, req *pb.CreateSSL // UpdateSSLCert 修改Cert func (this *SSLCertService) UpdateSSLCert(ctx context.Context, req *pb.UpdateSSLCertRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -77,12 +77,12 @@ func (this *SSLCertService) UpdateSSLCert(ctx context.Context, req *pb.UpdateSSL // FindEnabledSSLCertConfig 查找证书配置 func (this *SSLCertService) FindEnabledSSLCertConfig(ctx context.Context, req *pb.FindEnabledSSLCertConfigRequest) (*pb.FindEnabledSSLCertConfigResponse, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查权限 if userId > 0 { @@ -107,12 +107,12 @@ func (this *SSLCertService) FindEnabledSSLCertConfig(ctx context.Context, req *p // DeleteSSLCert 删除证书 func (this *SSLCertService) DeleteSSLCert(ctx context.Context, req *pb.DeleteSSLCertRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 检查权限 if userId > 0 { @@ -139,14 +139,14 @@ func (this *SSLCertService) DeleteSSLCert(ctx context.Context, req *pb.DeleteSSL // CountSSLCerts 计算匹配的Cert数量 func (this *SSLCertService) CountSSLCerts(ctx context.Context, req *pb.CountSSLCertRequest) (*pb.RPCCountResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() - if adminId > 0 { + if userId > 0 { userId = req.UserId } @@ -161,16 +161,16 @@ func (this *SSLCertService) CountSSLCerts(ctx context.Context, req *pb.CountSSLC // ListSSLCerts 列出单页匹配的Cert func (this *SSLCertService) ListSSLCerts(ctx context.Context, req *pb.ListSSLCertsRequest) (*pb.ListSSLCertsResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - if adminId > 0 { + if userId > 0 { userId = req.UserId } - tx := this.NullTx() + var tx = this.NullTx() certIds, err := models.SharedSSLCertDAO.ListCertIds(tx, req.IsCA, req.IsAvailable, req.IsExpired, int64(req.ExpiringDays), req.Keyword, userId, req.Offset, req.Size) if err != nil { diff --git a/internal/rpc/services/service_ssl_policy.go b/internal/rpc/services/service_ssl_policy.go index 4b0f42d2..011407a4 100644 --- a/internal/rpc/services/service_ssl_policy.go +++ b/internal/rpc/services/service_ssl_policy.go @@ -17,12 +17,12 @@ type SSLPolicyService struct { // CreateSSLPolicy 创建Policy func (this *SSLPolicyService) CreateSSLPolicy(ctx context.Context, req *pb.CreateSSLPolicyRequest) (*pb.CreateSSLPolicyResponse, error) { // 校验请求 - adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + adminId, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { // 检查证书 @@ -55,12 +55,12 @@ func (this *SSLPolicyService) CreateSSLPolicy(ctx context.Context, req *pb.Creat // UpdateSSLPolicy 修改Policy func (this *SSLPolicyService) UpdateSSLPolicy(ctx context.Context, req *pb.UpdateSSLPolicyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { err := models.SharedSSLPolicyDAO.CheckUserPolicy(tx, userId, req.SslPolicyId) @@ -86,7 +86,7 @@ func (this *SSLPolicyService) FindEnabledSSLPolicyConfig(ctx context.Context, re return nil, err } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedSSLPolicyDAO.ComposePolicyConfig(tx, req.SslPolicyId, nil) if err != nil { diff --git a/internal/rpc/services/service_sys_locker.go b/internal/rpc/services/service_sys_locker.go index ff71b389..6d56edd5 100644 --- a/internal/rpc/services/service_sys_locker.go +++ b/internal/rpc/services/service_sys_locker.go @@ -13,7 +13,7 @@ type SysLockerService struct { // SysLockerLock 获得锁 func (this *SysLockerService) SysLockerLock(ctx context.Context, req *pb.SysLockerLockRequest) (*pb.SysLockerLockResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { _, err = this.ValidateMonitorNode(ctx) if err != nil { @@ -43,7 +43,7 @@ func (this *SysLockerService) SysLockerLock(ctx context.Context, req *pb.SysLock // SysLockerUnlock 释放锁 func (this *SysLockerService) SysLockerUnlock(ctx context.Context, req *pb.SysLockerUnlockRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { _, err = this.ValidateMonitorNode(ctx) if err != nil { diff --git a/internal/rpc/services/service_sys_setting.go b/internal/rpc/services/service_sys_setting.go index 26ac9365..8e38e494 100644 --- a/internal/rpc/services/service_sys_setting.go +++ b/internal/rpc/services/service_sys_setting.go @@ -19,7 +19,7 @@ func (this *SysSettingService) UpdateSysSetting(ctx context.Context, req *pb.Upd return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedSysSettingDAO.UpdateSetting(tx, req.Code, req.ValueJSON) if err != nil { @@ -37,7 +37,7 @@ func (this *SysSettingService) ReadSysSetting(ctx context.Context, req *pb.ReadS return nil, err } - tx := this.NullTx() + var tx = this.NullTx() valueJSON, err := models.SharedSysSettingDAO.ReadSetting(tx, req.Code) if err != nil { diff --git a/internal/rpc/services/service_user.go b/internal/rpc/services/service_user.go index d6015138..6d369056 100644 --- a/internal/rpc/services/service_user.go +++ b/internal/rpc/services/service_user.go @@ -31,7 +31,7 @@ func (this *UserService) CreateUser(ctx context.Context, req *pb.CreateUserReque return nil, err } - tx := this.NullTx() + var tx = this.NullTx() userId, err := models.SharedUserDAO.CreateUser(tx, req.Username, req.Password, req.Fullname, req.Mobile, req.Tel, req.Email, req.Remark, req.Source, req.NodeClusterId, nil, "", true) if err != nil { @@ -116,7 +116,7 @@ func (this *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserReque return nil, err } - tx := this.NullTx() + var tx = this.NullTx() oldClusterId, err := models.SharedUserDAO.FindUserClusterId(tx, req.UserId) if err != nil { @@ -145,7 +145,7 @@ func (this *UserService) DeleteUser(ctx context.Context, req *pb.DeleteUserReque return nil, err } - tx := this.NullTx() + var tx = this.NullTx() // 删除其下的Server serverIds, err := models.SharedServerDAO.FindAllEnabledServerIdsWithUserId(tx, req.UserId) @@ -173,7 +173,7 @@ func (this *UserService) CountAllEnabledUsers(ctx context.Context, req *pb.Count return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedUserDAO.CountAllEnabledUsers(tx, 0, req.Keyword, req.IsVerifying) if err != nil { @@ -189,7 +189,7 @@ func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabl return nil, err } - tx := this.NullTx() + var tx = this.NullTx() users, err := models.SharedUserDAO.ListEnabledUsers(tx, 0, req.Keyword, req.IsVerifying, req.Offset, req.Size) if err != nil { @@ -233,12 +233,12 @@ func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabl // FindEnabledUser 查询单个用户信息 func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnabledUserRequest) (*pb.FindEnabledUserResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, _, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() user, err := models.SharedUserDAO.FindEnabledUser(tx, req.UserId, nil) if err != nil { @@ -291,7 +291,7 @@ func (this *UserService) CheckUserUsername(ctx context.Context, req *pb.CheckUse return nil, this.PermissionError() } - tx := this.NullTx() + var tx = this.NullTx() b, err := models.SharedUserDAO.ExistUser(tx, req.UserId, req.Username) if err != nil { @@ -323,7 +323,7 @@ func (this *UserService) LoginUser(ctx context.Context, req *pb.LoginUserRequest }, nil } - tx := this.NullTx() + var tx = this.NullTx() userId, err := models.SharedUserDAO.CheckUserPassword(tx, req.Username, req.Password) if err != nil { @@ -356,7 +356,7 @@ func (this *UserService) UpdateUserInfo(ctx context.Context, req *pb.UpdateUserI return nil, this.PermissionError() } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedUserDAO.UpdateUserInfo(tx, req.UserId, req.Fullname, req.Mobile, req.Email) if err != nil { @@ -376,7 +376,7 @@ func (this *UserService) UpdateUserLogin(ctx context.Context, req *pb.UpdateUser return nil, this.PermissionError() } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedUserDAO.UpdateUserLogin(tx, req.UserId, req.Username, req.Password) if err != nil { @@ -387,7 +387,7 @@ func (this *UserService) UpdateUserLogin(ctx context.Context, req *pb.UpdateUser // ComposeUserDashboard 取得用户Dashboard数据 func (this *UserService) ComposeUserDashboard(ctx context.Context, req *pb.ComposeUserDashboardRequest) (*pb.ComposeUserDashboardResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -484,12 +484,15 @@ func (this *UserService) ComposeUserDashboard(ctx context.Context, req *pb.Compo // FindUserNodeClusterId 获取用户所在的集群ID func (this *UserService) FindUserNodeClusterId(ctx context.Context, req *pb.FindUserNodeClusterIdRequest) (*pb.FindUserNodeClusterIdResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } clusterId, err := models.SharedUserDAO.FindUserClusterId(tx, req.UserId) if err != nil { @@ -510,7 +513,7 @@ func (this *UserService) UpdateUserFeatures(ctx context.Context, req *pb.UpdateU return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedUserDAO.UpdateUserFeatures(tx, req.UserId, featuresJSON) if err != nil { @@ -521,7 +524,7 @@ func (this *UserService) UpdateUserFeatures(ctx context.Context, req *pb.UpdateU // FindUserFeatures 获取用户所有的功能列表 func (this *UserService) FindUserFeatures(ctx context.Context, req *pb.FindUserFeaturesRequest) (*pb.FindUserFeaturesResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -529,7 +532,7 @@ func (this *UserService) FindUserFeatures(ctx context.Context, req *pb.FindUserF req.UserId = userId } - tx := this.NullTx() + var tx = this.NullTx() features, err := models.SharedUserDAO.FindUserFeatures(tx, req.UserId) if err != nil { diff --git a/internal/rpc/services/service_user_access_key.go b/internal/rpc/services/service_user_access_key.go index 505ddd94..d6a23533 100644 --- a/internal/rpc/services/service_user_access_key.go +++ b/internal/rpc/services/service_user_access_key.go @@ -13,12 +13,15 @@ type UserAccessKeyService struct { // CreateUserAccessKey 创建AccessKey func (this *UserAccessKeyService) CreateUserAccessKey(ctx context.Context, req *pb.CreateUserAccessKeyRequest) (*pb.CreateUserAccessKeyResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } userAccessKeyId, err := models.SharedUserAccessKeyDAO.CreateAccessKey(tx, req.AdminId, req.UserId, req.Description) if err != nil { @@ -29,12 +32,15 @@ func (this *UserAccessKeyService) CreateUserAccessKey(ctx context.Context, req * // FindAllEnabledUserAccessKeys 查找所有的AccessKey func (this *UserAccessKeyService) FindAllEnabledUserAccessKeys(ctx context.Context, req *pb.FindAllEnabledUserAccessKeysRequest) (*pb.FindAllEnabledUserAccessKeysResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } accessKeys, err := models.SharedUserAccessKeyDAO.FindAllEnabledAccessKeys(tx, req.AdminId, req.UserId) if err != nil { @@ -60,12 +66,12 @@ func (this *UserAccessKeyService) FindAllEnabledUserAccessKeys(ctx context.Conte // DeleteUserAccessKey 删除AccessKey func (this *UserAccessKeyService) DeleteUserAccessKey(ctx context.Context, req *pb.DeleteUserAccessKeyRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { ok, err := models.SharedUserAccessKeyDAO.CheckUserAccessKey(tx, 0, userId, req.UserAccessKeyId) @@ -86,12 +92,12 @@ func (this *UserAccessKeyService) DeleteUserAccessKey(ctx context.Context, req * // UpdateUserAccessKeyIsOn 设置是否启用AccessKey func (this *UserAccessKeyService) UpdateUserAccessKeyIsOn(ctx context.Context, req *pb.UpdateUserAccessKeyIsOnRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() if userId > 0 { ok, err := models.SharedUserAccessKeyDAO.CheckUserAccessKey(tx, 0, userId, req.UserAccessKeyId) @@ -112,12 +118,16 @@ func (this *UserAccessKeyService) UpdateUserAccessKeyIsOn(ctx context.Context, r // CountAllEnabledUserAccessKeys 计算AccessKey数量 func (this *UserAccessKeyService) CountAllEnabledUserAccessKeys(ctx context.Context, req *pb.CountAllEnabledUserAccessKeysRequest) (*pb.RPCCountResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } + count, err := models.SharedUserAccessKeyDAO.CountAllEnabledAccessKeys(tx, req.AdminId, req.UserId) if err != nil { return nil, err diff --git a/internal/rpc/services/service_user_bill.go b/internal/rpc/services/service_user_bill.go index d7581645..0ce4a851 100644 --- a/internal/rpc/services/service_user_bill.go +++ b/internal/rpc/services/service_user_bill.go @@ -33,7 +33,7 @@ func (this *UserBillService) GenerateAllUserBills(ctx context.Context, req *pb.G return nil, errors.New("invalid month '" + req.Month + "'") } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedUserBillDAO.GenerateBills(tx, req.Month) if err != nil { @@ -45,12 +45,15 @@ func (this *UserBillService) GenerateAllUserBills(ctx context.Context, req *pb.G // CountAllUserBills 计算所有账单数量 func (this *UserBillService) CountAllUserBills(ctx context.Context, req *pb.CountAllUserBillsRequest) (*pb.RPCCountResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } count, err := models.SharedUserBillDAO.CountAllUserBills(tx, req.PaidFlag, req.UserId, req.Month) if err != nil { @@ -61,12 +64,15 @@ func (this *UserBillService) CountAllUserBills(ctx context.Context, req *pb.Coun // ListUserBills 列出单页账单 func (this *UserBillService) ListUserBills(ctx context.Context, req *pb.ListUserBillsRequest) (*pb.ListUserBillsResponse, error) { - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } - tx := this.NullTx() + var tx = this.NullTx() + if userId > 0 { + req.UserId = userId + } bills, err := models.SharedUserBillDAO.ListUserBills(tx, req.PaidFlag, req.UserId, req.Month, req.Offset, req.Size) if err != nil { @@ -106,7 +112,7 @@ func (this *UserBillService) ListUserBills(ctx context.Context, req *pb.ListUser // FindUserBill 查找账单信息 func (this *UserBillService) FindUserBill(ctx context.Context, req *pb.FindUserBillRequest) (*pb.FindUserBillResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -163,7 +169,7 @@ func (this *UserBillService) FindUserBill(ctx context.Context, req *pb.FindUserB // PayUserBill 支付账单 func (this *UserBillService) PayUserBill(ctx context.Context, req *pb.PayUserBillRequest) (*pb.RPCSuccess, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } @@ -231,7 +237,7 @@ func (this *UserBillService) PayUserBill(ctx context.Context, req *pb.PayUserBil // SumUserUnpaidBills 计算用户所有未支付账单总额 func (this *UserBillService) SumUserUnpaidBills(ctx context.Context, req *pb.SumUserUnpaidBillsRequest) (*pb.SumUserUnpaidBillsResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_user_identity.go b/internal/rpc/services/service_user_identity.go index 822e6ae8..213c4526 100644 --- a/internal/rpc/services/service_user_identity.go +++ b/internal/rpc/services/service_user_identity.go @@ -42,7 +42,7 @@ func (this *UserIdentityService) CreateUserIdentity(ctx context.Context, req *pb // FindUserEnabledUserIdentityWithType 查看身份认证信息 func (this *UserIdentityService) FindUserEnabledUserIdentityWithType(ctx context.Context, req *pb.FindUserEnabledUserIdentityWithTypeRequest) (*pb.FindUserEnabledUserIdentityWithTypeResponse, error) { - _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) + _, userId, err := this.ValidateAdminAndUser(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_user_node.go b/internal/rpc/services/service_user_node.go index 147f4668..17d1e80e 100644 --- a/internal/rpc/services/service_user_node.go +++ b/internal/rpc/services/service_user_node.go @@ -23,7 +23,7 @@ func (this *UserNodeService) CreateUserNode(ctx context.Context, req *pb.CreateU return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodeId, err := models.SharedUserNodeDAO.CreateUserNode(tx, req.Name, req.Description, req.HttpJSON, req.HttpsJSON, req.AccessAddrsJSON, req.IsOn) if err != nil { @@ -40,7 +40,7 @@ func (this *UserNodeService) UpdateUserNode(ctx context.Context, req *pb.UpdateU return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedUserNodeDAO.UpdateUserNode(tx, req.UserNodeId, req.Name, req.Description, req.HttpJSON, req.HttpsJSON, req.AccessAddrsJSON, req.IsOn) if err != nil { @@ -57,7 +57,7 @@ func (this *UserNodeService) DeleteUserNode(ctx context.Context, req *pb.DeleteU return nil, err } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedUserNodeDAO.DisableUserNode(tx, req.UserNodeId) if err != nil { @@ -74,7 +74,7 @@ func (this *UserNodeService) FindAllEnabledUserNodes(ctx context.Context, req *p return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedUserNodeDAO.FindAllEnabledUserNodes(tx) if err != nil { @@ -112,7 +112,7 @@ func (this *UserNodeService) CountAllEnabledUserNodes(ctx context.Context, req * return nil, err } - tx := this.NullTx() + var tx = this.NullTx() count, err := models.SharedUserNodeDAO.CountAllEnabledUserNodes(tx) if err != nil { @@ -129,7 +129,7 @@ func (this *UserNodeService) ListEnabledUserNodes(ctx context.Context, req *pb.L return nil, err } - tx := this.NullTx() + var tx = this.NullTx() nodes, err := models.SharedUserNodeDAO.ListEnabledUserNodes(tx, req.Offset, req.Size) if err != nil { @@ -168,7 +168,7 @@ func (this *UserNodeService) FindEnabledUserNode(ctx context.Context, req *pb.Fi return nil, err } - tx := this.NullTx() + var tx = this.NullTx() node, err := models.SharedUserNodeDAO.FindEnabledUserNode(tx, req.UserNodeId) if err != nil { @@ -206,7 +206,7 @@ func (this *UserNodeService) FindCurrentUserNode(ctx context.Context, req *pb.Fi return nil, err } - tx := this.NullTx() + var tx = this.NullTx() md, ok := metadata.FromIncomingContext(ctx) if !ok { diff --git a/internal/rpc/services/sevice_http_gzip.go b/internal/rpc/services/sevice_http_gzip.go index 36c5834e..ef31c58a 100644 --- a/internal/rpc/services/sevice_http_gzip.go +++ b/internal/rpc/services/sevice_http_gzip.go @@ -42,7 +42,7 @@ func (this *HTTPGzipService) CreateHTTPGzip(ctx context.Context, req *pb.CreateH } } - tx := this.NullTx() + var tx = this.NullTx() gzipId, err := models.SharedHTTPGzipDAO.CreateGzip(tx, int(req.Level), minLengthJSON, maxLengthJSON, req.CondsJSON) if err != nil { @@ -60,7 +60,7 @@ func (this *HTTPGzipService) FindEnabledHTTPGzipConfig(ctx context.Context, req return nil, err } - tx := this.NullTx() + var tx = this.NullTx() config, err := models.SharedHTTPGzipDAO.ComposeGzipConfig(tx, req.HttpGzipId) if err != nil { @@ -104,7 +104,7 @@ func (this *HTTPGzipService) UpdateHTTPGzip(ctx context.Context, req *pb.UpdateH } } - tx := this.NullTx() + var tx = this.NullTx() err = models.SharedHTTPGzipDAO.UpdateGzip(tx, req.HttpGzipId, int(req.Level), minLengthJSON, maxLengthJSON, req.CondsJSON) if err != nil {