Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cloud-account
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.account
pica-cloud-account
提交
1d94d078
提交
1d94d078
编写于
10月 10, 2020
作者:
wangxinxu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
医生身份证加密存储
上级
392f2bc9
流水线
#30705
已失败 于阶段
in 0 second
变更
6
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
32 行增加
和
3 行删除
+32
-3
pom.xml
server/pom.xml
+7
-1
AccountStatusController.java
...nt/account/server/controller/AccountStatusController.java
+7
-0
DoctorController.java
...d/account/account/server/controller/DoctorController.java
+4
-0
AccountServiceImpl.java
...count/account/server/service/impl/AccountServiceImpl.java
+6
-0
DoctorServiceImpl.java
...ccount/account/server/service/impl/DoctorServiceImpl.java
+6
-0
AESUtil.java
...a/com/pica/cloud/account/account/server/util/AESUtil.java
+2
-2
未找到文件。
server/pom.xml
浏览文件 @
1d94d078
...
...
@@ -155,7 +155,7 @@
<dependency>
<groupId>
com.pica.cloud.foundation
</groupId>
<artifactId>
pica-cloud-encryption-client
</artifactId>
<version>
1.0.
2
</version>
<version>
1.0.
5
</version>
<exclusions>
<exclusion>
<groupId>
com.pica.cloud.foundation
</groupId>
...
...
@@ -222,6 +222,12 @@
</exclusions>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
<version>
1.2.73
</version>
</dependency>
</dependencies>
...
...
server/src/main/java/com/pica/cloud/account/account/server/controller/AccountStatusController.java
浏览文件 @
1d94d078
...
...
@@ -2,11 +2,15 @@ package com.pica.cloud.account.account.server.controller;
import
com.pica.cloud.account.account.server.entity.Account
;
import
com.pica.cloud.account.account.server.service.AccountService
;
import
com.pica.cloud.foundation.encryption.common.constants.EncryptConstants
;
import
com.pica.cloud.foundation.encryption.util.EncryptUtils
;
import
com.pica.cloud.foundation.entity.PicaResponse
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.bind.annotation.*
;
import
sun.swing.StringUIClientPropertyKey
;
import
java.util.Map
;
...
...
@@ -27,6 +31,9 @@ public class AccountStatusController extends AccountBaseController {
public
PicaResponse
<
Account
>
getStatus
()
{
long
doctorId
=
super
.
getDoctorIdByToken
();
Account
account
=
accountService
.
getById
(
doctorId
);
if
(!
StringUtils
.
isEmpty
(
account
)
&&
!
StringUtils
.
isEmpty
(
account
.
getCard
()))
{
account
.
setCard
(
EncryptUtils
.
decryptContent
(
account
.
getCard
(),
EncryptConstants
.
ENCRYPT_TYPE_DOCTOR_IDNO
,
EncryptConstants
.
ENCRYPT_DECRYPT_KEY
));
}
return
PicaResponse
.
toResponse
(
account
);
}
...
...
server/src/main/java/com/pica/cloud/account/account/server/controller/DoctorController.java
浏览文件 @
1d94d078
...
...
@@ -13,6 +13,7 @@ import com.pica.cloud.foundation.entity.PicaResponse;
import
com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -46,6 +47,9 @@ public class DoctorController extends AccountBaseController {
String
dencrypt
=
EncryptUtils
.
decryptContent
(
mobilePhone
,
EncryptConstants
.
ENCRYPT_TYPE_MOBILE
,
super
.
getToken
());
mobilePhone
=
dencrypt
.
substring
(
0
,
3
)
+
"****"
+
dencrypt
.
substring
(
7
,
11
);
doctorInfo
.
setMobilePhone
(
mobilePhone
);
if
(
StringUtils
.
isNotBlank
(
doctorInfo
.
getCard
()))
{
doctorInfo
.
setCard
(
EncryptUtils
.
decryptContent
(
doctorInfo
.
getCard
(),
EncryptConstants
.
ENCRYPT_TYPE_DOCTOR_IDNO
,
EncryptConstants
.
ENCRYPT_DECRYPT_KEY
));
}
return
PicaResponse
.
toResponse
(
doctorInfo
);
}
...
...
server/src/main/java/com/pica/cloud/account/account/server/service/impl/AccountServiceImpl.java
浏览文件 @
1d94d078
...
...
@@ -100,6 +100,9 @@ public class AccountServiceImpl implements AccountService {
}
else
{
accountInfo
.
setRegisterSource
(
AccountTypeEnum
.
DEVICE_TYPE_H5
.
getCode
());
}
if
(
StringUtils
.
isNotBlank
(
accountInfo
.
getIdCard
()))
{
accountInfo
.
setIdCard
(
EncryptUtils
.
encryptContent
(
accountInfo
.
getIdCard
(),
EncryptConstants
.
ENCRYPT_TYPE_DOCTOR_IDNO
));
}
accountInfoDetailMapper
.
insertSelective
(
accountInfo
);
Integer
acctId
=
accountInfo
.
getId
();
//doctor表,存入用户id
...
...
@@ -118,6 +121,9 @@ public class AccountServiceImpl implements AccountService {
account
.
setModifyTime
(
currentTime
);
account
.
setFirstLoginTime
(
currentTime
);
account
.
setLastLoginTime
(
currentTime
);
if
(
StringUtils
.
isNotBlank
(
account
.
getCard
()))
{
account
.
setCard
(
EncryptUtils
.
encryptContent
(
account
.
getCard
(),
EncryptConstants
.
ENCRYPT_TYPE_DOCTOR_IDNO
));
}
accountMapper
.
insertSelective
(
account
);
}
}
...
...
server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java
浏览文件 @
1d94d078
...
...
@@ -10,6 +10,8 @@ import com.pica.cloud.account.account.server.mapper.*;
import
com.pica.cloud.account.account.server.service.DoctorService
;
import
com.pica.cloud.account.account.server.util.AESUtil
;
import
com.pica.cloud.account.account.server.util.AccountUtils
;
import
com.pica.cloud.foundation.encryption.common.constants.EncryptConstants
;
import
com.pica.cloud.foundation.encryption.util.EncryptUtils
;
import
com.pica.cloud.foundation.utils.entity.PicaDoctor
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
...
...
@@ -73,6 +75,9 @@ public class DoctorServiceImpl implements DoctorService {
}
doctor
.
setMobilePhone
(
AESUtil
.
encryptV0
(
mobilePhone
));
doctor
.
setModifyTime
(
new
Date
());
if
(
StringUtils
.
isNotBlank
(
doctor
.
getCard
()))
{
doctor
.
setCard
(
EncryptUtils
.
encryptContent
(
doctor
.
getCard
(),
EncryptConstants
.
ENCRYPT_TYPE_DOCTOR_IDNO
));
}
doctorMapper
.
updateByPrimaryKeySelective
(
doctor
);
Integer
acctId
=
entity
.
getAcctId
();
AccountInfoEntity
accountInfoEntity
=
new
AccountInfoEntity
();
...
...
@@ -139,6 +144,7 @@ public class DoctorServiceImpl implements DoctorService {
entity
.
setDeleteFlag
(
1
);
entity
.
setSex
(
doctor
.
getSex
());
entity
.
setName
(
doctor
.
getName
());
doctor
.
setCard
(
EncryptUtils
.
encryptContent
(
doctor
.
getCard
(),
EncryptConstants
.
ENCRYPT_TYPE_DOCTOR_IDNO
));
entity
.
setIdCard
(
doctor
.
getCard
());
entity
.
setAge
(
doctor
.
getAge
());
entity
.
setBirthday
(
doctor
.
getBirthday
());
...
...
server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java
浏览文件 @
1d94d078
...
...
@@ -153,11 +153,11 @@ public class AESUtil {
* @return
*/
public
static
String
encryptV0
(
String
data
)
{
return
Encrypt
CreateUtil
.
encrypt
(
data
);
return
Encrypt
Utils
.
encryptContent
(
data
,
EncryptConstants
.
ENCRYPT_TYPE_MOBILE
);
}
public
static
String
decryptV0
(
String
data
)
{
return
Encrypt
CreateUtil
.
dencrypt
(
data
);
return
Encrypt
Utils
.
decryptContent
(
data
,
EncryptConstants
.
ENCRYPT_TYPE_MOBILE
,
EncryptConstants
.
ENCRYPT_DECRYPT_KEY
);
}
public
static
String
decrypt
(
String
sSrc
,
String
sKey
,
String
siv
)
throws
Exception
{
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录