dev

pom.xml

@@ -78,6 +78,11 @@
             <artifactId>ojdbc7</artifactId>
             <version>12.1.0.2</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.oracle.database.jdbc</groupId>-->
+<!--            <artifactId>ojdbc8</artifactId>-->
+<!--            <version>19.3.0.0</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.tibero</groupId>
@@ -125,8 +130,24 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <!-- FOR oracle 19c -->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.hibernate</groupId>-->
+<!--                    <artifactId>hibernate-core</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+            <!-- FOR oracle 19c -->
         </dependency>
 
+        <!-- FOR oracle 19c -->
+<!--        <dependency>-->
+<!--            <groupId>org.hibernate</groupId>-->
+<!--            <artifactId>hibernate-core</artifactId>-->
+<!--            <version>5.4.10.Final</version>-->
+<!--        </dependency>-->
+        <!-- FOR oracle 19c -->
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>

src/main/java/com/its/op/config/ApplicationContextProvider.java

@@ -15,10 +15,22 @@ public class ApplicationContextProvider implements ApplicationContextAware {
     private ApplicationContextProvider() {
     }
 
-    public void setApplicationContext(ApplicationContext ctx) throws BeansException {
+    private static void setApplication(ApplicationContext ctx) {
         applicationContext = ctx;
-        applicationId = ctx.getId();
-        environment = ctx.getEnvironment();
+    }
+    private static void setApplicationId(String id) {
+        applicationId = id;
+    }
+    private static void setEnvironment(Environment env) {
+        environment = env;
+    }
+    public void setApplicationContext(ApplicationContext ctx) throws BeansException {
+        setApplication(ctx);
+        setApplicationId(ctx.getId());
+        setEnvironment(ctx.getEnvironment());
+//        applicationContext = ctx;
+//        applicationId = ctx.getId();
+//        environment = ctx.getEnvironment();
     }
 
     public static ApplicationContext getApplicationContext() {

src/main/java/com/its/op/controller/ReloadDatabaseController.java

@@ -27,7 +27,7 @@ import com.its.op.entity.its.wcam.TbWcamCtlr;
 import com.its.op.global.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @Slf4j
-@RequiredArgsConstructor
+@AllArgsConstructor
 @Validated
 @RestController
 @RequestMapping("/api/reload")

src/main/java/com/its/op/global/CmmnCdManager.java

@@ -159,6 +159,9 @@ public class CmmnCdManager {
         }
     }
 
+    private static void setCodes(ConcurrentHashMap<String, HashMap<String, Code>> codeMap) {
+        codes = codeMap;
+    }
     public List<TbCmmnCd> reload() {
         ConcurrentHashMap<String, HashMap<String, Code>> tempMap = new ConcurrentHashMap<>();
         List<TbCmmnCd> codeList = this.repo.findAll();
@@ -179,7 +182,8 @@ public class CmmnCdManager {
                 codeMap.put(cd.getCmmnCd(), new Code(cd.getCmmnCd(), cd.getCmmnCdKorNm(), cd.getCmmnDescEnglNm()));
             }
         }
-        codes = tempMap;
+        setCodes(tempMap);
+        //codes = tempMap;
 
         return codeList;
     }
@@ -205,7 +209,8 @@ public class CmmnCdManager {
                 codeMap.put(cd.getCmmnCd(), new Code(cd.getCmmnCd(), cd.getCmmnCdKorNm(), cd.getCmmnDescEnglNm()));
             }
         }
-        codes = tempMap;
+        setCodes(tempMap);
+        //codes = tempMap;
     }
 
     public void merge(TbCmmnCdDto cd) {

src/main/java/com/its/op/global/CmmnFcltCdManager.java

@@ -74,6 +74,21 @@ public class CmmnFcltCdManager {
         }
     }
 
