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

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

Author: haptear

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

@@ -28,12 +28,12 @@ public class JsonController : ControllerBase
         private readonly IIdentityService _identitySvc;
         private ITableMapper _tableMapper;
 
-        public JsonController(SelectTable _selectTable, DbContext _db, IIdentityService identityService, ITableMapper tableMapper)
+        public JsonController(IIdentityService identityService, ITableMapper tableMapper, DbContext _db)
         {
-            selectTable = _selectTable;
             db = _db;
             _tableMapper = tableMapper;
             _identitySvc = identityService;
+            selectTable = new SelectTable(_identitySvc, _tableMapper, _db.Db);
         }
 
         /// <summary>
@@ -55,7 +55,7 @@ public ActionResult Test()
         /// <returns></returns>
         [HttpPost("/get")]
 
-        public ActionResult Query([FromBody] JObject jobject)
+        public async Task<ActionResult> Query([FromBody] JObject jobject)
         {
             JObject resultJobj = new SelectTable(_identitySvc, _tableMapper, db.Db).Query(jobject);
             return Ok(resultJobj);
@@ -91,8 +91,7 @@ public async Task<ActionResult> QueryByTable([FromRoute]string table)
                 jobject.Add(table, new JObject());
             }
 
-            JObject resultJobj = new SelectTable(_identitySvc, _tableMapper, db.Db).Query(ht);
-            return Ok(resultJobj);
+            return await Query(ht);
         }
         /// <summary>
         /// 新增

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

@@ -15,7 +15,7 @@ public class IdentityService : IIdentityService
         private IHttpContextAccessor _context;
         private List<Role> roles;
 
-        public IdentityService(IHttpContextAccessor context,IOptions<List<Role>> _roles)
+        public IdentityService(IHttpContextAccessor context, IOptions<List<Role>> _roles)
         {
             _context = context ?? throw new ArgumentNullException(nameof(context));
             roles = _roles.Value;
@@ -24,7 +24,7 @@ public string GetUserIdentity()
         {
             return _context.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
-        
+
         public string GetUserRoleName()
         {
             return _context.HttpContext.User.FindFirstValue(ClaimTypes.Role);
@@ -50,7 +50,7 @@ public Role GetRole()
             {
                 return (false, $"appsettings.json权限配置不正确！");
             }
-            string tablerole = role.Select.Table.FirstOrDefault(it => it.Equals(table, StringComparison.CurrentCultureIgnoreCase));
+            string tablerole = 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">
             <div class="right-bar">
                 <select id="rest-url">
-                    <option value="api/json/get">get</option>
-                    <option value="api/json/add">add</option>
-                    <option value="api/json/edit">edit</option>
-                    <option value="api/json/remove">remove</option>
-                    <option value="api/json/org">org</option>
+                    <option value="get">get</option>
+                    <option value="add">add</option>
+                    <option value="edit">edit</option>
+                    <option value="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
             string key = item.Key.Trim();
             var jb = JObject.Parse(item.Value.ToString());
             int page = jb["page"] == null ? 0 : int.Parse(jb["page"].ToString());
-            int count = jb["count"] == null ? 1 : int.Parse(jb["count"].ToString());
-            int query = jb["query"] == null ? 2 : int.Parse(jb["query"].ToString());
+            int count = jb["count"] == null ? 10 : int.Parse(jb["count"].ToString());
+            int query = jb["query"] == null ? 0 : int.Parse(jb["query"].ToString());
             int total = 0;
 
             jb.Remove("page"); jb.Remove("count"); jb.Remove("query");
@@ -230,7 +230,7 @@ private int QueryMoreList(JObject resultObj, KeyValuePair<string, JToken> item)
 
             var jb = JObject.Parse(item.Value.ToString());
             var page = jb["page"] == null ? 0 : int.Parse(jb["page"].ToString());
-            var count = jb["count"] == null ? 0 : int.Parse(jb["count"].ToString());
+            var count = jb["count"] == null ? 10 : int.Parse(jb["count"].ToString());
             var query = jb["query"] == null ? 0 : int.Parse(jb["query"].ToString());
             jb.Remove("page"); jb.Remove("count"); jb.Remove("query");
             var htt = new JArray();