fix conflict
Change-Id: I298272f356659e1d91972e65222f20a9087abe39
diff --git a/src/main/java/com/example/g8backend/controller/TrackerController.java b/src/main/java/com/example/g8backend/controller/TrackerController.java
index ace7067..84c04ba 100644
--- a/src/main/java/com/example/g8backend/controller/TrackerController.java
+++ b/src/main/java/com/example/g8backend/controller/TrackerController.java
@@ -36,6 +36,9 @@
logger.info("Announce request received: info_hash={}, peer_id={}, port={}, uploaded={}, downloaded={}, event={}, left={}, compact={}, passkey={}",
infoHash, peerId, port, uploaded, downloaded, event, left, compact, passkey);
+ System.out.println("passkey: " + passkey);
+ System.out.println("info_hash: " + infoHash);
+
AnnounceRequestDTO requestDTO = new AnnounceRequestDTO();
requestDTO.setPasskey(passkey);
requestDTO.setInfoHash(infoHash);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 99eaab2..59e5554 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,18 +1,25 @@
-spring.datasource.password=G812345678#
-spring.datasource.username=team8
-spring.datasource.url=jdbc:mysql://202.205.102.121:3306/g8backend
-#spring.datasource.password=12345678
-#spring.datasource.username=root
-#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/g8backend
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.sql.init.mode=always
+# production environment
+#spring.datasource.password=G812345678#
+#spring.datasource.username=team8
+#spring.datasource.url=jdbc:mysql://202.205.102.121:3306/g8backend
+
+# development environment
+spring.datasource.password=12345678
+spring.datasource.username=root
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/g8backend
+
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.sql.init.mode=always
#logging.level.root=DEBUG
+server.port=8080
+
mybatis-plus.mapper-locations=classpath*:/mapper/**/*.xml
spring.data.redis.host = 127.0.0.1
-//spring.data.redis.host = redis-server
+
+# spring.data.redis.host = redis-server
spring.data.redis.port = 6379
spring.mail.host=smtp.qq.com