Update application.properties

Author: sungchaewon

src/main/resources/application.properties

@@ -1,28 +1,15 @@
 spring.application.name=FixLog
 
-
 ##### [DEV] #####
 server.port=8083
 
-# DB
-
-server.port=8083
-
 # DB (MySQL)
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-<<<<<<< HEAD
-spring.datasource.url=${MYSQL_URL}
-spring.datasource.username=${MYSQL_USERNAME}
-spring.datasource.password=${MYSQL_PASSWORD}
-
-
-=======
 spring.datasource.url=jdbc:mysql://fixlog-db.c7cau8y2srl7.ap-northeast-2.rds.amazonaws.com:3306/fixlog?serverTimezone=Asia/Seoul
 spring.datasource.username=admin
 spring.datasource.password=${MYSQL_PASSWORD}
 
 # JPA
->>>>>>> origin/develop
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
@@ -37,14 +24,10 @@ cloud.aws.s3.bucket=${AWS_S3_BUCKET}
 # JWT
 jwt.secret=${JWT_KEY}
 
-# ?? ??
+# Spring Security 디버깅 로그
 logging.level.org.springframework.security=DEBUG
 
-
-
-
 ##### [PROD] #####
-
 # server.port=8083
 #
 # spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver