update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -26,5 +26,5 @@ public interface SysUserFeignService {
 	public Object test();
 
 	@GetMapping(value = "queryUserInfo")
-	SysUser queryUserInfo();
+	public SysUser queryUserInfo();
 }

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -22,6 +22,7 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 
 	@Override
 	public SysUser queryUserInfo() {
+		System.out.println("********************************");
 		return null;
 	}
 

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -67,8 +67,8 @@ public class SysUser {
 	@ApiModelProperty(value = "用户类型",required = false)
 	private SysUserType userType;
 
-	@ApiModelProperty(value = "性别",required = false)
-	private UserGenderEnum gender;
+	@ApiModelProperty(value = "性别0女1男",required = false)
+	private Integer gender;
 
 	@ApiModelProperty(value = "民族",required = false)
 	private String nation;
@@ -202,11 +202,11 @@ public class SysUser {
 		this.userType = userType;
 	}
 
-	public UserGenderEnum getGender() {
+	public Integer getGender() {
 		return gender;
 	}
 
-	public void setGender(UserGenderEnum gender) {
+	public void setGender(Integer gender) {
 		this.gender = gender;
 	}
 

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

@@ -92,10 +92,9 @@ public class UserController extends BaseController {
 	@PostMapping(value = "/updatePassword",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "authCode", value = "验证码", required = true, dataType = "String"),
-			@ApiImplicitParam(name = "newPassword", value = "新密码", required = true, dataType = "String"),
-			@ApiImplicitParam(name = "password", value = "旧密码", required = true, dataType = "String") })
+			@ApiImplicitParam(name = "newPassword", value = "新密码", required = true, dataType = "String")})
 	public Object updatePassword(String mobile,String authCode,String password,String newPassword) {
-		if(StringUtils.isEmpty(mobile) || StringUtils.isEmpty(authCode) || StringUtils.isEmpty(password) || StringUtils.isEmpty(newPassword)){
+		if(StringUtils.isEmpty(mobile) || StringUtils.isEmpty(authCode) || StringUtils.isEmpty(newPassword)){
 			return failed("参数校验异常");
 		}
 		SysUser sysUser = sysUserService.queryByPhone(mobile);
@@ -103,28 +102,13 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		if(smsCodeService.verifyValidCode(mobile, authCode)){
-			if(StringUtils.equals(password,newPassword)){
-				return failed("新密码与旧密码一致");
-			}
-			BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
-			newPassword = bCryptPasswordEncoder.encode(newPassword);
-			if(bCryptPasswordEncoder.matches(password,sysUser.getPassword())){
-				sysUserService.updatePassword(mobile,newPassword);
-				return succeed();
-			}else {
-				return failed("密码错误");
-			}
+			sysUserService.updatePassword(mobile,newPassword);
+			return succeed();
 		}else {
 			return failed("验证码错误");
 		}
 	}
 
-	/*@ApiOperation(value = "删除用户")
-	@DeleteMapping("/del/{id}")
-	public Object del(@ApiParam(value = "用户编号", required = true) @PathVariable("id") Integer id) {
-		return sysUserService.deleteById(id) ? succeed("删除成功") : failed("删除失败");
-	}*/
-
 	@ApiOperation(value = "修改用户")
 	@PostMapping(value = "/update",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 	public Object update(SysUser sysUser) {

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -21,7 +21,7 @@
         <result column="wx_openid_" property="wxOpenid"/>
         <result column="qq_openid_" property="qqOpenid"/>
         <result column="user_type_" property="userType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="gender_" property="gender" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="gender_" property="gender"/>
         <result column="nation_" property="nation"/>
         <result column="birthdate_" property="birthdate"/>
         <result column="email_" property="email"/>
@@ -65,7 +65,7 @@
         INSERT INTO sys_user
         (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_)
         VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{nation},#{birthdate},#{email})
+        #{gender},#{nation},#{birthdate},#{email})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -85,7 +85,7 @@
                 email_ = #{email},
             </if>
             <if test="gender != null">
-                gender_ = #{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                gender_ = #{gender},
             </if>
             <if test="salt != null">
                 salt_ = #{salt},

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/UploadFileService.java

@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -27,7 +28,7 @@ public class UploadFileService {
 	private StoragePlugin storagePlugin;
 
 	/** 最大上传大小，单位kb */
-	@Value("${common.upload.maxSize:10}")
+	@Value("${common.upload.maxSize:10240}")
 	private int maxSize;
 
 	/** 支持的扩展名 */
@@ -35,7 +36,7 @@ public class UploadFileService {
 	private String supportExtensions;
 
 	/** 文件根目录 */
-	@Value("common.upload.fileRoot:/var/tmp/")
+	@Value("/var/tmp/")
 	private String fileRoot;
 
 	public UploadReturnBean uploadFile(InputStream in, String ext) {
@@ -59,9 +60,7 @@ public class UploadFileService {
 
 		String folder = UploadUtil.getFileFloder();
 		String filePath = UploadUtil.getFilePath(root, staticFloder, folder);
-
 		File file = uploadFile(in, filePath, fileName);
-
 		if (maxSize > 0 && maxSize < file.length() / 1024) {
 			FileUtils.deleteQuietly(file);
 			uploadReturn.setMessage("超出允许的大小限制");