diff --git a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java index 69a88f6..a064124 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/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java b/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java index 0c2ecab..b7e7a29 100644 --- a/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java +++ b/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java @@ -22,14 +22,30 @@ public class WechatOpenApplication { @Value("${fm.exception}") private boolean fmException; - @Bean - public boolean isFmException() { - return fmException; - } + @Value("${fm.exception_emails}") + private String fmExceptionEmails; + + @Value("${fm.audit_emails}") + private String fmAuditEmails; @Value("${fm.deploy}") private Integer fmDeploy; + @Bean + public boolean isFmException() { + return fmException; + } + + @Bean + public String fmExceptionEmails() { + return fmExceptionEmails; + } + + @Bean + public String fmAuditEmails() { + return fmAuditEmails; + } + @Bean public Integer getFmDeploy() { return fmDeploy; } diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java index bb6f7e5..b6c886f 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java @@ -44,6 +44,9 @@ import java.util.Date; public class WechatCalllbackController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private String fmAuditEmails; + @Autowired protected FmOpenService openService; @@ -350,7 +353,7 @@ public class WechatCalllbackController extends BaseController { sb.append("审核未通过\n").append("原因").append(reason); } - String[] receivers = new String[]{"wangmei@iformall.com", "wuguoqiang@iformall.com", "huanghui@iformall.com", "sunmingming@iformall.com"}; + String[] receivers = fmAuditEmails.split(","); //发送邮件 mailService.sendSimpleMail(receivers, titleSB.toString(), sb.toString()); diff --git a/mlWechatOpen/src/main/resources/application-dev.yml b/mlWechatOpen/src/main/resources/application-dev.yml index 24a353b..9d13e8e 100644 --- a/mlWechatOpen/src/main/resources/application-dev.yml +++ b/mlWechatOpen/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 aws: clientRegion: cn-northwest-1 bucketName: iformall-net @@ -84,6 +87,8 @@ jasypt: fm: exception: false + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com + audit_emails: wangmei@iformall.com,wuguoqiang@iformall.com,huanghui@iformall.com,sunmingming@iformall.com deploy: 1 logging: diff --git a/mlWechatOpen/src/main/resources/application-prod.yml b/mlWechatOpen/src/main/resources/application-prod.yml index c20c2d2..89af6d0 100644 --- a/mlWechatOpen/src/main/resources/application-prod.yml +++ b/mlWechatOpen/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 aws: clientRegion: cn-northwest-1 @@ -78,6 +81,8 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com + audit_emails: wangmei@iformall.com,wuguoqiang@iformall.com,huanghui@iformall.com,sunmingming@iformall.com deploy: 3 logging: diff --git a/mlWechatOpen/src/main/resources/application-test.yml b/mlWechatOpen/src/main/resources/application-test.yml index b01f1b3..fe1ad85 100644 --- a/mlWechatOpen/src/main/resources/application-test.yml +++ b/mlWechatOpen/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: @@ -91,6 +91,8 @@ wechat: fm: exception: true + exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,hanxueda@iformall.com + audit_emails: wangmei@iformall.com,wuguoqiang@iformall.com,huanghui@iformall.com,sunmingming@iformall.com deploy: 2 ueditor: