Merge branch 'master' into fix_不一至的行尾

Author: yuanwj

build/version.props

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>2</VersionMajor>
 		<VersionMinor>3</VersionMinor>
-		<VersionPatch>5</VersionPatch>
+		<VersionPatch>6</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>
 </Project>

src/SmartCode.App/BuildTasks/ProcessBuildTask.cs

@@ -37,7 +37,7 @@ public Task Build(BuildContext context)
             var startInfo = new ProcessStartInfo(fileName)
             {
                 UseShellExecute = false,
-                RedirectStandardInput = true,
+                RedirectStandardInput = false,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
                 CreateNoWindow = DEFAULT_CREATE_NO_WINDOW
@@ -103,7 +103,7 @@ public Task Build(BuildContext context)
                 }
                 _logger.LogDebug($"--------Process.FileName:{startInfo.FileName},Args:{startInfo.Arguments},Taken:{process.TotalProcessorTime.TotalMilliseconds} End--------");
             }
-            return  Task.CompletedTask;
+            return Task.CompletedTask;
         }
 
         private void Process_ErrorDataReceived(object sender, DataReceivedEventArgs e)

src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-Oracle.cshtml

@@ -27,7 +27,7 @@
         Select TT.* From
         (Select ROW_NUMBER() Over(Order By T.@pkCol.Name Desc) Row_Index,T.* From @table.Name T
         <Include RefId="QueryParams" />) TT
-        Where TT.Row_Index Between ((@@PageIndex-1)*@@PageSize+1) And (@@PageIndex*@@PageSize)
+        Where TT.Row_Index Between ((@(dbPrefix)PageIndex-1)*@(dbPrefix)PageSize+1) And (@(dbPrefix)PageIndex*@(dbPrefix)PageSize)
     </Statement>
 }
 @section GetEntity
@@ -51,16 +51,21 @@
     {
     <!--获取数据列-->
     <Statement Id="Query" @queryStatementResultMap>
-        SELECT
-        <IsNotEmpty Prepend="Top" Property="Taken">
-            (@(dbPrefix)Taken)
+        select * from (
+
+            SELECT
+            T.* From @table.Name T
+            <Include RefId="QueryParams"/>
+            <Switch Prepend="Order By" Property="OrderBy">
+                <Default>
+                    T.@pkCol.Name Desc
+                </Default>
+            </Switch>
+        )
+        <IsNotEmpty Prepend="where" Property="Taken">
+        <![CDATA[
+        ROWNUM <= @(dbPrefix)Taken
+        ]]>
         </IsNotEmpty>
-        T.* From @table.Name T
-        <Include RefId="QueryParams" />
-        <Switch Prepend="Order By" Property="OrderBy">
-            <Default>
-                T.@pkCol.Name Desc
-            </Default>
-        </Switch>
     </Statement>
 }

src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-MySql.cshtml

@@ -21,6 +21,6 @@
     <select id="queryByPage" resultMap="@resultMapName">
         select * from @table.Name
         <include refid="queryParams"/>
-        limit #{page.offset} offset #{page.limit}
+        limit #{page.limit} offset #{page.offset}
     </select>
 }