diff --git a/pom.xml b/pom.xml index 728c167..f054e6e 100644 --- a/pom.xml +++ b/pom.xml @@ -137,11 +137,11 @@ spring-boot-starter-tomcat provided - - - - - + + + + + com.fasterxml.jackson.core jackson-databind @@ -317,15 +317,22 @@ - UDIC_UDI_Server + udims + + org.springframework.boot + spring-boot-maven-plugin + + com.glxp.udi.ApiAdminApplication + + org.apache.maven.plugins maven-compiler-plugin 3.1 - 1.8 - 1.8 + 11 + 11 UTF-8 diff --git a/src/main/java/com/glxp/udi/ApiAdminApplication.java b/src/main/java/com/glxp/udi/ApiAdminApplication.java index a351fa8..6ddb395 100644 --- a/src/main/java/com/glxp/udi/ApiAdminApplication.java +++ b/src/main/java/com/glxp/udi/ApiAdminApplication.java @@ -2,15 +2,23 @@ package com.glxp.udi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement @SpringBootApplication -public class ApiAdminApplication { +public class ApiAdminApplication extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(ApiAdminApplication.class, args); } + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(ApiAdminApplication.class); + } + + } diff --git a/src/main/java/com/glxp/udi/admin/config/Knife4jConfiguration.java b/src/main/java/com/glxp/udi/admin/config/Knife4jConfiguration.java index 013bf11..d1f8534 100644 --- a/src/main/java/com/glxp/udi/admin/config/Knife4jConfiguration.java +++ b/src/main/java/com/glxp/udi/admin/config/Knife4jConfiguration.java @@ -12,10 +12,8 @@ import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpoints import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; -import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java index ca3c3fe..7aeb608 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java @@ -82,7 +82,7 @@ public class OrderController { @Resource private WarehouseTempService warehouseTempService; - + @GetMapping("/warehouse/inout/order/filter") public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -183,7 +183,7 @@ public class OrderController { * @param orderFilterRequest * @return */ - + @GetMapping("admin/warehouse/inout/order/listerror") public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { AuthAdmin authAdmin = authAdminService.getCurrentUser(); @@ -204,7 +204,7 @@ public class OrderController { * @param orderFilterRequest * @return */ - + @GetMapping("/warehouse/inout/order/filterAdditionalOrder") public BaseResponse filterAdditionalOrder(OrderFilterRequest orderFilterRequest) { AuthAdmin authAdmin = authAdminService.getCurrentUser(); @@ -232,7 +232,7 @@ public class OrderController { * @param bindingResult * @return */ - + @GetMapping("/warehouse/inout/order/filterSupplementOrder") public BaseResponse filterSupplementOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -263,7 +263,7 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } - + @PostMapping("/warehouse/inout/order/mergeOrder") public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -305,7 +305,7 @@ public class OrderController { return ResultVOUtils.success("添加成功"); } - + @PostMapping("/warehouse/inout/order/updateSpms") public BaseResponse uploadSpms(@RequestBody OrderUploadRequest orderUploadRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -416,7 +416,7 @@ public class OrderController { * @param orderDetailEntity * @return */ - + @PostMapping("/warehouse/inout/order/detail/update") public BaseResponse updateStockOrderDetail(OrderDetailEntity orderDetailEntity) { if (null != orderDetailEntity) { @@ -431,7 +431,7 @@ public class OrderController { * @param orderEditRequest * @return */ - + @PostMapping("/udiwms/inout/order/updateOrderInfo") public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) { if (null == orderEditRequest || StrUtil.isBlank(orderEditRequest.getActDate()) || CollUtil.isEmpty(orderEditRequest.getOrderIds())) { @@ -447,7 +447,7 @@ public class OrderController { * @param orderId 单据号 * @return */ - + @GetMapping("/udiwms/stock/order/supplementOrder") public BaseResponse supplementOrder(@RequestParam("orderId") String orderId) { if (StrUtil.isBlank(orderId)) { @@ -467,7 +467,7 @@ public class OrderController { * @param orderId * @return */ - + @GetMapping("/udiwms/inout/order/filterOrderForDelete") public BaseResponse filterOrderForDelete(String orderId) { if (StrUtil.isBlank(orderId)) { @@ -498,7 +498,7 @@ public class OrderController { * @param addOrderChangeRequest * @return */ - + @PostMapping("/udiwms/stock/order/change") public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) { OrderEntity originOrder = orderService.findById(addOrderChangeRequest.getOrderId()); @@ -560,7 +560,7 @@ public class OrderController { } //手持终端下载订单校验 - + @GetMapping("/udiwms/inout/order/download") public BaseResponse downloadOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -610,7 +610,7 @@ public class OrderController { } //手持终端验收完成后，更新订单状态 - + @PostMapping("/spms/inout/order/check/updateStatus") public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -632,7 +632,7 @@ public class OrderController { * * @return */ - + @PostMapping("/warehouse/inout/order/submitWebScanOrder") public BaseResponse submitWebScanOrder(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors() || null == addOrderRequest || StrUtil.isBlank(addOrderRequest.getOrderId())) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4a4e3ca..ba42aa3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,14 +3,13 @@ spring: pathmatch: matching-strategy: ant_path_matcher datasource: - url: jdbc:mysql://127.0.0.1:3333/udims_cg?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:3306/udims_cg?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 redis: database: 11 host: 127.0.0.1 - port: 6377 - password: 123456 + port: 6379 jedis: pool: max-active: 8 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index a92a039..ba42aa3 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,15 +1,15 @@ spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:3306/udims_cg?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: mysql@2020 - + password: 123456 redis: - database: 4 + database: 11 host: 127.0.0.1 port: 6379 - password: jedis: pool: max-active: 8 @@ -17,19 +17,33 @@ spring: max-idle: 8 min-idle: 0 + boot: + admin: + client: + username: admin + password: admin + url: http://localhost:8888 + instance: + prefer-ip: true + + +management: + endpoint: + health: + show-details: always + logfile: + external-file: ../logs/UDIC_UDI_Server/web_debug.log + endpoints: + web: + exposure: + include: "*" logging: level: - org.springframework.data.mongodb.core.MongoTemplate: debug com.glxp.udi.admin.dao: debug -#mips服务地址 -UDIC_MIPSDOWNLOAD_URL: http://127.0.0.1:8080/UDIC_MIPSDL_Server -UCLOD_SERVER_URL: http://127.0.0.1:9997 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test -COOR_UPLOAD_ORDER: http://127.0.0.1:9987/udi/upload -#同步库接口调用地址相关信息 https://www.udims.com/UDI_DL_Server_test UDI_SERVER: url: https://www.udims.com/UDI_DL_Server_test connectTimeout: 2000 @@ -37,7 +51,7 @@ UDI_SERVER: followRedirects: false key: 17fbb8f8782c11ecaec9902e16f86c51 +UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df + file_path: D:/1s/udims -# UDI数据下载 -UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df \ No newline at end of file