冲突处理，路径修改

pom.xml

@@ -35,8 +35,22 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Spring-Mybatis -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
+        <!-- MySQL -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
     </dependencies>
 
+
     <build>
         <plugins>
             <plugin>

src/main/java/com/jz/Application.java

@@ -6,7 +6,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class Application {
 
-
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }

src/main/java/com/jz/sms/chuanlan/SendService.java

-package com.jz.sms.chuanlan;
-
-import com.jz.sms.dto.XfaceDmHubTemplateRequestDTO;
-import com.jz.sms.dto.XfaceDmHubTemplateResponseDTO;
-
-public interface SendService {
-
-
-    XfaceDmHubTemplateResponseDTO send(XfaceDmHubTemplateRequestDTO requestDTO);
-}

src/main/java/com/jz/sms/chuanlan/service/SendService.java

 package com.jz.sms.chuanlan.service;
 
-import java.util.Map;
+import com.jz.sms.dto.XfaceDmHubTemplateRequestDTO;
+import com.jz.sms.dto.XfaceDmHubTemplateResponseDTO;
 
 public interface SendService {
 
 
-    Map<String, Object> sendByFixed(Map<String, Object> params);
-
-
-    Map<String, Object> sendByVariable(Map<String, Object> params);
+    XfaceDmHubTemplateResponseDTO send(XfaceDmHubTemplateRequestDTO requestDTO);
 }

src/main/java/com/jz/sms/chuanlan/service/impl/SendServiceImpl.java

 package com.jz.sms.chuanlan.service.impl;
 
 
-<<<<<<< HEAD:src/main/java/com/jz/sms/chuanlan/service/impl/SendServiceImpl.java
 import com.jz.sms.chuanlan.service.SendService;
-=======
-import com.jz.sms.chuanlan.SendService;
 import com.jz.sms.dto.XfaceClTemplateRequestDTO;
 import com.jz.sms.dto.XfaceClTemplateResponseDTO;
 import com.jz.sms.dto.XfaceDmHubTemplateRequestDTO;
 import com.jz.sms.dto.XfaceDmHubTemplateResponseDTO;
->>>>>>> 528ba3c0e06018ca5719f9e1b7b1f6a61a423153:src/main/java/com/jz/sms/chuanlan/impl/SendServiceImpl.java
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
 
 @Service
 public class SendServiceImpl implements SendService {

src/main/resources/application-prod.yml

@@ -3,12 +3,23 @@ server:
   #contextPath: /resource
 
 
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/dmp_web?characterEncoding=utf8&useSSL=false
+    driver-class-name: com.mysql.jdbc.Driver
+    username: root
+    password: root
+    hikari:
+      maxLifetime: 1765000
+      maximumPoolSize: 20
+      connectionTimeout: 30000
+      idleTimeout: 600000
+
 system:
   config:
     chuanlan:
       notificationAccount: N0767543 # 通知类短信账号
       notificationPassword: N0767543 # 通知类短信密码
-
       marketingAccount: M7603731 # 营销类短信账号
       marketingPassword: N0767543 # 营销类短信密码
       sendFixed: http://smssh1.253.com/msg/send/json # 短信下发接口

src/main/resources/application-test.yml

@@ -4,6 +4,18 @@ server:
   #contextPath: /resource
 
 
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/dmp_web?characterEncoding=utf8&useSSL=false
+    driver-class-name: com.mysql.jdbc.Driver
+    username: root
+    password: root
+    hikari:
+      maxLifetime: 1765000
+      maximumPoolSize: 20
+      connectionTimeout: 30000
+      idleTimeout: 600000
+
 system:
   config:
     chuanlan: