Update server information

inp/_temp.inp

@@ -0,0 +1,109 @@
+[TITLE]␍␍
+␍␍
+[JUNCTIONS]␍␍
+␍␍
+[RESERVOIRS]␍␍
+␍␍
+[TANKS]␍␍
+␍␍
+[PIPES]␍␍
+␍␍
+[PUMPS]␍␍
+␍␍
+[VALVES]␍␍
+␍␍
+[DEMANDS]␍␍
+␍␍
+[EMITTERS]␍␍
+␍␍
+[STATUS]␍␍
+␍␍
+[PATTERNS]␍␍
+␍␍
+[CURVES]␍␍
+␍␍
+[CONTROLS]␍␍
+␍␍
+[ENERGY]␍␍
+GLOBAL EFFICIENCY         0.7500␍␍
+GLOBAL PRICE              0.0000␍␍
+DEMAND CHARGE             0.0000␍␍
+␍␍
+[QUALITY]␍␍
+␍␍
+[SOURCES]␍␍
+␍␍
+[MIXING]␍␍
+␍␍
+[REACTIONS]␍␍
+ORDER BULK                1.0000␍␍
+ORDER WALL                1.0000␍␍
+ORDER TANK                1.0000␍␍
+GLOBAL BULK               0.0000␍␍
+GLOBAL WALL               0.0000␍␍
+LIMITING POTENTIAL        0.0000␍␍
+ROUGHNESS CORRELATION     0.0000␍␍
+␍␍
+[OPTIONS]␍␍
+FLOW_UNITS                GPM␍␍
+PRESSURE_UNITS            PSI␍␍
+HEADLOSS_MODEL            H-W␍␍
+SPECIFIC_GRAVITY          1.0000␍␍
+SPECIFIC_VISCOSITY        1.0000␍␍
+␍␍
+MAXIMUM_TRIALS            100␍␍
+HEAD_TOLERANCE            0.0000␍␍
+FLOW_TOLERANCE            0.0000␍␍
+FLOW_CHANGE_LIMIT         0.0000␍␍
+TIME_WEIGHT               0.0000␍␍
+STEP_SIZING               FULL␍␍
+IF_UNBALANCED             STOP␍␍
+␍␍
+␍␍
+DEMAND_MODEL              FIXED␍␍
+DEMAND_PATTERN            ␍␍
+DEMAND_MULTIPLIER         1.0000␍␍
+MINIMUM_PRESSURE          0.0000␍␍
+SERVICE_PRESSURE          0.0000␍␍
+PRESSURE_EXPONENT         0.5000␍␍
+␍␍
+LEAKAGE_MODEL             NONE␍␍
+LEAKAGE_COEFF1            0.0000␍␍
+LEAKAGE_COEFF2            0.0000␍␍
+EMITTER_EXPONENT          0.5000␍␍
+␍␍
+QUALITY_MODEL             NONE␍␍
+SPECIFIC_DIFFUSIVITY      1.0000␍␍
+QUALITY_TOLERANCE         0.0100␍␍
+␍␍
+[TIMES]␍␍
+TOTAL DURATION            0:00:00␍␍
+HYDRAULIC TIMESTEP        1:00:00␍␍
+QUALITY TIMESTEP          0:05:00␍␍
+RULE TIMESTEP             0:05:00␍␍
+PATTERN TIMESTEP          1:00:00␍␍
+PATTERN START             0:00:00␍␍
+REPORT TIMESTEP           1:00:00␍␍
+REPORT START              0:00:00␍␍
+START CLOCKTIME           0:00:00␍␍
+␍␍
+[REPORT]␍␍
+SUMMARY                   YES␍␍
+␍␍
+[COORDINATES]␍␍
+␍␍
+[VERTICES]␍␍
+␍␍
+[REGION]␍␍
+␍␍
+[BOUND]␍␍
+␍␍
+[DATA_NODE_OF_REGION]␍␍
+␍␍
+[DMA]␍␍
+␍␍
+[VD]␍␍
+␍␍
+[SA]␍␍
+␍␍
+[DATA_REGION_OF_NODE]␍␍

main.py

@@ -14,6 +14,7 @@ from tjnetwork import *
 import asyncio
 import threading
 from multiprocessing import Value
+from fastapi.middleware.cors import CORSMiddleware
 
 JUNCTION = 0
 RESERVOIR = 1
@@ -36,6 +37,14 @@ if not os.path.exists(tmpDir):
 
 app = FastAPI()
 
+# 配置 CORS 中间件
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],  # 允许所有来源
+    allow_credentials=True,  # 允许传递凭证（Cookie、HTTP 头等）
+    allow_methods=["*"],  # 允许所有 HTTP 方法
+    allow_headers=["*"],  # 允许所有 HTTP 头
+)
 # 定义一个共享变量
 lock_simulation = Value('i', 0)
 

startpg.bat

@@ -1,3 +1,3 @@
-d:
-cd "d:\postgresql14\bin"
+C:
+cd "C:\pg-14.7\bin"
 pg_ctl -D ../data -l logfile start

startserver.bat

@@ -1,3 +1,3 @@
-f:
-cd "f:\DEV\GitHub\TJWaterServer"
-uvicorn main:app --host 0.0.0.0 --port 8000 --reload
+REM f:
+REM cd "f:\DEV\GitHub\TJWaterServer"
+uvicorn main:app --host 0.0.0.0 --port 80 --reload