Publish/06.Docker/制作镜像/制作镜像.txt

@@ -1,6 +1,6 @@
 #构建多架构镜像
 
-#docker login -u serset -p xxxxxxxxx
+# docker login -u serset -p xxxxxxxxx
 
 #---------------------------------------------------------------------
 #(x.1)初始化构建器
@@ -38,7 +38,7 @@ cd /root/image
 
 #构建镜像并推送到 Docker Hub 
 cd sqler
-docker buildx build . -t serset/sqler:3.0.1.586 -t serset/sqler --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
+docker buildx build . -t serset/sqler:3.0.1.595 -t serset/sqler --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
  
 
 

Publish/06.Docker/部署文件/docker部署sqler.md

@@ -98,6 +98,7 @@ docker run --rm -it serset/sqler dotnet Sqler.dll help
 show variables like '%sql_mode%';
 
 -- 修改sql_mode,去掉NO_ZERO_IN_DATE,NO_ZERO_DATE:
+set sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION';
 set global sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION';
 
 
@@ -105,13 +106,12 @@ set global sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_B
 
 #备份数据库
 docker run --rm -it \
---link mysql80:mysql \
+--link wordpress-mysql:mysql \
 -v /root/data:/root/data  \
 serset/sqler  \
 dotnet Sqler.dll MySql.BackupSqler \
 --filePath "/root/data/wordpress.sqler.zip" \
 --ConnectionString "Data Source=mysql;Port=3306;Database=wordpress;User Id=root;Password=123456;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;"
-
  
 
 
@@ -119,13 +119,13 @@ dotnet Sqler.dll MySql.BackupSqler \
 
 
 
-#还原数据库
+#强制还原数据库
 docker run --rm -it \
---link mysql80:mysql \
+--link wordpress-mysql:mysql \
 -v /root/data:/root/data  \
 serset/sqler  \
 dotnet Sqler.dll MySql.Restore \
---filePath "/root/data/wordpress.sqler.zip" \
+-f --filePath "/root/data/wordpress.sqler.zip" \
 --ConnectionString "Data Source=mysql;Port=3306;Database=wordpress;User Id=root;Password=123456;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;"
 
  

Sqler/Module/Sqler/Logical/DbPort/DbPortLogical.cs

@@ -518,7 +518,7 @@ namespace Sqler.Module.Sqler.Logical.DbPort
                             //(x.x.3)初始化环境参数                           
                             curTbIndex++;
 
-                        } while (dr.NextResult());
+                        } while (!dr.IsClosed && dr.NextResult());
                     }
                     var span = (DateTime.Now - startTime);
                     SendMsg(EMsgType.Nomal, "");

Sqler/Sqler.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>3.0.1.586</Version>
+		<Version>3.0.1.595</Version>
 		<Description>https://github.com/serset/Sqler</Description>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
@@ -19,11 +19,17 @@
 		<PackageReference Include="Microsoft.AspNetCore.App" />
 
 		<PackageReference Include="Vit.WebHost" Version="2.1.3.656" />
-		<PackageReference Include="Vit.Orm.EntityFramework.Dynamic" Version="2.2.0.580" />
-		<PackageReference Include="Vit.Db.DbMng" Version="2.2.0.585" />
+		<PackageReference Include="Vit.Orm.EntityFramework.Dynamic" Version="2.2.0.594-preview" />
+		<PackageReference Include="Vit.Db.DbMng" Version="2.2.0.594-preview" />
 	</ItemGroup>
 
 
+	<!--<ItemGroup>
+	  <ProjectReference Include="..\..\..\Vit.Library\Vit\Vit.Db\Vit.Db.DbMng\Vit.Db.DbMng.csproj" />
+	  <ProjectReference Include="..\..\..\Vit.Library\Vit\Vit.Orm.EntityFramework\Vit.Orm.EntityFramework.Dynamic\Vit.Orm.EntityFramework.Dynamic.csproj" />
+	</ItemGroup>-->
+
+
 
 	<ItemGroup>