From 82ff0f9874014eb3e734815eb978379a9bea38a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 23 Jun 2020 10:11:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 1 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 11 ++++++++---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 3 ++-
kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/util/AuthUtils.java | 12 +++++++-----
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java | 4 ++++
kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java | 9 +++++++--
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java | 13 ++++++++-----
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java | 4 ++++
8 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
index c468401..64fc544 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
@@ -87,6 +87,10 @@
@NotEmpty(message = "需求标签不能为空")
private String needTags;
/**
+ * 其他需求标签
+ */
+ private String needDataRemark;
+ /**
* 是否删除，1删除（已下载），0未删除（未下载）
*/
private Boolean isDel;
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 454522a..f67c7b7 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -722,11 +722,9 @@
if (StringUtils.isBlank(userRegVo.getPassword())) {
defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
- sysUser.setDefaultAuth(false);
userRegVo.setPassword(defaultPassWord);
} else {
sysUser.setPassword(passwordEncoder.encode(userRegVo.getPassword()));
- sysUser.setDefaultAuth(false);
}
sysUser.setNickname(userRegVo.getNickname());
sysUser.setSex(userRegVo.getSex());
@@ -737,6 +735,7 @@
sysUser.setType(UserType.DOCTOR.name());
}
sysUser.setHAdminUser(false);
+ sysUser.setDefaultAuth(false);
sysUser.setOpenId(userRegVo.getOpenId());
sysUser.setDel(false);
sysUser.setTenantId("hospital");
@@ -811,7 +810,13 @@
sysDoctor.setDoctorRankId(userRegVo.getDoctorRankId());
sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId());
sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
- sysDoctor.setDoctorState(userRegVo.getDoctorState());
+ if (isReg) {
+ sysDoctor.setDoctorState(false);
+ }
+ else
+ {
+ sysDoctor.setDoctorState(true);
+ }
sysDoctor.setDoctorTel(userRegVo.getMobile());
sysDoctor.setDoctorName(userRegVo.getNickname());
sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
index 161528f..5849181 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -102,6 +102,7 @@
<select id="findDoctorUserAllData" parameterType="long" resultType="com.kidgrow.common.model.DoctorUserAll">
SELECT sysuser.id,
sysdoctor.doctor_name,
+ sysdoctor.id doctor_Id,
sysdoctor.doctor_ccie,
sysdoctor.doctor_tel,
sysdoctor.doctor_rank,
diff --git a/kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/util/AuthUtils.java b/kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/util/AuthUtils.java
index 176a9fa..426b1ec 100644
--- a/kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/util/AuthUtils.java
+++ b/kidgrow-commons/kidgrow-authclient-spring-boot-starter/src/main/java/com/kidgrow/authclient/util/AuthUtils.java
@@ -2,14 +2,13 @@
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.SysUser;
+import com.kidgrow.common.utils.AesUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException;
import javax.servlet.http.HttpServletRequest;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
import java.util.Enumeration;
/**
@@ -82,9 +81,12 @@
* @param header header中的参数
*/
public static String[] extractHeaderClient(String header) {
- byte[] base64Client = header.substring(BASIC_.length()).getBytes(StandardCharsets.UTF_8);
- byte[] decoded = Base64.getDecoder().decode(base64Client);
- String clientStr = new String(decoded, StandardCharsets.UTF_8);
+ String clientStr = null;
+ try{
+ clientStr = AesUtils.desEncrypt(header.substring(BASIC_.length()));
+ }catch(Exception w){
+ log.error("Header解密失败", w);
+ }
String[] clientArr = clientStr.split(":");
if (clientArr.length != 2) {
throw new RuntimeException("Invalid basic authentication token");
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java
index d4a106c..1ac9314 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java
@@ -23,6 +23,10 @@
/**
* 医生姓名
*/
+ private Long doctorId;
+ /**
+ * 医生姓名
+ */
private String doctorName;
/**
* 医生的头像
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java
index 118bfe3..9f13ad6 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java
@@ -23,9 +23,10 @@
/**
* 加密方法
- * @param data 要加密的数据
- * @param key 加密key
- * @param iv 加密iv
+ *
+ * @param data 要加密的数据
+ * @param key 加密key
+ * @param iv 加密iv
* @return 加密的结果
* @throws Exception
*/
@@ -55,9 +56,10 @@
/**
* 解密方法
+ *
* @param data 要解密的数据
* @param key 解密key
- * @param iv 解密iv
+ * @param iv 解密iv
* @return 解密的结果
* @throws Exception
*/
@@ -69,7 +71,7 @@
IvParameterSpec ivspec = new IvParameterSpec(iv.getBytes());
cipher.init(Cipher.DECRYPT_MODE, keyspec, ivspec);
byte[] original = cipher.doFinal(encrypted1);
- String originalString = new String(original);
+ String originalString = new String(original).trim();
return originalString;
} catch (Exception e) {
e.printStackTrace();
@@ -89,6 +91,7 @@
/**
* 使用默认的key和iv解密
+ *
* @param data
* @return
* @throws Exception
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index a9ab5fc..97cee7a 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -219,7 +219,8 @@
/login.html,
/user/login,
/api-sms/smsChangLan/send,
- /api-user/users/doctorUserReg
+ /api-user/users/doctorUserReg,
+ /api-file/files-upload
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
index f5e695b..9478d1a 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
@@ -6,6 +6,7 @@
import com.kidgrow.authclient.util.AuthUtils;
import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.common.context.ClientContextHolder;
+import com.kidgrow.common.utils.AesUtils;
import com.kidgrow.common.utils.ResponseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -62,8 +63,12 @@
public void getUserTokenInfo(
@ApiParam(required = true, name = "username", value = "账号") String username,
@ApiParam(required = true, name = "password", value = "密码") String password,
- HttpServletRequest request, HttpServletResponse response) throws IOException {
- UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, password);
+ HttpServletRequest request, HttpServletResponse response) throws Exception {
+ //先解密
+ String decryptName = AesUtils.desEncrypt(username).trim();
+ String decryptPwd = AesUtils.desEncrypt(password).trim();
+
+ UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(decryptName, decryptPwd);
writerToken(request, response, token, "用户名或密码错误");
}
--
Gitblit v1.8.0