From cb741c328fb5cd81796d9f7c08a79439f263ba8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 31 Jul 2025 18:03:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nflg-wms-admin/pom.xml | 4 ++ .../com/nflg/wms/admin/AdminApplication.java | 2 +- .../controller/NormalOrderController.java | 20 +++++--- .../StructuralPackageOrderController.java | 11 +++++ .../nflg/wms/admin/service/SapService.java | 4 +- .../java/com/nflg/wms/admin/util/NoUtil.java | 6 +++ .../src/main/resources/logback-spring.xml | 38 +++++++++++++-- .../test/java/com/nflg/wms/admin/ATest.java | 9 ++++ nflg-wms-auth/pom.xml | 47 ++----------------- .../com/nflg/wms/auth/AuthApplication.java | 1 + .../src/main/resources/application-sit.yml | 8 ++++ .../src/main/resources/logback-spring.xml | 35 +++++++++++++- .../nflg/wms/common/pojo/dto/SAPOrderDTO.java | 7 +++ .../pojo/qo/DeliverNormalOrderSaveItemQO.java | 14 +++++- .../wms/common/pojo/qo/SearchSAPOrderQO.java | 9 ++++ nflg-wms-gateway/pom.xml | 4 ++ .../nflg/wms/gateway/GateWayApplication.java | 2 +- .../wms/gateway/definer/HostIpDefiner.java | 19 ++++++++ .../src/main/resources/application-sit.yml | 8 ++++ .../src/main/resources/logback-spring.xml | 35 +++++++++++++- .../entity/WmsNormalPrintOrder.java | 2 + nflg-wms-scheduled/pom.xml | 9 ++-- .../wms/scheduled/ScheduledApplication.java | 5 +- .../src/main/resources/application-prod.yml | 4 +- .../src/main/resources/application-sit.yml | 4 +- .../src/main/resources/logback-spring.xml | 38 +++++++++++++-- .../wms/starter/definer/HostIpDefiner.java | 19 ++++++++ pom.xml | 6 +++ 28 files changed, 292 insertions(+), 78 deletions(-) create mode 100644 nflg-wms-auth/src/main/resources/application-sit.yml create mode 100644 nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/definer/HostIpDefiner.java create mode 100644 nflg-wms-gateway/src/main/resources/application-sit.yml create mode 100644 nflg-wms-starter/src/main/java/com/nflg/wms/starter/definer/HostIpDefiner.java diff --git a/nflg-wms-admin/pom.xml b/nflg-wms-admin/pom.xml index 0d3d883d..020db0d6 100644 --- a/nflg-wms-admin/pom.xml +++ b/nflg-wms-admin/pom.xml @@ -131,6 +131,10 @@ org.springframework.boot spring-boot-starter-aop + + com.github.loki4j + loki-logback-appender + diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/AdminApplication.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/AdminApplication.java index 680e0a77..b647e3bb 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/AdminApplication.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/AdminApplication.java @@ -18,7 +18,7 @@ public class AdminApplication { public static void main(String[] args) { SpringApplication.run(AdminApplication.class, args); - log.info("【管理端】已启动"); + log.info("服务已启动"); // log.info("---------------------- Sa-Token SSO 模式二 Client 端启动成功 ----------------------"); // log.info("配置信息：" + SaSsoManager.getClientConfig()); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java index ba46d9cb..5be6c55f 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java @@ -59,8 +59,10 @@ public class NormalOrderController extends BaseController { private IWmsWorkbenchService workbenchService; private static final DecimalFormat DF = new DecimalFormat("0.00"); + @Resource private IWmsSrmOrderService srmOrderService; + @Resource private IWmsSrmOrderItemService srmOrderItemService; @@ -225,7 +227,8 @@ public class NormalOrderController extends BaseController { private String generateQRContent(DeliverNormalOrderItemDTO order,String indexNo){ String content=StrUtil.format("{}${}${}${}${}${}${}${}" - , order.getPrintNo(), order.getExternalOrderNo(),order.getRowNo(),order.getMaterialNo(),order.getPrintNum(),order.getMaterialDesc(),order.getSupplierCode(),Optional.ofNullable(indexNo).orElse("")); + , order.getPrintNo(), order.getExternalOrderNo(),order.getRowNo(),order.getMaterialNo(),order.getPrintNum() + ,order.getMaterialDesc(),order.getBatchNo(),Optional.ofNullable(indexNo).orElse("")); log.debug("二维码内容:"+ content); return content; } @@ -263,9 +266,11 @@ public class NormalOrderController extends BaseController { // .setOrderQty(RandomUtil.randomBigDecimal(new BigDecimal("1"),new BigDecimal("100"))) // ); // } + WmsSrmOrder order=srmOrderService.getById(id); + VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("送货单不存在"); List orders = srmOrderItemService.getByDeliverOrderId(id); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据"); - exportPdfPerPage(convert1(orders),response); + exportPdfPerPage(convert1(order.getSupplierNum(),orders),response); } /** @@ -283,12 +288,14 @@ public class NormalOrderController extends BaseController { // .setOrderQty(RandomUtil.randomBigDecimal(new BigDecimal("1"),new BigDecimal("100"))) // ); // } - List orders = srmOrderItemService.getByDeliverOrderId(id); - VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据"); - exportPdfInAll(convert1(orders),response); + WmsSrmOrder order=srmOrderService.getById(id); + VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("送货单不存在"); + List items = srmOrderItemService.getByDeliverOrderId(id); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("没有需要打印的数据"); + exportPdfInAll(convert1(order.getSupplierNum(),items),response); } - private List convert1(List orders) throws Exception { + private List convert1(String supplierNo,List orders) throws Exception { List datas = new ArrayList<>(); for (WmsSrmOrderItem order : orders) { DeliverNormalOrderItemDTO dto = new DeliverNormalOrderItemDTO(); @@ -297,6 +304,7 @@ public class NormalOrderController extends BaseController { dto.setIndex(0); dto.setPrintNo(order.getId() + "-" + 0); dto.setPrintNum(DF.format(order.getOrderQty())); + dto.setBatchNo(NoUtil.getBatchNo(supplierNo)); dto.setQrCode("data:image/png;base64,"+Base64.getEncoder().encodeToString(QRCodeUtil.generateQRCode(generateQRContent(dto,""), 100, 100))); datas.add(dto); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index ad33628d..21951208 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -148,6 +148,17 @@ public class StructuralPackageOrderController extends BaseController { datas = datas.stream().filter(it -> StrUtil.equals(request.getOrderNo(), it.getOrderNo())).toList(); } } + if (Objects.equals(request.getType(), 1)){ + datas.forEach(it -> { + SAPMaterialInfoInOrderDTO zim004DTO = sapService.zim004(it.getOrderNo(), request.getSupplierNo(), it.getMaterialNo()); + VUtil.trueThrowBusinessError(Objects.isNull(zim004DTO)) + .throwMessage(StrUtil.format("供应商({})下的采购单({})物料({})未找到订单详情(zim004)数据", request.getSupplierNo(), it.getOrderNo(), it.getMaterialNo())); + it.setLbprt(zim004DTO.getLbprt()); + if (StrUtil.equals("2", it.getLbprt()) || StrUtil.equals("4", it.getLbprt())) { + it.setBatchNo(NoUtil.getBatchNo(request.getSupplierNo())); + } + }); + } return ApiResult.success(datas); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java index 58f9eb01..74a0ba60 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java @@ -249,8 +249,8 @@ public class SapService { .setMaterialDesc(tOut.getString("TXZ01")) .setOrderNum(tOut.getBigDecimal("MENGE")) .setReceivedNum(tOut.getBigDecimal("WEMNG")) - .setTransportNum(tOut.getBigDecimal("ZZTSL"))) - ; + .setTransportNum(tOut.getBigDecimal("ZZTSL")) + ); } log.debug("数据:{}", JSONUtil.toJsonStr(result)); return result; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/util/NoUtil.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/util/NoUtil.java index 5df78c79..e473c77f 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/util/NoUtil.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/util/NoUtil.java @@ -1,5 +1,6 @@ package com.nflg.wms.admin.util; +import cn.hutool.core.util.StrUtil; import com.nflg.wms.common.util.DateTimeUtil; import java.time.LocalDate; @@ -18,4 +19,9 @@ public class NoUtil { public static String getForDeliverNo() { return "SH"+DateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmmss"); } + + public static String getBatchNo(String supplierNo) { + return StrUtil.format("{}{}", StrUtil.subSufByLength(supplierNo, 4) + , DateTimeUtil.format(LocalDateTime.now(), "yyMMdd")); + } } diff --git a/nflg-wms-admin/src/main/resources/logback-spring.xml b/nflg-wms-admin/src/main/resources/logback-spring.xml index 5f6b9435..348f826b 100644 --- a/nflg-wms-admin/src/main/resources/logback-spring.xml +++ b/nflg-wms-admin/src/main/resources/logback-spring.xml @@ -5,6 +5,10 @@ + + + + @@ -45,17 +49,45 @@ true + + + http://192.168.163.83:3100/loki/api/v1/push + + + service_name = wms + app = ${appName} + profile = ${profile} + host = ${HOSTIP} + + + level = %level + thread = %thread + class = %logger + + + true + 5 + 10000 + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] %-5level %logger{50} - %msg %ex + + + - + + - + + - + + \ No newline at end of file diff --git a/nflg-wms-admin/src/test/java/com/nflg/wms/admin/ATest.java b/nflg-wms-admin/src/test/java/com/nflg/wms/admin/ATest.java index 0bf0bcbd..67f7e921 100644 --- a/nflg-wms-admin/src/test/java/com/nflg/wms/admin/ATest.java +++ b/nflg-wms-admin/src/test/java/com/nflg/wms/admin/ATest.java @@ -1,8 +1,11 @@ package com.nflg.wms.admin; import cn.hutool.core.util.StrUtil; +import com.nflg.wms.common.util.DateTimeUtil; import org.junit.jupiter.api.Test; +import java.time.LocalDateTime; + public class ATest { @Test @@ -16,4 +19,10 @@ public class ATest { String index="0000"; System.out.println(StrUtil.removeAllPrefix(index,"0")); } + + @Test + public void test3(){ + String date=DateTimeUtil.format(LocalDateTime.now(), "yyMMdd"); + System.out.println(date); + } } diff --git a/nflg-wms-auth/pom.xml b/nflg-wms-auth/pom.xml index 4dccde5f..e877a8e6 100644 --- a/nflg-wms-auth/pom.xml +++ b/nflg-wms-auth/pom.xml @@ -40,49 +40,10 @@ org.springframework.ldap spring-ldap-core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.github.loki4j + loki-logback-appender + diff --git a/nflg-wms-auth/src/main/java/com/nflg/wms/auth/AuthApplication.java b/nflg-wms-auth/src/main/java/com/nflg/wms/auth/AuthApplication.java index 405cb78d..045e2bbb 100644 --- a/nflg-wms-auth/src/main/java/com/nflg/wms/auth/AuthApplication.java +++ b/nflg-wms-auth/src/main/java/com/nflg/wms/auth/AuthApplication.java @@ -17,6 +17,7 @@ public class AuthApplication { SpringApplication.run(AuthApplication.class, args); log.info("---------------------- Sa-Token SSO 统一认证中心启动成功 ----------------------"); log.info("配置信息：" + SaSsoManager.getServerConfig()); + log.info("服务已启动"); } } diff --git a/nflg-wms-auth/src/main/resources/application-sit.yml b/nflg-wms-auth/src/main/resources/application-sit.yml new file mode 100644 index 00000000..14c650df --- /dev/null +++ b/nflg-wms-auth/src/main/resources/application-sit.yml @@ -0,0 +1,8 @@ +logging: + level: + root: info + com: + nflg: debug + alibaba: + cloud: + nacos: debug \ No newline at end of file diff --git a/nflg-wms-auth/src/main/resources/logback-spring.xml b/nflg-wms-auth/src/main/resources/logback-spring.xml index b8865fac..17b454b6 100644 --- a/nflg-wms-auth/src/main/resources/logback-spring.xml +++ b/nflg-wms-auth/src/main/resources/logback-spring.xml @@ -5,6 +5,10 @@ + + + + @@ -32,13 +36,40 @@ + + + http://192.168.163.83:3100/loki/api/v1/push + + + service_name = wms + app = ${appName} + profile = ${profile} + host = ${HOSTIP} + + + level = %level + thread = %thread + class = %logger + + + true + 5 + 10000 + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] %-5level %logger{50} - %msg %ex + + + - + + - + + \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPOrderDTO.java index aaea2097..66dcfcfa 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPOrderDTO.java @@ -53,4 +53,11 @@ public class SAPOrderDTO { * 在途数量 */ private BigDecimal transportNum; + + private String lbprt; + + /** + * 批次号 + */ + private String batchNo; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverNormalOrderSaveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverNormalOrderSaveItemQO.java index d3b97d05..2bd79d24 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverNormalOrderSaveItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverNormalOrderSaveItemQO.java @@ -1,5 +1,7 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import java.math.BigDecimal; @@ -17,21 +19,25 @@ public class DeliverNormalOrderSaveItemQO { /** * 订单号 */ + @NotBlank private String externalOrderNo; /** * 订单行号 */ + @NotBlank private String rowNo; /** * 机台编号 */ + @NotBlank private String workbenchNo; /** * 物料编号 */ + @NotBlank private String materialNo; /** @@ -57,17 +63,20 @@ public class DeliverNormalOrderSaveItemQO { /** * 本批数量 */ + @NotNull private BigDecimal batchNum; /** * 最小包装数量 */ + @NotNull private BigDecimal minPackageNum; /** * 标签数量 */ - private BigDecimal lableNum; + @NotNull + private Integer lableNum; /** * 批次号 @@ -78,4 +87,7 @@ public class DeliverNormalOrderSaveItemQO { * 序列号 */ private String indexNo; + + @NotBlank + private String lbprt; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SearchSAPOrderQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SearchSAPOrderQO.java index 5de51e42..a9d6170e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SearchSAPOrderQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SearchSAPOrderQO.java @@ -1,13 +1,22 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data public class SearchSAPOrderQO { + /** + * 订单类型，1：普通物料订单；2：钢构件订单 + */ + @NotNull + private Integer type; + /** * 供应商编号 */ + @NotBlank private String supplierNo; /** diff --git a/nflg-wms-gateway/pom.xml b/nflg-wms-gateway/pom.xml index 4a1fe716..452d5e7f 100644 --- a/nflg-wms-gateway/pom.xml +++ b/nflg-wms-gateway/pom.xml @@ -77,6 +77,10 @@ org.springframework.boot spring-boot-starter-actuator + + com.github.loki4j + loki-logback-appender + diff --git a/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/GateWayApplication.java b/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/GateWayApplication.java index e8207529..bfa8bd9a 100644 --- a/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/GateWayApplication.java +++ b/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/GateWayApplication.java @@ -14,7 +14,7 @@ public class GateWayApplication { public static void main(String[] args) { SpringApplication.run(GateWayApplication.class, args); - log.info("系统已启动"); + log.info("服务已启动"); } } diff --git a/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/definer/HostIpDefiner.java b/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/definer/HostIpDefiner.java new file mode 100644 index 00000000..2343c3fe --- /dev/null +++ b/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/definer/HostIpDefiner.java @@ -0,0 +1,19 @@ +package com.nflg.wms.gateway.definer; + +import ch.qos.logback.core.PropertyDefinerBase; +import ch.qos.logback.core.spi.PropertyDefiner; + +import java.net.InetAddress; +import java.net.UnknownHostException; + +public class HostIpDefiner extends PropertyDefinerBase implements PropertyDefiner { + + @Override + public String getPropertyValue() { + try { + return InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + return "unknown"; + } + } +} \ No newline at end of file diff --git a/nflg-wms-gateway/src/main/resources/application-sit.yml b/nflg-wms-gateway/src/main/resources/application-sit.yml new file mode 100644 index 00000000..71ba67a2 --- /dev/null +++ b/nflg-wms-gateway/src/main/resources/application-sit.yml @@ -0,0 +1,8 @@ +logging: + level: + root: info + com: + nflg: debug + alibaba: + cloud: + nacos: warn \ No newline at end of file diff --git a/nflg-wms-gateway/src/main/resources/logback-spring.xml b/nflg-wms-gateway/src/main/resources/logback-spring.xml index 03201774..79ffa39a 100644 --- a/nflg-wms-gateway/src/main/resources/logback-spring.xml +++ b/nflg-wms-gateway/src/main/resources/logback-spring.xml @@ -5,6 +5,10 @@ + + + + @@ -32,15 +36,42 @@ + + + http://192.168.163.83:3100/loki/api/v1/push + + + service_name = wms + app = ${appName} + profile = ${profile} + host = ${HOSTIP} + + + level = %level + thread = %thread + class = %logger + + + true + 5 + 10000 + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] %-5level %logger{50} - %msg %ex + + + - + + 0 512 - + + diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsNormalPrintOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsNormalPrintOrder.java index 04beab77..58598428 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsNormalPrintOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsNormalPrintOrder.java @@ -131,4 +131,6 @@ public class WmsNormalPrintOrder implements Serializable { * 最后更新时间 */ private LocalDateTime updateTime; + + private String lbprt; } diff --git a/nflg-wms-scheduled/pom.xml b/nflg-wms-scheduled/pom.xml index c080fe54..6f875284 100644 --- a/nflg-wms-scheduled/pom.xml +++ b/nflg-wms-scheduled/pom.xml @@ -20,11 +20,6 @@ com.nflg nflg-wms-starter - - - - - com.sap.conn.jco sapjco3 @@ -36,6 +31,10 @@ tech.powerjob powerjob-worker + + com.github.loki4j + loki-logback-appender + diff --git a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/ScheduledApplication.java b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/ScheduledApplication.java index d809c171..64025c25 100644 --- a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/ScheduledApplication.java +++ b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/ScheduledApplication.java @@ -1,6 +1,5 @@ package com.nflg.wms.scheduled; -import com.sap.conn.jco.JCoException; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,9 +10,9 @@ import org.springframework.context.annotation.ComponentScan; @ComponentScan(basePackages = {"com.nflg.wms.scheduled","com.nflg.wms.starter","com.nflg.wms.repository"}) public class ScheduledApplication { - public static void main(String[] args) throws JCoException { + public static void main(String[] args) { SpringApplication.run(ScheduledApplication.class, args); - log.info("启动成功"); + log.info("服务已启动"); // SapService sapService=SpringUtil.getBean(SapService.class); // sapService.syncFrom("1010", List.of("0007"), LocalDateTime.now().minusMonths(1), LocalDateTime.now()); diff --git a/nflg-wms-scheduled/src/main/resources/application-prod.yml b/nflg-wms-scheduled/src/main/resources/application-prod.yml index 182b1fd1..9c8ff29b 100644 --- a/nflg-wms-scheduled/src/main/resources/application-prod.yml +++ b/nflg-wms-scheduled/src/main/resources/application-prod.yml @@ -5,6 +5,4 @@ logging: nflg: debug alibaba: cloud: - nacos: info - org: - springframework: info \ No newline at end of file + nacos: info \ No newline at end of file diff --git a/nflg-wms-scheduled/src/main/resources/application-sit.yml b/nflg-wms-scheduled/src/main/resources/application-sit.yml index 7dd3ba80..14c650df 100644 --- a/nflg-wms-scheduled/src/main/resources/application-sit.yml +++ b/nflg-wms-scheduled/src/main/resources/application-sit.yml @@ -5,6 +5,4 @@ logging: nflg: debug alibaba: cloud: - nacos: debug - org: - springframework: debug \ No newline at end of file + nacos: debug \ No newline at end of file diff --git a/nflg-wms-scheduled/src/main/resources/logback-spring.xml b/nflg-wms-scheduled/src/main/resources/logback-spring.xml index e0204478..da22bfb6 100644 --- a/nflg-wms-scheduled/src/main/resources/logback-spring.xml +++ b/nflg-wms-scheduled/src/main/resources/logback-spring.xml @@ -5,6 +5,10 @@ + + + + @@ -45,17 +49,45 @@ true + + + http://192.168.163.83:3100/loki/api/v1/push + + + service_name = wms + app = ${appName} + profile = ${profile} + host = ${HOSTIP} + + + level = %level + thread = %thread + class = %logger + + + true + 5 + 10000 + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] %-5level %logger{50} - %msg %ex + + + - + + - + + - + + \ No newline at end of file diff --git a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/definer/HostIpDefiner.java b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/definer/HostIpDefiner.java new file mode 100644 index 00000000..dbdb550d --- /dev/null +++ b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/definer/HostIpDefiner.java @@ -0,0 +1,19 @@ +package com.nflg.wms.starter.definer; + +import ch.qos.logback.core.PropertyDefinerBase; +import ch.qos.logback.core.spi.PropertyDefiner; + +import java.net.InetAddress; +import java.net.UnknownHostException; + +public class HostIpDefiner extends PropertyDefinerBase implements PropertyDefiner { + + @Override + public String getPropertyValue() { + try { + return InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + return "unknown"; + } + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index e43408fb..4817c605 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ 3.3.0 5.1.1 3.5.3 + 2.0.0 @@ -173,6 +174,11 @@ javase ${zxing.version} + + com.github.loki4j + loki-logback-appender + ${loki-logback-appender.version} +