diff --git a/pom.xml b/pom.xml index 4fdeda2..b002c17 100644 --- a/pom.xml +++ b/pom.xml @@ -361,6 +361,7 @@ + ctp-service org.springframework.boot diff --git a/src/main/java/com/utopiaindustries/model/ctp/BarcodeStickerSize.java b/src/main/java/com/utopiaindustries/model/ctp/BarcodeStickerSize.java index 6cb8c17..78a3d7a 100644 --- a/src/main/java/com/utopiaindustries/model/ctp/BarcodeStickerSize.java +++ b/src/main/java/com/utopiaindustries/model/ctp/BarcodeStickerSize.java @@ -5,7 +5,8 @@ public enum BarcodeStickerSize { SIZE_1_5_X_3( 3 * 72, 1.5f * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7), SIZE_2_X_3( 3 * 72, 2 * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7), SIZE_4_X_4( 4 * 72, 4 * 72, 8, 8, 8, 8, 200, 100, 250, 250, 14, 9, 7), - SIZE_1_75_X_3_5( 7f * 72, 4f * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7); + SIZE_1_75_X_3_5( 3.5f * 72, 1.75f * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7), + SIZE_4_X_7( 7f * 72, 4f * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7); private final float width; diff --git a/src/main/java/com/utopiaindustries/service/BarcodeService.java b/src/main/java/com/utopiaindustries/service/BarcodeService.java index ccb7202..b7ee32d 100644 --- a/src/main/java/com/utopiaindustries/service/BarcodeService.java +++ b/src/main/java/com/utopiaindustries/service/BarcodeService.java @@ -43,7 +43,7 @@ public class BarcodeService { * generate barcodes here * */ public void generateBarcodes(List ids, String artifactType) throws Exception { - String size = BarcodeStickerSize.SIZE_1_75_X_3_5.name(); + String size = BarcodeStickerSize.SIZE_4_X_7.name(); BarcodeStickerSize stickerSize = BarcodeStickerSize.getSize(size); List list = new ArrayList<>(); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 85fee79..3d84f5b 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -14,11 +14,11 @@ spring: enabled: true cache: period: 0 - static-locations: file:./src/main/resources/static/ + static-locations: classpath:/static/ thymeleaf: check-template-location: true cache: false - prefix: file:./src/main/resources/templates/ + prefix: classpath:/templates/ uinddatasource: jdbcUrl: jdbc:mysql://192.168.90.108:3306/uind_vms username: utopia