From 827d7b6c45708e63a2717eb173ecb7a2f62ba170 Mon Sep 17 00:00:00 2001
From: minuk926 <minuk926@gmail.com>
Date: Mon, 11 Jul 2022 17:29:25 +0900
Subject: [PATCH] fix: sql log format fix      CUD return int fix      local
 yml fix

---
 .../v2/controller/CtgyFileMgtController.java  |  4 +-
 .../config/database/BaseMpowerDaoSupport.java |  7 +--
 .../resources/config/application-local.yml    | 54 +++----------------
 3 files changed, 13 insertions(+), 52 deletions(-)

diff --git a/src/main/java/com/xit/biz/ctgy/v2/controller/CtgyFileMgtController.java b/src/main/java/com/xit/biz/ctgy/v2/controller/CtgyFileMgtController.java
index 4ee454e..ded33c3 100644
--- a/src/main/java/com/xit/biz/ctgy/v2/controller/CtgyFileMgtController.java
+++ b/src/main/java/com/xit/biz/ctgy/v2/controller/CtgyFileMgtController.java
@@ -82,7 +82,7 @@ public class CtgyFileMgtController {
 
         String absFile = "";
 
-        if (Arrays.asList(env.getActiveProfiles()).contains("prod"))
+        if (Arrays.asList(env.getActiveProfiles()).contains("local"))
             absFile = dto.getInFileurl() + File.separator + dto.getInFilename();
         else
             absFile = rootPath + dto.getInFileurl().split(serviceUrl)[1] + File.separator + dto.getInFilename();
@@ -129,7 +129,7 @@ public class CtgyFileMgtController {
 
         String absFile = "";
 
-        if (Arrays.asList(env.getActiveProfiles()).contains("prod"))
+        if (Arrays.asList(env.getActiveProfiles()).contains("local"))
             absFile = entity.getInFileurl() + File.separator + entity.getInFilename();
         else
             absFile = rootPath + entity.getInFileurl().split(serviceUrl)[1] + File.separator + entity.getInFilename();
diff --git a/src/main/java/com/xit/core/config/database/BaseMpowerDaoSupport.java b/src/main/java/com/xit/core/config/database/BaseMpowerDaoSupport.java
index 656bbb5..ebda94a 100644
--- a/src/main/java/com/xit/core/config/database/BaseMpowerDaoSupport.java
+++ b/src/main/java/com/xit/core/config/database/BaseMpowerDaoSupport.java
@@ -334,7 +334,7 @@ public abstract class BaseMpowerDaoSupport {
     }
 
     private String getQueryXml(String syntax, String sql){
-        log.info(sql);
+        log.info("\n{}",sql);
         return String.format(
                 "%s%s%s%s%s%s%s",
                 "<?xml version='1.0' encoding='euc-kr'?>\n<QUERYS DBNAME='",
@@ -369,6 +369,7 @@ public abstract class BaseMpowerDaoSupport {
         Objects.requireNonNull(sql, "SQL cannot be null");
 
         Client client = null;
+        int rtn = 0;
         try {
             client = getConnection();
             client.setInput("SQLXML", getQueryXml(syntax, sql));
@@ -377,11 +378,11 @@ public abstract class BaseMpowerDaoSupport {
             String result = client.getString("result", 0, 0);
 
             if (result.equals("true")){
-                System.out.println("<<<<<<<<<<<<===========#$#$#$$##$#$$#$#$$$$$$$====>>>>>>>>>");
+                rtn = 1;
             }else{
                 throw new MpowerException("SQL 오류::"+result);
             }
-            return 1;
+            return rtn;
 
         }catch (MpowerException e){
             throw e;
diff --git a/src/main/resources/config/application-local.yml b/src/main/resources/config/application-local.yml
index 67ed68f..6b32c26 100644
--- a/src/main/resources/config/application-local.yml
+++ b/src/main/resources/config/application-local.yml
@@ -8,66 +8,26 @@ spring:
   sql:
     init:
       mode: always
-      platform: h2 #postgres
+      platform: oracle
       #schema-locations: classpath:/data/h2/schema.sql
       #data-locations:
       #  - classpath:/data/h2/TRAFFIC_MIN_USERINFO.sql
       #  - classpath:/data/h2/TRAFFIC_MIN_SIMSA_USER680.sql
       
-  # ==================================================================================================================
-  # database setting
-  # ==================================================================================================================
-  datasource:
-#    driver-class-name: org.postgresql.Driver #org.h2.Driver
-#    url: jdbc:postgresql://localhost:5432/bustms
-#    username: traffic
-#    password: xhdgkq0
-    
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:xitdb;MODE=Oracle;DATABASE_TO_LOWER=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    username: sa
-    password: ''
-    
-    hikari:
-      driver-class-name: ${spring.datasource.driver-class-name}
-      jdbc-url: ${spring.datasource.url}
-      username: ${spring.datasource.username}
-      password: ${spring.datasource.password}
-      read-only: false
-  
-  # ==================================================================================================================
-  # JPA setting
-  # ==================================================================================================================
-  jpa:
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
-    #show-sql: false
-    properties:
-      hibernate:
-        hbm2ddl:
-          # create / create-drop / update / validate / none
-          auto: create-drop
-          
-  h2:
-    console:
-      enabled: true
-      path: /h2-console
-
 # ==================================================================================================================
-# JPA logging lib setting
+# logging lib setting
 # ==================================================================================================================
-decorator:
-  datasource:
-    p6spy:
-      enable-logging: true
 logging:
   level:
     # spring.mvc.log-request-details=debug 활성화
     web: debug
     root: info
-    # hibernate sql log 출력시 변수 바인딩
     org:
-      #hibernate:
-        #type: trace
+      springframework:
+        transaction:
+          interceptor: TRACE
+        orm:
+          jpa: TRACE
 
 # ==================================================================================================================
 # Spring-doc 활성