Merge branch 'zx_saas_0208_contracts' of http://git.dayaedu.com/yonge/mec into dev

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -61,10 +61,10 @@ public class UserController extends BaseController {
 	@Autowired
 	private RedisCache<String,Object> redisCache;
 
-	@Value("${message.debugMode}")
+	/*@Value("${message.debugMode}")
 	private boolean debugMode;
 	@Autowired
-	private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
+	private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;*/
 
 	@ApiOperation(value = "分页查询用户信息")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "String"),

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -246,11 +246,11 @@ public class ContractServiceImpl implements ContractService {
             }
 
             if (CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
-//                if (!debugMode) {
-//                    realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idCardNo);
-                    // 取消第三方实名认证
-                    RealnameAuthenticationDto.verify(realName, idCardNo);
-//                }
+                // 取消第三方实名认证
+                RealnameAuthenticationDto.verify(realName, idCardNo);
+                /*if (!debugMode) {
+                    realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idCardNo);
+                }*/
 
                 accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrganizationServiceImpl.java

@@ -191,10 +191,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
             //升级机构协议版本号
             tenantContractTemplateService.upgradeContractVersion(tenantId);
             
-			if (StringUtils.isNotBlank(organization.getCorporateName()) && StringUtils.isNotBlank(organization.getCorporateCode())) {
+			/*if (StringUtils.isNotBlank(organization.getCorporateName()) && StringUtils.isNotBlank(organization.getCorporateCode())) {
 				// 添加签章信息
 				contractService.addTsign(organization.getId(), organization.getCorporateCode(), organization.getCorporateName(), tenantId);
-			}
+			}*/
         }
 		
 		return true;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -4286,11 +4286,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 }
             }
         }
-        try {
+        /*try {
             contractService.register(user.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
         } catch (Exception e) {
             LOGGER.error("[{}]小课购买协议生成错误：{}", practiceGroup.getId(), e.getCause());
-        }
+        }*/
 
         String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //分类费用 course，instrument，accessories，other

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -1548,7 +1548,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentInfo.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(studentInfo);
         // 添加用户电子签章账户
-        contractService.register(student.getUserId(), student.getParentsName(), student.getIdCardNo(), student.getParentsPhone());
+//        contractService.register(student.getUserId(), student.getParentsName(), student.getIdCardNo(), student.getParentsPhone());
         return student;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -259,7 +259,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             //升级机构协议版本号
             tenantContractTemplateService.upgradeContractVersion(tenantId);
             //添加签章信息
-            contractService.addTsign(tenantInfo.getUserId(), dto.getTsignCode(), dto.getTsignName(), tenantId);
+//            contractService.addTsign(tenantInfo.getUserId(), dto.getTsignCode(), dto.getTsignName(), tenantId);
         }
 
         //机构状态 1已缴费，并且 机构注册的手机号与本次修改后的手机号不同，就证明本次修改了手机号 则需要修改机构的账号信息
@@ -461,7 +461,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         Lists.partition(collectMenuId, 50)
                 .forEach(idList -> employeeService.batchInsertRoleMenu(roleId, idList, tenantId));
         //添加签章信息
-        contractService.addTsign(tenantInfo.getUserId(), tenantInfo.getTsignCode(), tenantInfo.getTsignName(), tenantId);
+//        contractService.addTsign(tenantInfo.getUserId(), tenantInfo.getTsignCode(), tenantInfo.getTsignName(), tenantId);
 
         Date now = new Date();
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -2786,11 +2786,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 }
             }
         }
-        try {
+        /*try {
             contractService.register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
         } catch (Exception e) {
             businessLogger.error("[{}]课程购买协议生成错误：{}", vipGroup.getId(), e.getCause());
-        }
+        }*/
 
         String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //分类费用 course，instrument，accessories，other

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -228,9 +228,6 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
      * @return
      */
     public boolean organSign(String sealData, String srcPdfPath, String destPdfPath) {
-        if (true){
-            return true;
-        }
         PosBean posBean = new PosBean();
         // 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
         SignType signType = SignType.Key;
@@ -265,9 +262,6 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
      * @return
      */
     public boolean userSign(String accountId, String sealData, String srcPdfPath, String destPdfPath) {
-        if (true){
-            return true;
-        }
         SignPDFFileBean signPDFStreamBean = new SignPDFFileBean();
         // C:test_signed.pdf为平台自身签署后路径
         signPDFStreamBean.setSrcPdfFile(srcPdfPath);