diff --git a/template/common/src/main/java/{{.packagePath}}/common/response/MyDateFormat.java b/template/common/src/main/java/{{.packagePath}}/common/response/MyDateFormat.java index 0bd8043..4c03b4c 100644 --- a/template/common/src/main/java/{{.packagePath}}/common/response/MyDateFormat.java +++ b/template/common/src/main/java/{{.packagePath}}/common/response/MyDateFormat.java @@ -6,10 +6,15 @@ import java.util.Date; public class MyDateFormat extends DateFormat { private static final long serialVersionUID = -4580955831439573829L; - private static final String customDateFormat = "yyyy-MM-dd HH:mm:ss"; private DateFormat dateFormat; private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public MyDateFormat() { + this.calendar = Calendar.getInstance(); + this.dateFormat = simpleDateFormat; + } + + public MyDateFormat(DateFormat dateFormat) { this.calendar = Calendar.getInstance(); this.dateFormat = dateFormat; diff --git a/template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonExceptionResolver.java b/template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonExceptionResolver.java index 074381d..c8526a1 100644 --- a/template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonExceptionResolver.java +++ b/template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonExceptionResolver.java @@ -1,5 +1,6 @@ package {{ .package }}.common.response; +import {{ .package }}.common.utils.ObjectMapperFactory; import com.vs.ex.BizException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -38,17 +39,6 @@ public class ResponseJsonExceptionResolver extends AbstractHandlerExceptionResol } } - public static String getErrorInfoFromException(Exception e) { - try { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - e.printStackTrace(pw); - return "\r\n" + sw.toString() + "\r\n"; - } catch (Exception e2) { - return "bad getErrorInfoFromException"; - } - } - @Override protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { FailData failData = new FailData(); diff --git a/template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonMethodReturnValueHandler.java b/template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonMethodReturnValueHandler.java index d79dcb5..b5a363d 100644 --- a/template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonMethodReturnValueHandler.java +++ b/template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonMethodReturnValueHandler.java @@ -1,5 +1,6 @@ package {{ .package }}.common.response; +import {{ .package }}.common.utils.ObjectMapperFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; diff --git a/template/common/src/main/java/{{.packagePath}}/common/response/WebMvcConfiguration.java b/template/common/src/main/java/{{.packagePath}}/common/response/WebMvcConfiguration.java index 90e9315..f4b4b17 100644 --- a/template/common/src/main/java/{{.packagePath}}/common/response/WebMvcConfiguration.java +++ b/template/common/src/main/java/{{.packagePath}}/common/response/WebMvcConfiguration.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; @Configuration -@ComponentScan("com.vs.ox") +@ComponentScan("com.vs") public class WebMvcConfiguration extends WebMvcConfigurerAdapter implements ApplicationContextAware { RequestMappingHandlerAdapter requestMappingHandlerAdapter; @@ -37,9 +37,7 @@ WebMvcConfiguration extends WebMvcConfigurerAdapter implements ApplicationContex List newProcessors = new ArrayList<>(); while (iterator.hasNext()) { HandlerMethodReturnValueHandler next = iterator.next(); - //为了能在controller中直接返回map,不被默认的MapMethodProcessor拦截 if (next instanceof MapMethodProcessor || - //为了能在controller中直接返回String,不被默认的ViewNameMethodReturnValueHandler拦截 next instanceof ViewNameMethodReturnValueHandler) { continue; } else { diff --git a/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java b/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java index c15db93..81e66f2 100644 --- a/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java +++ b/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java @@ -1,27 +1,18 @@ package {{ .package }}.entrance.web; -import com.vs.sqlmapper.spring.DataSourceConfig; -import com.vs.sqlmapper.spring.scan.VSDaoBeanScan; -import com.vs.agent.TocoAgentInitializer; - import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication(scanBasePackages = {"{{.groupId}}", "com.vs"}) -@VSDaoBeanScan(basePackages = {"com.vs","{{.groupId}}"}) -@Import(DataSourceConfig.class) @MapperScan("{{.groupId}}.**.persist.mapper.mybatis") @EnableScheduling public class AppApplication{ public static void main(String[] args) { SpringApplication application = new SpringApplication(AppApplication.class); - application.addInitializers(new TocoAgentInitializer()); application.run(args); } }