shjung 2 年之前
父節點
當前提交
888c9536ec

+ 3 - 0
src/main/java/com/its/op/security/UserDetailsServiceImpl.java

@@ -28,6 +28,9 @@ public class UserDetailsServiceImpl implements UserDetailsService {
             //optUserInfr.get().setPswd((this.userRepo.getCryptoDecrypt(optUserInfr.get().getPwd())));
             optUserInfr.get().setPswd(optUserInfr.get().getPwd());
             return optUserInfr.get().toVo();
+//            List<GrantedAuthority> authorities = new ArrayList<>();
+//            authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
+//            return new User(integration.getClientToken(), integration.getClientSecret(), authorities);
         }
         else {
             throw new UsernameNotFoundException(userId + " 을(를) 찾을 수 없습니다.");

+ 6 - 23
src/main/resources/application.yml

@@ -43,6 +43,11 @@ spring:
   application:
     name: its-op-server
 
+  devtools:
+    livereload:
+      enabled: true
+  freemarker:
+    cache: false
   output:
     ansi:
       enabled: always
@@ -69,6 +74,7 @@ spring:
       # 커넥션 풀이 가변크기 모드로 작동하도록 설정
       idle-timeout: 60000
       max-lifetime: 180000
+      connection-timeout: 10000
       pool-name: pool-its-op-server
   jpa:
     #database: Oracle
@@ -114,23 +120,12 @@ spring:
   config:
     activate:
       on-profile: dev
-  devtools:
-    livereload:
-      enabled: true
-  freemarker:
-    cache: false
   datasource:
     hikari:
       driver-class-name: oracle.jdbc.OracleDriver
       jdbc-url: jdbc:oracle:thin:@115.91.94.42:1522:HANTE19C
       username: ptatms
       password: ptatms
-      connection-test-query: SELECT 1 FROM DUAL
-#      minimumIdle: 5
-#      maximumIdle: 10
-#      maximumPoolSize: 20
-      idleTimeout: 30000
-      connectTimeout: 10000
   jpa:
     database-platform: org.hibernate.dialect.Oracle12cDialect
     #database-platform: org.hibernate.dialect.Oracle19cDialect
@@ -146,24 +141,12 @@ spring:
   config:
     activate:
       on-profile: prod
-  devtools:
-    livereload:
-      enabled: true
-  freemarker:
-    cache: false
   datasource:
     hikari:
       driver-class-name: oracle.jdbc.OracleDriver
-      #jdbc-url: jdbc:oracle:thin:@172.19.10.25:1521:ptatms
       jdbc-url: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.19.10.25)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=172.19.10.26)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=ptatms)))
       username: ptatms
       password: ptatms
-      connection-test-query: SELECT 1 FROM DUAL
-      minimumIdle: 5
-      maximumIdle: 10
-      #maximumPoolSize: 20
-      idleTimeout: 30000
-      connectTimeout: 10000
   jpa:
     database-platform: org.hibernate.dialect.Oracle12cDialect
     properties:

+ 18 - 0
src/test/java/com/its/op/ItsOpServerApplicationTests.java

@@ -9,6 +9,8 @@ import org.jasypt.salt.StringFixedSaltGenerator;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.context.ActiveProfiles;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
@@ -16,12 +18,28 @@ import java.time.format.DateTimeFormatter;
 //@SpringBootTest
 @ActiveProfiles(profiles = "dev")
 public class ItsOpServerApplicationTests {
+//    @Autowired
+//    DefaultListableBeanFactory bf;
 
     @Test
     void encrypt() {
+//        for(String n : bf.getBeanDefinitionNames()){
+//            log.error("{}", n);
+//        }
         log.error("{}", SHA256Util.encrypt("1"));               // 6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b
         log.error("{}", SHA256Util.encrypt2("admin12#$!")); // 3de9f98e4b5b4e52ff7d78cfa3140cf23e2b33c5a3143d1b2d1048237c31593c
     }
+    @Test
+    public void testConnection() {
+        try (
+            Connection conn = DriverManager.getConnection("jdbc:oracle:thin:@115.91.94.42:1522:HANTE19C", "ptatms","ptatms");
+        ) {
+            log.info("XXXX: {}", conn);
+        } catch (Exception e) {
+            log.error("{}", e.getMessage());
+        }
+    }
+
     void reference1() {
         String name = "test";
         LocalDateTime ldt = LocalDateTime.now();