diff --git a/base/Resources/io/minio-server.bat b/base/Resources/io/minio-server.bat index fd29fad..4c41bcb 100644 --- a/base/Resources/io/minio-server.bat +++ b/base/Resources/io/minio-server.bat @@ -28,8 +28,8 @@ if exist "%MINIO_EXE%" ( start "Scenario Server" cmd /k "%MINIO_EXE% server ^"%DATA_DIR%^" --console-address ^":%CONSOLE_PORT%^"" ) -echo MinIO 服务已启动: -echo - MinIO API (端口: 9000) -echo - MinIO Web (端口: 9001) +echo MinIO: +echo - MinIO API (Port: 9000) +echo - MinIO Web (Port: 9001) pause \ No newline at end of file diff --git a/base/Resources/redis/redis.conf b/base/Resources/redis/redis.conf index 7e1c740..2ce2531 100644 --- a/base/Resources/redis/redis.conf +++ b/base/Resources/redis/redis.conf @@ -20,7 +20,7 @@ save "" port 6379 -requirepass '' +requirepass 'redis123' maxmemory 256mb appendonly no maxmemory-policy allkeys-lru diff --git a/server/eval/install-win7-eval.iss b/server/eval/install-win7-eval.iss index e9e1c80..476a75f 100644 --- a/server/eval/install-win7-eval.iss +++ b/server/eval/install-win7-eval.iss @@ -135,6 +135,7 @@ Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environmen -Dproject.database-name=eval_sys \ -Dmybatis-flex.datasource.ds1.password=WTpHm3sAJfE45HXp \ -Dproject.redis-url=127.0.0.1 \ + -Dproject.redis-password=redis123 \ -Dproject.minio-url=http://127.0.0.1:9000 \ -Dproject.minio-k=minio_FEaTQx \ -Dproject.minio-v=minio_34KYwR \ @@ -281,3 +282,8 @@ end; [UninstallRun] Filename: "taskkill"; Parameters: "-f -im {#MyAppExeName}-web.exe"; Flags: runascurrentuser runhidden waituntilterminated + +;; 卸载时删除的文件 +[UninstallDelete] +Type: filesandordirs; Name: "{app}\{#MyAppExeName}\log" +Type: filesandordirs; Name: "{app}\{#MyAppExeName}\script" diff --git a/server/model/install-win7-model.iss b/server/model/install-win7-model.iss index de51803..e1e9caf 100644 --- a/server/model/install-win7-model.iss +++ b/server/model/install-win7-model.iss @@ -274,3 +274,8 @@ end; [UninstallRun] Filename: "taskkill"; Parameters: "-f -im {#MyAppExeName}-web.exe"; Flags: runascurrentuser runhidden waituntilterminated + +;; 卸载时删除的文件 +[UninstallDelete] +Type: filesandordirs; Name: "{app}\{#MyAppExeName}\log" +Type: filesandordirs; Name: "{app}\{#MyAppExeName}\script" diff --git a/server/scenario/Resources/scenario.bat b/server/scenario/Resources/scenario.bat index 97f874f..3204301 100644 --- a/server/scenario/Resources/scenario.bat +++ b/server/scenario/Resources/scenario.bat @@ -3,11 +3,11 @@ chcp 65001 title Scenario Quick Start cd %SCENARIO_MAIN% -if exist "%SCENARIO_MAIN_BIN%" ( - start "Eval Server" cmd /k "java -jar %SCENARIO_VM_PARAMS% -jar %SCENARIO_MANAGE_BIN%" +if exist "%SCENARIO_MANAGE_BIN%" ( + start "Scenario Server" cmd /k "java -jar %SCENARIO_VM_PARAMS% -jar %SCENARIO_MANAGE_BIN%" ) -if exist "%SCENARIO_MAIN_BIN%" ( +if exist "%SCENARIO_MANAGE_BIN%" ( start "Scenario Website" cmd /k "cd web && scenario-web.exe -c conf/web.conf" ) diff --git a/server/scenario/install-win7-scenario.iss b/server/scenario/install-win7-scenario.iss index 64c4dcc..c054ebd 100644 --- a/server/scenario/install-win7-scenario.iss +++ b/server/scenario/install-win7-scenario.iss @@ -131,6 +131,8 @@ Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environmen -Dproject.database-port=33306 \ -Dproject.database-name=scenario \ -Dmybatis-flex.datasource.ds1.password=pF4jE0fA2aA2qE1c \ + -Dproject.redis-url=127.0.0.1 \ + -Dproject.redis-password=redis123 \ "; @@ -273,3 +275,10 @@ end; [UninstallRun] Filename: "taskkill"; Parameters: "-f -im {#MyAppExeName}-web.exe"; Flags: runascurrentuser runhidden waituntilterminated + + +;; 卸载时删除的文件 +[UninstallDelete] +Type: filesandordirs; Name: "{app}\{#MyAppExeName}\log" +Type: filesandordirs; Name: "{app}\{#MyAppExeName}\script" + diff --git a/server/simulation/install-win7-simulation.iss b/server/simulation/install-win7-simulation.iss index 6f59cc0..b563fbb 100644 --- a/server/simulation/install-win7-simulation.iss +++ b/server/simulation/install-win7-simulation.iss @@ -132,6 +132,7 @@ Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environmen -Dproject.database-port=33306 \ -Dproject.database-name=simulation \ -Dproject.redis-url=127.0.0.1 \ + -Dproject.redis-password=redis123 \ -Dproject.rocketmq-url=127.0.0.1:8081 \ -Dproject.minio-url=http://127.0.0.1:9000 \ -Dproject.eval-service-url=http://127.0.0.1:28480/evaluation/samples/receiveSync \ @@ -278,3 +279,8 @@ end; Filename: "taskkill"; Parameters: "-f -im {#MyAppExeName}-web.exe"; Flags: runascurrentuser runhidden waituntilterminated +;; 卸载时删除的文件 +[UninstallDelete] +Type: filesandordirs; Name: "{app}\{#MyAppExeName}\log" +Type: filesandordirs; Name: "{app}\{#MyAppExeName}\script" +