提交

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java

@@ -86,13 +86,15 @@ public class OssBuilder {
     public OssTemplateRe template(String code) {
         String tenantId = AuthUtil.getTenantId();
         Oss oss = getOss(tenantId, code);
-        String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
-       /* if(sys_isonline.equals("20")){
+        /*String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
+        if(sys_isonline.equals("20")){
             oss.setEndpoint("http://183.247.216.148:9000/");
         }else{
             oss.setEndpoint("https://oss-cn-shenzhen.aliyuncs.com/");
         }*/
+       // oss.setEndpoint("http://183.247.216.148:9000/");
         oss.setEndpoint("https://oss-cn-shenzhen.aliyuncs.com/");
+        System.out.println("oss="+oss.getEndpoint());
         Oss ossCached = ossPool.get(tenantId);
         OssTemplateRe template = templatePool.get(tenantId);
         // 若为空或者不一致，则重新加载

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -218,7 +218,7 @@
 
     <select id="approvalFile" resultType="org.springblade.archive.vo.ArchivesAutoVO$ApprovalFile">
         <if test="archiveId!=null">
-            select * from u_archive_file where archive_id = #{archiveId} and is_element = 0
+            select * from u_archive_file where archive_id = #{archiveId} and is_element = 0 order by sort
         </if>
     </select>
 

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveExpertConclusionServiceImpl.java

@@ -17,6 +17,7 @@ import org.springblade.archive.entity.ArchiveExpertScore;
 import org.springblade.archive.mapper.ArchiveExpertConclusionMapper;
 import org.springblade.archive.service.IArchiveExpertConclusionService;
 import org.springblade.archive.service.IArchiveExpertScoreService;
+import org.springblade.archive.utils.FileUtils;
 import org.springblade.archive.utils.ItextPdfUtils;
 import org.springblade.archive.utils.MyPdfPageHelper;
 import org.springblade.common.utils.SnowFlakeUtil;
@@ -27,6 +28,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.evisa.feign.EVisaClient;
+import org.springblade.evisa.vo.SealPdfVO;
+import org.springblade.evisa.vo.SealStrategyVO;
 import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.entity.SignPfxFile;
 import org.springblade.manager.feign.ProjectClient;
@@ -232,6 +235,9 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
             throw new ServiceException("获取专家账号失败");
         }
         List<Long> userIds = Func.toLongList(expertIds);
+        if(userIds!=null && userIds.size()>=1){
+            userIds =  userIds.stream().distinct().collect(Collectors.toList());
+        }
         List<User> users = userClient.userInfoByIds(userIds);
         if (users.size() == 0 || users.size() != userIds.size()){
             throw new ServiceException("专家账号信息错误，请联系管理员");
@@ -254,26 +260,26 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
             throw new ServiceException("生成PDF失败:"+e.getMessage());
         }
         //构建专家电签信息
-  /*      SigInfoVO vo = new SigInfoVO();
-        List<SigInfoVO.SigInfo> infos = new ArrayList<>();
+  /*      SealPdfVO vo = new SealPdfVO();
+        List<SealStrategyVO> infos = new ArrayList<>();
         for (User user : users) {
             SignPfxFile file = map.get(user.getId());
             if (file == null){
                 throw new ServiceException("未获取到专家:"+user.getName()+"的电签信息");
             }
-            SigInfoVO.SigInfo info = new SigInfoVO.SigInfo();
-            info.setUserName(user.getName());
+            SealStrategyVO info = new SealStrategyVO();
+            info.set(user.getName());
             info.setUserSig(user.getName()+user.getPhone().substring(0,3));
             info.setSealCode("S_NEW_"+file.getCertificatePassword());
             info.setSealPassword(file.getCertificatePassword());
             if (StringUtils.isBlank(file.getSignatureFileUrl())){
                 throw new ServiceException("未获取到专家:"+user.getName()+"的签字图片");
             }
-            info.setSigPic(file.getSignatureFileUrl());
+            info.setImageUrl(file.getSignatureFileUrl());
             infos.add(info);
         }
-        vo.setPdfUrl(pdfUrl);
-        vo.setList(infos);
+        vo.setPdfFileUrl(pdfUrl);
+        vo.setStrategyVoList(infos);
         System.out.println("11111111111");
         //PDF电签
         R<String> visa = eVisaClient.batchEVisa(vo);
@@ -285,14 +291,16 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
         }
         System.out.println(visa);
         //修改状态，插入结论PDF
-        conclusion.setTableUrl(visa.getData());
+        conclusion.setTableUrl(visa.getData());*/
+       // R<String> visa = eVisaClient.batchEVisa(vo);
+        conclusion.setTableUrl(pdfUrl);
         conclusion.setStatus(2);
         conclusion.setApproveDate(LocalDate.now());
         //还原当前项目所有档案的：申请验收状态，查阅状态，抽检意见，专家id，是否抽检
         baseMapper.updateAllArchiveByProject(conclusion.getProjectId());
         //还原当前项目所有分配的树节点
         baseMapper.updateAllNodeByProject(conclusion.getProjectId());
-        this.updateById(conclusion);*/
+        this.updateById(conclusion);
     }
 
     private String buildPdf(ArchiveExpertConclusion conclusion,List<User> users) throws Exception {
@@ -317,7 +325,7 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
         Document document = new Document(PageSize.A4, 10, 10, 80, 85);
         //文件地址
 //        String localFile = "C:\\Users\\泓创研发01\\Desktop\\"+conclusion.getId()+".pdf";
-        String localFile = "/www/wwwroot/Users/hongchuangyanfa/Desktop/archiveCheck/"+conclusion.getId()+".pdf";
+        String localFile = FileUtils.getSysLocalFileUrl()+ "/archiveCheck/"+conclusion.getId()+".pdf";
         //建立一个书写器
         FileOutputStream fileOutputStream = new FileOutputStream(localFile);
         PdfWriter writer = PdfWriter.getInstance(document,fileOutputStream );
@@ -328,6 +336,8 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
         //创建字体
 //        BaseFont baseFont2 =BaseFont.createFont("C:/WINDOWS/Fonts/simsun.ttc,0", BaseFont.IDENTITY_H,BaseFont.NOT_EMBEDDED);
         BaseFont baseFont2 =BaseFont.createFont("/usr/share/fonts/chinese/simsun.ttc,0", BaseFont.IDENTITY_H,BaseFont.NOT_EMBEDDED);
+      //  BaseFont baseFont2 =BaseFont.createFont("/Users/hongchuangyanfa/fsdownload/simsun.ttc", BaseFont.IDENTITY_H,BaseFont.NOT_EMBEDDED);
+     //   BaseFont baseFont2 =BaseFont.createFont(); //BaseFont.createFont("/Users/hongchuangyanfa/fsdownload/simsun.ttc", BaseFont.IDENTITY_H,BaseFont.NOT_EMBEDDED);
         //字体对象,这里可以创建一个方法
         Font sigFont = new Font(baseFont2, 0.1F, Font.NORMAL); //大小为0.1的正常字体
         Font size13font = new Font(baseFont2, 13, Font.NORMAL); //大小为13的正常字体
@@ -335,7 +345,7 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
         Font size14bold = new Font(baseFont2, 14, Font.BOLD); //大小为14的粗字体
         Font size17bold = new Font(baseFont2, 17, Font.BOLD);  //大小为17的正常字体
 
-        String firstText = "重庆渝北至长寿高速公路（渝长高速公路扩能）";
+        String firstText = "平塘至天峨高速公路";
         String secondText = "档案专项验收意见";
         ItextPdfUtils.tableHeader(document,size17bold,firstText);
         ItextPdfUtils.tableHeader(document,size17bold,secondText);
@@ -353,7 +363,7 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
         ItextPdfUtils.tableText(document,size13font,conclusion.getQuestionSuggest());
         ItextPdfUtils.blankRow(document,size13font,60);
         //落款项目
-        ItextPdfUtils.endRight(document,size13font,"重庆渝北至长寿高速公路（渝长高速公路扩能）",widthPercentage);
+        ItextPdfUtils.endRight(document,size13font,"平塘至天峨高速公路",widthPercentage);
         //落款档案验收组
         ItextPdfUtils.endRight(document,size13font,"档案验收组",60);
         //落款日期

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -58,7 +58,7 @@ public class EVController {
     @Resource(name = "taskExecutor1")
     private ThreadPoolExecutor executor;
 
-    @Scheduled(cron = "0/10 * * * * ?")
+   // @Scheduled(cron = "0/30 * * * * ?")
     public void SignInfo() {
         //执行代码
 
@@ -72,34 +72,37 @@ public class EVController {
                 "GROUP_CONCAT(create_user) as userId," +
                 "GROUP_CONCAT(nick_name) as nickName," +
                 "sign_type as sigType" +
-                " from u_task_batch where is_deleted=0 GROUP BY JSON_EXTRACT(json_data, '$.formDataId'),sign_type ORDER BY sign_type ASC ";
+                " from u_task_batch where is_deleted=0 and JSON_UNQUOTE(JSON_EXTRACT(json_data,'$.taskId')) in(SELECT id from u_task where project_id =1792760669353865218 and is_deleted =0 and approval_type=1 ) GROUP BY JSON_EXTRACT(json_data, '$.formDataId'),sign_type ORDER BY sign_type ASC ";
 
         List<TaskSignInfoVO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TaskSignInfoVO.class));
 
-        if (query != null && query.size() >= 1 ) {
+        if (query != null && query.size() >= 1) {
             for (TaskSignInfoVO dataInfo : query) {
-                if (executor.getQueue().size()<=20 ) {
+                if (executor.getQueue().size() <= 10) {
                     Boolean aBoolean = RedisTemplate.hasKey("sign-" + dataInfo.getFormDataId());
-                    if(dataInfo.getSigType()==2){
-                      String sql12 = "SELECT a.* from u_task a,u_task_parallel b where a.process_instance_id=b.process_instance_id and b.initiative=1 and  a.is_deleted=0 and b.is_deleted=0 and a.`status` in(1,2) and a.id='"+dataInfo.getTaskId()+"'";
-                      List<Map<String, Object>> maps12 = jdbcTemplate.queryForList(sql12);
-                      if(maps12!=null && maps12.size()>=1){
-                          jdbcTemplate.execute("delete from u_task_batch where id in("+dataInfo.getId()+")");
-                          aBoolean = true;
-                      }
-                    }else {
-                        dataInfo.setSigType(1);
-                    }
                     if (!aBoolean) {
-                        RedisTemplate.opsForValue().set("sign-" + dataInfo.getFormDataId(), "1",7200, TimeUnit.SECONDS);
-                        CompletableFuture<Void> runAsync = CompletableFuture.runAsync(() -> {
-                            try {
-                                /*===============执行批量任务===============*/
-                                evDataService.signTaskBatch(dataInfo);
-                            } catch (Exception e) {
-                                e.printStackTrace();
+                        if (dataInfo.getSigType() == 2) {
+                            String sql12 = "SELECT a.* from u_task a,u_task_parallel b where a.process_instance_id=b.process_instance_id and b.initiative=1 and  a.is_deleted=0 and b.is_deleted=0 and a.`status` in(1,2) and a.id='" + dataInfo.getTaskId() + "'";
+                            List<Map<String, Object>> maps12 = jdbcTemplate.queryForList(sql12);
+                            if (maps12 != null && maps12.size() >= 1) {
+                                jdbcTemplate.execute("delete from u_task_batch where id in(" + dataInfo.getId() + ")");
+                                aBoolean = true;
                             }
-                        }, executor);
+                        } else {
+                            dataInfo.setSigType(1);
+                        }
+
+                        if(!aBoolean){
+                            RedisTemplate.opsForValue().set("sign-" + dataInfo.getFormDataId(), "1", 7200, TimeUnit.SECONDS);
+                            CompletableFuture<Void> runAsync = CompletableFuture.runAsync(() -> {
+                                try {
+                                    /*===============执行批量任务===============*/
+                                    evDataService.signTaskBatch(dataInfo);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            }, executor);
+                        }
                     }
                 }
             }

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVisaController4.java

@@ -0,0 +1,130 @@
+package org.springblade.evisa.controller;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.logstash.logback.encoder.org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springblade.business.entity.Task;
+import org.springblade.business.entity.TaskParallel;
+import org.springblade.business.feign.TaskClient;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.CommonUtil;
+import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.evisa.service.EVisaService;
+import org.springblade.evisa.utils.FileUtils;
+import org.springblade.evisa.utils.PDFUtils;
+import org.springblade.evisa.utils.PdfAddimgUtil;
+import org.springblade.resource.feign.NewIOSSClient;
+import org.springblade.system.cache.ParamCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.ByteArrayInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+
+/**
+ * 清表基础数据表 控制器
+ *
+ * @author BladeX
+ * @since 2022-05-18
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/evisaInfo")
+@Api(value = "电签类", tags = "电签类接口")
+@Slf4j
+public class EVisaController4 {
+
+    @Autowired
+    StringRedisTemplate RedisTemplate;
+
+    // jdbc
+    private final JdbcTemplate jdbcTemplate;
+
+    // 线程池
+    @Resource(name = "taskExecutor1")
+    private ThreadPoolExecutor executor;
+
+
+    private final NewIOSSClient newIOSSClient;
+
+    // 电签主类
+    @Scheduled(cron = "0/10 * * * * ?")
+    public void SignInfo() {
+        //执行代码
+        log.info("扫描开始");
+        String sql = "SELECT * from u_archive_file where file_url LIKE '%//卷%' and LENGTH(id)<=10 ";
+        List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
+
+        if (maps != null && maps.size() >= 1) {//&& SystemUtils.isLinux()
+            for (Map<String, Object> dataInfo : maps) {
+                if (executor.getQueue().size()<=100 ) {
+                    String id = dataInfo.get("id") + "";
+                    String fileUrl = dataInfo.get("file_url") + "";
+
+                    Boolean aBoolean = RedisTemplate.hasKey("sign-" + id);
+
+                    if (!aBoolean) {
+                        RedisTemplate.opsForValue().set("sign-" + id, "1",900, TimeUnit.SECONDS);
+                        CompletableFuture<Void> runAsync = CompletableFuture.runAsync(() -> {
+                            try {
+                                /*===============执行批量任务===============*/
+                                this.taskMeterPdfInfo2(id,fileUrl);
+
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }, executor);
+                    }
+                }
+            }
+        }
+        System.out.println("队列数量" + executor.getQueue().size());
+        System.out.println("活跃数量" + executor.getActiveCount());
+        System.out.println("总共数量" + executor.getTaskCount());
+        System.out.println("完成数量" + executor.getCompletedTaskCount());
+    }
+
+    @Async
+    public void taskMeterPdfInfo2(@RequestParam String id, @RequestParam String fileUrl) throws Exception {
+        InputStream inputStreamByUrl = CommonUtil.getOSSInputStreamTow(fileUrl);
+        byte[] result = IOUtils.toByteArray(inputStreamByUrl);
+        String dataFileUrl = FileUtils.getSysLocalFileUrl() + "/privateUrl/" + id + ".pdf";
+        if (result != null) {
+            MultipartFile files = new MockMultipartFile("file", SnowFlakeUtil.getId() + ".pdf", "text/plain", IOUtils.toByteArray(new ByteArrayInputStream(result)));
+            //重新上传
+            BladeFile bladeFile = this.newIOSSClient.uploadFileByInputStream(files);
+            if (bladeFile != null) {
+                 String sql = "update u_archive_file set file_url='"+bladeFile.getLink()+"' , pdf_file_url='"+bladeFile.getLink()+"' where id="+id;
+                 jdbcTemplate.execute(sql);
+                System.out.println("11--"+bladeFile.getLink());
+            } else {
+                System.out.println("---四百--");
+            }
+        }
+    }
+}

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVDataServiceImpl.java

