合并代码

doctor-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-gateway/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-file/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-gen/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-health/src/main/java/doctor/ConvertUtil.java

@@ -1,53 +0,0 @@
-package doctor;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-
-/**
- * @Author ifredom
- * @Description 类型转换: Entity - Vo转换
- * @Date 2022/5/10 15:59
- * @Param [params]
- **/
-public class ConvertUtil {
-    public static final Logger logger = LoggerFactory.getLogger(ConvertUtil.class);
-
-    public static <T> T entityToVo(Object source, Class<T> target) {
-        if (source == null) {
-            return null;
-        }
-        T targetObject = null;
-        try {
-            targetObject = target.newInstance();
-            BeanUtils.copyProperties(source, targetObject);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return targetObject;
-    }
-
-    public static <T> List<T> entityToVoList(Collection<?> sourceList, Class<T> target) {
-        if (sourceList == null) {
-            return null;
-        }
-        List<T> targetList = new ArrayList<>(sourceList.size());
-
-        try {
-            for (Object source : sourceList) {
-                T targetObject = target.newInstance();
-                BeanUtils.copyProperties(source, targetObject);
-                targetList.add(targetObject);
-            }
-        } catch (Exception e) {
-            logger.error("convert error ", e);
-        }
-        return targetList;
-    }
-}
-

doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java

@@ -1,10 +1,10 @@
 package doctor.service.impl;
 
-import doctor.ConvertUtil;
 import doctor.domain.entity.InquiryDetailsRecordEntity;
 import doctor.domain.vo.InquiryDetailsRecordVo;
 import doctor.mapper.InquiryMapper;
 import doctor.service.InquiryService;
+import doctor.util.ConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java

@@ -1,6 +1,5 @@
 package doctor.service.impl;
 
-import doctor.ConvertUtil;
 import doctor.domain.entity.UserVideoBuyEntity;
 import doctor.domain.entity.UserVideoCollectionEntity;
 import doctor.domain.entity.UserWalletEntity;
@@ -8,6 +7,7 @@ import doctor.domain.vo.UserVideoBuyVo;
 import doctor.domain.vo.UserVideoCollectionVo;
 import doctor.mapper.UserVideoMapper;
 import doctor.service.UserVideoService;
+import doctor.util.ConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

doctor-modules/doctor-health/src/main/resources/bootstrap.yml

@@ -15,13 +15,24 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  mail:
+    host: smtp.qq.com
+    port: 587
+    username: 3581044601@qq.com
+    password: bwscqgqpkagjciih
+    default-encoding: UTF8
+    properties:
+      mail:
+        smtp:
+          socketFactoryClass: javax.net.ssl.SSLSocketFactory
+    debug: true

doctor-modules/doctor-job/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置