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

[全局exception][新增]:dev异常不发给研发

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
b05e1931ef
18 измененных файлов: 99 добавлений и 11 удалений
  1. +10
    -0
      mallinkAdmin/src/main/java/com/iformall/UserApplication.java
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
  3. +3
    -0
      mallinkAdmin/src/main/resources/application-dev.yml
  4. +4
    -0
      mallinkAdmin/src/main/resources/application-prod.yml
  5. +3
    -0
      mallinkAdmin/src/main/resources/application-test.yml
  6. +11
    -0
      mallinkBApi/src/main/java/com/iformall/BApplication.java
  7. +3
    -0
      mallinkBApi/src/main/resources/application-dev.yml
  8. +3
    -0
      mallinkBApi/src/main/resources/application-prod.yml
  9. +3
    -0
      mallinkBApi/src/main/resources/application-test.yml
  10. +11
    -0
      mallinkCApi/src/main/java/com/iformall/CApplication.java
  11. +3
    -0
      mallinkCApi/src/main/resources/application-dev.yml
  12. +3
    -0
      mallinkCApi/src/main/resources/application-prod.yml
  13. +3
    -0
      mallinkCApi/src/main/resources/application-test.yml
  14. +11
    -0
      mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java
  15. +3
    -0
      mallinkSchedule/src/main/resources/application-dev.yml
  16. +3
    -0
      mallinkSchedule/src/main/resources/application-prod.yml
  17. +3
    -0
      mallinkSchedule/src/main/resources/application-test.yml
  18. +17
    -11
      mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java

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

@@ -1,8 +1,10 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import tk.mybatis.spring.annotation.MapperScan; import tk.mybatis.spring.annotation.MapperScan;
@@ -18,6 +20,14 @@ import tk.mybatis.spring.annotation.MapperScan;
@EnableAsync @EnableAsync
public class UserApplication { public class UserApplication {


@Value("${fm.exception}")
private boolean fmException;

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

public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(UserApplication.class, args); SpringApplication.run(UserApplication.class, args);
} }


+ 2
- 0
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()); return new ResultData(ErrorCode.KAPCHA_NOT_VALID.getCode(), e.getMessage());
} }


Double.parseDouble("askhahsf");



ResultData data = new ResultData(); ResultData data = new ResultData();
if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) { if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) {


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

@@ -39,6 +39,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 10 min-idle: 10


fm:
exception: false

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -35,6 +35,10 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0



fm:
exception: true

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -36,6 +36,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: true

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -1,8 +1,10 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import tk.mybatis.spring.annotation.MapperScan; import tk.mybatis.spring.annotation.MapperScan;


/** /**
@@ -14,6 +16,15 @@ import tk.mybatis.spring.annotation.MapperScan;
@EnableEncryptableProperties @EnableEncryptableProperties
public class BApplication { public class BApplication {


@Value("${fm.exception}")
private boolean fmException;

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


public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(BApplication.class, args); SpringApplication.run(BApplication.class, args);
} }


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

@@ -38,6 +38,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: false

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -35,6 +35,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: true

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -35,6 +35,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: true

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -1,8 +1,10 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import tk.mybatis.spring.annotation.MapperScan; import tk.mybatis.spring.annotation.MapperScan;


/** /**
@@ -14,6 +16,15 @@ import tk.mybatis.spring.annotation.MapperScan;
@EnableEncryptableProperties @EnableEncryptableProperties
public class CApplication { public class CApplication {


@Value("${fm.exception}")
private boolean fmException;

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


public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(CApplication.class, args); SpringApplication.run(CApplication.class, args);
} }


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

@@ -37,6 +37,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: false

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -35,6 +35,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: true

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -35,6 +35,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: true

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -1,8 +1,10 @@
package com.iformall; package com.iformall;


import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import tk.mybatis.spring.annotation.MapperScan; import tk.mybatis.spring.annotation.MapperScan;


@@ -16,6 +18,15 @@ import tk.mybatis.spring.annotation.MapperScan;
@EnableEncryptableProperties @EnableEncryptableProperties
public class ScheduleApplication { public class ScheduleApplication {


@Value("${fm.exception}")
private boolean fmException;

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


public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(ScheduleApplication.class, args); SpringApplication.run(ScheduleApplication.class, args);
} }


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

@@ -39,6 +39,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 10 min-idle: 10


fm:
exception: false

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -36,6 +36,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: true

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -36,6 +36,9 @@ spring:
max-wait: -1 max-wait: -1
min-idle: 0 min-idle: 0


fm:
exception: true

logging: logging:
level: level:
tk.mybatis: debug tk.mybatis: debug


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

@@ -22,6 +22,9 @@ public class GlobalDefultExceptionHandler {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired
private boolean isFmException;

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


@@ -30,21 +33,24 @@ public class GlobalDefultExceptionHandler {
public String defultExcepitonHandler(HttpServletRequest request, Exception e) { public String defultExcepitonHandler(HttpServletRequest request, Exception e) {
log(e, request); 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 "发生异常"; return "发生异常";
} }


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