merge

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -154,18 +154,18 @@ Nuonuo:
     APPSecret: 07168A248B2844E0
 
 oldOrder:
-    studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
-    orderCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/AuditUnderOrder
-    finishOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CompleteOrder
-    refuseCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/ReFundAuditResult
-    inputOrderSn: http://gdxypx.xy.com/WitSystem/BussinessApi/GetNewYxtinputOrderSn
-    checkOrderStudent: http://gdxypx.xy.com/WitSystem/BussinessApi/ReAuditUnderOrder
-    checkOrderBrokerage: http://gdxypx.xy.com/WitSystem/BussinessApi/CommissionRate
-    refundPay: http://192.168.1.222:5030/common/platform/pay
-    refundPayHandle: http://192.168.1.222:5030/common/platform/pay/handle
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: http://192.168.1.222:6030/common/platform/pay
+    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
 
 oldSys:
     host: http://gdxypx.xy.com
 
 invoice:
-    host: http://192.168.1.222:7077/sys/common/openMplatform/log
+    host: http://192.168.1.222:8077/sys/common/openMplatform/log

zhongzheng-admin-saas/src/main/resources/application-pre.yml

@@ -4,9 +4,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
             username: root
-            password: gdxy2021!@#zzjykj
+            password: zhongzheng2021
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -49,11 +49,11 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 172.18.19.227
+        host: 192.168.1.222
         # 端口，默认为6379
         port: 6379
         # 数据库索引
-        database: 0
+        database: 1
         # 密码
         password: zhongzheng2021_redis
         # 连接超时时间
@@ -152,3 +152,20 @@ Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
+
+oldOrder:
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: http://192.168.1.222:6030/common/platform/pay
+    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
+
+oldSys:
+    host: http://gdxypx.xy.com
+
+invoice:
+    host: http://192.168.1.222:8077/sys/common/openMplatform/log

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -258,7 +258,6 @@ public class ClassGradeController extends BaseController {
         List<UserPeriodExportV2Vo> list = iClassGradeUserService.listUserStudyRecordV2(bo);
         return getDataTable(list);
     }
