忘记密码

modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java

@@ -7,6 +7,7 @@ import com.jeesite.common.idgen.IdGen;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.msg.EmailUtils;
 import com.jeesite.modules.bjflapi.AbstractController;
+import com.jeesite.modules.report.dto.WebsiteUserDto;
 import com.jeesite.modules.report.entity.WebsiteUser;
 import com.jeesite.modules.report.service.WebsiteUserService;
 import com.jeesite.modules.report.util.JwtUtil;
@@ -133,11 +134,10 @@ public class WebsiteUserControllerApi extends AbstractController {
      */
     @WebsiteAuth
     @PostMapping(value = "updatePwd")
-    public String updatePwd(String newPassword,
-                            String confirmNewPassword) {
+    public String updatePwd(WebsiteUserDto dto) {
         String userId = getUserIdByRequest();
         WebsiteUser websiteUser = websiteUserService.get(userId);
-        return updatePass(websiteUser, newPassword, confirmNewPassword);
+        return updatePass(websiteUser, dto.getNewPassword(), dto.getConfirmNewPassword());
     }
 
     private String updatePass(WebsiteUser websiteUser, String newPassword, String confirmNewPassword) {
@@ -162,17 +162,18 @@ public class WebsiteUserControllerApi extends AbstractController {
     }
 
     @PostMapping(value = "forgetPwd")
-    public Map<String, Object> forgetPwd(String uuid, String newPassword,
-                            String confirmNewPassword) {
+    public Map<String, Object> forgetPwd(WebsiteUserDto dto) {
         String secretKey = Global.getProperty("shiro.loginSubmit.secretKey");
-        String userId = (String) redisUtil.get(Constants.PREFIX_USER_FORGET_TOKEN + uuid);
+        String redisKey = Constants.PREFIX_USER_FORGET_TOKEN + dto.getUuid();
+        String userId = (String) redisUtil.get(redisKey);
         if (userId == null) {
             return R.error("链接已过期");
         }
         WebsiteUser websiteUser = websiteUserService.get(userId);
-        updatePass(websiteUser, newPassword, confirmNewPassword);
+        updatePass(websiteUser, dto.getNewPassword(), dto.getConfirmNewPassword());
+        redisUtil.del(redisKey);
         WebsiteUser newWebsiteUser = new WebsiteUser();
-        newWebsiteUser.setPassword(newPassword);
+        newWebsiteUser.setPassword(dto.getNewPassword());
         newWebsiteUser.setLoginCode(DesUtils.encode(websiteUser.getLoginCode(), secretKey));
         return login(newWebsiteUser);
     }
@@ -182,7 +183,8 @@ public class WebsiteUserControllerApi extends AbstractController {
      */
     @PostMapping(value = "getWuValidCode")
     @ApiOperation(value = "获取找回密码的邮件验证码")
-    public String getWuValidCode(String email) {
+    public String getWuValidCode(WebsiteUserDto dto) {
+        String email = dto.getEmail();
         if (StringUtils.isEmpty(email)) {
             return "邮箱为空";
         }

modules/report/src/main/java/com/jeesite/modules/report/dto/WebsiteUserDto.java

@@ -0,0 +1,13 @@
+package com.jeesite.modules.report.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WebsiteUserDto implements Serializable {
+    private String newPassword;        // 新密码
+    private String confirmNewPassword;        // 确认密码
+    private String uuid;        // uuid
+    private String email;        // 目录
+}

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelService.java

@@ -98,4 +98,10 @@ public class ResearchBriefReportLabelService extends CrudService<ResearchBriefRe
 	public long findCountNew(ResearchBriefReportLabel researchBriefReportLabel) {
 		return dao.findPageCount(researchBriefReportLabel);
 	}
+
+	public long findChildCount(String parentId) {
+		ResearchBriefReportLabel where = new ResearchBriefReportLabel();
+		where.setParentId(parentId);
+		return dao.findCount(where);
+	}
 }

modules/report/src/main/java/com/jeesite/modules/report/web/ResearchBriefReportLabelController.java

@@ -72,13 +72,18 @@ public class ResearchBriefReportLabelController extends BaseController {
 	//	@RequiresPermissions("report:researchBriefReportLabel:view")
 	@RequestMapping(value = "treeData")
 	@ResponseBody
-	public List<Map<String, Object>> treeData() {
+	public List<Map<String, Object>> treeData(Integer levelNum, Integer type) {
+		//levelNum：1-1级 2-二级 ; type: 1-下级有数据的 2-下级有或无都出来
 		List<Map<String, Object>> mapList = ListUtils.newArrayList();
 		ResearchBriefReportLabel where = new ResearchBriefReportLabel();
 		where.setStatus(ResearchBriefReportLabel.STATUS_NORMAL);
+		where.setLevelNum(levelNum);
 		List<ResearchBriefReportLabel> list = researchBriefReportLabelService.findList(where);
 		for (int i = 0; i < list.size(); i++) {
 			ResearchBriefReportLabel e = list.get(i);
+			if (Integer.valueOf(1).equals(type) && researchBriefReportLabelService.findChildCount(e.getParentId()) <= 0) {
+				continue;
+			}
 			Map<String, Object> map = MapUtils.newHashMap();
 			map.put("id", e.getId());
 			map.put("pId", e.getParentId());

web/src/main/resources/config/application.yml

@@ -908,7 +908,7 @@ msg:
   email:
     beanName: emailSendService
     fromAddress: 17798203568@163.com
-    fromPassword: Gmj19981010
+    fromPassword: LVTMfpQYCCTeucLf
     fromHostName: smtp.163.com
     sslOnConnect: false
     sslSmtpPort: 994