2020.2.2合并

src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/beyond_clouds?useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: password
+    password: 100Centa30821%mysql
 
 swagger:
   enable: true
@@ -33,5 +33,3 @@ beyondclouds:
       client-id: 101846021
       client-secret: 5bc41deeb7e152e2e6aff97726bbf86a
       redirect-uri: http://meteor.natapp1.cc/auth/qq
\ No newline at end of file
-server:
-  port: 8081
\ No newline at end of file

src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/beyond_clouds?useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 197442
+    password: 100Centa30821%mysql
 
 swagger:
   enable: true