add

src/main/java/com/zfire/jiasm/syncdata/base/BaseService.java

@@ -79,7 +79,6 @@ public class BaseService {
     public void initFile(String id){
         FileOutputStream fos = null;
         BufferedInputStream bis = null ;
-        HttpURLConnection httpUrl =null;
         int BUFFER_SIZE = 1024;
         byte[] buf = new byte[BUFFER_SIZE];
         int size = -1;

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -62,7 +62,7 @@ public class GLPPWXGQueryAdd {
 
 
     /**
-     * 新增 师傅服务类目信息
+     * 新增 师傅服务类目信息 这里只做新增(只新增从格力总部过来的师傅服务的类目信息)
      */
     @Scheduled(fixedDelayString = "${lmxx}")
     public void wxgQueryAddCategory() throws Exception {

src/main/java/com/zfire/jiasm/syncdata/http/PostObjectSample.java

@@ -1,15 +1,15 @@
 package com.zfire.jiasm.syncdata.http;
 
-import com.alibaba.fastjson.JSONObject;
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.common.utils.BinaryUtil;
 import com.aliyun.oss.internal.OSSUtils;
 import com.aliyun.oss.model.Callback;
-import com.zfire.jiasm.syncdata.gree.GreeLogic;
+import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.response.ExtData;
-import lombok.extern.slf4j.Slf4j;
+import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 
 import javax.activation.MimetypesFileTypeMap;
+import javax.annotation.Resource;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -17,7 +17,6 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-@Slf4j
 public class PostObjectSample {
 
     /**
@@ -44,7 +43,7 @@ public class PostObjectSample {
 
 
 
-    private static String formUpload(String urlStr, Map<String, String> formFields, String localFile)
+    private String formUpload(String urlStr, Map<String, String> formFields, String localFile)
             throws Exception {
         String res = "";
         HttpURLConnection conn = null;
@@ -103,6 +102,8 @@ public class PostObjectSample {
             strBuf.append("Content-Type: " + contentType + "\r\n\r\n");
             out.write(strBuf.toString().getBytes());
             DataInputStream in = new DataInputStream(new FileInputStream(file));
+            // DataInputStream in =new  DataInputStream(ClassUtils.getDefaultClassLoader().getResourceAsStream(String.valueOf(file)));
+
             int bytes = 0;
             byte[] bufferOut = new byte[1024];
             while ((bytes = in.read(bufferOut)) != -1) {

src/main/java/com/zfire/jiasm/syncdata/service/UploadWorkeCertificateService.java

@@ -2,5 +2,5 @@ package com.zfire.jiasm.syncdata.service;
 
 public interface UploadWorkeCertificateService {
 
-    void procesUploadWorkeCert() throws Exception;
+    void procesUploadWorkeCert();
 }

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -113,6 +113,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             workerIdCardMap = oldWorkerRec.stream().collect(Collectors.groupingBy(Worker::getIdcard));
         }
 
+        // 平台服务商网点信息
         websitrec = websitService.lambdaQuery()
                 .select(Websit::getWebsitId,Websit::getServiceId,Websit::getWebsitName).list();
         if (CollectionUtils.isNotEmpty(websitrec)){
@@ -270,10 +271,12 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 wosrec = websitOrderSignMap.get(m.getWdno());
                 // 存在品牌网点对应平台多网点 平台网点信息
                 for (WebsitOrderSign i : wosrec){
-                    // 若师傅身份证没找到说明师傅信息未同步到师傅信息表，不处理 等下次处理即可
-                    if (!workerIdCardMap.containsKey(m.getSfzen())){
+                    // 若师傅没找到说明师傅信息未同步到师傅信息表，不处理 等下次处理即可
+                    String workerId = checkIsGreeWroker(workerIdCardMap, m);
+                    if (workerId.length()<1) {
                         continue;
                     }
+
                     // 生成品牌师傅网点信息对像
                     WorkerBrandAccount add = getWorkerBrandAccount(workerIdCardMap, websitMap, m, addwbas, i);
                     // 主键： worker_id + websit_id  已添加过就不再添加
@@ -312,6 +315,19 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         WebsitWorkers.clear();
     }
 
+    private String checkIsGreeWroker(Map<String, List<Worker>> workerIdcardMap, ItfTblWangdianWxgDownload wxg) {
+        String workerId="";
+        if (workerIdcardMap.containsKey(wxg.getSfzen())){
+            for (Worker w: workerIdcardMap.get(wxg.getSfzen())){
+                if (w.getWorkerName().equals(wxg.getWxgmc()) && w.getMobile().equals(wxg.getYddh())){
+                    workerId = w.getWorkerId();
+                    break;
+                }
+            }
+        }
+        return workerId;
+    }
+
     private void getWebsitWorker(Map<String, List<Worker>> workerIdCardMap, Map<String, List<Websit>> websitrecMap,
                                  ItfTblWangdianWxgDownload m, List<WebsitWorker> websitWorkeradd,
                                  WebsitOrderSign i, WorkerBrandAccount add) {

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -190,6 +190,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         Map<String,List<Worker>> Worker_Idcards = new HashMap<>();
         Map<String, List<WorkerServiceCategoryDetail>> workerServiceCategoryDetailMap = new HashMap<>();
         Map<String, List<SysDictRef>> sysDictRefMap = new HashMap<>();
+        List<SysDictRef> sysDictRef = new ArrayList<>();
+        List<WorkerServiceCategoryDetail> wxgCategoryRec = new ArrayList<>();
 
         // 提取品牌信息
         Brand brand = baseService.getBrand();
@@ -198,7 +200,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
 
         // 提取品牌商对应的大类信息
-        List<SysDictRef> sysDictRef =  sysDictRefService.lambdaQuery()
+        sysDictRef =  sysDictRefService.lambdaQuery()
                 .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
                 .eq(SysDictRef::getBrandId, brand.getBrandId())
                 .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
@@ -227,8 +229,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 .select(ItfTblWangdianWxgDownload::getWxgid,
                         ItfTblWangdianWxgDownload::getWxgno,
                         ItfTblWangdianWxgDownload::getWdno,
-                        ItfTblWangdianWxgDownload::getSfzen)
+                        ItfTblWangdianWxgDownload::getSfzen,
+                        ItfTblWangdianWxgDownload::getWxgmc,
+                        ItfTblWangdianWxgDownload::getYddh,
+                        ItfTblWangdianWxgDownload::getFlag)
                 // .eq(ItfTblWangdianWxgDownload::getWxgno,"S21A00200023")// 测试用 todo
+                .eq(ItfTblWangdianWxgDownload::getFlag,DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
 
@@ -243,13 +249,13 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         // 这里提取对应的商户网点信息
 
         // 提取所有师傅的服务大类信息 先内存中查询
-        List<WorkerServiceCategoryDetail> wxgCategoryRec = workerServiceCategoryDetailService.lambdaQuery().list();
+        wxgCategoryRec = workerServiceCategoryDetailService.lambdaQuery().list();
         if (CollectionUtils.isNotEmpty(wxgCategoryRec)){
             workerServiceCategoryDetailMap = wxgCategoryRec.stream().collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getWebsitWorkerId));
         }
 
         for (ItfTblWangdianWxgDownload wxgDownload :wxgRecs){
-            // 无效的数据不新增
+            // 状态无效不处理
             if (wxgDownload.getFlag() != null){
                 if (!wxgDownload.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
                     continue;
@@ -437,7 +443,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 .select(ItfTblWangdianWxgDownload::getWxgid,
                         ItfTblWangdianWxgDownload::getWxgno,
                         ItfTblWangdianWxgDownload::getWdno,
-                        ItfTblWangdianWxgDownload::getSfzen)
+                        ItfTblWangdianWxgDownload::getSfzen,
+                        ItfTblWangdianWxgDownload::getFlag)
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
         try {
@@ -448,6 +455,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                         continue;
                     }
                 }
+
+                // 师傅不存在不处理
+
                 if (!oldWorkers.contains(wxg.getSfzen())) {
                     continue;
                 }
@@ -480,7 +490,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         ItfTblWangdianPositionDownload item = new ItfTblWangdianPositionDownload();
         BeanUtils.copyProperties(wvos,item);
         wdwxgadd.add(item);
-        if (wdwxgadd.size()>100){
+        if (wdwxgadd.size()>3000){
             itfTblWangdianPositionDownloadService.saveBatch(wdwxgadd);
             wdwxgadd.clear();
         }
@@ -679,10 +689,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         List<WorkerServiceCategoryDetail> wscdList = new ArrayList<>();
 
         for (WorkerBrandAccount i:workerBrandAccounts){
-            // 提取本地商户师傅信息 网点，师傅编号  不存在不处理 修改处已做了处理 这里只新增(前提是找到师傅所在网点信息)
+            // 提取本地商户师傅信息 网点｜师傅编号不存在不处理 修改处已做了处理 这里只新增(前提是找到师傅所在网点信息)
             WorkerBrandAccount workerBrandAccount = getWorkerBrandAccountData(workerBrandAccounts, wxgDownload);
-            if (!(i.getBrandWebsitId().equals(wxgDownload.getWdno()) &&
-                    i.getBrandWorkerNumber().equals(wxgDownload.getWxgno()))){
+            if (workerBrandAccount == null){
                 continue;
             }
 
@@ -706,7 +715,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 wvos = resultDatax.getWangdianWxgVos().get(0);
 
                 // 提取师傅的服务大类信息 先内存中查询
-                if (workerServiceCategoryDetailMap.containsKey(wxgDownload.getSfzen())){
+                if (workerServiceCategoryDetailMap.containsKey(wxgDownload.getWxgid())){
                     wxgCategoryTypeRecs = workerServiceCategoryDetailMap.get(workerBrandAccount.getWebsitWorkerId()).stream().
                             collect(Collectors.groupingBy(WorkerServiceCategoryDetail::getType));
                 } else {
@@ -798,8 +807,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         WorkerBrandAccount workerBrandAccount = null;
 
         for (WorkerBrandAccount wba: wbarecs){
-            if (wba.getBrandWebsitId().equals(wxg.getWdno())
-                    && wba.getBrandWorkerNumber().equals(wxg.getWxgno())){
+            if (wba.getBrandWorkerId().equals(wxg.getWxgid())){
                 workerBrandAccount = wba;
                 break;
             }

src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkeCertificateServiceImpl.java

@@ -45,7 +45,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
 
     @Override
-    public void procesUploadWorkeCert() throws Exception {
+    public void procesUploadWorkeCert() {
 
         List<WorkerCert> recs = new ArrayList<>();
         List<WorkerBrandAccount> workerWdnos = new ArrayList<>();
@@ -72,52 +72,62 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
             fid2 = "";
             count = 0;
 
-            //  查看师傅是否已选中品牌商网点(这里只提取选中格力品牌商的师傅数据)
-            workerWdnos = workerBrandAccountService.lambdaQuery()
-                    .eq(WorkerBrandAccount::getWorkerId, item.getWorkerId())
-                    .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON")
-                    .eq(WorkerBrandAccount::getDel,0)
-                    .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId()).list();
-
-            // 未选择品牌商
-            if (workerWdnos.size()<1){
-                updateWorkCertificateerror(item.getId(),"师傅未选择格力品牌商信息");
-                continue;
-            }
+            try{
+                //  查看师傅是否已选中品牌商网点(这里只提取选中格力品牌商的师傅数据)
+                workerWdnos = workerBrandAccountService.lambdaQuery()
+                        .eq(WorkerBrandAccount::getWorkerId, item.getWorkerId())
+                        .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON")
+                        .eq(WorkerBrandAccount::getDel,0)
+                        .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId()).list();
+
+                // 未选择品牌商
+                if (workerWdnos.size()<1){
+                    updateWorkCertificateerror(item,"师傅未选择格力品牌商信息");
+                    continue;
+                }
 
-            //  判断师傅入驻的商户网点
-            count = getCount(workerWdnos, count);
-            if (count.equals(workerWdnos.size())){
-                updateWorkCertificateerror(item.getId(),"师傅未入驻品牌商网点");
-                continue;
-            }
+                //  判断师傅入驻的商户网点
+                count = getCount(workerWdnos, count);
+                if (count.equals(workerWdnos.size())){
+                    updateWorkCertificateerror(item,"师傅未入驻品牌商网点");
+                    continue;
+                }
 
-            // 生成图片
-            if (StringUtils.isNotEmpty(item.getFileUrl()) && (StringUtils.isEmpty(item.getOutFileUrl()))){
-                fid1 = IdWorker.getIdStr() + ".jpg";
-                // 下载文件生成新文件 fid1
-                baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fid1);
-                // 获取文件
-                fileo = fid1;
-            }
-            if (StringUtils.isNotEmpty(item.getFileUrl2()) && (StringUtils.isEmpty(item.getOutFileUrl2()))){
-                fid2 = IdWorker.getIdStr() + ".jpg";
-                // 下载文件生成新文件 fid2
-                baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fid2);
-                // 获取文件
-                filet = fid2;
-            }
+                // 生成图片 System.getProperty("java.io.tmpdir")
+                if (StringUtils.isNotEmpty(item.getFileUrl()) && (StringUtils.isEmpty(item.getOutFileUrl()))){
+                    fid1 = IdWorker.getIdStr() + ".jpg";
+                    // 下载文件生成新文件 fid1
+                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fid1);
+                    // 获取文件
+                    fileo = fid1;
+                }
+                if (StringUtils.isNotEmpty(item.getFileUrl2()) && (StringUtils.isEmpty(item.getOutFileUrl2()))){
+                    fid2 = IdWorker.getIdStr() + ".jpg";
+                    // 下载文件生成新文件 fid2
+                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fid2);
+                    // 获取文件
+                    filet = fid2;
+                }
 
-            // 上传图片 按网点上传
-            for (WorkerBrandAccount wdno: workerWdnos){
-                uploadFileexc(fileo, filet, fid1, fid2,wdno.getBrandWebsitId(),item);
-                delfilet(fid3);
-                // 保险数据同步 保险证不在证件表中
-                fid3 = uploadInsureCert(wdno);
-            }
+                // 上传图片 按网点上传
+                for (WorkerBrandAccount wdno: workerWdnos){
+                    uploadFileexc(fileo, filet, fid1, fid2,wdno.getBrandWebsitId(),item);
+                    delfilet(fid3);
+                    // 保险数据同步 保险证不在证件表中
+                    fid3 = uploadInsureCert(wdno);
+                }
 
-            // 文件清除
-            delfile(fileo, filet, fid1, fid2,fid3);
+                // 文件清除
+                delfile(fileo, filet, fid1, fid2,fid3);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                log.info("同步师傅证件失败：【" + item.getId() + "】");
+                String msg = "同步师傅证件失败：";
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(ex.getMessage())){
+                    msg = msg + ex.getMessage();
+                }
+                updateWorkCertificateerror(item,msg);
+            }
         }
     }
 
@@ -221,13 +231,13 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
                         if (StringUtils.isNotEmpty(responses.getMsg())){
                             msg = msg + responses.getMsg();
                         }
-                        updateWorkCertificateerror(item.getId(),msg);
+                        updateWorkCertificateerror(item,msg);
                     }
                 } else {
-                    updateWorkCertificateerror(item.getId(),"上传图片到OSS失败");
+                    updateWorkCertificateerror(item,"上传图片到OSS失败");
                 }
             } else {
-                updateWorkCertificateerror(item.getId(),"获取签名信息失败");
+                updateWorkCertificateerror(item,"获取签名信息失败");
                 return Boolean.TRUE;
             }
         }
@@ -257,21 +267,22 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
                         if (StringUtils.isNotEmpty(responses.getMsg())){
                             msg = msg + responses.getMsg();
                         }
-                        updateWorkCertificateerror(item.getId(),msg);
+                        updateWorkCertificateerror(item,msg);
                         return Boolean.TRUE;
                     }
                 } else {
-                    updateWorkCertificateerror(item.getId(),"上传图片到OSS失败");
+                    updateWorkCertificateerror(item,"上传图片到OSS失败");
                     return Boolean.TRUE;
                 }
             } else {
-                updateWorkCertificateerror(item.getId(),"获取签名信息失败");
+                updateWorkCertificateerror(item,"获取签名信息失败");
                 return Boolean.TRUE;
             }
         }
         return Boolean.FALSE;
     }
 
+
     private Boolean uploadInitFileexc(String fileo, String fid1,String wdno,WebsitWorker wk) throws Exception {
 
         if (StringUtils.isEmpty(wdno)){
@@ -323,17 +334,19 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
         return count;
     }
 
-    private void updateWorkCertificateerror(String id, String msg) {
+    private void updateWorkCertificateerror(WorkerCert item, String msg) {
         WorkerCert v = new WorkerCert();
-        v.setId(id);
+        v.setId(item.getId());
         v.setOutSyncTime(new Date());
         v.setOutSyncErrorMsg(msg);
+        v.setOutSyncTimes(item.getOutSyncTimes() +1);
         if (msg.length()>250){
             v.setOutSyncErrorMsg(msg.substring(0,250));
         }
         workerCertService.updateById(v);
     }
 
+
     private void updateWorkCertificatesave(WorkerCert i, String file, Integer flag,
                                            Boolean bool, Boolean onlyOne) {
         WorkerCert v = new WorkerCert();
@@ -371,7 +384,8 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
     private List<WorkerCert> getWorkerUploads() {
         // 同步标志-synStatus(0:待同步;1:已同步;99:同步失败)
         return workerCertService.lambdaQuery()
-                .eq(WorkerCert::getOutSyncStatus,0)
+                .in(WorkerCert::getOutSyncStatus,0,99)
+                .lt(WorkerCert::getOutSyncTimes,10)
                 .list();
     }
 }

src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkerTOGreeServiceImpl.java

@@ -688,7 +688,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
     }
 
     // 这里只有修改
-    private void updataWorker(String id, GreeResponseHelper response) throws JsonProcessingException {
+    private void updataWorker(String id, GreeResponseHelper response) {
         WorkerBrandAccount w = new WorkerBrandAccount();
         w.setId(id);
         w.setOutSyncTime(new Date());

src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkeCertificate.java

@@ -27,7 +27,7 @@ public class UploadWorkeCertificate {
 
     // 师傅证件照同步到格力总部
     @Scheduled(fixedDelayString = "${workercertificate}")
-    public void processUploadTask() throws Exception {
+    public void processUploadTask(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         if (workercertificatec.equals(TaskConfigEnum.FALSE.getCode())){

src/main/java/com/zfire/jiasm/syncdata/utils/oss/OSSUtil.java

@@ -66,6 +66,7 @@ public class OSSUtil {
 
 
     public  String getUrlWw(String key){
+        // OSS clientWw = new OSSClientBuilder().build("https://"+OSS_ENDPOINT_WW,ACCESS_KEY_ID,ACCESS_KEY_SECERT);
         OSS clientWw = new OSSClientBuilder().build(OSS_ENDPOINT_WW,ACCESS_KEY_ID,ACCESS_KEY_SECERT);
         // 设置URL过期时间为1小时
         Date expiration = new Date(new Date().getTime() + 3600 * 1000);

src/main/resources/bootstrap-dev.properties

@@ -84,20 +84,21 @@ spring.redis.lettuce.pool.min-idle=0
 spring.redis.timeout=100000ms
 
 #################### 阿里云配置 ######################
-#ali.access.key.id=LTAI4GK1q4mnpCFbonMd1pji
-#ali.access.key.secert=E5LW0V1H8HBxqjKkExIxaXUgSyex6C
-#ali.oss.bucket.name=zfiresupply
-#ali.oss.endpoint.ww=oss-cn-hangzhou.aliyuncs.com/
-#ali.oss.endpoint=oss-cn-hangzhou-internal.aliyuncs.com/
-#ali.oss.type.pic=uploadfile/
-#ali.sms.msg.code=SMS_212320165
-ali.access.key.id=LTAI5tN5RSgMtdGDrNDAqMLT
-ali.access.key.secert=mvWc8VtBFOj10DIa9E1eKiw3F0NRxf
-ali.oss.bucket.name=zfire-supply-sys
-ali.oss.endpoint.ww=oss-cn-shenzhen.aliyuncs.com/
-ali.oss.endpoint=oss-cn-shenzhen-internal.aliyuncs.com/
+ali.access.key.id=LTAI4GK1q4mnpCFbonMd1pji
+ali.access.key.secert=E5LW0V1H8HBxqjKkExIxaXUgSyex6C
+ali.oss.bucket.name=zfiresupply
+ali.oss.endpoint.ww=oss-cn-hangzhou.aliyuncs.com/
+ali.oss.endpoint=oss-cn-hangzhou-internal.aliyuncs.com/
 ali.oss.type.pic=uploadfile/
-ali.sms.msg.code=SMS_247050125
+ali.sms.msg.code=SMS_212320165
+
+#ali.access.key.id=LTAI5tN5RSgMtdGDrNDAqMLT
+#ali.access.key.secert=mvWc8VtBFOj10DIa9E1eKiw3F0NRxf
+#ali.oss.bucket.name=zfire-supply-sys
+#ali.oss.endpoint.ww=oss-cn-shenzhen.aliyuncs.com/
+#ali.oss.endpoint=oss-cn-shenzhen-internal.aliyuncs.com/
+#ali.oss.type.pic=uploadfile/
+#ali.sms.msg.code=SMS_247050125
 
 
 ######################## 从格力下载 ##############################
@@ -177,7 +178,7 @@ gdbaseurl=http://121.41.110.30:8112/
 
 ######################## 同步定时任务时间隔 ########################
 #师傅 证件、师傅、工单子表信息
-workercertificate=5000
+workercertificate=60000
 workercerupload=5000
 detaildown=2000
 #安装工单下载 、入本地表
@@ -290,7 +291,7 @@ hsgdcjtm=10000
 dataupload=2000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
-workercertificatec=FALSE
+workercertificatec=TRUE
 workerceruploadc=FALSE
 detaildownc=FALSE
 #安装工单下载 、入本地表
@@ -371,7 +372,7 @@ ththhgxc=FALSE
 wxzjsc=FALSE
 wxzjscxc=FALSE
 #网点维修工 证件照，服务类目，位置、新增同步到本地、修改
-zjzxxc=TRUE
+zjzxxc=FALSE
 lmxxc=FALSE
 wxgwzc=FALSE
 wxgxgc=FALSE

src/main/resources/bootstrap-prd.properties

@@ -165,7 +165,7 @@ gdbaseurl=http://121.41.110.30:8112/
 
 ######################## 同步定时任务时间隔 ########################
 #师傅 证件、师傅、工单子表信息
-workercertificate=5000
+workercertificate=60000
 workercerupload=5000
 detaildown=2000
 #安装工单下载 、入本地表

src/main/resources/bootstrap-test.properties

@@ -85,20 +85,13 @@ spring.redis.lettuce.pool.min-idle=0
 spring.redis.timeout=100000ms
 
 #################### 阿里云配置 ######################
-#ali.access.key.id=LTAI4GK1q4mnpCFbonMd1pji
-#ali.access.key.secert=E5LW0V1H8HBxqjKkExIxaXUgSyex6C
-#ali.oss.bucket.name=zfiresupply
-#ali.oss.endpoint.ww=oss-cn-hangzhou.aliyuncs.com/
-#ali.oss.endpoint=oss-cn-hangzhou-internal.aliyuncs.com/
-#ali.oss.type.pic=uploadfile/
-#ali.sms.msg.code=SMS_212320165
-ali.access.key.id=LTAI5tN5RSgMtdGDrNDAqMLT
-ali.access.key.secert=mvWc8VtBFOj10DIa9E1eKiw3F0NRxf
-ali.oss.bucket.name=zfire-supply-sys
-ali.oss.endpoint.ww=oss-cn-shenzhen.aliyuncs.com/
-ali.oss.endpoint=oss-cn-shenzhen-internal.aliyuncs.com/
+ali.access.key.id=LTAI4GK1q4mnpCFbonMd1pji
+ali.access.key.secert=E5LW0V1H8HBxqjKkExIxaXUgSyex6C
+ali.oss.bucket.name=zfiresupply
+ali.oss.endpoint.ww=oss-cn-hangzhou.aliyuncs.com/
+ali.oss.endpoint=oss-cn-hangzhou-internal.aliyuncs.com/
 ali.oss.type.pic=uploadfile/
-ali.sms.msg.code=SMS_247050125
+ali.sms.msg.code=SMS_212320165