Merge branch 'main' of http://8.140.250.85:3000/yuejiajun/WindowsStarter

base/Resources/redis/install_redis.bat

@@ -1,6 +1,6 @@
 @echo off
 chcp 65001 >nul
-tital Install Redis Server
+title Install Redis Server
 
 :: 检查是否以管理员身份运行
 net session >nul 2>&1

base/install_base.iss

@@ -5,6 +5,8 @@
 #define MyAppPublisher "X"
 #define MyAppURL "~"
 #define MyAppExeName "command"
+#define MyAppExeNameHump "Command"
+#define MyAppExeNameUpper "COMMAND"
 #define MyAppAssocName MyAppName + " File"
 #define MyAppAssocExt ".myp"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt

server/eval/install-win7-eval.iss

@@ -132,7 +132,8 @@ Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environmen
     -Dserver.port=28480 \
     -Dproject.database-ip=127.0.0.1 \
     -Dproject.database-port=33306 \
-    -Dproject.database-name=eval \
+    -Dproject.database-name=eval_sys \
+    -Dmybatis-flex.datasource.ds1.password=WTpHm3sAJfE45HXp \
     -Dproject.redis-url=127.0.0.1 \
     -Dproject.minio-url=http://127.0.0.1:9000 \
     -Dproject.minio-k=minio_FEaTQx \

server/eval/resources-initialize.bat

@@ -17,7 +17,7 @@ for %%f in (
   "dist"
   "fonts"
   "lib"
-  "script/eval"
+  "script/eval_sys"
   "server"
   "web"
 ) do (

server/model/Resources/model.bat

@@ -0,0 +1,18 @@
+@echo off
+chcp 65001
+title Model Quick Start
+
+cd %MODEL_MAIN%
+if exist "%MODEL_MANAGE_BIN%" (
+	start "Model Server" cmd /k "java -jar %MODEL_VM_PARAMS% -jar %MODEL_MANAGE_BIN%"
+)
+
+if exist "%MODEL_MANAGE_BIN%" (
+	start "Model Website" cmd /k "cd web && model-web.exe -c conf/web.conf"
+)
+
+echo Model:
+echo - ModelServer (Port: 28680)
+echo - ModelWebsite (Port: 18680)
+
+pause

server/model/install-win7-model.iss

@@ -129,6 +129,8 @@ Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environmen
     -Dproject.database-ip=127.0.0.1 \
     -Dproject.database-port=33306 \
     -Dproject.database-name=model \
+    -Dmybatis-flex.datasource.ds1.username=model \
+    -Dmybatis-flex.datasource.ds1.password=Wfbke8!LeMY5Fwwe \
     ";
 
 

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" (
+cd %SCENARIO_MAIN%
-	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"
+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 Scenario:
-echo - ScenarioServer (端口: 28880)
+echo - ScenarioServer (Port: 28880)
-echo - ScenarioWebsite (端口: 18880)
+echo - ScenarioWebsite (Port: 18880)
 
 pause

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 \
     ";
 
 

server/simulation/Resources/web/conf/simulation-windows.conf

@@ -15,12 +15,12 @@ server {
       try_files $uri $uri/ /index.html;
   }
   
-  # location /login {
+  location /login {
-  #   proxy_pass http://127.0.0.1:28280/login;
+    proxy_pass http://127.0.0.1:28280/login;
-  #   proxy_set_header Host $host;
+    proxy_set_header Host $host;
-  #   proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Real-IP $remote_addr;
-  #   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  # }
+  }
   
   location /api/ {
     proxy_pass http://127.0.0.1:28280/;