mirror of
https://github.com/hpd840321/starRiverProperty.git
synced 2026-06-09 16:30:29 +08:00
418c7db202
- davinci-manager-storage:FilePart 路径与基址按 V1 JAR(/portal/file、/part/*、GET /download) - 启动类:扫描 cn.cloudwalk.serial 与 cn.cloudwalk.cwos.client.resource,补 UUIDSerial 与 ApplicationService - deploy:v1/v2 application 中 cloudwalk.serial.enabled、Kafka 指向 192.168.3.12:9092;deploy/.gitignore 忽略日志 - cloudwalk-common-serial:补充 META-INF/spring.factories(Boot 自动配置) - 电梯:Session 配置、Davinci Bean、Feign 包、MQTT/Visitor/Zone Feign;部署脚本与 API parity 工具更新 - 文档与根脚本若干;未纳入大体积 jar/zip 与 v1 CFR 对比目录 Made-with: Cursor Former-commit-id: b76d142d13ebb5c0898de2d9d11bc583876829c2
39 lines
1.2 KiB
Bash
Executable File
39 lines
1.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# 读取 redis-override.properties,输出一行 SPRING_APPLICATION_JSON(紧凑 JSON)。
|
|
# 若环境变量 SPRING_REDIS_PASSWORD 已设置(含空字符串),则覆盖文件中的 spring.redis.password。
|
|
# 用法: export SPRING_APPLICATION_JSON="$(./merge-redis-json.sh /path/to/redis-override.properties)"
|
|
set -euo pipefail
|
|
PROP="${1:?用法: merge-redis-json.sh <redis-override.properties>}"
|
|
if [[ ! -f "$PROP" ]]; then
|
|
echo "找不到文件: $PROP" >&2
|
|
exit 1
|
|
fi
|
|
python3 - "$PROP" <<'PY'
|
|
import json, os, pathlib, re, sys
|
|
|
|
prop = pathlib.Path(sys.argv[1])
|
|
lines = prop.read_text(encoding="utf-8")
|
|
|
|
|
|
def get(key):
|
|
pat = r"^" + re.escape(key) + r"\s*=\s*(.*?)\s*$"
|
|
m = re.search(pat, lines, re.MULTILINE)
|
|
return m.group(1).strip() if m else ""
|
|
|
|
|
|
host = get("spring.redis.host") or "127.0.0.1"
|
|
port_raw = get("spring.redis.port") or "6379"
|
|
try:
|
|
port = int(port_raw)
|
|
except ValueError:
|
|
port = 6379
|
|
|
|
if "SPRING_REDIS_PASSWORD" in os.environ:
|
|
pwd = os.environ["SPRING_REDIS_PASSWORD"]
|
|
else:
|
|
pwd = get("spring.redis.password")
|
|
|
|
payload = {"spring": {"redis": {"host": host, "port": port, "password": pwd}}}
|
|
print(json.dumps(payload, separators=(",", ":")))
|
|
PY
|