Эх сурвалжийг харах

删除了启动程序命令startCommand,统一的使用BAT文件来启动程序,
原因:使用启动程序命令startCommand启动的时候,由于Java的原因,性能和日历存在运行非常缓慢的现象,因此统一的使用BAT文件启动。

YangZhiJie 7 жил өмнө
parent
commit
effb5877ac

+ 6 - 20
config/applicationContext.xml

@@ -44,13 +44,11 @@
 	<bean id="applicationSetting1" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="应用服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\ProdogServer"></property>
-		<property name="startCommand" value="javaw -jar D:\ProdogServers\ProdogServer\ProdogBoot-0.0.1.jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 		<property name="autoUpdateFileNames">
 			<list>
 				<value>DingDingServer-0.0.1.jar</value>
-				<value>DingDingServer-0.0.1.jar</value>
 			</list>
 		</property>		
 		<property name="xmlConfigPath" >
@@ -68,7 +66,6 @@
 	<bean id="applicationSetting2" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="文件服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\FileServer"></property>
-		<property name="startCommand" value="javaw -jar D:\ProdogServers\FileServer\FileServer-0.0.1-SNAPSHOT.jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 		<property name="monitorUrl" value="http://127.0.0.1:85/api/monitor"></property>
@@ -78,7 +75,6 @@
 	<bean id="applicationSetting3" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="反向代理服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\nginx-1.13.8"></property>
-		<property name="startCommand" value="D:\ProdogServers\nginx-1.13.8\nginx.exe"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 		<property name="monitorUrl" value="http://127.0.0.1:85/api/monitor"></property>
@@ -88,7 +84,6 @@
 	<bean id="applicationSetting4" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="工作流服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\WorkflowServer"></property>
-		<property name="startCommand" value="javaw -jar D:\ProdogServers\WorkflowServer\ActivitiServer-0.0.1-SNAPSHOT.jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 		<property name="monitorUrl" value="http://127.0.0.1:82/activiti/explorer/monitor"></property>
@@ -98,7 +93,6 @@
 	<bean id="applicationSetting5" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="报表服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\ReportServer"></property>
-		<property name="startCommand" value="javaw -jar D:\ProdogServers\ReportServer\report-server-0.0.1-SNAPSHOT.jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 		<property name="monitorUrl" value="http://127.0.0.1:81/monitor"></property>
@@ -106,8 +100,6 @@
 		<property name="autoUpdateFileNames">
 			<list>
 				<value>report-server-0.0.1.jar</value>
-				<value>apache-tomcat-9.0.2-windows-x64.zip</value>
-				<value>apache-tomcat-9.0.2-windows-x86.zip</value>
 			</list>
 		</property>
 		<property name="xmlConfigPath" >
@@ -127,7 +119,6 @@
 	<bean id="applicationSetting6" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="钉钉服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\DingTalkServer"></property>
-		<property name="startCommand" value="javaw -jar D:\ProdogServers\DingTalkServer\DingDingServer-0.0.1-SNAPSHOT.jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 		<property name="monitorUrl" value="http://127.0.0.1:83/monitor"></property>
@@ -137,7 +128,6 @@
 	<bean id="applicationSetting7" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="微信服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\WeChatServer"></property>
-		<property name="startCommand" value="javaw -jar D:\ProdogServers\WeChatServer\WeChatServer-0.0.1.jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 		<property name="monitorUrl" value="http://127.0.0.1:80/monitor"></property>
@@ -147,7 +137,6 @@
 	<bean id="applicationSetting8" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="排产服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\ApsServer"></property>
-		<property name="startCommand" value="javaw -jar D:\ProdogServers\ApsServer\ProdogAssign-0.0.1.jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 		<property name="monitorUrl" value="http://127.0.0.1:85/api/monitor"></property>
@@ -157,7 +146,6 @@
 	<bean id="applicationSetting9" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="中间件服务器"></property>
 		<property name="installPath" value=""></property>
-		<property name="startCommand" value="javaw -jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 	</bean>
@@ -165,7 +153,6 @@
 	<bean id="applicationSetting10" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="视频监控服务器"></property>
 		<property name="installPath" value=""></property>
