liaozb#1:优化数据库操作 支持0:MySql,1:SqlServer,2:Sqlite,3:Oracle,4:PostgreSQL

2：增加token登录 #

Author: liaozb

APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj

@@ -9,12 +9,13 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReferenceInclude="Dapper"Version="1.50.5" />
- <PackageReferenceInclude="Dapper.SqlBuilder"Version="1.50.5" />
  <PackageReferenceInclude="Microsoft.AspNetCore.App" />
+ <PackageReferenceInclude="Microsoft.AspNetCore.Authentication.JwtBearer"Version="2.1.0" />
+ <PackageReferenceInclude="Microsoft.VisualStudio.Web.CodeGeneration.Design"Version="2.1.0" />
  <PackageReferenceInclude="MySql.Data"Version="8.0.11" />
- <PackageReferenceInclude="Swashbuckle.AspNetCore"Version="2.5.0" />
- <PackageReferenceInclude="Swashbuckle.AspNetCore.Swagger"Version="2.5.0" />
+ <PackageReferenceInclude="sqlSugarCore"Version="4.6.4.9" />
+ <PackageReferenceInclude="Swashbuckle.AspNetCore"Version="3.0.0" />
+ <PackageReferenceInclude="Swashbuckle.AspNetCore.Swagger"Version="3.0.0" />
  </ItemGroup>
 
 </Project>

APIJSON.NET/APIJSON.NET/AuthConfigurer.cs

@@ -0,0 +1,71 @@
+usingMicrosoft.AspNetCore.Authentication.JwtBearer;
+usingMicrosoft.Extensions.Configuration;
+usingMicrosoft.Extensions.DependencyInjection;
+usingMicrosoft.IdentityModel.Tokens;
+usingSystem;
+usingSystem.Collections.Generic;
+usingSystem.Linq;
+usingSystem.Text;
+usingSystem.Threading.Tasks;
+namespaceAPIJSON.NET
+{
+publicstaticclassAuthConfigurer
+{
+publicstaticvoidConfigure(IServiceCollectionservices,IConfigurationconfiguration)
+{
+if(bool.Parse(configuration["Authentication:JwtBearer:IsEnabled"]))
+{
+services.AddAuthentication(sharedOptions =>
+{
+sharedOptions.DefaultAuthenticateScheme=JwtBearerDefaults.AuthenticationScheme;
+sharedOptions.DefaultChallengeScheme=JwtBearerDefaults.AuthenticationScheme;
+})
+.AddJwtBearer(options =>
+{
+options.Audience=configuration["Authentication:JwtBearer:Audience"];
+
+options.TokenValidationParameters=newTokenValidationParameters
+{
+
+ValidateIssuerSigningKey=true,
+IssuerSigningKey=newSymmetricSecurityKey(Encoding.ASCII.GetBytes(configuration["Authentication:JwtBearer:SecurityKey"])),
+
+ValidateIssuer=true,
+ValidIssuer=configuration["Authentication:JwtBearer:Issuer"],
+
+
+ValidateAudience=true,
+ValidAudience=configuration["Authentication:JwtBearer:Audience"],
+
+
+ValidateLifetime=true,
+
+
+ClockSkew=TimeSpan.Zero
+};
+
+options.Events=newJwtBearerEvents
+{
+OnMessageReceived=QueryStringTokenResolver,
+
+};
+});
+}
+}
+
+privatestaticTaskQueryStringTokenResolver(MessageReceivedContextcontext)
+{
+
+varqsAuthToken=context.Request.Headers["Authorization"].FirstOrDefault();
+if(qsAuthToken==null)
+{
+
+returnTask.CompletedTask;
+}
+qsAuthToken=qsAuthToken.Replace("Bearer ","");
+
+// context.Token = SimpleStringCipher.Instance.Decrypt(qsAuthToken, AppConsts.DefaultPassPhrase);
+returnTask.CompletedTask;
+}
+}
+}

…JSON.NET/Controllers/ValuesController.cs …PIJSON.NET/Controllers/JsonController.csAPIJSON.NET/APIJSON.NET/Controllers/ValuesController.cs renamed to APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs APIJSON.NET/APIJSON.NET/Controllers/ValuesController.cs renamed to APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs

