Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ExcelAnalyseCoreServiceImpl.java

@@ -15,9 +15,11 @@ import com.yonge.cooleshow.biz.dal.service.ExcelAnalyseCoreService;
 import com.yonge.cooleshow.biz.dal.service.FileImportInfoService;
 import com.yonge.cooleshow.biz.dal.service.TenantAccountRecordService;
 import com.yonge.cooleshow.biz.dal.wrapper.FileImportInfoWrapper;
+import com.yonge.toolset.base.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -73,7 +75,9 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
                         .build();
                 fileImportInfoService.update(importInfo);
 
-            } catch (Exception e) {
+            }catch (NotOfficeXmlFileException e) {
+                throw new BizException("上传文件格式版本太低");
+            }catch (Exception e) {
                 log.error("asyncAnalyseReadExcelData wrapper={}", wrapper.jsonString(), e);
             }
         });
@@ -100,6 +104,8 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
             fileImportInfoService.update(importInfo);
             return fileImportInfoService.getById(wrapper.getId());
 
+        }catch (NotOfficeXmlFileException e) {
+            throw new BizException("上传文件格式版本太低");
         } catch (Exception e) {
             log.error("asyncAnalyseReadExcelData wrapper={}", wrapper.jsonString(), e);
         }
@@ -154,6 +160,8 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
                 log.info("createFileImportRecord uploadFile={}, resp={}", uploadFile, context.getResp());
                 // 删除本地缓存文件
                 DownloadManager.getInstance().deleteOnExit(respPath);
+            } else if (StringUtils.isNotEmpty(respPath)) {
+                context.setResp(wrapper.getImportUrl());
             }
         }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/StudentWrapper.java

@@ -11,6 +11,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -192,4 +193,13 @@ public class StudentWrapper {
         @ApiModelProperty("机构ID")
         private Long tenantId;
     }
+
+    @Data
+    @ApiModel("学生修改密码")
+    public static class StudentUpdatePassword {
+
+        @ApiModelProperty("密码")
+        @NotNull
+        private String password;
+    }
 }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentController.java

@@ -15,6 +15,7 @@ import com.yonge.cooleshow.biz.dal.vo.MyFollow;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.mybatis.support.PageUtil;
@@ -25,6 +26,8 @@ import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -168,4 +171,16 @@ public class StudentController extends BaseController {
         return succeed();
     }
 
+
+    @PostMapping("/checkPassword")
+    @ApiOperation(value = "校验密码")
+    public Object checkPassword(@Validated @RequestBody StudentWrapper.StudentUpdatePassword updatePassword){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        if(!encoder.matches(updatePassword.getPassword(),sysUser.getPassword())){
+            throw new BizException("原密码错误");
+        }
+        return succeed();
+    }
+
 }