Merge branch 'master' of https://dev.azure.com/luolan/ASG%E7%B3%BB%E7%BB%9F/_git/asg_backend
This commit is contained in:
		
						commit
						9e4d4144a6
					
				@ -37,7 +37,7 @@ namespace asg_form.Controllers
 | 
				
			|||||||
            {
 | 
					            {
 | 
				
			||||||
                TestDbContext testDb = new TestDbContext();
 | 
					                TestDbContext testDb = new TestDbContext();
 | 
				
			||||||
                string chinaname = user.chinaname;
 | 
					                string chinaname = user.chinaname;
 | 
				
			||||||
                var teamgame = testDb.team_Games.Where(a => a.commentary.IndexOf(chinaname) >= 0).Select(a => new { a.id, a.team1_name, a.team2_name, a.bilibiliuri, a.commentary, a.referee, a.opentime,a.tag,a.belong}).ToList();
 | 
					                var teamgame = testDb.team_Games.Where(a => a.commentary.IndexOf(chinaname) >= 0).Select(a => new { a.id, a.team1_name, a.team2_name, a.bilibiliuri, a.commentary, a.referee ,a.opentime}).ToList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                return JsonConvert.SerializeObject(teamgame);
 | 
					                return JsonConvert.SerializeObject(teamgame);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										7
									
								
								asg_form/Controllers/InviteReferee.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								asg_form/Controllers/InviteReferee.cs
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
				
			|||||||
 | 
					namespace asg_form.Controllers
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    public class InviteReferee
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -235,7 +235,7 @@ namespace asg_form.Controllers
 | 
				
			|||||||
            {
 | 
					            {
 | 
				
			||||||
using(TestDbContext ctx =new TestDbContext())
 | 
					using(TestDbContext ctx =new TestDbContext())
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    object data = userManager.Users.Select(a => new {a.UserName,a.chinaname,a.Email,a.officium}).Where(a => a.officium != null).GroupBy(a => a.officium).ToList();
 | 
					                    object data = userManager.Users.Select(a => new {a.Id,a.UserName,a.chinaname,a.Email,a.officium}).Where(a => a.officium != null).GroupBy(a => a.officium).ToList();
 | 
				
			||||||
                    return data;
 | 
					                    return data;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                
 | 
					                
 | 
				
			||||||
 | 
				
			|||||||
@ -22,7 +22,6 @@ using System.Text;
 | 
				
			|||||||
Console.WriteLine("\n   _____    _________ ________ \n  /  _  \\  /   _____//  _____/ \n /  /_\\  \\ \\_____  \\/   \\  ___ \n/    |    \\/        \\    \\_\\  \\\n\\____|__  /_______  /\\______  /\n        \\/        \\/        \\/ \n__________                __    ___________           .___\n\\______   \\_____    ____ |  | __\\_   _____/ ____    __| _/\n |    |  _/\\__  \\ _/ ___\\|  |/ / |    __)_ /    \\  / __ | \n |    |   \\ / __ \\\\  \\___|    <  |        \\   |  \\/ /_/ | \n |______  /(____  /\\___  >__|_ \\/_______  /___|  /\\____ | \n        \\/      \\/     \\/     \\/        \\/     \\/      \\/ ");
 | 
					Console.WriteLine("\n   _____    _________ ________ \n  /  _  \\  /   _____//  _____/ \n /  /_\\  \\ \\_____  \\/   \\  ___ \n/    |    \\/        \\    \\_\\  \\\n\\____|__  /_______  /\\______  /\n        \\/        \\/        \\/ \n__________                __    ___________           .___\n\\______   \\_____    ____ |  | __\\_   _____/ ____    __| _/\n |    |  _/\\__  \\ _/ ___\\|  |/ / |    __)_ /    \\  / __ | \n |    |   \\ / __ \\\\  \\___|    <  |        \\   |  \\/ /_/ | \n |______  /(____  /\\___  >__|_ \\/_______  /___|  /\\____ | \n        \\/      \\/     \\/     \\/        \\/     \\/      \\/ ");
 | 
				
			||||||
var builder = WebApplication.CreateBuilder(args);
 | 
					var builder = WebApplication.CreateBuilder(args);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
//builder.AddServiceDefaults();
 | 
					//builder.AddServiceDefaults();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Add services to the container.
 | 
					// Add services to the container.
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user