diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 5462cfcd0..3609692ca 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -163,8 +163,8 @@ jasypt: password: oRqdnDbK5pj3eMmB fm: - exception: false - exception_emails: zhengfangyuan@iformall.com,xuxiaohu@iformall.com + exception: true + exception_emails: xuxiaohu@iformall.com deploy: 1 open: true upload_dir: /home/test/server/uploads/ diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 76fe4f591..b9f321d7e 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -155,8 +155,8 @@ wechat: min-idle: 10 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 diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index d033f385a..4afa59113 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -155,8 +155,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/ diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index dbbcb8bf7..386d2a3b0 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -161,8 +161,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/ diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index 20c8a10d1..46fb6fb84 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -156,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/ diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index c7930118a..088229df9 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -155,8 +155,8 @@ wechat: min-idle: 10 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 diff --git a/mallinkPublicApi/src/main/resources/application-dev.yml b/mallinkPublicApi/src/main/resources/application-dev.yml index b2b606aad..f4f0cd3f9 100644 --- a/mallinkPublicApi/src/main/resources/application-dev.yml +++ b/mallinkPublicApi/src/main/resources/application-dev.yml @@ -155,8 +155,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/ diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index a34e14dc6..0e10fac9e 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -155,8 +155,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/ diff --git a/mallinkSysAdmin/src/main/resources/application-dev.yml b/mallinkSysAdmin/src/main/resources/application-dev.yml index 17e994ace..d6c58379e 100644 --- a/mallinkSysAdmin/src/main/resources/application-dev.yml +++ b/mallinkSysAdmin/src/main/resources/application-dev.yml @@ -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/ diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index 3d077efcd..8105d910f 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -155,8 +155,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/