Просмотр исходного кода

[邮箱][修改]:发送者邮箱修改,并整理异常接收者

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
26ac4740d9
25 измененных файлов: 131 добавлений и 63 удалений
  1. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/UserApplication.java
  2. +3
    -2
      mallinkAdmin/src/main/resources/application-dev.yml
  3. +10
    -9
      mallinkAdmin/src/main/resources/application-prod.yml
  4. +3
    -2
      mallinkAdmin/src/main/resources/application-test.yml
  5. +12
    -4
      mallinkBApi/src/main/java/com/iformall/BApplication.java
  6. +3
    -2
      mallinkBApi/src/main/resources/application-dev.yml
  7. +3
    -2
      mallinkBApi/src/main/resources/application-prod.yml
  8. +3
    -2
      mallinkBApi/src/main/resources/application-test.yml
  9. +12
    -4
      mallinkCApi/src/main/java/com/iformall/CApplication.java
  10. +4
    -3
      mallinkCApi/src/main/resources/application-dev.yml
  11. +3
    -2
      mallinkCApi/src/main/resources/application-prod.yml
  12. +3
    -2
      mallinkCApi/src/main/resources/application-test.yml
  13. +8
    -0
      mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java
  14. +3
    -2
      mallinkMQConsumer/src/main/resources/application-dev.yml
  15. +3
    -12
      mallinkMQConsumer/src/main/resources/application-prod.yml
  16. +3
    -2
      mallinkMQConsumer/src/main/resources/application-test.yml
  17. +8
    -0
      mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java
  18. +3
    -2
      mallinkSchedule/src/main/resources/application-dev.yml
  19. +3
    -2
      mallinkSchedule/src/main/resources/application-prod.yml
  20. +3
    -2
      mallinkSchedule/src/main/resources/application-test.yml
  21. +4
    -1
      mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java
  22. +8
    -0
      mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java
  23. +6
    -2
      mallinkWebSocketServer/src/main/resources/application-dev.yml
  24. +6
    -2
      mallinkWebSocketServer/src/main/resources/application-prod.yml
  25. +6
    -2
      mallinkWebSocketServer/src/main/resources/application-test.yml

+ 8
- 0
mallinkAdmin/src/main/java/com/iformall/UserApplication.java Просмотреть файл

@@ -25,6 +25,9 @@ public class UserApplication {
@Value("${fm.exception}") @Value("${fm.exception}")
private boolean fmException; private boolean fmException;


@Value("${fm.exception_emails}")
private String fmExceptionEmails;

@Value("${fm.open}") @Value("${fm.open}")
private boolean fmOpen; private boolean fmOpen;


@@ -33,6 +36,11 @@ public class UserApplication {
return fmException; return fmException;
} }


@Bean
public String fmExceptionEmails() {
return fmExceptionEmails;
}

@Bean @Bean
public boolean isFmOpen() { public boolean isFmOpen() {
return fmOpen; return fmOpen;


+ 3
- 2
mallinkAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -42,8 +42,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=)
password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码
username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==)
password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -111,6 +111,7 @@ jasypt:


fm: fm:
exception: false exception: false
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 1 deploy: 1
open: true open: true




+ 10
- 9
mallinkAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -40,17 +40,17 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com 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: properties:
mail: 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
rabbitmq: rabbitmq:
host: localhost host: localhost
@@ -95,6 +95,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 3 deploy: 3
open: true open: true




+ 3
- 2
mallinkAdmin/src/main/resources/application-test.yml Просмотреть файл

@@ -40,8 +40,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=)
password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码
username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==)
password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -95,6 +95,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 2 deploy: 2
open: true open: true




+ 12
- 4
mallinkBApi/src/main/java/com/iformall/BApplication.java Просмотреть файл

@@ -21,13 +21,21 @@ public class BApplication {
@Value("${fm.exception}") @Value("${fm.exception}")
private boolean fmException; private boolean fmException;


@Value("${fm.exception_emails}")
private String fmExceptionEmails;

@Value("${fm.open}") @Value("${fm.open}")
private boolean fmOpen; private boolean fmOpen;


@Bean
public boolean isFmException() {
return fmException;
}
@Bean
public boolean isFmException() {
return fmException;
}

@Bean
public String fmExceptionEmails() {
return fmExceptionEmails;
}


@Bean @Bean
public boolean isFmOpen() { public boolean isFmOpen() {


+ 3
- 2
mallinkBApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -41,8 +41,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=)
password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码
username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==)
password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -85,6 +85,7 @@ wechat:


fm: fm:
exception: false exception: false
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 1 deploy: 1
open: true open: true




+ 3
- 2
mallinkBApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -39,8 +39,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com 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: properties:
mail: mail:
smtp: smtp:
@@ -88,6 +88,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 3 deploy: 3
open: true open: true




+ 3
- 2
mallinkBApi/src/main/resources/application-test.yml Просмотреть файл

@@ -39,8 +39,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=)
password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码
username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==)
password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -88,6 +88,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 2 deploy: 2
open: true open: true




