UDI
/
udims-cg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udims打包问题

Browse Source
dev
anthonywj 1 year ago
parent 4e82b6a1a8
commit 9543dbf813
6 changed files with 68 additions and 42 deletions
Show Stats Download Patch File Download Diff File

23
pom.xml
Unescape Escape View File

@ -137,11 +137,11 @@
<artifactId>spring-boot-starter-tomcat</artifactId> <artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- jar包使用 --> <!-- jar包使用 -->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>--> <!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-undertow</artifactId>--> <!-- <artifactId>spring-boot-starter-undertow</artifactId>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
@ -317,15 +317,22 @@
</dependencies> </dependencies>
<build> <build>
<finalName>UDIC_UDI_Server</finalName> <finalName>udims</finalName>
<plugins> <plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.glxp.udi.ApiAdminApplication</mainClass>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.1</version>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>

10
src/main/java/com/glxp/udi/ApiAdminApplication.java
Unescape Escape View File

@ -2,15 +2,23 @@ package com.glxp.udi;
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.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement @EnableTransactionManagement
@SpringBootApplication @SpringBootApplication
public class ApiAdminApplication { public class ApiAdminApplication extends SpringBootServletInitializer {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(ApiAdminApplication.class, args); SpringApplication.run(ApiAdminApplication.class, args);
} }
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
return builder.sources(ApiAdminApplication.class);
}
} }

2
src/main/java/com/glxp/udi/admin/config/Knife4jConfiguration.java
Unescape Escape View File

@ -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.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;

28
src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java
Unescape Escape View File

