Merge branch 'master' of https://github.com/roncoo/roncoo-education into dev

 Conflicts:
	README.md
	pom.xml
	roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/api/biz/ApiUserInfoBiz.java

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/common/bo/UserRegisterBO.java

@@ -3,12 +3,12 @@
  */
 package com.roncoo.education.user.common.bo;
 
-import java.io.Serializable;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 用户基本信息
@@ -20,34 +20,41 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class UserRegisterBO implements Serializable {
 
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 手机号码
-	 */
-	@ApiModelProperty(value = "手机", required = true)
-	private String mobile;
-	/**
-	 * 登录密码
-	 */
-	@ApiModelProperty(value = "密码", required = true)
-	private String password;
-	/**
-	 * 重复密码
-	 */
-	@ApiModelProperty(value = "重复密码", required = true)
-	private String repassword;
-	/**
-	 * clientId
-	 */
-	@ApiModelProperty(value = "clientId", required = true)
-	private String clientId;
-	/**
-	 * 手机验证码
-	 */
-	@ApiModelProperty(value = "手机验证码", required = true)
-	private String code;
-
-	private String ip;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机", required = true)
+    private String mobile;
+    /**
+     * 登录密码
+     */
+    @ApiModelProperty(value = "密码", required = true)
+    private String password;
+    /**
+     * 重复密码
+     */
+    @ApiModelProperty(value = "重复密码", required = true)
+    private String repassword;
+    /**
+     * clientId
+     */
+    @ApiModelProperty(value = "clientId", required = true)
+    private String clientId;
+    /**
+     * 手机验证码
+     */
+    @ApiModelProperty(value = "手机验证码", required = true)
+    private String code;
+
+    @ApiModelProperty(value = "ip地址")
+    private String ip;
+
+    @ApiModelProperty(value = "注册来源", hidden = true)
+    private Integer source = 2;
+
+    @ApiModelProperty(value = "推荐人", hidden = true)
+    private String referralCode = "D92359";
 
 }

roncoo-education-util/pom.xml

@@ -34,6 +34,12 @@
             <version>5.3.8</version>
         </dependency>
 
+        <!-- hutool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
         <!-- jwt -->
         <dependency>
             <groupId>com.auth0</groupId>

roncoo-education-util/src/main/java/com/roncoo/education/util/enums/FileTypeEnum.java

@@ -3,7 +3,6 @@
  */
 package com.roncoo.education.util.enums;
 
-import com.roncoo.education.util.base.BaseException;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -14,10 +13,10 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FileTypeEnum {
 
-	ALIYUN(1, "阿里云"), FDSF(2, "FastDFS"), LOCAL(3, "本地");
+    LOCAL(0, "本地"), ALIYUN(1, "阿里云"), FDSF(2, "FastDFS"), MINIO(3, "MinIO");
 
-	private Integer code;
+    private Integer code;
 
-	private String desc;
+    private String desc;
 
 }