+ 12
- 4
mallinkCApi/src/main/java/com/iformall/CApplication.java Просмотреть файл

@@ -21,13 +21,21 @@ public class CApplication {
@Value("${fm.exception}") @Value("${fm.exception}")
private boolean fmException; private boolean fmException;


@Value("${fm.exception_emails}")
private String fmExceptionEmails;

@Value("${fm.open}") @Value("${fm.open}")
private boolean fmOpen; private boolean fmOpen;


@Bean
public boolean isFmException() {
return fmException;
}
@Bean
public boolean isFmException() {
return fmException;
}

@Bean
public String fmExceptionEmails() {
return fmExceptionEmails;
}


@Bean @Bean
public boolean isFmOpen() { public boolean isFmOpen() {


+ 4
- 3
mallinkCApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -41,8 +41,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=)
password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码
username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==)
password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -84,7 +84,8 @@ jasypt:
password: oRqdnDbK5pj3eMmB password: oRqdnDbK5pj3eMmB


fm: fm:
exception: false
exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 1 deploy: 1
open: true open: true




+ 3
- 2
mallinkCApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -39,8 +39,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com 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: properties:
mail: mail:
smtp: smtp:
@@ -88,6 +88,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 3 deploy: 3
open: true open: true




+ 3
- 2
mallinkCApi/src/main/resources/application-test.yml Просмотреть файл

@@ -39,8 +39,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=)
password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码
username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==)
password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -88,6 +88,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 2 deploy: 2
open: true open: true




+ 8
- 0
mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java Просмотреть файл

@@ -23,6 +23,9 @@ public class ConsumerApplication {
@Value("${fm.exception}") @Value("${fm.exception}")
private boolean fmException; private boolean fmException;


@Value("${fm.exception_emails}")
private String fmExceptionEmails;

@Value("${fm.open}") @Value("${fm.open}")
private boolean fmOpen; private boolean fmOpen;


@@ -31,6 +34,11 @@ public class ConsumerApplication {
return fmException; return fmException;
} }


@Bean
public String fmExceptionEmails() {
return fmExceptionEmails;
}

@Bean @Bean
public boolean isFmOpen() { public boolean isFmOpen() {
return fmOpen; return fmOpen;


+ 3
- 2
mallinkMQConsumer/src/main/resources/application-dev.yml Просмотреть файл

@@ -43,8 +43,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=)
password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码
username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==)
password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -104,6 +104,7 @@ jasypt:


fm: fm:
exception: false exception: false
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 1 deploy: 1
open: true open: true




+ 3
- 12
mallinkMQConsumer/src/main/resources/application-prod.yml Просмотреть файл

@@ -27,21 +27,11 @@ spring:
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) 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 # EMAIL
mail: mail:
host: smtp.exmail.qq.com 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: properties:
mail: mail:
smtp: smtp:
@@ -89,6 +79,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 3 deploy: 3
open: true open: true




+ 3
- 2
mallinkMQConsumer/src/main/resources/application-test.yml Просмотреть файл

@@ -40,8 +40,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=)
password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码
username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==)
password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -89,6 +89,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 2 deploy: 2
open: true open: true




+ 8
- 0
mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java Просмотреть файл

@@ -23,6 +23,9 @@ public class ScheduleApplication {
@Value("${fm.exception}") @Value("${fm.exception}")
private boolean fmException; private boolean fmException;


@Value("${fm.exception_emails}")
private String fmExceptionEmails;

@Value("${fm.open}") @Value("${fm.open}")
private boolean fmOpen; private boolean fmOpen;


@@ -31,6 +34,11 @@ public class ScheduleApplication {
return fmException; return fmException;
} }


@Bean
public String fmExceptionEmails() {
return fmExceptionEmails;
}

