From 9135368cc85a3e2c205a64ab33063de6f4b10569 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 8 Apr 2025 09:31:03 +0800
Subject: [PATCH] =?UTF-8?q?45843=201=20=E6=97=A0=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=A1=A5=E6=8A=A5=E5=B7=A5JOB=E9=92=88=E5=AF=B9=E5=A4=9A?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC=E5=9C=BA=E6=99=AF=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8SAP=20=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE0001=E8=BF=9B=E8=A1=8C=E8=A1=A5=E6=8A=A5=E5=B7=A5=202?=
 =?UTF-8?q?=20=E6=97=A0=E5=B7=A5=E5=8D=95=E6=8A=A5=E5=B7=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=A7=E7=BA=BF=E7=89=A9=E6=96=99=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=80=E4=B8=AA=E4=BA=8B=E5=8A=A1=E5=8E=BB=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/controller/base/MesWhiteController.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesWhiteController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesWhiteController.java
index 1b0ae92..49442ae 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesWhiteController.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesWhiteController.java
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.MesConfigService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.MesProduceSnExtService;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import jodd.util.Base64;
 import lombok.extern.slf4j.Slf4j;
@@ -43,7 +44,7 @@ public class MesWhiteController {
 
     @PostMapping("/picture")
     public ResultBean savePicture(@RequestBody MesPictureModel model){
-        log.info("castle-保存图片开始");
+        log.info("castle-保存图片开始 model={}", JSONObject.toJSONString(model));
         String localUrl = mesConfigService.getCfgValue(model.getOrganizeCode(), "LOCAL_PICTURE_ABS_URL");
         String fileName = localUrl+model.getFileName();
         File file = new File(fileName);
@@ -60,10 +61,14 @@ public class MesWhiteController {
        if (!StringUtils.isBlank(model.getRemoteUserName()) && !StringUtils.isBlank(model.getRemoteNginxUrl()) ){
            // 构建scp命令
            log.info("castle-保存图片开始-scp命令");
-           String scpCommand = String.format("scp -P %s %s %s@%s:%s", model.getRemotePort() ,fileName, model.getRemoteUserName(), model.getRemoteNginxUrl(), localUrl);
+           String scpCommand = String.format("scp  %s %s@%s:%s" ,fileName, model.getRemoteUserName(), model.getRemoteNginxUrl(), localUrl);
+           log.info("castle-保存图片开始-scp命令开始={}",scpCommand);
+
            try {
                Runtime.getRuntime().exec(scpCommand);
-           } catch (IOException e) {
+               log.info("castle-保存图片开始-scp命令结束={}",scpCommand);
+
+           } catch (Exception e) {
                log.error("调用scp命令失败,请手动同步图片:{}",fileName);
            }
        }