Merge branch 'master' into jenkins_with_weblogic

build.gradle

@@ -7,16 +7,15 @@ plugins {
 	id 'net.researchgate.release' version '3.0.2'
 }
 
+def nexusUrl = "https://nexus.eactive.synology.me:8090"
 def springVersion = "5.3.27"
 //def quartzVersion = "2.2.1"
 def queryDslVersion = "5.0.0"
 def hibernateVersion = "5.6.15.Final"
 
-def nexusUrl = "https://nexus.eactive.synology.me:8090"
 def generatedJavaDir = "$buildDir/generated/java"
 def generatedTestJavaDir = "$buildDir/generated-test/java"
 
-
 java {
 	toolchain {
 		languageVersion = JavaLanguageVersion.of(8)

src/main/java/com/eactive/eai/data/entity/onl/authoutbound/OutboundOAuthCredential.java

@@ -18,7 +18,7 @@ public class OutboundOAuthCredential extends AbstractEntity<String> {
     @Comment("대상 어댑터 그룹 명")
     private String adapterGroupName;
 
-    @Column(name = "grant_type", nullable = false)
+    @Column(name = "grant_type", nullable = true)
     @Comment("인증 방식. 현재 \"client_credentials\"만 사용")
     private String grantType;
 
@@ -26,11 +26,11 @@ public class OutboundOAuthCredential extends AbstractEntity<String> {
     @Comment("토큰 발급 거래 URL")
     private String url;
 
-    @Column(name = "client_id", nullable = false)
+    @Column(name = "client_id", nullable = true)
     @Comment("클라이언트 ID. OAuth 인증 시 사용")
     private String clientId;
 
-    @Column(name = "client_secret", nullable = false)
+    @Column(name = "client_secret", nullable = true)
     @Comment("클라이언트 시크릿. OAuth 인증 시 사용")
     private String clientSecret;
 
@@ -58,6 +58,18 @@ public class OutboundOAuthCredential extends AbstractEntity<String> {
     @Comment("최종 업데이트 날짜와 시간. 레코드가 마지막으로 업데이트된 시간")
     private LocalDateTime updatedAt;
 
+    @Column(name = "content_type")
+    @Comment("토큰발급 거래 content-type")
+    private String contentType;
+
+    @Column(name = "header_json")
+    @Comment("Http Header 추가 셋팅")
+    private String headerJson;
+
+    @Column(name = "body_json")
+    @Comment("Http Body 추가 셋팅")
+    private String bodyJson;
+
     @Override
     public @NonNull String getId() {
         return adapterGroupName;