Revert "移除mysql"

This reverts commit 99618f81

src/main/java/cn/com/duiba/jdactivity/dao/BaseDao.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.session.RowBounds;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.jdbc.datasource.DelegatingDataSource;
 
+import javax.annotation.Resource;
 import javax.sql.DataSource;
 import java.util.List;
 import java.util.Map;
@@ -17,7 +18,7 @@ import java.util.Map;
 public abstract class BaseDao {
     private SqlSessionTemplate sqlSessionTemplate;
 
-    // @Resource(name = "customSqlSessionTemplate")
+    @Resource(name = "customSqlSessionTemplate")
     private SqlSessionTemplate customSqlSessionTemplate;
 
     /**

src/main/resources/application-dev.properties

-##MySQL配置 注意这是内网地址
-#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mydb?serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8
-#spring.datasource.username=root
-#spring.datasource.password=123456
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#MySQL配置 注意这是内网地址
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mydb?serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8
+spring.datasource.username=root
+spring.datasource.password=123456
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #redis 注意这是内网地址
 spring.redis.host=localhost
 spring.redis.timeout=1000

src/main/resources/application-prod.properties

 #MySQL配置 注意这是内网地址
-#spring.datasource.url=jdbc:mysql://mysql-cn-north-1-5321aee1b70d421c.rds.jdcloud.com:3306/custom?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true
-#spring.datasource.username=jd_activity
-#spring.datasource.password=kP6oWdeYU78tHee70bcs
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://mysql-cn-north-1-5321aee1b70d421c.rds.jdcloud.com:3306/custom?serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.username=jd_activity
+spring.datasource.password=kP6oWdeYU78tHee70bcs
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #redis 注意这是内网地址
 spring.redis.host=redis-x4n822igaxnu-proxy-nlb.jvessel-open-hb.jdcloud.com
 spring.redis.password=kP6oWdeYU78tHee

src/main/resources/application.properties

 spring.application.name=jd-activity
 spring.profiles.active=prod
 #先排除一些autoconfigure
-spring.autoconfigure.exclude=\
-  org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\
-  org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\
-  org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
+spring.autoconfigure.exclude=
 # tomcat
 server.port=8080
 server.tomcat.accesslog.enabled=false

src/main/resources/spring/spring-datasource-custom.xml

@@ -3,23 +3,23 @@
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <!--    <bean id="customSqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">-->
-    <!--        <constructor-arg>-->
-    <!--            <bean class="org.mybatis.spring.SqlSessionFactoryBean">-->
-    <!--                <property name="dataSource" ref="dataSource"/>-->
-    <!--                <property name="mapperLocations">-->
-    <!--                    <array>-->
-    <!--                        <value>classpath:mybatis/custom/*.xml</value>-->
-    <!--                    </array>-->
-    <!--                </property>-->
-    <!--                <property name="configLocation" value="classpath:mybatis/mybatis-config.xml"/>-->
-    <!--            </bean>-->
-    <!--        </constructor-arg>-->
-    <!--    </bean>-->
+    <bean id="customSqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
+        <constructor-arg>
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="dataSource"/>
+                <property name="mapperLocations">
+                    <array>
+                        <value>classpath:mybatis/custom/*.xml</value>
+                    </array>
+                </property>
+                <property name="configLocation" value="classpath:mybatis/mybatis-config.xml"/>
+            </bean>
+        </constructor-arg>
+    </bean>
 
 
-    <!--    <bean id="customTransactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">-->
-    <!--        <constructor-arg ref="dataSource"/>-->
-    <!--    </bean>-->
+    <bean id="customTransactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <constructor-arg ref="dataSource"/>
+    </bean>
 
 </beans>
\ No newline at end of file