diff --git a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java index fffc1111e..f1c776d8b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java @@ -1,8 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; import springfox.documentation.swagger2.annotations.EnableSwagger2; import tk.mybatis.spring.annotation.MapperScan; @@ -18,6 +20,14 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableAsync public class UserApplication { + @Value("${fm.exception}") + private boolean fmException; + + @Bean + public boolean isFmException() { + return fmException; + } + public static void main(String[] args) { SpringApplication.run(UserApplication.class, args); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 66503982c..0fd3ac39f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -89,6 +89,8 @@ public class HomeController extends BaseController { return new ResultData(ErrorCode.KAPCHA_NOT_VALID.getCode(), e.getMessage()); } + Double.parseDouble("askhahsf"); + ResultData data = new ResultData(); if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) { diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 42b1b08aa..9cebfdae8 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -39,6 +39,9 @@ spring: max-wait: -1 min-idle: 10 +fm: + exception: false + logging: level: tk.mybatis: debug diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 083287e5b..9d0dc20b8 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -35,6 +35,10 @@ spring: max-wait: -1 min-idle: 0 + +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index 2a61a45a3..471b6de50 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -36,6 +36,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkBApi/src/main/java/com/iformall/BApplication.java b/mallinkBApi/src/main/java/com/iformall/BApplication.java index 017c85a3c..ef3c776ba 100644 --- a/mallinkBApi/src/main/java/com/iformall/BApplication.java +++ b/mallinkBApi/src/main/java/com/iformall/BApplication.java @@ -1,8 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import tk.mybatis.spring.annotation.MapperScan; /** @@ -14,6 +16,15 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableEncryptableProperties public class BApplication { + @Value("${fm.exception}") + private boolean fmException; + + @Bean + public boolean isFmException() { + return fmException; + } + + public static void main(String[] args) { SpringApplication.run(BApplication.class, args); } diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 55dbfd2ab..70bd52b35 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -38,6 +38,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: false + logging: level: tk.mybatis: debug diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index c2790ee82..28021fe41 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -35,6 +35,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index 76cdc917b..e535f61ce 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -35,6 +35,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkCApi/src/main/java/com/iformall/CApplication.java b/mallinkCApi/src/main/java/com/iformall/CApplication.java index d822ec386..eca6c85b2 100644 --- a/mallinkCApi/src/main/java/com/iformall/CApplication.java +++ b/mallinkCApi/src/main/java/com/iformall/CApplication.java @@ -1,8 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import tk.mybatis.spring.annotation.MapperScan; /** @@ -14,6 +16,15 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableEncryptableProperties public class CApplication { + @Value("${fm.exception}") + private boolean fmException; + + @Bean + public boolean isFmException() { + return fmException; + } + + public static void main(String[] args) { SpringApplication.run(CApplication.class, args); } diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 5bb86281d..5d5965d2e 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -37,6 +37,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: false + logging: level: tk.mybatis: debug diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 9ca138926..9b9c66e3f 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -35,6 +35,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index 600046ff3..a7ffb6efb 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -35,6 +35,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java index c9ab711ec..68815c746 100644 --- a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java +++ b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java @@ -1,8 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import springfox.documentation.swagger2.annotations.EnableSwagger2; import tk.mybatis.spring.annotation.MapperScan; @@ -16,6 +18,15 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableEncryptableProperties public class ScheduleApplication { + @Value("${fm.exception}") + private boolean fmException; + + @Bean + public boolean isFmException() { + return fmException; + } + + public static void main(String[] args) { SpringApplication.run(ScheduleApplication.class, args); } diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 54a5823a2..71fc13367 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -39,6 +39,9 @@ spring: max-wait: -1 min-idle: 10 +fm: + exception: false + logging: level: tk.mybatis: debug diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index c5859a633..94435ab1c 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -36,6 +36,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index 1162a3779..e93df812c 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -36,6 +36,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java index 206adf796..6c9e81ed8 100644 --- a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java +++ b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java @@ -22,6 +22,9 @@ public class GlobalDefultExceptionHandler { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private boolean isFmException; + @Autowired private MailService mailService; @@ -30,21 +33,24 @@ public class GlobalDefultExceptionHandler { public String defultExcepitonHandler(HttpServletRequest request, Exception e) { log(e, request); - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - e.printStackTrace(pw); + if(isFmException) { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + e.printStackTrace(pw); - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 - StringBuilder sb = new StringBuilder(); - sb.append(df.format(new Date())); - sb.append("\n"); - sb.append(sw.toString()); + StringBuilder sb = new StringBuilder(); + sb.append(df.format(new Date())); + sb.append("\n"); + sb.append(sw.toString()); - String[] receivers = new String[] {"hupeng@iformall.com", "wuguoqiang@iformall.com", "gongbiao@iformall.com"}; + String[] receivers = new String[] {"hupeng@iformall.com", "wuguoqiang@iformall.com", "gongbiao@iformall.com"}; + + //发送邮件 + mailService.sendSimpleMail(receivers, "请求地址:" + request.getRequestURL() + "异常", sb.toString()); + } - //发送邮件 - mailService.sendSimpleMail(receivers, "请求地址:" + request.getRequestURL() + "异常", sb.toString()); return "发生异常"; }