From 26ac4740d9effbf53278013adaf555c307fa5432 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 23 Apr 2019 11:11:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=82=AE=E7=AE=B1][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8F=91=E9=80=81=E8=80=85=E9=82=AE=E7=AE=B1=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=95=B4=E7=90=86=E5=BC=82=E5=B8=B8=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/UserApplication.java | 8 ++++++++ .../src/main/resources/application-dev.yml | 5 +++-- .../src/main/resources/application-prod.yml | 19 ++++++++++--------- .../src/main/resources/application-test.yml | 5 +++-- .../main/java/com/iformall/BApplication.java | 16 ++++++++++++---- .../src/main/resources/application-dev.yml | 5 +++-- .../src/main/resources/application-prod.yml | 5 +++-- .../src/main/resources/application-test.yml | 5 +++-- .../main/java/com/iformall/CApplication.java | 16 ++++++++++++---- .../src/main/resources/application-dev.yml | 7 ++++--- .../src/main/resources/application-prod.yml | 5 +++-- .../src/main/resources/application-test.yml | 5 +++-- .../com/iformall/ConsumerApplication.java | 8 ++++++++ .../src/main/resources/application-dev.yml | 5 +++-- .../src/main/resources/application-prod.yml | 15 +++------------ .../src/main/resources/application-test.yml | 5 +++-- .../com/iformall/ScheduleApplication.java | 8 ++++++++ .../src/main/resources/application-dev.yml | 5 +++-- .../src/main/resources/application-prod.yml | 5 +++-- .../src/main/resources/application-test.yml | 5 +++-- .../common/GlobalDefultExceptionHandler.java | 5 ++++- .../com/iformall/SocketServerApplication.java | 8 ++++++++ .../src/main/resources/application-dev.yml | 8 ++++++-- .../src/main/resources/application-prod.yml | 8 ++++++-- .../src/main/resources/application-test.yml | 8 ++++++-- 25 files changed, 131 insertions(+), 63 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java index 668c20847..ed37b6797 100644 --- a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java @@ -25,6 +25,9 @@ public class UserApplication { @Value("${fm.exception}") private boolean fmException; + @Value("${fm.exception_emails}") + private String fmExceptionEmails; + @Value("${fm.open}") private boolean fmOpen; @@ -33,6 +36,11 @@ public class UserApplication { return fmException; } + @Bean + public String fmExceptionEmails() { + return fmExceptionEmails; + } + @Bean public boolean isFmOpen() { return fmOpen; diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index c35cb3431..3383e8451 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -42,8 +42,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) + password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 properties: mail: smtp: @@ -111,6 +111,7 @@ jasypt: fm: exception: false + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 1 open: true diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 85b34da23..ad957ad0b 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -40,17 +40,17 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(I2YKxnRVPY7J1r/bwzwHOhQCjj3nVqCWEbVTJvBq7y0=) - password: ENC(APQMO9XQRzMKd0eap+oSSOYH9MQe/r5K0YFF9A9mizU=) # 授权密码 + username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) + password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 properties: mail: - smtp: - auth: true - starttls: - enable: true - socketFactory: - port: 465 - class: javax.net.ssl.SSLSocketFactory + smtp: + auth: true + starttls: + enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: localhost @@ -95,6 +95,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 3 open: true diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index 2178ea199..574e7844f 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -40,8 +40,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=) - password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码 + username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==) + password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码 properties: mail: smtp: @@ -95,6 +95,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 2 open: true diff --git a/mallinkBApi/src/main/java/com/iformall/BApplication.java b/mallinkBApi/src/main/java/com/iformall/BApplication.java index 8ab96db8a..b583daff9 100644 --- a/mallinkBApi/src/main/java/com/iformall/BApplication.java +++ b/mallinkBApi/src/main/java/com/iformall/BApplication.java @@ -21,13 +21,21 @@ public class BApplication { @Value("${fm.exception}") private boolean fmException; + @Value("${fm.exception_emails}") + private String fmExceptionEmails; + @Value("${fm.open}") private boolean fmOpen; - @Bean - public boolean isFmException() { - return fmException; - } + @Bean + public boolean isFmException() { + return fmException; + } + + @Bean + public String fmExceptionEmails() { + return fmExceptionEmails; + } @Bean public boolean isFmOpen() { diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index bd151ee2e..7ad8efcdd 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -41,8 +41,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) + password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 properties: mail: smtp: @@ -85,6 +85,7 @@ wechat: fm: exception: false + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 1 open: true diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 232cbb284..4c22a5659 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -39,8 +39,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(I2YKxnRVPY7J1r/bwzwHOhQCjj3nVqCWEbVTJvBq7y0=) - password: ENC(APQMO9XQRzMKd0eap+oSSOYH9MQe/r5K0YFF9A9mizU=) # 授权密码 + username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) + password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 properties: mail: smtp: @@ -88,6 +88,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 3 open: true diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index 51ba81bc2..467825304 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -39,8 +39,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=) - password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码 + username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==) + password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码 properties: mail: smtp: @@ -88,6 +88,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 2 open: true diff --git a/mallinkCApi/src/main/java/com/iformall/CApplication.java b/mallinkCApi/src/main/java/com/iformall/CApplication.java index c3d60da7e..a3f904892 100644 --- a/mallinkCApi/src/main/java/com/iformall/CApplication.java +++ b/mallinkCApi/src/main/java/com/iformall/CApplication.java @@ -21,13 +21,21 @@ public class CApplication { @Value("${fm.exception}") private boolean fmException; + @Value("${fm.exception_emails}") + private String fmExceptionEmails; + @Value("${fm.open}") private boolean fmOpen; - @Bean - public boolean isFmException() { - return fmException; - } + @Bean + public boolean isFmException() { + return fmException; + } + + @Bean + public String fmExceptionEmails() { + return fmExceptionEmails; + } @Bean public boolean isFmOpen() { diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index e38fa70ce..4f332d6fb 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -41,8 +41,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) + password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 properties: mail: smtp: @@ -84,7 +84,8 @@ jasypt: password: oRqdnDbK5pj3eMmB fm: - exception: false + exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 1 open: true diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 8fed514f7..40cd75f73 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -39,8 +39,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(I2YKxnRVPY7J1r/bwzwHOhQCjj3nVqCWEbVTJvBq7y0=) - password: ENC(APQMO9XQRzMKd0eap+oSSOYH9MQe/r5K0YFF9A9mizU=) # 授权密码 + username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) + password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 properties: mail: smtp: @@ -88,6 +88,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 3 open: true diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index c1a7c0ef6..f7e30b35c 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -39,8 +39,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=) - password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码 + username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==) + password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码 properties: mail: smtp: @@ -88,6 +88,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 2 open: true diff --git a/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java b/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java index c4eb13fb2..dd73188bc 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java @@ -23,6 +23,9 @@ public class ConsumerApplication { @Value("${fm.exception}") private boolean fmException; + @Value("${fm.exception_emails}") + private String fmExceptionEmails; + @Value("${fm.open}") private boolean fmOpen; @@ -31,6 +34,11 @@ public class ConsumerApplication { return fmException; } + @Bean + public String fmExceptionEmails() { + return fmExceptionEmails; + } + @Bean public boolean isFmOpen() { return fmOpen; diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index bb2b7ded5..47e0c39bd 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -43,8 +43,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) + password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 properties: mail: smtp: @@ -104,6 +104,7 @@ jasypt: fm: exception: false + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 1 open: true diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 5010adb19..e2907d5f0 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -27,21 +27,11 @@ spring: host: 127.0.0.1 port: 6379 password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) - timeout: 3600 - expire: 1800 #30分钟 - database: 1 - defaultExpiration: 2592000 # 默认生命周期30天 - jedis: - pool: - max-active: 8 - max-idle: 8 - max-wait: -1 - min-idle: 0 # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(I2YKxnRVPY7J1r/bwzwHOhQCjj3nVqCWEbVTJvBq7y0=) - password: ENC(APQMO9XQRzMKd0eap+oSSOYH9MQe/r5K0YFF9A9mizU=) # 授权密码 + username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) + password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 properties: mail: smtp: @@ -89,6 +79,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 3 open: true diff --git a/mallinkMQConsumer/src/main/resources/application-test.yml b/mallinkMQConsumer/src/main/resources/application-test.yml index e1c673b7a..8a849a88b 100644 --- a/mallinkMQConsumer/src/main/resources/application-test.yml +++ b/mallinkMQConsumer/src/main/resources/application-test.yml @@ -40,8 +40,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=) - password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码 + username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==) + password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码 properties: mail: smtp: @@ -89,6 +89,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 2 open: true diff --git a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java index 9ad8515f7..640a82a1a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java +++ b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java @@ -23,6 +23,9 @@ public class ScheduleApplication { @Value("${fm.exception}") private boolean fmException; + @Value("${fm.exception_emails}") + private String fmExceptionEmails; + @Value("${fm.open}") private boolean fmOpen; @@ -31,6 +34,11 @@ public class ScheduleApplication { return fmException; } + @Bean + public String fmExceptionEmails() { + return fmExceptionEmails; + } + @Bean public boolean isFmOpen() { return fmOpen; diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 5601bf51d..702acbf79 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -43,8 +43,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) + password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 properties: mail: smtp: @@ -87,6 +87,7 @@ jasypt: fm: exception: false + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 1 open: true diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index 4bec7fa2c..1dac831d9 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -40,8 +40,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(I2YKxnRVPY7J1r/bwzwHOhQCjj3nVqCWEbVTJvBq7y0=) - password: ENC(APQMO9XQRzMKd0eap+oSSOYH9MQe/r5K0YFF9A9mizU=) # 授权密码 + username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) + password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 properties: mail: smtp: @@ -89,6 +89,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 3 open: true diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index 4b3f13e67..82387aa13 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -40,8 +40,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=) - password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码 + username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==) + password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码 properties: mail: smtp: @@ -89,6 +89,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 2 open: true diff --git a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java index 69a88f69a..a06412457 100644 --- a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java +++ b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java @@ -25,6 +25,9 @@ public class GlobalDefultExceptionHandler { @Autowired private boolean isFmException; + @Autowired + private String fmExceptionEmails; + @Autowired private MailService mailService; @@ -51,7 +54,7 @@ public class GlobalDefultExceptionHandler { sb.append("\n"); sb.append(sw.toString()); - String[] receivers = new String[] {"hupeng@iformall.com", "wuguoqiang@iformall.com", "gongbiao@iformall.com", "luozukai@iformall.com"}; + String[] receivers = fmExceptionEmails.split(","); //发送邮件 mailService.sendSimpleMail(receivers, "请求地址:" + request.getRequestURL() + "异常", sb.toString()); diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java b/mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java index 556e11c8c..69664250c 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java @@ -22,6 +22,9 @@ public class SocketServerApplication { @Value("${fm.exception}") private boolean fmException; + @Value("${fm.exception_emails}") + private String fmExceptionEmails; + @Value("${fm.open}") private boolean fmOpen; @@ -30,6 +33,11 @@ public class SocketServerApplication { return fmException; } + @Bean + public String fmExceptionEmails() { + return fmExceptionEmails; + } + @Bean public boolean isFmOpen() { return fmOpen; diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index 4e2a1354c..041b69d95 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -43,14 +43,17 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) + password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 properties: mail: smtp: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory rocketmq: nameServer: 127.0.0.1:9876 producer: @@ -101,6 +104,7 @@ jasypt: fm: exception: false + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 1 open: true diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index 8938643c7..c777bb3cf 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -40,14 +40,17 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(I2YKxnRVPY7J1r/bwzwHOhQCjj3nVqCWEbVTJvBq7y0=) - password: ENC(APQMO9XQRzMKd0eap+oSSOYH9MQe/r5K0YFF9A9mizU=) # 授权密码 + username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) + password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 properties: mail: smtp: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: localhost @@ -86,6 +89,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 3 open: true diff --git a/mallinkWebSocketServer/src/main/resources/application-test.yml b/mallinkWebSocketServer/src/main/resources/application-test.yml index 71fe99bc8..4a2dbfa4d 100644 --- a/mallinkWebSocketServer/src/main/resources/application-test.yml +++ b/mallinkWebSocketServer/src/main/resources/application-test.yml @@ -40,14 +40,17 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=) - password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码 + username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==) + password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码 properties: mail: smtp: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: 127.0.0.1 @@ -86,6 +89,7 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com deploy: 2 open: true