Sunyard/cisd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改激活服务路径

Browse Source
This commit is contained in:
xydkj 2026-05-20 18:05:57 +08:00
parent 2c0aa49ad2
commit 7eddb44aaa
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/cisd/tms/modules/device/controller/NetworkConfigController.java
View File

@ -1,13 +1,8 @@
package com.cisd.tms.modules.device.controller; package com.cisd.tms.modules.device.controller;
import com.cisd.tms.common.api.ApiResponse; import com.cisd.tms.common.api.ApiResponse;
import com.cisd.tms.modules.device.dto.network.*; import com.cisd.tms.modules.device.dto.network.*;
import com.cisd.tms.modules.device.entity.PageResult; import com.cisd.tms.modules.device.entity.PageResult;
import com.cisd.tms.modules.device.service.NetworkConfigService; import com.cisd.tms.modules.device.service.NetworkConfigService;
import com.cisd.tms.modules.log.annotation.AuditedOperation;
import com.cisd.tms.modules.log.enums.ActionType;
import com.cisd.tms.modules.log.enums.ModuleCode;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid; import jakarta.validation.Valid;
@ -84,7 +79,6 @@ public class NetworkConfigController {
@Operation(summary = "创建Bond", description = "创建一个新的Bond聚合接口，需指定名称、模式和从属接口") @Operation(summary = "创建Bond", description = "创建一个新的Bond聚合接口，需指定名称、模式和从属接口")
@PostMapping("/bond/create") @PostMapping("/bond/create")
@AuditedOperation(module = ModuleCode.NETWORK, action = ActionType.CREATE, summary = "创建Bond")
public ApiResponse<Void> createBond(@Valid @RequestBody BondCreateRequest req) { public ApiResponse<Void> createBond(@Valid @RequestBody BondCreateRequest req) {
networkConfigService.createBond(req); networkConfigService.createBond(req);
return ApiResponse.success(); return ApiResponse.success();

24
src/main/java/com/cisd/tms/modules/log/service/OperationAuditService.java
View File

@ -240,18 +240,18 @@ public class OperationAuditService {
private static String buildSignValueSource(OperationAuditLogEntity existLog, AuditResult auditResult) { private static String buildSignValueSource(OperationAuditLogEntity existLog, AuditResult auditResult) {
String signValueSource = trim(existLog.getLogId()) + String signValueSource = trim(existLog.getLogId()) + "_" +
existLog.getOperatorRoleCode() + existLog.getOperatorRoleCode() + "_" +
existLog.getOperatorAuthLevel() + existLog.getOperatorAuthLevel() + "_" +
existLog.getModuleCode() + existLog.getModuleCode() + "_" +
existLog.getActionType() + existLog.getActionType() + "_" +
trim(existLog.getRemoteIp()) + trim(existLog.getRemoteIp()) + "_" +
existLog.getOperationResult() + existLog.getOperationResult() + "_" +
trim(existLog.getSummary()) + trim(existLog.getSummary()) + "_" +
trim(existLog.getErrorMessage()) + trim(existLog.getErrorMessage()) + "_" +
existLog.getAuditStatus() + existLog.getAuditStatus() + "_" +
auditResult + auditResult + "_" +
trim(existLog.getSignValue()) + trim(existLog.getSignValue()) + "_" +
existLog.getOccurredAt(); existLog.getOccurredAt();
return signValueSource; return signValueSource;

1
src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java
View File

@ -163,6 +163,7 @@ public class MasterKeyActivateServiceImpl implements MasterKeyActivateService {
request.setHash(hash); request.setHash(hash);
String json = OBJECT_MAPPER.writeValueAsString(request); String json = OBJECT_MAPPER.writeValueAsString(request);
//todo 抛异常
// System.out.print(json); // System.out.print(json);
HttpRequest httpRequest = HttpRequest.newBuilder() HttpRequest httpRequest = HttpRequest.newBuilder()
.uri(URI.create(masterKeyActivateProperties.getPlatformUrl())) .uri(URI.create(masterKeyActivateProperties.getPlatformUrl()))

2
src/main/resources/application.yml
View File

@ -336,7 +336,7 @@ tms:
new-pin-base64: ${TMS_MK_INIT_IDENTIFY_NEW_PIN_BASE64:NjY2NjY2} new-pin-base64: ${TMS_MK_INIT_IDENTIFY_NEW_PIN_BASE64:NjY2NjY2}
activate: activate:
# 激活服务平台路径 # 激活服务平台路径
platform-url: ${TMS_MK_ACTIVATE_PLATFORM_URL:http://127.0.0.1:8080/device/active} platform-url: ${TMS_MK_ACTIVATE_PLATFORM_URL:http://172.16.18.195:8170/device/active}
security: security:
# 内部接口鉴权 token（前后端内部调用需一致）。 # 内部接口鉴权 token（前后端内部调用需一致）。
internal-token: ${TMS_INTERNAL_TOKEN:change-me-internal-token} internal-token: ${TMS_INTERNAL_TOKEN:change-me-internal-token}