+    private static void setCodeFailOcrrType(ConcurrentHashMap<String, TbFcltFailOcrrTypeDto> codeMap) {
+        codeFailOcrrType = codeMap;
+    }
+    private static void setCodeFailType(ConcurrentHashMap<String, TbFcltFailTypeDto> codeMap) {
+        codeFailType = codeMap;
+    }
+    private static void setCodeFailTypeAct(ConcurrentHashMap<String, TbFcltFailTypeActDto> codeMap) {
+        codeFailTypeAct = codeMap;
+    }
+    private static void setCodeFcltSubj(ConcurrentHashMap<Long, TbFcltSubjDto> codeMap) {
+        codeFcltSubj = codeMap;
+    }
+    private static void setCodeFcltSubjPart(ConcurrentHashMap<Long, TbFcltSubjPartDto> codeMap) {
+        codeFcltSubjPart = codeMap;
+    }
     public List<TbFcltFailOcrrType> reload() {
         ConcurrentHashMap<String, TbFcltFailOcrrTypeDto> tempCodeFailOcrrType = new ConcurrentHashMap<>();
         ConcurrentHashMap<String, TbFcltFailTypeDto> tempCodeFailType = new ConcurrentHashMap<>();
@@ -111,11 +126,16 @@ public class CmmnFcltCdManager {
             tempCodeFcltSubjPart.put(code.getPartNmbr(), code);
         }
 
-        codeFailOcrrType = tempCodeFailOcrrType;
-        codeFailType = tempCodeFailType;
-        codeFailTypeAct = tempCodeFailTypeAct;
-        codeFcltSubj = tempCodeFcltSubj;
-        codeFcltSubjPart = tempCodeFcltSubjPart;
+        setCodeFailOcrrType(tempCodeFailOcrrType);
+        setCodeFailType(tempCodeFailType);
+        setCodeFailTypeAct(tempCodeFailTypeAct);
+        setCodeFcltSubj(tempCodeFcltSubj);
+        setCodeFcltSubjPart(tempCodeFcltSubjPart);
+//        codeFailOcrrType = tempCodeFailOcrrType;
+//        codeFailType = tempCodeFailType;
+//        codeFailTypeAct = tempCodeFailTypeAct;
+//        codeFcltSubj = tempCodeFcltSubj;
+//        codeFcltSubjPart = tempCodeFcltSubjPart;
 
         return codeList1;
     }
