0.0.8 清理SelectTable 支持重载

haptear · haptear · commit f64c5bca0a4f · 2019-12-03T10:14:23.000+08:00
diff --git a/APIJSON.NET/APIJSON.NET.Test/Program.cs b/APIJSON.NET/APIJSON.NET.Test/Program.cs
@@ -1,5 +1,6 @@
 using RestSharp;
 using System;
+using System.Text.RegularExpressions;
 
 namespace APIJSON.NET.Test
{
diff --git a/APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs b/APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs
@@ -57,7 +57,8 @@ public ActionResult Test()
 
 public async Task<ActionResult> Query([FromBody] JObject jobject)
{
- JObject resultJobj = new SelectTable(_identitySvc, _tableMapper, db.Db).Query(jobject);
+ var st = new SelectTable(_identitySvc, _tableMapper, db.Db);
+ JObject resultJobj = st.Query(jobject);
 return Ok(resultJobj);
 }
 
@@ -75,20 +76,46 @@ public async Task<ActionResult> QueryByTable([FromRoute]string table)
 
 JObject jobject = JObject.Parse(json);
 ht.Add(table + "[]", jobject);
- ht.Add("total@", "");
+
+ if (jobject["query"] != null && jobject["query"].ToString() != "0" && jobject["total@"] == null)
+{
+ //自动添加总计数量
+ ht.Add("total@", "");
+ }
+
+ //每页最大1000条数据
+ if (jobject["count"] != null && int.Parse(jobject["count"].ToString()) > 1000)
+{
+ throw new Exception("count分页数量最大不能超过1000");
+ }
+
+ bool isDebug = (jobject["@debug"] != null && jobject["@debug"].ToString() != "0");
+ jobject.Remove("@debug");
 
 bool hasTableKey = false;
+ List<string> ignoreConditions = new List<string>{"page", "count", "query" };
+ JObject tableConditions = new JObject();//表的其它查询条件，比如过滤，字段等
 foreach (var item in jobject)
{
 if (item.Key.Equals(table, StringComparison.CurrentCultureIgnoreCase))
{
 hasTableKey = true;
 break;
 }
+ if (!ignoreConditions.Contains(item.Key.ToLower()))
+{
+ tableConditions.Add(item.Key, item.Value);
+ }
+ }
+
+ foreach (var removeKey in tableConditions)
+{
+ jobject.Remove(removeKey.Key);
 }
+
 if (!hasTableKey)
{
- jobject.Add(table, new JObject());
+ jobject.Add(table, tableConditions);
 }
 
 return await Query(ht);
diff --git a/APIJSON.NET/APIJSON.NET/Services/IdentityService.cs b/APIJSON.NET/APIJSON.NET/Services/IdentityService.cs
@@ -10,25 +10,47 @@
 
