UIND
/
cut-to-pack-service
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add dev and prod yml file and change the printer ip #4

Merged
saif.haq merged 2 commits from properties-config into main 2025-01-21 12:08:56 +00:00
Conversation 0 Commits 2 Files Changed 5
5 changed files with 81 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java
View File

@ -38,7 +38,7 @@ public class UserDAO {
return namedParameterJdbcTemplate.query( SELECT_BY_USERNAME, params, new UserRowMapper() )
.stream()
.findAny()
.orElse( new User() );
.orElse( null );
}
public List<User> findAll() {

11
src/main/java/com/utopiaindustries/service/BarcodeService.java
View File

@ -13,6 +13,7 @@ import com.zebra.sdk.comm.TcpConnection;
import com.zebra.sdk.graphics.internal.ZebraImage;
import com.zebra.sdk.printer.ZebraPrinter;
import com.zebra.sdk.printer.ZebraPrinterFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.imageio.ImageIO;
@ -27,6 +28,12 @@ import java.util.List;
@Service
public class BarcodeService {
@Value("${ctp.printer.ipAdd}")
private String ipAddress;
@Value("${ctp.printer.port}")
private int port;
private final BundleDAO bundleDAO;
private final MasterBundleDAO masterBundleDAO;
private final FinishedItemDAO finishedItemDAO;
@ -123,9 +130,7 @@ public class BarcodeService {
}
public void printLabel( BufferedImage bufferedImage ) throws Exception {
String ipAddr = "192.168.90.160";
int port = 9100;
Connection connection = new TcpConnection( ipAddr, port );
Connection connection = new TcpConnection( ipAddress, port );
connection.open();
ZebraPrinter printer = ZebraPrinterFactory.getInstance( connection );
ZebraImage zebraImage = new ZebraImage( bufferedImage );

34
src/main/resources/application-dev.yml Normal file
View File

@ -0,0 +1,34 @@
spring:
uinddatasource:
jdbcUrl: jdbc:mysql://192.168.90.147:3306
username: utopia
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
logbackUrl: jdbc:mysql://192.168.90.147:3306/uind_logs?serverTimezone=Asia/Karachi
hikari:
maximum-pool-size: 5
pool-name: UINDMainPool
leak-detection-threshold: 2000
cosmosdatasource:
jdbcUrl: jdbc:mysql://192.168.90.147:3307
username: utopia
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 5
pool-name: UINDCosmosPool
leak-detection-threshold: 2000
localdatasource:
jdbcUrl: jdbc:mysql://192.168.90.147:3306/cut_to_pack
username: utopia
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 5
pool-name: CTPPool
leak-detection-threshold: 2000
ctp:
printer:
ipAdd: 192.168.90.160
port: 9100

34
src/main/resources/application-prod.yml Normal file
View File

@ -0,0 +1,34 @@
spring:
uinddatasource:
jdbcUrl: jdbc:mysql://localhost:3306
username: root
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
logbackUrl: jdbc:mysql://localhost:3306/uind_logs?serverTimezone=Asia/Karachi
hikari:
maximum-pool-size: 5
pool-name: UINDMainPool
leak-detection-threshold: 2000
cosmosdatasource:
jdbcUrl: jdbc:mysql://localhost:3307
username: root
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 5
pool-name: UINDCosmosPool
leak-detection-threshold: 2000
localdatasource:
jdbcUrl: jdbc:mysql://localhost:3306/cut_to_pack
username: root
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 5
pool-name: CTPPool
leak-detection-threshold: 2000
ctp:
printer:
ipAdd: 172.16.53.32
port: 9100

32
src/main/resources/application.yaml
View File

@ -1,8 +1,12 @@
application:
title: Cut To Pack Service
version: v1.0
name: application-dev
spring:
profiles:
active: dev
resources:
chain:
cache: false
@ -19,34 +23,6 @@ spring:
check-template-location: true
cache: false
prefix: classpath:/templates/
uinddatasource:
jdbcUrl: jdbc:mysql://192.168.90.108:3306/uind_vms
username: utopia
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
logbackUrl: jdbc:mysql://192.168.90.108:3306/uind_logs?serverTimezone=Asia/Karachi
hikari:
maximum-pool-size: 5
pool-name: UINDMainPool
leak-detection-threshold: 2000
cosmosdatasource:
jdbcUrl: jdbc:mysql://192.168.90.108:3307
username: utopia
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 5
pool-name: UINDCosmosPool
leak-detection-threshold: 2000
localdatasource:
jdbcUrl: jdbc:mysql://192.168.90.108:3306/cut_to_pack
username: utopia
password: Utopia01
driverClassName: com.mysql.cj.jdbc.Driver
hikari:
maximum-pool-size: 5
pool-name: CTPPool
leak-detection-threshold: 2000
server:
servlet: