|
|
|
@@ -3,11 +3,7 @@ spring: |
|
|
|
include: rabbitMQ |
|
|
|
# JDBC |
|
|
|
datasource: |
|
|
|
<<<<<<< HEAD |
|
|
|
url: jdbc:mysql://202.165.179.86:3306/mallink_share?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true |
|
|
|
======= |
|
|
|
url: jdbc:mysql://101.200.130.134:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true |
|
|
|
>>>>>>> release_real_202010 |
|
|
|
username: root |
|
|
|
password: fm2020test |
|
|
|
type: com.alibaba.druid.pool.DruidDataSource |
|
|
|
@@ -160,8 +156,8 @@ jasypt: |
|
|
|
password: oRqdnDbK5pj3eMmB |
|
|
|
|
|
|
|
fm: |
|
|
|
exception: false |
|
|
|
exception_emails: houtaikaifa@iformall.com |
|
|
|
exception: true |
|
|
|
exception_emails: xuxiaohu@iformall.com |
|
|
|
deploy: 1 |
|
|
|
open: true |
|
|
|
upload_dir: /home/test/server/uploads/ |
|
|
|
|