@Bean @Bean
public boolean isFmOpen() { public boolean isFmOpen() {
return fmOpen; return fmOpen;


+ 3
- 2
mallinkSchedule/src/main/resources/application-dev.yml Просмотреть файл

@@ -43,8 +43,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=)
password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码
username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==)
password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -87,6 +87,7 @@ jasypt:


fm: fm:
exception: false exception: false
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 1 deploy: 1
open: true open: true




+ 3
- 2
mallinkSchedule/src/main/resources/application-prod.yml Просмотреть файл

@@ -40,8 +40,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com 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: properties:
mail: mail:
smtp: smtp:
@@ -89,6 +89,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 3 deploy: 3
open: true open: true




+ 3
- 2
mallinkSchedule/src/main/resources/application-test.yml Просмотреть файл

@@ -40,8 +40,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=)
password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码
username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==)
password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
@@ -89,6 +89,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 2 deploy: 2
open: true open: true




+ 4
- 1
mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java Просмотреть файл

@@ -25,6 +25,9 @@ public class GlobalDefultExceptionHandler {
@Autowired @Autowired
private boolean isFmException; private boolean isFmException;


@Autowired
private String fmExceptionEmails;

@Autowired @Autowired
private MailService mailService; private MailService mailService;


@@ -51,7 +54,7 @@ public class GlobalDefultExceptionHandler {
sb.append("\n"); sb.append("\n");
sb.append(sw.toString()); 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()); mailService.sendSimpleMail(receivers, "请求地址:" + request.getRequestURL() + "异常", sb.toString());


+ 8
- 0
mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java Просмотреть файл

@@ -22,6 +22,9 @@ public class SocketServerApplication {
@Value("${fm.exception}") @Value("${fm.exception}")
private boolean fmException; private boolean fmException;


@Value("${fm.exception_emails}")
private String fmExceptionEmails;

@Value("${fm.open}") @Value("${fm.open}")
private boolean fmOpen; private boolean fmOpen;


@@ -30,6 +33,11 @@ public class SocketServerApplication {
return fmException; return fmException;
} }


@Bean
public String fmExceptionEmails() {
return fmExceptionEmails;
}

@Bean @Bean
public boolean isFmOpen() { public boolean isFmOpen() {
return fmOpen; return fmOpen;


+ 6
- 2
mallinkWebSocketServer/src/main/resources/application-dev.yml Просмотреть файл

@@ -43,14 +43,17 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=)
password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码
username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==)
password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
auth: true auth: true
starttls: starttls:
enable: true enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
rocketmq: rocketmq:
nameServer: 127.0.0.1:9876 nameServer: 127.0.0.1:9876
producer: producer:
@@ -101,6 +104,7 @@ jasypt:


fm: fm:
exception: false exception: false
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 1 deploy: 1
open: true open: true




+ 6
- 2
mallinkWebSocketServer/src/main/resources/application-prod.yml Просмотреть файл

@@ -40,14 +40,17 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com 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: properties:
mail: mail:
smtp: smtp:
auth: true auth: true
starttls: starttls:
enable: true enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ # RABBITMQ
rabbitmq: rabbitmq:
host: localhost host: localhost
@@ -86,6 +89,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 3 deploy: 3
open: true open: true




+ 6
- 2
mallinkWebSocketServer/src/main/resources/application-test.yml Просмотреть файл

@@ -40,14 +40,17 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(HFbRXtAFVxU36Hk0yT3reyvRuLrw3RhMlbxFj9Ev/VY=)
password: ENC(pk4+/3C5n2hMYmgi+VTqI4P1m77DllW8y4KElMXXmIo=) # 授权密码
username: ENC(TtJQE2C4cWo8CpVGMMl5hiy5eykepd96J5XjsW3Kj5fgP+6+5ctDNQ==)
password: ENC(Zh6A6kRtA2ABtH6nzdvsqQSO1/8p3mparJr8neI2BLU=) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:
auth: true auth: true
starttls: starttls:
enable: true enable: true
socketFactory:
port: 465
class: javax.net.ssl.SSLSocketFactory
# RABBITMQ # RABBITMQ
rabbitmq: rabbitmq:
host: 127.0.0.1 host: 127.0.0.1
@@ -86,6 +89,7 @@ wechat:


fm: fm:
exception: true exception: true
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com
deploy: 2 deploy: 2
open: true open: true




Загрузка…
Отмена
Сохранить