合并胡老板代码

src/main/resources/application-prod.yml

+spring:
+  datasource:
+    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: 100Centa30821%mysql
+
+swagger:
+  enable: true
+
+
+aliyun:
+  access-key-id: LTAIeHWeydaWT3ZZ
+  access-key-secret: 2FTWlODpzEZjsBQw10NO6SUBMwYOcL
+  oss:
+    bucket: beyondclouds
+    endpoint: http://oss-cn-beijing.aliyuncs.com
+    base-url: https://beyondclouds.oss-cn-beijing.aliyuncs.com
+  sms:
+    domain: dysmsapi.aliyuncs.com
+    version: 2017-05-25
+    action: SendSms
+    region-id: cn-hangzhou
+    sign-name: 段启岩
+    template-code-map: {verifyCode: SMS_142384912}
+mybatis-plus:
+  mapper-locations: classpath*:cn/meteor/beyondclouds/modules/**/xml/*.xml
+
+beyondclouds:
+  auth:
+    qq:
+      client-id: 101846021
+      client-secret: 5bc41deeb7e152e2e6aff97726bbf86a
+      redirect-uri: http://meteor.natapp1.cc/auth/qq
\ 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: password
+    password: 100Centa30821%mysql
 
 swagger:
   enable: true