修复 Server 依赖项独立启动

src/Process/ProcessStarter.cs

@@ -49,12 +49,12 @@ namespace WingCloudServer.Loader
         /// <param name="processName">工具程序名称</param>
         public static void StartProcess(string namePath)
         {
-            var toolsRootPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Tools");
             Process process = new Process();
             process.StartInfo.WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory;
-            process.StartInfo.FileName = Path.Combine(toolsRootPath,namePath);
+            process.StartInfo.FileName = namePath;
             //process.StartInfo.Arguments = paramsValue;
             process.Start();
+
         }
         /// <summary>
         /// 停止工具程序

src/WingApplicationBuilder.cs

@@ -41,34 +41,26 @@ namespace WingCloudServer
             //=========================================================================//         
 
             //启动 工具
-            var _dependencies = ConfigurationManager.GetParammeter<StringParameter>("Dependencies", "Data").Value;
+            var _dependencies = ConfigurationManager.GetParammeter<StringParameter>("Dependencies", "Apps").Value;
             if (!string.IsNullOrEmpty(_dependencies))
             {
-                var items = _dependencies.Split(',');
-                foreach (var item in items)
+                var dependenciesApps = _dependencies.Split(',');
+                foreach (var item in dependenciesApps)
                 {
-                    var array = item.Split('-');
-                    if (array == null || array.Length <= 1)
+                    if (!string.IsNullOrEmpty(item))
                     {
-                        if (item.Contains('\\'))
+                        var appPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, item);
+                        ProcessStarter.StartProcess(appPath);
+                        var arry = item.Split('.');
+                        if (arry.Length > 0)
                         {
-                            ProcessStarter.StartProcess(item);
-                            var arrayexe = item.Split('\\');
-                            if (arrayexe.Length > 0)
-                            {
-                                _dependencieNames.Add(arrayexe[1]);
-                            }
+                            _dependencieNames.Add(arry[0]);
                         }
                         else
                         {
-                            ProcessStarter.StartTool(item);
                             _dependencieNames.Add(item);
                         }
-                    }
-                    if (array.Length == 2)
-                    {
-                        ProcessStarter.StartTool(array[0], array[1]);
-                        _dependencieNames.Add(array[0]);
+
                     }
                 }
             }

src/WingCloudServer.csproj

@@ -31,9 +31,15 @@
     <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Tools\**">
+    <None Update="mongod.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="sms.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <!-- <None Update="Tools\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None> -->
     <None Update="macstart.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -64,13 +70,10 @@
       <Link>Networks\Carotid\%(Filename)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="startTool.bat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-      <None Update="startMongoDB.bat">
+    <None Update="mongod.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="closedTool.bat">
+     <None Update="sms.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

src/appsettings.json

@@ -2,7 +2,7 @@
   "General": {
     "Version": "1.0.0.0",
     "IsDistributed": false,
-    "IsMaster": true,
+    "IsMaster": false,
     "MasterUrl": ""
   },
   "Gateway": {
@@ -32,7 +32,7 @@
     "IsUploadThumbnail": true
   },
   "Notification": {
-    "Host": "http://*:9301/"
+    "Host": "http://127.0.0.1:9301/"
   },
   "Report": {
     "ShareCodePrefix": "1",
@@ -41,7 +41,7 @@
     "ReportMessageTemplateId": "1017793"
   },
   "Storage": {
-    "ServerHost": "http://*:9303/",
+    "ServerHost": "http://127.0.0.1:9303/",
     "StorageServer":"COS",
     "StorageNode": "ap-beijing",
     "DivisionForUpload": 5242880,
@@ -73,10 +73,10 @@
     "HeartRateSeconds": 300
   },
   "Dependencies":{
-      "Data": "StartMongodTool\\mongod,Sms.Tool-http://*:8302/"
+      "Apps": "mongod.bat,sms.bat,"
   },
   "FastServer": {
-    "ServerHost": "http://*:9304/"
+    "ServerHost": "http://127.0.0.1:9304/"
   },
   "Email": {
     "EmailUserName": "vcloud@vinno.com",

src/mongod.bat

@@ -0,0 +1,3 @@
+@echo off
+cd %~dp0
+start /b  mongod.exe --dbpath  %~dp0Mongodb\Data  --logpath  %~dp0Mongodb\Logs\DBLog   --port 8301  --nojournal  --quiet 

src/sms.bat

@@ -0,0 +1,4 @@
+@echo off 
+@for /f %%i in ('tasklist /nh') do if "%%i"=="sms.exe"  echo "exist" &  goto end
+start /b sms.exe "http://*:8302/"
+:end

src/startMongoDB.bat

@@ -1,3 +0,0 @@
-@echo off
-cd %~dp0Tools\WingStartTool
-start /b  mongod.exe "%~dp0Tools "  "--dbpath  %~dp0Mongodb\Data  --logpath  %~dp0Mongodb\Logs\DBLog   --port 8301  --nojournal  --quiet "

src/startSmsTool.bat

@@ -1,3 +0,0 @@
-@echo off
-cd %~dp0Tools\win
-start /b win_Sms.Tool.exe  "http://*:8302/"