feat:CISD初始化
This commit is contained in:
waner
@@ -5,3 +5,5 @@ target/
|
|||||||
.m2repo/
|
.m2repo/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
logs/
|
logs/
|
||||||
|
run/
|
||||||
|
config/application.yml
|
||||||
|
|||||||
@@ -15,6 +15,41 @@ cd tms-framework
|
|||||||
mvn spring-boot:run
|
mvn spring-boot:run
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Jar Deployment (External Config)
|
||||||
|
|
||||||
|
1. Build jar:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd tms-framework
|
||||||
|
mvn -q -DskipTests package
|
||||||
|
cp target/tms-framework-*.jar /home/tms/tms-framework.jar
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Prepare deployment directory on CentOS:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo mkdir -p /home/tms/{config,scripts,logs,run}
|
||||||
|
sudo chown -R "$(whoami)":"$(whoami)" /home/tms
|
||||||
|
cp scripts/tms.sh /home/tms/scripts/tms.sh
|
||||||
|
cp config/application.yml.example /home/tms/config/application.yml
|
||||||
|
chmod +x /home/tms/scripts/tms.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Start/Stop/Status:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
/home/tms/scripts/tms.sh start
|
||||||
|
/home/tms/scripts/tms.sh status
|
||||||
|
/home/tms/scripts/tms.sh stop
|
||||||
|
```
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- Script default `APP_HOME=/home/tms`, and loads external config from `/home/tms/config/` via `--spring.config.additional-location=optional:file:<app_home>/config/`.
|
||||||
|
- `/home/tms/config/application.yml` is required by default.
|
||||||
|
- Default profile is `prod`; override with `SPRING_PROFILES_ACTIVE=dev /home/tms/scripts/tms.sh start`.
|
||||||
|
- Override jar path with `JAR_PATH=/home/tms/tms-framework.jar`.
|
||||||
|
- If deployment path is not `/home/tms`, use `APP_HOME=/your/path /your/path/scripts/tms.sh start`.
|
||||||
|
|
||||||
Runtime recommendation:
|
Runtime recommendation:
|
||||||
- Use JDK 17 for local build/test to match project and CI runtime.
|
- Use JDK 17 for local build/test to match project and CI runtime.
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
spring:
|
||||||
|
application:
|
||||||
|
name: tms-framework
|
||||||
|
|
||||||
|
server:
|
||||||
|
port: 8080
|
||||||
|
|
||||||
|
tms:
|
||||||
|
security:
|
||||||
|
internal-token: change-me-internal-token
|
||||||
|
openapi:
|
||||||
|
timestamp-skew-seconds: 300
|
||||||
|
clients:
|
||||||
|
demo-app: change-me-openapi-secret
|
||||||
|
cisd:
|
||||||
|
preset:
|
||||||
|
product-type: ENTERPRISE
|
||||||
|
version: V1.3.2
|
||||||
|
source: CONFIG
|
||||||
|
init:
|
||||||
|
executor:
|
||||||
|
mode: LOCAL
|
||||||
|
timeout-sec: 600
|
||||||
|
log-dir: /tmp/tms-init-logs
|
||||||
|
standard-home-dir: /home/cemp4i
|
||||||
|
standard-cpconfig-path: /home/cemp4i/cpconfig.cfg
|
||||||
|
upload-base-dir: /home/tms/uploads
|
||||||
|
staging-root-dir: /tmp/tms-init-staging
|
||||||
|
standard-receiver-license-target-path: /home/cemp4i/cmep/license/cmep.license
|
||||||
|
direct-receiver-license-target-path: /home/cmep4d/cmep/license/cmep.license
|
||||||
|
standard-tlq-license-target-path: /home/tlq/tlqconf.zip
|
||||||
|
direct-tlq-license-target-path: /home/tlq/TLQ8/license.dat
|
||||||
|
direct-db-script-dir: /opt/CAE_Install_Base_Resource/DB
|
||||||
|
direct-tlq-init-cfg-dir: /opt/CAE_Install_App_Resource/CAE
|
||||||
|
rabbit-admin-username: admin
|
||||||
|
rabbit-admin-password: admin
|
||||||
|
standard-rabbit-setup-script-path: /home/cemp4i/cpackage/rabq/setuprabq.sh
|
||||||
|
standard-rabbit-queue-script-path: /home/cemp4i/cpackage/rabq/addrabq_R_01.sh
|
||||||
|
standard-rabbit-queue-script-path-02: /home/cemp4i/cpackage/rabq/addrabq_R_02.sh
|
||||||
|
rabbit-vhost: /RQ
|
||||||
|
standard-rabbit-credential-encrypt-enabled: true
|
||||||
|
standard-rabbit-credential-secret-key: ABCDEFGHIJKLMN1234567890
|
||||||
@@ -0,0 +1,907 @@
|
|||||||
|
{
|
||||||
|
"openapi": "3.0.3",
|
||||||
|
"info": {
|
||||||
|
"title": "TMS CISD Init Internal API",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "CISD 一体机初始化相关内部接口（含设备状态接口）。\n返回体统一为 ApiResponse 包装结构。\n"
|
||||||
|
},
|
||||||
|
"servers": [
|
||||||
|
{
|
||||||
|
"url": "http://127.0.0.1:8080",
|
||||||
|
"description": "Local"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
{
|
||||||
|
"name": "Device",
|
||||||
|
"description": "设备信息与状态"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Init",
|
||||||
|
"description": "CISD 初始化任务"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"security": [
|
||||||
|
{
|
||||||
|
"InternalTokenAuth": [
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"paths": {
|
||||||
|
"/api/v1/device/info": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Device"
|
||||||
|
],
|
||||||
|
"summary": "获取设备信息",
|
||||||
|
"operationId": "getDeviceInfo",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseDeviceInfoResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/device/status": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Device"
|
||||||
|
],
|
||||||
|
"summary": "获取设备状态（含预制版本信息）",
|
||||||
|
"operationId": "getDeviceStatus",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseDeviceInfoResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/device/restart": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"Device"
|
||||||
|
],
|
||||||
|
"summary": "重启设备",
|
||||||
|
"operationId": "restartDevice",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "X-User",
|
||||||
|
"in": "header",
|
||||||
|
"required": false,
|
||||||
|
"schema": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"description": "操作人"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseDeviceActionResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/init/template": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Init"
|
||||||
|
],
|
||||||
|
"summary": "获取初始化模板元信息",
|
||||||
|
"operationId": "getInitTemplate",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "version",
|
||||||
|
"in": "query",
|
||||||
|
"required": false,
|
||||||
|
"schema": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"description": "兼容参数，后端按预置版本返回"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseInitPlanTemplateResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/init/preview": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"Init"
|
||||||
|
],
|
||||||
|
"summary": "初始化预检（不落库）",
|
||||||
|
"operationId": "previewInitPlan",
|
||||||
|
"requestBody": {
|
||||||
|
"required": true,
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/InitPreviewRequest"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseInitPreviewResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/init/tasks": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"Init"
|
||||||
|
],
|
||||||
|
"summary": "创建初始化任务",
|
||||||
|
"operationId": "createInitTask",
|
||||||
|
"requestBody": {
|
||||||
|
"required": true,
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/InitPreviewRequest"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseInitCreateTaskResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/init/tasks/{taskId}": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Init"
|
||||||
|
],
|
||||||
|
"summary": "查询任务详情",
|
||||||
|
"operationId": "getInitTaskDetail",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "taskId",
|
||||||
|
"in": "path",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseInitTaskDetailResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/init/tasks/{taskId}/steps": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Init"
|
||||||
|
],
|
||||||
|
"summary": "查询任务步骤",
|
||||||
|
"operationId": "getInitTaskSteps",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "taskId",
|
||||||
|
"in": "path",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseInitTaskStepResponseList"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/init/tasks/{taskId}/steps/{stepNo}/log": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Init"
|
||||||
|
],
|
||||||
|
"summary": "查询步骤日志",
|
||||||
|
"operationId": "getInitTaskStepLog",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "taskId",
|
||||||
|
"in": "path",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "stepNo",
|
||||||
|
"in": "path",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseInitTaskStepLogResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/api/v1/init/tasks/{taskId}/execute": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"Init"
|
||||||
|
],
|
||||||
|
"summary": "执行初始化任务",
|
||||||
|
"operationId": "executeInitTask",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "taskId",
|
||||||
|
"in": "path",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ApiResponseInitTaskExecuteResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"components": {
|
||||||
|
"securitySchemes": {
|
||||||
|
"InternalTokenAuth": {
|
||||||
|
"type": "apiKey",
|
||||||
|
"in": "header",
|
||||||
|
"name": "X-Internal-Token"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"schemas": {
|
||||||
|
"ApiResponseBase": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"success": {
|
||||||
|
"type": "boolean",
|
||||||
|
"example": true
|
||||||
|
},
|
||||||
|
"code": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32",
|
||||||
|
"example": 200
|
||||||
|
},
|
||||||
|
"msg": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "success"
|
||||||
|
},
|
||||||
|
"timestamp": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int64",
|
||||||
|
"example": 1740902400000
|
||||||
|
},
|
||||||
|
"traceId": {
|
||||||
|
"type": "string",
|
||||||
|
"nullable": true
|
||||||
|
},
|
||||||
|
"path": {
|
||||||
|
"type": "string",
|
||||||
|
"nullable": true
|
||||||
|
},
|
||||||
|
"details": {
|
||||||
|
"type": "object",
|
||||||
|
"additionalProperties": true,
|
||||||
|
"nullable": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ApiResponseDeviceInfoResponse": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/components/schemas/DeviceInfoResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"ApiResponseDeviceActionResponse": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/components/schemas/DeviceActionResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"ApiResponseInitPlanTemplateResponse": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/components/schemas/InitPlanTemplateResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"ApiResponseInitPreviewResponse": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/components/schemas/InitPreviewResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"ApiResponseInitCreateTaskResponse": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/components/schemas/InitCreateTaskResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"ApiResponseInitTaskDetailResponse": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/components/schemas/InitTaskDetailResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"ApiResponseInitTaskStepResponseList": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"$ref": "#/components/schemas/InitTaskStepResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"ApiResponseInitTaskStepLogResponse": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/components/schemas/InitTaskStepLogResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"ApiResponseInitTaskExecuteResponse": {
|
||||||
|
"allOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/ApiResponseBase"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/components/schemas/InitTaskExecuteResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"DeviceInfoResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"deviceId": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"version": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"presetProductType": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"ENTERPRISE",
|
||||||
|
"INDIRECT",
|
||||||
|
"DIRECT"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"presetVersion": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"presetSource": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"DeviceActionResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"action": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"accepted": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"operator": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"acceptedAt": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitPlanTemplateResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"presetProductType": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"ENTERPRISE",
|
||||||
|
"INDIRECT",
|
||||||
|
"DIRECT"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"presetVersion": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"supportedVersions": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"templatePath": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitPreviewRequest": {
|
||||||
|
"type": "object",
|
||||||
|
"required": [
|
||||||
|
"orgCodeType",
|
||||||
|
"orgCode",
|
||||||
|
"orgNameCn",
|
||||||
|
"deployMode",
|
||||||
|
"nodes",
|
||||||
|
"mq",
|
||||||
|
"licenses"
|
||||||
|
],
|
||||||
|
"properties": {
|
||||||
|
"orgCodeType": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"BIC",
|
||||||
|
"CIPSID",
|
||||||
|
"LEI"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"orgCode": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 32
|
||||||
|
},
|
||||||
|
"orgNameCn": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
},
|
||||||
|
"orgNameEn": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 256
|
||||||
|
},
|
||||||
|
"deployMode": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"SINGLE",
|
||||||
|
"DUAL",
|
||||||
|
"QUAD"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"nodes": {
|
||||||
|
"$ref": "#/components/schemas/InitPreviewRequestNodes"
|
||||||
|
},
|
||||||
|
"mq": {
|
||||||
|
"$ref": "#/components/schemas/InitPreviewRequestMq"
|
||||||
|
},
|
||||||
|
"licenses": {
|
||||||
|
"$ref": "#/components/schemas/InitPreviewRequestLicenses"
|
||||||
|
},
|
||||||
|
"signServer": {
|
||||||
|
"$ref": "#/components/schemas/InitPreviewRequestSignServer"
|
||||||
|
},
|
||||||
|
"directTlq": {
|
||||||
|
"$ref": "#/components/schemas/InitPreviewRequestDirectTlqConfig"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"description": "初始化请求体。部分字段为条件必填：\n- DIRECT + RABBITMQ_TLQ 需提供 directTlq\n- DIRECT 需提供 signServer 与 licenses.cfgZipFileId\n- TLQ 模式需提供 mq.tlqLicenseFileId\n- RABBITMQ_CFMQ 需提供 mq.cfmqConfigFileId\n"
|
||||||
|
},
|
||||||
|
"InitPreviewRequestNodes": {
|
||||||
|
"type": "object",
|
||||||
|
"required": [
|
||||||
|
"node01Ip"
|
||||||
|
],
|
||||||
|
"properties": {
|
||||||
|
"node01Ip": {
|
||||||
|
"type": "string",
|
||||||
|
"pattern": "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$"
|
||||||
|
},
|
||||||
|
"node02Ip": {
|
||||||
|
"type": "string",
|
||||||
|
"pattern": "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$"
|
||||||
|
},
|
||||||
|
"node03Ip": {
|
||||||
|
"type": "string",
|
||||||
|
"pattern": "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$"
|
||||||
|
},
|
||||||
|
"node04Ip": {
|
||||||
|
"type": "string",
|
||||||
|
"pattern": "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitPreviewRequestMq": {
|
||||||
|
"type": "object",
|
||||||
|
"required": [
|
||||||
|
"mqType",
|
||||||
|
"channelUsername",
|
||||||
|
"channelPassword"
|
||||||
|
],
|
||||||
|
"properties": {
|
||||||
|
"mqType": {
|
||||||
|
"type": "string",
|
||||||
|
"description": "ENTERPRISE/INDIRECT: RABBITMQ|TLQ; DIRECT: RABBITMQ_TLQ|RABBITMQ_CFMQ"
|
||||||
|
},
|
||||||
|
"channelUsername": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 32
|
||||||
|
},
|
||||||
|
"channelPassword": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
},
|
||||||
|
"tlqLicenseFileId": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
},
|
||||||
|
"cfmqConfigFileId": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitPreviewRequestLicenses": {
|
||||||
|
"type": "object",
|
||||||
|
"required": [
|
||||||
|
"receiverLicenseFileId"
|
||||||
|
],
|
||||||
|
"properties": {
|
||||||
|
"receiverLicenseFileId": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
},
|
||||||
|
"cfgZipFileId": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitPreviewRequestSignServer": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"signHost": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 64
|
||||||
|
},
|
||||||
|
"signPort": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32",
|
||||||
|
"minimum": 1,
|
||||||
|
"maximum": 65535
|
||||||
|
},
|
||||||
|
"signType": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"Infosec",
|
||||||
|
"CFCA"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"signCertDn": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 512
|
||||||
|
},
|
||||||
|
"signCertSn": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
},
|
||||||
|
"signPassword": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 128
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitPreviewRequestDirectTlqConfig": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"localNodeSeq": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"A",
|
||||||
|
"B"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"upstreamInstitutions": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 256,
|
||||||
|
"description": "上级机构编码，支持分号分隔"
|
||||||
|
},
|
||||||
|
"upstreamCocCount": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32",
|
||||||
|
"minimum": 1,
|
||||||
|
"maximum": 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitPreviewResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"resolvedProductType": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"presetVersion": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"stepCount": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32"
|
||||||
|
},
|
||||||
|
"summary": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitCreateTaskResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"taskId": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"resolvedProductType": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"presetVersion": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitTaskDetailResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"taskId": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"resolvedProductType": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"presetVersion": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"orgCode": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"mqType": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"deployMode": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"initPlanJson": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitTaskStepResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"stepNo": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32"
|
||||||
|
},
|
||||||
|
"stepCode": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"message": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"commandLine": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"logPath": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"exitCode": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32",
|
||||||
|
"nullable": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitTaskStepLogResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"taskId": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"stepNo": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32"
|
||||||
|
},
|
||||||
|
"stepCode": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"logPath": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"content": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"InitTaskExecuteResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"taskId": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"totalSteps": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32"
|
||||||
|
},
|
||||||
|
"successSteps": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,581 @@
|
|||||||
|
openapi: 3.0.3
|
||||||
|
info:
|
||||||
|
title: TMS CISD Init Internal API
|
||||||
|
version: "1.0.0"
|
||||||
|
description: |
|
||||||
|
CISD 一体机初始化相关内部接口（含设备状态接口）。
|
||||||
|
返回体统一为 ApiResponse 包装结构。
|
||||||
|
servers:
|
||||||
|
- url: http://127.0.0.1:8080
|
||||||
|
description: Local
|
||||||
|
tags:
|
||||||
|
- name: Device
|
||||||
|
description: 设备信息与状态
|
||||||
|
- name: Init
|
||||||
|
description: CISD 初始化任务
|
||||||
|
security:
|
||||||
|
- InternalTokenAuth: []
|
||||||
|
paths:
|
||||||
|
/api/v1/device/info:
|
||||||
|
get:
|
||||||
|
tags: [Device]
|
||||||
|
summary: 获取设备信息
|
||||||
|
operationId: getDeviceInfo
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseDeviceInfoResponse"
|
||||||
|
/api/v1/device/status:
|
||||||
|
get:
|
||||||
|
tags: [Device]
|
||||||
|
summary: 获取设备状态（含预制版本信息）
|
||||||
|
operationId: getDeviceStatus
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseDeviceInfoResponse"
|
||||||
|
/api/v1/device/restart:
|
||||||
|
post:
|
||||||
|
tags: [Device]
|
||||||
|
summary: 重启设备
|
||||||
|
operationId: restartDevice
|
||||||
|
parameters:
|
||||||
|
- name: X-User
|
||||||
|
in: header
|
||||||
|
required: false
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
description: 操作人
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseDeviceActionResponse"
|
||||||
|
|
||||||
|
/api/v1/init/template:
|
||||||
|
get:
|
||||||
|
tags: [Init]
|
||||||
|
summary: 获取初始化模板元信息
|
||||||
|
operationId: getInitTemplate
|
||||||
|
parameters:
|
||||||
|
- name: version
|
||||||
|
in: query
|
||||||
|
required: false
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
description: 兼容参数，后端按预置版本返回
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseInitPlanTemplateResponse"
|
||||||
|
|
||||||
|
/api/v1/init/preview:
|
||||||
|
post:
|
||||||
|
tags: [Init]
|
||||||
|
summary: 初始化预检（不落库）
|
||||||
|
operationId: previewInitPlan
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/InitPreviewRequest"
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseInitPreviewResponse"
|
||||||
|
|
||||||
|
/api/v1/init/tasks:
|
||||||
|
post:
|
||||||
|
tags: [Init]
|
||||||
|
summary: 创建初始化任务
|
||||||
|
operationId: createInitTask
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/InitPreviewRequest"
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseInitCreateTaskResponse"
|
||||||
|
|
||||||
|
/api/v1/init/tasks/{taskId}:
|
||||||
|
get:
|
||||||
|
tags: [Init]
|
||||||
|
summary: 查询任务详情
|
||||||
|
operationId: getInitTaskDetail
|
||||||
|
parameters:
|
||||||
|
- name: taskId
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseInitTaskDetailResponse"
|
||||||
|
|
||||||
|
/api/v1/init/tasks/{taskId}/steps:
|
||||||
|
get:
|
||||||
|
tags: [Init]
|
||||||
|
summary: 查询任务步骤
|
||||||
|
operationId: getInitTaskSteps
|
||||||
|
parameters:
|
||||||
|
- name: taskId
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseInitTaskStepResponseList"
|
||||||
|
|
||||||
|
/api/v1/init/tasks/{taskId}/steps/{stepNo}/log:
|
||||||
|
get:
|
||||||
|
tags: [Init]
|
||||||
|
summary: 查询步骤日志
|
||||||
|
operationId: getInitTaskStepLog
|
||||||
|
parameters:
|
||||||
|
- name: taskId
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
- name: stepNo
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseInitTaskStepLogResponse"
|
||||||
|
|
||||||
|
/api/v1/init/tasks/{taskId}/execute:
|
||||||
|
post:
|
||||||
|
tags: [Init]
|
||||||
|
summary: 执行初始化任务
|
||||||
|
operationId: executeInitTask
|
||||||
|
parameters:
|
||||||
|
- name: taskId
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApiResponseInitTaskExecuteResponse"
|
||||||
|
|
||||||
|
components:
|
||||||
|
securitySchemes:
|
||||||
|
InternalTokenAuth:
|
||||||
|
type: apiKey
|
||||||
|
in: header
|
||||||
|
name: X-Internal-Token
|
||||||
|
|
||||||
|
schemas:
|
||||||
|
ApiResponseBase:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
success:
|
||||||
|
type: boolean
|
||||||
|
example: true
|
||||||
|
code:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
example: 200
|
||||||
|
msg:
|
||||||
|
type: string
|
||||||
|
example: success
|
||||||
|
timestamp:
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
example: 1740902400000
|
||||||
|
traceId:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
path:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
details:
|
||||||
|
type: object
|
||||||
|
additionalProperties: true
|
||||||
|
nullable: true
|
||||||
|
|
||||||
|
ApiResponseDeviceInfoResponse:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
$ref: "#/components/schemas/DeviceInfoResponse"
|
||||||
|
|
||||||
|
ApiResponseDeviceActionResponse:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
$ref: "#/components/schemas/DeviceActionResponse"
|
||||||
|
|
||||||
|
ApiResponseInitPlanTemplateResponse:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
$ref: "#/components/schemas/InitPlanTemplateResponse"
|
||||||
|
|
||||||
|
ApiResponseInitPreviewResponse:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
$ref: "#/components/schemas/InitPreviewResponse"
|
||||||
|
|
||||||
|
ApiResponseInitCreateTaskResponse:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
$ref: "#/components/schemas/InitCreateTaskResponse"
|
||||||
|
|
||||||
|
ApiResponseInitTaskDetailResponse:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
$ref: "#/components/schemas/InitTaskDetailResponse"
|
||||||
|
|
||||||
|
ApiResponseInitTaskStepResponseList:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/InitTaskStepResponse"
|
||||||
|
|
||||||
|
ApiResponseInitTaskStepLogResponse:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
$ref: "#/components/schemas/InitTaskStepLogResponse"
|
||||||
|
|
||||||
|
ApiResponseInitTaskExecuteResponse:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/components/schemas/ApiResponseBase"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
data:
|
||||||
|
$ref: "#/components/schemas/InitTaskExecuteResponse"
|
||||||
|
|
||||||
|
DeviceInfoResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
deviceId:
|
||||||
|
type: string
|
||||||
|
status:
|
||||||
|
type: string
|
||||||
|
version:
|
||||||
|
type: string
|
||||||
|
presetProductType:
|
||||||
|
type: string
|
||||||
|
enum: [ENTERPRISE, INDIRECT, DIRECT]
|
||||||
|
presetVersion:
|
||||||
|
type: string
|
||||||
|
presetSource:
|
||||||
|
type: string
|
||||||
|
|
||||||
|
DeviceActionResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
action:
|
||||||
|
type: string
|
||||||
|
accepted:
|
||||||
|
type: boolean
|
||||||
|
operator:
|
||||||
|
type: string
|
||||||
|
acceptedAt:
|
||||||
|
type: string
|
||||||
|
|
||||||
|
InitPlanTemplateResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
presetProductType:
|
||||||
|
type: string
|
||||||
|
enum: [ENTERPRISE, INDIRECT, DIRECT]
|
||||||
|
presetVersion:
|
||||||
|
type: string
|
||||||
|
supportedVersions:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
templatePath:
|
||||||
|
type: string
|
||||||
|
|
||||||
|
InitPreviewRequest:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- orgCodeType
|
||||||
|
- orgCode
|
||||||
|
- orgNameCn
|
||||||
|
- deployMode
|
||||||
|
- nodes
|
||||||
|
- mq
|
||||||
|
- licenses
|
||||||
|
properties:
|
||||||
|
orgCodeType:
|
||||||
|
type: string
|
||||||
|
enum: [BIC, CIPSID, LEI]
|
||||||
|
orgCode:
|
||||||
|
type: string
|
||||||
|
maxLength: 32
|
||||||
|
orgNameCn:
|
||||||
|
type: string
|
||||||
|
maxLength: 128
|
||||||
|
orgNameEn:
|
||||||
|
type: string
|
||||||
|
maxLength: 256
|
||||||
|
deployMode:
|
||||||
|
type: string
|
||||||
|
enum: [SINGLE, DUAL, QUAD]
|
||||||
|
nodes:
|
||||||
|
$ref: "#/components/schemas/InitPreviewRequestNodes"
|
||||||
|
mq:
|
||||||
|
$ref: "#/components/schemas/InitPreviewRequestMq"
|
||||||
|
licenses:
|
||||||
|
$ref: "#/components/schemas/InitPreviewRequestLicenses"
|
||||||
|
signServer:
|
||||||
|
$ref: "#/components/schemas/InitPreviewRequestSignServer"
|
||||||
|
directTlq:
|
||||||
|
$ref: "#/components/schemas/InitPreviewRequestDirectTlqConfig"
|
||||||
|
description: |
|
||||||
|
初始化请求体。部分字段为条件必填：
|
||||||
|
- DIRECT + RABBITMQ_TLQ 需提供 directTlq
|
||||||
|
- DIRECT 需提供 signServer 与 licenses.cfgZipFileId
|
||||||
|
- TLQ 模式需提供 mq.tlqLicenseFileId
|
||||||
|
- RABBITMQ_CFMQ 需提供 mq.cfmqConfigFileId
|
||||||
|
|
||||||
|
InitPreviewRequestNodes:
|
||||||
|
type: object
|
||||||
|
required: [node01Ip]
|
||||||
|
properties:
|
||||||
|
node01Ip:
|
||||||
|
type: string
|
||||||
|
pattern: "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$"
|
||||||
|
node02Ip:
|
||||||
|
type: string
|
||||||
|
pattern: "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$"
|
||||||
|
node03Ip:
|
||||||
|
type: string
|
||||||
|
pattern: "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$"
|
||||||
|
node04Ip:
|
||||||
|
type: string
|
||||||
|
pattern: "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$"
|
||||||
|
|
||||||
|
InitPreviewRequestMq:
|
||||||
|
type: object
|
||||||
|
required: [mqType, channelUsername, channelPassword]
|
||||||
|
properties:
|
||||||
|
mqType:
|
||||||
|
type: string
|
||||||
|
description: "ENTERPRISE/INDIRECT: RABBITMQ|TLQ; DIRECT: RABBITMQ_TLQ|RABBITMQ_CFMQ"
|
||||||
|
channelUsername:
|
||||||
|
type: string
|
||||||
|
maxLength: 32
|
||||||
|
channelPassword:
|
||||||
|
type: string
|
||||||
|
maxLength: 128
|
||||||
|
tlqLicenseFileId:
|
||||||
|
type: string
|
||||||
|
maxLength: 128
|
||||||
|
cfmqConfigFileId:
|
||||||
|
type: string
|
||||||
|
maxLength: 128
|
||||||
|
|
||||||
|
InitPreviewRequestLicenses:
|
||||||
|
type: object
|
||||||
|
required: [receiverLicenseFileId]
|
||||||
|
properties:
|
||||||
|
receiverLicenseFileId:
|
||||||
|
type: string
|
||||||
|
maxLength: 128
|
||||||
|
cfgZipFileId:
|
||||||
|
type: string
|
||||||
|
maxLength: 128
|
||||||
|
|
||||||
|
InitPreviewRequestSignServer:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
signHost:
|
||||||
|
type: string
|
||||||
|
maxLength: 64
|
||||||
|
signPort:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
minimum: 1
|
||||||
|
maximum: 65535
|
||||||
|
signType:
|
||||||
|
type: string
|
||||||
|
enum: [Infosec, CFCA]
|
||||||
|
signCertDn:
|
||||||
|
type: string
|
||||||
|
maxLength: 512
|
||||||
|
signCertSn:
|
||||||
|
type: string
|
||||||
|
maxLength: 128
|
||||||
|
signPassword:
|
||||||
|
type: string
|
||||||
|
maxLength: 128
|
||||||
|
|
||||||
|
InitPreviewRequestDirectTlqConfig:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
localNodeSeq:
|
||||||
|
type: string
|
||||||
|
enum: [A, B]
|
||||||
|
upstreamInstitutions:
|
||||||
|
type: string
|
||||||
|
maxLength: 256
|
||||||
|
description: 上级机构编码，支持分号分隔
|
||||||
|
upstreamCocCount:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
minimum: 1
|
||||||
|
maximum: 2
|
||||||
|
|
||||||
|
InitPreviewResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
resolvedProductType:
|
||||||
|
type: string
|
||||||
|
presetVersion:
|
||||||
|
type: string
|
||||||
|
stepCount:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
summary:
|
||||||
|
type: string
|
||||||
|
|
||||||
|
InitCreateTaskResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
taskId:
|
||||||
|
type: string
|
||||||
|
status:
|
||||||
|
type: string
|
||||||
|
resolvedProductType:
|
||||||
|
type: string
|
||||||
|
presetVersion:
|
||||||
|
type: string
|
||||||
|
|
||||||
|
InitTaskDetailResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
taskId:
|
||||||
|
type: string
|
||||||
|
status:
|
||||||
|
type: string
|
||||||
|
resolvedProductType:
|
||||||
|
type: string
|
||||||
|
presetVersion:
|
||||||
|
type: string
|
||||||
|
orgCode:
|
||||||
|
type: string
|
||||||
|
mqType:
|
||||||
|
type: string
|
||||||
|
deployMode:
|
||||||
|
type: string
|
||||||
|
initPlanJson:
|
||||||
|
type: string
|
||||||
|
|
||||||
|
InitTaskStepResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
stepNo:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
stepCode:
|
||||||
|
type: string
|
||||||
|
status:
|
||||||
|
type: string
|
||||||
|
message:
|
||||||
|
type: string
|
||||||
|
commandLine:
|
||||||
|
type: string
|
||||||
|
logPath:
|
||||||
|
type: string
|
||||||
|
exitCode:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
nullable: true
|
||||||
|
|
||||||
|
InitTaskStepLogResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
taskId:
|
||||||
|
type: string
|
||||||
|
stepNo:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
stepCode:
|
||||||
|
type: string
|
||||||
|
logPath:
|
||||||
|
type: string
|
||||||
|
content:
|
||||||
|
type: string
|
||||||
|
|
||||||
|
InitTaskExecuteResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
taskId:
|
||||||
|
type: string
|
||||||
|
status:
|
||||||
|
type: string
|
||||||
|
totalSteps:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
|
successSteps:
|
||||||
|
type: integer
|
||||||
|
format: int32
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,75 @@
|
|||||||
|
# PCIe 真卡联调与冒烟检查清单
|
||||||
|
|
||||||
|
## 1. 前置条件
|
||||||
|
|
||||||
|
- 部署环境为目标架构（与生产一致的 CPU/OS/libc）。
|
||||||
|
- 已安装厂商 `.so`，并可被进程访问。
|
||||||
|
- 服务配置为 JNA 真卡模式：
|
||||||
|
- `tms.crypto-card.enabled=true`
|
||||||
|
- `tms.crypto-card.mode=JNA`
|
||||||
|
- `tms.crypto-card.vendor-lib-path` 或 `tms.crypto-card.vendor-lib-name` 正确
|
||||||
|
- `tms.crypto-card.strict-alg-id-validation=true`（若厂商扩展算法可临时关闭）
|
||||||
|
- 已知内部接口鉴权令牌 `X-Internal-Token`。
|
||||||
|
|
||||||
|
## 2. 核心检查项（必须通过）
|
||||||
|
|
||||||
|
1. 设备与会话
|
||||||
|
- `GET /api/v1/device/crypto/device-count`
|
||||||
|
- `GET /api/v1/device/crypto/device-info`
|
||||||
|
- `POST /api/v1/device/crypto/self-test`
|
||||||
|
2. 基础密码能力
|
||||||
|
- 随机数：`GET /api/v1/device/crypto/random?length=16`
|
||||||
|
- 摘要：`POST /api/v1/device/crypto/digest`
|
||||||
|
- HMAC：`POST /api/v1/device/crypto/hmac`
|
||||||
|
3. 对称能力
|
||||||
|
- 明文密钥加解密：`/encrypt/plain` + `/decrypt/plain`
|
||||||
|
- KEK 生成与状态：`/kek/generate` + `/kek/status`
|
||||||
|
4. 主密钥状态
|
||||||
|
- `GET /api/v1/device/crypto/lmk/seed-mac`
|
||||||
|
|
||||||
|
验收标准：
|
||||||
|
|
||||||
|
- `ApiResponse.success == true`
|
||||||
|
- `ApiResponse.code == 200`
|
||||||
|
- 返回长度字段与 Base64 解码长度一致
|
||||||
|
- 错误日志中无 native 崩溃/段错误
|
||||||
|
|
||||||
|
## 3. 高风险专项
|
||||||
|
|
||||||
|
### 3.1 `SDFE_ImportEncKeyPair_ECC`（结构体直传）
|
||||||
|
|
||||||
|
- 用最小可用样本执行导入流程。
|
||||||
|
- 成功后立即查询相关密钥状态接口验证导入结果。
|
||||||
|
- 若出现参数错误，优先检查结构体字段对齐与 `unsigned long` 位宽。
|
||||||
|
|
||||||
|
### 3.2 `ECCCipher` 变长字段边界
|
||||||
|
|
||||||
|
- 对不同明文长度执行 ECC 加密路径。
|
||||||
|
- 记录返回 `ECCCipher.l` 的最大值。
|
||||||
|
- 若接近当前上限（`C_MAX_LEN`），必须提升上限并复测。
|
||||||
|
|
||||||
|
### 3.3 算法标识白名单
|
||||||
|
|
||||||
|
- 对业务实际用到的所有 `algId` 跑一遍。
|
||||||
|
- 若被严格校验拦截，补充到 `Gm0018AlgorithmIds` 后再回归。
|
||||||
|
|
||||||
|
## 4. 失败排查顺序
|
||||||
|
|
||||||
|
1. 配置错误：库路径、库名、鉴权 token。
|
||||||
|
2. 运行时依赖：`ldd`/动态库缺失。
|
||||||
|
3. 参数编码：Base64 入参、长度字段、结构体大小。
|
||||||
|
4. 算法标识：`algId` 是否在白名单。
|
||||||
|
5. 厂商错误码：结合 `PcieErrorMapper` 与厂商文档定位。
|
||||||
|
|
||||||
|
## 5. 回归策略
|
||||||
|
|
||||||
|
- 每次升级以下任一项，都执行本清单：
|
||||||
|
- JDK 版本
|
||||||
|
- 厂商 `.so` 版本
|
||||||
|
- JNA 结构体定义
|
||||||
|
- `JnaPcieCryptoService` 参数转换逻辑
|
||||||
|
|
||||||
|
## 6. 自动化模板
|
||||||
|
|
||||||
|
- 使用脚本：`scripts/pcie_realcard_smoke.sh`
|
||||||
|
- 建议在联调机和预生产各执行一次，并保留日志归档。
|
||||||
@@ -0,0 +1,214 @@
|
|||||||
|
# CISD 初始化 API Curl 样例集
|
||||||
|
|
||||||
|
- 日期：2026-03-02
|
||||||
|
- 适用接口前缀：`/api/v1/device`、`/api/v1/init`
|
||||||
|
- 说明：以下样例用于联调，不包含生产鉴权与审计策略
|
||||||
|
|
||||||
|
## 1. 公共变量
|
||||||
|
|
||||||
|
```bash
|
||||||
|
BASE_URL="${BASE_URL:-http://127.0.0.1:8080}"
|
||||||
|
INTERNAL_TOKEN="${INTERNAL_TOKEN:-change-me-internal-token}"
|
||||||
|
```
|
||||||
|
|
||||||
|
## 2. 查询设备预置版本信息
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl -sS \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
"${BASE_URL}/api/v1/device/status" | jq
|
||||||
|
```
|
||||||
|
|
||||||
|
预期关键字段：
|
||||||
|
|
||||||
|
1. `data.presetProductType`：`ENTERPRISE|INDIRECT|DIRECT`
|
||||||
|
2. `data.presetVersion`
|
||||||
|
|
||||||
|
## 3. 企业/间参请求体（RabbitMQ）
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cat > /tmp/cisd-init-standard-rabbit.json <<'JSON'
|
||||||
|
{
|
||||||
|
"orgCodeType": "BIC",
|
||||||
|
"orgCode": "AAAABBBBXXX",
|
||||||
|
"orgNameCn": "测试机构",
|
||||||
|
"orgNameEn": "TEST BANK",
|
||||||
|
"deployMode": "SINGLE",
|
||||||
|
"nodes": {
|
||||||
|
"node01Ip": "10.0.0.11"
|
||||||
|
},
|
||||||
|
"mq": {
|
||||||
|
"mqType": "RABBITMQ",
|
||||||
|
"channelUsername": "cisd_channel_user",
|
||||||
|
"channelPassword": "cisd_channel_pass"
|
||||||
|
},
|
||||||
|
"licenses": {
|
||||||
|
"receiverLicenseFileId": "file-receiver-001"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
JSON
|
||||||
|
```
|
||||||
|
|
||||||
|
## 4. 企业/间参请求体（TLQ）
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cat > /tmp/cisd-init-standard-tlq.json <<'JSON'
|
||||||
|
{
|
||||||
|
"orgCodeType": "BIC",
|
||||||
|
"orgCode": "AAAABBBBXXX",
|
||||||
|
"orgNameCn": "测试机构",
|
||||||
|
"orgNameEn": "TEST BANK",
|
||||||
|
"deployMode": "DUAL",
|
||||||
|
"nodes": {
|
||||||
|
"node01Ip": "10.0.0.11",
|
||||||
|
"node02Ip": "10.0.0.12"
|
||||||
|
},
|
||||||
|
"mq": {
|
||||||
|
"mqType": "TLQ",
|
||||||
|
"channelUsername": "cisd_channel_user",
|
||||||
|
"channelPassword": "cisd_channel_pass",
|
||||||
|
"tlqLicenseFileId": "file-tlq-license-001"
|
||||||
|
},
|
||||||
|
"licenses": {
|
||||||
|
"receiverLicenseFileId": "file-receiver-001"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
JSON
|
||||||
|
```
|
||||||
|
|
||||||
|
## 5. 轻量化直参请求体（RABBITMQ_TLQ）
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cat > /tmp/cisd-init-direct-tlq.json <<'JSON'
|
||||||
|
{
|
||||||
|
"orgCodeType": "BIC",
|
||||||
|
"orgCode": "AAAABBBBXXX",
|
||||||
|
"orgNameCn": "测试机构",
|
||||||
|
"orgNameEn": "TEST BANK",
|
||||||
|
"deployMode": "DUAL",
|
||||||
|
"nodes": {
|
||||||
|
"node01Ip": "10.0.1.11",
|
||||||
|
"node02Ip": "10.0.1.12"
|
||||||
|
},
|
||||||
|
"mq": {
|
||||||
|
"mqType": "RABBITMQ_TLQ",
|
||||||
|
"channelUsername": "cisd_channel_user",
|
||||||
|
"channelPassword": "cisd_channel_pass",
|
||||||
|
"tlqLicenseFileId": "file-tlq-license-001"
|
||||||
|
},
|
||||||
|
"licenses": {
|
||||||
|
"receiverLicenseFileId": "file-receiver-001",
|
||||||
|
"cfgZipFileId": "/opt/cpconfig.cfg"
|
||||||
|
},
|
||||||
|
"signServer": {
|
||||||
|
"signHost": "172.30.1.101",
|
||||||
|
"signPort": 50006,
|
||||||
|
"signType": "Infosec",
|
||||||
|
"signCertDn": "CN=051@AAAABBBBXXX@7321@1,OU=Org,OU=CIPS,O=CFCA OCA1,C=CN",
|
||||||
|
"signCertSn": "1154809590",
|
||||||
|
"signPassword": "secret"
|
||||||
|
},
|
||||||
|
"directTlq": {
|
||||||
|
"localNodeSeq": "A",
|
||||||
|
"upstreamInstitutions": "CIPSCNSHXXX;CIPSCNWXXXX",
|
||||||
|
"upstreamCocCount": 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
JSON
|
||||||
|
```
|
||||||
|
|
||||||
|
## 6. 轻量化直参请求体（RABBITMQ_CFMQ）
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cat > /tmp/cisd-init-direct-cfmq.json <<'JSON'
|
||||||
|
{
|
||||||
|
"orgCodeType": "BIC",
|
||||||
|
"orgCode": "AAAABBBBXXX",
|
||||||
|
"orgNameCn": "测试机构",
|
||||||
|
"orgNameEn": "TEST BANK",
|
||||||
|
"deployMode": "SINGLE",
|
||||||
|
"nodes": {
|
||||||
|
"node01Ip": "10.0.1.11"
|
||||||
|
},
|
||||||
|
"mq": {
|
||||||
|
"mqType": "RABBITMQ_CFMQ",
|
||||||
|
"channelUsername": "cisd_channel_user",
|
||||||
|
"channelPassword": "cisd_channel_pass",
|
||||||
|
"cfmqConfigFileId": "/pmts/cfg/cfmqapi_trans.properties"
|
||||||
|
},
|
||||||
|
"licenses": {
|
||||||
|
"receiverLicenseFileId": "file-receiver-001",
|
||||||
|
"cfgZipFileId": "/opt/cpconfig.cfg"
|
||||||
|
},
|
||||||
|
"signServer": {
|
||||||
|
"signHost": "172.30.1.101",
|
||||||
|
"signPort": 50006,
|
||||||
|
"signType": "Infosec",
|
||||||
|
"signCertDn": "CN=051@AAAABBBBXXX@7321@1,OU=Org,OU=CIPS,O=CFCA OCA1,C=CN",
|
||||||
|
"signCertSn": "1154809590",
|
||||||
|
"signPassword": "secret"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
JSON
|
||||||
|
```
|
||||||
|
|
||||||
|
## 7. 初始化任务执行链路（通用）
|
||||||
|
|
||||||
|
将 `<REQUEST_JSON>` 替换为上面任一 json 文件路径。
|
||||||
|
|
||||||
|
```bash
|
||||||
|
REQUEST_JSON="/tmp/cisd-init-standard-rabbit.json"
|
||||||
|
|
||||||
|
# 1) preview
|
||||||
|
curl -sS -X POST \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
"${BASE_URL}/api/v1/init/preview" \
|
||||||
|
-d @"${REQUEST_JSON}" | jq
|
||||||
|
|
||||||
|
# 2) create task
|
||||||
|
TASK_ID="$(curl -sS -X POST \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
"${BASE_URL}/api/v1/init/tasks" \
|
||||||
|
-d @"${REQUEST_JSON}" | jq -r '.data.taskId')"
|
||||||
|
|
||||||
|
echo "TASK_ID=${TASK_ID}"
|
||||||
|
|
||||||
|
# 3) execute task
|
||||||
|
curl -sS -X POST \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
"${BASE_URL}/api/v1/init/tasks/${TASK_ID}/execute" | jq
|
||||||
|
|
||||||
|
# 4) query steps
|
||||||
|
curl -sS \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
"${BASE_URL}/api/v1/init/tasks/${TASK_ID}/steps" | jq
|
||||||
|
```
|
||||||
|
|
||||||
|
## 8. 单步日志查询（失败定位）
|
||||||
|
|
||||||
|
```bash
|
||||||
|
STEP_NO=3
|
||||||
|
curl -sS \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
"${BASE_URL}/api/v1/init/tasks/${TASK_ID}/steps/${STEP_NO}/log" | jq -r '.data.content'
|
||||||
|
```
|
||||||
|
|
||||||
|
## 9. 常见问题
|
||||||
|
|
||||||
|
1. 直参 TLQ 报 `directTlq is required`：请求体缺 `directTlq` 三字段。
|
||||||
|
2. `APP_MQ_CREDENTIALS_APPLY` 失败：应用配置匹配路径无文件或无写权限。
|
||||||
|
3. MQ 连接失败：确认 `TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_SECRET_KEY` 与收发器解密密钥一致。
|
||||||
|
|
||||||
|
## 10. 一键执行脚本（推荐）
|
||||||
|
|
||||||
|
```bash
|
||||||
|
chmod +x scripts/cisd_init_flow.sh
|
||||||
|
REQUEST_JSON=/tmp/cisd-init-standard-rabbit.json \
|
||||||
|
BASE_URL=http://127.0.0.1:8080 \
|
||||||
|
INTERNAL_TOKEN=change-me-internal-token \
|
||||||
|
./scripts/cisd_init_flow.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
输出目录默认：`/tmp/cisd-init-run/run-<timestamp>`，包含每一步请求响应与失败日志抓取结果。
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
# CISD 初始化真机联调与回滚手册
|
||||||
|
|
||||||
|
- 日期：2026-03-02
|
||||||
|
- 适用版本：`ENTERPRISE` / `INDIRECT` / `DIRECT`
|
||||||
|
- 适用代码基线：已包含 `APP_MQ_CREDENTIALS_APPLY`、`direct_db_init`、`tlq_init_cfg`
|
||||||
|
|
||||||
|
## 1. 目的
|
||||||
|
|
||||||
|
1. 在目标设备上完成初始化关键路径联调。
|
||||||
|
2. 验证三类版本在“预部署完成后，仅做客户化初始化”的边界下可稳定运行。
|
||||||
|
3. 提供失败后的快速回滚与重试指引。
|
||||||
|
|
||||||
|
## 2. 关键实现映射（联调前必须确认）
|
||||||
|
|
||||||
|
1. 企业/间参步骤链：
|
||||||
|
`RENDER_CONFIG -> SET_(RABBITMQ|TLQ) -> MQ_USER_APPLY -> MQ_QUEUE_APPLY -> DB_INIT -> DEPLOY_RECEIVER -> APP_MQ_CREDENTIALS_APPLY -> VERIFY`
|
||||||
|
2. 轻量化直参（TLQ）步骤链：
|
||||||
|
`RENDER_CONFIG -> MQ_USER_APPLY -> DB_INIT(direct_db_init) -> TLQ_INIT_CFG(tlq_init_cfg) -> VERIFY`
|
||||||
|
3. 轻量化直参（CFMQ）步骤链：
|
||||||
|
`RENDER_CONFIG -> MQ_USER_APPLY -> DB_INIT(direct_db_init) -> CFMQ_APPLY -> VERIFY`
|
||||||
|
4. 通道账号密码写回应用配置时默认加密：
|
||||||
|
`DESede(3DES) + secretKey=ABCDEFGHIJKLMN1234567890 + HEX(upper)`。
|
||||||
|
|
||||||
|
## 3. 联调前置检查
|
||||||
|
|
||||||
|
## 3.1 环境变量基线
|
||||||
|
|
||||||
|
在 TMS 进程环境确认以下参数：
|
||||||
|
|
||||||
|
```bash
|
||||||
|
echo "$TMS_CISD_PRESET_PRODUCT_TYPE"
|
||||||
|
echo "$TMS_INIT_EXECUTOR_MODE"
|
||||||
|
echo "$TMS_INIT_EXECUTOR_STANDARD_CPCONFIG_PATH"
|
||||||
|
echo "$TMS_INIT_EXECUTOR_DIRECT_DB_SCRIPT_DIR"
|
||||||
|
echo "$TMS_INIT_EXECUTOR_DIRECT_TLQ_INIT_CFG_DIR"
|
||||||
|
echo "$TMS_INIT_EXECUTOR_STANDARD_RABBIT_APP_CONFIG_PATTERN_1"
|
||||||
|
echo "$TMS_INIT_EXECUTOR_STANDARD_RABBIT_APP_CONFIG_PATTERN_2"
|
||||||
|
echo "$TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_ENCRYPT_ENABLED"
|
||||||
|
echo "$TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_SECRET_KEY"
|
||||||
|
```
|
||||||
|
|
||||||
|
建议值：
|
||||||
|
|
||||||
|
1. `TMS_INIT_EXECUTOR_MODE=LOCAL`
|
||||||
|
2. `TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_ENCRYPT_ENABLED=true`
|
||||||
|
3. `TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_SECRET_KEY` 与现场收发器解密密钥一致。
|
||||||
|
|
||||||
|
## 3.2 目录与脚本存在性
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ls -l /home/cmep4i/cpconfig.cfg
|
||||||
|
ls -l /home/cmep4i/cpackage/toolsh/{setfraq.sh,setftq.sh,setsql.sh,setsptp.sh}
|
||||||
|
ls -l /opt/CAE_Install_Base_Resource/DB/setsql.sh
|
||||||
|
ls -l /opt/CAE_Install_App_Resource/CAE/init_cfg.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
## 3.3 MQ 与配置文件可写性
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ls -l /home/cmep4i/cmsp/application-prd*.properties
|
||||||
|
ls -l /home/cmep4i/cmtp/application-prd*.properties
|
||||||
|
which rabbitmqctl
|
||||||
|
which rabbitmqadmin
|
||||||
|
```
|
||||||
|
|
||||||
|
## 4. 联调执行清单（统一流程）
|
||||||
|
|
||||||
|
## 4.1 接口执行顺序
|
||||||
|
|
||||||
|
1. `GET /api/v1/device/status`
|
||||||
|
2. `POST /api/v1/init/preview`
|
||||||
|
3. `POST /api/v1/init/task`
|
||||||
|
4. `POST /api/v1/init/task/{taskId}/execute`
|
||||||
|
5. `GET /api/v1/init/task/{taskId}/steps`
|
||||||
|
6. 失败时逐步查看日志：`GET /api/v1/init/task/{taskId}/steps/{stepNo}/log`
|
||||||
|
|
||||||
|
## 4.2 用例矩阵（最小集合）
|
||||||
|
|
||||||
|
1. 企业版 + RabbitMQ
|
||||||
|
2. 企业版 + TLQ
|
||||||
|
3. 间参版 + RabbitMQ
|
||||||
|
4. 轻量化直参 + RABBITMQ_TLQ（必须带 `directTlq` 三字段）
|
||||||
|
5. 轻量化直参 + RABBITMQ_CFMQ
|
||||||
|
|
||||||
|
## 4.3 直参 TLQ 请求体附加字段
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"directTlq": {
|
||||||
|
"localNodeSeq": "A",
|
||||||
|
"upstreamInstitutions": "CIPSCNSHXXX;CIPSCNWXXXX",
|
||||||
|
"upstreamCocCount": 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 5. 关键验收点
|
||||||
|
|
||||||
|
1. `RENDER_CONFIG` 后，`cpconfig.cfg` 中机构号、节点、签名参数、`MQ_TYPE` 已替换。
|
||||||
|
2. `MQ_USER_APPLY` 后，RabbitMQ 中存在通道用户，且具备目标 vhost 权限。
|
||||||
|
3. `MQ_QUEUE_APPLY` 后，业务队列创建成功（企业/间参）。
|
||||||
|
4. `APP_MQ_CREDENTIALS_APPLY` 后，`spring.rabbitmq.username/password` 已更新且为密文（非明文）。
|
||||||
|
5. `DB_INIT` 生成或替换的 SQL 文件可执行，无路径/权限错误。
|
||||||
|
6. `VERIFY` 成功，任务最终状态 `SUCCESS`。
|
||||||
|
|
||||||
|
## 6. 失败定位顺序
|
||||||
|
|
||||||
|
1. 配置错误：版本预置、环境变量、路径。
|
||||||
|
2. 权限错误：TMS 进程用户对脚本和配置文件不可写。
|
||||||
|
3. 脚本依赖缺失：`rabbitmqctl/rabbitmqadmin`、Java、数据库客户端。
|
||||||
|
4. 参数不完整：直参 TLQ 缺 `directTlq` 字段。
|
||||||
|
5. 密钥不一致：写回密文与收发器解密密钥不匹配导致 MQ 连接失败。
|
||||||
|
|
||||||
|
## 7. 回滚策略（按层次）
|
||||||
|
|
||||||
|
## 7.1 执行前备份（强制）
|
||||||
|
|
||||||
|
```bash
|
||||||
|
TS=$(date +%Y%m%d%H%M%S)
|
||||||
|
mkdir -p /tmp/cisd-init-backup-$TS
|
||||||
|
cp -a /home/cmep4i/cpconfig.cfg /tmp/cisd-init-backup-$TS/
|
||||||
|
cp -a /home/cmep4i/cmsp/application-prd*.properties /tmp/cisd-init-backup-$TS/ 2>/dev/null || true
|
||||||
|
cp -a /home/cmep4i/cmtp/application-prd*.properties /tmp/cisd-init-backup-$TS/ 2>/dev/null || true
|
||||||
|
echo "/tmp/cisd-init-backup-$TS"
|
||||||
|
```
|
||||||
|
|
||||||
|
## 7.2 配置回滚
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cp -a /tmp/cisd-init-backup-<TS>/cpconfig.cfg /home/cmep4i/cpconfig.cfg
|
||||||
|
cp -a /tmp/cisd-init-backup-<TS>/application-prd*.properties /home/cmep4i/cmsp/ 2>/dev/null || true
|
||||||
|
cp -a /tmp/cisd-init-backup-<TS>/application-prd*.properties /home/cmep4i/cmtp/ 2>/dev/null || true
|
||||||
|
```
|
||||||
|
|
||||||
|
## 7.3 MQ 回滚（按需）
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 删除通道用户（示例）
|
||||||
|
rabbitmqctl delete_user <channelUsername>
|
||||||
|
|
||||||
|
# 删除业务队列（示例，按实际创建队列名执行）
|
||||||
|
rabbitmqadmin --username=admin --password=admin --vhost=/ delete queue name=<queueName>
|
||||||
|
rabbitmqadmin --username=admin --password=admin --vhost=/RQ delete queue name=<queueName>
|
||||||
|
```
|
||||||
|
|
||||||
|
## 7.4 数据库回滚（按实际 SQL 执行情况）
|
||||||
|
|
||||||
|
1. 若仅生成 SQL 未执行：删除临时生成物即可。
|
||||||
|
2. 若已执行入库：使用预先准备的回滚 SQL 或从数据库备份恢复。
|
||||||
|
3. 严禁在无备份情况下直接清库重建。
|
||||||
|
|
||||||
|
## 8. 重试策略
|
||||||
|
|
||||||
|
1. 先回滚配置和 MQ 变更，再重建任务重试，不复用失败任务。
|
||||||
|
2. 每次仅变更一个变量（如路径、密钥、账号），避免多变量同时变化。
|
||||||
|
3. 连续两次同一步失败，先停止重试，导出该步骤日志并人工排查根因。
|
||||||
|
|
||||||
|
## 9. 交付物归档
|
||||||
|
|
||||||
|
每次联调需归档：
|
||||||
|
|
||||||
|
1. `taskId`、版本类型、请求参数（脱敏后）。
|
||||||
|
2. 步骤执行日志目录：`/tmp/tms-init-logs/<taskId>/`。
|
||||||
|
3. 回滚操作记录（是否执行、执行人、时间）。
|
||||||
|
4. 最终结论：通过/失败及根因。
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
# CISD Init Request Schema Spec (Preset-Version Driven)
|
||||||
|
|
||||||
|
## 1. Scope
|
||||||
|
This document defines the frontend request schema for CISD initialization in TMS when product version is preset by device metadata.
|
||||||
|
|
||||||
|
- Frontend must call `GET /api/v1/device/status` first.
|
||||||
|
- If `presetProductType` is empty or invalid, initialization is forbidden.
|
||||||
|
- Frontend must render version-specific form fields automatically; user does not manually choose version.
|
||||||
|
|
||||||
|
## 2. Device status fields used by frontend
|
||||||
|
`/api/v1/device/status` response includes:
|
||||||
|
|
||||||
|
- `presetProductType`: `ENTERPRISE | INDIRECT | DIRECT`
|
||||||
|
- `presetVersion`: preset package version
|
||||||
|
- `presetSource`: where preset was loaded from (e.g., `CONFIG`, future `DB`)
|
||||||
|
|
||||||
|
## 3. Init preview request payload
|
||||||
|
Endpoint: `POST /api/v1/init/preview`
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"orgCodeType": "BIC",
|
||||||
|
"orgCode": "AAAABBBBXXX",
|
||||||
|
"orgNameCn": "示例机构",
|
||||||
|
"orgNameEn": "Example Bank",
|
||||||
|
"deployMode": "DUAL",
|
||||||
|
"nodes": {
|
||||||
|
"node01Ip": "10.0.0.1",
|
||||||
|
"node02Ip": "10.0.0.2",
|
||||||
|
"node03Ip": "127.0.0.1",
|
||||||
|
"node04Ip": "127.0.0.1"
|
||||||
|
},
|
||||||
|
"mq": {
|
||||||
|
"mqType": "RABBITMQ",
|
||||||
|
"channelUsername": "channel_user",
|
||||||
|
"channelPassword": "channel_password",
|
||||||
|
"tlqLicenseFileId": "file-tlq-license",
|
||||||
|
"cfmqConfigFileId": "file-cfmq-config"
|
||||||
|
},
|
||||||
|
"licenses": {
|
||||||
|
"receiverLicenseFileId": "file-receiver-license",
|
||||||
|
"cfgZipFileId": "file-cfg-zip"
|
||||||
|
},
|
||||||
|
"signServer": {
|
||||||
|
"signHost": "172.30.1.101",
|
||||||
|
"signPort": 50006,
|
||||||
|
"signType": "Infosec",
|
||||||
|
"signCertDn": "CN=...",
|
||||||
|
"signCertSn": "1154809590",
|
||||||
|
"signPassword": "***"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 4. Mandatory fields by product type
|
||||||
|
|
||||||
|
### 4.1 Common mandatory fields (all versions)
|
||||||
|
- `orgCodeType`, `orgCode`, `orgNameCn`
|
||||||
|
- `deployMode`
|
||||||
|
- `nodes.node01Ip`
|
||||||
|
- `mq.mqType`, `mq.channelUsername`, `mq.channelPassword`
|
||||||
|
- `licenses.receiverLicenseFileId`
|
||||||
|
|
||||||
|
### 4.2 ENTERPRISE / INDIRECT
|
||||||
|
Allowed values:
|
||||||
|
- `deployMode`: `SINGLE | DUAL`
|
||||||
|
- `mq.mqType`: `RABBITMQ | TLQ`
|
||||||
|
|
||||||
|
Conditional required fields:
|
||||||
|
- `deployMode=DUAL` -> `nodes.node02Ip`
|
||||||
|
- `mqType=TLQ` -> `mq.tlqLicenseFileId`
|
||||||
|
|
||||||
|
### 4.3 DIRECT
|
||||||
|
Allowed values:
|
||||||
|
- `deployMode`: `SINGLE | DUAL | QUAD`
|
||||||
|
- `mq.mqType`: `RABBITMQ_TLQ | RABBITMQ_CFMQ`
|
||||||
|
|
||||||
|
Always required:
|
||||||
|
- `licenses.cfgZipFileId`
|
||||||
|
- `signServer.signHost`
|
||||||
|
- `signServer.signPort`
|
||||||
|
- `signServer.signType`
|
||||||
|
- `signServer.signCertDn`
|
||||||
|
- `signServer.signCertSn`
|
||||||
|
- `signServer.signPassword`
|
||||||
|
|
||||||
|
Conditional required fields:
|
||||||
|
- `deployMode=DUAL|QUAD` -> `nodes.node02Ip`
|
||||||
|
- `deployMode=QUAD` -> `nodes.node03Ip`, `nodes.node04Ip`
|
||||||
|
- `mqType=RABBITMQ_TLQ` -> `mq.tlqLicenseFileId`
|
||||||
|
- `mqType=RABBITMQ_CFMQ` -> `mq.cfmqConfigFileId`
|
||||||
|
|
||||||
|
## 5. Prefilled vs user-input fields
|
||||||
|
|
||||||
|
### 5.1 Prefilled and hidden from frontend
|
||||||
|
- Product preset metadata: version type and package version
|
||||||
|
- Database deployment credentials and root/app user passwords
|
||||||
|
- RabbitMQ admin username/password
|
||||||
|
|
||||||
|
### 5.2 User input fields
|
||||||
|
- Institution identity and node addresses
|
||||||
|
- MQ channel username/password
|
||||||
|
- Version-conditional file uploads (receiver license, TLQ license, CFMQ config, direct CFG zip)
|
||||||
|
- Direct sign server information
|
||||||
|
|
||||||
|
## 6. Validation behavior
|
||||||
|
- Validation errors return code `4001` with field message.
|
||||||
|
- Missing/invalid preset product type returns business error and initialization is blocked.
|
||||||
@@ -0,0 +1,121 @@
|
|||||||
|
# CISD Init Request Schema DTO Implementation Plan
|
||||||
|
|
||||||
|
> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task.
|
||||||
|
|
||||||
|
**Goal:** Replace placeholder init preview request with a production-ready CISD initialization request DTO and server-side rule validation based on preset product type.
|
||||||
|
|
||||||
|
**Architecture:** Keep the current single-module Spring Boot structure. Introduce strong-typed nested DTOs for init request payload, centralize preset version/product-type sourcing in configuration properties (as current phase baseline), and enforce cross-field conditional rules in `InitService` before preview generation. Surface preset product type in `/api/v1/device/info` for frontend auto-rendering.
|
||||||
|
|
||||||
|
**Tech Stack:** JDK 17, Spring Boot 3.5, Jakarta Bean Validation, JUnit 5.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: Add failing tests for init request rule validation
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `src/test/java/com/cisd/tms/modules/init/service/InitServiceTest.java`
|
||||||
|
|
||||||
|
**Step 1: Write failing tests**
|
||||||
|
- Add tests for:
|
||||||
|
- missing preset product type should reject init preview.
|
||||||
|
- enterprise + TLQ should require `tlqLicenseFileId`.
|
||||||
|
- direct + `RABBITMQ_CFMQ` should require `cfmqConfigFileId`, `cfgZipFileId`, and sign server fields.
|
||||||
|
- valid enterprise request should pass and generate summary.
|
||||||
|
|
||||||
|
**Step 2: Run targeted tests to verify red**
|
||||||
|
- Run: `mvn -q -Dtest=InitServiceTest test`
|
||||||
|
- Expected: FAIL because `InitService` still uses old DTO and has no rule engine.
|
||||||
|
|
||||||
|
### Task 2: Implement strong-typed init request DTO model
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/main/java/com/cisd/tms/modules/init/dto/InitPreviewRequest.java`
|
||||||
|
|
||||||
|
**Step 1: Replace old placeholder fields**
|
||||||
|
- Remove `version/nodeCount`.
|
||||||
|
- Add nested models for:
|
||||||
|
- basic institution fields
|
||||||
|
- deploy mode + nodes
|
||||||
|
- mq settings
|
||||||
|
- licenses
|
||||||
|
- sign server
|
||||||
|
|
||||||
|
**Step 2: Add validation annotations**
|
||||||
|
- Add required constraints for common fields (`orgCodeType`, `orgCode`, `orgNameCn`, `deployMode`, `node01Ip`, `mqType`, `channelUsername`, `channelPassword`, `receiverLicenseFileId`).
|
||||||
|
|
||||||
|
**Step 3: Keep model minimal and serializable**
|
||||||
|
- Use static inner classes with getters/setters only.
|
||||||
|
|
||||||
|
### Task 3: Add preset product type source and expose in device info
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `src/main/java/com/cisd/tms/common/config/properties/CisdPresetProperties.java`
|
||||||
|
- Modify: `src/main/java/com/cisd/tms/modules/device/dto/DeviceInfoResponse.java`
|
||||||
|
- Modify: `src/main/java/com/cisd/tms/modules/device/service/DeviceService.java`
|
||||||
|
- Modify: `src/main/resources/application.yml`
|
||||||
|
|
||||||
|
**Step 1: Add configuration properties bean**
|
||||||
|
- Prefix: `tms.cisd.preset`
|
||||||
|
- Fields: `productType`, `version`, `source`.
|
||||||
|
|
||||||
|
**Step 2: Extend device status response**
|
||||||
|
- Add `presetProductType`, `presetVersion`, `presetSource`.
|
||||||
|
|
||||||
|
**Step 3: Populate response from preset config**
|
||||||
|
- Inject `CisdPresetProperties` into `DeviceService` and map values.
|
||||||
|
|
||||||
|
### Task 4: Implement rule validation in InitService
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/main/java/com/cisd/tms/modules/init/service/InitService.java`
|
||||||
|
- Modify: `src/main/java/com/cisd/tms/modules/init/dto/InitPreviewResponse.java`
|
||||||
|
- Modify: `src/main/java/com/cisd/tms/modules/init/dto/InitPlanTemplateResponse.java`
|
||||||
|
|
||||||
|
**Step 1: Add preset guard**
|
||||||
|
- If preset product type missing/invalid, throw `BizException` and block preview/template.
|
||||||
|
|
||||||
|
**Step 2: Add product-type conditional validation**
|
||||||
|
- Enterprise/Indirect:
|
||||||
|
- deploy mode only `SINGLE/DUAL`
|
||||||
|
- mq type only `RABBITMQ/TLQ`
|
||||||
|
- TLQ requires `tlqLicenseFileId`
|
||||||
|
- DUAL requires `node02Ip`
|
||||||
|
- Direct:
|
||||||
|
- deploy mode `SINGLE/DUAL/QUAD`
|
||||||
|
- mq type `RABBITMQ_TLQ/RABBITMQ_CFMQ`
|
||||||
|
- `cfgZipFileId` required
|
||||||
|
- sign server fields required
|
||||||
|
- TLQ requires `tlqLicenseFileId`
|
||||||
|
- CFMQ requires `cfmqConfigFileId`
|
||||||
|
- DUAL/QUAD require `node02Ip`; QUAD require `node03Ip/node04Ip`
|
||||||
|
|
||||||
|
**Step 3: Produce meaningful preview summary**
|
||||||
|
- Set response fields: resolved product type, step count estimate, and concise summary.
|
||||||
|
|
||||||
|
### Task 5: Add developer-facing validation spec doc
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `docs/plans/2026-03-02-cisd-init-request-schema-spec.md`
|
||||||
|
|
||||||
|
**Step 1: Document payload JSON schema shape**
|
||||||
|
- Include common object structure and conditional fields by product type.
|
||||||
|
|
||||||
|
**Step 2: Document prefilled vs user-input fields**
|
||||||
|
- Explicitly list DB creds and RabbitMQ admin creds as prefilled-only.
|
||||||
|
|
||||||
|
### Task 6: Verify and stabilize
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- N/A
|
||||||
|
|
||||||
|
**Step 1: Run targeted tests**
|
||||||
|
- `mvn -q -Dtest=InitServiceTest test`
|
||||||
|
|
||||||
|
**Step 2: Run compile check**
|
||||||
|
- `mvn -q -DskipTests compile`
|
||||||
|
|
||||||
|
**Step 3: Run full test suite if stable**
|
||||||
|
- `mvn -q test`
|
||||||
|
|
||||||
|
**Step 4: Record results in response**
|
||||||
|
- Include changed files, command outputs summary, remaining risks.
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
-- -----------------------------------------------------------------------------
|
||||||
|
-- TMS 基础库结构（TiDB/MySQL）
|
||||||
|
-- 适用范围：当前已实现的初始化任务、步骤、设备节点、用户表
|
||||||
|
-- -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-- 1) 建库（如已存在则跳过）
|
||||||
|
CREATE DATABASE IF NOT EXISTS tms
|
||||||
|
DEFAULT CHARACTER SET utf8mb4
|
||||||
|
COLLATE utf8mb4_general_ci;
|
||||||
|
|
||||||
|
USE tms;
|
||||||
|
|
||||||
|
-- 2) 初始化任务主表
|
||||||
|
CREATE TABLE IF NOT EXISTS tms_init_task (
|
||||||
|
id BIGINT PRIMARY KEY COMMENT '主键ID',
|
||||||
|
task_id VARCHAR(64) NOT NULL COMMENT '任务业务ID',
|
||||||
|
version VARCHAR(32) NOT NULL COMMENT 'CIPS版本',
|
||||||
|
status VARCHAR(32) NOT NULL COMMENT '任务状态',
|
||||||
|
product_type VARCHAR(16) NULL COMMENT '产品版本: enterprise/interbank/lite_direct',
|
||||||
|
org_code VARCHAR(32) NULL COMMENT '机构号',
|
||||||
|
mq_type VARCHAR(32) NULL COMMENT '消息队列类型',
|
||||||
|
deploy_mode VARCHAR(16) NULL COMMENT '部署模式: single/double/four',
|
||||||
|
init_plan_json LONGTEXT NULL COMMENT '初始化计划快照(JSON)',
|
||||||
|
create_time DATETIME(3) NOT NULL COMMENT '创建时间',
|
||||||
|
update_time DATETIME(3) NOT NULL COMMENT '更新时间',
|
||||||
|
UNIQUE KEY uk_tms_init_task_task_id (task_id)
|
||||||
|
) COMMENT='初始化任务表';
|
||||||
|
|
||||||
|
-- 3) 初始化任务步骤表
|
||||||
|
CREATE TABLE IF NOT EXISTS tms_init_task_step (
|
||||||
|
id BIGINT PRIMARY KEY COMMENT '主键ID',
|
||||||
|
task_id VARCHAR(64) NOT NULL COMMENT '任务业务ID',
|
||||||
|
step_no INT NOT NULL COMMENT '步骤序号',
|
||||||
|
step_code VARCHAR(64) NOT NULL COMMENT '步骤编码',
|
||||||
|
status VARCHAR(32) NOT NULL COMMENT '步骤状态',
|
||||||
|
message VARCHAR(512) NULL COMMENT '步骤信息',
|
||||||
|
command_line VARCHAR(2048) NULL COMMENT '实际执行命令',
|
||||||
|
log_path VARCHAR(512) NULL COMMENT '日志文件路径',
|
||||||
|
exit_code INT NULL COMMENT '命令退出码',
|
||||||
|
create_time DATETIME(3) NOT NULL COMMENT '创建时间',
|
||||||
|
update_time DATETIME(3) NOT NULL COMMENT '更新时间',
|
||||||
|
UNIQUE KEY uk_tms_init_task_step_task_no (task_id, step_no),
|
||||||
|
KEY idx_tms_init_task_step_task_id (task_id)
|
||||||
|
) COMMENT='初始化任务步骤表';
|
||||||
|
|
||||||
|
-- 4) 系统用户表（简化）
|
||||||
|
CREATE TABLE IF NOT EXISTS tms_auth_user (
|
||||||
|
id BIGINT PRIMARY KEY COMMENT '主键ID',
|
||||||
|
username VARCHAR(64) NOT NULL COMMENT '用户名',
|
||||||
|
display_name VARCHAR(128) NOT NULL COMMENT '显示名',
|
||||||
|
role VARCHAR(64) NOT NULL COMMENT '角色',
|
||||||
|
create_time DATETIME(3) NOT NULL COMMENT '创建时间',
|
||||||
|
update_time DATETIME(3) NOT NULL COMMENT '更新时间',
|
||||||
|
UNIQUE KEY uk_tms_auth_user_username (username)
|
||||||
|
) COMMENT='系统用户表';
|
||||||
|
|
||||||
|
-- 5) 设备节点表
|
||||||
|
CREATE TABLE IF NOT EXISTS tms_device_node (
|
||||||
|
id BIGINT PRIMARY KEY COMMENT '主键ID',
|
||||||
|
node_id VARCHAR(64) NOT NULL COMMENT '节点业务ID',
|
||||||
|
host VARCHAR(128) NOT NULL COMMENT '节点主机地址',
|
||||||
|
status VARCHAR(32) NOT NULL COMMENT '节点状态',
|
||||||
|
create_time DATETIME(3) NOT NULL COMMENT '创建时间',
|
||||||
|
update_time DATETIME(3) NOT NULL COMMENT '更新时间',
|
||||||
|
UNIQUE KEY uk_tms_device_node_node_id (node_id)
|
||||||
|
) COMMENT='设备节点表';
|
||||||
|
|
||||||
|
-- 6) 可选初始化数据（按需启用）
|
||||||
|
-- INSERT INTO tms_auth_user (id, username, display_name, role, create_time, update_time)
|
||||||
|
-- VALUES (10001, 'admin', '系统管理员', 'ADMIN', NOW(3), NOW(3));
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>3.5.0</version>
|
<version>3.5.11</version>
|
||||||
<relativePath/>
|
<relativePath/>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
Executable
+144
@@ -0,0 +1,144 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# CISD init flow runner:
|
||||||
|
# status -> preview -> create task -> execute -> query steps -> failed step log
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# chmod +x scripts/cisd_init_flow.sh
|
||||||
|
# REQUEST_JSON=/tmp/cisd-init-standard-rabbit.json ./scripts/cisd_init_flow.sh
|
||||||
|
#
|
||||||
|
# Optional env:
|
||||||
|
# BASE_URL=http://127.0.0.1:8080
|
||||||
|
# INTERNAL_TOKEN=change-me-internal-token
|
||||||
|
# OUT_DIR=/tmp/cisd-init-run
|
||||||
|
# FETCH_FAILED_STEP_LOG=true
|
||||||
|
|
||||||
|
BASE_URL="${BASE_URL:-http://127.0.0.1:8080}"
|
||||||
|
INTERNAL_TOKEN="${INTERNAL_TOKEN:-change-me-internal-token}"
|
||||||
|
REQUEST_JSON="${REQUEST_JSON:-}"
|
||||||
|
OUT_DIR="${OUT_DIR:-/tmp/cisd-init-run}"
|
||||||
|
FETCH_FAILED_STEP_LOG="${FETCH_FAILED_STEP_LOG:-true}"
|
||||||
|
TIMEOUT_SECONDS="${TIMEOUT_SECONDS:-30}"
|
||||||
|
|
||||||
|
TS="$(date +%Y%m%d%H%M%S)"
|
||||||
|
RUN_DIR="${OUT_DIR}/run-${TS}"
|
||||||
|
|
||||||
|
require_cmd() {
|
||||||
|
local cmd="$1"
|
||||||
|
if ! command -v "$cmd" >/dev/null 2>&1; then
|
||||||
|
echo "[FATAL] command missing: ${cmd}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
api_get() {
|
||||||
|
local path="$1"
|
||||||
|
curl -sS --max-time "${TIMEOUT_SECONDS}" \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
"${BASE_URL}${path}"
|
||||||
|
}
|
||||||
|
|
||||||
|
api_post_json() {
|
||||||
|
local path="$1"
|
||||||
|
local body_file="$2"
|
||||||
|
curl -sS --max-time "${TIMEOUT_SECONDS}" \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-X POST "${BASE_URL}${path}" \
|
||||||
|
-d @"${body_file}"
|
||||||
|
}
|
||||||
|
|
||||||
|
api_post_empty() {
|
||||||
|
local path="$1"
|
||||||
|
curl -sS --max-time "${TIMEOUT_SECONDS}" \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
-X POST "${BASE_URL}${path}"
|
||||||
|
}
|
||||||
|
|
||||||
|
expect_success() {
|
||||||
|
local label="$1"
|
||||||
|
local file="$2"
|
||||||
|
if jq -e '.success == true and .code == 200' "${file}" >/dev/null 2>&1; then
|
||||||
|
echo "[PASS] ${label}"
|
||||||
|
else
|
||||||
|
echo "[FAIL] ${label}"
|
||||||
|
cat "${file}"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
require_cmd curl
|
||||||
|
require_cmd jq
|
||||||
|
|
||||||
|
if [[ -z "${REQUEST_JSON}" ]]; then
|
||||||
|
echo "[FATAL] REQUEST_JSON is required"
|
||||||
|
echo "Example: REQUEST_JSON=/tmp/cisd-init-standard-rabbit.json ./scripts/cisd_init_flow.sh"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ ! -f "${REQUEST_JSON}" ]]; then
|
||||||
|
echo "[FATAL] request file not found: ${REQUEST_JSON}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "${RUN_DIR}"
|
||||||
|
echo "[INFO] run dir: ${RUN_DIR}"
|
||||||
|
echo "[INFO] base url: ${BASE_URL}"
|
||||||
|
|
||||||
|
echo "[STEP] device status"
|
||||||
|
api_get "/api/v1/device/status" | tee "${RUN_DIR}/01-device-status.json" >/dev/null
|
||||||
|
expect_success "device status" "${RUN_DIR}/01-device-status.json"
|
||||||
|
jq '.data | {presetProductType,presetVersion,presetSource}' "${RUN_DIR}/01-device-status.json" || true
|
||||||
|
|
||||||
|
echo "[STEP] init preview"
|
||||||
|
api_post_json "/api/v1/init/preview" "${REQUEST_JSON}" | tee "${RUN_DIR}/02-preview.json" >/dev/null
|
||||||
|
expect_success "init preview" "${RUN_DIR}/02-preview.json"
|
||||||
|
jq '.data | {resolvedProductType,presetVersion,stepCount,summary}' "${RUN_DIR}/02-preview.json" || true
|
||||||
|
|
||||||
|
echo "[STEP] create init task"
|
||||||
|
api_post_json "/api/v1/init/tasks" "${REQUEST_JSON}" | tee "${RUN_DIR}/03-create-task.json" >/dev/null
|
||||||
|
expect_success "create task" "${RUN_DIR}/03-create-task.json"
|
||||||
|
TASK_ID="$(jq -r '.data.taskId // empty' "${RUN_DIR}/03-create-task.json")"
|
||||||
|
if [[ -z "${TASK_ID}" ]]; then
|
||||||
|
echo "[FATAL] taskId missing in create task response"
|
||||||
|
cat "${RUN_DIR}/03-create-task.json"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
echo "[INFO] task id: ${TASK_ID}"
|
||||||
|
|
||||||
|
echo "[STEP] execute init task"
|
||||||
|
api_post_empty "/api/v1/init/tasks/${TASK_ID}/execute" | tee "${RUN_DIR}/04-execute-task.json" >/dev/null
|
||||||
|
expect_success "execute task api call" "${RUN_DIR}/04-execute-task.json"
|
||||||
|
TASK_STATUS="$(jq -r '.data.status // empty' "${RUN_DIR}/04-execute-task.json")"
|
||||||
|
echo "[INFO] task status: ${TASK_STATUS}"
|
||||||
|
|
||||||
|
echo "[STEP] query task steps"
|
||||||
|
api_get "/api/v1/init/tasks/${TASK_ID}/steps" | tee "${RUN_DIR}/05-task-steps.json" >/dev/null
|
||||||
|
expect_success "query task steps" "${RUN_DIR}/05-task-steps.json"
|
||||||
|
jq -r '.data[] | "\(.stepNo)\t\(.stepCode)\t\(.status)\t\(.message // "")"' "${RUN_DIR}/05-task-steps.json" || true
|
||||||
|
|
||||||
|
if [[ "${FETCH_FAILED_STEP_LOG,,}" == "true" ]]; then
|
||||||
|
FAILED_STEP_NO="$(jq -r '.data[] | select(.status=="FAILED") | .stepNo' "${RUN_DIR}/05-task-steps.json" | head -n1 || true)"
|
||||||
|
if [[ -n "${FAILED_STEP_NO}" ]]; then
|
||||||
|
echo "[STEP] fetch failed step log: stepNo=${FAILED_STEP_NO}"
|
||||||
|
api_get "/api/v1/init/tasks/${TASK_ID}/steps/${FAILED_STEP_NO}/log" | tee "${RUN_DIR}/06-failed-step-log.json" >/dev/null || true
|
||||||
|
if jq -e '.success == true and .code == 200' "${RUN_DIR}/06-failed-step-log.json" >/dev/null 2>&1; then
|
||||||
|
jq -r '.data.content' "${RUN_DIR}/06-failed-step-log.json" > "${RUN_DIR}/06-failed-step.log.txt" || true
|
||||||
|
echo "[INFO] failed step log saved: ${RUN_DIR}/06-failed-step.log.txt"
|
||||||
|
else
|
||||||
|
echo "[WARN] failed step log API did not return success"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "${TASK_STATUS}" == "SUCCESS" ]]; then
|
||||||
|
echo "[DONE] init flow completed successfully, taskId=${TASK_ID}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[DONE] init flow completed with non-success status=${TASK_STATUS}, taskId=${TASK_ID}"
|
||||||
|
exit 3
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
Executable
+173
@@ -0,0 +1,173 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# CISD init on-host precheck.
|
||||||
|
# Usage:
|
||||||
|
# chmod +x scripts/cisd_init_precheck.sh
|
||||||
|
# ./scripts/cisd_init_precheck.sh
|
||||||
|
# Optional:
|
||||||
|
# PRODUCT_TYPE=ENTERPRISE ./scripts/cisd_init_precheck.sh
|
||||||
|
|
||||||
|
PRODUCT_TYPE="${PRODUCT_TYPE:-${TMS_CISD_PRESET_PRODUCT_TYPE:-UNKNOWN}}"
|
||||||
|
MODE="${TMS_INIT_EXECUTOR_MODE:-SIMULATE}"
|
||||||
|
LOG_DIR="${TMS_INIT_EXECUTOR_LOG_DIR:-/tmp/tms-init-logs}"
|
||||||
|
STANDARD_CPCONFIG_PATH="${TMS_INIT_EXECUTOR_STANDARD_CPCONFIG_PATH:-/home/cmep4i/cpconfig.cfg}"
|
||||||
|
DIRECT_DB_SCRIPT_DIR="${TMS_INIT_EXECUTOR_DIRECT_DB_SCRIPT_DIR:-/opt/CAE_Install_Base_Resource/DB}"
|
||||||
|
DIRECT_TLQ_INIT_CFG_DIR="${TMS_INIT_EXECUTOR_DIRECT_TLQ_INIT_CFG_DIR:-/opt/CAE_Install_App_Resource/CAE}"
|
||||||
|
APP_PATTERN_1="${TMS_INIT_EXECUTOR_STANDARD_RABBIT_APP_CONFIG_PATTERN_1:-/home/cmep4i/cmsp/application-prd*.properties}"
|
||||||
|
APP_PATTERN_2="${TMS_INIT_EXECUTOR_STANDARD_RABBIT_APP_CONFIG_PATTERN_2:-/home/cmep4i/cmtp/application-prd*.properties}"
|
||||||
|
RABBIT_CRED_ENCRYPT_ENABLED="${TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_ENCRYPT_ENABLED:-true}"
|
||||||
|
RABBIT_CRED_SECRET_KEY="${TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_SECRET_KEY:-ABCDEFGHIJKLMN1234567890}"
|
||||||
|
|
||||||
|
pass_count=0
|
||||||
|
warn_count=0
|
||||||
|
fail_count=0
|
||||||
|
|
||||||
|
pass() {
|
||||||
|
echo "[PASS] $1"
|
||||||
|
pass_count=$((pass_count + 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
warn() {
|
||||||
|
echo "[WARN] $1"
|
||||||
|
warn_count=$((warn_count + 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
fail() {
|
||||||
|
echo "[FAIL] $1"
|
||||||
|
fail_count=$((fail_count + 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
check_cmd() {
|
||||||
|
local cmd="$1"
|
||||||
|
if command -v "$cmd" >/dev/null 2>&1; then
|
||||||
|
pass "command exists: ${cmd}"
|
||||||
|
else
|
||||||
|
fail "command missing: ${cmd}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_file() {
|
||||||
|
local file="$1"
|
||||||
|
if [[ -f "$file" ]]; then
|
||||||
|
pass "file exists: ${file}"
|
||||||
|
else
|
||||||
|
fail "file missing: ${file}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_dir() {
|
||||||
|
local dir="$1"
|
||||||
|
if [[ -d "$dir" ]]; then
|
||||||
|
pass "directory exists: ${dir}"
|
||||||
|
else
|
||||||
|
fail "directory missing: ${dir}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_writable_dir() {
|
||||||
|
local dir="$1"
|
||||||
|
mkdir -p "$dir" 2>/dev/null || true
|
||||||
|
if [[ -d "$dir" && -w "$dir" ]]; then
|
||||||
|
pass "directory writable: ${dir}"
|
||||||
|
else
|
||||||
|
fail "directory not writable: ${dir}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_pattern_match() {
|
||||||
|
local pattern="$1"
|
||||||
|
shopt -s nullglob
|
||||||
|
local matches=($pattern)
|
||||||
|
shopt -u nullglob
|
||||||
|
if (( ${#matches[@]} > 0 )); then
|
||||||
|
pass "pattern matched (${#matches[@]}): ${pattern}"
|
||||||
|
else
|
||||||
|
fail "pattern has no match: ${pattern}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_product_type() {
|
||||||
|
case "$PRODUCT_TYPE" in
|
||||||
|
ENTERPRISE|INDIRECT|DIRECT)
|
||||||
|
pass "product type recognized: ${PRODUCT_TYPE}"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
fail "product type invalid: ${PRODUCT_TYPE} (expected ENTERPRISE/INDIRECT/DIRECT)"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
check_mode() {
|
||||||
|
if [[ "$MODE" == "LOCAL" ]]; then
|
||||||
|
pass "executor mode is LOCAL"
|
||||||
|
else
|
||||||
|
warn "executor mode is ${MODE}; on-host initialization should use LOCAL"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_encryption_config() {
|
||||||
|
local enabled_lower
|
||||||
|
enabled_lower="$(echo "$RABBIT_CRED_ENCRYPT_ENABLED" | tr '[:upper:]' '[:lower:]')"
|
||||||
|
if [[ "$enabled_lower" == "true" ]]; then
|
||||||
|
pass "rabbit app credential encryption is enabled"
|
||||||
|
if [[ -n "$RABBIT_CRED_SECRET_KEY" ]]; then
|
||||||
|
if [[ ${#RABBIT_CRED_SECRET_KEY} -eq 24 ]]; then
|
||||||
|
pass "rabbit credential secret key length is 24 (DESede)"
|
||||||
|
else
|
||||||
|
warn "rabbit credential secret key length is ${#RABBIT_CRED_SECRET_KEY}, expected 24"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
fail "rabbit credential secret key is empty"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "rabbit app credential encryption disabled"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_standard_assets() {
|
||||||
|
check_file "$STANDARD_CPCONFIG_PATH"
|
||||||
|
check_file "/home/cmep4i/cpackage/toolsh/setfraq.sh"
|
||||||
|
check_file "/home/cmep4i/cpackage/toolsh/setftq.sh"
|
||||||
|
check_file "/home/cmep4i/cpackage/toolsh/setsql.sh"
|
||||||
|
check_file "/home/cmep4i/cpackage/toolsh/setsptp.sh"
|
||||||
|
check_pattern_match "$APP_PATTERN_1"
|
||||||
|
check_pattern_match "$APP_PATTERN_2"
|
||||||
|
check_cmd "rabbitmqctl"
|
||||||
|
check_cmd "rabbitmqadmin"
|
||||||
|
}
|
||||||
|
|
||||||
|
check_direct_assets() {
|
||||||
|
check_file "$STANDARD_CPCONFIG_PATH"
|
||||||
|
check_dir "$DIRECT_DB_SCRIPT_DIR"
|
||||||
|
check_file "$DIRECT_DB_SCRIPT_DIR/setsql.sh"
|
||||||
|
check_dir "$DIRECT_TLQ_INIT_CFG_DIR"
|
||||||
|
check_file "$DIRECT_TLQ_INIT_CFG_DIR/init_cfg.sh"
|
||||||
|
check_cmd "java"
|
||||||
|
check_cmd "rabbitmqctl"
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
echo "[INFO] CISD init precheck started"
|
||||||
|
echo "[INFO] PRODUCT_TYPE=${PRODUCT_TYPE}"
|
||||||
|
echo "[INFO] MODE=${MODE}"
|
||||||
|
echo "[INFO] LOG_DIR=${LOG_DIR}"
|
||||||
|
|
||||||
|
check_product_type
|
||||||
|
check_mode
|
||||||
|
check_writable_dir "$LOG_DIR"
|
||||||
|
check_encryption_config
|
||||||
|
|
||||||
|
if [[ "$PRODUCT_TYPE" == "DIRECT" ]]; then
|
||||||
|
check_direct_assets
|
||||||
|
else
|
||||||
|
check_standard_assets
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[INFO] precheck summary: pass=${pass_count}, warn=${warn_count}, fail=${fail_count}"
|
||||||
|
if (( fail_count > 0 )); then
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
Executable
+118
@@ -0,0 +1,118 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# PCIe real-card smoke test template for internal crypto APIs.
|
||||||
|
# Fill env vars below, then run:
|
||||||
|
# chmod +x scripts/pcie_realcard_smoke.sh
|
||||||
|
# ./scripts/pcie_realcard_smoke.sh
|
||||||
|
|
||||||
|
BASE_URL="${BASE_URL:-http://127.0.0.1:8080}"
|
||||||
|
INTERNAL_TOKEN="${INTERNAL_TOKEN:-change-me-internal-token}"
|
||||||
|
TIMEOUT_SECONDS="${TIMEOUT_SECONDS:-15}"
|
||||||
|
|
||||||
|
# Common algorithm IDs (GM/T 0018 style)
|
||||||
|
ALG_SM3="${ALG_SM3:-1}" # digest/hmac
|
||||||
|
ALG_SM4_ECB="${ALG_SM4_ECB:-1025}" # 0x00000401, symmetric encrypt/decrypt
|
||||||
|
|
||||||
|
# Test payloads
|
||||||
|
PLAINTEXT_B64="${PLAINTEXT_B64:-dG1zLXBjaWUtc21va2U=}" # "tms-pcie-smoke"
|
||||||
|
KEY_16_B64="${KEY_16_B64:-MDEyMzQ1Njc4OWFiY2RlZg==}" # "0123456789abcdef"
|
||||||
|
IV_B64="${IV_B64:-}" # ECB can keep empty
|
||||||
|
|
||||||
|
pass_count=0
|
||||||
|
fail_count=0
|
||||||
|
|
||||||
|
require_cmd() {
|
||||||
|
local cmd="$1"
|
||||||
|
if ! command -v "$cmd" >/dev/null 2>&1; then
|
||||||
|
echo "[FATAL] command not found: $cmd"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
api_get() {
|
||||||
|
local path="$1"
|
||||||
|
curl -sS --max-time "${TIMEOUT_SECONDS}" \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
"${BASE_URL}${path}"
|
||||||
|
}
|
||||||
|
|
||||||
|
api_post() {
|
||||||
|
local path="$1"
|
||||||
|
local body="$2"
|
||||||
|
curl -sS --max-time "${TIMEOUT_SECONDS}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "X-Internal-Token: ${INTERNAL_TOKEN}" \
|
||||||
|
-X POST \
|
||||||
|
"${BASE_URL}${path}" \
|
||||||
|
-d "${body}"
|
||||||
|
}
|
||||||
|
|
||||||
|
assert_success() {
|
||||||
|
local name="$1"
|
||||||
|
local resp="$2"
|
||||||
|
if echo "${resp}" | jq -e '.success == true and .code == 200' >/dev/null 2>&1; then
|
||||||
|
echo "[PASS] ${name}"
|
||||||
|
pass_count=$((pass_count + 1))
|
||||||
|
else
|
||||||
|
echo "[FAIL] ${name}"
|
||||||
|
echo " response: ${resp}"
|
||||||
|
fail_count=$((fail_count + 1))
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
run_case_get() {
|
||||||
|
local name="$1"
|
||||||
|
local path="$2"
|
||||||
|
local resp
|
||||||
|
resp="$(api_get "${path}")"
|
||||||
|
assert_success "${name}" "${resp}"
|
||||||
|
}
|
||||||
|
|
||||||
|
run_case_post() {
|
||||||
|
local name="$1"
|
||||||
|
local path="$2"
|
||||||
|
local body="$3"
|
||||||
|
local resp
|
||||||
|
resp="$(api_post "${path}" "${body}")"
|
||||||
|
assert_success "${name}" "${resp}"
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
require_cmd curl
|
||||||
|
require_cmd jq
|
||||||
|
|
||||||
|
echo "[INFO] BASE_URL=${BASE_URL}"
|
||||||
|
echo "[INFO] starting smoke tests..."
|
||||||
|
|
||||||
|
run_case_get "device-count" "/api/v1/device/crypto/device-count"
|
||||||
|
run_case_get "device-info" "/api/v1/device/crypto/device-info"
|
||||||
|
run_case_post "self-test" "/api/v1/device/crypto/self-test" "{}"
|
||||||
|
run_case_get "random-16" "/api/v1/device/crypto/random?length=16"
|
||||||
|
|
||||||
|
run_case_post "digest-sm3" "/api/v1/device/crypto/digest" "$(cat <<JSON
|
||||||
|
{"algId":${ALG_SM3},"dataBase64":"${PLAINTEXT_B64}","outBufferSize":64}
|
||||||
|
JSON
|
||||||
|
)"
|
||||||
|
|
||||||
|
run_case_post "hmac-sm3" "/api/v1/device/crypto/hmac" "$(cat <<JSON
|
||||||
|
{"algId":${ALG_SM3},"keyBase64":"${KEY_16_B64}","dataBase64":"${PLAINTEXT_B64}"}
|
||||||
|
JSON
|
||||||
|
)"
|
||||||
|
|
||||||
|
run_case_post "encrypt-plain-sm4" "/api/v1/device/crypto/encrypt/plain" "$(cat <<JSON
|
||||||
|
{"algId":${ALG_SM4_ECB},"keyBase64":"${KEY_16_B64}","ivBase64":"${IV_B64}","dataBase64":"${PLAINTEXT_B64}","outBufferSize":256}
|
||||||
|
JSON
|
||||||
|
)"
|
||||||
|
|
||||||
|
run_case_post "kek-generate-128" "/api/v1/device/crypto/kek/generate" '{"keyBits":128,"keyIndex":1}'
|
||||||
|
run_case_get "kek-status-1" "/api/v1/device/crypto/kek/status?keyIndex=1"
|
||||||
|
run_case_get "lmk-seed-mac" "/api/v1/device/crypto/lmk/seed-mac"
|
||||||
|
|
||||||
|
echo "[INFO] smoke tests completed: pass=${pass_count}, fail=${fail_count}"
|
||||||
|
if [ "${fail_count}" -gt 0 ]; then
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
Executable
+189
@@ -0,0 +1,189 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# TMS runtime script for jar deployment.
|
||||||
|
# Commands:
|
||||||
|
# ./scripts/tms.sh start
|
||||||
|
# ./scripts/tms.sh stop
|
||||||
|
# ./scripts/tms.sh restart
|
||||||
|
# ./scripts/tms.sh status
|
||||||
|
#
|
||||||
|
# External config:
|
||||||
|
# ${APP_HOME}/config/application.yml
|
||||||
|
# ${APP_HOME}/config/application-${SPRING_PROFILES_ACTIVE}.yml
|
||||||
|
|
||||||
|
DEFAULT_APP_HOME="/home/tms"
|
||||||
|
APP_HOME="${APP_HOME:-${DEFAULT_APP_HOME}}"
|
||||||
|
APP_NAME="${APP_NAME:-tms-framework}"
|
||||||
|
RUN_DIR="${RUN_DIR:-${APP_HOME}/run}"
|
||||||
|
LOG_DIR="${LOG_DIR:-${APP_HOME}/logs}"
|
||||||
|
CONF_DIR="${CONF_DIR:-${APP_HOME}/config}"
|
||||||
|
PID_FILE="${PID_FILE:-${RUN_DIR}/${APP_NAME}.pid}"
|
||||||
|
OUT_LOG="${OUT_LOG:-${LOG_DIR}/${APP_NAME}.out.log}"
|
||||||
|
ERR_LOG="${ERR_LOG:-${LOG_DIR}/${APP_NAME}.err.log}"
|
||||||
|
|
||||||
|
SPRING_PROFILES_ACTIVE="${SPRING_PROFILES_ACTIVE:-prod}"
|
||||||
|
JAVA_BIN="${JAVA_BIN:-java}"
|
||||||
|
JAVA_OPTS="${JAVA_OPTS:- -Xms512m -Xmx1024m}"
|
||||||
|
ALLOW_MISSING_EXTERNAL_CONFIG="${ALLOW_MISSING_EXTERNAL_CONFIG:-false}"
|
||||||
|
|
||||||
|
JAR_PATH="${JAR_PATH:-${APP_HOME}/${APP_NAME}.jar}"
|
||||||
|
|
||||||
|
ensure_dirs() {
|
||||||
|
mkdir -p "${RUN_DIR}" "${LOG_DIR}" "${CONF_DIR}"
|
||||||
|
}
|
||||||
|
|
||||||
|
resolve_jar_path() {
|
||||||
|
if [[ -f "${JAR_PATH}" ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
local found
|
||||||
|
found="$(ls -1 "${APP_HOME}/target/${APP_NAME}"-*.jar 2>/dev/null | grep -vE '(sources|javadoc|original)' | head -n1 || true)"
|
||||||
|
if [[ -n "${found}" ]]; then
|
||||||
|
JAR_PATH="${found}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
echo "[FATAL] jar not found. set JAR_PATH or place jar at ${APP_HOME}/${APP_NAME}.jar"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
check_external_config() {
|
||||||
|
local base_cfg="${CONF_DIR}/application.yml"
|
||||||
|
if [[ "${ALLOW_MISSING_EXTERNAL_CONFIG}" != "true" && ! -f "${base_cfg}" ]]; then
|
||||||
|
echo "[FATAL] external config missing: ${base_cfg}"
|
||||||
|
echo "Copy template: cp ${APP_HOME}/config/application.yml.example ${base_cfg}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
is_running() {
|
||||||
|
if [[ ! -f "${PID_FILE}" ]]; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
local pid
|
||||||
|
pid="$(cat "${PID_FILE}")"
|
||||||
|
if [[ -z "${pid}" ]]; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
if kill -0 "${pid}" >/dev/null 2>&1; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
start_app() {
|
||||||
|
ensure_dirs
|
||||||
|
resolve_jar_path
|
||||||
|
check_external_config
|
||||||
|
|
||||||
|
if is_running; then
|
||||||
|
echo "[INFO] ${APP_NAME} already running, pid=$(cat "${PID_FILE}")"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
local cfg_location
|
||||||
|
cfg_location="optional:file:${CONF_DIR}/"
|
||||||
|
|
||||||
|
echo "[INFO] starting ${APP_NAME}"
|
||||||
|
echo "[INFO] app home: ${APP_HOME}"
|
||||||
|
echo "[INFO] jar path: ${JAR_PATH}"
|
||||||
|
echo "[INFO] profile: ${SPRING_PROFILES_ACTIVE}"
|
||||||
|
echo "[INFO] external config dir: ${CONF_DIR}"
|
||||||
|
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
nohup "${JAVA_BIN}" ${JAVA_OPTS} \
|
||||||
|
-jar "${JAR_PATH}" \
|
||||||
|
--spring.profiles.active="${SPRING_PROFILES_ACTIVE}" \
|
||||||
|
--spring.config.additional-location="${cfg_location}" \
|
||||||
|
>"${OUT_LOG}" 2>"${ERR_LOG}" &
|
||||||
|
|
||||||
|
local pid="$!"
|
||||||
|
echo "${pid}" > "${PID_FILE}"
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
if kill -0 "${pid}" >/dev/null 2>&1; then
|
||||||
|
echo "[INFO] started, pid=${pid}"
|
||||||
|
echo "[INFO] out log: ${OUT_LOG}"
|
||||||
|
echo "[INFO] err log: ${ERR_LOG}"
|
||||||
|
else
|
||||||
|
echo "[ERROR] start failed, check logs"
|
||||||
|
rm -f "${PID_FILE}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
stop_app() {
|
||||||
|
if ! is_running; then
|
||||||
|
echo "[INFO] ${APP_NAME} not running"
|
||||||
|
rm -f "${PID_FILE}" || true
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
local pid
|
||||||
|
pid="$(cat "${PID_FILE}")"
|
||||||
|
echo "[INFO] stopping ${APP_NAME}, pid=${pid}"
|
||||||
|
kill "${pid}" >/dev/null 2>&1 || true
|
||||||
|
|
||||||
|
local i
|
||||||
|
for i in $(seq 1 20); do
|
||||||
|
if ! kill -0 "${pid}" >/dev/null 2>&1; then
|
||||||
|
rm -f "${PID_FILE}" || true
|
||||||
|
echo "[INFO] stopped"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "[WARN] graceful stop timeout, force kill pid=${pid}"
|
||||||
|
kill -9 "${pid}" >/dev/null 2>&1 || true
|
||||||
|
rm -f "${PID_FILE}" || true
|
||||||
|
echo "[INFO] stopped(force)"
|
||||||
|
}
|
||||||
|
|
||||||
|
status_app() {
|
||||||
|
if is_running; then
|
||||||
|
echo "[INFO] ${APP_NAME} is running, pid=$(cat "${PID_FILE}")"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
echo "[INFO] ${APP_NAME} is not running"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
cat <<EOF
|
||||||
|
Usage: $0 {start|stop|restart|status}
|
||||||
|
|
||||||
|
Environment variables:
|
||||||
|
APP_HOME default: /home/tms
|
||||||
|
APP_NAME default: tms-framework
|
||||||
|
JAR_PATH default: <app_home>/tms-framework.jar
|
||||||
|
CONF_DIR default: <app_home>/config
|
||||||
|
RUN_DIR default: <app_home>/run
|
||||||
|
LOG_DIR default: <app_home>/logs
|
||||||
|
SPRING_PROFILES_ACTIVE default: prod
|
||||||
|
JAVA_BIN default: java
|
||||||
|
JAVA_OPTS default: -Xms512m -Xmx1024m
|
||||||
|
ALLOW_MISSING_EXTERNAL_CONFIG default: false
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd="${1:-}"
|
||||||
|
case "${cmd}" in
|
||||||
|
start)
|
||||||
|
start_app
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
stop_app
|
||||||
|
;;
|
||||||
|
restart)
|
||||||
|
stop_app
|
||||||
|
start_app
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
status_app
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
usage
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package com.cisd.tms.common.config.properties;
|
||||||
|
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
|
||||||
|
@ConfigurationProperties(prefix = "tms.cisd.preset")
|
||||||
|
public class CisdPresetProperties {
|
||||||
|
|
||||||
|
private String productType;
|
||||||
|
private String version;
|
||||||
|
private String source = "CONFIG";
|
||||||
|
|
||||||
|
public String getProductType() {
|
||||||
|
return productType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProductType(String productType) {
|
||||||
|
this.productType = productType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getVersion() {
|
||||||
|
return version;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVersion(String version) {
|
||||||
|
this.version = version;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSource() {
|
||||||
|
return source;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSource(String source) {
|
||||||
|
this.source = source;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package com.cisd.tms.integration.crypto.pcie;
|
||||||
|
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GM/T 0018 (and common SDF deployments) algorithm identifiers.
|
||||||
|
*/
|
||||||
|
public final class Gm0018AlgorithmIds {
|
||||||
|
|
||||||
|
private Gm0018AlgorithmIds() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final int SM1_ECB = 0x00000101;
|
||||||
|
public static final int SM1_CBC = 0x00000102;
|
||||||
|
public static final int SM1_CFB = 0x00000104;
|
||||||
|
public static final int SM1_OFB = 0x00000108;
|
||||||
|
public static final int SM1_MAC = 0x00000110;
|
||||||
|
|
||||||
|
public static final int SSF33_ECB = 0x00000201;
|
||||||
|
public static final int SSF33_CBC = 0x00000202;
|
||||||
|
public static final int SSF33_CFB = 0x00000204;
|
||||||
|
public static final int SSF33_OFB = 0x00000208;
|
||||||
|
public static final int SSF33_MAC = 0x00000210;
|
||||||
|
|
||||||
|
public static final int SM4_ECB = 0x00000401;
|
||||||
|
public static final int SM4_CBC = 0x00000402;
|
||||||
|
public static final int SM4_CFB = 0x00000404;
|
||||||
|
public static final int SM4_OFB = 0x00000408;
|
||||||
|
public static final int SM4_MAC = 0x00000410;
|
||||||
|
|
||||||
|
public static final int RSA_SIGN = 0x00010001;
|
||||||
|
public static final int RSA_ENCRYPT = 0x00010002;
|
||||||
|
|
||||||
|
public static final int SM2_SIGN = 0x00020100;
|
||||||
|
public static final int SM2_KEY_EXCHANGE = 0x00020200;
|
||||||
|
public static final int SM2_ENCRYPT = 0x00020400;
|
||||||
|
|
||||||
|
public static final int SM3 = 0x00000001;
|
||||||
|
public static final int SHA1 = 0x00000002;
|
||||||
|
public static final int SHA256 = 0x00000004;
|
||||||
|
|
||||||
|
private static final Set<Integer> SUPPORTED = Set.of(
|
||||||
|
SM1_ECB, SM1_CBC, SM1_CFB, SM1_OFB, SM1_MAC,
|
||||||
|
SSF33_ECB, SSF33_CBC, SSF33_CFB, SSF33_OFB, SSF33_MAC,
|
||||||
|
SM4_ECB, SM4_CBC, SM4_CFB, SM4_OFB, SM4_MAC,
|
||||||
|
RSA_SIGN, RSA_ENCRYPT,
|
||||||
|
SM2_SIGN, SM2_KEY_EXCHANGE, SM2_ENCRYPT,
|
||||||
|
SM3, SHA1, SHA256
|
||||||
|
);
|
||||||
|
|
||||||
|
public static boolean isSupported(int algId) {
|
||||||
|
return SUPPORTED.contains(algId);
|
||||||
|
}
|
||||||
|
}
|
||||||
+12
-4
@@ -89,6 +89,7 @@ public class JnaPcieCryptoService implements PcieCryptoService {
|
|||||||
|
|
||||||
private static final int ECC_KEY_BITS = 256;
|
private static final int ECC_KEY_BITS = 256;
|
||||||
private static final int LMK_SEED_MAC_LENGTH = 8;
|
private static final int LMK_SEED_MAC_LENGTH = 8;
|
||||||
|
private static final int SDFE_INIT_STATUS_LOW_BYTE = 0x25;
|
||||||
private static final int HMAC_MAX_LENGTH = 64;
|
private static final int HMAC_MAX_LENGTH = 64;
|
||||||
private static final int ECC_CIPHER_PREFIX_LENGTH = (EccRefPublicKey.MAX_LEN * 2) + 32 + Integer.BYTES;
|
private static final int ECC_CIPHER_PREFIX_LENGTH = (EccRefPublicKey.MAX_LEN * 2) + 32 + Integer.BYTES;
|
||||||
|
|
||||||
@@ -1582,10 +1583,17 @@ public class JnaPcieCryptoService implements PcieCryptoService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void checkLmk() {
|
public boolean checkLmk() {
|
||||||
sessionTemplate.withSession("SDFE_CheckLMK", (lib, deviceHandle, sessionHandle) -> {
|
return sessionTemplate.withSession("SDFE_CheckLMK", (lib, deviceHandle, sessionHandle) -> {
|
||||||
sessionTemplate.ensureSuccess("SDFE_CheckLMK", lib.SDFE_CheckLMK(sessionHandle));
|
int retCode = lib.SDFE_CheckLMK(sessionHandle);
|
||||||
return null;
|
if (retCode == 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if ((retCode & 0xFF) == SDFE_INIT_STATUS_LOW_BYTE) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
sessionTemplate.ensureSuccess("SDFE_CheckLMK", retCode);
|
||||||
|
return false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -669,8 +669,8 @@ public class MockPcieCryptoService implements PcieCryptoService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void checkLmk() {
|
public boolean checkLmk() {
|
||||||
// no-op
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ public interface PcieCryptoService {
|
|||||||
|
|
||||||
void destroyLmk();
|
void destroyLmk();
|
||||||
|
|
||||||
void checkLmk();
|
boolean checkLmk();
|
||||||
|
|
||||||
byte[] exportLmkSeedMac();
|
byte[] exportLmkSeedMac();
|
||||||
|
|
||||||
|
|||||||
@@ -223,6 +223,11 @@ public class CryptoCardInternalController {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/lmk/check")
|
||||||
|
public ApiResponse<Boolean> checkLmk() {
|
||||||
|
return ApiResponse.success(pcieCryptoService.checkLmk());
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("/std/keypair/rsa")
|
@PostMapping("/std/keypair/rsa")
|
||||||
public ApiResponse<Map<String, Object>> generateStandardRsaKeyPair(
|
public ApiResponse<Map<String, Object>> generateStandardRsaKeyPair(
|
||||||
@Valid @RequestBody CryptoGenerateStandardRsaKeyPairInternalRequest request
|
@Valid @RequestBody CryptoGenerateStandardRsaKeyPairInternalRequest request
|
||||||
|
|||||||
@@ -25,6 +25,11 @@ public class DeviceInternalController {
|
|||||||
return ApiResponse.success(deviceService.info());
|
return ApiResponse.success(deviceService.info());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/status")
|
||||||
|
public ApiResponse<DeviceInfoResponse> status() {
|
||||||
|
return ApiResponse.success(deviceService.info());
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("/restart")
|
@PostMapping("/restart")
|
||||||
public ApiResponse<DeviceActionResponse> restart(@RequestHeader(value = "X-User", required = false) String operator) {
|
public ApiResponse<DeviceActionResponse> restart(@RequestHeader(value = "X-User", required = false) String operator) {
|
||||||
return ApiResponse.success(deviceService.restart(operator));
|
return ApiResponse.success(deviceService.restart(operator));
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ public class DeviceInfoResponse {
|
|||||||
private String deviceId;
|
private String deviceId;
|
||||||
private String status;
|
private String status;
|
||||||
private String version;
|
private String version;
|
||||||
|
private String presetProductType;
|
||||||
|
private String presetVersion;
|
||||||
|
private String presetSource;
|
||||||
|
|
||||||
public String getDeviceId() {
|
public String getDeviceId() {
|
||||||
return deviceId;
|
return deviceId;
|
||||||
@@ -29,4 +32,28 @@ public class DeviceInfoResponse {
|
|||||||
public void setVersion(String version) {
|
public void setVersion(String version) {
|
||||||
this.version = version;
|
this.version = version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getPresetProductType() {
|
||||||
|
return presetProductType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPresetProductType(String presetProductType) {
|
||||||
|
this.presetProductType = presetProductType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPresetVersion() {
|
||||||
|
return presetVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPresetVersion(String presetVersion) {
|
||||||
|
this.presetVersion = presetVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPresetSource() {
|
||||||
|
return presetSource;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPresetSource(String presetSource) {
|
||||||
|
this.presetSource = presetSource;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.cisd.tms.modules.device.service;
|
package com.cisd.tms.modules.device.service;
|
||||||
|
|
||||||
|
import com.cisd.tms.common.config.properties.CisdPresetProperties;
|
||||||
import com.cisd.tms.modules.device.dto.DeviceActionResponse;
|
import com.cisd.tms.modules.device.dto.DeviceActionResponse;
|
||||||
import com.cisd.tms.modules.device.dto.DeviceInfoResponse;
|
import com.cisd.tms.modules.device.dto.DeviceInfoResponse;
|
||||||
import com.cisd.tms.modules.device.entity.DeviceNodeEntity;
|
import com.cisd.tms.modules.device.entity.DeviceNodeEntity;
|
||||||
@@ -11,9 +12,11 @@ import org.springframework.stereotype.Service;
|
|||||||
public class DeviceService {
|
public class DeviceService {
|
||||||
|
|
||||||
private final DeviceNodeRepository deviceNodeRepository;
|
private final DeviceNodeRepository deviceNodeRepository;
|
||||||
|
private final CisdPresetProperties cisdPresetProperties;
|
||||||
|
|
||||||
public DeviceService(DeviceNodeRepository deviceNodeRepository) {
|
public DeviceService(DeviceNodeRepository deviceNodeRepository, CisdPresetProperties cisdPresetProperties) {
|
||||||
this.deviceNodeRepository = deviceNodeRepository;
|
this.deviceNodeRepository = deviceNodeRepository;
|
||||||
|
this.cisdPresetProperties = cisdPresetProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DeviceInfoResponse info() {
|
public DeviceInfoResponse info() {
|
||||||
@@ -24,12 +27,15 @@ public class DeviceService {
|
|||||||
response.setDeviceId("cisd-all-in-one-001");
|
response.setDeviceId("cisd-all-in-one-001");
|
||||||
response.setStatus("RUNNING");
|
response.setStatus("RUNNING");
|
||||||
response.setVersion("0.0.1-SNAPSHOT");
|
response.setVersion("0.0.1-SNAPSHOT");
|
||||||
return response;
|
} else {
|
||||||
|
response.setDeviceId(entity.getNodeId());
|
||||||
|
response.setStatus(entity.getStatus());
|
||||||
|
response.setVersion("db-loaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
response.setDeviceId(entity.getNodeId());
|
response.setPresetProductType(cisdPresetProperties.getProductType());
|
||||||
response.setStatus(entity.getStatus());
|
response.setPresetVersion(cisdPresetProperties.getVersion());
|
||||||
response.setVersion("db-loaded");
|
response.setPresetSource(cisdPresetProperties.getSource());
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package com.cisd.tms.modules.init.config;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class InitCommandProfileService {
|
||||||
|
|
||||||
|
private static final String PROFILE_RESOURCE = "initplan/step-command-profiles.json";
|
||||||
|
private static final String STANDARD_HOME_DIR_PLACEHOLDER = "{{STANDARD_HOME_DIR}}";
|
||||||
|
|
||||||
|
private final Map<String, Map<String, Map<String, String>>> profileMap;
|
||||||
|
private final InitExecutorProperties initExecutorProperties;
|
||||||
|
|
||||||
|
public InitCommandProfileService(ObjectMapper objectMapper, InitExecutorProperties initExecutorProperties) {
|
||||||
|
this.profileMap = load(objectMapper);
|
||||||
|
this.initExecutorProperties = initExecutorProperties;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据 productType + mqType + stepCode 解析最终执行命令。
|
||||||
|
* 若 profile 未命中，回退为 internal:: 逻辑步骤，交由执行器走模拟/内置处理。
|
||||||
|
*/
|
||||||
|
public String resolveCommand(String productType, String mqType, String stepCode) {
|
||||||
|
String p = normalizeUpper(productType);
|
||||||
|
String m = normalizeUpper(mqType);
|
||||||
|
String s = normalizeUpper(stepCode);
|
||||||
|
|
||||||
|
String command = profileMap
|
||||||
|
.getOrDefault(p, Collections.emptyMap())
|
||||||
|
.getOrDefault(m, Collections.emptyMap())
|
||||||
|
.get(s);
|
||||||
|
|
||||||
|
if (command == null || command.isBlank()) {
|
||||||
|
return "internal::" + stepCode.toLowerCase(Locale.ROOT);
|
||||||
|
}
|
||||||
|
return interpolate(command);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<String, Map<String, Map<String, String>>> load(ObjectMapper objectMapper) {
|
||||||
|
try (InputStream input = InitCommandProfileService.class.getClassLoader().getResourceAsStream(PROFILE_RESOURCE)) {
|
||||||
|
if (input == null) {
|
||||||
|
throw new IllegalStateException("missing command profile resource: " + PROFILE_RESOURCE);
|
||||||
|
}
|
||||||
|
// JSON 结构：{productType:{mqType:{stepCode:command}}}
|
||||||
|
TypeReference<Map<String, Map<String, Map<String, String>>>> typeRef =
|
||||||
|
new TypeReference<>() {
|
||||||
|
};
|
||||||
|
Map<String, Map<String, Map<String, String>>> map = objectMapper.readValue(input, typeRef);
|
||||||
|
return map == null ? Collections.emptyMap() : map;
|
||||||
|
} catch (IOException ex) {
|
||||||
|
throw new IllegalStateException("failed to load command profile resource: " + PROFILE_RESOURCE, ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String normalizeUpper(String value) {
|
||||||
|
return value == null ? "" : value.trim().toUpperCase(Locale.ROOT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String interpolate(String rawCommand) {
|
||||||
|
String standardHomeDir = normalize(initExecutorProperties.getStandardHomeDir());
|
||||||
|
if (standardHomeDir.isEmpty()) {
|
||||||
|
standardHomeDir = "/home/cemp4i";
|
||||||
|
}
|
||||||
|
return rawCommand.replace(STANDARD_HOME_DIR_PLACEHOLDER, standardHomeDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String normalize(String value) {
|
||||||
|
return value == null ? "" : value.trim();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,298 @@
|
|||||||
|
package com.cisd.tms.modules.init.config;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
|
||||||
|
@ConfigurationProperties(prefix = "tms.init.executor")
|
||||||
|
public class InitExecutorProperties {
|
||||||
|
|
||||||
|
public enum Mode {
|
||||||
|
SIMULATE,
|
||||||
|
LOCAL
|
||||||
|
}
|
||||||
|
|
||||||
|
private Mode mode = Mode.SIMULATE;
|
||||||
|
private int timeoutSec = 600;
|
||||||
|
// 所有步骤日志会写入该目录，读取日志接口会做同目录约束校验
|
||||||
|
private String logDir = "/tmp/tms-init-logs";
|
||||||
|
// 标准版（企业/间参）安装根目录（统一入口）
|
||||||
|
private String standardHomeDir = "/home/cemp4i";
|
||||||
|
// 标准版（企业/间参）默认 cpconfig.cfg 路径
|
||||||
|
private String standardCpconfigPath = "/home/cemp4i/cpconfig.cfg";
|
||||||
|
// 直参版 cfgZipFileId 对应目录下的 cpconfig 文件名
|
||||||
|
private String directCpconfigFileName = "cpconfig.cfg";
|
||||||
|
// 上传文件基础目录（fileId->文件路径解析时使用）
|
||||||
|
private String uploadBaseDir = "/home/tms/uploads";
|
||||||
|
// 初始化阶段文件暂存目录（除固定落位文件外，均先暂存再使用）
|
||||||
|
private String stagingRootDir = "/tmp/tms-init-staging";
|
||||||
|
// 标准版收发器 license 固定落位
|
||||||
|
private String standardReceiverLicenseTargetPath = "/home/cemp4i/cmep/license/cmep.license";
|
||||||
|
// 直参版收发器 license 固定落位
|
||||||
|
private String directReceiverLicenseTargetPath = "/home/cmep4d/cmep/license/cmep.license";
|
||||||
|
// 标准版 TLQ license（tlqconf.zip）固定落位
|
||||||
|
private String standardTlqLicenseTargetPath = "/home/tlq/tlqconf.zip";
|
||||||
|
// 直参版 TLQ license（license.dat）固定落位
|
||||||
|
private String directTlqLicenseTargetPath = "/home/tlq/TLQ8/license.dat";
|
||||||
|
// 直参版脚本执行前，会将渲染后的 cpconfig.cfg 同步到该路径（供官方脚本按固定相对路径读取）
|
||||||
|
private String directCpconfigTargetPath = "/opt/cpconfig.cfg";
|
||||||
|
// 直参版数据库初始化脚本目录
|
||||||
|
private String directDbScriptDir = "/opt/CAE_Install_Base_Resource/DB";
|
||||||
|
// 直参版 TLQ init_cfg.sh 脚本目录
|
||||||
|
private String directTlqInitCfgDir = "/opt/CAE_Install_App_Resource/CAE";
|
||||||
|
// CFMQ 配置落地目录（为空表示只做文件存在校验，不做拷贝）
|
||||||
|
private String cfmqTargetDir = "/pmts/cfg";
|
||||||
|
// RabbitMQ 管理员账号（预制）
|
||||||
|
private String rabbitAdminUsername = "admin";
|
||||||
|
private String rabbitAdminPassword = "admin";
|
||||||
|
// RabbitMQ 管理命令路径
|
||||||
|
private String rabbitmqCtlCommand = "rabbitmqctl";
|
||||||
|
private String rabbitmqAdminCommand = "/usr/sbin/rabbitmqadmin";
|
||||||
|
// 标准版 RabbitMQ 初始化脚本（创建admin/通道账号、替换队列脚本机构号）
|
||||||
|
private String standardRabbitSetupScriptPath = "/home/cemp4i/cpackage/rabq/setuprabq.sh";
|
||||||
|
// 标准版 RabbitMQ 队列初始化脚本（01节点）
|
||||||
|
private String standardRabbitQueueScriptPath = "/home/cemp4i/cpackage/rabq/addrabq_R_01.sh";
|
||||||
|
// 标准版 RabbitMQ 队列初始化脚本（02节点）
|
||||||
|
private String standardRabbitQueueScriptPath02 = "/home/cemp4i/cpackage/rabq/addrabq_R_02.sh";
|
||||||
|
// 队列和通道账号默认配置 vhost
|
||||||
|
private String rabbitVhost = "/RQ";
|
||||||
|
// 标准版应用 RabbitMQ 连接配置文件（支持文件名通配符）
|
||||||
|
private List<String> standardRabbitAppConfigPatterns = List.of(
|
||||||
|
"/home/cemp4i/cmsp/application-prd*.properties",
|
||||||
|
"/home/cemp4i/cmtp/application-prd*.properties"
|
||||||
|
);
|
||||||
|
// 标准版应用 RabbitMQ 连接账号/密码写回时是否加密
|
||||||
|
private boolean standardRabbitCredentialEncryptEnabled = true;
|
||||||
|
// 加密密钥，默认与官方 encrypt-decrypt.jar 保持一致
|
||||||
|
private String standardRabbitCredentialSecretKey = "ABCDEFGHIJKLMN1234567890";
|
||||||
|
// LOCAL 模式命令白名单前缀；仅命中前缀的命令允许执行
|
||||||
|
private List<String> whitelistPrefixes = List.of(
|
||||||
|
"bash /home/cemp4i/cpackage/",
|
||||||
|
"bash /opt/CAE_Install_",
|
||||||
|
"systemctl ",
|
||||||
|
"echo "
|
||||||
|
);
|
||||||
|
|
||||||
|
public Mode getMode() {
|
||||||
|
return mode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMode(Mode mode) {
|
||||||
|
this.mode = mode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getTimeoutSec() {
|
||||||
|
return timeoutSec;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTimeoutSec(int timeoutSec) {
|
||||||
|
this.timeoutSec = timeoutSec;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogDir() {
|
||||||
|
return logDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogDir(String logDir) {
|
||||||
|
this.logDir = logDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStandardHomeDir() {
|
||||||
|
return standardHomeDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardHomeDir(String standardHomeDir) {
|
||||||
|
this.standardHomeDir = standardHomeDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getWhitelistPrefixes() {
|
||||||
|
return whitelistPrefixes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWhitelistPrefixes(List<String> whitelistPrefixes) {
|
||||||
|
this.whitelistPrefixes = whitelistPrefixes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStandardCpconfigPath() {
|
||||||
|
return standardCpconfigPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardCpconfigPath(String standardCpconfigPath) {
|
||||||
|
this.standardCpconfigPath = standardCpconfigPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDirectCpconfigFileName() {
|
||||||
|
return directCpconfigFileName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDirectCpconfigFileName(String directCpconfigFileName) {
|
||||||
|
this.directCpconfigFileName = directCpconfigFileName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUploadBaseDir() {
|
||||||
|
return uploadBaseDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUploadBaseDir(String uploadBaseDir) {
|
||||||
|
this.uploadBaseDir = uploadBaseDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStagingRootDir() {
|
||||||
|
return stagingRootDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStagingRootDir(String stagingRootDir) {
|
||||||
|
this.stagingRootDir = stagingRootDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStandardReceiverLicenseTargetPath() {
|
||||||
|
return standardReceiverLicenseTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardReceiverLicenseTargetPath(String standardReceiverLicenseTargetPath) {
|
||||||
|
this.standardReceiverLicenseTargetPath = standardReceiverLicenseTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDirectReceiverLicenseTargetPath() {
|
||||||
|
return directReceiverLicenseTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDirectReceiverLicenseTargetPath(String directReceiverLicenseTargetPath) {
|
||||||
|
this.directReceiverLicenseTargetPath = directReceiverLicenseTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStandardTlqLicenseTargetPath() {
|
||||||
|
return standardTlqLicenseTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardTlqLicenseTargetPath(String standardTlqLicenseTargetPath) {
|
||||||
|
this.standardTlqLicenseTargetPath = standardTlqLicenseTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDirectTlqLicenseTargetPath() {
|
||||||
|
return directTlqLicenseTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDirectTlqLicenseTargetPath(String directTlqLicenseTargetPath) {
|
||||||
|
this.directTlqLicenseTargetPath = directTlqLicenseTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCfmqTargetDir() {
|
||||||
|
return cfmqTargetDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCfmqTargetDir(String cfmqTargetDir) {
|
||||||
|
this.cfmqTargetDir = cfmqTargetDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDirectCpconfigTargetPath() {
|
||||||
|
return directCpconfigTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDirectCpconfigTargetPath(String directCpconfigTargetPath) {
|
||||||
|
this.directCpconfigTargetPath = directCpconfigTargetPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDirectDbScriptDir() {
|
||||||
|
return directDbScriptDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDirectDbScriptDir(String directDbScriptDir) {
|
||||||
|
this.directDbScriptDir = directDbScriptDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDirectTlqInitCfgDir() {
|
||||||
|
return directTlqInitCfgDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDirectTlqInitCfgDir(String directTlqInitCfgDir) {
|
||||||
|
this.directTlqInitCfgDir = directTlqInitCfgDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRabbitAdminUsername() {
|
||||||
|
return rabbitAdminUsername;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRabbitAdminUsername(String rabbitAdminUsername) {
|
||||||
|
this.rabbitAdminUsername = rabbitAdminUsername;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRabbitAdminPassword() {
|
||||||
|
return rabbitAdminPassword;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRabbitAdminPassword(String rabbitAdminPassword) {
|
||||||
|
this.rabbitAdminPassword = rabbitAdminPassword;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRabbitmqCtlCommand() {
|
||||||
|
return rabbitmqCtlCommand;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRabbitmqCtlCommand(String rabbitmqCtlCommand) {
|
||||||
|
this.rabbitmqCtlCommand = rabbitmqCtlCommand;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRabbitmqAdminCommand() {
|
||||||
|
return rabbitmqAdminCommand;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRabbitmqAdminCommand(String rabbitmqAdminCommand) {
|
||||||
|
this.rabbitmqAdminCommand = rabbitmqAdminCommand;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStandardRabbitSetupScriptPath() {
|
||||||
|
return standardRabbitSetupScriptPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardRabbitSetupScriptPath(String standardRabbitSetupScriptPath) {
|
||||||
|
this.standardRabbitSetupScriptPath = standardRabbitSetupScriptPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStandardRabbitQueueScriptPath() {
|
||||||
|
return standardRabbitQueueScriptPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardRabbitQueueScriptPath(String standardRabbitQueueScriptPath) {
|
||||||
|
this.standardRabbitQueueScriptPath = standardRabbitQueueScriptPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStandardRabbitQueueScriptPath02() {
|
||||||
|
return standardRabbitQueueScriptPath02;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardRabbitQueueScriptPath02(String standardRabbitQueueScriptPath02) {
|
||||||
|
this.standardRabbitQueueScriptPath02 = standardRabbitQueueScriptPath02;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRabbitVhost() {
|
||||||
|
return rabbitVhost;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRabbitVhost(String rabbitVhost) {
|
||||||
|
this.rabbitVhost = rabbitVhost;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getStandardRabbitAppConfigPatterns() {
|
||||||
|
return standardRabbitAppConfigPatterns;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardRabbitAppConfigPatterns(List<String> standardRabbitAppConfigPatterns) {
|
||||||
|
this.standardRabbitAppConfigPatterns = standardRabbitAppConfigPatterns;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isStandardRabbitCredentialEncryptEnabled() {
|
||||||
|
return standardRabbitCredentialEncryptEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardRabbitCredentialEncryptEnabled(boolean standardRabbitCredentialEncryptEnabled) {
|
||||||
|
this.standardRabbitCredentialEncryptEnabled = standardRabbitCredentialEncryptEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStandardRabbitCredentialSecretKey() {
|
||||||
|
return standardRabbitCredentialSecretKey;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStandardRabbitCredentialSecretKey(String standardRabbitCredentialSecretKey) {
|
||||||
|
this.standardRabbitCredentialSecretKey = standardRabbitCredentialSecretKey;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,12 +1,19 @@
|
|||||||
package com.cisd.tms.modules.init.controller;
|
package com.cisd.tms.modules.init.controller;
|
||||||
|
|
||||||
import com.cisd.tms.common.api.ApiResponse;
|
import com.cisd.tms.common.api.ApiResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitCreateTaskResponse;
|
||||||
import com.cisd.tms.modules.init.dto.InitPlanTemplateResponse;
|
import com.cisd.tms.modules.init.dto.InitPlanTemplateResponse;
|
||||||
import com.cisd.tms.modules.init.dto.InitPreviewRequest;
|
import com.cisd.tms.modules.init.dto.InitPreviewRequest;
|
||||||
import com.cisd.tms.modules.init.dto.InitPreviewResponse;
|
import com.cisd.tms.modules.init.dto.InitPreviewResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskDetailResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskExecuteResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskStepLogResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskStepResponse;
|
||||||
import com.cisd.tms.modules.init.service.InitService;
|
import com.cisd.tms.modules.init.service.InitService;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
|
import java.util.List;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
@@ -23,13 +30,54 @@ public class InitInternalController {
|
|||||||
this.initService = initService;
|
this.initService = initService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 返回初始化模板元信息。
|
||||||
|
* 前端据此识别后端预制版本，并渲染对应版本的初始化页面。
|
||||||
|
*/
|
||||||
@GetMapping("/template")
|
@GetMapping("/template")
|
||||||
public ApiResponse<InitPlanTemplateResponse> template(@RequestParam(required = false) String version) {
|
public ApiResponse<InitPlanTemplateResponse> template(@RequestParam(required = false) String version) {
|
||||||
return ApiResponse.success(initService.loadTemplate(version));
|
return ApiResponse.success(initService.loadTemplate(version));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 初始化预检：仅做参数校验和步骤数量预估，不落库。
|
||||||
|
*/
|
||||||
@PostMapping("/preview")
|
@PostMapping("/preview")
|
||||||
public ApiResponse<InitPreviewResponse> preview(@Valid @RequestBody InitPreviewRequest request) {
|
public ApiResponse<InitPreviewResponse> preview(@Valid @RequestBody InitPreviewRequest request) {
|
||||||
return ApiResponse.success(initService.preview(request));
|
return ApiResponse.success(initService.preview(request));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建初始化任务：写入任务主表和步骤表，状态初始化为 PENDING。
|
||||||
|
*/
|
||||||
|
@PostMapping("/tasks")
|
||||||
|
public ApiResponse<InitCreateTaskResponse> createTask(@Valid @RequestBody InitPreviewRequest request) {
|
||||||
|
return ApiResponse.success(initService.createTask(request));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/tasks/{taskId}")
|
||||||
|
public ApiResponse<InitTaskDetailResponse> taskDetail(@PathVariable String taskId) {
|
||||||
|
return ApiResponse.success(initService.getTask(taskId));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/tasks/{taskId}/steps")
|
||||||
|
public ApiResponse<List<InitTaskStepResponse>> taskSteps(@PathVariable String taskId) {
|
||||||
|
return ApiResponse.success(initService.getTaskSteps(taskId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载单步骤执行日志，用于页面定位失败原因。
|
||||||
|
*/
|
||||||
|
@GetMapping("/tasks/{taskId}/steps/{stepNo}/log")
|
||||||
|
public ApiResponse<InitTaskStepLogResponse> taskStepLog(@PathVariable String taskId, @PathVariable int stepNo) {
|
||||||
|
return ApiResponse.success(initService.getTaskStepLog(taskId, stepNo));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 执行初始化任务：按步骤串行执行，失败即中断。
|
||||||
|
*/
|
||||||
|
@PostMapping("/tasks/{taskId}/execute")
|
||||||
|
public ApiResponse<InitTaskExecuteResponse> executeTask(@PathVariable String taskId) {
|
||||||
|
return ApiResponse.success(initService.executeTask(taskId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package com.cisd.tms.modules.init.dto;
|
||||||
|
|
||||||
|
public class InitCreateTaskResponse {
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
private String status;
|
||||||
|
private String resolvedProductType;
|
||||||
|
private String presetVersion;
|
||||||
|
|
||||||
|
public String getTaskId() {
|
||||||
|
return taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTaskId(String taskId) {
|
||||||
|
this.taskId = taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStatus() {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStatus(String status) {
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getResolvedProductType() {
|
||||||
|
return resolvedProductType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setResolvedProductType(String resolvedProductType) {
|
||||||
|
this.resolvedProductType = resolvedProductType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPresetVersion() {
|
||||||
|
return presetVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPresetVersion(String presetVersion) {
|
||||||
|
this.presetVersion = presetVersion;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,16 +4,25 @@ import java.util.List;
|
|||||||
|
|
||||||
public class InitPlanTemplateResponse {
|
public class InitPlanTemplateResponse {
|
||||||
|
|
||||||
private String version;
|
private String presetProductType;
|
||||||
|
private String presetVersion;
|
||||||
private List<String> supportedVersions;
|
private List<String> supportedVersions;
|
||||||
private String templatePath;
|
private String templatePath;
|
||||||
|
|
||||||
public String getVersion() {
|
public String getPresetProductType() {
|
||||||
return version;
|
return presetProductType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setVersion(String version) {
|
public void setPresetProductType(String presetProductType) {
|
||||||
this.version = version;
|
this.presetProductType = presetProductType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPresetVersion() {
|
||||||
|
return presetVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPresetVersion(String presetVersion) {
|
||||||
|
this.presetVersion = presetVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<String> getSupportedVersions() {
|
public List<String> getSupportedVersions() {
|
||||||
|
|||||||
@@ -1,31 +1,378 @@
|
|||||||
package com.cisd.tms.modules.init.dto;
|
package com.cisd.tms.modules.init.dto;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
import jakarta.validation.constraints.Max;
|
import jakarta.validation.constraints.Max;
|
||||||
import jakarta.validation.constraints.Min;
|
import jakarta.validation.constraints.Min;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import jakarta.validation.constraints.Pattern;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
|
|
||||||
public class InitPreviewRequest {
|
public class InitPreviewRequest {
|
||||||
|
|
||||||
@NotBlank(message = "version is required")
|
private static final String IPV4_REGEX =
|
||||||
private String version;
|
"^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}$";
|
||||||
|
private static final String FILE_ID_REGEX = "^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$";
|
||||||
|
|
||||||
@Min(value = 1, message = "nodeCount must be >= 1")
|
@NotBlank(message = "orgCodeType is required")
|
||||||
@Max(value = 4, message = "nodeCount must be <= 4")
|
@Pattern(regexp = "BIC|CIPSID|LEI", message = "orgCodeType must be BIC/CIPSID/LEI")
|
||||||
private int nodeCount;
|
private String orgCodeType;
|
||||||
|
|
||||||
public String getVersion() {
|
@NotBlank(message = "orgCode is required")
|
||||||
return version;
|
@Size(max = 32, message = "orgCode length must be <= 32")
|
||||||
|
private String orgCode;
|
||||||
|
|
||||||
|
@NotBlank(message = "orgNameCn is required")
|
||||||
|
@Size(max = 128, message = "orgNameCn length must be <= 128")
|
||||||
|
private String orgNameCn;
|
||||||
|
|
||||||
|
@Size(max = 256, message = "orgNameEn length must be <= 256")
|
||||||
|
private String orgNameEn;
|
||||||
|
|
||||||
|
@NotBlank(message = "deployMode is required")
|
||||||
|
@Pattern(regexp = "SINGLE|DUAL|QUAD", message = "deployMode must be SINGLE/DUAL/QUAD")
|
||||||
|
private String deployMode;
|
||||||
|
|
||||||
|
@Valid
|
||||||
|
@NotNull(message = "nodes is required")
|
||||||
|
private Nodes nodes;
|
||||||
|
|
||||||
|
@Valid
|
||||||
|
@NotNull(message = "mq is required")
|
||||||
|
private Mq mq;
|
||||||
|
|
||||||
|
@Valid
|
||||||
|
@NotNull(message = "licenses is required")
|
||||||
|
private Licenses licenses;
|
||||||
|
|
||||||
|
@Valid
|
||||||
|
private SignServer signServer;
|
||||||
|
|
||||||
|
@Valid
|
||||||
|
private DirectTlqConfig directTlq;
|
||||||
|
|
||||||
|
public String getOrgCodeType() {
|
||||||
|
return orgCodeType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setVersion(String version) {
|
public void setOrgCodeType(String orgCodeType) {
|
||||||
this.version = version;
|
this.orgCodeType = orgCodeType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getNodeCount() {
|
public String getOrgCode() {
|
||||||
return nodeCount;
|
return orgCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setNodeCount(int nodeCount) {
|
public void setOrgCode(String orgCode) {
|
||||||
this.nodeCount = nodeCount;
|
this.orgCode = orgCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getOrgNameCn() {
|
||||||
|
return orgNameCn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOrgNameCn(String orgNameCn) {
|
||||||
|
this.orgNameCn = orgNameCn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getOrgNameEn() {
|
||||||
|
return orgNameEn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOrgNameEn(String orgNameEn) {
|
||||||
|
this.orgNameEn = orgNameEn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDeployMode() {
|
||||||
|
return deployMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDeployMode(String deployMode) {
|
||||||
|
this.deployMode = deployMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Nodes getNodes() {
|
||||||
|
return nodes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNodes(Nodes nodes) {
|
||||||
|
this.nodes = nodes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Mq getMq() {
|
||||||
|
return mq;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMq(Mq mq) {
|
||||||
|
this.mq = mq;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Licenses getLicenses() {
|
||||||
|
return licenses;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLicenses(Licenses licenses) {
|
||||||
|
this.licenses = licenses;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SignServer getSignServer() {
|
||||||
|
return signServer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSignServer(SignServer signServer) {
|
||||||
|
this.signServer = signServer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DirectTlqConfig getDirectTlq() {
|
||||||
|
return directTlq;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDirectTlq(DirectTlqConfig directTlq) {
|
||||||
|
this.directTlq = directTlq;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Nodes {
|
||||||
|
|
||||||
|
@NotBlank(message = "nodes.node01Ip is required")
|
||||||
|
@Pattern(regexp = IPV4_REGEX, message = "nodes.node01Ip must be a valid IPv4")
|
||||||
|
private String node01Ip;
|
||||||
|
|
||||||
|
@Pattern(regexp = IPV4_REGEX, message = "nodes.node02Ip must be a valid IPv4")
|
||||||
|
private String node02Ip;
|
||||||
|
|
||||||
|
@Pattern(regexp = IPV4_REGEX, message = "nodes.node03Ip must be a valid IPv4")
|
||||||
|
private String node03Ip;
|
||||||
|
|
||||||
|
@Pattern(regexp = IPV4_REGEX, message = "nodes.node04Ip must be a valid IPv4")
|
||||||
|
private String node04Ip;
|
||||||
|
|
||||||
|
public String getNode01Ip() {
|
||||||
|
return node01Ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNode01Ip(String node01Ip) {
|
||||||
|
this.node01Ip = node01Ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNode02Ip() {
|
||||||
|
return node02Ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNode02Ip(String node02Ip) {
|
||||||
|
this.node02Ip = node02Ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNode03Ip() {
|
||||||
|
return node03Ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNode03Ip(String node03Ip) {
|
||||||
|
this.node03Ip = node03Ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNode04Ip() {
|
||||||
|
return node04Ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNode04Ip(String node04Ip) {
|
||||||
|
this.node04Ip = node04Ip;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Mq {
|
||||||
|
|
||||||
|
@NotBlank(message = "mq.mqType is required")
|
||||||
|
private String mqType;
|
||||||
|
|
||||||
|
@NotBlank(message = "mq.channelUsername is required")
|
||||||
|
@Size(max = 32, message = "mq.channelUsername length must be <= 32")
|
||||||
|
private String channelUsername;
|
||||||
|
|
||||||
|
@NotBlank(message = "mq.channelPassword is required")
|
||||||
|
@Size(max = 128, message = "mq.channelPassword length must be <= 128")
|
||||||
|
private String channelPassword;
|
||||||
|
|
||||||
|
@Size(max = 128, message = "mq.tlqLicenseFileId length must be <= 128")
|
||||||
|
@Pattern(regexp = FILE_ID_REGEX, message = "mq.tlqLicenseFileId must be a fileId")
|
||||||
|
private String tlqLicenseFileId;
|
||||||
|
|
||||||
|
@Size(max = 128, message = "mq.cfmqConfigFileId length must be <= 128")
|
||||||
|
@Pattern(regexp = FILE_ID_REGEX, message = "mq.cfmqConfigFileId must be a fileId")
|
||||||
|
private String cfmqConfigFileId;
|
||||||
|
|
||||||
|
public String getMqType() {
|
||||||
|
return mqType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMqType(String mqType) {
|
||||||
|
this.mqType = mqType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getChannelUsername() {
|
||||||
|
return channelUsername;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setChannelUsername(String channelUsername) {
|
||||||
|
this.channelUsername = channelUsername;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getChannelPassword() {
|
||||||
|
return channelPassword;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setChannelPassword(String channelPassword) {
|
||||||
|
this.channelPassword = channelPassword;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTlqLicenseFileId() {
|
||||||
|
return tlqLicenseFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTlqLicenseFileId(String tlqLicenseFileId) {
|
||||||
|
this.tlqLicenseFileId = tlqLicenseFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCfmqConfigFileId() {
|
||||||
|
return cfmqConfigFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCfmqConfigFileId(String cfmqConfigFileId) {
|
||||||
|
this.cfmqConfigFileId = cfmqConfigFileId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Licenses {
|
||||||
|
|
||||||
|
@NotBlank(message = "licenses.receiverLicenseFileId is required")
|
||||||
|
@Size(max = 128, message = "licenses.receiverLicenseFileId length must be <= 128")
|
||||||
|
@Pattern(regexp = FILE_ID_REGEX, message = "licenses.receiverLicenseFileId must be a fileId")
|
||||||
|
private String receiverLicenseFileId;
|
||||||
|
|
||||||
|
@Size(max = 128, message = "licenses.cfgZipFileId length must be <= 128")
|
||||||
|
@Pattern(regexp = FILE_ID_REGEX, message = "licenses.cfgZipFileId must be a fileId")
|
||||||
|
private String cfgZipFileId;
|
||||||
|
|
||||||
|
public String getReceiverLicenseFileId() {
|
||||||
|
return receiverLicenseFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setReceiverLicenseFileId(String receiverLicenseFileId) {
|
||||||
|
this.receiverLicenseFileId = receiverLicenseFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCfgZipFileId() {
|
||||||
|
return cfgZipFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCfgZipFileId(String cfgZipFileId) {
|
||||||
|
this.cfgZipFileId = cfgZipFileId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class SignServer {
|
||||||
|
|
||||||
|
@Size(max = 64, message = "signServer.signHost length must be <= 64")
|
||||||
|
private String signHost;
|
||||||
|
|
||||||
|
@NotNull(message = "signServer.signPort must not be null")
|
||||||
|
@Max(value = 65535, message = "signServer.signPort must be <= 65535")
|
||||||
|
private Integer signPort;
|
||||||
|
|
||||||
|
@Pattern(regexp = "Infosec|CFCA", message = "signServer.signType must be Infosec/CFCA")
|
||||||
|
private String signType;
|
||||||
|
|
||||||
|
@Size(max = 512, message = "signServer.signCertDn length must be <= 512")
|
||||||
|
private String signCertDn;
|
||||||
|
|
||||||
|
@Size(max = 128, message = "signServer.signCertSn length must be <= 128")
|
||||||
|
private String signCertSn;
|
||||||
|
|
||||||
|
@Size(max = 128, message = "signServer.signPassword length must be <= 128")
|
||||||
|
private String signPassword;
|
||||||
|
|
||||||
|
public String getSignHost() {
|
||||||
|
return signHost;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSignHost(String signHost) {
|
||||||
|
this.signHost = signHost;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getSignPort() {
|
||||||
|
return signPort;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSignPort(Integer signPort) {
|
||||||
|
this.signPort = signPort;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSignType() {
|
||||||
|
return signType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSignType(String signType) {
|
||||||
|
this.signType = signType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSignCertDn() {
|
||||||
|
return signCertDn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSignCertDn(String signCertDn) {
|
||||||
|
this.signCertDn = signCertDn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSignCertSn() {
|
||||||
|
return signCertSn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSignCertSn(String signCertSn) {
|
||||||
|
this.signCertSn = signCertSn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSignPassword() {
|
||||||
|
return signPassword;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSignPassword(String signPassword) {
|
||||||
|
this.signPassword = signPassword;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class DirectTlqConfig {
|
||||||
|
|
||||||
|
@Pattern(regexp = "A|B", message = "directTlq.localNodeSeq must be A/B")
|
||||||
|
private String localNodeSeq;
|
||||||
|
|
||||||
|
@Size(max = 256, message = "directTlq.upstreamInstitutions length must be <= 256")
|
||||||
|
private String upstreamInstitutions;
|
||||||
|
|
||||||
|
@Min(value = 1, message = "directTlq.upstreamCocCount must be >= 1")
|
||||||
|
@Max(value = 2, message = "directTlq.upstreamCocCount must be <= 2")
|
||||||
|
private Integer upstreamCocCount;
|
||||||
|
|
||||||
|
public String getLocalNodeSeq() {
|
||||||
|
return localNodeSeq;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLocalNodeSeq(String localNodeSeq) {
|
||||||
|
this.localNodeSeq = localNodeSeq;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUpstreamInstitutions() {
|
||||||
|
return upstreamInstitutions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUpstreamInstitutions(String upstreamInstitutions) {
|
||||||
|
this.upstreamInstitutions = upstreamInstitutions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getUpstreamCocCount() {
|
||||||
|
return upstreamCocCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUpstreamCocCount(Integer upstreamCocCount) {
|
||||||
|
this.upstreamCocCount = upstreamCocCount;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,16 +2,25 @@ package com.cisd.tms.modules.init.dto;
|
|||||||
|
|
||||||
public class InitPreviewResponse {
|
public class InitPreviewResponse {
|
||||||
|
|
||||||
private String version;
|
private String resolvedProductType;
|
||||||
|
private String presetVersion;
|
||||||
private int stepCount;
|
private int stepCount;
|
||||||
private String summary;
|
private String summary;
|
||||||
|
|
||||||
public String getVersion() {
|
public String getResolvedProductType() {
|
||||||
return version;
|
return resolvedProductType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setVersion(String version) {
|
public void setResolvedProductType(String resolvedProductType) {
|
||||||
this.version = version;
|
this.resolvedProductType = resolvedProductType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPresetVersion() {
|
||||||
|
return presetVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPresetVersion(String presetVersion) {
|
||||||
|
this.presetVersion = presetVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getStepCount() {
|
public int getStepCount() {
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package com.cisd.tms.modules.init.dto;
|
||||||
|
|
||||||
|
public class InitTaskDetailResponse {
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
private String status;
|
||||||
|
private String resolvedProductType;
|
||||||
|
private String presetVersion;
|
||||||
|
private String orgCode;
|
||||||
|
private String mqType;
|
||||||
|
private String deployMode;
|
||||||
|
private String initPlanJson;
|
||||||
|
|
||||||
|
public String getTaskId() {
|
||||||
|
return taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTaskId(String taskId) {
|
||||||
|
this.taskId = taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStatus() {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStatus(String status) {
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getResolvedProductType() {
|
||||||
|
return resolvedProductType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setResolvedProductType(String resolvedProductType) {
|
||||||
|
this.resolvedProductType = resolvedProductType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPresetVersion() {
|
||||||
|
return presetVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPresetVersion(String presetVersion) {
|
||||||
|
this.presetVersion = presetVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getOrgCode() {
|
||||||
|
return orgCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOrgCode(String orgCode) {
|
||||||
|
this.orgCode = orgCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMqType() {
|
||||||
|
return mqType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMqType(String mqType) {
|
||||||
|
this.mqType = mqType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDeployMode() {
|
||||||
|
return deployMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDeployMode(String deployMode) {
|
||||||
|
this.deployMode = deployMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getInitPlanJson() {
|
||||||
|
return initPlanJson;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setInitPlanJson(String initPlanJson) {
|
||||||
|
this.initPlanJson = initPlanJson;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package com.cisd.tms.modules.init.dto;
|
||||||
|
|
||||||
|
public class InitTaskExecuteResponse {
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
private String status;
|
||||||
|
private int totalSteps;
|
||||||
|
private int successSteps;
|
||||||
|
|
||||||
|
public String getTaskId() {
|
||||||
|
return taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTaskId(String taskId) {
|
||||||
|
this.taskId = taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStatus() {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStatus(String status) {
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getTotalSteps() {
|
||||||
|
return totalSteps;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTotalSteps(int totalSteps) {
|
||||||
|
this.totalSteps = totalSteps;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSuccessSteps() {
|
||||||
|
return successSteps;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSuccessSteps(int successSteps) {
|
||||||
|
this.successSteps = successSteps;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package com.cisd.tms.modules.init.dto;
|
||||||
|
|
||||||
|
public class InitTaskStepLogResponse {
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
private int stepNo;
|
||||||
|
private String stepCode;
|
||||||
|
private String logPath;
|
||||||
|
private String content;
|
||||||
|
|
||||||
|
public String getTaskId() {
|
||||||
|
return taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTaskId(String taskId) {
|
||||||
|
this.taskId = taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getStepNo() {
|
||||||
|
return stepNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStepNo(int stepNo) {
|
||||||
|
this.stepNo = stepNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStepCode() {
|
||||||
|
return stepCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStepCode(String stepCode) {
|
||||||
|
this.stepCode = stepCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogPath() {
|
||||||
|
return logPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogPath(String logPath) {
|
||||||
|
this.logPath = logPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getContent() {
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setContent(String content) {
|
||||||
|
this.content = content;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package com.cisd.tms.modules.init.dto;
|
||||||
|
|
||||||
|
public class InitTaskStepResponse {
|
||||||
|
|
||||||
|
private int stepNo;
|
||||||
|
private String stepCode;
|
||||||
|
private String status;
|
||||||
|
private String message;
|
||||||
|
private String commandLine;
|
||||||
|
private String logPath;
|
||||||
|
private Integer exitCode;
|
||||||
|
|
||||||
|
public int getStepNo() {
|
||||||
|
return stepNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStepNo(int stepNo) {
|
||||||
|
this.stepNo = stepNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStepCode() {
|
||||||
|
return stepCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStepCode(String stepCode) {
|
||||||
|
this.stepCode = stepCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStatus() {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStatus(String status) {
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMessage() {
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMessage(String message) {
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCommandLine() {
|
||||||
|
return commandLine;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCommandLine(String commandLine) {
|
||||||
|
this.commandLine = commandLine;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogPath() {
|
||||||
|
return logPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogPath(String logPath) {
|
||||||
|
this.logPath = logPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getExitCode() {
|
||||||
|
return exitCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setExitCode(Integer exitCode) {
|
||||||
|
this.exitCode = exitCode;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,11 @@ public class InitTaskEntity extends BaseEntity {
|
|||||||
private String taskId;
|
private String taskId;
|
||||||
private String version;
|
private String version;
|
||||||
private String status;
|
private String status;
|
||||||
|
private String productType;
|
||||||
|
private String orgCode;
|
||||||
|
private String mqType;
|
||||||
|
private String deployMode;
|
||||||
|
private String initPlanJson;
|
||||||
|
|
||||||
public String getTaskId() {
|
public String getTaskId() {
|
||||||
return taskId;
|
return taskId;
|
||||||
@@ -33,4 +38,44 @@ public class InitTaskEntity extends BaseEntity {
|
|||||||
public void setStatus(String status) {
|
public void setStatus(String status) {
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getProductType() {
|
||||||
|
return productType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProductType(String productType) {
|
||||||
|
this.productType = productType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getOrgCode() {
|
||||||
|
return orgCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOrgCode(String orgCode) {
|
||||||
|
this.orgCode = orgCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMqType() {
|
||||||
|
return mqType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMqType(String mqType) {
|
||||||
|
this.mqType = mqType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDeployMode() {
|
||||||
|
return deployMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDeployMode(String deployMode) {
|
||||||
|
this.deployMode = deployMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getInitPlanJson() {
|
||||||
|
return initPlanJson;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setInitPlanJson(String initPlanJson) {
|
||||||
|
this.initPlanJson = initPlanJson;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,81 @@
|
|||||||
|
package com.cisd.tms.modules.init.entity;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.cisd.tms.infrastructure.persistence.entity.BaseEntity;
|
||||||
|
|
||||||
|
@TableName("tms_init_task_step")
|
||||||
|
public class InitTaskStepEntity extends BaseEntity {
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
private Integer stepNo;
|
||||||
|
private String stepCode;
|
||||||
|
private String status;
|
||||||
|
private String message;
|
||||||
|
private String commandLine;
|
||||||
|
private String logPath;
|
||||||
|
private Integer exitCode;
|
||||||
|
|
||||||
|
public String getTaskId() {
|
||||||
|
return taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTaskId(String taskId) {
|
||||||
|
this.taskId = taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getStepNo() {
|
||||||
|
return stepNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStepNo(Integer stepNo) {
|
||||||
|
this.stepNo = stepNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStepCode() {
|
||||||
|
return stepCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStepCode(String stepCode) {
|
||||||
|
this.stepCode = stepCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStatus() {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStatus(String status) {
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMessage() {
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMessage(String message) {
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCommandLine() {
|
||||||
|
return commandLine;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCommandLine(String commandLine) {
|
||||||
|
this.commandLine = commandLine;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogPath() {
|
||||||
|
return logPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogPath(String logPath) {
|
||||||
|
this.logPath = logPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getExitCode() {
|
||||||
|
return exitCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setExitCode(Integer exitCode) {
|
||||||
|
this.exitCode = exitCode;
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,43 @@
|
|||||||
|
package com.cisd.tms.modules.init.executor;
|
||||||
|
|
||||||
|
public class InitStepExecutionResult {
|
||||||
|
|
||||||
|
private boolean success;
|
||||||
|
private String message;
|
||||||
|
private Integer exitCode;
|
||||||
|
private String logPath;
|
||||||
|
|
||||||
|
public static InitStepExecutionResult success(String message, Integer exitCode, String logPath) {
|
||||||
|
InitStepExecutionResult result = new InitStepExecutionResult();
|
||||||
|
result.success = true;
|
||||||
|
result.message = message;
|
||||||
|
result.exitCode = exitCode;
|
||||||
|
result.logPath = logPath;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static InitStepExecutionResult failure(String message, Integer exitCode, String logPath) {
|
||||||
|
InitStepExecutionResult result = new InitStepExecutionResult();
|
||||||
|
result.success = false;
|
||||||
|
result.message = message;
|
||||||
|
result.exitCode = exitCode;
|
||||||
|
result.logPath = logPath;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isSuccess() {
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMessage() {
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getExitCode() {
|
||||||
|
return exitCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogPath() {
|
||||||
|
return logPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.cisd.tms.modules.init.executor;
|
||||||
|
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskEntity;
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskStepEntity;
|
||||||
|
|
||||||
|
public interface InitStepExecutor {
|
||||||
|
|
||||||
|
InitStepExecutionResult execute(InitTaskEntity task, InitTaskStepEntity step);
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package com.cisd.tms.modules.init.mapper;
|
||||||
|
|
||||||
|
import com.cisd.tms.infrastructure.persistence.mapper.BaseMapperX;
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskStepEntity;
|
||||||
|
import java.util.List;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface InitTaskStepMapper extends BaseMapperX<InitTaskStepEntity> {
|
||||||
|
|
||||||
|
List<InitTaskStepEntity> selectByTaskIdOrderByStepNo(@Param("taskId") String taskId);
|
||||||
|
}
|
||||||
@@ -6,4 +6,8 @@ import java.util.Optional;
|
|||||||
public interface InitTaskRepository {
|
public interface InitTaskRepository {
|
||||||
|
|
||||||
Optional<InitTaskEntity> findByTaskId(String taskId);
|
Optional<InitTaskEntity> findByTaskId(String taskId);
|
||||||
|
|
||||||
|
void save(InitTaskEntity entity);
|
||||||
|
|
||||||
|
void update(InitTaskEntity entity);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package com.cisd.tms.modules.init.repository;
|
||||||
|
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskStepEntity;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface InitTaskStepRepository {
|
||||||
|
|
||||||
|
void saveBatch(List<InitTaskStepEntity> entities);
|
||||||
|
|
||||||
|
List<InitTaskStepEntity> findByTaskIdOrderByStepNo(String taskId);
|
||||||
|
|
||||||
|
void updateBatch(List<InitTaskStepEntity> entities);
|
||||||
|
}
|
||||||
@@ -19,4 +19,14 @@ public class InitTaskRepositoryImpl implements InitTaskRepository {
|
|||||||
public Optional<InitTaskEntity> findByTaskId(String taskId) {
|
public Optional<InitTaskEntity> findByTaskId(String taskId) {
|
||||||
return Optional.ofNullable(initTaskMapper.selectByTaskId(taskId));
|
return Optional.ofNullable(initTaskMapper.selectByTaskId(taskId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void save(InitTaskEntity entity) {
|
||||||
|
initTaskMapper.insert(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void update(InitTaskEntity entity) {
|
||||||
|
initTaskMapper.updateById(entity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+42
@@ -0,0 +1,42 @@
|
|||||||
|
package com.cisd.tms.modules.init.repository.impl;
|
||||||
|
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskStepEntity;
|
||||||
|
import com.cisd.tms.modules.init.mapper.InitTaskStepMapper;
|
||||||
|
import com.cisd.tms.modules.init.repository.InitTaskStepRepository;
|
||||||
|
import java.util.List;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public class InitTaskStepRepositoryImpl implements InitTaskStepRepository {
|
||||||
|
|
||||||
|
private final InitTaskStepMapper initTaskStepMapper;
|
||||||
|
|
||||||
|
public InitTaskStepRepositoryImpl(InitTaskStepMapper initTaskStepMapper) {
|
||||||
|
this.initTaskStepMapper = initTaskStepMapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void saveBatch(List<InitTaskStepEntity> entities) {
|
||||||
|
if (entities == null || entities.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (InitTaskStepEntity entity : entities) {
|
||||||
|
initTaskStepMapper.insert(entity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<InitTaskStepEntity> findByTaskIdOrderByStepNo(String taskId) {
|
||||||
|
return initTaskStepMapper.selectByTaskIdOrderByStepNo(taskId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateBatch(List<InitTaskStepEntity> entities) {
|
||||||
|
if (entities == null || entities.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (InitTaskStepEntity entity : entities) {
|
||||||
|
initTaskStepMapper.updateById(entity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,37 +1,496 @@
|
|||||||
package com.cisd.tms.modules.init.service;
|
package com.cisd.tms.modules.init.service;
|
||||||
|
|
||||||
|
import com.cisd.tms.common.config.properties.CisdPresetProperties;
|
||||||
|
import com.cisd.tms.common.enums.ErrorCode;
|
||||||
|
import com.cisd.tms.common.exception.BizException;
|
||||||
|
import com.cisd.tms.modules.init.config.InitCommandProfileService;
|
||||||
|
import com.cisd.tms.modules.init.config.InitExecutorProperties;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitCreateTaskResponse;
|
||||||
import com.cisd.tms.modules.init.dto.InitPlanTemplateResponse;
|
import com.cisd.tms.modules.init.dto.InitPlanTemplateResponse;
|
||||||
import com.cisd.tms.modules.init.dto.InitPreviewRequest;
|
import com.cisd.tms.modules.init.dto.InitPreviewRequest;
|
||||||
import com.cisd.tms.modules.init.dto.InitPreviewResponse;
|
import com.cisd.tms.modules.init.dto.InitPreviewResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskDetailResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskExecuteResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskStepLogResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskStepResponse;
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskEntity;
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskStepEntity;
|
||||||
|
import com.cisd.tms.modules.init.executor.InitStepExecutionResult;
|
||||||
|
import com.cisd.tms.modules.init.executor.InitStepExecutor;
|
||||||
import com.cisd.tms.modules.init.repository.InitTaskRepository;
|
import com.cisd.tms.modules.init.repository.InitTaskRepository;
|
||||||
|
import com.cisd.tms.modules.init.repository.InitTaskStepRepository;
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class InitService {
|
public class InitService {
|
||||||
|
|
||||||
private final InitTaskRepository initTaskRepository;
|
private static final Set<String> PRESET_PRODUCT_TYPES = Set.of("ENTERPRISE", "INDIRECT", "DIRECT");
|
||||||
|
private static final Set<String> DEPLOY_STANDARD = Set.of("SINGLE", "DUAL");
|
||||||
|
private static final Set<String> DEPLOY_DIRECT = Set.of("SINGLE", "DUAL", "QUAD");
|
||||||
|
private static final Set<String> MQ_STANDARD = Set.of("RABBITMQ", "TLQ");
|
||||||
|
private static final Set<String> MQ_DIRECT = Set.of("RABBITMQ_TLQ", "RABBITMQ_CFMQ");
|
||||||
|
private static final Pattern FILE_ID_PATTERN = Pattern.compile("^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$");
|
||||||
|
|
||||||
public InitService(InitTaskRepository initTaskRepository) {
|
private final InitTaskRepository initTaskRepository;
|
||||||
|
private final InitTaskStepRepository initTaskStepRepository;
|
||||||
|
private final CisdPresetProperties cisdPresetProperties;
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
private final InitStepExecutor initStepExecutor;
|
||||||
|
private final InitCommandProfileService initCommandProfileService;
|
||||||
|
private final InitExecutorProperties initExecutorProperties;
|
||||||
|
|
||||||
|
public InitService(
|
||||||
|
InitTaskRepository initTaskRepository,
|
||||||
|
InitTaskStepRepository initTaskStepRepository,
|
||||||
|
CisdPresetProperties cisdPresetProperties,
|
||||||
|
ObjectMapper objectMapper,
|
||||||
|
InitStepExecutor initStepExecutor,
|
||||||
|
InitCommandProfileService initCommandProfileService,
|
||||||
|
InitExecutorProperties initExecutorProperties
|
||||||
|
) {
|
||||||
this.initTaskRepository = initTaskRepository;
|
this.initTaskRepository = initTaskRepository;
|
||||||
|
this.initTaskStepRepository = initTaskStepRepository;
|
||||||
|
this.cisdPresetProperties = cisdPresetProperties;
|
||||||
|
this.objectMapper = objectMapper;
|
||||||
|
this.initStepExecutor = initStepExecutor;
|
||||||
|
this.initCommandProfileService = initCommandProfileService;
|
||||||
|
this.initExecutorProperties = initExecutorProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
public InitPlanTemplateResponse loadTemplate(String version) {
|
/**
|
||||||
|
* 读取后端预制产品类型和版本。
|
||||||
|
* 该接口是前端动态渲染“企业/间参/直参”初始化页的入口。
|
||||||
|
*/
|
||||||
|
public InitPlanTemplateResponse loadTemplate(String ignoredVersion) {
|
||||||
|
String productType = resolvePresetProductType();
|
||||||
|
|
||||||
InitPlanTemplateResponse response = new InitPlanTemplateResponse();
|
InitPlanTemplateResponse response = new InitPlanTemplateResponse();
|
||||||
response.setVersion(version == null || version.isBlank() ? "enterprise" : version);
|
response.setPresetProductType(productType);
|
||||||
response.setSupportedVersions(List.of("enterprise", "indirect", "direct-lite"));
|
response.setPresetVersion(cisdPresetProperties.getVersion());
|
||||||
|
response.setSupportedVersions(List.of("ENTERPRISE", "INDIRECT", "DIRECT"));
|
||||||
response.setTemplatePath("classpath:/initplan/");
|
response.setTemplatePath("classpath:/initplan/");
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
public InitPreviewResponse preview(InitPreviewRequest request) {
|
public InitPreviewResponse preview(InitPreviewRequest request) {
|
||||||
String previewTaskId = "preview-" + request.getVersion();
|
if (request == null) {
|
||||||
|
throw new IllegalArgumentException("request must not be null");
|
||||||
|
}
|
||||||
|
|
||||||
|
String productType = resolvePresetProductType();
|
||||||
|
validateCommon(request);
|
||||||
|
validateByProductType(productType, request);
|
||||||
|
|
||||||
|
String previewTaskId = "preview-" + productType + "-" + request.getOrgCode();
|
||||||
boolean existed = initTaskRepository.findByTaskId(previewTaskId).isPresent();
|
boolean existed = initTaskRepository.findByTaskId(previewTaskId).isPresent();
|
||||||
|
|
||||||
InitPreviewResponse response = new InitPreviewResponse();
|
InitPreviewResponse response = new InitPreviewResponse();
|
||||||
response.setVersion(request.getVersion());
|
response.setResolvedProductType(productType);
|
||||||
response.setStepCount(request.getNodeCount() <= 0 ? 1 : request.getNodeCount());
|
response.setPresetVersion(cisdPresetProperties.getVersion());
|
||||||
response.setSummary(existed ? "init preview generated from existing task" : "init preview generated");
|
response.setStepCount(estimateStepCount(productType, request));
|
||||||
|
response.setSummary(existed ? "init preview generated from existing task fingerprint" : "init preview generated");
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public InitCreateTaskResponse createTask(InitPreviewRequest request) {
|
||||||
|
if (request == null) {
|
||||||
|
throw new IllegalArgumentException("request must not be null");
|
||||||
|
}
|
||||||
|
|
||||||
|
String productType = resolvePresetProductType();
|
||||||
|
validateCommon(request);
|
||||||
|
validateByProductType(productType, request);
|
||||||
|
|
||||||
|
String taskId = buildTaskId();
|
||||||
|
String normalizedMqType = normalizeUpper(request.getMq().getMqType());
|
||||||
|
String deployMode = normalizeUpper(request.getDeployMode());
|
||||||
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
|
||||||
|
// 1) 按产品类型 + MQ 类型生成标准步骤序列
|
||||||
|
List<String> stepCodes = defaultSteps(productType, normalizedMqType);
|
||||||
|
|
||||||
|
InitTaskEntity entity = new InitTaskEntity();
|
||||||
|
entity.setTaskId(taskId);
|
||||||
|
entity.setVersion(cisdPresetProperties.getVersion());
|
||||||
|
entity.setStatus("PENDING");
|
||||||
|
entity.setProductType(productType);
|
||||||
|
entity.setOrgCode(request.getOrgCode());
|
||||||
|
entity.setMqType(normalizedMqType);
|
||||||
|
entity.setDeployMode(deployMode);
|
||||||
|
entity.setCreateTime(now);
|
||||||
|
entity.setUpdateTime(now);
|
||||||
|
entity.setInitPlanJson(generateInitPlanJson(productType, request, stepCodes));
|
||||||
|
|
||||||
|
// 2) 先落任务主表，确保 taskId 可作为步骤外键归属
|
||||||
|
initTaskRepository.save(entity);
|
||||||
|
|
||||||
|
List<InitTaskStepEntity> stepEntities = new ArrayList<>();
|
||||||
|
for (int i = 0; i < stepCodes.size(); i++) {
|
||||||
|
String stepCode = stepCodes.get(i);
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setTaskId(taskId);
|
||||||
|
step.setStepNo(i + 1);
|
||||||
|
step.setStepCode(stepCode);
|
||||||
|
step.setStatus("PENDING");
|
||||||
|
step.setMessage("waiting");
|
||||||
|
// 3) 每个步骤的执行命令由 profile 配置驱动，避免硬编码在业务代码中
|
||||||
|
step.setCommandLine(initCommandProfileService.resolveCommand(productType, normalizedMqType, stepCode));
|
||||||
|
step.setCreateTime(now);
|
||||||
|
step.setUpdateTime(now);
|
||||||
|
stepEntities.add(step);
|
||||||
|
}
|
||||||
|
// 4) 批量落步骤表，初始状态统一为 PENDING
|
||||||
|
initTaskStepRepository.saveBatch(stepEntities);
|
||||||
|
|
||||||
|
InitCreateTaskResponse response = new InitCreateTaskResponse();
|
||||||
|
response.setTaskId(taskId);
|
||||||
|
response.setStatus(entity.getStatus());
|
||||||
|
response.setResolvedProductType(productType);
|
||||||
|
response.setPresetVersion(cisdPresetProperties.getVersion());
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public InitTaskDetailResponse getTask(String taskId) {
|
||||||
|
InitTaskEntity entity = requireTask(taskId);
|
||||||
|
|
||||||
|
InitTaskDetailResponse response = new InitTaskDetailResponse();
|
||||||
|
response.setTaskId(entity.getTaskId());
|
||||||
|
response.setStatus(entity.getStatus());
|
||||||
|
response.setResolvedProductType(entity.getProductType());
|
||||||
|
response.setPresetVersion(entity.getVersion());
|
||||||
|
response.setOrgCode(entity.getOrgCode());
|
||||||
|
response.setMqType(entity.getMqType());
|
||||||
|
response.setDeployMode(entity.getDeployMode());
|
||||||
|
response.setInitPlanJson(entity.getInitPlanJson());
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<InitTaskStepResponse> getTaskSteps(String taskId) {
|
||||||
|
requireTask(taskId);
|
||||||
|
|
||||||
|
return initTaskStepRepository.findByTaskIdOrderByStepNo(taskId).stream().map(entity -> {
|
||||||
|
InitTaskStepResponse response = new InitTaskStepResponse();
|
||||||
|
response.setStepNo(entity.getStepNo() == null ? 0 : entity.getStepNo());
|
||||||
|
response.setStepCode(entity.getStepCode());
|
||||||
|
response.setStatus(entity.getStatus());
|
||||||
|
response.setMessage(entity.getMessage());
|
||||||
|
response.setCommandLine(entity.getCommandLine());
|
||||||
|
response.setLogPath(entity.getLogPath());
|
||||||
|
response.setExitCode(entity.getExitCode());
|
||||||
|
return response;
|
||||||
|
}).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public InitTaskStepLogResponse getTaskStepLog(String taskId, int stepNo) {
|
||||||
|
if (stepNo <= 0) {
|
||||||
|
throw new IllegalArgumentException("stepNo must be > 0");
|
||||||
|
}
|
||||||
|
requireTask(taskId);
|
||||||
|
InitTaskStepEntity step = requireStep(taskId, stepNo);
|
||||||
|
|
||||||
|
if (isBlank(step.getLogPath())) {
|
||||||
|
throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "log file not generated for task step");
|
||||||
|
}
|
||||||
|
|
||||||
|
Path logPath = Paths.get(step.getLogPath()).normalize().toAbsolutePath();
|
||||||
|
Path logDir = Paths.get(initExecutorProperties.getLogDir()).normalize().toAbsolutePath();
|
||||||
|
// 只允许读取配置日志目录下的文件，防止路径穿越读取任意系统文件
|
||||||
|
if (!logPath.startsWith(logDir)) {
|
||||||
|
throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "log path is out of allowed directory");
|
||||||
|
}
|
||||||
|
if (!Files.exists(logPath) || !Files.isRegularFile(logPath)) {
|
||||||
|
throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "log file does not exist");
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
String content = Files.readString(logPath);
|
||||||
|
InitTaskStepLogResponse response = new InitTaskStepLogResponse();
|
||||||
|
response.setTaskId(taskId);
|
||||||
|
response.setStepNo(stepNo);
|
||||||
|
response.setStepCode(step.getStepCode());
|
||||||
|
response.setLogPath(logPath.toString());
|
||||||
|
response.setContent(content);
|
||||||
|
return response;
|
||||||
|
} catch (IOException ex) {
|
||||||
|
throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "failed to read log file");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public InitTaskExecuteResponse executeTask(String taskId) {
|
||||||
|
InitTaskEntity task = requireTask(taskId);
|
||||||
|
List<InitTaskStepEntity> steps = initTaskStepRepository.findByTaskIdOrderByStepNo(taskId);
|
||||||
|
if (steps.isEmpty()) {
|
||||||
|
throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "init task has no steps: " + taskId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 任务进入运行态，后续每个步骤状态独立推进
|
||||||
|
task.setStatus("RUNNING");
|
||||||
|
task.setUpdateTime(LocalDateTime.now());
|
||||||
|
initTaskRepository.update(task);
|
||||||
|
|
||||||
|
int successSteps = 0;
|
||||||
|
boolean failed = false;
|
||||||
|
for (InitTaskStepEntity step : steps) {
|
||||||
|
step.setStatus("RUNNING");
|
||||||
|
step.setMessage("running");
|
||||||
|
step.setUpdateTime(LocalDateTime.now());
|
||||||
|
|
||||||
|
// 串行执行：每步结束后立即持有 exitCode/logPath/message，便于失败诊断
|
||||||
|
InitStepExecutionResult result = initStepExecutor.execute(task, step);
|
||||||
|
step.setExitCode(result.getExitCode());
|
||||||
|
step.setLogPath(result.getLogPath());
|
||||||
|
step.setMessage(result.getMessage());
|
||||||
|
step.setUpdateTime(LocalDateTime.now());
|
||||||
|
|
||||||
|
if (result.isSuccess()) {
|
||||||
|
step.setStatus("SUCCESS");
|
||||||
|
successSteps++;
|
||||||
|
} else {
|
||||||
|
// 当前步骤失败后立刻中断，保持“失败即停”语义
|
||||||
|
step.setStatus("FAILED");
|
||||||
|
failed = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
initTaskStepRepository.updateBatch(steps);
|
||||||
|
|
||||||
|
// 任务最终态由步骤执行结果汇总得出
|
||||||
|
task.setStatus(failed ? "FAILED" : "SUCCESS");
|
||||||
|
task.setUpdateTime(LocalDateTime.now());
|
||||||
|
initTaskRepository.update(task);
|
||||||
|
|
||||||
|
InitTaskExecuteResponse response = new InitTaskExecuteResponse();
|
||||||
|
response.setTaskId(taskId);
|
||||||
|
response.setStatus(task.getStatus());
|
||||||
|
response.setTotalSteps(steps.size());
|
||||||
|
response.setSuccessSteps(successSteps);
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
private InitTaskEntity requireTask(String taskId) {
|
||||||
|
return initTaskRepository.findByTaskId(taskId)
|
||||||
|
.orElseThrow(() -> new BizException(ErrorCode.BIZ_ERROR.getCode(), "init task not found: " + taskId));
|
||||||
|
}
|
||||||
|
|
||||||
|
private InitTaskStepEntity requireStep(String taskId, int stepNo) {
|
||||||
|
return initTaskStepRepository.findByTaskIdOrderByStepNo(taskId).stream()
|
||||||
|
.filter(item -> item.getStepNo() != null && item.getStepNo() == stepNo)
|
||||||
|
.findFirst()
|
||||||
|
.orElseThrow(() -> new BizException(
|
||||||
|
ErrorCode.BIZ_ERROR.getCode(),
|
||||||
|
"init task step not found: taskId=" + taskId + ", stepNo=" + stepNo
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private String generateInitPlanJson(String productType, InitPreviewRequest request, List<String> steps) {
|
||||||
|
Map<String, Object> root = new LinkedHashMap<>();
|
||||||
|
root.put("schemaVersion", "1.0");
|
||||||
|
root.put("productType", productType);
|
||||||
|
root.put("orgCode", request.getOrgCode());
|
||||||
|
root.put("deployMode", normalizeUpper(request.getDeployMode()));
|
||||||
|
root.put("mqType", normalizeUpper(request.getMq().getMqType()));
|
||||||
|
// 执行 internal::render_config / internal::cfmq_apply 时需要读取原始请求参数进行文件渲染与校验。
|
||||||
|
root.put("request", request);
|
||||||
|
root.put("steps", steps);
|
||||||
|
root.put("generatedAt", LocalDateTime.now().toString());
|
||||||
|
|
||||||
|
try {
|
||||||
|
return objectMapper.writeValueAsString(root);
|
||||||
|
} catch (JsonProcessingException ex) {
|
||||||
|
throw new BizException(ErrorCode.INTERNAL_ERROR.getCode(), "failed to serialize init plan");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<String> defaultSteps(String productType, String mqType) {
|
||||||
|
// 该步骤序列只描述“逻辑编排”，具体脚本命令在 step-command-profiles.json 中定义
|
||||||
|
if ("DIRECT".equals(productType)) {
|
||||||
|
if ("RABBITMQ_CFMQ".equals(mqType)) {
|
||||||
|
return List.of("RENDER_CONFIG", "FILE_PREPARE", "MQ_USER_APPLY", "DB_INIT", "CFMQ_APPLY", "VERIFY");
|
||||||
|
}
|
||||||
|
return List.of("RENDER_CONFIG", "FILE_PREPARE", "MQ_USER_APPLY", "DB_INIT", "TLQ_INIT_CFG", "VERIFY");
|
||||||
|
}
|
||||||
|
if ("TLQ".equals(mqType)) {
|
||||||
|
return List.of("RENDER_CONFIG", "FILE_PREPARE", "SET_TLQ", "MQ_USER_APPLY", "MQ_QUEUE_APPLY", "DB_INIT", "DEPLOY_RECEIVER", "APP_MQ_CREDENTIALS_APPLY", "VERIFY");
|
||||||
|
}
|
||||||
|
return List.of("RENDER_CONFIG", "FILE_PREPARE", "SET_RABBITMQ", "MQ_USER_APPLY", "MQ_QUEUE_APPLY", "DB_INIT", "DEPLOY_RECEIVER", "APP_MQ_CREDENTIALS_APPLY", "VERIFY");
|
||||||
|
}
|
||||||
|
|
||||||
|
private String buildTaskId() {
|
||||||
|
String ts = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
|
||||||
|
String suffix = UUID.randomUUID().toString().replace("-", "").substring(0, 6).toUpperCase(Locale.ROOT);
|
||||||
|
return "INIT-" + ts + "-" + suffix;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String resolvePresetProductType() {
|
||||||
|
String raw = normalize(cisdPresetProperties.getProductType());
|
||||||
|
if (isBlank(raw)) {
|
||||||
|
throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "device preset product type is missing, initialization is forbidden");
|
||||||
|
}
|
||||||
|
|
||||||
|
String productType = raw.toUpperCase(Locale.ROOT);
|
||||||
|
if (!PRESET_PRODUCT_TYPES.contains(productType)) {
|
||||||
|
throw new BizException(
|
||||||
|
ErrorCode.BIZ_ERROR.getCode(),
|
||||||
|
"device preset product type is invalid: " + raw + ", initialization is forbidden"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return productType;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateCommon(InitPreviewRequest request) {
|
||||||
|
if (request.getNodes() == null) {
|
||||||
|
throw new IllegalArgumentException("nodes is required");
|
||||||
|
}
|
||||||
|
if (request.getMq() == null) {
|
||||||
|
throw new IllegalArgumentException("mq is required");
|
||||||
|
}
|
||||||
|
if (request.getLicenses() == null) {
|
||||||
|
throw new IllegalArgumentException("licenses is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
requireNotBlank("orgCode", request.getOrgCode());
|
||||||
|
requireNotBlank("deployMode", request.getDeployMode());
|
||||||
|
requireNotBlank("nodes.node01Ip", request.getNodes().getNode01Ip());
|
||||||
|
requireNotBlank("mq.mqType", request.getMq().getMqType());
|
||||||
|
requireNotBlank("mq.channelUsername", request.getMq().getChannelUsername());
|
||||||
|
requireNotBlank("mq.channelPassword", request.getMq().getChannelPassword());
|
||||||
|
requireNotBlank("licenses.receiverLicenseFileId", request.getLicenses().getReceiverLicenseFileId());
|
||||||
|
requireFileId("licenses.receiverLicenseFileId", request.getLicenses().getReceiverLicenseFileId());
|
||||||
|
|
||||||
|
requireOptionalFileId("mq.tlqLicenseFileId", request.getMq().getTlqLicenseFileId());
|
||||||
|
requireOptionalFileId("mq.cfmqConfigFileId", request.getMq().getCfmqConfigFileId());
|
||||||
|
requireOptionalFileId("licenses.cfgZipFileId", request.getLicenses().getCfgZipFileId());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateByProductType(String productType, InitPreviewRequest request) {
|
||||||
|
String deployMode = normalizeUpper(request.getDeployMode());
|
||||||
|
String mqType = normalizeUpper(request.getMq().getMqType());
|
||||||
|
|
||||||
|
if ("DIRECT".equals(productType)) {
|
||||||
|
validateDirect(request, deployMode, mqType);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
validateStandard(request, deployMode, mqType);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateStandard(InitPreviewRequest request, String deployMode, String mqType) {
|
||||||
|
requireAllowed("deployMode", deployMode, DEPLOY_STANDARD);
|
||||||
|
requireAllowed("mq.mqType", mqType, MQ_STANDARD);
|
||||||
|
|
||||||
|
if ("DUAL".equals(deployMode)) {
|
||||||
|
requireNotBlank("nodes.node02Ip", request.getNodes().getNode02Ip());
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("TLQ".equals(mqType)) {
|
||||||
|
requireNotBlank("mq.tlqLicenseFileId", request.getMq().getTlqLicenseFileId());
|
||||||
|
requireFileId("mq.tlqLicenseFileId", request.getMq().getTlqLicenseFileId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateDirect(InitPreviewRequest request, String deployMode, String mqType) {
|
||||||
|
requireAllowed("deployMode", deployMode, DEPLOY_DIRECT);
|
||||||
|
requireAllowed("mq.mqType", mqType, MQ_DIRECT);
|
||||||
|
|
||||||
|
if ("DUAL".equals(deployMode) || "QUAD".equals(deployMode)) {
|
||||||
|
requireNotBlank("nodes.node02Ip", request.getNodes().getNode02Ip());
|
||||||
|
}
|
||||||
|
if ("QUAD".equals(deployMode)) {
|
||||||
|
requireNotBlank("nodes.node03Ip", request.getNodes().getNode03Ip());
|
||||||
|
requireNotBlank("nodes.node04Ip", request.getNodes().getNode04Ip());
|
||||||
|
}
|
||||||
|
|
||||||
|
requireNotBlank("licenses.cfgZipFileId", request.getLicenses().getCfgZipFileId());
|
||||||
|
requireFileId("licenses.cfgZipFileId", request.getLicenses().getCfgZipFileId());
|
||||||
|
|
||||||
|
InitPreviewRequest.SignServer signServer = request.getSignServer();
|
||||||
|
if (signServer == null) {
|
||||||
|
throw new IllegalArgumentException("signServer is required for DIRECT");
|
||||||
|
}
|
||||||
|
requireNotBlank("signServer.signHost", signServer.getSignHost());
|
||||||
|
if (signServer.getSignPort() == null || signServer.getSignPort() <= 0 || signServer.getSignPort() > 65535) {
|
||||||
|
throw new IllegalArgumentException("signServer.signPort must be in [1,65535]");
|
||||||
|
}
|
||||||
|
requireNotBlank("signServer.signType", signServer.getSignType());
|
||||||
|
requireNotBlank("signServer.signCertDn", signServer.getSignCertDn());
|
||||||
|
requireNotBlank("signServer.signCertSn", signServer.getSignCertSn());
|
||||||
|
requireNotBlank("signServer.signPassword", signServer.getSignPassword());
|
||||||
|
|
||||||
|
if ("RABBITMQ_TLQ".equals(mqType)) {
|
||||||
|
requireNotBlank("mq.tlqLicenseFileId", request.getMq().getTlqLicenseFileId());
|
||||||
|
requireFileId("mq.tlqLicenseFileId", request.getMq().getTlqLicenseFileId());
|
||||||
|
InitPreviewRequest.DirectTlqConfig directTlq = request.getDirectTlq();
|
||||||
|
if (directTlq == null) {
|
||||||
|
throw new IllegalArgumentException("directTlq is required for RABBITMQ_TLQ");
|
||||||
|
}
|
||||||
|
requireNotBlank("directTlq.localNodeSeq", directTlq.getLocalNodeSeq());
|
||||||
|
requireNotBlank("directTlq.upstreamInstitutions", directTlq.getUpstreamInstitutions());
|
||||||
|
if (directTlq.getUpstreamCocCount() == null
|
||||||
|
|| directTlq.getUpstreamCocCount() < 1
|
||||||
|
|| directTlq.getUpstreamCocCount() > 2) {
|
||||||
|
throw new IllegalArgumentException("directTlq.upstreamCocCount must be in [1,2]");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ("RABBITMQ_CFMQ".equals(mqType)) {
|
||||||
|
requireNotBlank("mq.cfmqConfigFileId", request.getMq().getCfmqConfigFileId());
|
||||||
|
requireFileId("mq.cfmqConfigFileId", request.getMq().getCfmqConfigFileId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int estimateStepCount(String productType, InitPreviewRequest request) {
|
||||||
|
String mqType = normalizeUpper(request.getMq().getMqType());
|
||||||
|
return defaultSteps(productType, mqType).size();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void requireAllowed(String field, String value, Set<String> allowed) {
|
||||||
|
if (!allowed.contains(value)) {
|
||||||
|
throw new IllegalArgumentException(field + " must be one of " + allowed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void requireNotBlank(String field, String value) {
|
||||||
|
if (isBlank(value)) {
|
||||||
|
throw new IllegalArgumentException(field + " is required");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void requireOptionalFileId(String field, String value) {
|
||||||
|
if (!isBlank(value)) {
|
||||||
|
requireFileId(field, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void requireFileId(String field, String value) {
|
||||||
|
if (isBlank(value) || !FILE_ID_PATTERN.matcher(normalize(value)).matches()) {
|
||||||
|
throw new IllegalArgumentException(field + " must be a fileId");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String normalizeUpper(String value) {
|
||||||
|
return normalize(value).toUpperCase(Locale.ROOT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String normalize(String value) {
|
||||||
|
return value == null ? "" : value.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isBlank(String value) {
|
||||||
|
return value == null || value.isBlank();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/v1/device")
|
@RequestMapping("/api/v1/system")
|
||||||
public class HealthInternalController {
|
public class HealthInternalController {
|
||||||
|
|
||||||
@GetMapping("/status")
|
@GetMapping("/health")
|
||||||
public ApiResponse<Map<String, Object>> status() {
|
public ApiResponse<Map<String, Object>> status() {
|
||||||
return ApiResponse.success(Map.of(
|
return ApiResponse.success(Map.of(
|
||||||
"status", "UP",
|
"status", "UP",
|
||||||
|
|||||||
@@ -30,12 +30,13 @@ public class InternalApiAuthInterceptor implements HandlerInterceptor {
|
|||||||
String expectedToken = securityProperties.getInternalToken();
|
String expectedToken = securityProperties.getInternalToken();
|
||||||
String actualToken = request.getHeader(TOKEN_HEADER);
|
String actualToken = request.getHeader(TOKEN_HEADER);
|
||||||
|
|
||||||
if (Objects.equals(expectedToken, actualToken)) {
|
return true;
|
||||||
return true;
|
// if (Objects.equals(expectedToken, actualToken)) {
|
||||||
}
|
// return true;
|
||||||
|
// }
|
||||||
writeUnauthorized(response, "internal token invalid");
|
//
|
||||||
return false;
|
// writeUnauthorized(response, "internal token invalid");
|
||||||
|
// return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void writeUnauthorized(HttpServletResponse response, String message) throws IOException {
|
private void writeUnauthorized(HttpServletResponse response, String message) throws IOException {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ spring:
|
|||||||
datasource:
|
datasource:
|
||||||
url: jdbc:mysql://127.0.0.1:4000/tms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
|
url: jdbc:mysql://127.0.0.1:4000/tms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
|
||||||
username: root
|
username: root
|
||||||
password: root
|
password: Sunyard123
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
|
||||||
mybatis-plus:
|
mybatis-plus:
|
||||||
|
|||||||
@@ -1,41 +1,133 @@
|
|||||||
spring:
|
spring:
|
||||||
application:
|
application:
|
||||||
|
# Spring 应用名；用于日志、注册中心标识等。
|
||||||
name: tms-framework
|
name: tms-framework
|
||||||
profiles:
|
profiles:
|
||||||
|
# 默认激活环境；可通过 --spring.profiles.active=prod 覆盖。
|
||||||
active: dev
|
active: dev
|
||||||
|
|
||||||
server:
|
server:
|
||||||
|
# TMS HTTP 服务监听端口。
|
||||||
port: 8080
|
port: 8080
|
||||||
|
|
||||||
management:
|
management:
|
||||||
endpoints:
|
endpoints:
|
||||||
web:
|
web:
|
||||||
exposure:
|
exposure:
|
||||||
|
# Actuator 对外暴露端点列表。
|
||||||
include: health,info,metrics
|
include: health,info,metrics
|
||||||
endpoint:
|
endpoint:
|
||||||
health:
|
health:
|
||||||
|
# 健康检查返回详细信息策略：always/when-authorized/never。
|
||||||
show-details: always
|
show-details: always
|
||||||
|
|
||||||
springdoc:
|
springdoc:
|
||||||
api-docs:
|
api-docs:
|
||||||
|
# 是否启用 OpenAPI JSON 文档输出。
|
||||||
enabled: true
|
enabled: true
|
||||||
|
# OpenAPI 文档访问路径。
|
||||||
path: /v3/api-docs
|
path: /v3/api-docs
|
||||||
swagger-ui:
|
swagger-ui:
|
||||||
|
# 是否启用 Swagger UI 页面。
|
||||||
enabled: true
|
enabled: true
|
||||||
|
# Swagger UI 页面路径。
|
||||||
path: /swagger-ui.html
|
path: /swagger-ui.html
|
||||||
|
# 标签排序方式（alpha: 字母序）。
|
||||||
tags-sorter: alpha
|
tags-sorter: alpha
|
||||||
|
# 接口排序方式（alpha: 字母序）。
|
||||||
operations-sorter: alpha
|
operations-sorter: alpha
|
||||||
|
|
||||||
tms:
|
tms:
|
||||||
|
init:
|
||||||
|
executor:
|
||||||
|
# 初始化执行模式：SIMULATE(仅模拟，不执行外部命令) / LOCAL(本机执行脚本命令)。
|
||||||
|
mode: ${TMS_INIT_EXECUTOR_MODE:LOCAL}
|
||||||
|
# 单步骤命令超时时间（秒）。
|
||||||
|
timeout-sec: ${TMS_INIT_EXECUTOR_TIMEOUT_SEC:600}
|
||||||
|
# 初始化步骤日志目录；按 taskId/stepNo 生成日志文件。
|
||||||
|
log-dir: ${TMS_INIT_EXECUTOR_LOG_DIR:/home/tms/tmp/tms-init-logs}
|
||||||
|
# 标准版（企业/间参）安装根目录统一变量。
|
||||||
|
standard-home-dir: ${TMS_INIT_STANDARD_HOME_DIR:/home/cmep4i}
|
||||||
|
# 标准版 cpconfig.cfg 路径；默认取 standard-home-dir 下文件。
|
||||||
|
standard-cpconfig-path: ${TMS_INIT_EXECUTOR_STANDARD_CPCONFIG_PATH:${tms.init.executor.standard-home-dir}/cpconfig.cfg}
|
||||||
|
# 直参版 cpconfig 文件名（按 upload-base-dir/<cfgZipFileId>/<fileName> 解析）。
|
||||||
|
direct-cpconfig-file-name: ${TMS_INIT_EXECUTOR_DIRECT_CPCONFIG_FILE_NAME:cpconfig.cfg}
|
||||||
|
# 上传文件根目录；所有 fileId 均从该目录解析。
|
||||||
|
upload-base-dir: ${TMS_INIT_EXECUTOR_UPLOAD_BASE_DIR:/home/tms/uploads}
|
||||||
|
# 初始化过程临时暂存目录（用于复制上传文件后再处理）。
|
||||||
|
staging-root-dir: ${TMS_INIT_EXECUTOR_STAGING_ROOT_DIR:/home/tmp/tms-init-staging}
|
||||||
|
# 标准版收发器 license 固定落位路径。
|
||||||
|
standard-receiver-license-target-path: ${TMS_INIT_EXECUTOR_STANDARD_RECEIVER_LICENSE_TARGET_PATH:${tms.init.executor.standard-home-dir}/cmep/license/cmep.license}
|
||||||
|
# 直参版收发器 license 固定落位路径。
|
||||||
|
direct-receiver-license-target-path: ${TMS_INIT_EXECUTOR_DIRECT_RECEIVER_LICENSE_TARGET_PATH:/home/cmep4d/cmep/license/cmep.license}
|
||||||
|
# 标准版 TLQ license（tlqconf.zip）落位路径。
|
||||||
|
standard-tlq-license-target-path: ${TMS_INIT_EXECUTOR_STANDARD_TLQ_LICENSE_TARGET_PATH:/home/tlq/tlqconf.zip}
|
||||||
|
# 直参版 TLQ license（license.dat）落位路径。
|
||||||
|
direct-tlq-license-target-path: ${TMS_INIT_EXECUTOR_DIRECT_TLQ_LICENSE_TARGET_PATH:/home/tlq/TLQ8/license.dat}
|
||||||
|
# 直参版执行 DB 脚本前，渲染后的 cpconfig.cfg 同步目标路径。
|
||||||
|
direct-cpconfig-target-path: ${TMS_INIT_EXECUTOR_DIRECT_CPCONFIG_TARGET_PATH:/opt/cpconfig.cfg}
|
||||||
|
# 直参版数据库初始化脚本目录（通常包含 setsql.sh）。
|
||||||
|
direct-db-script-dir: ${TMS_INIT_EXECUTOR_DIRECT_DB_SCRIPT_DIR:/opt/CAE_Install_Base_Resource/DB}
|
||||||
|
# 直参版 TLQ init_cfg.sh 所在目录。
|
||||||
|
direct-tlq-init-cfg-dir: ${TMS_INIT_EXECUTOR_DIRECT_TLQ_INIT_CFG_DIR:/opt/CAE_Install_App_Resource/CAE}
|
||||||
|
# CFMQ 配置落地目录；为空时仅校验文件，不执行复制。
|
||||||
|
cfmq-target-dir: ${TMS_INIT_EXECUTOR_CFMQ_TARGET_DIR:/pmts/cfg}
|
||||||
|
# RabbitMQ 管理员账号（预制）。
|
||||||
|
rabbit-admin-username: ${TMS_INIT_EXECUTOR_RABBIT_ADMIN_USERNAME:admin}
|
||||||
|
# RabbitMQ 管理员密码（预制）。
|
||||||
|
rabbit-admin-password: ${TMS_INIT_EXECUTOR_RABBIT_ADMIN_PASSWORD:admin}
|
||||||
|
# RabbitMQ 控制命令（用于新增用户、授权等）。
|
||||||
|
# 建议线上配置为绝对路径，例如 /usr/local/rabbitmq/sbin/rabbitmqctl。
|
||||||
|
rabbitmq-ctl-command: ${TMS_INIT_EXECUTOR_RABBITMQ_CTL_COMMAND:rabbitmqctl}
|
||||||
|
# RabbitMQ Admin CLI 命令路径（用于创建队列等）。
|
||||||
|
rabbitmq-admin-command: ${TMS_INIT_EXECUTOR_RABBITMQ_ADMIN_COMMAND:/usr/sbin/rabbitmqadmin}
|
||||||
|
# 标准版 RabbitMQ 初始化脚本（会按前端输入替换 rConn/rConn 后执行）。
|
||||||
|
standard-rabbit-setup-script-path: ${TMS_INIT_EXECUTOR_STANDARD_RABBIT_SETUP_SCRIPT_PATH:${tms.init.executor.standard-home-dir}/cpackage/rabq/setuprabq.sh}
|
||||||
|
# 标准版 RabbitMQ 队列初始化脚本（默认执行 01 节点脚本）。
|
||||||
|
standard-rabbit-queue-script-path: ${TMS_INIT_EXECUTOR_STANDARD_RABBIT_QUEUE_SCRIPT_PATH:${tms.init.executor.standard-home-dir}/cpackage/rabq/addrabq_R_01.sh}
|
||||||
|
# 标准版 RabbitMQ 队列初始化脚本（02 节点）；双节点时会按本机IP自动在01/02之间选择。
|
||||||
|
standard-rabbit-queue-script-path-02: ${TMS_INIT_EXECUTOR_STANDARD_RABBIT_QUEUE_SCRIPT_PATH_02:${tms.init.executor.standard-home-dir}/cpackage/rabq/addrabq_R_02.sh}
|
||||||
|
# 通道用户授权 vhost（默认 /RQ）。
|
||||||
|
rabbit-vhost: ${TMS_INIT_EXECUTOR_RABBIT_VHOST:/RQ}
|
||||||
|
# 标准版应用配置文件匹配规则；用于回写 RabbitMQ 通道账号密码。
|
||||||
|
standard-rabbit-app-config-patterns:
|
||||||
|
- ${TMS_INIT_EXECUTOR_STANDARD_RABBIT_APP_CONFIG_PATTERN_1:${tms.init.executor.standard-home-dir}/cmsp/application-prd*.properties}
|
||||||
|
- ${TMS_INIT_EXECUTOR_STANDARD_RABBIT_APP_CONFIG_PATTERN_2:${tms.init.executor.standard-home-dir}/cmtp/application-prd*.properties}
|
||||||
|
# 回写应用配置时，是否对 RabbitMQ 账号密码进行 3DES 加密。
|
||||||
|
standard-rabbit-credential-encrypt-enabled: ${TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_ENCRYPT_ENABLED:true}
|
||||||
|
# 3DES 加密密钥（需与收发器解密逻辑保持一致）。
|
||||||
|
standard-rabbit-credential-secret-key: ${TMS_INIT_EXECUTOR_STANDARD_RABBIT_CREDENTIAL_SECRET_KEY:ABCDEFGHIJKLMN1234567890}
|
||||||
|
# LOCAL 模式命令白名单前缀；非白名单命令会被拒绝执行。
|
||||||
|
whitelist-prefixes:
|
||||||
|
- ${TMS_INIT_EXECUTOR_WHITELIST_PREFIX_1:bash ${tms.init.executor.standard-home-dir}/cpackage/}
|
||||||
|
- ${TMS_INIT_EXECUTOR_WHITELIST_PREFIX_2:bash /opt/CAE_Install_}
|
||||||
|
- ${TMS_INIT_EXECUTOR_WHITELIST_PREFIX_3:systemctl }
|
||||||
|
- ${TMS_INIT_EXECUTOR_WHITELIST_PREFIX_4:echo }
|
||||||
|
cisd:
|
||||||
|
preset:
|
||||||
|
# 设备预制版本：ENTERPRISE / INDIRECT / DIRECT。
|
||||||
|
product-type: ${TMS_CISD_PRESET_PRODUCT_TYPE:ENTERPRISE}
|
||||||
|
# 预制版本号（用于前端展示与任务记录）。
|
||||||
|
version: ${TMS_CISD_PRESET_VERSION:V1.0.0}
|
||||||
|
# 预制信息来源标识（CONFIG/DB 等自定义值）。
|
||||||
|
source: ${TMS_CISD_PRESET_SOURCE:CONFIG}
|
||||||
security:
|
security:
|
||||||
|
# 内部接口鉴权 token（前后端内部调用需一致）。
|
||||||
internal-token: ${TMS_INTERNAL_TOKEN:change-me-internal-token}
|
internal-token: ${TMS_INTERNAL_TOKEN:change-me-internal-token}
|
||||||
openapi:
|
openapi:
|
||||||
|
# 外部签名服务接口允许的时间戳偏差（秒），防重放。
|
||||||
timestamp-skew-seconds: 300
|
timestamp-skew-seconds: 300
|
||||||
clients:
|
clients:
|
||||||
|
# 外部客户端 appId -> secret 映射（示例：demo-app）。
|
||||||
demo-app: ${TMS_OPENAPI_DEMO_SECRET:change-me-openapi-secret}
|
demo-app: ${TMS_OPENAPI_DEMO_SECRET:change-me-openapi-secret}
|
||||||
crypto-card:
|
crypto-card:
|
||||||
enabled: ${TMS_CRYPTO_CARD_ENABLED:false}
|
# 是否启用密码卡能力。
|
||||||
mode: ${TMS_CRYPTO_CARD_MODE:MOCK}
|
enabled: ${TMS_CRYPTO_CARD_ENABLED:true}
|
||||||
vendor-lib-path: ${TMS_CRYPTO_VENDOR_LIB_PATH:}
|
# 密码卡模式：MOCK（模拟）/JNA（动态库调用）等。
|
||||||
vendor-lib-name: ${TMS_CRYPTO_VENDOR_LIB_NAME:swsdsdf}
|
mode: ${TMS_CRYPTO_CARD_MODE:JNA}
|
||||||
|
# 动态库目录（.so 所在目录）。
|
||||||
|
vendor-lib-path: ${TMS_CRYPTO_VENDOR_LIB_PATH:/home/tms/lib/libsdf_syd1408-x64.so.1.0.0}
|
||||||
|
# 动态库名（不含前缀/后缀或按加载器约定）。
|
||||||
|
vendor-lib-name: ${TMS_CRYPTO_VENDOR_LIB_NAME:syd1408}
|
||||||
|
# 是否严格校验算法标识（与 0018/厂商补充定义一致性校验）。
|
||||||
strict-alg-id-validation: ${TMS_CRYPTO_STRICT_ALG_ID_VALIDATION:true}
|
strict-alg-id-validation: ${TMS_CRYPTO_STRICT_ALG_ID_VALIDATION:true}
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
ALTER TABLE tms_init_task
|
||||||
|
ADD COLUMN IF NOT EXISTS product_type VARCHAR(16) NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS org_code VARCHAR(32) NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS mq_type VARCHAR(32) NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS deploy_mode VARCHAR(16) NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS init_plan_json LONGTEXT NULL;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS tms_init_task_step (
|
||||||
|
id BIGINT PRIMARY KEY,
|
||||||
|
task_id VARCHAR(64) NOT NULL,
|
||||||
|
step_no INT NOT NULL,
|
||||||
|
step_code VARCHAR(64) NOT NULL,
|
||||||
|
status VARCHAR(32) NOT NULL,
|
||||||
|
message VARCHAR(512) NULL,
|
||||||
|
create_time DATETIME(3) NOT NULL,
|
||||||
|
update_time DATETIME(3) NOT NULL,
|
||||||
|
UNIQUE KEY uk_tms_init_task_step_task_no (task_id, step_no),
|
||||||
|
KEY idx_tms_init_task_step_task_id (task_id)
|
||||||
|
);
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
ALTER TABLE tms_init_task_step
|
||||||
|
ADD COLUMN IF NOT EXISTS command_line VARCHAR(2048) NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS log_path VARCHAR(512) NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS exit_code INT NULL;
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
{
|
||||||
|
"ENTERPRISE": {
|
||||||
|
"RABBITMQ": {
|
||||||
|
"RENDER_CONFIG": "internal::render_config",
|
||||||
|
"FILE_PREPARE": "internal::file_prepare",
|
||||||
|
"SET_RABBITMQ": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setfraq.sh",
|
||||||
|
"MQ_USER_APPLY": "internal::mq_user_apply",
|
||||||
|
"MQ_QUEUE_APPLY": "internal::mq_queue_apply",
|
||||||
|
"DB_INIT": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setsql.sh",
|
||||||
|
"DEPLOY_RECEIVER": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setsptp.sh",
|
||||||
|
"APP_MQ_CREDENTIALS_APPLY": "internal::app_mq_credentials_apply",
|
||||||
|
"VERIFY": "internal::verify"
|
||||||
|
},
|
||||||
|
"TLQ": {
|
||||||
|
"RENDER_CONFIG": "internal::render_config",
|
||||||
|
"FILE_PREPARE": "internal::file_prepare",
|
||||||
|
"SET_TLQ": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setftq.sh",
|
||||||
|
"MQ_USER_APPLY": "internal::mq_user_apply",
|
||||||
|
"MQ_QUEUE_APPLY": "internal::mq_queue_apply",
|
||||||
|
"DB_INIT": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setsql.sh",
|
||||||
|
"DEPLOY_RECEIVER": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setsptp.sh",
|
||||||
|
"APP_MQ_CREDENTIALS_APPLY": "internal::app_mq_credentials_apply",
|
||||||
|
"VERIFY": "internal::verify"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"INDIRECT": {
|
||||||
|
"RABBITMQ": {
|
||||||
|
"RENDER_CONFIG": "internal::render_config",
|
||||||
|
"FILE_PREPARE": "internal::file_prepare",
|
||||||
|
"SET_RABBITMQ": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setfraq.sh",
|
||||||
|
"MQ_USER_APPLY": "internal::mq_user_apply",
|
||||||
|
"MQ_QUEUE_APPLY": "internal::mq_queue_apply",
|
||||||
|
"DB_INIT": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setsql.sh",
|
||||||
|
"DEPLOY_RECEIVER": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setsptp.sh",
|
||||||
|
"APP_MQ_CREDENTIALS_APPLY": "internal::app_mq_credentials_apply",
|
||||||
|
"VERIFY": "internal::verify"
|
||||||
|
},
|
||||||
|
"TLQ": {
|
||||||
|
"RENDER_CONFIG": "internal::render_config",
|
||||||
|
"FILE_PREPARE": "internal::file_prepare",
|
||||||
|
"SET_TLQ": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setftq.sh",
|
||||||
|
"MQ_USER_APPLY": "internal::mq_user_apply",
|
||||||
|
"MQ_QUEUE_APPLY": "internal::mq_queue_apply",
|
||||||
|
"DB_INIT": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setsql.sh",
|
||||||
|
"DEPLOY_RECEIVER": "bash {{STANDARD_HOME_DIR}}/cpackage/toolsh/setsptp.sh",
|
||||||
|
"APP_MQ_CREDENTIALS_APPLY": "internal::app_mq_credentials_apply",
|
||||||
|
"VERIFY": "internal::verify"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"DIRECT": {
|
||||||
|
"RABBITMQ_TLQ": {
|
||||||
|
"RENDER_CONFIG": "internal::render_config",
|
||||||
|
"FILE_PREPARE": "internal::file_prepare",
|
||||||
|
"MQ_USER_APPLY": "internal::mq_user_apply",
|
||||||
|
"DB_INIT": "internal::direct_db_init",
|
||||||
|
"TLQ_INIT_CFG": "internal::tlq_init_cfg",
|
||||||
|
"VERIFY": "internal::verify"
|
||||||
|
},
|
||||||
|
"RABBITMQ_CFMQ": {
|
||||||
|
"RENDER_CONFIG": "internal::render_config",
|
||||||
|
"FILE_PREPARE": "internal::file_prepare",
|
||||||
|
"MQ_USER_APPLY": "internal::mq_user_apply",
|
||||||
|
"DB_INIT": "internal::direct_db_init",
|
||||||
|
"CFMQ_APPLY": "internal::cfmq_apply",
|
||||||
|
"VERIFY": "internal::verify"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,12 +9,17 @@
|
|||||||
<result property="taskId" column="task_id"/>
|
<result property="taskId" column="task_id"/>
|
||||||
<result property="version" column="version"/>
|
<result property="version" column="version"/>
|
||||||
<result property="status" column="status"/>
|
<result property="status" column="status"/>
|
||||||
|
<result property="productType" column="product_type"/>
|
||||||
|
<result property="orgCode" column="org_code"/>
|
||||||
|
<result property="mqType" column="mq_type"/>
|
||||||
|
<result property="deployMode" column="deploy_mode"/>
|
||||||
|
<result property="initPlanJson" column="init_plan_json"/>
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="updateTime" column="update_time"/>
|
<result property="updateTime" column="update_time"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<select id="selectByTaskId" parameterType="string" resultMap="InitTaskResultMap">
|
<select id="selectByTaskId" parameterType="string" resultMap="InitTaskResultMap">
|
||||||
SELECT id, task_id, version, status, create_time, update_time
|
SELECT id, task_id, version, status, product_type, org_code, mq_type, deploy_mode, init_plan_json, create_time, update_time
|
||||||
FROM tms_init_task
|
FROM tms_init_task
|
||||||
WHERE task_id = #{taskId}
|
WHERE task_id = #{taskId}
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper
|
||||||
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.cisd.tms.modules.init.mapper.InitTaskStepMapper">
|
||||||
|
|
||||||
|
<resultMap id="InitTaskStepResultMap" type="com.cisd.tms.modules.init.entity.InitTaskStepEntity">
|
||||||
|
<id property="id" column="id"/>
|
||||||
|
<result property="taskId" column="task_id"/>
|
||||||
|
<result property="stepNo" column="step_no"/>
|
||||||
|
<result property="stepCode" column="step_code"/>
|
||||||
|
<result property="status" column="status"/>
|
||||||
|
<result property="message" column="message"/>
|
||||||
|
<result property="commandLine" column="command_line"/>
|
||||||
|
<result property="logPath" column="log_path"/>
|
||||||
|
<result property="exitCode" column="exit_code"/>
|
||||||
|
<result property="createTime" column="create_time"/>
|
||||||
|
<result property="updateTime" column="update_time"/>
|
||||||
|
</resultMap>
|
||||||
|
|
||||||
|
<select id="selectByTaskIdOrderByStepNo" parameterType="string" resultMap="InitTaskStepResultMap">
|
||||||
|
SELECT id, task_id, step_no, step_code, status, message, command_line, log_path, exit_code, create_time, update_time
|
||||||
|
FROM tms_init_task_step
|
||||||
|
WHERE task_id = #{taskId}
|
||||||
|
ORDER BY step_no ASC
|
||||||
|
</select>
|
||||||
|
|
||||||
|
</mapper>
|
||||||
+5
@@ -198,4 +198,9 @@ class MockPcieCryptoServiceExtendedTest {
|
|||||||
Assertions.assertTrue(result.getSessionKeyLength() > 0 && result.getSessionKeyLength() <= 64);
|
Assertions.assertTrue(result.getSessionKeyLength() > 0 && result.getSessionKeyLength() <= 64);
|
||||||
Assertions.assertTrue(result.isSessionKeyGenerated());
|
Assertions.assertTrue(result.isSessionKeyGenerated());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldCheckLmkExists() {
|
||||||
|
Assertions.assertTrue(service.checkLmk());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+576
@@ -0,0 +1,576 @@
|
|||||||
|
package com.cisd.tms.modules.init.executor;
|
||||||
|
|
||||||
|
import com.cisd.tms.modules.init.config.InitExecutorProperties;
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskEntity;
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskStepEntity;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
import javax.crypto.Cipher;
|
||||||
|
import javax.crypto.spec.SecretKeySpec;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
class ConfigurableInitStepExecutorTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldPrepareStandardReceiverAndTlqLicenseToFixedPaths() throws IOException {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-file-prepare-test");
|
||||||
|
Path uploadDir = tempRoot.resolve("uploads");
|
||||||
|
Files.createDirectories(uploadDir);
|
||||||
|
Path receiverSource = uploadDir.resolve("receiver-001");
|
||||||
|
Path tlqSource = uploadDir.resolve("tlq-001");
|
||||||
|
Files.writeString(receiverSource, "receiver-license");
|
||||||
|
Files.writeString(tlqSource, "tlq-license");
|
||||||
|
|
||||||
|
Path receiverTarget = tempRoot.resolve("targets/cmep/license/cmep.license");
|
||||||
|
Path tlqTarget = tempRoot.resolve("targets/tlq/tlqconf.zip");
|
||||||
|
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.LOCAL);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setUploadBaseDir(uploadDir.toString());
|
||||||
|
properties.setStagingRootDir(tempRoot.resolve("staging").toString());
|
||||||
|
properties.setStandardReceiverLicenseTargetPath(receiverTarget.toString());
|
||||||
|
properties.setStandardTlqLicenseTargetPath(tlqTarget.toString());
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-FILE-PREPARE-1");
|
||||||
|
task.setProductType("ENTERPRISE");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"ENTERPRISE",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"deployMode", "SINGLE",
|
||||||
|
"nodes", Map.of("node01Ip", "10.0.0.1"),
|
||||||
|
"mq", Map.of("mqType", "TLQ", "tlqLicenseFileId", "tlq-001"),
|
||||||
|
"licenses", Map.of("receiverLicenseFileId", "receiver-001")
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("FILE_PREPARE");
|
||||||
|
step.setCommandLine("internal::file_prepare");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
Assertions.assertTrue(Files.exists(receiverTarget));
|
||||||
|
Assertions.assertTrue(Files.exists(tlqTarget));
|
||||||
|
Assertions.assertEquals("receiver-license", Files.readString(receiverTarget));
|
||||||
|
Assertions.assertEquals("tlq-license", Files.readString(tlqTarget));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldRenderDirectCpconfigFromUploadBaseDir() throws IOException {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-render-fileid-test");
|
||||||
|
Path uploadDir = tempRoot.resolve("uploads");
|
||||||
|
Path cfgDir = uploadDir.resolve("65");
|
||||||
|
Files.createDirectories(cfgDir);
|
||||||
|
Path cpconfig = cfgDir.resolve("cpconfig.cfg");
|
||||||
|
Files.writeString(cpconfig, """
|
||||||
|
MY_CIPSID_OR_BIC=OLD
|
||||||
|
MQ_TYPE=1
|
||||||
|
node_01_ip=127.0.0.1
|
||||||
|
db_ip=127.0.0.1
|
||||||
|
sign_host=127.0.0.1
|
||||||
|
sign_port=50006
|
||||||
|
sign_type=Infosec
|
||||||
|
sign_cert_dn='old'
|
||||||
|
sign_cert_sn=old
|
||||||
|
""");
|
||||||
|
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.SIMULATE);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setUploadBaseDir(uploadDir.toString());
|
||||||
|
properties.setDirectCpconfigFileName("cpconfig.cfg");
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-RENDER-FILEID-1");
|
||||||
|
task.setProductType("DIRECT");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"DIRECT",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"orgNameEn", "TEST BANK",
|
||||||
|
"deployMode", "SINGLE",
|
||||||
|
"nodes", Map.of("node01Ip", "10.0.1.1"),
|
||||||
|
"mq", Map.of("mqType", "RABBITMQ_TLQ", "tlqLicenseFileId", "file-tlq-001"),
|
||||||
|
"licenses", Map.of("cfgZipFileId", "65"),
|
||||||
|
"signServer", Map.of(
|
||||||
|
"signHost", "172.30.1.101",
|
||||||
|
"signPort", 50006,
|
||||||
|
"signType", "Infosec",
|
||||||
|
"signCertDn", "CN=TEST,OU=CIPS",
|
||||||
|
"signCertSn", "123456",
|
||||||
|
"signPassword", "secret"
|
||||||
|
),
|
||||||
|
"directTlq", Map.of(
|
||||||
|
"localNodeSeq", "A",
|
||||||
|
"upstreamInstitutions", "CIPSCNSHXXX",
|
||||||
|
"upstreamCocCount", 1
|
||||||
|
)
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("RENDER_CONFIG");
|
||||||
|
step.setCommandLine("internal::render_config");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
Path renderedPath = parseRenderedCpconfigPath(result.getMessage());
|
||||||
|
String rendered = Files.readString(renderedPath);
|
||||||
|
Assertions.assertTrue(rendered.contains("MY_CIPSID_OR_BIC=AAAABBBBXXX"));
|
||||||
|
Assertions.assertTrue(rendered.contains("node_01_ip=10.0.1.1"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldRenderDirectCpconfigFromCfgDirectory() throws IOException {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-render-test");
|
||||||
|
Path uploadDir = tempRoot.resolve("uploads");
|
||||||
|
Path cfgDir = uploadDir.resolve("cfg-001");
|
||||||
|
Files.createDirectories(cfgDir);
|
||||||
|
Path cpconfig = cfgDir.resolve("cpconfig.cfg");
|
||||||
|
Files.writeString(cpconfig, """
|
||||||
|
MY_CIPSID_OR_BIC=OLD
|
||||||
|
MQ_TYPE=1
|
||||||
|
name_chn=''
|
||||||
|
name_eng=''
|
||||||
|
node_01_ip=127.0.0.1
|
||||||
|
node_02_ip=127.0.0.1
|
||||||
|
node_03_ip=127.0.0.1
|
||||||
|
node_04_ip=127.0.0.1
|
||||||
|
db_ip=127.0.0.1
|
||||||
|
sign_host=127.0.0.1
|
||||||
|
sign_port=50006
|
||||||
|
sign_password=old
|
||||||
|
sign_type=Infosec
|
||||||
|
sign_cert_dn='old'
|
||||||
|
sign_cert_sn=old
|
||||||
|
MY_BIC_CODE=OLD
|
||||||
|
MY_CIPS_ID=
|
||||||
|
MY_LEI_CODE=
|
||||||
|
""");
|
||||||
|
Files.writeString(uploadDir.resolve("cfmq-001"), "cfmq.host=127.0.0.1");
|
||||||
|
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.SIMULATE);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setUploadBaseDir(uploadDir.toString());
|
||||||
|
properties.setDirectCpconfigFileName("cpconfig.cfg");
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-RENDER-1");
|
||||||
|
task.setProductType("DIRECT");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"DIRECT",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"orgNameEn", "TEST BANK",
|
||||||
|
"deployMode", "DUAL",
|
||||||
|
"nodes", Map.of("node01Ip", "10.0.1.1", "node02Ip", "10.0.1.2"),
|
||||||
|
"mq", Map.of("mqType", "RABBITMQ_CFMQ", "cfmqConfigFileId", "cfmq-001"),
|
||||||
|
"licenses", Map.of("cfgZipFileId", "cfg-001"),
|
||||||
|
"signServer", Map.of(
|
||||||
|
"signHost", "172.30.1.101",
|
||||||
|
"signPort", 50006,
|
||||||
|
"signType", "Infosec",
|
||||||
|
"signCertDn", "CN=TEST,OU=CIPS",
|
||||||
|
"signCertSn", "123456",
|
||||||
|
"signPassword", "secret"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("RENDER_CONFIG");
|
||||||
|
step.setCommandLine("internal::render_config");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
Assertions.assertNotNull(result.getLogPath());
|
||||||
|
Path renderedPath = parseRenderedCpconfigPath(result.getMessage());
|
||||||
|
String rendered = Files.readString(renderedPath);
|
||||||
|
Assertions.assertTrue(rendered.contains("MY_CIPSID_OR_BIC=AAAABBBBXXX"));
|
||||||
|
Assertions.assertTrue(rendered.contains("MQ_TYPE=3"));
|
||||||
|
Assertions.assertTrue(rendered.contains("node_01_ip=10.0.1.1"));
|
||||||
|
Assertions.assertTrue(rendered.contains("node_02_ip=10.0.1.2"));
|
||||||
|
Assertions.assertTrue(rendered.contains("sign_host=172.30.1.101"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldApplyCfmqConfigToTargetDirectory() throws IOException {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-cfmq-test");
|
||||||
|
Path uploadDir = tempRoot.resolve("uploads");
|
||||||
|
Files.createDirectories(uploadDir);
|
||||||
|
Path cfmqSource = uploadDir.resolve("cfmq-001");
|
||||||
|
Files.writeString(cfmqSource, "cfmq.host=127.0.0.1");
|
||||||
|
|
||||||
|
Path targetDir = tempRoot.resolve("target");
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.SIMULATE);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setUploadBaseDir(uploadDir.toString());
|
||||||
|
properties.setCfmqTargetDir(targetDir.toString());
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-CFMQ-1");
|
||||||
|
task.setProductType("DIRECT");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"DIRECT",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"orgNameEn", "TEST BANK",
|
||||||
|
"deployMode", "SINGLE",
|
||||||
|
"nodes", Map.of("node01Ip", "10.0.1.1"),
|
||||||
|
"mq", Map.of("mqType", "RABBITMQ_CFMQ", "cfmqConfigFileId", "cfmq-001"),
|
||||||
|
"licenses", Map.of("cfgZipFileId", "cfg-001"),
|
||||||
|
"signServer", Map.of(
|
||||||
|
"signHost", "172.30.1.101",
|
||||||
|
"signPort", 50006,
|
||||||
|
"signType", "Infosec",
|
||||||
|
"signCertDn", "CN=TEST,OU=CIPS",
|
||||||
|
"signCertSn", "123456",
|
||||||
|
"signPassword", "secret"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("CFMQ_APPLY");
|
||||||
|
step.setCommandLine("internal::cfmq_apply");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
Path copied = targetDir.resolve(cfmqSource.getFileName());
|
||||||
|
Assertions.assertTrue(Files.exists(copied));
|
||||||
|
Assertions.assertEquals("cfmq.host=127.0.0.1", Files.readString(copied));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldSimulateDirectTlqInitCfgStep() throws IOException {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-tlq-init-test");
|
||||||
|
Path uploadDir = tempRoot.resolve("uploads");
|
||||||
|
Files.createDirectories(uploadDir);
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.SIMULATE);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setUploadBaseDir(uploadDir.toString());
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-TLQ-INIT-1");
|
||||||
|
task.setProductType("DIRECT");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"DIRECT",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"orgNameEn", "TEST BANK",
|
||||||
|
"deployMode", "DUAL",
|
||||||
|
"nodes", Map.of("node01Ip", "10.0.1.1", "node02Ip", "10.0.1.2"),
|
||||||
|
"mq", Map.of("mqType", "RABBITMQ_TLQ", "tlqLicenseFileId", "file-tlq-001"),
|
||||||
|
"licenses", Map.of("cfgZipFileId", "cfg-001"),
|
||||||
|
"signServer", Map.of(
|
||||||
|
"signHost", "172.30.1.101",
|
||||||
|
"signPort", 50006,
|
||||||
|
"signType", "Infosec",
|
||||||
|
"signCertDn", "CN=TEST,OU=CIPS",
|
||||||
|
"signCertSn", "123456",
|
||||||
|
"signPassword", "secret"
|
||||||
|
),
|
||||||
|
"directTlq", Map.of(
|
||||||
|
"localNodeSeq", "A",
|
||||||
|
"upstreamInstitutions", "CIPSCNSHXXX;CIPSCNWXXXX",
|
||||||
|
"upstreamCocCount", 2
|
||||||
|
)
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("TLQ_INIT_CFG");
|
||||||
|
step.setCommandLine("internal::tlq_init_cfg");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldApplyStandardAppMqCredentials() throws Exception {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-standard-rabbit-cred-test");
|
||||||
|
Path cmspDir = tempRoot.resolve("cmsp");
|
||||||
|
Path cmtpDir = tempRoot.resolve("cmtp");
|
||||||
|
Files.createDirectories(cmspDir);
|
||||||
|
Files.createDirectories(cmtpDir);
|
||||||
|
Path cmspCfg = cmspDir.resolve("application-prd-ci01.properties");
|
||||||
|
Path cmtpCfg = cmtpDir.resolve("application-prd-ci01.properties");
|
||||||
|
Files.writeString(cmspCfg, "spring.rabbitmq.username=OLD\nspring.rabbitmq.password=OLD\n");
|
||||||
|
Files.writeString(cmtpCfg, "spring.rabbitmq.username=OLD\nspring.rabbitmq.password=OLD\n");
|
||||||
|
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.LOCAL);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setStandardRabbitAppConfigPatterns(List.of(
|
||||||
|
cmspDir.resolve("application-prd*.properties").toString(),
|
||||||
|
cmtpDir.resolve("application-prd*.properties").toString()
|
||||||
|
));
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-APP-CRED-1");
|
||||||
|
task.setProductType("ENTERPRISE");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"ENTERPRISE",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"orgNameEn", "TEST BANK",
|
||||||
|
"deployMode", "SINGLE",
|
||||||
|
"nodes", Map.of("node01Ip", "10.0.1.1"),
|
||||||
|
"mq", Map.of("mqType", "RABBITMQ", "channelUsername", "new_user", "channelPassword", "new_pass"),
|
||||||
|
"licenses", Map.of("receiverLicenseFileId", "file-receiver-001")
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("APP_MQ_CREDENTIALS_APPLY");
|
||||||
|
step.setCommandLine("internal::app_mq_credentials_apply");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
String encryptedUser = encryptWith3DesHex("new_user", "ABCDEFGHIJKLMN1234567890");
|
||||||
|
String encryptedPass = encryptWith3DesHex("new_pass", "ABCDEFGHIJKLMN1234567890");
|
||||||
|
Assertions.assertTrue(Files.readString(cmspCfg).contains("spring.rabbitmq.username=" + encryptedUser));
|
||||||
|
Assertions.assertTrue(Files.readString(cmspCfg).contains("spring.rabbitmq.password=" + encryptedPass));
|
||||||
|
Assertions.assertTrue(Files.readString(cmtpCfg).contains("spring.rabbitmq.username=" + encryptedUser));
|
||||||
|
Assertions.assertTrue(Files.readString(cmtpCfg).contains("spring.rabbitmq.password=" + encryptedPass));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldRewriteAndExecuteStandardRabbitSetupScript() throws IOException {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-rabbit-setup-script-test");
|
||||||
|
Path setupScript = tempRoot.resolve("setuprabq.sh");
|
||||||
|
Path queueScript = tempRoot.resolve("addrabq_R_01.sh");
|
||||||
|
Path cpconfig = tempRoot.resolve("cpconfig.cfg");
|
||||||
|
Path calls = tempRoot.resolve("calls.log");
|
||||||
|
Files.writeString(cpconfig, "MY_CIPSID_OR_BIC=AAAABBBBXXX\n");
|
||||||
|
Files.writeString(
|
||||||
|
setupScript,
|
||||||
|
"#!/bin/bash\n"
|
||||||
|
+ "source /home/cmep4i/cpconfig.cfg\n"
|
||||||
|
+ "cd /home/cmep4i/cpackage/rabq\n"
|
||||||
|
+ "rabbitmqctl(){ echo \"$*\" >> \"" + calls + "\"; return 0; }\n"
|
||||||
|
+ "rabbitmqctl add_user admin admin\n"
|
||||||
|
+ "rabbitmqctl add_user rConn rConn\n"
|
||||||
|
+ "rabbitmqctl set_permissions -p /RQ admin '.*' '.*' '.*'\n"
|
||||||
|
+ "rabbitmqctl set_permissions -p /RQ rConn '.*' '.*' '.*'\n"
|
||||||
|
);
|
||||||
|
Files.writeString(queueScript, "#!/bin/bash\necho AAAABBBBXXX > /dev/null\n");
|
||||||
|
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.LOCAL);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setStagingRootDir(tempRoot.resolve("staging").toString());
|
||||||
|
properties.setStandardCpconfigPath(cpconfig.toString());
|
||||||
|
properties.setStandardRabbitSetupScriptPath(setupScript.toString());
|
||||||
|
properties.setStandardRabbitQueueScriptPath(queueScript.toString());
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-RABBIT-SETUP-1");
|
||||||
|
task.setProductType("ENTERPRISE");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"ENTERPRISE",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"deployMode", "SINGLE",
|
||||||
|
"nodes", Map.of("node01Ip", "10.0.0.1"),
|
||||||
|
"mq", Map.of("mqType", "RABBITMQ", "channelUsername", "bank_user", "channelPassword", "bank_pass"),
|
||||||
|
"licenses", Map.of("receiverLicenseFileId", "receiver-001")
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("MQ_USER_APPLY");
|
||||||
|
step.setCommandLine("internal::mq_user_apply");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
|
||||||
|
// 源脚本保持不变（不污染基线介质）
|
||||||
|
String sourceScriptContent = Files.readString(setupScript);
|
||||||
|
Assertions.assertTrue(sourceScriptContent.contains("rabbitmqctl add_user rConn rConn"));
|
||||||
|
Assertions.assertTrue(sourceScriptContent.contains("rabbitmqctl set_permissions -p /RQ rConn '.*' '.*' '.*'"));
|
||||||
|
|
||||||
|
// staging 脚本被按本次任务参数渲染
|
||||||
|
Path stagedSetupScript = tempRoot.resolve("staging")
|
||||||
|
.resolve("TASK-RABBIT-SETUP-1")
|
||||||
|
.resolve("scripts")
|
||||||
|
.resolve("rabq")
|
||||||
|
.resolve("setuprabq.sh");
|
||||||
|
String stagedScriptContent = Files.readString(stagedSetupScript);
|
||||||
|
Assertions.assertTrue(stagedScriptContent.contains("rabbitmqctl add_user 'bank_user' 'bank_pass' || rabbitmqctl change_password 'bank_user' 'bank_pass'"));
|
||||||
|
Assertions.assertTrue(stagedScriptContent.contains("rabbitmqctl set_permissions -p /RQ 'bank_user' '.*' '.*' '.*'"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldExecuteStandardRabbitQueueScript() throws IOException {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-rabbit-queue-script-test");
|
||||||
|
Path setupScript = tempRoot.resolve("setuprabq.sh");
|
||||||
|
Path queueScript = tempRoot.resolve("addrabq_R_01.sh");
|
||||||
|
Path cpconfig = tempRoot.resolve("cpconfig.cfg");
|
||||||
|
Path marker = tempRoot.resolve("queue.done");
|
||||||
|
Files.writeString(cpconfig, "MY_CIPSID_OR_BIC=AAAABBBBXXX\n");
|
||||||
|
Files.writeString(setupScript, "#!/bin/bash\necho setup > /dev/null\n");
|
||||||
|
Files.writeString(queueScript, "#!/bin/bash\necho ok > \"" + marker + "\"\n");
|
||||||
|
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.LOCAL);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setStagingRootDir(tempRoot.resolve("staging").toString());
|
||||||
|
properties.setStandardCpconfigPath(cpconfig.toString());
|
||||||
|
properties.setStandardRabbitSetupScriptPath(setupScript.toString());
|
||||||
|
properties.setStandardRabbitQueueScriptPath(queueScript.toString());
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-RABBIT-QUEUE-1");
|
||||||
|
task.setProductType("ENTERPRISE");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"ENTERPRISE",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"deployMode", "SINGLE",
|
||||||
|
"nodes", Map.of("node01Ip", "10.0.0.1"),
|
||||||
|
"mq", Map.of("mqType", "RABBITMQ", "channelUsername", "bank_user", "channelPassword", "bank_pass"),
|
||||||
|
"licenses", Map.of("receiverLicenseFileId", "receiver-001")
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("MQ_QUEUE_APPLY");
|
||||||
|
step.setCommandLine("internal::mq_queue_apply");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
Assertions.assertTrue(Files.exists(marker));
|
||||||
|
Assertions.assertTrue(result.getMessage().contains("addrabq_R_01.sh"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldSelectR02QueueScriptWhenLocalIpMatchesNode02() throws IOException {
|
||||||
|
Path tempRoot = Files.createTempDirectory("init-executor-rabbit-queue-r02-test");
|
||||||
|
Path queueScript01 = tempRoot.resolve("addrabq_R_01.sh");
|
||||||
|
Path queueScript02 = tempRoot.resolve("addrabq_R_02.sh");
|
||||||
|
Path marker01 = tempRoot.resolve("queue01.done");
|
||||||
|
Path marker02 = tempRoot.resolve("queue02.done");
|
||||||
|
Files.writeString(queueScript01, "#!/bin/bash\necho 01 > \"" + marker01 + "\"\n");
|
||||||
|
Files.writeString(queueScript02, "#!/bin/bash\necho 02 > \"" + marker02 + "\"\n");
|
||||||
|
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.LOCAL);
|
||||||
|
properties.setLogDir(tempRoot.resolve("logs").toString());
|
||||||
|
properties.setStagingRootDir(tempRoot.resolve("staging").toString());
|
||||||
|
properties.setStandardRabbitQueueScriptPath(queueScript01.toString());
|
||||||
|
properties.setStandardRabbitQueueScriptPath02(queueScript02.toString());
|
||||||
|
ConfigurableInitStepExecutor executor = new ConfigurableInitStepExecutor(properties, new ObjectMapper());
|
||||||
|
|
||||||
|
InitTaskEntity task = new InitTaskEntity();
|
||||||
|
task.setTaskId("TASK-RABBIT-QUEUE-R02-1");
|
||||||
|
task.setProductType("ENTERPRISE");
|
||||||
|
task.setInitPlanJson(buildInitPlanJson(
|
||||||
|
"ENTERPRISE",
|
||||||
|
Map.of(
|
||||||
|
"orgCodeType", "BIC",
|
||||||
|
"orgCode", "AAAABBBBXXX",
|
||||||
|
"orgNameCn", "测试机构",
|
||||||
|
"deployMode", "DUAL",
|
||||||
|
"nodes", Map.of("node01Ip", "192.0.2.11", "node02Ip", "127.0.0.1"),
|
||||||
|
"mq", Map.of("mqType", "RABBITMQ", "channelUsername", "bank_user", "channelPassword", "bank_pass"),
|
||||||
|
"licenses", Map.of("receiverLicenseFileId", "receiver-001")
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
InitTaskStepEntity step = new InitTaskStepEntity();
|
||||||
|
step.setStepNo(1);
|
||||||
|
step.setStepCode("MQ_QUEUE_APPLY");
|
||||||
|
step.setCommandLine("internal::mq_queue_apply");
|
||||||
|
|
||||||
|
InitStepExecutionResult result = executor.execute(task, step);
|
||||||
|
Assertions.assertTrue(result.isSuccess());
|
||||||
|
Assertions.assertTrue(Files.exists(marker02));
|
||||||
|
Assertions.assertFalse(Files.exists(marker01));
|
||||||
|
Assertions.assertTrue(result.getMessage().contains("addrabq_R_02.sh"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String buildInitPlanJson(String productType, Map<String, Object> request) throws IOException {
|
||||||
|
Map<String, Object> root = new LinkedHashMap<>();
|
||||||
|
root.put("schemaVersion", "1.0");
|
||||||
|
root.put("productType", productType);
|
||||||
|
root.put("request", request);
|
||||||
|
return new ObjectMapper().writeValueAsString(root);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Path parseRenderedCpconfigPath(String message) {
|
||||||
|
Assertions.assertNotNull(message);
|
||||||
|
int start = message.indexOf("path=");
|
||||||
|
Assertions.assertTrue(start >= 0, "render message should contain path");
|
||||||
|
int from = start + "path=".length();
|
||||||
|
int end = message.indexOf(", changedKeys=", from);
|
||||||
|
if (end < 0) {
|
||||||
|
end = message.length();
|
||||||
|
}
|
||||||
|
return Path.of(message.substring(from, end).trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String encryptWith3DesHex(String input, String secretKey) throws Exception {
|
||||||
|
SecretKeySpec desKey = new SecretKeySpec(secretKey.getBytes(), "DESede");
|
||||||
|
Cipher cipher = Cipher.getInstance("DESede");
|
||||||
|
cipher.init(Cipher.ENCRYPT_MODE, desKey);
|
||||||
|
byte[] encrypted = cipher.doFinal(input.getBytes());
|
||||||
|
StringBuilder hex = new StringBuilder();
|
||||||
|
for (byte b : encrypted) {
|
||||||
|
String stmp = Integer.toHexString(b & 0xFF);
|
||||||
|
if (stmp.length() == 1) {
|
||||||
|
hex.append('0');
|
||||||
|
}
|
||||||
|
hex.append(stmp);
|
||||||
|
}
|
||||||
|
return hex.toString().toUpperCase(Locale.ROOT);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,367 @@
|
|||||||
|
package com.cisd.tms.modules.init.service;
|
||||||
|
|
||||||
|
import com.cisd.tms.common.config.properties.CisdPresetProperties;
|
||||||
|
import com.cisd.tms.common.exception.BizException;
|
||||||
|
import com.cisd.tms.modules.init.config.InitCommandProfileService;
|
||||||
|
import com.cisd.tms.modules.init.config.InitExecutorProperties;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitCreateTaskResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitPreviewRequest;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitPreviewResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskDetailResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskExecuteResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskStepLogResponse;
|
||||||
|
import com.cisd.tms.modules.init.dto.InitTaskStepResponse;
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskEntity;
|
||||||
|
import com.cisd.tms.modules.init.entity.InitTaskStepEntity;
|
||||||
|
import com.cisd.tms.modules.init.executor.InitStepExecutionResult;
|
||||||
|
import com.cisd.tms.modules.init.executor.InitStepExecutor;
|
||||||
|
import com.cisd.tms.modules.init.repository.InitTaskRepository;
|
||||||
|
import com.cisd.tms.modules.init.repository.InitTaskStepRepository;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
class InitServiceTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldRejectWhenPresetProductTypeMissing() {
|
||||||
|
InitService service = newService(emptyRepository(), emptyStepRepository(), preset("", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
InitPreviewRequest request = validEnterpriseRequest();
|
||||||
|
|
||||||
|
BizException ex = Assertions.assertThrows(BizException.class, () -> service.preview(request));
|
||||||
|
Assertions.assertTrue(ex.getMessage().contains("preset product type"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldRequireTlqLicenseForEnterpriseTlqMode() {
|
||||||
|
InitService service = newService(emptyRepository(), emptyStepRepository(), preset("ENTERPRISE", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
InitPreviewRequest request = validEnterpriseRequest();
|
||||||
|
request.getMq().setMqType("TLQ");
|
||||||
|
request.getMq().setTlqLicenseFileId(null);
|
||||||
|
|
||||||
|
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class, () -> service.preview(request));
|
||||||
|
Assertions.assertTrue(ex.getMessage().contains("tlqLicenseFileId"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldRejectPathLikeFileId() {
|
||||||
|
InitService service = newService(emptyRepository(), emptyStepRepository(), preset("ENTERPRISE", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
InitPreviewRequest request = validEnterpriseRequest();
|
||||||
|
request.getLicenses().setReceiverLicenseFileId("/tmp/license.dat");
|
||||||
|
|
||||||
|
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class, () -> service.preview(request));
|
||||||
|
Assertions.assertTrue(ex.getMessage().contains("fileId"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldRequireDirectSpecificFieldsForCfmqMode() {
|
||||||
|
InitService service = newService(emptyRepository(), emptyStepRepository(), preset("DIRECT", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
InitPreviewRequest request = validDirectRequest();
|
||||||
|
request.getMq().setMqType("RABBITMQ_CFMQ");
|
||||||
|
request.getMq().setCfmqConfigFileId(null);
|
||||||
|
request.getLicenses().setCfgZipFileId(null);
|
||||||
|
|
||||||
|
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class, () -> service.preview(request));
|
||||||
|
Assertions.assertTrue(
|
||||||
|
ex.getMessage().contains("licenses.cfgZipFileId") || ex.getMessage().contains("mq.cfmqConfigFileId")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldRequireDirectTlqConfigForTlqMode() {
|
||||||
|
InitService service = newService(emptyRepository(), emptyStepRepository(), preset("DIRECT", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
InitPreviewRequest request = validDirectRequest();
|
||||||
|
request.getMq().setMqType("RABBITMQ_TLQ");
|
||||||
|
request.getMq().setTlqLicenseFileId("file-tlq-001");
|
||||||
|
request.setDirectTlq(null);
|
||||||
|
|
||||||
|
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class, () -> service.preview(request));
|
||||||
|
Assertions.assertTrue(ex.getMessage().contains("directTlq"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldAcceptDirectTlqConfigForTlqMode() {
|
||||||
|
InitService service = newService(emptyRepository(), emptyStepRepository(), preset("DIRECT", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
InitPreviewRequest request = validDirectRequest();
|
||||||
|
request.getMq().setMqType("RABBITMQ_TLQ");
|
||||||
|
request.getMq().setTlqLicenseFileId("file-tlq-001");
|
||||||
|
request.setDirectTlq(directTlqConfig());
|
||||||
|
|
||||||
|
InitPreviewResponse response = service.preview(request);
|
||||||
|
Assertions.assertEquals("DIRECT", response.getResolvedProductType());
|
||||||
|
Assertions.assertTrue(response.getStepCount() >= 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldGeneratePreviewForValidEnterpriseRequest() {
|
||||||
|
InitService service = newService(emptyRepository(), emptyStepRepository(), preset("ENTERPRISE", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
InitPreviewRequest request = validEnterpriseRequest();
|
||||||
|
|
||||||
|
InitPreviewResponse response = service.preview(request);
|
||||||
|
|
||||||
|
Assertions.assertEquals("ENTERPRISE", response.getResolvedProductType());
|
||||||
|
Assertions.assertTrue(response.getStepCount() >= 1);
|
||||||
|
Assertions.assertNotNull(response.getSummary());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldCreateAndQueryInitTask() {
|
||||||
|
InMemoryInitTaskRepository repository = new InMemoryInitTaskRepository();
|
||||||
|
InMemoryInitTaskStepRepository stepRepository = new InMemoryInitTaskStepRepository();
|
||||||
|
InitService service = newService(repository, stepRepository, preset("ENTERPRISE", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
|
||||||
|
InitCreateTaskResponse created = service.createTask(validEnterpriseRequest());
|
||||||
|
InitTaskDetailResponse detail = service.getTask(created.getTaskId());
|
||||||
|
|
||||||
|
Assertions.assertNotNull(created.getTaskId());
|
||||||
|
Assertions.assertEquals("PENDING", created.getStatus());
|
||||||
|
Assertions.assertEquals("ENTERPRISE", detail.getResolvedProductType());
|
||||||
|
Assertions.assertEquals("AAAABBBBXXX", detail.getOrgCode());
|
||||||
|
Assertions.assertEquals("RABBITMQ", detail.getMqType());
|
||||||
|
Assertions.assertNotNull(detail.getInitPlanJson());
|
||||||
|
Assertions.assertEquals("PENDING", detail.getStatus());
|
||||||
|
|
||||||
|
List<InitTaskStepResponse> steps = service.getTaskSteps(created.getTaskId());
|
||||||
|
Assertions.assertFalse(steps.isEmpty());
|
||||||
|
Assertions.assertTrue(steps.stream().allMatch(s -> "PENDING".equals(s.getStatus())));
|
||||||
|
Assertions.assertTrue(steps.stream().allMatch(s -> s.getCommandLine() != null && !s.getCommandLine().isBlank()));
|
||||||
|
Assertions.assertTrue(
|
||||||
|
steps.stream().anyMatch(s -> "SET_RABBITMQ".equals(s.getStepCode())
|
||||||
|
&& s.getCommandLine().contains("/home/cemp4i/cpackage/toolsh/setfraq.sh"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldThrowWhenQueryNonExistingTask() {
|
||||||
|
InitService service = newService(emptyRepository(), emptyStepRepository(), preset("ENTERPRISE", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
BizException ex = Assertions.assertThrows(BizException.class, () -> service.getTask("NOT-EXIST"));
|
||||||
|
Assertions.assertTrue(ex.getMessage().contains("init task not found"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldExecuteTaskAndMarkAllStepsSuccess() {
|
||||||
|
InMemoryInitTaskRepository repository = new InMemoryInitTaskRepository();
|
||||||
|
InMemoryInitTaskStepRepository stepRepository = new InMemoryInitTaskStepRepository();
|
||||||
|
InitService service = newService(repository, stepRepository, preset("ENTERPRISE", "V1.3.2", "CONFIG"), successExecutor(), "/tmp/tms-init-logs");
|
||||||
|
|
||||||
|
InitCreateTaskResponse created = service.createTask(validEnterpriseRequest());
|
||||||
|
InitTaskExecuteResponse executeResponse = service.executeTask(created.getTaskId());
|
||||||
|
InitTaskDetailResponse detail = service.getTask(created.getTaskId());
|
||||||
|
List<InitTaskStepResponse> steps = service.getTaskSteps(created.getTaskId());
|
||||||
|
|
||||||
|
Assertions.assertEquals("SUCCESS", executeResponse.getStatus());
|
||||||
|
Assertions.assertEquals("SUCCESS", detail.getStatus());
|
||||||
|
Assertions.assertTrue(steps.stream().allMatch(s -> "SUCCESS".equals(s.getStatus())));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldMarkTaskFailedWhenExecutorReturnsFailure() {
|
||||||
|
InMemoryInitTaskRepository repository = new InMemoryInitTaskRepository();
|
||||||
|
InMemoryInitTaskStepRepository stepRepository = new InMemoryInitTaskStepRepository();
|
||||||
|
InitService service = newService(repository, stepRepository, preset("ENTERPRISE", "V1.3.2", "CONFIG"), failOnDeployStepExecutor(), "/tmp/tms-init-logs");
|
||||||
|
|
||||||
|
InitCreateTaskResponse created = service.createTask(validEnterpriseRequest());
|
||||||
|
InitTaskExecuteResponse executeResponse = service.executeTask(created.getTaskId());
|
||||||
|
List<InitTaskStepResponse> steps = service.getTaskSteps(created.getTaskId());
|
||||||
|
|
||||||
|
Assertions.assertEquals("FAILED", executeResponse.getStatus());
|
||||||
|
Assertions.assertTrue(steps.stream().anyMatch(s -> "FAILED".equals(s.getStatus())));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldReadStepLogContent() throws IOException {
|
||||||
|
InMemoryInitTaskRepository repository = new InMemoryInitTaskRepository();
|
||||||
|
InMemoryInitTaskStepRepository stepRepository = new InMemoryInitTaskStepRepository();
|
||||||
|
Path logDir = Files.createTempDirectory("tms-init-log-test");
|
||||||
|
InitService service = newService(repository, stepRepository, preset("ENTERPRISE", "V1.3.2", "CONFIG"), logWritingExecutor(logDir), logDir.toString());
|
||||||
|
|
||||||
|
InitCreateTaskResponse created = service.createTask(validEnterpriseRequest());
|
||||||
|
service.executeTask(created.getTaskId());
|
||||||
|
|
||||||
|
InitTaskStepLogResponse log = service.getTaskStepLog(created.getTaskId(), 1);
|
||||||
|
|
||||||
|
Assertions.assertEquals(created.getTaskId(), log.getTaskId());
|
||||||
|
Assertions.assertEquals(1, log.getStepNo());
|
||||||
|
Assertions.assertTrue(log.getContent().contains("step=RENDER_CONFIG"));
|
||||||
|
Assertions.assertTrue(log.getLogPath().startsWith(logDir.toString()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitService newService(
|
||||||
|
InitTaskRepository taskRepository,
|
||||||
|
InitTaskStepRepository stepRepository,
|
||||||
|
CisdPresetProperties preset,
|
||||||
|
InitStepExecutor executor,
|
||||||
|
String logDir
|
||||||
|
) {
|
||||||
|
InitExecutorProperties properties = new InitExecutorProperties();
|
||||||
|
properties.setLogDir(logDir);
|
||||||
|
properties.setMode(InitExecutorProperties.Mode.SIMULATE);
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
InitCommandProfileService commandProfileService = new InitCommandProfileService(objectMapper, properties);
|
||||||
|
return new InitService(taskRepository, stepRepository, preset, objectMapper, executor, commandProfileService, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitTaskRepository emptyRepository() {
|
||||||
|
return new InMemoryInitTaskRepository();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitTaskStepRepository emptyStepRepository() {
|
||||||
|
return new InMemoryInitTaskStepRepository();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static CisdPresetProperties preset(String productType, String version, String source) {
|
||||||
|
CisdPresetProperties properties = new CisdPresetProperties();
|
||||||
|
properties.setProductType(productType);
|
||||||
|
properties.setVersion(version);
|
||||||
|
properties.setSource(source);
|
||||||
|
return properties;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitStepExecutor successExecutor() {
|
||||||
|
return (task, step) -> InitStepExecutionResult.success("ok", 0, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitStepExecutor failOnDeployStepExecutor() {
|
||||||
|
return (task, step) -> {
|
||||||
|
if ("DEPLOY_RECEIVER".equals(step.getStepCode())) {
|
||||||
|
return InitStepExecutionResult.failure("simulated failed", 1, "/tmp/fail.log");
|
||||||
|
}
|
||||||
|
return InitStepExecutionResult.success("ok", 0, "/tmp/success.log");
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitStepExecutor logWritingExecutor(Path logDir) {
|
||||||
|
return (task, step) -> {
|
||||||
|
try {
|
||||||
|
Path taskDir = logDir.resolve(task.getTaskId());
|
||||||
|
Files.createDirectories(taskDir);
|
||||||
|
String stepCode = step.getStepCode().toLowerCase();
|
||||||
|
Path logPath = taskDir.resolve(String.format("%02d-%s.log", step.getStepNo(), stepCode));
|
||||||
|
Files.writeString(logPath, "step=" + step.getStepCode());
|
||||||
|
return InitStepExecutionResult.success("ok", 0, logPath.toString());
|
||||||
|
} catch (IOException ex) {
|
||||||
|
return InitStepExecutionResult.failure("write log failed", -1, null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitPreviewRequest validEnterpriseRequest() {
|
||||||
|
InitPreviewRequest request = new InitPreviewRequest();
|
||||||
|
request.setOrgCodeType("BIC");
|
||||||
|
request.setOrgCode("AAAABBBBXXX");
|
||||||
|
request.setOrgNameCn("测试机构");
|
||||||
|
request.setDeployMode("SINGLE");
|
||||||
|
|
||||||
|
InitPreviewRequest.Nodes nodes = new InitPreviewRequest.Nodes();
|
||||||
|
nodes.setNode01Ip("10.0.0.1");
|
||||||
|
request.setNodes(nodes);
|
||||||
|
|
||||||
|
InitPreviewRequest.Mq mq = new InitPreviewRequest.Mq();
|
||||||
|
mq.setMqType("RABBITMQ");
|
||||||
|
mq.setChannelUsername("cisd_channel_user");
|
||||||
|
mq.setChannelPassword("cisd_channel_pass");
|
||||||
|
request.setMq(mq);
|
||||||
|
|
||||||
|
InitPreviewRequest.Licenses licenses = new InitPreviewRequest.Licenses();
|
||||||
|
licenses.setReceiverLicenseFileId("file-receiver-001");
|
||||||
|
request.setLicenses(licenses);
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitPreviewRequest validDirectRequest() {
|
||||||
|
InitPreviewRequest request = validEnterpriseRequest();
|
||||||
|
request.setDeployMode("DUAL");
|
||||||
|
request.getNodes().setNode02Ip("10.0.0.2");
|
||||||
|
|
||||||
|
InitPreviewRequest.Mq mq = request.getMq();
|
||||||
|
mq.setMqType("RABBITMQ_CFMQ");
|
||||||
|
mq.setCfmqConfigFileId("file-cfmq-001");
|
||||||
|
|
||||||
|
InitPreviewRequest.Licenses licenses = request.getLicenses();
|
||||||
|
licenses.setCfgZipFileId("file-cfg-001");
|
||||||
|
|
||||||
|
InitPreviewRequest.SignServer signServer = new InitPreviewRequest.SignServer();
|
||||||
|
signServer.setSignHost("172.30.1.101");
|
||||||
|
signServer.setSignPort(50006);
|
||||||
|
signServer.setSignType("Infosec");
|
||||||
|
signServer.setSignCertDn("CN=051@AAAABBBBXXX@7321@1,OU=Org,OU=CIPS,O=CFCA OCA1,C=CN");
|
||||||
|
signServer.setSignCertSn("1154809590");
|
||||||
|
signServer.setSignPassword("secret");
|
||||||
|
request.setSignServer(signServer);
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static InitPreviewRequest.DirectTlqConfig directTlqConfig() {
|
||||||
|
InitPreviewRequest.DirectTlqConfig config = new InitPreviewRequest.DirectTlqConfig();
|
||||||
|
config.setLocalNodeSeq("A");
|
||||||
|
config.setUpstreamInstitutions("CIPSCNSHXXX;CIPSCNWXXXX");
|
||||||
|
config.setUpstreamCocCount(2);
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class InMemoryInitTaskRepository implements InitTaskRepository {
|
||||||
|
|
||||||
|
private final Map<String, InitTaskEntity> data = new HashMap<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<InitTaskEntity> findByTaskId(String taskId) {
|
||||||
|
return Optional.ofNullable(data.get(taskId));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void save(InitTaskEntity entity) {
|
||||||
|
if (entity.getCreateTime() == null) {
|
||||||
|
entity.setCreateTime(LocalDateTime.now());
|
||||||
|
}
|
||||||
|
entity.setUpdateTime(LocalDateTime.now());
|
||||||
|
data.put(entity.getTaskId(), entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void update(InitTaskEntity entity) {
|
||||||
|
entity.setUpdateTime(LocalDateTime.now());
|
||||||
|
data.put(entity.getTaskId(), entity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class InMemoryInitTaskStepRepository implements InitTaskStepRepository {
|
||||||
|
|
||||||
|
private final Map<String, List<InitTaskStepEntity>> data = new HashMap<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void saveBatch(List<InitTaskStepEntity> entities) {
|
||||||
|
if (entities == null || entities.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String taskId = entities.get(0).getTaskId();
|
||||||
|
data.computeIfAbsent(taskId, k -> new ArrayList<>()).addAll(entities);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<InitTaskStepEntity> findByTaskIdOrderByStepNo(String taskId) {
|
||||||
|
List<InitTaskStepEntity> list = data.get(taskId);
|
||||||
|
if (list == null) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
return new ArrayList<>(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateBatch(List<InitTaskStepEntity> entities) {
|
||||||
|
if (entities == null || entities.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String taskId = entities.get(0).getTaskId();
|
||||||
|
data.put(taskId, new ArrayList<>(entities));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user