feat(elevator): 对齐 V1 lib 的 Davinci/扫描/事件与部署配置

- 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
2026-06-09 08:20:31 +08:00 · 2026-04-28 01:02:31 +08:00
parent be7a8e9d89
commit 418c7db202
61 changed files with 2967 additions and 461 deletions
@@ -0,0 +1,119 @@
+# deploy/v2-maven \uFF1Amaven \u6784\u5EFA cw-elevator-application-2.0.0.jar\uFF08\u540C\u76EE\u5F55\u542F\u52A8\uFF09
+server.port=18081
+spring.application.name=cw-elevator-application
+# Boot 1.5 \u65E0 spring.main.allow-bean-definition-overriding\uFF1B\u82E5\u91CD\u590D Bean \u9700\u5728\u4EE3\u7801\u4FA7\u6D88\u6B67\u4E49\u6216\u5347\u7EA7 Spring Boot
+
+
+# spring\u914D\u7F6E
+spring.mvc.throw-exception-if-no-handler-found=true
+spring.mvc.locale=zh_CN
+# \u8D44\u6E90\u6587\u4EF6\u914D\u7F6E
+spring.messages.basename=access-control
+spring.messages.always-use-message-format=true
+spring.messages.encoding=utf-8
+# http\u914D\u7F6E
+spring.http.multipart.max-file-size=200MB
+spring.http.multipart.max-request-size=200MB
+spring.http.encoding.force=true
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+# \u65E5\u5FD7\u914D\u7F6E
+logging.config=classpath:logs/logback.xml
+logging.file=${spring.application.name}
+logging.path=logs
+logging.level.root=info
+logging.level.cn.cloudwalk=info
+# mybatis\u914D\u7F6E
+mybatis.mapper-locations=classpath*:cn/cloudwalk/elevator/**/*.xml
+mybatis.config-location=classpath:mapper/mybatis-config.xml
+# \u5E8F\u5217\u53F7\u914D\u7F6E
+cloudwalk.serial.enabled=true
+cloudwalk.serial.serial-length=8
+cloudwalk.serial.serial-type=redis
+cloudwalk.serial.serial-redis-key=CLOUDWALK-ACS-SERIAL-KEY
+# \u7F13\u5B58\u914D\u7F6E
+cloudwalk.spring.cache.expires=CACHE_NAME_APPLICATIONIDS#21600,ACS_DeviceTypesCache#7200,ACS_DeviceTypeFeaturesCache#7200,ACS_DeviceAttrsCache#7200,ACS_RecordStatisticsCache#90000,ACS_AreaTreeCache#60
+# \u5185\u90E8\u63A5\u53E3\u8C03\u7528\u5BA2\u6237\u7AEF\u53CA\u8D85\u65F6\u914D\u7F6E
+feign.hystrix.enable=true
+feign.httpclient.enable=false
+feign.okhttp.enable=true
+ribbon.http.client.enabled=false
+ribbon.okhttp.enabled=true
+ribbon.ReadTimeout=10000
+ribbon.ConnectTimeout=10000
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
+# \u5065\u5EB7\u68C0\u67E5\u914D\u7F6E
+management.health.redis.enabled=false
+management.health.db.enabled=false
+# \u6570\u636E\u8131\u654F\u914D\u7F6E
+cloudwalk.datafield.enable=true
+cloudwalk.datafield.securityKey=d4b2aabc97394a12a27fc3cca6cd9ba1
+cloudwalk.datafield.encrypt=AES
+# redis\u914D\u7F6E\uFF08\u672C\u673A Docker\uFF1Aybs-redis 6379->6379\uFF0C\u82E5\u7528 craftlabs-redis \u6539\u4E3A 6380\uFF09
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+# \u672C\u673A Redis \u65E0\u5BC6\u7801\u65F6\u5FC5\u987B\u4FDD\u7559\u4E0B\u884C\u7A7A\u503C\uFF0C\u4EE5\u8986\u76D6 fat-jar \u5185\u5D4C\u65E7\u5BC6\u7801\uFF08\u5426\u5219 Redisson ERR AUTH\uFF09
+spring.redis.password=
+spring.redis.database=5
+spring.redis.timeout=0
+spring.redis.pool.max-active=10
+spring.redis.pool.max-idle=1
+spring.redis.pool.max-wait=10
+spring.redis.pool.min-idle=0
+# \u6570\u636E\u5E93sharding\u914D\u7F6E
+spring.shardingsphere.datasource.names=ds0
+spring.shardingsphere.datasource.ds0.type=com.zaxxer.hikari.HikariDataSource
+spring.shardingsphere.datasource.ds0.driver-class-name=com.mysql.jdbc.Driver
+spring.shardingsphere.datasource.ds0.jdbc-url=jdbc:mysql://192.168.3.12:3307/cw-elevator-application?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+spring.shardingsphere.datasource.ds0.username=root
+spring.shardingsphere.datasource.ds0.password=123456
+spring.shardingsphere.datasource.ds0.connection-timeout=60000
+spring.shardingsphere.datasource.ds0.maximum-pool-size=20
+spring.shardingsphere.datasource.ds0.minimum-idle=5
+spring.shardingsphere.datasource.ds0.max-lifetime=1765000
+spring.shardingsphere.datasource.ds0.auto-commit=true
+spring.shardingsphere.datasource.ds0.pool-name=ds0-pool
+spring.shardingsphere.props.sql.show=false
+spring.shardingsphere.sharding.default-data-source-name=ds0
+# \u5FAE\u670D\u52A1\u670D\u52A1\u540D\u914D\u7F6E
+feign.device.name=cwos-portal
+feign.resource.name=cwos-portal
+feign.cwos-portal.name=cwos-portal
+feign.ninca-crk-std.name=ninca-crk-std
+# 见 v1-legacy 同段注释：Consul 无 ninca-crk-std 时用静态 Ribbon 列表。
+ninca-crk-std.ribbon.NIWSServerListClassName=com.netflix.loadbalancer.ConfigurationBasedServerList
+ninca-crk-std.ribbon.listOfServers=10.128.161.95:16106
+feign.davinci-portal.name=cwos-portal
+feign.component-organization.name=ninca-common-component-organization
+feign.ninca-common.name=ninca-common
+feign.mqtt.name=cloudwalk-device-thirdparty
+# CWOS\u4E8B\u4EF6\u914D\u7F6E
+cloudwalk.event.bootstrap-servers=192.168.3.12:9092
+cloudwalk.event.group-id=cw-elevator-application-1
+cloudwalk.event.handler-executor-config.core-pool-size=10
+cloudwalk.event.handler-executor-config.maximum-pool-size=30
+# \u5206\u5E03\u5F0F\u9501\u914D\u7F6E
+intelligent.lock.enable=true
+intelligent.lock.config.default-wait-time=10000
+lockWatchdogTimeout=21000
+# PERSON_NAME_SPACE
+person.name.space=recordEvent
+elevator.application.key=xinghewan
+elevator.application.time=600
+elevator.application.keyA=5B7DEF88FF04
+ninca-crk-std.ip=10.128.161.95:16106
+#\u53D1\u9001\u7B2C\u4E09\u65B9\u6570\u636Eip
+sendRecord.ip=hrec.star-river.com:32165
+sendRecord.token.corpId=53db867a8bb747a1bd04dd1afcad8ca6
+sendRecord.token.appKey=293e2d708f0143c2957b702cef44d951
+sendRecord.token.appSecret=5f6995009b864669b52041b8f5dc4625
+sendRecord.boolean=true
+
+# \u8BBE\u5907\u5904\u7406\u7EBF\u7A0B\u6C60\u914D\u7F6E
+ninca.update.floor.pool.corePoolSize=5
+ninca.update.floor.pool.maxPoolSize=5
+ninca.update.floor.pool.queueCapacity=100000
+ninca.update.floor.pool.keepAliveSeconds=150
+ninca.update.floor.pool.allowCoreThreadTimeOut=true
+#\u697C\u680Bid
+floor.building.id=605560539791228928
@@ -0,0 +1,3 @@
+# 覆盖 fat-jar 内嵌 Consul 地址，指向局域网 Docker Consul。
+spring.cloud.consul.host=192.168.3.12
+spring.cloud.consul.port=8500
@@ -0,0 +1,4 @@
+# run.sh 将本文件合并为 SPRING_APPLICATION_JSON，覆盖 jar 内 Redis 配置。
+spring.redis.host=192.168.3.12
+spring.redis.port=6379
+spring.redis.password=1qaz!QAZ
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# 与当前目录下 application.properties 同路径启动 V2（maven 构建）包。
+# 默认优先系统 JDK 8；若只有 JDK11+ 会自动附加 --add-opens。
+# ELEVATOR_USE_ENV_JAVA=1 ./run.sh 使用当前 JAVA_HOME（如 Conda）。
+set -euo pipefail
+cd "$(dirname "$0")"
+# shellcheck source=../common-java.sh
+source "$(cd "$(dirname "$0")" && pwd)/../common-java.sh"
+
+JAR="cw-elevator-application-2.0.0.jar"
+if [[ ! -f "$JAR" ]]; then
+  echo "缺少 $JAR，请在 deploy 目录执行: ./sync-jars.sh" >&2
+  exit 1
+fi
+
+_pick_java_home
+if [[ ! -x "${JAVA_HOME}/bin/java" ]]; then
+  echo "ERROR: 未找到可执行的 JDK。请安装 openjdk-8-jdk，或设定 JAVA_HOME / ELEVATOR_USE_ENV_JAVA=1 ./run.sh（使用 Conda 等当前环境）。" >&2
+  exit 1
+fi
+JAVA="${JAVA_HOME}/bin/java"
+OPEN_FLAGS=()
+while IFS= read -r line; do
+  [[ -n "$line" ]] && OPEN_FLAGS+=("$line")
+done < <(_jdk8_open_flags "$JAVA")
+
+# 同 v1：由 redis-override.properties 合并出 SPRING_APPLICATION_JSON。
+if ! command -v python3 >/dev/null 2>&1; then
+  echo "需要 python3（deploy/merge-redis-json.sh）。请安装 python3。" >&2
+  exit 1
+fi
+MERGE="$(cd "$(dirname "$0")" && pwd)/../merge-redis-json.sh"
+if [[ ! -x "$MERGE" ]]; then
+  chmod +x "$MERGE" 2>/dev/null || true
+fi
+export SPRING_APPLICATION_JSON="$("$MERGE" "$PWD/redis-override.properties")"
+# shellcheck disable=SC2086
+exec "$JAVA" "${OPEN_FLAGS[@]}" ${ELEVATOR_JAVA_OPTS:-} -jar "$JAR" \
+  --spring.config.location=file:./application.properties,file:./redis-override.properties