1：增加对所有表“*”的支持

2：添加/{table} 单表查询的接口

Author: haptear

APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs

@@ -28,12 +28,12 @@ public class JsonController : ControllerBase
 privatereadonlyIIdentityService_identitySvc;
 privateITableMapper_tableMapper;
 
-publicJsonController(SelectTable_selectTable,DbContext_db,IIdentityServiceidentityService,ITableMappertableMapper)
+publicJsonController(IIdentityServiceidentityService,ITableMappertableMapper,DbContext_db)
 {
-selectTable=_selectTable;
 db=_db;
 _tableMapper=tableMapper;
 _identitySvc=identityService;
+selectTable=newSelectTable(_identitySvc,_tableMapper,_db.Db);
 }
 
 /// <summary>
@@ -55,7 +55,7 @@ public ActionResult Test()
 /// <returns></returns>
 [HttpPost("/get")]
 
-publicActionResultQuery([FromBody]JObjectjobject)
+publicasyncTask<ActionResult>Query([FromBody]JObjectjobject)
 {
 JObjectresultJobj=newSelectTable(_identitySvc,_tableMapper,db.Db).Query(jobject);
 returnOk(resultJobj);
@@ -91,8 +91,7 @@ public async Task<ActionResult> QueryByTable([FromRoute]string table)
 jobject.Add(table,newJObject());
 }
 
-JObjectresultJobj=newSelectTable(_identitySvc,_tableMapper,db.Db).Query(ht);
-returnOk(resultJobj);
+returnawaitQuery(ht);
 }
 /// <summary>
 /// 新增

APIJSON.NET/APIJSON.NET/Services/IdentityService.cs

@@ -15,7 +15,7 @@ public class IdentityService : IIdentityService
 privateIHttpContextAccessor_context;
 privateList<Role>roles;
 
-publicIdentityService(IHttpContextAccessorcontext,IOptions<List<Role>>_roles)
+publicIdentityService(IHttpContextAccessorcontext,IOptions<List<Role>>_roles)
 {
 _context=context??thrownewArgumentNullException(nameof(context));
 roles=_roles.Value;
@@ -24,7 +24,7 @@ public string GetUserIdentity()
 {
 return_context.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
 }
-
+
 publicstringGetUserRoleName()
 {
 return_context.HttpContext.User.FindFirstValue(ClaimTypes.Role);
@@ -50,7 +50,7 @@ public Role GetRole()
 {
 return(false,$"appsettings.json权限配置不正确！");
 }
-stringtablerole=role.Select.Table.FirstOrDefault(it =>it.Equals(table,StringComparison.CurrentCultureIgnoreCase));
+stringtablerole=role.Select.Table.FirstOrDefault(it =>it=="*"||it.Equals(table,StringComparison.CurrentCultureIgnoreCase));
 
 if(string.IsNullOrEmpty(tablerole))
 {

APIJSON.NET/APIJSON.NET/wwwroot/index.html

@@ -31,11 +31,11 @@
 <div:class="'side-left side-view-' + baseview">
 <divclass="right-bar">
 <selectid="rest-url">
-<optionvalue="api/json/get">get</option>
-<optionvalue="api/json/add">add</option>
-<optionvalue="api/json/edit">edit</option>
-<optionvalue="api/json/remove">remove</option>
-<optionvalue="api/json/org">org</option>
+<optionvalue="get">get</option>
+<optionvalue="add">add</option>
+<optionvalue="edit">edit</option>
+<optionvalue="remove">remove</option>
+<!--<option value="org">org</option>-->
 
 </select>
 <button@click="hpost()">发送请求</button>

APIJSON.NET/APIJSONCommon/SelectTable.cs

@@ -201,8 +201,8 @@ private int QuerySingleList(JObject resultObj, KeyValuePair<string, JToken> item
 stringkey=item.Key.Trim();
 varjb=JObject.Parse(item.Value.ToString());
 intpage=jb["page"]==null?0:int.Parse(jb["page"].ToString());
-intcount=jb["count"]==null?1:int.Parse(jb["count"].ToString());
-intquery=jb["query"]==null?2:int.Parse(jb["query"].ToString());
+intcount=jb["count"]==null?10:int.Parse(jb["count"].ToString());
+intquery=jb["query"]==null?0:int.Parse(jb["query"].ToString());
 inttotal=0;
 
 jb.Remove("page");jb.Remove("count");jb.Remove("query");
@@ -230,7 +230,7 @@ private int QueryMoreList(JObject resultObj, KeyValuePair<string, JToken> item)
 
 varjb=JObject.Parse(item.Value.ToString());
 varpage=jb["page"]==null?0:int.Parse(jb["page"].ToString());
-varcount=jb["count"]==null?0:int.Parse(jb["count"].ToString());
+varcount=jb["count"]==null?10:int.Parse(jb["count"].ToString());
 varquery=jb["query"]==null?0:int.Parse(jb["query"].ToString());
 jb.Remove("page");jb.Remove("count");jb.Remove("query");
 varhtt=newJArray();