添加ui界面

GraceDotnet · Jul 28, 2023 · be06bcb · be06bcb
1 parent e968d81
commit be06bcb
Show file tree

Hide file tree

Showing 75 changed files with 142 additions and 74,166 deletions.
diff --git a/README.md b/README.md
@@ -21,26 +21,26 @@ Console.WriteLine(sqlStructure);
 // 2.结构比较获取同步结构的sql
 var diff = new DiffUtility(dbSoruce, "test", dbTarget, "test").Diff();
 
-Console.WriteLine("------------需要新建的表-----------");
-foreach (var sqls in diff.CreateTables.Select(x => x.SyncSqls))
+Console.WriteLine("------------新建-----------");
+foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Created).Select(x => x.SyncSqls))
 {
  foreach (var sql in sqls)
  {
  Console.WriteLine(sql);
  }
 }
 
-Console.WriteLine("------------需要删除的表-----------");
-foreach (var sqls in diff.DeleteTables.Select(x => x.SyncSqls))
+Console.WriteLine("------------删除-----------");
+foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Delete).Select(x => x.SyncSqls))
 {
  foreach (var sql in sqls)
  {
  Console.WriteLine(sql);
  }
 }
 
-Console.WriteLine("------------需要修改的字段或索引-----------");
-foreach (var sqls in diff.EditTables.Select(x => x.SyncSqls))
+Console.WriteLine("------------修改-----------");
+foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Edit).Select(x => x.SyncSqls))
 {
  foreach (var sql in sqls)
  {

diff --git a/README_zh.md b/README_zh.md
@@ -21,26 +21,26 @@ Console.WriteLine(sqlStructure);
 // 2.结构比较获取同步结构的sql
 var diff = new DiffUtility(dbSoruce, "test", dbTarget, "test").Diff();
 
-Console.WriteLine("------------需要新建的表-----------");
-foreach (var sqls in diff.CreateTables.Select(x => x.SyncSqls))
+Console.WriteLine("------------新建-----------");
+foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Created).Select(x => x.SyncSqls))
 {
  foreach (var sql in sqls)
  {
  Console.WriteLine(sql);
  }
 }
 
-Console.WriteLine("------------需要删除的表-----------");
-foreach (var sqls in diff.DeleteTables.Select(x => x.SyncSqls))
+Console.WriteLine("------------删除-----------");
+foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Delete).Select(x => x.SyncSqls))
 {
  foreach (var sql in sqls)
  {
  Console.WriteLine(sql);
  }
 }
 
