Merge branch 'dev' of http://git.mooctest.com/tuosi-crowd-test-service/tuosi-backend

core/pom.xml

@@ -82,6 +82,7 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
+            <version>5.1.6</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

site/pom.xml

@@ -36,6 +36,7 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
+			<version>5.1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>

site/src/main/java/com/mooctest/crowd/site/command/ApplyAgencyAuthCommand.java

@@ -33,15 +33,15 @@ public class ApplyAgencyAuthCommand{
 
     @NotNull(message = "法人姓名不能为空")
     private  String legalPersonName;
-    @NotNull(message = "身份证号码不能为空")
+//    @NotNull(message = "身份证号码不能为空")
     private  String  IdCardNum;
-    @NotNull(message = "请选择性别")
+//    @NotNull(message = "请选择性别")
     private String gender;
-    @NotNull(message = "请上传身份证正面照")
+//    @NotNull(message = "请上传身份证正面照")
     private String idCardPositivePhoto;//身份证正面照
-    @NotNull(message = "请上传身份证反面照")
+//    @NotNull(message = "请上传身份证反面照")
     private String idCardBackPhoto;//身份证反面照
-    @NotNull(message = "请正确填写身份证过期时间")
+//    @NotNull(message = "请正确填写身份证过期时间")
     private Date idCardDeadTime;
     @NotNull(message = "请选择企业认证类型")
     private ArrayList<Integer> roleList;

site/target/classes/application.yml

@@ -24,8 +24,6 @@ file:
     path: /var/www/
 
 oss:
-#  accessKeyId: LTAI4FdrT3HsfdR5edBVN7ws
-#  accessKeySecret: yroxrpm46DzTyzHrLBZzS3MRNIicP6
   accessKeyId: LTAI5tKXZyWkB2mCXRuHBNCB
   accessKeySecret: tyJ4zu0bmGheTRuxzQ0iyKIiJkStx4
   endPoint: oss-cn-hangzhou.aliyuncs.com