diff --git a/src/Services/MASA.PM.Service.Admin/Infrastructure/Repositories/AppRepository.cs b/src/Services/MASA.PM.Service.Admin/Infrastructure/Repositories/AppRepository.cs index 9c4322d..a072e29 100644 --- a/src/Services/MASA.PM.Service.Admin/Infrastructure/Repositories/AppRepository.cs +++ b/src/Services/MASA.PM.Service.Admin/Infrastructure/Repositories/AppRepository.cs @@ -165,7 +165,7 @@ join envCluster in _dbContext.EnvironmentClusters on ecp.EnvironmentClusterId eq join env in _dbContext.Environments on envCluster.EnvironmentId equals env.Id join cluster in _dbContext.Clusters on envCluster.ClusterId equals cluster.Id join ecpa in _dbContext.EnvironmentClusterProjectApps on ecp.Id equals ecpa.EnvironmentClusterProjectId - join app in _dbContext.Apps.Where(app => app.Name == name || app.Identity.ToLower() == identity && !excludeAppIds.Contains(app.Id)) on ecpa.AppId equals app.Id + join app in _dbContext.Apps.Where(app => (app.Name == name || app.Identity.ToLower() == identity) && !excludeAppIds.Contains(app.Id)) on ecpa.AppId equals app.Id select new { EnvironmentName = env.Name, diff --git a/src/Services/MASA.PM.Service.Admin/Infrastructure/Repositories/ProjectRepository.cs b/src/Services/MASA.PM.Service.Admin/Infrastructure/Repositories/ProjectRepository.cs index ef0f55d..ca808ac 100644 --- a/src/Services/MASA.PM.Service.Admin/Infrastructure/Repositories/ProjectRepository.cs +++ b/src/Services/MASA.PM.Service.Admin/Infrastructure/Repositories/ProjectRepository.cs @@ -1,254 +1,251 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the Apache License. See LICENSE.txt in the project root for license information. -using MASA.PM.Service.Admin.Infrastructure.Entities; +namespace MASA.PM.Service.Admin.Infrastructure.Repositories; -namespace MASA.PM.Service.Admin.Infrastructure.Repositories +public class ProjectRepository : IProjectRepository { - public class ProjectRepository : IProjectRepository + private readonly PmDbContext _dbContext; + private readonly II18n _i18N; + public ProjectRepository(PmDbContext dbContext, II18n i18N) { - private readonly PmDbContext _dbContext; - private readonly II18n _i18N; - public ProjectRepository(PmDbContext dbContext, II18n i18N) - { - _dbContext = dbContext; - _i18N = i18N; - } + _dbContext = dbContext; + _i18N = i18N; + } - public async Task AddAsync(Project project) + public async Task AddAsync(Project project) + { + if (await _dbContext.Projects.AnyAsync(p => p.Name == project.Name)) { - if (_dbContext.Projects.Any(p => p.Name == project.Name)) - { - throw new UserFriendlyException(_i18N.T("Project name already exists!")); - } - if (_dbContext.Projects.Any(p => p.Identity == project.Identity)) - { - throw new UserFriendlyException(_i18N.T("Project ID already exists!")); - } - - await _dbContext.Projects.AddAsync(project); - await _dbContext.SaveChangesAsync(); - - return project; + throw new UserFriendlyException(_i18N.T("Project name already exists!")); } - - public async Task AddEnvironmentClusterProjectsAsync(IEnumerable environmentClusterProjects) + if (await _dbContext.Projects.AnyAsync(p => p.Identity == project.Identity)) { - if (environmentClusterProjects.Any()) - { - await _dbContext.EnvironmentClusterProjects.AddRangeAsync(environmentClusterProjects); - await _dbContext.SaveChangesAsync(); - } + throw new UserFriendlyException(_i18N.T("Project ID already exists!")); } - public async Task AddEnvironmentClusterProjectAsync(EnvironmentClusterProject environmentClusterProject) + await _dbContext.Projects.AddAsync(project); + await _dbContext.SaveChangesAsync(); + + return project; + } + + public async Task AddEnvironmentClusterProjectsAsync(IEnumerable environmentClusterProjects) + { + if (environmentClusterProjects.Any()) { - await _dbContext.AddAsync(environmentClusterProject); + await _dbContext.EnvironmentClusterProjects.AddRangeAsync(environmentClusterProjects); await _dbContext.SaveChangesAsync(); - - return environmentClusterProject; } + } - public async Task<(List, List)> GetListByTeamIdsAsync(List teamIds, string environment) - { - var projectTeams = (await _dbContext.EnvironmentProjectTeams - .Where(c => teamIds.Contains(c.TeamId) && environment.Equals(c.EnvironmentName)) - .ToListAsync()) - .DistinctBy(c => new { c.ProjectId, c.TeamId }) - .ToList(); + public async Task AddEnvironmentClusterProjectAsync(EnvironmentClusterProject environmentClusterProject) + { + await _dbContext.AddAsync(environmentClusterProject); + await _dbContext.SaveChangesAsync(); - var projects = await _dbContext.Projects.Where(project => projectTeams.Select(c => c.ProjectId).Contains(project.Id)).ToListAsync(); + return environmentClusterProject; + } - return new ValueTuple, List>(projects, projectTeams); - } + public async Task<(List, List)> GetListByTeamIdsAsync(List teamIds, string environment) + { + var projectTeams = (await _dbContext.EnvironmentProjectTeams + .Where(c => teamIds.Contains(c.TeamId) && environment.Equals(c.EnvironmentName)) + .ToListAsync()) + .DistinctBy(c => new { c.ProjectId, c.TeamId }) + .ToList(); - public async Task RemoveAsync(int Id) - { - var project = await _dbContext.Projects.FirstOrDefaultAsync(project => project.Id == Id); - if (project == null) - { - throw new UserFriendlyException(_i18N.T("Project does not exist!")); - } + var projects = await _dbContext.Projects.Where(project => projectTeams.Select(c => c.ProjectId).Contains(project.Id)).ToListAsync(); - _dbContext.Projects.Remove(project); - await _dbContext.SaveChangesAsync(); - } + return new ValueTuple, List>(projects, projectTeams); + } - public async Task RemoveEnvironmentClusterProjects(IEnumerable environmentClusterProjects) + public async Task RemoveAsync(int Id) + { + var project = await _dbContext.Projects.FirstOrDefaultAsync(project => project.Id == Id); + if (project == null) { - if (environmentClusterProjects.Any()) - { - _dbContext.EnvironmentClusterProjects.RemoveRange(environmentClusterProjects); - await _dbContext.SaveChangesAsync(); - } + throw new UserFriendlyException(_i18N.T("Project does not exist!")); } - public async Task GetAsync(int Id) - { - var result = await _dbContext.Projects.FirstOrDefaultAsync(project => project.Id == Id); + _dbContext.Projects.Remove(project); + await _dbContext.SaveChangesAsync(); + } - return result ?? throw new UserFriendlyException(_i18N.T("Project does not exist!")); + public async Task RemoveEnvironmentClusterProjects(IEnumerable environmentClusterProjects) + { + if (environmentClusterProjects.Any()) + { + _dbContext.EnvironmentClusterProjects.RemoveRange(environmentClusterProjects); + await _dbContext.SaveChangesAsync(); } + } - public async Task GetByIdentityAsync(string identity) - { - var result = await _dbContext.Projects.FirstOrDefaultAsync(project => project.Identity == identity); + public async Task GetAsync(int Id) + { + var result = await _dbContext.Projects.FirstOrDefaultAsync(project => project.Id == Id); - return result ?? throw new UserFriendlyException(_i18N.T("Project does not exist!")); - } + return result ?? throw new UserFriendlyException(_i18N.T("Project does not exist!")); + } - public async Task> GetListAsync() - { - var result = await _dbContext.Projects.ToListAsync(); + public async Task GetByIdentityAsync(string identity) + { + var result = await _dbContext.Projects.FirstOrDefaultAsync(project => project.Identity == identity); - return result; - } + return result ?? throw new UserFriendlyException(_i18N.T("Project does not exist!")); + } - public async Task> GetEnvironmentClusterProjectsByProjectIdAsync(int projectId) - { - var result = await _dbContext.EnvironmentClusterProjects.Where(environmentClusterProject => environmentClusterProject.ProjectId == projectId).ToListAsync(); + public async Task> GetListAsync() + { + var result = await _dbContext.Projects.ToListAsync(); - return result; - } + return result; + } - public async Task> GetEnvironmentClusterProjectsByProjectIdAndEnvirionmentClusterIds(int projectId, IEnumerable environmentClusterIds) - { - var result = await _dbContext.EnvironmentClusterProjects - .Where(ecp => ecp.ProjectId == projectId && environmentClusterIds.Contains(ecp.EnvironmentClusterId)) - .ToListAsync(); + public async Task> GetEnvironmentClusterProjectsByProjectIdAsync(int projectId) + { + var result = await _dbContext.EnvironmentClusterProjects.Where(environmentClusterProject => environmentClusterProject.ProjectId == projectId).ToListAsync(); - return result; - } + return result; + } - public async Task> GetEnvironmentClusterProjectsById(IEnumerable envClusterIds, int projectId) - { - var result = await _dbContext.EnvironmentClusterProjects - .Where(ecp => envClusterIds.Contains(ecp.EnvironmentClusterId) && ecp.ProjectId == projectId) - .ToListAsync(); + public async Task> GetEnvironmentClusterProjectsByProjectIdAndEnvirionmentClusterIds(int projectId, IEnumerable environmentClusterIds) + { + var result = await _dbContext.EnvironmentClusterProjects + .Where(ecp => ecp.ProjectId == projectId && environmentClusterIds.Contains(ecp.EnvironmentClusterId)) + .ToListAsync(); - return result; - } + return result; + } - public async Task> GetListByEnvironmentClusterIdAsync(int environmentClusterId) - { - System.Linq.Expressions.Expression> predicate = environmentClusterProject => - environmentClusterProject.EnvironmentClusterId == environmentClusterId; + public async Task> GetEnvironmentClusterProjectsById(IEnumerable envClusterIds, int projectId) + { + var result = await _dbContext.EnvironmentClusterProjects + .Where(ecp => envClusterIds.Contains(ecp.EnvironmentClusterId) && ecp.ProjectId == projectId) + .ToListAsync(); - var projectIds = await _dbContext.EnvironmentClusterProjects.Where(predicate) - .Select(project => project.ProjectId) - .ToListAsync(); + return result; + } - var result = await _dbContext.Projects.Where(project => projectIds.Contains(project.Id)).ToListAsync(); - return result; - } + public async Task> GetListByEnvironmentClusterIdAsync(int environmentClusterId) + { + System.Linq.Expressions.Expression> predicate = environmentClusterProject => + environmentClusterProject.EnvironmentClusterId == environmentClusterId; - public async Task> GetProjectListByEnvIdAsync(string envName) - { - var projects = await (from env in _dbContext.Environments.Where(env => env.Name == envName) - join envCluster in _dbContext.EnvironmentClusters on env.Id equals envCluster.EnvironmentId - join envClusterProject in _dbContext.EnvironmentClusterProjects on envCluster.Id equals envClusterProject.EnvironmentClusterId - join project in _dbContext.Projects on envClusterProject.ProjectId equals project.Id - select project) - .Distinct() - .ToListAsync(); - - return projects; - } + var projectIds = await _dbContext.EnvironmentClusterProjects.Where(predicate) + .Select(project => project.ProjectId) + .ToListAsync(); - public async Task UpdateAsync(Project project) - { - if (_dbContext.Projects.Any(e => e.Name.ToLower() == project.Name.ToLower() && e.Id != project.Id)) - { - throw new UserFriendlyException(_i18N.T("Project name already exists!")); - } + var result = await _dbContext.Projects.Where(project => projectIds.Contains(project.Id)).ToListAsync(); + return result; + } - _dbContext.Projects.Update(project); - await _dbContext.SaveChangesAsync(); - } + public async Task> GetProjectListByEnvIdAsync(string envName) + { + var projects = await (from env in _dbContext.Environments.Where(env => env.Name == envName) + join envCluster in _dbContext.EnvironmentClusters on env.Id equals envCluster.EnvironmentId + join envClusterProject in _dbContext.EnvironmentClusterProjects on envCluster.Id equals envClusterProject.EnvironmentClusterId + join project in _dbContext.Projects on envClusterProject.ProjectId equals project.Id + select project) + .Distinct() + .ToListAsync(); + + return projects; + } - public async Task IsExistedProjectName(string name, List environmentClusterIds, params int[] excludeProjectIds) + public async Task UpdateAsync(Project project) + { + if (await _dbContext.Projects.AnyAsync(e => e.Name.ToLower() == project.Name.ToLower() && e.Id != project.Id)) { - var result = await (from project in _dbContext.Projects.Where(project => project.Name.ToLower() == name.ToLower() && !excludeProjectIds.Contains(project.Id)) - join ecp in _dbContext.EnvironmentClusterProjects on project.Id equals ecp.ProjectId - join ec in _dbContext.EnvironmentClusters.Where(envCluster => environmentClusterIds.Contains(envCluster.Id)) on ecp.EnvironmentClusterId equals ec.Id - join e in _dbContext.Environments on ec.EnvironmentId equals e.Id - join c in _dbContext.Clusters on ec.ClusterId equals c.Id - select new - { - EnvironmentName = e.Name, - ClusterName = c.Name - }).FirstOrDefaultAsync(); - - if (result != null) - { - string message = _i18N.T("The project name [{name}] already exists in the environment [{EnvironmentName}]/environment [{ClusterName}]!") - .Replace("{name}", name) - .Replace("{EnvironmentName}", result.EnvironmentName) - .Replace("{ClusterName}", result.ClusterName); - throw new UserFriendlyException(message); - } + throw new UserFriendlyException(_i18N.T("Project name already exists!")); } - public async Task IsExistProjectInCluster(int clusterId) - { - var result = await (from envCluster in _dbContext.EnvironmentClusters - join envClusterProject in _dbContext.EnvironmentClusterProjects on envCluster.Id equals envClusterProject.EnvironmentClusterId - select envCluster - ).AnyAsync(ec => ec.ClusterId == clusterId); + _dbContext.Projects.Update(project); + await _dbContext.SaveChangesAsync(); + } - return result; + public async Task IsExistedProjectName(string name, List environmentClusterIds, params int[] excludeProjectIds) + { + var result = await (from project in _dbContext.Projects.Where(project => project.Name.ToLower() == name.ToLower() && !excludeProjectIds.Contains(project.Id)) + join ecp in _dbContext.EnvironmentClusterProjects on project.Id equals ecp.ProjectId + join ec in _dbContext.EnvironmentClusters.Where(envCluster => environmentClusterIds.Contains(envCluster.Id)) on ecp.EnvironmentClusterId equals ec.Id + join e in _dbContext.Environments on ec.EnvironmentId equals e.Id + join c in _dbContext.Clusters on ec.ClusterId equals c.Id + select new + { + EnvironmentName = e.Name, + ClusterName = c.Name + }).FirstOrDefaultAsync(); + + if (result != null) + { + string message = _i18N.T("The project name [{name}] already exists in the environment [{EnvironmentName}]/environment [{ClusterName}]!") + .Replace("{name}", name) + .Replace("{EnvironmentName}", result.EnvironmentName) + .Replace("{ClusterName}", result.ClusterName); + throw new UserFriendlyException(message); } + } + public async Task IsExistProjectInCluster(int clusterId) + { + var result = await (from envCluster in _dbContext.EnvironmentClusters + join envClusterProject in _dbContext.EnvironmentClusterProjects on envCluster.Id equals envClusterProject.EnvironmentClusterId + select envCluster + ).AnyAsync(ec => ec.ClusterId == clusterId); - public async Task AddEnvironemtProjectTeamAsync(EnvironmentProjectTeam environmentProjectTeam) - { - await _dbContext.EnvironmentProjectTeams.AddAsync(environmentProjectTeam); - await _dbContext.SaveChangesAsync(); - } + return result; + } - public async Task AddEnvironemtProjectTeamsAsync(IEnumerable environmentProjectTeams) - { - await _dbContext.EnvironmentProjectTeams.AddRangeAsync(environmentProjectTeams); - await _dbContext.SaveChangesAsync(); - } - public async Task RemoveEnvironemtProjectTeamAsync(int projectId, string environemntName) - { - var envProjectTeams = await _dbContext.EnvironmentProjectTeams.Where(c => c.ProjectId == projectId && c.EnvironmentName == environemntName).ToListAsync(); - if (envProjectTeams != null && envProjectTeams.Any()) - { - _dbContext.EnvironmentProjectTeams.RemoveRange(envProjectTeams); - await _dbContext.SaveChangesAsync(); - } - } + public async Task AddEnvironemtProjectTeamAsync(EnvironmentProjectTeam environmentProjectTeam) + { + await _dbContext.EnvironmentProjectTeams.AddAsync(environmentProjectTeam); + await _dbContext.SaveChangesAsync(); + } + + public async Task AddEnvironemtProjectTeamsAsync(IEnumerable environmentProjectTeams) + { + await _dbContext.EnvironmentProjectTeams.AddRangeAsync(environmentProjectTeams); + await _dbContext.SaveChangesAsync(); + } - public async Task RemoveProjectEnvironemtTeamsAsync(int projectId) + public async Task RemoveEnvironemtProjectTeamAsync(int projectId, string environemntName) + { + var envProjectTeams = await _dbContext.EnvironmentProjectTeams.Where(c => c.ProjectId == projectId && c.EnvironmentName == environemntName).ToListAsync(); + if (envProjectTeams != null && envProjectTeams.Any()) { - var envProjectTeams = await _dbContext.EnvironmentProjectTeams.Where(c => c.ProjectId == projectId).ToListAsync(); - if (envProjectTeams != null && envProjectTeams.Any()) - { - _dbContext.EnvironmentProjectTeams.RemoveRange(envProjectTeams); - await _dbContext.SaveChangesAsync(); - } + _dbContext.EnvironmentProjectTeams.RemoveRange(envProjectTeams); + await _dbContext.SaveChangesAsync(); } + } - public async Task> GetProjectTeamByProjectId(int projectId) + public async Task RemoveProjectEnvironemtTeamsAsync(int projectId) + { + var envProjectTeams = await _dbContext.EnvironmentProjectTeams.Where(c => c.ProjectId == projectId).ToListAsync(); + if (envProjectTeams != null && envProjectTeams.Any()) { - var projectTeams = await _dbContext.EnvironmentProjectTeams - .Where(c => c.ProjectId == projectId) - .ToListAsync(); - - return projectTeams; + _dbContext.EnvironmentProjectTeams.RemoveRange(envProjectTeams); + await _dbContext.SaveChangesAsync(); } + } - public async Task> GetProjectTeamByProjectIds(IEnumerable projectIds) - { - var projectTeams = await _dbContext.EnvironmentProjectTeams - .Where(c => projectIds.Contains(c.ProjectId)) - .ToListAsync(); + public async Task> GetProjectTeamByProjectId(int projectId) + { + var projectTeams = await _dbContext.EnvironmentProjectTeams + .Where(c => c.ProjectId == projectId) + .ToListAsync(); - return projectTeams; - } + return projectTeams; + } + public async Task> GetProjectTeamByProjectIds(IEnumerable projectIds) + { + var projectTeams = await _dbContext.EnvironmentProjectTeams + .Where(c => projectIds.Contains(c.ProjectId)) + .ToListAsync(); + + return projectTeams; } + } diff --git a/src/Services/MASA.PM.Service.Admin/Properties/launchSettings.json b/src/Services/MASA.PM.Service.Admin/Properties/launchSettings.json index 0b5944e..5a0f54c 100644 --- a/src/Services/MASA.PM.Service.Admin/Properties/launchSettings.json +++ b/src/Services/MASA.PM.Service.Admin/Properties/launchSettings.json @@ -17,7 +17,7 @@ "OTLP_URL": "https://otel-collector.masastack:9013", "REDIS": "{\"RedisHost\": \"10.130.0.19\", \"RedisPort\": 2135, \"RedisDb\": 3,\"RedisPassword\": \"Hzss@123\"}", "CONNECTIONSTRING": "{\"Server\": \"10.130.0.235\", \"Port\": 24878,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}", - "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"http://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"http://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"http://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"http://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"http://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"http://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"http://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"http://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]", + "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"https://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"https://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"https://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"https://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"https://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"https://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"https://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"https://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]", "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}", "ENVIRONMENT": "Development", "ADMIN_PWD": "admin_pwd", diff --git a/src/Web/MASA.PM.Web.Admin/Properties/launchSettings.json b/src/Web/MASA.PM.Web.Admin/Properties/launchSettings.json index 8b7e618..3b16262 100644 --- a/src/Web/MASA.PM.Web.Admin/Properties/launchSettings.json +++ b/src/Web/MASA.PM.Web.Admin/Properties/launchSettings.json @@ -14,7 +14,7 @@ "OTLP_URL": "https://otel-collector.masastack:9013", "REDIS": "{\"RedisHost\": \"10.130.0.19\", \"RedisPort\": 2135, \"RedisDb\": 3,\"RedisPassword\": \"Hzss@123\"}", "CONNECTIONSTRING": "{\"Server\": \"10.130.0.19\", \"Port\": 2415,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}", - "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"http://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"http://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"http://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"http://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"http://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"http://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"http://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"http://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]", + "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"https://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"https://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"https://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"https://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"https://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"https://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"https://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"https://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]", "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}", "ENVIRONMENT": "Development", "ADMIN_PWD": "admin_pwd",