 namespace APIJSON.NET.Services
{
+ /// <summary>
+ /// 
+ /// </summary>
 public class IdentityService : IIdentityService
{
 private IHttpContextAccessor _context;
 private List<Role> roles;
 
+ /// <summary>
+ /// 
+ /// </summary>
+ /// <param name="context"></param>
+ /// <param name="_roles"></param>
 public IdentityService(IHttpContextAccessor context, IOptions<List<Role>> _roles)
{
 _context = context ?? throw new ArgumentNullException(nameof(context));
 roles = _roles.Value;
 }
+
+ /// <summary>
+ /// 
+ /// </summary>
+ /// <returns></returns>
 public string GetUserIdentity()
{
 return _context.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
 }
 
+ /// <summary>
+ /// 
+ /// </summary>
+ /// <returns></returns>
 public string GetUserRoleName()
{
 return _context.HttpContext.User.FindFirstValue(ClaimTypes.Role);
 }
+
+ /// <summary>
+ /// 
+ /// </summary>
+ /// <returns></returns>
 public Role GetRole()
{
 var role = new Role();
@@ -43,23 +65,37 @@ public Role GetRole()
 }
 return role;
 }
- public (bool, string) GetSelectRole(string table)
+
+ /// <summary>
+ /// 
+ /// </summary>
+ /// <param name="table"></param>
+ /// <returns></returns>
+ public Tuple<bool, string> GetSelectRole(string table)
{
 var role = GetRole();
 if (role == null || role.Select == null || role.Select.Table == null)
{
- return (false, $"appsettings.json权限配置不正确！");
+ return Tuple.Create(false, $"appsettings.json权限配置不正确！");
 }
 string tablerole = role.Select.Table.FirstOrDefault(it => it == "*" || it.Equals(table, StringComparison.CurrentCultureIgnoreCase));
 
 if (string.IsNullOrEmpty(tablerole))
{
- return (false, $"表名{table}没权限查询！");
+ return Tuple.Create(false, $"表名{table}没权限查询！");
 }
 int index = Array.IndexOf(role.Select.Table, tablerole);
 string selectrole = role.Select.Column[index];
- return (true, selectrole);
+ return Tuple.Create(true, selectrole);
 }
+
+
+ /// <summary>
+ /// 
+ /// </summary>
+ /// <param name="col"></param>
+ /// <param name="selectrole"></param>
+ /// <returns></returns>
 public bool ColIsRole(string col, string[] selectrole)
{
 if (selectrole.Contains("*"))
diff --git a/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj b/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj
@@ -2,8 +2,9 @@
 
 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
- <Version>0.0.7</Version>
- <Description>0.0.7 修复not in的缺陷，增加~ 不等于的支持
+ <Version>0.0.8</Version>
+ <Description>0.0.8 清理SelectTable 支持重载
+0.0.7 修复not in的缺陷，增加~ 不等于的支持
 0.0.6 增加ToSql接口，处理sql注入的情况
 通用查询组件</Description>
 <PackageId>ApiJson.Common.Core</PackageId>
diff --git a/APIJSON.NET/APIJSONCommon/Properties/AssemblyInfo.cs b/APIJSON.NET/APIJSONCommon/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("ApiJson.Common")]
-[assembly: AssemblyDescription("增加ToSql接口，处理sql注入的情况")]
+[assembly: AssemblyDescription("修复not in的缺陷，增加~ 不等于的支持")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ApiJson.Common")]
@@ -31,5 +31,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.6.0")]
-[assembly: AssemblyFileVersion("0.0.6.0")]
+[assembly: AssemblyVersion("0.0.7.0")]
+[assembly: AssemblyFileVersion("0.0.7.0")]
diff --git a/APIJSON.NET/APIJSONCommon/SelectTable.cs b/APIJSON.NET/APIJSONCommon/SelectTable.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`usingRestSharp;`
`2`	`2`	`usingSystem;`
	`3`	`+usingSystem.Text.RegularExpressions;`
`3`	`4`
`4`	`5`	`namespaceAPIJSON.NET.Test`
`5`	`6`	`{`
-Original file line number
+Diff line change
 publicasyncTask<ActionResult>Query([FromBody]JObjectjobject)
+{
 -JObjectresultJobj=newSelectTable(_identitySvc,_tableMapper,db.Db).Query(jobject);
 +varst=newSelectTable(_identitySvc,_tableMapper,db.Db);
 +JObjectresultJobj=st.Query(jobject);
 returnOk(resultJobj);
+}
 JObjectjobject=JObject.Parse(json);
 ht.Add(table+"[]",jobject);
 -ht.Add("total@","");
++
 +if(jobject["query"]!=null&&jobject["query"].ToString()!="0"&&jobject["total@"]==null)
 +{
 +//自动添加总计数量
 +ht.Add("total@","");
 +}
++
 +//每页最大1000条数据
 +if(jobject["count"]!=null&&int.Parse(jobject["count"].ToString())>1000)
 +{
 +thrownewException("count分页数量最大不能超过1000");
 +}
++
 +boolisDebug=(jobject["@debug"]!=null&&jobject["@debug"].ToString()!="0");
 +jobject.Remove("@debug");
 boolhasTableKey=false;
 +List<string>ignoreConditions=newList<string>{"page","count","query"};
 +JObjecttableConditions=newJObject();//表的其它查询条件，比如过滤，字段等
 foreach(variteminjobject)
+{
 if(item.Key.Equals(table,StringComparison.CurrentCultureIgnoreCase))
+{
 hasTableKey=true;
 break;
+}
 +if(!ignoreConditions.Contains(item.Key.ToLower()))
 +{
 +tableConditions.Add(item.Key,item.Value);
 +}
 +}
++
 +foreach(varremoveKeyintableConditions)
 +{
 +jobject.Remove(removeKey.Key);
+}
++
 if(!hasTableKey)
+{
 -jobject.Add(table,newJObject());
 +jobject.Add(table,tableConditions);
+}
 returnawaitQuery(ht);
Original file line number	Diff line number	Diff line change
`@@ -10,25 +10,47 @@`
`10`	`10`
`11`	`11`	`namespaceAPIJSON.NET.Services`
`12`	`12`	`{`
	`13`	`+/// <summary>`
	`14`	`+///`
	`15`	`+/// </summary>`
`13`	`16`	`publicclassIdentityService:IIdentityService`
`14`	`17`	`{`
`15`	`18`	`privateIHttpContextAccessor_context;`
`16`	`19`	`privateList<Role>roles;`
`17`	`20`
	`21`	`+/// <summary>`
	`22`	`+///`
	`23`	`+/// </summary>`
	`24`	`+/// <param name="context"></param>`
	`25`	`+/// <param name="_roles"></param>`
`18`	`26`	`publicIdentityService(IHttpContextAccessorcontext,IOptions<List<Role>>_roles)`
`19`	`27`	`{`
`20`	`28`	`_context=context??thrownewArgumentNullException(nameof(context));`
`21`	`29`	`roles=_roles.Value;`
`22`	`30`	`}`
	`31`	`+`
	`32`	`+/// <summary>`
	`33`	`+///`
	`34`	`+/// </summary>`
	`35`	`+/// <returns></returns>`
`23`	`36`	`publicstringGetUserIdentity()`
`24`	`37`	`{`
`25`	`38`	`return_context.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);`
`26`	`39`	`}`
`27`	`40`
	`41`	`+/// <summary>`
	`42`	`+///`
	`43`	`+/// </summary>`
	`44`	`+/// <returns></returns>`
`28`	`45`	`publicstringGetUserRoleName()`
`29`	`46`	`{`
`30`	`47`	`return_context.HttpContext.User.FindFirstValue(ClaimTypes.Role);`
`31`	`48`	`}`
	`49`	`+`
	`50`	`+/// <summary>`
	`51`	`+///`
	`52`	`+/// </summary>`
	`53`	`+/// <returns></returns>`
`32`	`54`	`publicRoleGetRole()`
`33`	`55`	`{`
`34`	`56`	`varrole=newRole();`
`@@ -43,23 +65,37 @@ public Role GetRole()`
`43`	`65`	`}`
`44`	`66`	`returnrole;`
`45`	`67`	`}`
`46`		`-public(bool,string)GetSelectRole(stringtable)`
	`68`	`+`
	`69`	`+/// <summary>`
	`70`	`+///`
	`71`	`+/// </summary>`
	`72`	`+/// <param name="table"></param>`
	`73`	`+/// <returns></returns>`
	`74`	`+publicTuple<bool,string>GetSelectRole(stringtable)`
`47`	`75`	`{`
`48`	`76`	`varrole=GetRole();`
`49`	`77`	`if(role==null\|\|role.Select==null\|\|role.Select.Table==null)`
`50`	`78`	`{`
`51`		`-return(false,$"appsettings.json权限配置不正确！");`
	`79`	`+returnTuple.Create(false,$"appsettings.json权限配置不正确！");`
`52`	`80`	`}`
`53`	`81`	`stringtablerole=role.Select.Table.FirstOrDefault(it =>it=="*"\|\|it.Equals(table,StringComparison.CurrentCultureIgnoreCase));`
`54`	`82`
`55`	`83`	`if(string.IsNullOrEmpty(tablerole))`
`56`	`84`	`{`
`57`		`-return(false,$"表名{table}没权限查询！");`
	`85`	`+returnTuple.Create(false,$"表名{table}没权限查询！");`
`58`	`86`	`}`
`59`	`87`	`intindex=Array.IndexOf(role.Select.Table,tablerole);`
`60`	`88`	`stringselectrole=role.Select.Column[index];`
`61`		`-return(true,selectrole);`
	`89`	`+returnTuple.Create(true,selectrole);`
`62`	`90`	`}`
	`91`	`+`
	`92`	`+`
	`93`	`+/// <summary>`
	`94`	`+///`
	`95`	`+/// </summary>`
	`96`	`+/// <param name="col"></param>`
	`97`	`+/// <param name="selectrole"></param>`
	`98`	`+/// <returns></returns>`
`63`	`99`	`publicboolColIsRole(stringcol,string[]selectrole)`
`64`	`100`	`{`
`65`	`101`	`if(selectrole.Contains("*"))`
-Original file line number
+Diff line change
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly:AssemblyTitle("ApiJson.Common")]
 -[assembly:AssemblyDescription("增加ToSql接口，处理sql注入的情况")]
 +[assembly:AssemblyDescription("修复not in的缺陷，增加~ 不等于的支持")]
 [assembly:AssemblyConfiguration("")]
 [assembly:AssemblyCompany("")]
 [assembly:AssemblyProduct("ApiJson.Common")]
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
 -[assembly:AssemblyVersion("0.0.6.0")]
 -[assembly:AssemblyFileVersion("0.0.6.0")]
 +[assembly:AssemblyVersion("0.0.7.0")]
 +[assembly:AssemblyFileVersion("0.0.7.0")]