Merge branch 'master' of chendi/editor into master

src/main/resources/application.yml

@@ -6,6 +6,7 @@ server:
  session-timeout:  3000
spring:
  imageUrl: http://172.19.103.31:10001/ydf/upload/image
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/ydf?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root