Merge branch 'liaozb:master' into master

Author: TommyLemon

Diff for: APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs

@@ -134,9 +134,6 @@ public ActionResult Add([FromBody]JObject jobject)
             ht.Add("msg", "success");
             try
             {
-
-
-
                 foreach (var item in jobject)
                 {
                     string key = item.Key.Trim();

Diff for: APIJSON.NET/APIJSON.NET/Data/DbContext.cs

@@ -1,4 +1,4 @@
-using APIJSON.NET.Models;
+using APIJSON.NET.Data.Models;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using SqlSugar;

Diff for: APIJSON.NET/APIJSON.NET/Data/DbInit.cs

@@ -1,4 +1,4 @@
-using APIJSON.NET.Models;
+using APIJSON.NET.Data.Models;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using SqlSugar;

Diff for: APIJSON.NET/APIJSON.NET/Models/Login.cs renamed to APIJSON.NET/APIJSON.NET/Data/Models/Login.cs

@@ -1,20 +1,20 @@
 using SqlSugar;
 using System;
 
-namespace APIJSON.NET.Models
+namespace APIJSON.NET.Data.Models
 {
     public class Login
     {
         [SugarColumn(IsNullable = false, IsPrimaryKey = true)]
         public int userId { get; set; }
-        [SugarColumn(Length =100,ColumnDescription ="用户名")]
+        [SugarColumn(Length = 100, ColumnDescription = "用户名")]
         public string userName { get; set; }
         [SugarColumn(Length = 200, ColumnDescription = "密码")]
         public string passWord { get; set; }
         [SugarColumn(Length = 100, ColumnDescription = "密码盐")]
         public string passWordSalt { get; set; }
         [SugarColumn(Length = 100, ColumnDescription = "权限组")]
         public string roleCode { get; set; }
-       
+
     }
 }

Diff for: APIJSON.NET/APIJSON.NET/Program.cs

@@ -19,7 +19,11 @@
 
 // Add services to the container.
 
-builder.Services.AddControllers();
+builder.Services.AddControllers().AddNewtonsoftJson(options =>
+{
+    options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
+    options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
+});
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 
@@ -42,23 +46,18 @@
       .AllowAnyHeader()
       .AllowAnyMethod().AllowCredentials()
       ));
-builder.Services.AddControllers()
-    .AddNewtonsoftJson(options =>
-    {
-        options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
-        options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
-    }); ;
+ 
 builder.Services.AddSwaggerGen(c =>
 {
     c.SwaggerDoc("v1", new OpenApiInfo { Title = "APIJSON.NET", Version = "v1" });
 });
 builder.Services.AddSingleton<DbContext>();
-builder.Services.AddSingleton<SelectTable>();
+
 builder.Services.AddSingleton<TokenAuthConfiguration>();
 builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddTransient<IIdentityService, IdentityService>();
 builder.Services.AddTransient<ITableMapper, TableMapper>();
-
+ 
 
 var app = builder.Build();
 
@@ -74,6 +73,7 @@
 }
 
 app.UseHttpsRedirection();
+app.UseDefaultFiles();
 app.UseStaticFiles();
 app.UseAuthorization();
 app.UseCors(_defaultCorsPolicyName);

Diff for: APIJSON.NET/APIJSON.NET/appsettings.json

@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
-    "DbType": 0, //0:MySql,1:SqlServer,2:Sqlite
-    "ConnectionString": "Server=192.168.2.25;Database=yunwei1.8;Uid=root;Pwd=xmjk;Port=3306;Character Set=utf8;"
+    "DbType": 1, //0:MySql,1:SqlServer,2:Sqlite
+    "ConnectionString": "Server=localhost;Database=APIJSON.NET;Uid=sa;Pwd=sa123qwe,;"
     //"ConnectionString": "Server=119.29.9.25;Port=3306;Database=test;Uid=root;Pwd=1q,2w.3e?;CharSet=UTF8;"
   },
   "CorsUrls": "http://localhost:5000,http://localhost5001",
@@ -15,21 +15,21 @@
   },
   "RoleList": [
     {
-      "name": "role1", //Ȩ������ Ψһ
-      "select": { //��ѯȨ��
-        "table": [ "*" ], //�ɲ����ı�
-        "column": [ "*" ], //�ɲ������ֶ�
+      "name": "role1", //权限名称 唯一
+      "select": { //查询权限
+        "table": [ "*" ], //可操作的表
+        "column": [ "*" ], //可操作的字段
         "where": []
       },
-      "update": { //�޸�Ȩ��
+      "update": { //修改权限
         "table": [ "moment", "User", "Comment" ],
         "column": [ "*", "*", "*" ]
       },
-      "insert": { //���Ȩ��
+      "insert": { //添加权限
         "table": [ "moment", "User", "Comment" ],
         "column": [ "*", "*", "*" ]
       },
-      "delete": { //ɾ��Ȩ��
+      "delete": { //删除权限
         "table": [ "moment", "User", "Comment" ]
       }
     },
@@ -41,7 +41,7 @@
       }
     }
   ],
-  "tablempper": //������ӳ��
+  "tablempper": //别名表映射
   {
     "user": "apijson_user",
     "org": "web_organization"