完善域名服务器多对多关联与共享路径预检,补齐回归源码及进度文档
支持同项目内域名与服务器双向复用,局部修改和清空不影响其他域名;在绑定保存、服务器编辑和部署前拒绝已知共享路径冲突。 新增仓储、接口、工作流与页面回归源码,同步任务状态和第三版接口交接。按要求先开发后统一测试,本批未运行测试、构建或部署,保留在途任务与主机别名等待办。
This commit is contained in:
1 parent
f38e290b22
commit
e2200534d3
25 files changed
+740
-41
No files matched your search
@@ -72,11 +72,12 @@ func (r *SQLProjectMemberRepository) ReplaceProjectDomainServers(ctx context.Con
|
||||
return nil, errors.New("项目绑定及授权审计相关表必须使用 InnoDB")
|
||||
}
|
||||
}
|
||||
var projectID string
|
||||
var candidate domain.Domain
|
||||
if err := tx.QueryRowContext(ctx, Rebind(r.driver,
|
||||
`SELECT project_id FROM domains WHERE id = ?`+r.resourceWriteLock()), domainID).Scan(&projectID); err != nil {
|
||||
`SELECT id, project_id, name, certificate_type FROM domains WHERE id = ?`+r.resourceWriteLock()), domainID).Scan(&candidate.ID, &candidate.ProjectID, &candidate.Name, &candidate.CertificateType); err != nil {
|
||||
return nil, projectBindingReadError(err)
|
||||
}
|
||||
projectID := candidate.ProjectID
|
||||
if err := r.authorizeBindingTransaction(ctx, tx, actorID, projectID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -92,6 +93,11 @@ func (r *SQLProjectMemberRepository) ReplaceProjectDomainServers(ctx context.Con
|
||||
}
|
||||
items = append(items, item)
|
||||
}
|
||||
for _, item := range items {
|
||||
if err := validateServerDomainPaths(ctx, tx, r.driver, item, &candidate); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, Rebind(r.driver, `DELETE FROM domain_servers WHERE domain_id = ?`), domainID); err != nil {
|
||||
return nil, fmt.Errorf("清理项目绑定失败:%w", err)
|
||||
}
|
||||
@@ -166,8 +172,8 @@ func (r *SQLProjectMemberRepository) authorizeBindingTransaction(ctx context.Con
|
||||
}
|
||||
defer rows.Close()
|
||||
permissions := map[domain.ProjectPermission]bool{
|
||||
domain.PermissionCertificateRead: false,
|
||||
domain.PermissionServerRead: false,
|
||||
domain.PermissionCertificateRead: false,
|
||||
domain.PermissionServerRead: false,
|
||||
domain.PermissionDeploymentExecute: false,
|
||||
}
|
||||
for rows.Next() {
|
||||
|
||||
Reference in new issue
Block a user