Commit 1d4d3ff2 by lepdou

Merge pull request #231 from nobodyiam/utf8mb4

Utf8mb4
parents 05281db8 67961c42
...@@ -4,6 +4,7 @@ spring.http.converters.preferred-json-mapper=gson ...@@ -4,6 +4,7 @@ spring.http.converters.preferred-json-mapper=gson
spring.datasource.testWhileIdle=true spring.datasource.testWhileIdle=true
spring.datasource.testOnBorrow=true spring.datasource.testOnBorrow=true
spring.datasource.validationQuery=SELECT 1 spring.datasource.validationQuery=SELECT 1
spring.datasource.initSQL=set names utf8mb4
# Naming strategy # Naming strategy
spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy
......
<!--
for ctrip datasource
-->
<Datasources>
<Datasource
name="${pro_titan_dbname}"
testWhileIdle="true"
testOnBorrow="true"
testOnReturn="false"
validationQuery="SELECT 1"
initSQL="set names utf8mb4"
validationInterval="30000"
timeBetweenEvictionRunsMillis="5000"
maxActive="100"
minIdle="10"
maxWait="10000"
initialSize="10"
removeAbandonedTimeout="60"
removeAbandoned="true"
logAbandoned="false"
minEvictableIdleTimeMillis="30000"
option="sendStringParametersAsUnicode=false"
/>
</Datasources>
...@@ -354,6 +354,7 @@ ...@@ -354,6 +354,7 @@
<include>**/*.yml</include> <include>**/*.yml</include>
<include>**/*.yaml</include> <include>**/*.yaml</include>
<include>**/*.properties</include> <include>**/*.properties</include>
<include>**/*.xml</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>
...@@ -363,6 +364,7 @@ ...@@ -363,6 +364,7 @@
<exclude>**/*.yml</exclude> <exclude>**/*.yml</exclude>
<exclude>**/*.yaml</exclude> <exclude>**/*.yaml</exclude>
<exclude>**/*.properties</exclude> <exclude>**/*.properties</exclude>
<exclude>**/*.xml</exclude>
</excludes> </excludes>
</resource> </resource>
</resources> </resources>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment