From edcc7ddbc34a15319f680d63656884657236a346 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 02 Jul 2020 17:07:49 +0800
Subject: [PATCH] 修改续签时间，自己只能修改手自己手机号的验证，修改保存意见的接口
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 9 ++++++++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java | 26 +++++++++++++-------------
kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/properties/RenewProperties.java | 2 +-
kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/SingleTokenServices.java | 2 +-
4 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java
index 6ad136f..f474ac5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java
@@ -83,19 +83,19 @@
if (sysFeedback.getId()==null) {
List<SysOrganization> organizations = sysUser.getOrganizations();
if (organizations.size() > 0) {
- sysFeedback.setDepartmentId(organizations.get(1).getId());
- sysFeedback.setDepartmentName(organizations.get(1).getOrgName());
- sysFeedback.setHospitalId(organizations.get(0).getId());
- sysFeedback.setHospitalName(organizations.get(0).getOrgName());
- Map map = new HashMap();
- map.put("user_id", sysUser.getId());
- ResultBody listByMap = sysDoctorService.getListByMap(map);
- List<SysDoctor> sysDoctors = JSON.parseArray(JSON.toJSONString(listByMap.getData()), SysDoctor.class);
- if (sysDoctors.size() > 0) {
- sysFeedback.setDoctorId(sysDoctors.get(0).getId());
- sysFeedback.setDoctorName(sysDoctors.get(0).getDoctorName());
- sysFeedback.setDoctorTel(sysDoctors.get(0).getDoctorTel());
- }
+// sysFeedback.setDepartmentId(organizations.get(1).getId());
+// sysFeedback.setDepartmentName(organizations.get(1).getOrgName());
+// sysFeedback.setHospitalId(organizations.get(0).getId());
+// sysFeedback.setHospitalName(organizations.get(0).getOrgName());
+// Map map = new HashMap();
+// map.put("user_id", sysUser.getId());
+// ResultBody listByMap = sysDoctorService.getListByMap(map);
+// List<SysDoctor> sysDoctors = JSON.parseArray(JSON.toJSONString(listByMap.getData()), SysDoctor.class);
+// if (sysDoctors.size() > 0) {
+// sysFeedback.setDoctorId(sysDoctors.get(0).getId());
+// sysFeedback.setDoctorName(sysDoctors.get(0).getDoctorName());
+// sysFeedback.setDoctorTel(sysDoctors.get(0).getDoctorTel());
+// }
int insert = baseMapper.insert(sysFeedback);
if (insert > 0) {
return true;
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index d4febe3..c3007e3 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -293,7 +293,14 @@
* @return
*/
@PutMapping(value = "/users/updateusertel")
- public ResultBody updateUserTel(@RequestParam Map<String, Object> params) {
+ public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
+ String oldTel = MapUtils.getString(params, "oldTel");
+ if (oldTel==null){
+ return ResultBody.failed("请输入原账号");
+ }
+ if(!sysUser.getUsername().equals(oldTel)){
+ return ResultBody.failed("请输入正确的原账号");
+ }
return appUserService.updateUserTel(params);
}
diff --git a/kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/properties/RenewProperties.java b/kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/properties/RenewProperties.java
index dd4e2e8..5e67d57 100644
--- a/kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/properties/RenewProperties.java
+++ b/kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/properties/RenewProperties.java
@@ -35,5 +35,5 @@
/**
* 续签时间比例，当前剩余时间小于小于过期总时长的50%则续签
*/
- private Double timeRatio = 0.5;
+ private Double timeRatio = 1D;//0.5
}
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/SingleTokenServices.java b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/SingleTokenServices.java
index 93a2a16..1c97969 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/SingleTokenServices.java
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/SingleTokenServices.java
@@ -30,7 +30,7 @@
@Deprecated
public class SingleTokenServices implements AuthorizationServerTokenServices, ResourceServerTokenServices, ConsumerTokenServices, InitializingBean {
private int refreshTokenValiditySeconds = 2592000;
- private int accessTokenValiditySeconds = 43200;
+ private int accessTokenValiditySeconds = 3600;//43200
private boolean supportRefreshToken = false;
private boolean reuseRefreshToken = true;
private TokenStore tokenStore;
--
Gitblit v1.8.0