From 4f5110ec9ec51a40404f8b375b81c8a1891995a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E5=87=AF?= <371894675@qq.com>
Date: Fri, 20 Oct 2023 23:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=20=E6=B3=A8=E5=86=8C?=
=?UTF-8?q?=E6=96=B9=E6=B3=951.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
base-system-server/pom.xml | 7 +-----
.../server/controller/SysUserController.java | 6 -----
.../server/service/ISysUserService.java | 1 -
.../service/impl/SysUserServiceImpl.java | 22 ++-----------------
.../src/main/resources/bootstrap.yml | 6 +----
.../resources/mapper/system/SysUserMapper.xml | 11 +++++-----
6 files changed, 9 insertions(+), 44 deletions(-)
diff --git a/base-system-server/pom.xml b/base-system-server/pom.xml
index c8be82d..1c2d366 100644
--- a/base-system-server/pom.xml
+++ b/base-system-server/pom.xml
@@ -103,11 +103,6 @@
com.health
health-common-log
-
- org.springframework.boot
- spring-boot-starter-mail
- 2.7.13
-
com.health
@@ -116,7 +111,7 @@
com.health
health-common-core
- 3.6.4
+ 3.6.5
diff --git a/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java b/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
index 959f1bc..9aaabe5 100644
--- a/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
+++ b/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
@@ -143,12 +143,6 @@ public class SysUserController extends BaseController
}
//-------------------------------------------------------------------
- //获取邮箱验证码
- @PostMapping("/getEmailCode")
- public Result getEmailCode(@RequestParam("email") String email){
-
- return userService.getEmailCode(email);
- }
//----------------------------------------
//注册
diff --git a/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java b/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java
index 5ac7788..d3f5d66 100644
--- a/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java
+++ b/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java
@@ -208,7 +208,6 @@ public interface ISysUserService
*/
public String importUser(List userList, Boolean isUpdateSupport, String operName);
- Result getEmailCode(String email);
int registerNewUser(CommonBody commonBody);
}
diff --git a/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java b/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
index 896040d..7c52ca5 100644
--- a/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
+++ b/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
@@ -27,8 +27,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
import javax.validation.Validator;
import java.util.ArrayList;
import java.util.List;
@@ -46,8 +44,7 @@ public class SysUserServiceImpl implements ISysUserService
@Autowired
private RedisTemplate redisTemplate;
- @Autowired
- private JavaMailSender javaMailSender;
+
@Autowired
private SysUserMapper userMapper;
@@ -558,23 +555,7 @@ public class SysUserServiceImpl implements ISysUserService
- @Override
- public Result getEmailCode(String emailCount) {
- String emailCode = RandomUtil.randomNumbers(4);
- MimeMessage mimeMessage = javaMailSender.createMimeMessage();
- try {
- MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, true);
- mimeMessageHelper.setFrom("371894675@qq.com");
- mimeMessageHelper.setTo(emailCount);
- mimeMessageHelper.setSubject("邮箱验证码");
- mimeMessageHelper.setText("验证码为:"+emailCode);
- } catch (MessagingException e) {
- throw new RuntimeException(e);
- }
- redisTemplate.opsForValue().set(emailCount,emailCode);
- return Result.success(emailCode,"邮箱验证码发送成功");
- }
//-----------------------------
@Override
@@ -589,6 +570,7 @@ public class SysUserServiceImpl implements ISysUserService
int role=101;
//添加用户不管是患者还是医生
int userId=userMapper.insertNewUser(commonBody);
+ System.out.println("获取的自增userId是"+userId);
//如果角色标识roleId==2的时候再赋值为102
if (commonBody.getRoleId()==2){
role=102;
diff --git a/base-system-server/src/main/resources/bootstrap.yml b/base-system-server/src/main/resources/bootstrap.yml
index 7b5f146..ed8fd9b 100644
--- a/base-system-server/src/main/resources/bootstrap.yml
+++ b/base-system-server/src/main/resources/bootstrap.yml
@@ -23,8 +23,4 @@ spring:
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- mail:
- host: smtp.qq.com
- port: 587
- username: 371894675@qq.com
- password: abkabckjtgmgcafb
+
diff --git a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
index d99f47e..84170ee 100644
--- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -181,13 +181,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
+
insert into tb_patient
- patient_id,
+ user_id,
patient_name,
password,
email,
@@ -202,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
values
- #{patientId},
+ #{userId},
#{name},
#{password},
#{email},
@@ -218,7 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into tb_doctor
- doctor_id,
+ user_id,
doctor_name,
password,
email,
@@ -231,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
values
- #{doctorId},
+ #{userId},
#{name},
#{password},
#{email},