diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 6fa56e162..8ea37eaa2 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -190,4 +190,6 @@ aMap: # 远程升级服务器信息 remoteUpdate: server: http://apitest.jsowellcloud.com - port: 21 \ No newline at end of file + port: 21 + username: jsowellftp + password: ZzJeZRB6fDRcnfkz \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index 29cb9be14..3a86e817f 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -186,4 +186,6 @@ aMap: # 远程升级服务器信息 remoteUpdate: server: http://apitest.jsowellcloud.com - port: 21 \ No newline at end of file + port: 21 + username: jsowellftpprd + password: ADHJAYinpXEctwDA \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 460de5531..e42ecd1ab 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -186,4 +186,6 @@ aMap: # 远程升级服务器信息 remoteUpdate: server: http://apitest.jsowellcloud.com - port: 21 \ No newline at end of file + port: 21 + username: jsowellftpprd + password: ADHJAYinpXEctwDA \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index b7ac6071c..ad4c75a8c 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -191,4 +191,6 @@ aMap: # 远程升级服务器信息 remoteUpdate: server: http://apitest.jsowellcloud.com - port: 21 \ No newline at end of file + port: 21 + username: jsowellftp + password: ZzJeZRB6fDRcnfkz \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java index afe048c48..5214807fe 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java @@ -20,6 +20,12 @@ public class UpdateFirmwareCommand { // 远程更新服务器端口 private int port; + // 远程更新 ftp用户名 + private String username; + + // 远程更新 ftp密码 + private String password; + // 文件路径 private String filePath; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java index 1542e9eba..b897777c3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java @@ -49,6 +49,13 @@ public class PileRemoteService { @Value("${remoteUpdate.port}") private int port; + + @Value("${remoteUpdate.username}") + private String username; + + @Value("${remoteUpdate.password}") + private String password; + /** * 获取充电桩实时数据信息 * @@ -215,6 +222,8 @@ public class PileRemoteService { .pileSnList(dto.getPileSns()) .serverAddress(serverAddress) .port(port) + .username(username) + .password(password) .filePath(pileFirmwareInfo.getFilePath()) .build(); ykcPushCommandService.pushUpdateFileCommand(command); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index dfd6620c3..2ff9acc11 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -341,10 +341,10 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { byte[] updateServerPortByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.hexString2Bytes(Integer.toHexString(command.getPort())), 4); // 用户名 - byte[] userNameByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(Constants.updateServerUserName2), 32); + byte[] userNameByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(command.getUsername()), 32); // 密码 - byte[] passwordByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(Constants.updateServerPassword2), 32); + byte[] passwordByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(command.getPassword()), 32); // 文件路径 byte[] filePathByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(command.getFilePath()), 64);