-		<property name="startCommand" value="javaw -jar"></property>
 		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 	</bean>
@@ -174,8 +161,7 @@
 	<bean id="applicationSetting11" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="源代码服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\TortoiseHg"></property>
-		<property name="startCommand" value="start.bat"></property>
-		<property name="startBatFile" value="stop.bat"></property>
+		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 	</bean>
 	
@@ -183,7 +169,7 @@
 	<bean id="applicationSetting12" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="natapp服务器"></property>
 		<property name="installPath" value="D:\ProdogServers\natapp_windows_8080"></property>
-		<property name="startBatFile" value="natapp.exe"></property>
+		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 	</bean>
 	
@@ -191,25 +177,25 @@
 	<bean id="applicationSetting13" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="测试服务器"></property>
 		<property name="installPath" value="D:\LeanwoProgram_2018\OtherServer\ServerManagement\src\test\java"></property>
-		<property name="startBatFile" value="test.bat"></property>
+		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 	</bean>
 	<bean id="applicationSetting14" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="测试服务器"></property>
 		<property name="installPath" value="D:\LeanwoProgram_2018\OtherServer\ServerManagement\src\test\java"></property>
-		<property name="startBatFile" value="test.bat"></property>
+		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 	</bean>
 	<bean id="applicationSetting15" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="测试服务器"></property>
 		<property name="installPath" value="D:\LeanwoProgram_2018\OtherServer\ServerManagement\src\test\java"></property>
-		<property name="startBatFile" value="test.bat"></property>
+		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 	</bean>
 	<bean id="applicationSetting16" class="com.leanwo.management.model.ApplicationSetting">
 		<property name="name" value="测试服务器"></property>
 		<property name="installPath" value="D:\LeanwoProgram_2018\OtherServer\ServerManagement\src\test\java"></property>
-		<property name="startBatFile" value="test.bat"></property>
+		<property name="startBatFile" value="start.bat"></property>
 		<property name="stopBatFile" value="stop.bat"></property>
 	</bean>
 </beans>

+ 0 - 21
src/main/java/com/leanwo/management/model/ApplicationSetting.java

@@ -21,9 +21,6 @@ public class ApplicationSetting {
 	/** 安装路径. */
 	private String installPath;
 	
-	/** 启动程序命令. */
-	private String startCommand;
-	
 	/** 启动程序BAT文件路径. */
 	private String startBatFile;
 
@@ -84,24 +81,6 @@ public class ApplicationSetting {
 		this.installPath = installPath;
 	}
 
-	/**
-	 * Gets the 启动程序命令.
-	 *
-	 * @return the 启动程序命令
-	 */
-	public String getStartCommand() {
-		return startCommand;
-	}
-
-	/**
-	 * Sets the 启动程序命令.
-	 *
-	 * @param startCommand the new 启动程序命令
-	 */
-	public void setStartCommand(String startCommand) {
-		this.startCommand = startCommand;
-	}
-
 	/**
 	 * Gets the 启动程序BAT文件路径.
 	 *

+ 2 - 5
src/main/java/com/leanwo/management/service/ProcessService.java

@@ -28,14 +28,11 @@ public class ProcessService implements StatusService {
 	public ProgramRunResult startProgram(ApplicationSetting setting) throws IOException{
 		File workingDirectory = new File(setting.getInstallPath());
 		ProgramRunResult programRunResult = null;
-		
-		//if(setting.getStartCommand() != null && setting.getStartCommand().length() > 0) {
-		//	programRunResult = runProgram(workingDirectory, setting.getStartCommand());
-		//}else if(setting.getStartBatFile() != null && setting.getStartBatFile().length() > 0) {
+		if(setting.getStartBatFile() != null && setting.getStartBatFile().length() > 0) {
 			String fullPath = setting.getInstallPath() + File.separator + setting.getStartBatFile();
 			File batFile = new File(fullPath);
 			programRunResult = runProgram(workingDirectory, batFile);
-		//}
+		}
 		return programRunResult;
 	}