##

liaozb · liaozb · commit 74a845fcedef · 2018-08-06T11:17:35.000+08:00
diff --git a/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj b/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj
@@ -5,6 +5,7 @@
 </PropertyGroup>
 
 <ItemGroup>
+ <PackageReference Include="AspectCore.Extensions.Reflection" Version="0.7.0" />
 <PackageReference Include="Microsoft.AspNetCore.App" />
 <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />
 <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" />
diff --git a/APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs b/APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs
@@ -200,7 +200,7 @@ public ActionResult Add([FromBody]string json)
 var dt = new Dictionary<string, object>();
 foreach (var f in JObject.Parse(item.Value.ToString()))
{
- if (f.Key.ToLower() != "id" && role.Insert.Column.Contains(f.Key, StringComparer.CurrentCultureIgnoreCase))
+ if (f.Key.ToLower() != "id" && selectTable.IsCol(key, f.Key) && (role.Insert.Column.Contains("*") || role.Insert.Column.Contains(f.Key, StringComparer.CurrentCultureIgnoreCase)))
 dt.Add(f.Key, f.Value);
 }
 int id = db.Db.Insertable(dt).AS(key).ExecuteReturnIdentity();
@@ -252,7 +252,7 @@ public ActionResult Edit([FromBody]string json)
 dt.Add("id", value["id"]);
 foreach (var f in value)
{
- if (f.Key.ToLower() != "id"&& role.Update.Column.Contains(f.Key, StringComparer.CurrentCultureIgnoreCase))
+ if (f.Key.ToLower() != "id"&& selectTable.IsCol(key,f.Key) && (role.Update.Column.Contains ("*")||role.Update.Column.Contains(f.Key, StringComparer.CurrentCultureIgnoreCase)))
{
 dt.Add(f.Key, f.Value);
 }
@@ -290,7 +290,7 @@ public ActionResult Remove([FromBody]string json)
 string key = item.Key.Trim();
 var value = JObject.Parse(item.Value.ToString());
 var sb = new System.Text.StringBuilder(100);
- sb.Append($"delete [{key}] where");
+ sb.Append($"delete FROM{key} where");
 if (role.Delete==null||role.Delete.Table==null)
{
 ht["code"] = "500";
diff --git a/APIJSON.NET/APIJSON.NET/Controllers/TokenController.cs b/APIJSON.NET/APIJSON.NET/Controllers/TokenController.cs
@@ -74,7 +74,7 @@ public IActionResult Create([FromBody]TokenInput input)
 [HttpGet] 
 public IActionResult GetRole()
{
- return Ok(User.Identity.Name);
+ return Ok(User.FindFirstValue(ClaimTypes.Role));
 }
 private string CreateAccessToken(IEnumerable<Claim> claims, TimeSpan? expiration = null)
{
diff --git a/APIJSON.NET/APIJSON.NET/SelectTable.cs b/APIJSON.NET/APIJSON.NET/SelectTable.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Linq;
- using System.Reflection;
+ using AspectCore.Extensions.Reflection;
 using System.Text.RegularExpressions;
 
 public class SelectTable
@@ -50,14 +50,19 @@ public bool IsCol(string table, string col)
 /// <returns></returns>
 public object ExecFunc(string funcname,object[] param, Type[] types)
{
- Type type = typeof(FuncList);
- Object obj = Activator.CreateInstance(type);
- MethodInfo mt = type.GetMethod(funcname,types);
- if (mt==null)
-{
- throw new Exception($"{funcname}没有获取到相应的函数");
- }
- return mt.Invoke(obj, param);
+ var method = typeof(FuncList).GetMethod(funcname);
+ 
+ var reflector = method.GetReflector();
+ var result = reflector.Invoke(new FuncList(), param);
+ //Type type = typeof(FuncList);
+ //Object obj = Activator.CreateInstance(type);
+ //MethodInfo mt = type.GetMethod(funcname,types);
+ //if (mt==null)
+ //{
+ // throw new Exception($"{funcname}没有获取到相应的函数");
+ //}
+ //return mt.Invoke(obj, param);
+ return result;
 }
 
 public (dynamic,int) GetTableData(string subtable, int page, int count, string json, JObject dd)
diff --git a/APIJSON.NET/APIJSON.NET/Startup.cs b/APIJSON.NET/APIJSON.NET/Startup.cs
@@ -60,6 +60,7 @@ public void ConfigureServices(IServiceCollection services)
 // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
 public void Configure(IApplicationBuilder app, IHostingEnvironment env)
{
+ app.UseAuthentication();
 app.UseMvc(routes =>
{
 routes.MapRoute(
@@ -74,7 +75,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
 
 });
- app.UseAuthentication();
+ 
 app.UseJwtTokenMiddleware();
 DbInit.Initialize(app);
 }

-Original file line number
+Diff line change
  </PropertyGroup>
  <ItemGroup>
 + <PackageReferenceInclude="AspectCore.Extensions.Reflection"Version="0.7.0" />
  <PackageReferenceInclude="Microsoft.AspNetCore.App" />
  <PackageReferenceInclude="Microsoft.AspNetCore.Authentication.JwtBearer"Version="2.1.0" />
  <PackageReferenceInclude="Microsoft.VisualStudio.Web.CodeGeneration.Design"Version="2.1.0" />
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public ActionResult Add([FromBody]string json)`
`200`	`200`	`vardt=newDictionary<string,object>();`
`201`	`201`	`foreach(varfinJObject.Parse(item.Value.ToString()))`
`202`	`202`	`{`
`203`		`-if(f.Key.ToLower()!="id"&&role.Insert.Column.Contains(f.Key,StringComparer.CurrentCultureIgnoreCase))`
	`203`	`+if(f.Key.ToLower()!="id"&&selectTable.IsCol(key,f.Key)&&(role.Insert.Column.Contains("*")\|\|role.Insert.Column.Contains(f.Key,StringComparer.CurrentCultureIgnoreCase)))`
`204`	`204`	`dt.Add(f.Key,f.Value);`
`205`	`205`	`}`
`206`	`206`	`intid=db.Db.Insertable(dt).AS(key).ExecuteReturnIdentity();`
`@@ -252,7 +252,7 @@ public ActionResult Edit([FromBody]string json)`
`252`	`252`	`dt.Add("id",value["id"]);`
`253`	`253`	`foreach(varfinvalue)`
`254`	`254`	`{`
`255`		`-if(f.Key.ToLower()!="id"&&role.Update.Column.Contains(f.Key,StringComparer.CurrentCultureIgnoreCase))`
	`255`	`+if(f.Key.ToLower()!="id"&&selectTable.IsCol(key,f.Key)&&(role.Update.Column.Contains("*")\|\|role.Update.Column.Contains(f.Key,StringComparer.CurrentCultureIgnoreCase)))`
`256`	`256`	`{`
`257`	`257`	`dt.Add(f.Key,f.Value);`
`258`	`258`	`}`
`@@ -290,7 +290,7 @@ public ActionResult Remove([FromBody]string json)`
`290`	`290`	`stringkey=item.Key.Trim();`
`291`	`291`	`varvalue=JObject.Parse(item.Value.ToString());`
`292`	`292`	`varsb=newSystem.Text.StringBuilder(100);`
`293`		`-sb.Append($"delete [{key}] where");`
	`293`	`+sb.Append($"delete FROM {key} where");`
`294`	`294`	`if(role.Delete==null\|\|role.Delete.Table==null)`
`295`	`295`	`{`
`296`	`296`	`ht["code"]="500";`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public IActionResult Create([FromBody]TokenInput input)`
`74`	`74`	`[HttpGet]`
`75`	`75`	`publicIActionResultGetRole()`
`76`	`76`	`{`
`77`		`-returnOk(User.Identity.Name);`
	`77`	`+returnOk(User.FindFirstValue(ClaimTypes.Role));`
`78`	`78`	`}`
`79`	`79`	`privatestringCreateAccessToken(IEnumerable<Claim>claims,TimeSpan?expiration=null)`
`80`	`80`	`{`
-Original file line number
+Diff line change
 usingSystem.Collections.Generic;
 usingSystem.Dynamic;
 usingSystem.Linq;
 -usingSystem.Reflection;
 +usingAspectCore.Extensions.Reflection;
 usingSystem.Text.RegularExpressions;
 publicclassSelectTable
 /// <returns></returns>
 publicobjectExecFunc(stringfuncname,object[]param,Type[]types)
+{
 -Typetype=typeof(FuncList);
 -Objectobj=Activator.CreateInstance(type);
 -MethodInfomt=type.GetMethod(funcname,types);
 -if(mt==null)
 -{
 -thrownewException($"{funcname}没有获取到相应的函数");
 -}
 -returnmt.Invoke(obj,param);
 +varmethod=typeof(FuncList).GetMethod(funcname);
++
 +varreflector=method.GetReflector();
 +varresult=reflector.Invoke(newFuncList(),param);
 +//Type type = typeof(FuncList);
 +//Object obj = Activator.CreateInstance(type);
 +//MethodInfo mt = type.GetMethod(funcname,types);
 +//if (mt==null)
 +//{
 +// throw new Exception($"{funcname}没有获取到相应的函数");
 +//}
 +//return mt.Invoke(obj, param);
 +returnresult;
+}
 public(dynamic,int)GetTableData(stringsubtable,intpage,intcount,stringjson,JObjectdd)
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public void ConfigureServices(IServiceCollection services)`
`60`	`60`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`61`	`61`	`publicvoidConfigure(IApplicationBuilderapp,IHostingEnvironmentenv)`
`62`	`62`	`{`
	`63`	`+app.UseAuthentication();`
`63`	`64`	`app.UseMvc(routes =>`
`64`	`65`	`{`
`65`	`66`	`routes.MapRoute(`
`@@ -74,7 +75,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
`74`	`75`	`c.SwaggerEndpoint("/swagger/v1/swagger.json","My API V1");`
`75`	`76`
`76`	`77`	`});`
`77`		`-app.UseAuthentication();`
	`78`	`+`
`78`	`79`	`app.UseJwtTokenMiddleware();`
`79`	`80`	`DbInit.Initialize(app);`
`80`	`81`	`}`