Revert "update application.yml"

This reverts commit 09ca4c2.
xuanzhi33 · Jul 20, 2024 · 51ce055 · 51ce055
1 parent 09ca4c2
commit 51ce055
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Android-app/.idea/misc.xml b/Android-app/.idea/misc.xml
diff --git a/server/java/carproject-server/src/main/resources/application-dev.yml b/server/java/carproject-server/src/main/resources/application-dev.yml
diff --git a/server/java/carproject-server/src/main/resources/application.yml b/server/java/carproject-server/src/main/resources/application.yml
@@ -1,15 +1,10 @@
 spring:
-  profiles:
-    active: dev
   datasource:
-    driver-class-name: ${carproject.datasource.driver-class-name}
-    url: jdbc:mysql://${carproject.datasource.host}:${carproject.datasource.port}/${carproject.datasource.database}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-    username: ${carproject.datasource.username}
-    password: ${carproject.datasource.password}
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  profiles:
+    include: db
 
 mybatis:
-  mapper-locations: classpath:mapper/*.xml
-  type-aliases-package:
   configuration:
     map-underscore-to-camel-case: true