-
     /**
      * 查询学时学员记录列表
      *//*

zhongzheng-admin/src/main/resources/application-pre.yml

@@ -4,9 +4,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
             username: root
-            password: gdxy2021!@#zzjykj
+            password: zhongzheng2021
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -152,3 +152,20 @@ Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
+
+oldOrder:
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: http://192.168.1.222:6030/common/platform/pay
+    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
+
+oldSys:
+    host: http://gdxypx.xy.com
+
+invoice:
+    host: http://192.168.1.222:8077/sys/common/openMplatform/log

zhongzheng-api/src/main/resources/application-pre.yml

@@ -4,9 +4,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
             username: root
-            password: gdxy2021!@#zzjykj
+            password: zhongzheng2021
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -152,3 +152,20 @@ Nuonuo:
     host: https://sandbox.nuonuocs.cn/open/v1/services
     APPkey: SD39149760
     APPSecret: SD168A248B2844E0
+
+oldOrder:
+    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: http://192.168.1.222:6030/common/platform/pay
+    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
+
+oldSys:
+    host: http://gdxypx.xy.com
+
+invoice:
+    host: http://192.168.1.222:8077/sys/common/openMplatform/log

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.common.utils;
 
+
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
@@ -17,11 +18,17 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
+
+
+import static org.apache.xmlbeans.impl.util.Base64.encode;
+
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+
 public class ToolsUtils {
 
     public static final int EMU_PER_PX = 9525;
@@ -269,6 +276,11 @@ public class ToolsUtils {
         return null;
     }
 
+    public static String encodetoStr(byte[] src) {
+        byte[] encoded = encode(src);
+        return new String(encoded,0,0,encoded.length);
+    }
+
     /**
      * 不够位数的在前面补0，保留num的长度位数字
      * @param code

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/http/HttpUtils.java

@@ -166,7 +166,8 @@ public class HttpUtils
 
     public static String sendPostJsonHeader(String url, String json, Map<String, String> headersMap)
     {
-        HttpClient client =  HttpClients.createDefault();
+   //     System.out.println(json);
+        HttpClient client = HttpClients.createDefault();
         HttpPost post = new HttpPost(url);
         try {
             //此处应设定参数的编码格式，不然中文会变乱码

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -862,6 +862,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                             throw new CustomException(studyAccountStatusQueryBo.getRealname() + "学员信息为空");
                         }
                         CertInfoListItem certInfoListItem = new CertInfoListItem();
+                        if(Validator.isEmpty(personRoot.getCertInfoList())||personRoot.getCertInfoList().size()==0){
+                            throw new CustomException(studyAccountStatusQueryBo.getRealname() + "学员信息为空");
+                        }
                         for (CertInfoListItem certInfo : personRoot.getCertInfoList()) {
                             if (studyAccountStatusQueryBo.getWorkTypeName().equals(certInfo.getWorkTypeName())) {
                                 BeanUtils.copyProperties(certInfo, certInfoListItem);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -1850,11 +1850,11 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     FileBean f1 = new FileBean();
                     String idCardImg1 = vo.getIdCardImg1();
                     f1.setPath(idCardImg1);
-                    f1.setFileName("身份证/"+vo.getIdCard() + "_0.jpg");
+                    f1.setFileName("身份证/"+vo.getIdCard() + "_0$身份证.jpg");
                     FileBean f2 = new FileBean();
                     String idCardImg2 = vo.getIdCardImg2();
                     f2.setPath(idCardImg2);
-                    f2.setFileName("身份证/"+vo.getIdCard() + "_1.jpg");
+                    f2.setFileName("身份证/"+vo.getIdCard() + "_1$身份证.jpg");
                     fileBeanList.add(f1);
                     fileBeanList.add(f2);
                 }
@@ -1864,7 +1864,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     FileBean f3 = new FileBean();
                     String oneInchPhotos = vo.getOneInchPhotos();
                     f3.setPath(oneInchPhotos);
-                    f3.setFileName("证件照/"+vo.getIdCard() + ".jpg");
+                    f3.setFileName("证件照/"+vo.getIdCard() + "$头像.jpg");
                     fileBeanList.add(f3);
                 }
 
@@ -1873,7 +1873,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     String commitment_seal = JSONObject.parseObject(String.valueOf(maps.get("commitment_seal")), UserProfileFit.class).getValue();
                     FileBean f4 = new FileBean();
                     f4.setPath(commitment_seal);
-                    f4.setFileName("承诺书/"+vo.getIdCard()  + ".jpg");
+                    f4.setFileName("承诺书/"+vo.getIdCard()  + "$承诺书.jpg");
                     fileBeanList.add(f4);
                 }
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeVo.java

@@ -301,4 +301,7 @@ public class UserSubscribeVo {
 	@Excel(name = "智慧考场抓拍照")
 	@ApiModelProperty("智慧考场抓拍照")
 	private String snapPictures;
+
+	@ApiModelProperty("证件照")
+	private String oneInchPhotos;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/service/impl/WisdomServiceImpl.java

@@ -242,9 +242,10 @@ public class WisdomServiceImpl  implements IWisdomService {
             Map<String, Object> userVo = new HashMap<>();
             userVo.put("examineeCode",vo.getExamineeCode());
             userVo.put("idNumber",vo.getIdCard());
-            userVo.put("examineeName","ddsfs");
+            userVo.put("examineeName",vo.getRealname());
             userVo.put("idCardImg1",vo.getIdCardImg1());
             userVo.put("idCardImg2",vo.getIdCardImg2());
+            userVo.put("oneInchPhotos",vo.getOneInchPhotos());
             userVo.put("phone_num",vo.getTelphone());
             userVo.put("status",0);
             userVo.put("reportTime",DateUtils.getTime());
@@ -302,13 +303,19 @@ public class WisdomServiceImpl  implements IWisdomService {
                     String idCardImg2 = String.valueOf(userVo.get("idCardImg2"));
                     f2.setPath(idCardImg2);
                     f2.setFileName(userVo.get("examineeCode")+"_1.jpg");
-                    fileBeanList.add(f1);
-                    fileBeanList.add(f2);
+                    FileBean f3 = new FileBean();
+                    String oneInchPhotos = String.valueOf(userVo.get("oneInchPhotos"));
+                    f3.setPath(oneInchPhotos);
+                    f3.setFileName(userVo.get("examineeCode")+".jpg");
+                  /*  fileBeanList.add(f1);
+                    fileBeanList.add(f2);*/
+                    fileBeanList.add(f3);
+
                 }
                 ossService.zipWisdomDownload(fileBeanList,outStream);
                 outStream.close();
                 byte[] dataByte = ToolsUtils.getBytesByFile(zipFile);
-                vo.setExamineeZipFiles(dataByte);
+                vo.setExamineeZipFiles(ToolsUtils.encodetoStr(dataByte));
                 FileUtils.deleteFile(zipFile);
             } catch (IOException e) {
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/vo/CenterVo.java

@@ -17,7 +17,7 @@ public class CenterVo {
 
     private String zipFileName;
 
-    private byte[] examineeZipFiles;
+    private String examineeZipFiles;
 
     private String examName;
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="telphone" column="telphone" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="idCardImg1" column="id_card_img1"/>
         <result property="idCardImg2" column="id_card_img2"/>
+        <result property="oneInchPhotos" column="one_inch_photos"/>
         <result property="centerId" column="center_id"/>
         <result property="applyCode" column="apply_code"/>
         <result property="roomId" column="room_id"/>
@@ -435,6 +436,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                u.telphone,
                u.id_card_img1,
                u.id_card_img2,
+               u.one_inch_photos,
                es.center_id,
                ea.code as apply_code,
                ea.apply_name