Merge pull request #7 from liaozb/master

TommyLemon · web-flow · commit 02ea36168c60 · 2019-04-09T23:09:18.000-05:00
Sync
diff --git a/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj b/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj
@@ -16,17 +16,15 @@
 
   <ItemGroup>
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="1.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.4" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="MySql.Data" Version="8.0.15" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.5" />
-    <PackageReference Include="SqlKata" Version="1.1.7" />
-    <PackageReference Include="SqlKata.Execution" Version="1.1.7" />
-    <PackageReference Include="sqlSugarCore" Version="4.9.9.2" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.6" />
+    <PackageReference Include="sqlSugarCore" Version="4.9.9.6" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="4.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="4.0.1" />
diff --git a/APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs b/APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs
@@ -37,15 +37,13 @@ public JsonController(SelectTable _selectTable, DbContext _db,IIdentityService i
         /// <returns></returns>
         [HttpPost("/get")]
 
-        public ActionResult Query([FromBody]string json)
+        public ActionResult Query([FromBody] JObject jobject)
         {
-            json = HttpUtility.UrlDecode(json);
             JObject ht = new JObject();
             ht.Add("code", "200");
             ht.Add("msg", "success");
             try
             {
-                JObject jobject = JObject.Parse(json);
                 int page = 0, count = 0, query = 0, total = 0;
                 foreach (var item in jobject)
                 {
@@ -178,16 +176,16 @@ public ActionResult Query([FromBody]string json)
         /// <param name="json"></param>
         /// <returns></returns>
         [HttpPost("/add")]
-        public ActionResult Add([FromBody]string json)
+        public ActionResult Add([FromBody]JObject jobject)
         {
-            json = HttpUtility.UrlDecode(json);
+            
             JObject ht = new JObject();
             ht.Add("code", "200");
             ht.Add("msg", "success");
             try
             {
-                JObject jobject = JObject.Parse(json);
-                var sb = new System.Text.StringBuilder(100);
+                
+                
 
                 foreach (var item in jobject)
                 {
@@ -222,16 +220,13 @@ public ActionResult Add([FromBody]string json)
         /// <param name="json"></param>
         /// <returns></returns>
         [HttpPost("/edit")]
-        public ActionResult Edit([FromBody]string json)
+        public ActionResult Edit([FromBody]JObject jobject)
         {
-            json = HttpUtility.UrlDecode(json);
             JObject ht = new JObject();
             ht.Add("code", "200");
             ht.Add("msg", "success");
             try
             {
-                JObject jobject = JObject.Parse(json);
-
                 foreach (var item in jobject)
                 {
                     string key = item.Key.Trim();
@@ -276,16 +271,14 @@ public ActionResult Edit([FromBody]string json)
         /// <param name="json"></param>
         /// <returns></returns>
         [HttpPost("/remove")]
-        public ActionResult Remove([FromBody]string json)
+        public ActionResult Remove([FromBody]JObject jobject)
         {
-            json = HttpUtility.UrlDecode(json);
             JObject ht = new JObject();
             ht.Add("code", "200");
             ht.Add("msg", "success");
             try
             {
                 var role = _identitySvc.GetRole();
-                JObject jobject = JObject.Parse(json);
                 foreach (var item in jobject)
                 {
                     string key = item.Key.Trim();
diff --git a/APIJSON.NET/APIJSON.NET/Startup.cs b/APIJSON.NET/APIJSON.NET/Startup.cs
@@ -12,10 +12,7 @@
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.IdentityModel.Tokens;
-    using SqlKata.Execution;
     using Swashbuckle.AspNetCore.Swagger;
-    using MySql.Data.MySqlClient;
-    using SqlKata.Compilers;
 
     public class Startup
     {
diff --git a/APIJSON.NET/APIJSON.NET/wwwroot/js/main.js b/APIJSON.NET/APIJSON.NET/wwwroot/js/main.js
@@ -147,7 +147,7 @@
                   url: $('#rest-url').val(),
                   type: "POST", dataType: "json",
                   contentType: "application/json;charset=utf-8",
-                  data: JSON.stringify($('#vInput').val()),
+                  data: $('#vInput').val(),
                   success: function (data) {
                   
                       App.jsonhtml = data;
