diff --git a/.gitignore b/.gitignore
index bbf756d3d..87bfea6cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ packages
/script/generator/generated_code
output
+/cms/core/JR.Cms.Core/*.user
diff --git a/bootstrap/JR.Cms.Bootstrap/Properties/AssemblyInfo.cs b/bootstrap/JR.Cms.Bootstrap/Properties/AssemblyInfo.cs
index bdad6f29d..e6c3825be 100644
--- a/bootstrap/JR.Cms.Bootstrap/Properties/AssemblyInfo.cs
+++ b/bootstrap/JR.Cms.Bootstrap/Properties/AssemblyInfo.cs
@@ -15,7 +15,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JR.Cms .NET!The cross platform content manage system.")]
-[assembly: AssemblyCopyright("Copyright To2.Net 2008-2019")]
+[assembly: AssemblyCopyright("Copyright to2.net 2008-2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/cms/core/JR.Cms.Core/Conf/CmsVariables.cs b/cms/core/JR.Cms.Core/Conf/CmsVariables.cs
index 2d4f12148..0ede6cb9e 100644
--- a/cms/core/JR.Cms.Core/Conf/CmsVariables.cs
+++ b/cms/core/JR.Cms.Core/Conf/CmsVariables.cs
@@ -6,7 +6,7 @@ public class CmsVariables
///
/// 版本号
///
- public const string VERSION="3.2.002";
+ public const string VERSION="3.2.004";
///
/// 框架目录
diff --git a/patch/upgrade.xml b/cms/core/JR.Cms.Core/Conf/upgrade.xml
similarity index 77%
rename from patch/upgrade.xml
rename to cms/core/JR.Cms.Core/Conf/upgrade.xml
index d84532d79..15a87132a 100644
--- a/patch/upgrade.xml
+++ b/cms/core/JR.Cms.Core/Conf/upgrade.xml
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/cms/core/JR.Cms.Core/Updater.cs b/cms/core/JR.Cms.Core/Updater.cs
index 89a8f2feb..8e5443a7c 100644
--- a/cms/core/JR.Cms.Core/Updater.cs
+++ b/cms/core/JR.Cms.Core/Updater.cs
@@ -68,7 +68,7 @@ static Updater()
if (UpgradePercent < 0.3F) UpgradePercent = 0.3F;
//最后更新dll
- UpgradeFile("bin.zip", UpgradeFileType.Zip,UpgadeDir, false);
+ UpgradeFile("boot.zip", UpgradeFileType.Zip,UpgadeDir, false);
//v2.1 版本切换至于sponet.dll
}
diff --git a/cms/core/JR.Cms.Core/_#upgrade/v2/j6.cms.libs.zip b/cms/core/JR.Cms.Core/_#upgrade/v2/j6.cms.libs.zip
deleted file mode 100644
index 5678728b5..000000000
Binary files a/cms/core/JR.Cms.Core/_#upgrade/v2/j6.cms.libs.zip and /dev/null differ
diff --git a/cms/core/JR.Cms.Core/_#upgrade/v2/upgrade.xml b/cms/core/JR.Cms.Core/_#upgrade/v2/upgrade.xml
deleted file mode 100644
index d84532d79..000000000
--- a/cms/core/JR.Cms.Core/_#upgrade/v2/upgrade.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-本版本请在技术人员指导下进行操作升级,请用户勿擅自升级!
-
-
-]]>
-
diff --git a/patch/bin.zip b/patch/bin.zip
deleted file mode 100644
index e743dc67c..000000000
Binary files a/patch/bin.zip and /dev/null differ
diff --git a/patch/cms.patch.zip b/patch/cms.patch.zip
deleted file mode 100644
index 6bfc29ae6..000000000
Binary files a/patch/cms.patch.zip and /dev/null differ
diff --git a/script/build.sh b/script/build.sh
index 56fab60e1..8679c52fb 100644
--- a/script/build.sh
+++ b/script/build.sh
@@ -4,11 +4,19 @@ echo "======================================="
echo "= JR Cms .NET ! assembly ="
echo "======================================="
-echo scanning assemblies...
+echo scanning assemblies... && cd ..
-cur=$(pwd)
+dist_dir=$(pwd)/dist
+tmp_dir=$(pwd)/dist/tmp
+dll_dir=$(pwd)/refrence.dll
+exe_dir=$(pwd)/script
+
+rm -rf $dist_dir/patch && rm -rf $dist_dir/*.zip
+
+mkdir -p $tmp_dir/templates \
+ && mkdir -p $tmp_dir/bin \
+ && mkdir -p $tmp_dir/../patch
-cd ../bin
echo "1. build dll "
@@ -17,7 +25,7 @@ echo "1. build dll "
#cd %dir%/src/bin/
#echo /keyfile:%dir%\src\JR.cms.snk>nul
-${cur}/merge.exe -closed -ndebug \
+cd ./bin && $exe_dir/merge.exe -closed -ndebug \
/keyfile:../cms/jr.cms.snk \
/targetplatform:v4 /target:dll /out:../dist/jrcms.dll \
JR.Cms.Core.dll JR.Cms.BLL.dll JR.Cms.DAL.dll \
@@ -31,13 +39,6 @@ ${cur}/merge.exe -closed -ndebug \
&& cd ..
echo "2. prepare files"
-tmp_dir=$(pwd)/dist/tmp
-dll_dir=$(pwd)/refrence.dll
-exe_dir=$(pwd)/script
-
-rm -rf $tmp_dir && mkdir -p $tmp_dir/templates \
- && mkdir -p $tmp_dir/bin \
- && mkdir -p $tmp_dir/../patch
cd $(find . -path "*/JR.Cms.WebUI") && \
cp -r \$server install plugins public \
@@ -52,9 +53,15 @@ cp LICENSE README.md $tmp_dir && cp dist/boot.dll \
cp dist/jrcms.dll $dll_dir/jrdev* $tmp_dir/public/assemblies
echo "3. package upgrade zip"
-cd $tmp_dir && cp -r $(find $exe_dir/../cms -name "upgrade.xml") ../patch \
- && $exe_dir/7z.exe a -tzip ../patch/boot.zip bin >/dev/null \
- && $exe_dir/7z.exe a -tzip ../patch/cms-patch.zip >/dev/null
+# copy upgrade.xml
+cd $tmp_dir && cp -r $(find $exe_dir/../cms -name "upgrade.xml") ../patch
+# copy bin folder
+mv bin/System.Data.SQLite.dll bin/System.Data.SQLite.dll.bak \
+ && $exe_dir/7z.exe a -tzip ../patch/boot.zip bin/*.dll >/dev/null \
+ && mv bin/System.Data.SQLite.dll.bak bin/System.Data.SQLite.dll
+# copy patch folders
+$exe_dir/7z.exe a -tzip ../patch/cms-patch.zip public \
+ plugins README.md LICENSE >/dev/null
echo "4. package all"
$exe_dir/7z.exe a -tzip ../jrcms-dist-1.0.zip * >/dev/null