@@ -84,6 +84,7 @@ public class EVDataServiceImpl implements EVDataService {
             }
             this.addSignatureTaskBatch(taskApp);
             String fileUrl = CommonUtil.replaceOssUrl(taskApp.getSignPdfUrl());
+            System.out.println("s1231312"+fileUrl);
             List<String> eVisaConfigList = PDFUtils.getPdfSignIds(fileUrl, taskApp);
             if (eVisaConfigList == null || eVisaConfigList.size() == 0) {
                 //没有电签配置，默认当前任务为不签字审批，返回成功
@@ -193,6 +194,9 @@ public class EVDataServiceImpl implements EVDataService {
     @Transactional
     public void SignBackPdfInfo(TaskSignInfoVO taskApp) {
         Integer totalCount = this.jdbcTemplate.queryForObject("select min(exe_count) as exe_count from u_task_parallel where parallel_process_instance_id in(" + taskApp.getParallelProcessInstanceId() + ")", Integer.class);
+        if(totalCount==null){
+            totalCount=0;
+        }
         //上报类型: 1填报资料，2工程文件，3日志资料
         //档案：4档案数据 ,
         //计量： 5中间计量申请，6材料计量单 ,7开工预付款计量单, 8变更令
@@ -684,7 +688,7 @@ public class EVDataServiceImpl implements EVDataService {
 
         Object[] result = null;
         String fileUrl = pdfUrl;
-        if (list.size() >= 10 || fileByte.length > 10 * 1000 * 1000) {
+        if (list.size() >= 10000 || fileByte.length > 100000 * 1000 * 1000) {
             String inUrl = "/inp/" + DateUtil.today();
             String outUrl = "/out/" + DateUtil.today();
             SignFtpUtil.FTPCreateDir(inUrl);
@@ -697,11 +701,18 @@ public class EVDataServiceImpl implements EVDataService {
             InputStream inputStream = new ByteArrayInputStream(fileByte);
             int i = SignFtpUtil.uploadFile(locPdfUrl, inputStream);
             if (i == 1) {
-                result = eVisaService.signPdfByAXQZ(pdfVO, locPdfUrl, OutPdfUrl);
-                int i1 = SignFtpUtil.downloadFile(dataFileUrl, OutPdfUrl);
-                fileUrl = dataFileUrl;
-                SignFtpUtil.FTPDeleteDir(locPdfUrl);
-                SignFtpUtil.FTPDeleteDir(OutPdfUrl);
+                 result = eVisaService.signPdfByAXQZ(pdfVO, locPdfUrl, OutPdfUrl);
+                if(result!=null){
+                    int i1 = SignFtpUtil.downloadFile(dataFileUrl, OutPdfUrl);
+                    fileUrl = dataFileUrl;
+                    SignFtpUtil.FTPDeleteDir(locPdfUrl);
+                    SignFtpUtil.FTPDeleteDir(OutPdfUrl);
+                }else{
+                    taskApp.setSigState(2);
+                    taskApp.setSignSmg("result："+result);
+                    SignBackPdfInfo(taskApp);
+                    return;
+                }
             }
         } else {
             result = eVisaService.signPdfByAXQZ(pdfVO, fileByte);

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -96,7 +96,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class EVisaServiceImpl implements EVisaService {
 
-    private static String SIGN_HOST = "172.30.224.79";
+    private static String SIGN_HOST = "10.0.0.3";
 
     private static final String SIGN_PORT = "8183";
 
@@ -793,7 +793,7 @@ public class EVisaServiceImpl implements EVisaService {
         String url = "http://localhost:9125/FrontSys/SealServicezx/FileSignByKeyWord";
         String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
         if ("20".equals(sys_isonline) || SystemUtils.isWindows() || SystemUtils.isMacOs()) {
-            url = "http://39.108.216.210:9125/FrontSys/SealServicezx/FileSignByKeyWord";
+            url = "http://219.151.181.73:9125/FrontSys/SealServicezx/FileSignByKeyWord";
         }
 
         String sysLocalFileUrl = FileUtils.getSysLocalFileUrl();
@@ -852,7 +852,7 @@ public class EVisaServiceImpl implements EVisaService {
         try {
             String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
             if ("20".equals(sys_isonline) || SystemUtils.isWindows() || SystemUtils.isMacOs()) {
-                SIGN_HOST = "47.115.117.246";
+                SIGN_HOST = "219.151.181.43";
             }
             System.out.println("电签Ip===:" + SIGN_HOST);
             PaperlessClient paperlessClient = new PaperlessClient(SIGN_HOST, SIGN_PORT, 240000000, 810000000);
@@ -1052,7 +1052,7 @@ public class EVisaServiceImpl implements EVisaService {
         try {
             String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
             if ("20".equals(sys_isonline) || SystemUtils.isWindows() || SystemUtils.isMacOs()) {
-                SIGN_HOST = "47.115.117.246";
+                SIGN_HOST = "219.151.181.43";
             }
             System.out.println("电签Ip===:" + SIGN_HOST);
             PaperlessClient paperlessClient = new PaperlessClient(SIGN_HOST, SIGN_PORT, 240000000, 810000000);
@@ -1311,7 +1311,7 @@ public class EVisaServiceImpl implements EVisaService {
         try {
             String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
             if ("20".equals(sys_isonline) || SystemUtils.isWindows() || SystemUtils.isMacOs()) {
-                SIGN_HOST = "47.115.117.246";
+                SIGN_HOST = "219.151.181.43";
             }
             System.out.println("电签Ip===:" + SIGN_HOST);
             PaperlessClient paperlessClient = new PaperlessClient(SIGN_HOST, SIGN_PORT, 240000000, 810000000);
@@ -1390,7 +1390,7 @@ public class EVisaServiceImpl implements EVisaService {
         try {
             String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
             if ("20".equals(sys_isonline) || SystemUtils.isWindows() || SystemUtils.isMacOs()) {
-                SIGN_HOST = "47.115.117.246";
+                SIGN_HOST = "219.151.181.43";
             }
             System.out.println("电签Ip===:" + SIGN_HOST);
             PaperlessClient paperlessClient = new PaperlessClient(SIGN_HOST, SIGN_PORT, 240000000, 810000000);
@@ -1675,7 +1675,7 @@ public class EVisaServiceImpl implements EVisaService {
         try {
             String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
             if ("20".equals(sys_isonline) || SystemUtils.isWindows() || SystemUtils.isMacOs()) {
-                SIGN_HOST = "47.115.117.246";
+                SIGN_HOST = "219.151.181.43";
             }
             PaperlessClient paperlessClient = new PaperlessClient(SIGN_HOST, SIGN_PORT, 240000000, 810000000);
             paperlessClient.setSSL(false);
@@ -1702,7 +1702,7 @@ public class EVisaServiceImpl implements EVisaService {
             List<PdfBean> pdfBeans = new ArrayList<>();
             PdfBean pdfBean = new PdfBean();
             pdfBean.setBizSerialNo(GUIDUtil.generateId());
-            pdfBean.setInputSource("/mnt/bladesign" + loPdfurl);
+            pdfBean.setInputSource("/mnt/sdc/signInfo" + loPdfurl);
             pdfBean.setInputType(BaseConstants.INPUT_TYPE_FILEPATH);
             pdfBeans.add(pdfBean);
             requestBody.setPdfBeans(pdfBeans);
@@ -1715,7 +1715,7 @@ public class EVisaServiceImpl implements EVisaService {
             requestBody.setSealStrategies(sealStrategies);
 
             //签章后文件保存地址，不为空时，直接将签章文件保存在此地址，不再返回签章后文档数据;ftp:auto
-            requestBody.setOutputFilepath("/mnt/bladesign" + outPdfUrl);
+            requestBody.setOutputFilepath("/mnt/sdc/signInfo" + outPdfUrl);
 
             //时间戳方式，默认为0；0：实时访问CFCA 时间戳服务；1：使用从CFCA购置并在本地部署的时间戳服务器产品；
             requestBody.setTimestampChannel(BaseConstants.TIME_STAMP_CHANNEL_CFCA);
@@ -1738,7 +1738,7 @@ public class EVisaServiceImpl implements EVisaService {
                 List<PdfBean4Response> pdfBeanList = responseBody.getPdfBeans();
                 if (pdfBeanList != null && pdfBeanList.size() > 0) {
                     PdfBean4Response pdfBean4Response = pdfBeanList.get(0);
-                    result[0] = pdfBean4Response.getPdf();
+                    result[0] = pdfBean4Response.getOutputFilepath();
                 }
             } else {
                 logger.info("【电签模块】{}", "签章响应Response:" + compoundSealPdfListDetachedResponse);

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/utils/SignFtpUtil.java

@@ -11,10 +11,8 @@ import java.io.*;
 public class SignFtpUtil {
 
     // -外网
-   // private static final String SERVER = "47.115.117.246";
-    // 内网210
-    private static String SERVER = "172.30.224.79";
-    private static final int PORT = 6233;
+    private static String SERVER = "10.0.0.3";
+    private static final int PORT = 6233 ;
     private static final String USER = "signAdmin";
     private static final String PASS = "123456";
     private static final int CONNECT_TIMEOUT = 900000; // 30秒
@@ -35,7 +33,7 @@ public class SignFtpUtil {
             // 连接到FTP服务器
             String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
             if("20".equals(sys_isonline) || SystemUtils.isWindows() || SystemUtils.isMacOs()){
-                SERVER = "47.115.117.246";
+                SERVER = "219.151.181.43";
             }
             System.out.println("ftp上传ip地址:"+SERVER);
             ftp.connect(SERVER, PORT);
@@ -229,4 +227,11 @@ public class SignFtpUtil {
         }
     }
 
+/*    public static void main(String[] args) {
+        String loudUrl = "/Users/hongchuangyanfa/Desktop/excel/头像.jpeg";
+        uploadFile(loudUrl,"/inp/20250317/123.jpeg");
+
+      //  ftp://signAdmin:123456@219.151.181.43:6233/inp/20250317/bc64d878fed6eff18a896641874594ea.jpg
+       // downloadFile("/Users/hongchuangyanfa/Desktop/22222/头像.jpeg","/inp/20250317/bc64d878fed6eff18a896641874594ea.jpg");
+    }*/
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -495,7 +495,7 @@ public class UserController {
         HttpClient httpClient = HttpClientBuilder.create().build();
         HttpGet httpPost = new HttpGet("http://user.hcxxy.com:8090/blade-auth/oauth/user-info");
         if("20".equals(sys_isonline)){
-            httpPost =new HttpGet("http://152.168.2.11:8090/blade-auth/oauth/user-info");
+            httpPost =new HttpGet("http://127.0.0.1:8090/blade-auth/oauth/user-info");
         }
 
         httpPost.setHeader("Authorization", token); //这个需要 client:
@@ -589,7 +589,7 @@ public class UserController {
         String url = "http://user.hcxxy.com:8090/blade-auth/oauth/token";
         String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
         if("20".equals(sys_isonline)){
-            url = "http://152.168.2.11:8090/blade-auth/oauth/token";
+            url = "http://127.0.0.1:8090/blade-auth/oauth/token";
         }
         HttpPost httpPost = new HttpPost(url);
         httpPost.setHeader("Authorization", Authorization);