|
|
@@ -1,15 +1,19 @@
|
|
|
package com.goafanti.user.controller;
|
|
|
|
|
|
|
|
|
+import java.io.IOException;
|
|
|
+import java.util.List;
|
|
|
import java.util.UUID;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.validation.Valid;
|
|
|
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
@@ -23,6 +27,7 @@ import com.goafanti.common.model.UserCareer;
|
|
|
import com.goafanti.common.model.UserEdu;
|
|
|
import com.goafanti.common.model.UserIdentity;
|
|
|
import com.goafanti.common.model.UserInfo;
|
|
|
+import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.common.utils.PasswordUtil;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.user.bo.OrgIdentityBo;
|
|
|
@@ -130,6 +135,39 @@ public class UserApiController extends BaseApiController {
|
|
|
* @param bindingResult
|
|
|
* @return
|
|
|
*/
|
|
|
+ @RequestMapping(value = "/avatar/upload", method = RequestMethod.POST)
|
|
|
+ public Result avatar(HttpServletRequest req) {
|
|
|
+ Result res = new Result();
|
|
|
+ res.setData(handleFile(res, "/avatar/", false, req));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ @RequestMapping(value = "/identity/upload", method = RequestMethod.POST)
|
|
|
+ public Result identityFile(HttpServletRequest req) {
|
|
|
+ Result res = new Result();
|
|
|
+ res.setData(handleFile(res, "/identity/", true, req));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req) {
|
|
|
+ List<MultipartFile> files = getFiles(req);
|
|
|
+ String fileName = path + System.nanoTime() + ".jpg";
|
|
|
+ if (!files.isEmpty()) {
|
|
|
+ try {
|
|
|
+ MultipartFile mf = files.get(0);
|
|
|
+ mf.transferTo(isPrivate ? toPrivateFile(fileName) : toFile(fileName));
|
|
|
+ LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
|
|
|
+ } catch (IllegalStateException | IOException e) {
|
|
|
+ LoggerUtils.error(getClass(), "文件上传失败", e);
|
|
|
+ res.getError().add(buildError("", "文件上传失败!"));
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ res.getError().add(buildError("", "文件上传失败!"));
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+ return fileName;
|
|
|
+ }
|
|
|
|
|
|
@RequestMapping(value = "/personaldata", method = RequestMethod.POST)
|
|
|
public Result personalData(@Valid UserInfoBo userInfoBo,BindingResult bindingResult){
|
|
|
@@ -138,6 +176,7 @@ public class UserApiController extends BaseApiController {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
bindingResult.getFieldError().getField()));
|
|
|
return res;
|
|
|
+
|
|
|
}
|
|
|
if(res.getError().isEmpty()){
|
|
|
UserInfo info= userInfoService.selectUserInfoByUserId(TokenManager.getUserId());
|