cli

chu10 · Apr 21, 2018 · 249907b · 249907b
1 parent 6a3544a
commit 249907b
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 284 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,12 @@
 *.zip
 build/
+backup/
+update/
+*.exe
+*.exe.config
+Web.Backup.config
+Web.Restore.config
+Web.RestoreUpdate.config
 .vscode/
 
 ## Ignore Visual Studio temporary files, build results, and

diff --git a/README.md b/README.md
@@ -11,9 +11,10 @@ SiteServer CMS 是.NET平台CMS系统的创始者，能够以最低的成本、
 ```code
 │ siteserver.sln                  Visual Studio 项目文件
 │
-├─SiteServer.Utils                基础类库
-├─SiteServer.CMS                  CMS 源文件
 ├─SiteServer.BackgroundPages      ASP.NET 页面源文件
+├─SiteServer.Cli                  命令行工具
+├─SiteServer.CMS                  CMS 源文件
+├─SiteServer.Utils                基础类库
 └─SiteServer.Web                  API 源文件及aspx页面
 ```
 

diff --git a/SiteServer.BackgroundPages/packages.config b/SiteServer.BackgroundPages/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Net.Compilers" version="2.6.1" targetFramework="net461" developmentDependency="true" />
-  <package id="SiteServer.Plugin" version="1.5.0" targetFramework="net452" />
+  <package id="SiteServer.Plugin" version="1.5.46-beta" targetFramework="net452" />
 </packages>
diff --git a/SiteServer.CMS/packages.config b/SiteServer.CMS/packages.config
@@ -13,6 +13,6 @@
   <package id="NuGet.Packaging.Core" version="4.5.0" targetFramework="net461" />
   <package id="NuGet.Versioning" version="4.5.0" targetFramework="net461" />
   <package id="Oracle.ManagedDataAccess" version="12.2.1100" targetFramework="net461" />
-  <package id="SiteServer.Plugin" version="1.5.0" targetFramework="net452" />
+  <package id="SiteServer.Plugin" version="1.5.46-beta" targetFramework="net452" />
   <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net461" />
 </packages>
diff --git a/SiteServer.Cli/.gitignore b/SiteServer.Cli/.gitignore
diff --git a/SiteServer.Cli/Program.cs b/SiteServer.Cli/Program.cs
@@ -69,7 +69,7 @@ private static void Main(string[] args)
             catch (Exception ex)
             {
                 CliUtils.PrintError(ex.Message);
-                FileUtils.WriteText(PathUtils.Combine(CliUtils.PhysicalApplicationPath, "log.txt"), Encoding.UTF8, $"{ex.Message}{Environment.NewLine}{ex.StackTrace}");
+                FileUtils.WriteText(PathUtils.Combine(CliUtils.PhysicalApplicationPath, "error.log"), Encoding.UTF8, $"{ex.Message}{Environment.NewLine}{ex.StackTrace}");
             }
         }
     }

diff --git a/SiteServer.Cli/SiteServer.Cli.csproj b/SiteServer.Cli/SiteServer.Cli.csproj
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>.\</OutputPath>
+    <OutputPath>..\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>.\</OutputPath>
+    <OutputPath>..\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -193,9 +193,6 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
-    <None Include="Web.Backup.config" />
-    <None Include="Web.Restore.config" />
-    <None Include="Web.RestoreUpdate.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />

diff --git a/SiteServer.Cli/Web.Backup.config b/SiteServer.Cli/Web.Backup.config
diff --git a/SiteServer.Cli/Web.Restore.config b/SiteServer.Cli/Web.Restore.config
diff --git a/SiteServer.Cli/Web.RestoreUpdate.config b/SiteServer.Cli/Web.RestoreUpdate.config
diff --git a/SiteServer.Cli/log.txt b/SiteServer.Cli/log.txt