处理别名如果为关键字的缺陷

haptear · haptear · commit 42db8616a1af · 2020-07-23T18:13:38.000+08:00
diff --git a/APIJSON.NET/APIJSON.NET/appsettings.json b/APIJSON.NET/APIJSON.NET/appsettings.json
@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
     "DbType": 0, //0:MySql,1:SqlServer,2:Sqlite
-    "ConnectionString": "Server=192.168.2.25;Database=yunwei;Uid=root;Pwd=xmjk;Port=3306;Character Set=utf8;"
+    "ConnectionString": "Server=192.168.2.25;Database=yunwei1.8;Uid=root;Pwd=xmjk;Port=3306;Character Set=utf8;"
     //"ConnectionString": "Server=119.29.9.25;Port=3306;Database=test;Uid=root;Pwd=1q,2w.3e?;CharSet=UTF8;"
   },
   "Authentication": {
@@ -16,8 +16,8 @@
     {
       "name": "role1", //Ȩ������ Ψһ
       "select": { //��ѯȨ��
-        "table": [ "moment", "User", "Comment" ], //�ɲ����ı�
-        "column": [ "*", "*", "*" ], //�ɲ������ֶ�
+        "table": [ "*" ], //�ɲ����ı�
+        "column": [ "*" ], //�ɲ������ֶ�
         "where": []
       },
       "update": { //�޸�Ȩ��
diff --git a/APIJSON.NET/APIJSON.NET/wwwroot/index.html b/APIJSON.NET/APIJSON.NET/wwwroot/index.html
@@ -35,7 +35,7 @@
                     <option value="add">add</option>
                     <option value="edit">edit</option>
                     <option value="remove">remove</option>
-                    <!--<option value="org">org</option>-->
+                    <option value="org">org</option>
 
                 </select>
                 <button @click="hpost()">发送请求</button>
diff --git a/APIJSON.NET/APIJSON.NET/wwwroot/js/main.js b/APIJSON.NET/APIJSON.NET/wwwroot/js/main.js
@@ -142,12 +142,11 @@
     },
       methods: {
           hpost: function () {
-            
               $.ajax({
                   url: $('#rest-url').val(),
                   type: "POST", dataType: "json",
                   contentType: "application/json;charset=utf-8",
-                  data: $('#vInput').val(),
+                  data: $('#vInput').val(),//JSON.stringify($('#vInput').val()),
                   success: function (data) {
                   
                       App.jsonhtml = data;
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.8</Version>
-    <Description>0.0.8 清理SelectTable 支持重载
+    <Version>0.0.10</Version>
+    <Description>0.0.10 处理别名如果为关键字的缺陷
+0.0.8 清理SelectTable 支持重载
 0.0.7 修复not in的缺陷，增加~ 不等于的支持
 0.0.6 增加ToSql接口，处理sql注入的情况
 通用查询组件</Description>
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("修复not in的缺陷，增加~ 不等于的支持")]
+[assembly: AssemblyDescription("0.0.19 处理别名如果为关键字的缺陷")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ApiJson.Common")]
@@ -31,5 +31,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.7.0")]
-[assembly: AssemblyFileVersion("0.0.7.0")]
+[assembly: AssemblyVersion("0.0.10.0")]
+[assembly: AssemblyFileVersion("0.0.10.0")]
diff --git a/APIJSON.NET/APIJSONCommon/SelectTable.cs b/APIJSON.NET/APIJSONCommon/SelectTable.cs
@@ -456,7 +456,10 @@ private ISugarQueryable<ExpandoObject> sugarQueryable(string subtable, string se
             {
                 string vakey = va.Key.Trim();
                 string fieldValue = va.Value.ToString();
-
+                if (vakey.StartsWith("@"))
+                {
+                    continue;
+                }
                 if (vakey.EndsWith("$"))//模糊查询
                 {
                     FuzzyQuery(subtable, conModels, va);
@@ -531,10 +534,10 @@ private void ProcessColumn(string subtable, string selectrole, JObject values, I
                         {
                             throw new Exception("别名不能超过20个字符");
                         }
-                        str.Append(ziduan[0] + " as " + ReplaceSQLChar(ziduan[1]) + ",");
+                        str.Append(ziduan[0] + " as `" + ReplaceSQLChar(ziduan[1]) + "`,");
                     }
                     else
-                        str.Append(ziduan[0] + ",");
+                        str.Append("`" + ziduan[0] + "`" + ",");
 
                 }
             }

-Original file line number
+Diff line change
@@ @@ -1,7 +1,7 @@ @@
+{
   "ConnectionStrings": {
     "DbType": 0, //0:MySql,1:SqlServer,2:Sqlite
 -    "ConnectionString": "Server=192.168.2.25;Database=yunwei;Uid=root;Pwd=xmjk;Port=3306;Character Set=utf8;"
 +    "ConnectionString": "Server=192.168.2.25;Database=yunwei1.8;Uid=root;Pwd=xmjk;Port=3306;Character Set=utf8;"
     //"ConnectionString": "Server=119.29.9.25;Port=3306;Database=test;Uid=root;Pwd=1q,2w.3e?;CharSet=UTF8;"
   },
   "Authentication": {
+    {
       "name": "role1", //权限名称 唯一
       "select": { //查询权限
 -        "table": [ "moment", "User", "Comment" ], //可操作的表
 -        "column": [ "*", "*", "*" ], //可操作的字段
 +        "table": [ "*" ], //可操作的表
 +        "column": [ "*" ], //可操作的字段
         "where": []
       },
       "update": { //修改权限
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,10 @@ private ISugarQueryable<ExpandoObject> sugarQueryable(string subtable, string se`
`456`	`456`	`{`
`457`	`457`	`string vakey = va.Key.Trim();`
`458`	`458`	`string fieldValue = va.Value.ToString();`
`459`		`-`
	`459`	`+ if (vakey.StartsWith("@"))`
	`460`	`+ {`
	`461`	`+ continue;`
	`462`	`+ }`
`460`	`463`	`if (vakey.EndsWith("$"))//模糊查询`
`461`	`464`	`{`
`462`	`465`	`FuzzyQuery(subtable, conModels, va);`
`@@ -531,10 +534,10 @@ private void ProcessColumn(string subtable, string selectrole, JObject values, I`
`531`	`534`	`{`
`532`	`535`	`throw new Exception("别名不能超过20个字符");`
`533`	`536`	`}`
`534`		`- str.Append(ziduan[0] + " as " + ReplaceSQLChar(ziduan[1]) + ",");`
	`537`	+ str.Append(ziduan[0] + " as `" + ReplaceSQLChar(ziduan[1]) + "`,");
`535`	`538`	`}`
`536`	`539`	`else`
`537`		`- str.Append(ziduan[0] + ",");`
	`540`	+ str.Append("`" + ziduan[0] + "`" + ",");
`538`	`541`
`539`	`542`	`}`
`540`	`543`	`}`