浏览代码

@IPU_FIXBUG_2021@调整配置

weihf 4 年之前
父节点
当前提交
4815162f07

+ 2 - 2
ipu-rest-demo/src/main/resources/dev/ipu-mybatis-config.xml

@ -21,9 +21,9 @@
21 21
		<environment id="test">
22 22
			<transactionManager type="JDBC" />
23 23
			<dataSource type="com.ai.ipu.database.datasource.DruidDataSourceFactory">
24
				<property name="jdbcUrl" value="jdbc:mysql://121.42.183.206:3307/test" />
24
				<property name="jdbcUrl" value="jdbc:mysql://47.105.160.21:3307/test" />
25 25
				<property name="username" value="ipu" />
26
				<property name="password" value="ipumysql" />
26
				<property name="encryptedPasswd" value="@DES@qORhaGJxhhQ=" />
27 27
			</dataSource>
28 28
		</environment>
29 29
		

+ 1 - 1
ipu-rest-scaffold/docker/Dockerfile

@ -1,7 +1,7 @@
1 1
FROM openjdk:8-jdk-alpine
2 2
VOLUME /tmp
3 3
WORKDIR /package
4
ADD  target/ipu-rest-scaffold-bin.tar.gz /package
4
ADD  target/ipu-rest-scaffold-bin.tar.gz .
5 5
WORKDIR /package/ipu-rest-scaffold
6 6
CMD mkdir logs
7 7
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar ./ipu-rest-scaffold.jar $0 $@

+ 1 - 0
ipu-rest-scaffold/docker/docker-compose.yml

@ -52,6 +52,7 @@ services:
52 52
      - /data/ipu-rest-scaffold/mysql/logs/mysql.log:/var/log/mysql/mysql.log
53 53
      - /data/ipu-rest-scaffold/mysql/logs/error.log:/var/log/mysql/error.log
54 54
      - /data/ipu-rest-scaffold/mysql/data:/var/lib/mysql
55
      - /data/ipu-rest-scaffold/mysql/init:/docker-entrypoint-initdb.d
55 56
    networks:
56 57
      back:
57 58
        ipv4_address: "11.11.11.12"

+ 2 - 2
ipu-rest-scaffold/src/main/resources/dev/ipu-mybatis-config.xml

@ -18,9 +18,9 @@
18 18
		<environment id="test">
19 19
			<transactionManager type="JDBC" />
20 20
			<dataSource type="com.ai.ipu.database.datasource.DruidDataSourceFactory">
21
				<property name="jdbcUrl" value="jdbc:mysql://121.42.183.206:3307/test" />
21
				<property name="jdbcUrl" value="jdbc:mysql://121.42.183.206:3307/test?useUnicode=true&amp;characterEncoding=UTF-8" />
22 22
				<property name="username" value="ipu" />
23
				<property name="password" value="ipumysql" />
23
				<property name="encryptedPasswd" value="@DES@q6yRrK803em51758WVXNcg==" />
24 24
			</dataSource>
25 25
		</environment>
26 26
	</environments>

+ 1 - 1
ipu-rest-scaffold/src/main/resources/docker/ipu-cache.xml

@ -14,7 +14,7 @@
14 14
		<!-- redis池的可用连接实例的最大数目,缺省为8 -->
15 15
		<config name="poolSize" value="10" />
16 16
		<!-- redis池最多有多少个状态为idle(空闲的)的jedis实例,缺省为8,空闲连接大于这个数会进行回收 -->
17
		<config name="maxIdle" />
17
		<config name="maxIdle" value="10" />
18 18
		<!-- 最小空闲数,空闲连接小于这个数会建立新的连接,缺省为0 -->
19 19
		<config name="minIdle" />
20 20
		<!-- 等待Response超时时间,默认5000ms -->

+ 2 - 2
ipu-rest-scaffold/src/main/resources/docker/ipu-mybatis-config.xml

@ -18,9 +18,9 @@
18 18
		<environment id="test">
19 19
			<transactionManager type="JDBC" />
20 20
			<dataSource type="com.ai.ipu.database.datasource.DruidDataSourceFactory">
21
				<property name="jdbcUrl" value="jdbc:mysql://rest-scaffold-db:3306/test" />
21
				<property name="jdbcUrl" value="jdbc:mysql://rest-scaffold-db:3306/test?useUnicode=true&amp;characterEncoding=UTF-8" />
22 22
				<property name="username" value="ipu" />
23
				<property name="password" value="ipumysql" />
23
				<property name="encryptedPasswd" value="@DES@q6yRrK803em51758WVXNcg==" />
24 24
			</dataSource>
25 25
		</environment>
26 26
	</environments>