diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index 5038125ae..8d7e5e7fd 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -269,8 +269,9 @@ public class ApiUserController { public Object updateAction(ApiUserModel model) { Long userId = model.getUserId(); Map dataApiUser = new HashMap(); + Map user = new HashMap(); dataApiUser.put("email", model.getEmail()); - dataApiUser.put("password", model.getPassword()); + user.put("password", DigestUtils.md5Hex(model.getPassword())); dataApiUser.put("siteName", model.getSiteName()); dataApiUser.put("ip", model.getIp()); dataApiUser.put("company", model.getCompany()); @@ -280,6 +281,7 @@ public class ApiUserController { dataApiUser.put("manager", model.getManager()); dataApiUser.put("isMonitor", model.getIsMonitor()); this.apiUserService.update(dataApiUser, userId); + this.userService.updateById(user,userId); //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE, model.getEvaluateRate()); diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index da2db31c2..88b47da75 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -155,15 +155,15 @@ return re.test(strIP) } - $("#resetPwd").click(function () { - if (confirm('确认重置密码为【123456】?')) { - $.get('resetPwd', - "userId=" + $("#userId").val(), - function (data) { - alert(status); - }) - } - }) + // $("#resetPwd").click(function () { + // if (confirm('确认重置密码为【123456】?')) { + // $.get('resetPwd', + // "userId=" + $("#userId").val(), + // function (data) { + // alert(status); + // }) + // } + // }) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 1106483b6..1ad4b2c38 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -15,6 +15,8 @@ import com.fangjia.open.dto.HouseValueInformationDto; import com.fangjia.open.dto.UniversalDto; import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto; import com.fangjia.open.interceptors.AuthenticationBean; +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; import com.fangjia.open.model.*; import com.fangjia.open.util.CommonDtoUtils; import com.fangjia.open.util.CommonUtils; @@ -49,7 +51,7 @@ import static com.poseidon.util.TypeConverter.convertToString; * @author 13607 * @since 2023/12/12 10:29 */ -//@Authority(role = Role.USER) +@Authority(role = Role.USER) public class ComprehensiveQueryController { private DistrictService districtService;