@@ -128,7 +148,8 @@ public class CmmnFcltCdManager {
         for (TbFcltFailOcrrTypeDto code : codeList1) {
             tempCodeFailOcrrType.put(code.getFailOcrrCd(), code);
         }
-        codeFailOcrrType = tempCodeFailOcrrType;
+        setCodeFailOcrrType(tempCodeFailOcrrType);
+        //codeFailOcrrType = tempCodeFailOcrrType;
     }
     public void updateFailOcrrType(TbFcltFailOcrrTypeDto code) {
         codeFailOcrrType.put(code.getFailOcrrCd(), code);
@@ -142,7 +163,8 @@ public class CmmnFcltCdManager {
         for (TbFcltFailTypeDto code : codeList2) {
             tempCodeFailType.put(code.getFailCd(), code);
         }
-        codeFailType = tempCodeFailType;
+        setCodeFailType(tempCodeFailType);
+        //codeFailType = tempCodeFailType;
     }
     public void updateFailType(TbFcltFailTypeDto code) {
         codeFailType.put(code.getFailCd(), code);
@@ -156,7 +178,8 @@ public class CmmnFcltCdManager {
         for (TbFcltFailTypeActDto code : codeList3) {
             tempCodeFailTypeAct.put(code.getFailActCd(), code);
         }
-        codeFailTypeAct = tempCodeFailTypeAct;
+        setCodeFailTypeAct(tempCodeFailTypeAct);
+        //codeFailTypeAct = tempCodeFailTypeAct;
     }
     public void updateFailTypeAct(TbFcltFailTypeActDto code) {
         codeFailTypeAct.put(code.getFailActCd(), code);
@@ -170,7 +193,8 @@ public class CmmnFcltCdManager {
         for (TbFcltSubjDto code : codeList4) {
             tempCodeFcltSubj.put(code.getSubjNmbr(), code);
         }
-        codeFcltSubj = tempCodeFcltSubj;
+        setCodeFcltSubj(tempCodeFcltSubj);
+        //codeFcltSubj = tempCodeFcltSubj;
     }
     public void updateSubj(TbFcltSubjDto code) {
         codeFcltSubj.put(code.getSubjNmbr(), code);
@@ -187,7 +211,8 @@ public class CmmnFcltCdManager {
         for (TbFcltSubjPartDto code : codeList5) {
             tempCodeFcltSubjPart.put(code.getPartNmbr(), code);
         }
-        codeFcltSubjPart = tempCodeFcltSubjPart;
+        setCodeFcltSubjPart(tempCodeFcltSubjPart);
+        //codeFcltSubjPart = tempCodeFcltSubjPart;
     }
     public void updateSubPart(TbFcltSubjPartDto code) {
         codeFcltSubjPart.put(code.getPartNmbr(), code);

src/main/java/com/its/op/service/its/cctv/CctvControlService.java

@@ -81,8 +81,16 @@ public class CctvControlService {
         }
         return requestHttpPostProbe(result, controlUri, controlData, ipAddr, userId, userPswd);
     }
+
+    private String getEncodeCommand(String userId, String userPswd) {
+        String encoding;
+        String command = userId + ":" + userPswd;
+        encoding = Base64.getEncoder().encodeToString(command.getBytes(StandardCharsets.UTF_8));
+        return encoding;
+    }
     public CctvControlDto.CctvControlRes requestHttpPostProbe(CctvControlDto.CctvControlRes result, String controlUri, byte[] controlData, String ipAddr, String userId, String userPswd) {
-        String encoding = Base64.getEncoder().encodeToString((userId + ":" + userPswd).getBytes());
+        //String encoding = Base64.getEncoder().encodeToString((userId + ":" + userPswd).getBytes());
+        String encoding = getEncodeCommand(userId, userPswd);
         String apiUrl = "http://" + ipAddr + controlUri;
         log.info("{}, Basis: {}", apiUrl, encoding);
 
@@ -147,7 +155,8 @@ public class CctvControlService {
         return result;
     }
     public CctvControlDto.CctvControlRes requestHttpPostProbe2(CctvControlDto.CctvControlRes result, String controlUri, String controlData, String ipAddr, String userId, String userPswd) {
-        String encoding = Base64.getEncoder().encodeToString((userId + ":" + userPswd).getBytes());
+        //String encoding = Base64.getEncoder().encodeToString((userId + ":" + userPswd).getBytes());
+        String encoding = getEncodeCommand(userId, userPswd);
         String apiUrl = "http://" + ipAddr + controlUri;
         log.info("{}, Basis: {}", apiUrl, encoding);
 
@@ -187,7 +196,8 @@ public class CctvControlService {
             //connection.setDefaultUseCaches(false);
 
             DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
-            wr.write(controlData.getBytes());
+            //wr.write(controlData.getBytes());
+            wr.write(controlData.getBytes(StandardCharsets.UTF_8));
             wr.flush();
             wr.close();
 
@@ -272,7 +282,8 @@ public class CctvControlService {
      * @return
      */
     public CctvControlDto.CctvControlRes requestHttpPostZeno(CctvControlDto.CctvControlRes result, byte[] controlData, String ipAddr, String userId, String userPswd) {
-        String encoding = Base64.getEncoder().encodeToString((userId + ":" + userPswd).getBytes());
+        //String encoding = Base64.getEncoder().encodeToString((userId + ":" + userPswd).getBytes());
+        String encoding = getEncodeCommand(userId, userPswd);
         String apiUrl = "http://" + ipAddr + "/cgi-bin/admin/uartctrl.cgi";
         log.info("{}, Basis: {}, {}", apiUrl, encoding, SysUtils.byteArrayToHex(controlData));
 
@@ -519,7 +530,8 @@ public class CctvControlService {
             //conn.setRequestProperty("Connection", "keep-alive");
             conn.setDoOutput(true);
 
-            out = new OutputStreamWriter(conn.getOutputStream());
+            //out = new OutputStreamWriter(conn.getOutputStream());
+            out = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8);
             bw = new BufferedWriter(out);
                 // JSON 형식의 데이터 셋팅
 //            JSONObject commands = new JSONObject();
@@ -536,7 +548,8 @@ public class CctvControlService {
             // 보내고 결과값 받기
             int responseCode = conn.getResponseCode();
             if (responseCode == HttpURLConnection.HTTP_OK) {
-                try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+                try (//BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+                     BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
                 ) {
                     StringBuilder sb = new StringBuilder();
                     String line = "";

src/main/java/com/its/op/service/its/cctv/CctvControlZenoService.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -72,7 +73,8 @@ public class CctvControlZenoService {
                 cmd[6] = (byte)cmdSpeed;
                 cmd[8] = (byte)cmdTime;
                 String psetName = "preset " + cmdPsetNmbr;
-                byte[] byteName = psetName.getBytes();
+                //byte[] byteName = psetName.getBytes();
+                byte[] byteName = psetName.getBytes(StandardCharsets.UTF_8);
                 System.arraycopy(byteName, 0, cmd, 10, byteName.length);
             }
             return cmd;

src/main/java/com/its/op/xnetudp/thread/CenterCommServerReceiver.java

@@ -20,6 +20,7 @@ import org.springframework.web.socket.TextMessage;
 import javax.annotation.PostConstruct;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -55,10 +56,12 @@ public class CenterCommServerReceiver {
                     byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
                     byte[] recvTm  = new byte[CENTER_COMM_DEFINE.INT_TRAFFIC_TIME_SIZE];
                     byteBuffer.get(recvTm);
-                    prcsTm = new String(recvTm);
+                    //prcsTm = new String(recvTm);
+                    prcsTm = new String(recvTm, StandardCharsets.UTF_8);
                     if (data.getLength() >= (CENTER_COMM_DEFINE.INT_TRAFFIC_TIME_SIZE+CENTER_COMM_DEFINE.INT_TRAFFIC_TIME_SIZE)) {
                         byteBuffer.get(recvTm);
-                        currTm = new String(recvTm);
+                        //currTm = new String(recvTm);
+                        currTm = new String(recvTm, StandardCharsets.UTF_8);
                     }
                 }
 
@@ -108,14 +111,17 @@ public class CenterCommServerReceiver {
                         byte[] saveDt  = new byte[CENTER_COMM_DEFINE.INT_VMS_MAX_DATETIME];
                         byteBuffer.get(saveDt);
                         // VMS 폼을 데이터베이스에 저장(다운로드 결과는 알수 없음)
-                        log.info("@@@ RECV VMS Server Message: INT_OP_VMS_FORM_SAVE: SaveTime: {}", new String(saveDt));
+                        String command = "form-save";
+                        //String notifyTm = new String(saveDt);
+                        String notifyTm = new String(saveDt, StandardCharsets.UTF_8);
+                        log.info("@@@ RECV VMS Server Message: INT_OP_VMS_FORM_SAVE: SaveTime: {}", notifyTm);
                         NotifyDto notifyDto1 = NotifyDto.builder()
-                                .notify("form-save")
-                                .notifyTm(new String(saveDt))
+                                .notify(command)
+                                .notifyTm(notifyTm)
                                 .notifyCount(0)
-                                .notifyMsg("form-save")
+                                .notifyMsg(command)
                                 .build();
-                        ItsWebSocketMessage socketMessage1 = new ItsWebSocketMessage("form-save", notifyDto1);
+                        ItsWebSocketMessage socketMessage1 = new ItsWebSocketMessage(command, notifyDto1);
                         try {
                             String jsonData = this.mapper.writeValueAsString(socketMessage1);
                             this.itsWebSocketSessionManager.sendBroadcastMessage(socketMessage1.getCommand(), new TextMessage(jsonData));

src/main/java/com/its/utils/AES256Util.java

@@ -7,6 +7,7 @@ import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.*;
 
 public class AES256Util {
@@ -41,7 +42,8 @@ public class AES256Util {
             NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException,
             IllegalBlockSizeException, BadPaddingException{
         Cipher c = Cipher.getInstance("AES/CBC/PKCS5Padding");
-        c.init(Cipher.ENCRYPT_MODE, keySpec, new IvParameterSpec(iv.getBytes()));
+        //c.init(Cipher.ENCRYPT_MODE, keySpec, new IvParameterSpec(iv.getBytes()));
+        c.init(Cipher.ENCRYPT_MODE, keySpec, new IvParameterSpec(iv.getBytes(StandardCharsets.UTF_8)));
         byte[] encrypted = c.doFinal(str.getBytes("UTF-8"));
         return encrypted;
     }
@@ -60,7 +62,8 @@ public class AES256Util {
 
         try {
             MessageDigest msgDigest = MessageDigest.getInstance("SHA-256");
-            msgDigest.update(str.getBytes());
+            //msgDigest.update(str.getBytes());
+            msgDigest.update(str.getBytes(StandardCharsets.UTF_8));
             byte byteData[] = msgDigest.digest();
             StringBuffer builder = new StringBuffer();
 

src/main/java/com/its/utils/SHA256Util.java

@@ -1,5 +1,6 @@
 package com.its.utils;
 
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -14,7 +15,8 @@ public class SHA256Util {
         StringBuilder sb = new StringBuilder();
         try {
             MessageDigest md = MessageDigest.getInstance(algorithm);
-            md.update(text.getBytes());
+            //md.update(text.getBytes());
+            md.update(text.getBytes(StandardCharsets.UTF_8));
             byte[] data = md.digest();
             for (byte b : data) {
                 sb.append(String.format("%02x", b & 0xFF));
@@ -28,7 +30,8 @@ public class SHA256Util {
     public static String encrypt2(String planText) {
         try {
             MessageDigest md = MessageDigest.getInstance("SHA-256");
-            md.update(planText.getBytes());
+            //md.update(planText.getBytes());
+            md.update(planText.getBytes(StandardCharsets.UTF_8));
             byte byteData[] = md.digest();
             StringBuffer sb = new StringBuffer();
             for (int i = 0; i < byteData.length; i++) {
@@ -54,7 +57,8 @@ public class SHA256Util {
             SecureRandom random = SecureRandom.getInstance(saltAlgorithm);
             byte[] data = new byte[20];
             random.nextBytes(data);
-            salt = new String(Base64.getEncoder().encode(data));
+            //salt = new String(Base64.getEncoder().encode(data));
+            salt = new String(Base64.getEncoder().encode(data), StandardCharsets.UTF_8);
         } catch (NoSuchAlgorithmException e) {
             throw new RuntimeException();
         }
@@ -66,7 +70,8 @@ public class SHA256Util {
         StringBuffer sb = new StringBuffer();
         try {
             MessageDigest md = MessageDigest.getInstance(algorithm);
-            md.update(saltText.getBytes());
+            //md.update(saltText.getBytes());
+            md.update(saltText.getBytes(StandardCharsets.UTF_8));
             byte[] data = md.digest();
             for (byte b : data) {
                 sb.append(String.format("%02x", b & 0xFF));

src/main/java/com/its/utils/SysUtils.java

@@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -110,10 +111,12 @@ public final class SysUtils
 	}
 
 	public static byte[] stringToByteArray(String data) {
-		return data.getBytes();
+		//return data.getBytes();
+		return data.getBytes(StandardCharsets.UTF_8);
 	}
 	public static void copyStringToByteArray(byte[] dest, int length, String data) {
-		byte[] byteData = data.getBytes();
+		//byte[] byteData = data.getBytes();
+		byte[] byteData = data.getBytes(StandardCharsets.UTF_8);
 		int size = dest.length;
 		int ii;
 		for (ii = 0; ii < byteData.length && ii < size; ii++) {

src/main/resources/application.yml

@@ -63,8 +63,12 @@ spring:
     hikari:
       auto-commit: true
       connection-test-query: SELECT 1 FROM DUAL
+      # 기본 설정
       minimum-idle: 10
-      #maximum-pool-size: 50
+      maximum-pool-size: 30
+      # 커넥션 풀이 가변크기 모드로 작동하도록 설정
+      idle-timeout: 60000
+      max-lifetime: 180000
       pool-name: pool-its-op-server
   jpa:
     #database: Oracle
@@ -76,8 +80,8 @@ spring:
       hibernate:
         synonyms: true
         default_batch_fetch_size: 1000
-        format_sql: false
-        use_sql_columns: false
+        format_sql: true
+        use_sql_columns: true
         hbm2ddl.auto: validate
         implicit_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
         physical_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
@@ -87,6 +91,9 @@ spring:
 
 logging:
   level:
+    #root: DEBUG
+    #org.hibernate: DEBUG
+    #org.springframework: INFO
     org.hibernate.SQL: ERROR
     org.hibernate.type: ERROR # 파라미터 보여준다.
     org:
@@ -119,22 +126,20 @@ spring:
       username: ptatms
       password: ptatms
       connection-test-query: SELECT 1 FROM DUAL
-      minimumIdle: 5
-      maximumIdle: 10
-      maximumPoolSize: 20
+#      minimumIdle: 5
+#      maximumIdle: 10
+#      maximumPoolSize: 20
       idleTimeout: 30000
       connectTimeout: 10000
   jpa:
-    database: oracle
     database-platform: org.hibernate.dialect.Oracle12cDialect
+    #database-platform: org.hibernate.dialect.Oracle19cDialect
     #org.hibernate.dialect.Oracle10gDialect
     #org.hibernate.dialect.Oracle12cDialect
-    hibernate:
-      ddl-auto: none
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle12cDialect
-
+        #dialect: org.hibernate.dialect.Oracle19cDialect
 
 ---
 spring:

src/main/resources/log4jdbc.log4j2.properties

@@ -1,2 +1,3 @@
 log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator
 log4jdbc.dump.sql.maxlinelength=0
+#log4jdbc.level=DEBUG

src/test/java/com/its/op/ItsOpServerApplicationTests.java

@@ -7,13 +7,14 @@ import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
 import org.jasypt.salt.StringFixedSaltGenerator;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 @Slf4j
-@SpringBootTest
+//@SpringBootTest
+@ActiveProfiles(profiles = "dev")
 public class ItsOpServerApplicationTests {
 
     @Test