diff --git a/src/main/java/com/zhgd/xmgl/call/JcCall.java b/src/main/java/com/zhgd/xmgl/call/JcCall.java index 9f2187fcf..fe69330df 100644 --- a/src/main/java/com/zhgd/xmgl/call/JcCall.java +++ b/src/main/java/com/zhgd/xmgl/call/JcCall.java @@ -138,7 +138,7 @@ public class JcCall { JcHttpUtil.UserSyncRequest.CertificateInfo certificateInfo = new JcHttpUtil.UserSyncRequest.CertificateInfo(); if (StrUtil.isNotBlank(o.get("photoUrl"))) { try { - certificateInfo.setCertificate(PathUtil.getServerUrl() + "/image/" + FileUtils.urlToFileName(o.get("photoUrl"))); + certificateInfo.setCertificate(FileUtils.getOnlineUrl(o.get("photoUrl"))); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerCertificateServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerCertificateServiceImpl.java index b7db2a661..5fde6c4be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerCertificateServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerCertificateServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.call.JcCall; import com.zhgd.xmgl.modules.worker.entity.WorkerBlacklist; import com.zhgd.xmgl.modules.worker.entity.WorkerCertificate; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; @@ -13,9 +14,11 @@ import com.zhgd.xmgl.modules.worker.mapper.WorkerBlacklistMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerCertificateMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.service.IWorkerCertificateService; +import com.zhgd.xmgl.util.AsyncTaskUtil; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +44,9 @@ public class WorkerCertificateServiceImpl extends ServiceImpl { + WorkerInfo workerInfo = workerInfoMapper.selectById(workerCertificate.getWorkerId()); + jcCall.sendSaveWorkerInfoByJc(workerInfo); + }); } @Override @@ -79,6 +93,7 @@ public class WorkerCertificateServiceImpl extends ServiceImpl fileObjs = parseUrlString(fileUrl); + if (CollUtil.isEmpty(fileObjs)) { + return null; + } + String fileUrl1 = fileObjs.get(0).getFileUrl(); + if (StrUtil.isBlank(fileUrl1)) { + return null; + } + if (fileUrl1.contains("http:") || fileUrl1.contains("https:")) { + fileUrl1 = StringUtils.substringAfter(fileUrl1, "/image/"); + } + return fileUrl1; + } + public static void main(String[] args) { - System.out.println(urlToFileName("图片2.png*http://jxj.zhgdyun.com:21000/image/0012710f3eac4542b30314130873ae6e1.png")); - System.out.println(urlToFileName("文件名称.png*0012710f3eac4542b30314130873ae6e.png")); - System.out.println(urlToFileName("0012710f3eac4542b30314130873ae6e1.png")); - System.out.println(urlToFileName("0012710f3eac4542b30314130873ae6e.png,123.png")); + System.out.println(urlToLocalFileName("图片2.png*http://jxj.zhgdyun.com:21000/image/0012710f3eac4542b30314130873ae6e1.png")); + System.out.println(urlToLocalFileName("文件名称.png*0012710f3eac4542b30314130873ae6e.png")); + System.out.println(urlToLocalFileName("0012710f3eac4542b30314130873ae6e1.png")); + System.out.println(urlToLocalFileName("0012710f3eac4542b30314130873ae6e.png,123.png")); } /** @@ -213,7 +234,7 @@ public class FileUtils { String getUrl = null; if (StrUtil.isNotBlank(url)) { try { - getUrl = PathUtil.getServerUrl() + "/image/" + FileUtils.urlToFileName(url); + getUrl = PathUtil.getServerUrl() + "/image/" + FileUtils.urlToLocalFileName(url); } catch (Exception e) { log.error("", e); }