diff --git a/udf-server/pom.xml b/udf-server/pom.xml index 1f58ccc..963fad6 100644 --- a/udf-server/pom.xml +++ b/udf-server/pom.xml @@ -24,6 +24,7 @@ udf-eureka-config-server udf-admin-server + udf-demo-server diff --git a/udf-server/udf-demo-server/pom.xml b/udf-server/udf-demo-server/pom.xml new file mode 100644 index 0000000..ed6fb63 --- /dev/null +++ b/udf-server/udf-demo-server/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + udf-demo-server + udf-demo-server + jar + http://itkk.org:81 + + + org.itkk.udf + udf-server + 1.0 + + + + 9003 + 8003 + + + + + + org.itkk.udf + udf-starter-core + + + + + + + ${project.basedir}/src/main/resources/ + true + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + + + repackage + + + + + + + diff --git a/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/UdfDemoServerApplication.java b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/UdfDemoServerApplication.java new file mode 100644 index 0000000..a8bc85f --- /dev/null +++ b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/UdfDemoServerApplication.java @@ -0,0 +1,13 @@ +package org.itkk.udf.demo.server; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; + +@SpringCloudApplication +public class UdfDemoServerApplication { + + public static void main(String[] args) { + SpringApplication.run(UdfDemoServerApplication.class, args); + } + +} diff --git a/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/core/ExceptionControllerAdvice.java b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/core/ExceptionControllerAdvice.java new file mode 100644 index 0000000..e78716c --- /dev/null +++ b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/core/ExceptionControllerAdvice.java @@ -0,0 +1,43 @@ +package org.itkk.udf.demo.server.core; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import javax.servlet.http.HttpServletRequest; + +@RestControllerAdvice +@Slf4j +public class ExceptionControllerAdvice { + + /** + * 全局异常处理 + * + * @param req 请求对象 + * @param e 异常对象 + * @return ResponseEntity + */ + @ExceptionHandler(Exception.class) + public ResponseEntity jsonErrorHandler(HttpServletRequest req, Exception e) { + log.error("rest请求错误:", e); + HttpStatus status = getStatus(req); + return new ResponseEntity<>(e.getClass().getName(), status); + } + + /** + * 获得错误响应状态 + * + * @param request request + * @return HttpStatus + */ + private HttpStatus getStatus(HttpServletRequest request) { + Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code"); + if (statusCode == null) { + return HttpStatus.INTERNAL_SERVER_ERROR; + } + return HttpStatus.valueOf(statusCode); + } + +} diff --git a/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/domain/DemoEntity.java b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/domain/DemoEntity.java new file mode 100644 index 0000000..2660ed1 --- /dev/null +++ b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/domain/DemoEntity.java @@ -0,0 +1,13 @@ +package org.itkk.udf.demo.server.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.Date; + +@Data +@AllArgsConstructor +public class DemoEntity { + private String name; + private Date date; +} diff --git a/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/service/DemoService.java b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/service/DemoService.java new file mode 100644 index 0000000..bdce465 --- /dev/null +++ b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/service/DemoService.java @@ -0,0 +1,13 @@ +package org.itkk.udf.demo.server.service; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class DemoService { + public void t1() { + log.info("这是日志"); + int a = 1 / 0; + } +} diff --git a/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/web/DemoController.java b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/web/DemoController.java new file mode 100644 index 0000000..b404650 --- /dev/null +++ b/udf-server/udf-demo-server/src/main/java/org/itkk/udf/demo/server/web/DemoController.java @@ -0,0 +1,26 @@ +package org.itkk.udf.demo.server.web; + +import org.itkk.udf.demo.server.domain.DemoEntity; +import org.itkk.udf.demo.server.service.DemoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; + +@RestController("demoController") +@RequestMapping("demo") +public class DemoController { + + @Autowired + private DemoService demoService; + + @RequestMapping(method = RequestMethod.GET, path = "t1/{name}") + public DemoEntity t1(@PathVariable String name) { + demoService.t1(); + return new DemoEntity(name,new Date()); + } + +} diff --git a/udf-server/udf-demo-server/src/main/resources/banner.txt b/udf-server/udf-demo-server/src/main/resources/banner.txt new file mode 100644 index 0000000..1b84812 --- /dev/null +++ b/udf-server/udf-demo-server/src/main/resources/banner.txt @@ -0,0 +1,11 @@ + .----------------. .----------------. .----------------. +| .--------------. || .--------------. || .--------------. | +| | _____ _____ | || | ________ | || | _________ | | +| ||_ _||_ _|| || | |_ ___ `. | || | |_ ___ | | | +| | | | | | | || | | | `. \ | || | | |_ \_| | | +| | | ' ' | | || | | | | | | || | | _| | | +| | \ `--' / | || | _| |___.' / | || | _| |_ | | +| | `.__.' | || | |________.' | || | |_____| | | +| | | || | | || | | | +| '--------------' || '--------------' || '--------------' | + '----------------' '----------------' '----------------' \ No newline at end of file diff --git a/udf-server/udf-demo-server/src/main/resources/bootstrap-dev.properties b/udf-server/udf-demo-server/src/main/resources/bootstrap-dev.properties new file mode 100644 index 0000000..9041c04 --- /dev/null +++ b/udf-server/udf-demo-server/src/main/resources/bootstrap-dev.properties @@ -0,0 +1,16 @@ +# EUREKA.ENVIRONMENT ( EurekaServerBootstrap ) +eureka.environment=${spring.profiles.active} +# EUREKA.INSTANCE ( EurekaInstanceConfigBean ) +eureka.instance.preferIpAddress=true +# EUREKA.CLIENT (EurekaClientConfigBean , EurekaServerConfigBean ) +eureka.client.serviceUrl.defaultZone=http://127.0.0.1:9001/eureka/ +# SPRING.CLOUD.CONFIG.SERVER.GIT ( MultipleJGitEnvironmentRepository ) ({application}/{profile}/{label}) +spring.cloud.config.enabled=true +spring.cloud.config.profile=${spring.profiles.active} +spring.cloud.config.name=test +spring.cloud.config.label=2.X_and_Finchley.X +spring.cloud.config.failFast=true +spring.cloud.config.discovery.enabled=true +spring.cloud.config.discovery.serviceId=UDF-EUREKA-CONFIG-SERVER +# LOGGING +logging.file=d:/develop/application-log/${spring.application.name}_${server.port}_${spring.profiles.active}/base.log \ No newline at end of file diff --git a/udf-server/udf-demo-server/src/main/resources/bootstrap.properties b/udf-server/udf-demo-server/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..623cf73 --- /dev/null +++ b/udf-server/udf-demo-server/src/main/resources/bootstrap.properties @@ -0,0 +1,34 @@ +# INFO +info.build.group=${project.groupId} +info.build.artifact=${project.artifactId} +info.build.version=${project.version} +info.build.name=${spring.application.name} +info.build.env=${spring.profiles.active} +info.build.time=${project.build.date} +info.build.encoding=${project.build.sourceEncoding} +info.build.java.source=${java.version} +info.build.java.target=${java.version} +# SPRING +spring.application.name=${project.name} +# HTTP SERVER +server.port=${server.port} +# MANAGEMENT HTTP SERVER (ManagementServerProperties) +#management.server.address=127.0.0.1 +management.server.port=${management.port} +# ENDPOINTS WEB CONFIGURATION (WebEndpointProperties) +management.endpoints.web.exposure.include=* +# ENDPOINT +management.endpoint.health.showDetails=always +management.endpoint.shutdown.enabled=true +management.endpoint.restart.enabled=true +management.endpoint.pause.enabled=true +management.endpoint.resume.enabled=true +# JACKSON +#spring.jackson.dateFormat=${org.itkk.application.config.dateFormat} +#spring.jackson.jodaDateTimeFormat=${org.itkk.application.config.dateFormat} +spring.jackson.timeZone=Asia/Shanghai +spring.jackson.serialization.INDENT_OUTPUT=true +spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=true +spring.jackson.deserialization.FAIL_ON_UNKNOWN_PROPERTIES=true +spring.jackson.parser.ALLOW_SINGLE_QUOTES=true +spring.jackson.parser.ALLOW_UNQUOTED_CONTROL_CHARS=true \ No newline at end of file diff --git a/udf-server/udf-demo-server/src/main/resources/logback.xml b/udf-server/udf-demo-server/src/main/resources/logback.xml new file mode 100644 index 0000000..049dc97 --- /dev/null +++ b/udf-server/udf-demo-server/src/main/resources/logback.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file