@ -82,7 +82,7 @@ public class OrderController {
@Resource @Resource
private WarehouseTempService warehouseTempService; private WarehouseTempService warehouseTempService;
@GetMapping("/warehouse/inout/order/filter") @GetMapping("/warehouse/inout/order/filter")
public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -183,7 +183,7 @@ public class OrderController {
* @param orderFilterRequest * @param orderFilterRequest
* @return * @return
*/ */
@GetMapping("admin/warehouse/inout/order/listerror") @GetMapping("admin/warehouse/inout/order/listerror")
public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) {
AuthAdmin authAdmin = authAdminService.getCurrentUser(); AuthAdmin authAdmin = authAdminService.getCurrentUser();
@ -204,7 +204,7 @@ public class OrderController {
* @param orderFilterRequest * @param orderFilterRequest
* @return * @return
*/ */
@GetMapping("/warehouse/inout/order/filterAdditionalOrder") @GetMapping("/warehouse/inout/order/filterAdditionalOrder")
public BaseResponse filterAdditionalOrder(OrderFilterRequest orderFilterRequest) { public BaseResponse filterAdditionalOrder(OrderFilterRequest orderFilterRequest) {
AuthAdmin authAdmin = authAdminService.getCurrentUser(); AuthAdmin authAdmin = authAdminService.getCurrentUser();
@ -232,7 +232,7 @@ public class OrderController {
* @param bindingResult * @param bindingResult
* @return * @return
*/ */
@GetMapping("/warehouse/inout/order/filterSupplementOrder") @GetMapping("/warehouse/inout/order/filterSupplementOrder")
public BaseResponse filterSupplementOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { public BaseResponse filterSupplementOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -263,7 +263,7 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@PostMapping("/warehouse/inout/order/mergeOrder") @PostMapping("/warehouse/inout/order/mergeOrder")
public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) { public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -305,7 +305,7 @@ public class OrderController {
return ResultVOUtils.success("添加成功"); return ResultVOUtils.success("添加成功");
} }
@PostMapping("/warehouse/inout/order/updateSpms") @PostMapping("/warehouse/inout/order/updateSpms")
public BaseResponse uploadSpms(@RequestBody OrderUploadRequest orderUploadRequest, BindingResult bindingResult) { public BaseResponse uploadSpms(@RequestBody OrderUploadRequest orderUploadRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -416,7 +416,7 @@ public class OrderController {
* @param orderDetailEntity * @param orderDetailEntity
* @return * @return
*/ */
@PostMapping("/warehouse/inout/order/detail/update") @PostMapping("/warehouse/inout/order/detail/update")
public BaseResponse updateStockOrderDetail(OrderDetailEntity orderDetailEntity) { public BaseResponse updateStockOrderDetail(OrderDetailEntity orderDetailEntity) {
if (null != orderDetailEntity) { if (null != orderDetailEntity) {
@ -431,7 +431,7 @@ public class OrderController {
* @param orderEditRequest * @param orderEditRequest
* @return * @return
*/ */
@PostMapping("/udiwms/inout/order/updateOrderInfo") @PostMapping("/udiwms/inout/order/updateOrderInfo")
public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) { public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) {
if (null == orderEditRequest || StrUtil.isBlank(orderEditRequest.getActDate()) || CollUtil.isEmpty(orderEditRequest.getOrderIds())) { if (null == orderEditRequest || StrUtil.isBlank(orderEditRequest.getActDate()) || CollUtil.isEmpty(orderEditRequest.getOrderIds())) {
@ -447,7 +447,7 @@ public class OrderController {
* @param orderId 单据号 * @param orderId 单据号
* @return * @return
*/ */
@GetMapping("/udiwms/stock/order/supplementOrder") @GetMapping("/udiwms/stock/order/supplementOrder")
public BaseResponse supplementOrder(@RequestParam("orderId") String orderId) { public BaseResponse supplementOrder(@RequestParam("orderId") String orderId) {
if (StrUtil.isBlank(orderId)) { if (StrUtil.isBlank(orderId)) {
@ -467,7 +467,7 @@ public class OrderController {
* @param orderId * @param orderId
* @return * @return
*/ */
@GetMapping("/udiwms/inout/order/filterOrderForDelete") @GetMapping("/udiwms/inout/order/filterOrderForDelete")
public BaseResponse filterOrderForDelete(String orderId) { public BaseResponse filterOrderForDelete(String orderId) {
if (StrUtil.isBlank(orderId)) { if (StrUtil.isBlank(orderId)) {
@ -498,7 +498,7 @@ public class OrderController {
* @param addOrderChangeRequest * @param addOrderChangeRequest
* @return * @return
*/ */
@PostMapping("/udiwms/stock/order/change") @PostMapping("/udiwms/stock/order/change")
public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) { public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) {
OrderEntity originOrder = orderService.findById(addOrderChangeRequest.getOrderId()); OrderEntity originOrder = orderService.findById(addOrderChangeRequest.getOrderId());
@ -560,7 +560,7 @@ public class OrderController {
} }
//手持终端下载订单校验 //手持终端下载订单校验
@GetMapping("/udiwms/inout/order/download") @GetMapping("/udiwms/inout/order/download")
public BaseResponse downloadOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { public BaseResponse downloadOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -610,7 +610,7 @@ public class OrderController {
} }
//手持终端验收完成后，更新订单状态 //手持终端验收完成后，更新订单状态
@PostMapping("/spms/inout/order/check/updateStatus") @PostMapping("/spms/inout/order/check/updateStatus")
public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, BindingResult bindingResult) { public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -632,7 +632,7 @@ public class OrderController {
* *
* @return * @return
*/ */
@PostMapping("/warehouse/inout/order/submitWebScanOrder") @PostMapping("/warehouse/inout/order/submitWebScanOrder")
public BaseResponse submitWebScanOrder(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) { public BaseResponse submitWebScanOrder(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors() || null == addOrderRequest || StrUtil.isBlank(addOrderRequest.getOrderId())) { if (bindingResult.hasErrors() || null == addOrderRequest || StrUtil.isBlank(addOrderRequest.getOrderId())) {

5
src/main/resources/application-dev.yml
Unescape Escape View File

@ -3,14 +3,13 @@ spring:
pathmatch: pathmatch:
matching-strategy: ant_path_matcher matching-strategy: ant_path_matcher
datasource: 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 username: root
password: 123456 password: 123456
redis: redis:
database: 11 database: 11
host: 127.0.0.1 host: 127.0.0.1
port: 6377 port: 6379
password: 123456
jedis: jedis:
pool: pool:
max-active: 8 max-active: 8

42
src/main/resources/application-pro.yml
Unescape Escape View File

@ -1,15 +1,15 @@
spring: spring:
mvc:
pathmatch:
matching-strategy: ant_path_matcher
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/udims_cg?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
url: jdbc:mysql://127.0.0.1:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: mysql@2020 password: 123456
redis: redis:
database: 4 database: 11
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
password:
jedis: jedis:
pool: pool:
max-active: 8 max-active: 8
@ -17,19 +17,33 @@ spring:
max-idle: 8 max-idle: 8
min-idle: 0 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: logging:
level: level:
org.springframework.data.mongodb.core.MongoTemplate: debug
com.glxp.udi.admin.dao: 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 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: UDI_SERVER:
url: https://www.udims.com/UDI_DL_Server_test url: https://www.udims.com/UDI_DL_Server_test
connectTimeout: 2000 connectTimeout: 2000
@ -37,7 +51,7 @@ UDI_SERVER:
followRedirects: false followRedirects: false
key: 17fbb8f8782c11ecaec9902e16f86c51 key: 17fbb8f8782c11ecaec9902e16f86c51
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
file_path: D:/1s/udims file_path: D:/1s/udims
# UDI数据下载
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
Write Preview
Loading…
Cancel
Save