diff --git a/server/scenario/Resources/scenario.bat b/server/scenario/Resources/scenario.bat index fb85434..97f874f 100644 --- a/server/scenario/Resources/scenario.bat +++ b/server/scenario/Resources/scenario.bat @@ -2,16 +2,17 @@ chcp 65001 title Scenario Quick Start -if exist "%EVAL_MAIN%\bin\demo-0.0.1.jar" ( - start "Scenario Server" cmd /k "java -jar -Dproject.database-ip=127.0.0.1 -Dproject.database-port=33306 --enable-preview -Dserver.port=28880 -Dspring.profiles.active=dev -Dmybatis-flex.datasource.ds1.password=pF4jE0fA2aA2qE1c bin/demo-0.0.1.jar" +cd %SCENARIO_MAIN% +if exist "%SCENARIO_MAIN_BIN%" ( + start "Eval Server" cmd /k "java -jar %SCENARIO_VM_PARAMS% -jar %SCENARIO_MANAGE_BIN%" ) -if exist "%EVAL_MAIN%\bin\demo-0.0.1.jar" ( +if exist "%SCENARIO_MAIN_BIN%" ( start "Scenario Website" cmd /k "cd web && scenario-web.exe -c conf/web.conf" ) -echo 评估服务已启动: -echo - ScenarioServer (端口: 28880) -echo - ScenarioWebsite (端口: 18880) +echo Scenario: +echo - ScenarioServer (Port: 28880) +echo - ScenarioWebsite (Port: 18880) pause \ No newline at end of file diff --git a/server/scenario/install-win7-scenario.iss b/server/scenario/install-win7-scenario.iss index 975520f..64c4dcc 100644 --- a/server/scenario/install-win7-scenario.iss +++ b/server/scenario/install-win7-scenario.iss @@ -124,11 +124,13 @@ Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environmen ; 扩展启动vm变量 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string; Flags: uninsdeletevalue; \ ValueName: "{#MyAppExeNameUpper}_VM_PARAMS"; ValueData: " \ + -Dspring.profiles.active=dev \ --enable-preview \ -Dserver.port=28880 \ -Dproject.database-ip=127.0.0.1 \ -Dproject.database-port=33306 \ -Dproject.database-name=scenario \ + -Dmybatis-flex.datasource.ds1.password=pF4jE0fA2aA2qE1c \ ";