Merge branch 'master' into release/v0.1.0

f-lab-edu · Aug 8, 2024 · e65f530 · e65f530
2 parents 20c847b + fd8bda3
commit e65f530
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -29,6 +29,8 @@ WORKDIR /app
 
 COPY . /app
 RUN chmod +x ./gradlew
+
+WORKDIR /app/web
 RUN ./gradlew build -x test
 
 CMD ["java", "-jar", "-Dspring.profiles.active=product",  "build/libs/web-0.1.0.jar"]
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 allprojects {
     group = 'jshop'
     version = '0.1.0'
-
+    
     java {
         sourceCompatibility = '17'
     }

diff --git a/jenkins/develop-test.jenkins b/jenkins/develop-test.jenkins
@@ -1,3 +1,4 @@
+/*
 pipeline {
     agent any
 
@@ -16,5 +17,5 @@ pipeline {
             junit 'build/test-results/test/*.xml'
         }
     }
-
-}
+}
+*/
diff --git a/jenkins/pr_open_script.jenkins b/jenkins/pr_open_script.jenkins
@@ -1,3 +1,4 @@
+/*
 pipeline {
     agent any
 
@@ -17,3 +18,4 @@ pipeline {
         }
     }
 }
+*/
diff --git a/web/src/main/resources/application.yml b/web/src/main/resources/application.yml
@@ -49,7 +49,7 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/jshop?useSSL=false&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://localhost:3308/jshop?useSSL=false&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true
     username: root
     password: 1234
 
@@ -73,6 +73,7 @@ spring:
     username: ${MYSQL_USERNAME}
     password: ${MYSQL_PASSWORD}
 
+
   jwt:
     secret: ${JWT_SECRET_KEY}
 

diff --git a/web/src/main/resources/logback-spring-dev.xml b/web/src/main/resources/logback-spring-dev.xml
@@ -10,19 +10,6 @@
     </encoder>
   </appender>
 
-  <!--  <logger name="jdbc" level="OFF" additive="false">-->
-  <!--    <appender-ref ref="STDOUT"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="jdbc.sqlonly" level="DEBUG" additive="false">-->
-  <!--    <appender-ref ref="STDOUT"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="jdbc.sqltiming" level="OFF" additive="false">-->
-  <!--    <appender-ref ref="STDOUT"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="org.hibernate.SQL" level="DEBUG" additive="false">-->
-  <!--    <appender-ref ref="STDOUT"/>-->
-  <!--  </logger>-->
-
   <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>

diff --git a/web/src/main/resources/logback-spring-prod.xml b/web/src/main/resources/logback-spring-prod.xml
@@ -27,20 +27,6 @@
     </encoder>
   </appender>
 
-
-  <!--  <logger name="jdbc" level="OFF" additive="false">-->
-  <!--    <appender-ref ref="FILE"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="jdbc.sqlonly" level="DEBUG" additive="false">-->
-  <!--    <appender-ref ref="FILE"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="jdbc.sqltiming" level="OFF" additive="false">-->
-  <!--    <appender-ref ref="FILE"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="org.hibernate.SQL" level="DEBUG" additive="false">-->
-  <!--    <appender-ref ref="FILE"/>-->
-  <!--  </logger>-->
-
   <root level="INFO">
     <appender-ref ref="FILE"/>
     <appender-ref ref="STDOUT"/>

diff --git a/web/src/test/java/jshop/web/acceptance/AddressAcceptanceTest.java b/web/src/test/java/jshop/web/acceptance/AddressAcceptanceTest.java
@@ -14,6 +14,7 @@
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Optional;
+import jshop.core.config.P6SpyConfig;
 import jshop.core.domain.address.dto.CreateAddressResponse;
 import jshop.core.domain.address.entity.Address;
 import jshop.core.domain.address.repository.AddressRepository;
@@ -33,6 +34,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrint;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.test.web.servlet.MockMvc;
@@ -45,6 +47,7 @@
 @AutoConfigureMockMvc(print = MockMvcPrint.NONE)
 @Transactional
 @DisplayName("[통합 테스트] AddressController")
+@Import(P6SpyConfig.class)
 public class AddressAcceptanceTest extends BaseTestContainers {
 
     @Autowired

diff --git a/web/src/test/resources/application.yml b/web/src/test/resources/application.yml
@@ -0,0 +1,18 @@
+spring:
+  application:
+    name: jshop-web
+  jpa:
+    hibernate:
+      ddl-auto: update
+  datasource:
+    p6spy:
+      enable-logging: true
+      multiline: true
+      logging: slf4j
+      tracing:
+        include-parameter-values: true
+
+logging:
+  config: classpath:logback-spring-dev.xml
+  level:
+    sql: error