-Console.WriteLine("------------需要修改的字段或索引-----------");
-foreach (var sqls in diff.EditTables.Select(x => x.SyncSqls))
+Console.WriteLine("------------修改-----------");
+foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Edit).Select(x => x.SyncSqls))
 {
  foreach (var sql in sqls)
  {

diff --git a/src/ConsoleApp/Program.cs b/src/ConsoleApp/Program.cs
@@ -20,7 +20,7 @@ static void Main(string[] args)
  var diff = new DiffUtility(dbSoruce, "bxparking", dbTarget, "bxparking").Diff();
 
  Console.WriteLine("------------新建-----------");
- foreach (var sqls in diff.CreateTables.Select(x => x.SyncSqls))
+ foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Created).Select(x => x.SyncSqls))
  {
  foreach (var sql in sqls)
  {
@@ -29,7 +29,7 @@ static void Main(string[] args)
  }
 
  Console.WriteLine("------------删除-----------");
- foreach (var sqls in diff.DeleteTables.Select(x => x.SyncSqls))
+ foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Delete).Select(x => x.SyncSqls))
  {
  foreach (var sql in sqls)
  {
@@ -38,7 +38,7 @@ static void Main(string[] args)
  }
 
  Console.WriteLine("------------修改-----------");
- foreach (var sqls in diff.EditTables.Select(x => x.SyncSqls))
+ foreach (var sqls in diff.Tables.Where(x => x.Operate == OprateEnum.Edit).Select(x => x.SyncSqls))
  {
  foreach (var sql in sqls)
  {

diff --git a/src/OnlineWebApp/Controllers/HomeController.cs b/src/OnlineWebApp/Controllers/HomeController.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using OnlineWebApp.Models;
+using PowerSchemaSync.Models;
 using System.Diagnostics;
 
 namespace OnlineWebApp.Controllers
@@ -18,7 +19,22 @@ public IActionResult Index()
  return View();
  }
 
- public IActionResult Privacy()
+ public IActionResult PreSync()
+ {
+ return View();
+ }
+
+ /// <summary>
+ /// 
+ /// </summary>
+ /// <param name="s">源连接串</param>
+ /// <param name="ss">源schema</param>
+ /// <param name="st">源数据库类型</param>
+ /// <param name="t">目标连接串</param>
+ /// <param name="ts">目标schema</param>
+ /// <param name="tt">目标数据库类型</param>
+ /// <returns></returns>
+ public IActionResult SyncCheck(string s, string ss, DataBaseType st, string t, string ts, DataBaseType tt)
  {
  return View();
  }

diff --git a/src/OnlineWebApp/OnlineWebApp.csproj b/src/OnlineWebApp/OnlineWebApp.csproj
@@ -6,4 +6,8 @@
  <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>
 
+ <ItemGroup>
+ <ProjectReference Include="..\PowerSchemaSync\PowerSchemaSync.csproj" />
+ </ItemGroup>
+
 </Project>
diff --git a/src/OnlineWebApp/OnlineWebApp.csproj.user b/src/OnlineWebApp/OnlineWebApp.csproj.user
@@ -2,5 +2,9 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
  <ActiveDebugProfile>https</ActiveDebugProfile>
+ <View_SelectedScaffolderID>RazorViewEmptyScaffolder</View_SelectedScaffolderID>
+ <View_SelectedScaffolderCategoryPath>root/Common/MVC/View</View_SelectedScaffolderCategoryPath>
+ <Controller_SelectedScaffolderID>ApiControllerWithActionsScaffolder</Controller_SelectedScaffolderID>
+ <Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
  </PropertyGroup>
 </Project>
diff --git a/src/OnlineWebApp/Program.cs b/src/OnlineWebApp/Program.cs
@@ -1,3 +1,5 @@
+using OnlineWebApp.Filters;
+
 namespace OnlineWebApp
 {
  public class Program
@@ -9,6 +11,8 @@ public static void Main(string[] args)
  // Add services to the container.
  builder.Services.AddControllersWithViews();
 
+ builder.Services.AddSingleton<CustomExceptionFilterAttribute>();
+
  var app = builder.Build();
 
  // Configure the HTTP request pipeline.

diff --git a/src/OnlineWebApp/Views/Home/Index.cshtml b/src/OnlineWebApp/Views/Home/Index.cshtml
@@ -1,8 +1,28 @@
 @{
- ViewData["Title"] = "Home Page";
+ ViewData["Title"] = "首页";
 }
 
-<div class="text-center">
- <h1 class="display-4">Welcome</h1>
- <p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
+<div id="app">
+ <el-button @@click="goSync">{{ message }}</el-button>
 </div>
+
+@section js{
+ <script>
+ const app = Vue.createApp(
+ {
+ data() {
+ return {
+ message: "结构同步",
+ };
+ },
+
+ methods: {
+ goSync() {
+ location.href = "/home/presync";
+ }
+ }
+ }
+ ).use(ElementPlus).mount("#app");
+ </script>
+}
+
diff --git a/src/OnlineWebApp/Views/Home/Privacy.cshtml b/src/OnlineWebApp/Views/Home/Privacy.cshtml
diff --git a/src/OnlineWebApp/Views/Shared/_Layout.cshtml b/src/OnlineWebApp/Views/Shared/_Layout.cshtml
@@ -1,49 +1,20 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" class="dark">
 <head>
  <meta charset="utf-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>@ViewData["Title"] - OnlineWebApp</title>
- <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
- <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
- <link rel="stylesheet" href="~/OnlineWebApp.styles.css" asp-append-version="true" />
+ <title>@ViewData["Title"]</title>
+ <link rel="stylesheet" href="//unpkg.com/element-plus/dist/index.css" />
+ <script src="//unpkg.com/vue@3"></script>
+ <script src="//unpkg.com/element-plus"></script>
+ @await RenderSectionAsync("css", required: false)
 </head>
 <body>
- <header>
- <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
- <div class="container-fluid">
- <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">OnlineWebApp</a>
- <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
- aria-expanded="false" aria-label="Toggle navigation">
- <span class="navbar-toggler-icon"></span>
- </button>
- <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
- <ul class="navbar-nav flex-grow-1">
- <li class="nav-item">
- <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
- </li>
- <li class="nav-item">
- <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
- </li>
- </ul>
- </div>
- </div>
- </nav>
- </header>
- <div class="container">
- <main role="main" class="pb-3">
- @RenderBody()
- </main>
- </div>
+ <main role="main">
+ @RenderBody()
+ </main>
 
- <footer class="border-top footer text-muted">
- <div class="container">
- &copy; 2023 - OnlineWebApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
- </div>
- </footer>
- <script src="~/lib/jquery/dist/jquery.min.js"></script>
- <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
- <script src="~/js/site.js" asp-append-version="true"></script>
- @await RenderSectionAsync("Scripts", required: false)
+ <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
+ @await RenderSectionAsync("js", required: false)
 </body>
 </html>
diff --git a/src/OnlineWebApp/wwwroot/css/site.css b/src/OnlineWebApp/wwwroot/css/site.css
diff --git a/src/OnlineWebApp/wwwroot/js/site.js b/src/OnlineWebApp/wwwroot/js/site.js
diff --git a/src/OnlineWebApp/wwwroot/lib/bootstrap/LICENSE b/src/OnlineWebApp/wwwroot/lib/bootstrap/LICENSE