@@ -2,22 +2,24 @@
 {
 usingSystem;
 usingSystem.Collections.Generic;
-usingSystem.Data.SqlClient;
 usingSystem.Web;
-usingDapper;
 usingMicrosoft.AspNetCore.Mvc;
 usingMicrosoft.Extensions.Options;
 usingNewtonsoft.Json.Linq;
+usingSqlSugar;
+
 [Route("api/[controller]")]
 [ApiController]
 publicclassJsonController:ControllerBase
 {
-privateDapperHelperdb;
+privateDbOptions_options;
 privateJsonToSqlsqlbuilder;
-publicJsonController(DapperHelperhelper,JsonToSqljsonToSql)
+privateDbContextdb;
+publicJsonController(IOptions<DbOptions>options,JsonToSqljsonToSql,DbContext_db)
 {
-db=helper;
+_options=options.Value;
 sqlbuilder=jsonToSql;
+db=_db;
 }
 /// <summary>
 /// 查询
@@ -55,36 +57,35 @@ public ActionResult Query([FromBody]string json)
 if(tables.Count>0)
 {
 stringtable=tables[0];
-vartemplate=sqlbuilder.GetSqlBuilder(table,page,count,where[0],null);
-foreach(varddindb.Query(template.RawSql,template.Parameters))
+vartemplate=sqlbuilder.GetTableData(table,page,count,where[0],null);
+foreach(varddintemplate)
 {
 varzht=newJObject();
 zht.Add(table,JToken.FromObject(dd));
 for(inti=1;i<tables.Count;i++)
 {
 stringsubtable=tables[i];
-
 if(tables[i].EndsWith("[]"))
 {
 subtable=tables[i].Replace("[]","");
 varjbb=JObject.Parse(where[i]);
 page=jbb["page"]==null?0:int.Parse(jbb["page"].ToString());
 count=jbb["count"]==null?0:int.Parse(jbb["count"].ToString());
-template=sqlbuilder.GetSqlBuilder(subtable,page,count,jbb[subtable].ToString(),zht);
+template=sqlbuilder.GetTableData(subtable,page,count,jbb[subtable].ToString(),zht);
 varlt=newJArray();
-foreach(vardindb.Query(template.RawSql,template.Parameters))
+foreach(vardintemplate)
 {
 lt.Add(JToken.FromObject(d));
 }
 zht.Add(tables[i],lt);
 }
 else
 {
-template=sqlbuilder.GetSqlBuilder(subtable,0,0,where[i].ToString(),zht);
-vardf=db.QueryFirstOrDefault(template.RawSql,template.Parameters);
-if(df!=null)
+template=sqlbuilder.GetTableData(subtable,0,0,where[i].ToString(),zht);
+
+if(template!=null)
 {
-zht.Add(subtable,JToken.FromObject(df));
+zht.Add(subtable,JToken.FromObject(template));
 }
 
 }
@@ -96,16 +97,16 @@ public ActionResult Query([FromBody]string json)
 }
 elseif(key.EndsWith("[]"))
 {
-varbuilder=newSqlBuilder();
+
 varhtt=newJArray();
 varjb=JObject.Parse(item.Value.ToString());
 intpage=jb["page"]==null?0:int.Parse(jb["page"].ToString()),count=jb["count"]==null?0:int.Parse(jb["count"].ToString());
 jb.Remove("page");
 jb.Remove("count");
 foreach(vartinjb)
 {
-vartemplate=sqlbuilder.GetSqlBuilder(t.Key,page,count,t.Value.ToString(),null);
-foreach(vardindb.Query(template.RawSql,template.Parameters))
+vartemplate=sqlbuilder.GetTableData(t.Key,page,count,t.Value.ToString(),null);
+foreach(vardintemplate)
 {
 htt.Add(JToken.FromObject(d));
 }
@@ -114,11 +115,10 @@ public ActionResult Query([FromBody]string json)
 }
 else
 {
-vartemplate=sqlbuilder.GetSqlBuilder(key,0,0,item.Value.ToString(),ht);
-vardf=db.QueryFirstOrDefault(template.RawSql,template.Parameters);
-if(df!=null)
+vartemplate=sqlbuilder.GetTableData(key,0,0,item.Value.ToString(),ht);
+if(template!=null)
 {
-ht.Add(key,JToken.FromObject(df));
+ht.Add(key,JToken.FromObject(template));
 }
 }
 }
@@ -147,27 +147,20 @@ public ActionResult Add([FromBody]string json)
 {
 JObjectjobject=JObject.Parse(json);
 varsb=newSystem.Text.StringBuilder(100);
+
 foreach(variteminjobject)
 {
 stringkey=item.Key.Trim();
-sb.Append($"insert into [{key}](");
-varval=newSystem.Text.StringBuilder(100);
-val.Append($")values(");
-varp=newDynamicParameters();
+
+vardt=newDictionary<string,object>();
 foreach(varfinJObject.Parse(item.Value.ToString()))
 {
-sb.Append($"{f.Key},");
-val.Append($"@{f.Key},");
-p.Add($"@{f.Key}",f.Value.ToString());
+dt.Add(f.Key,f.Value);
 }
-stringsql=sb.ToString().TrimEnd(',')+val.ToString().TrimEnd(',')+");SELECT CAST(SCOPE_IDENTITY() as int);";
+
+intid=db.Db.Insertable(dt).AS(key).ExecuteReturnIdentity();
+ht.Add(key,JToken.FromObject(new{code=200,msg="success",id}));
 
-using(varsqlConnection=db.Connection)
-{
-sqlConnection.Open();
-intid=sqlConnection.ExecuteScalar<int>(sql,p);
-ht.Add(key,JToken.FromObject(new{code=200,msg="success",id}));
-}
 }
 
 }
@@ -194,36 +187,28 @@ public ActionResult Edit([FromBody]string json)
 try
 {
 JObjectjobject=JObject.Parse(json);
+
 foreach(variteminjobject)
 {
 stringkey=item.Key.Trim();
 varvalue=JObject.Parse(item.Value.ToString());
-varsb=newSystem.Text.StringBuilder(100);
-
-sb.Append($"update [{key}] set ");
 if(!value.ContainsKey("id"))
 {
 ht["code"]="500";
 ht["msg"]="未传主键id";
 break;
 }
-varp=newDynamicParameters();
+vardt=newDictionary<string,object>();
+dt.Add("id",value["id"]);
 foreach(varfinvalue)
 {
 if(f.Key.ToLower()!="id")
 {
-sb.Append($"{f.Key}=@{f.Key},");
+dt.Add(f.Key,f.Value);
 }
-
-p.Add($"@{f.Key}",f.Value.ToString());
-}
-stringsql=sb.ToString().TrimEnd(',')+" where id=@id;";
-using(varsqlConnection=db.Connection)
-{
-sqlConnection.Open();
-sqlConnection.Execute(sql,p);
-ht.Add(key,JToken.FromObject(new{code=200,msg="success",id=value["id"].ToString()}));
 }
+db.Db.Updateable(dt).AS(key).ExecuteCommand();
+ht.Add(key,JToken.FromObject(new{code=200,msg="success",id=value["id"].ToString()}));
 }
 }
 catch(Exceptionex)
@@ -249,33 +234,31 @@ public ActionResult Remove([FromBody]string json)
 try
 {
 JObjectjobject=JObject.Parse(json);
+
 foreach(variteminjobject)
 {
 stringkey=item.Key.Trim();
 varvalue=JObject.Parse(item.Value.ToString());
 varsb=newSystem.Text.StringBuilder(100);
-
 sb.Append($"delete [{key}] where");
 if(!value.ContainsKey("id"))
 {
 ht["code"]="500";
 ht["msg"]="未传主键id";
 break;
 }
-varp=newDynamicParameters();
+varp=newList<SugarParameter>();
 foreach(varfinvalue)
 {
 sb.Append($"{f.Key}=@{f.Key},");
 
-p.Add($"@{f.Key}",f.Value.ToString());
+p.Add(newSugarParameter($"@{f.Key}",f.Value.ToString()));
 }
+
 stringsql=sb.ToString().TrimEnd(',');
-using(varsqlConnection=db.Connection)
-{
-sqlConnection.Open();
-sqlConnection.Execute(sql,p);
-ht.Add(key,JToken.FromObject(new{code=200,msg="success",id=value["id"].ToString()}));
-}
+db.Db.Ado.ExecuteCommand(sql,p);
+ht.Add(key,JToken.FromObject(new{code=200,msg="success",id=value["id"].ToString()}));
+
 }
 }
 catch(Exceptionex)