Merge remote-tracking branch 'origin/dev' into dev

克 刘

2020-04-02 81aaee286ba7f54ef1b713fedd6d24a9294745df

 kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml

@@ -11,10 +11,10 @@
  application:
    name: demo-order-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/demo_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/demo_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
    driver-class-name: com.mysql.jdbc.Driver
#    driver-class-name: com.mysql.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
      aop-patterns: com.kidgrow.order.controller.*,com.kidgrow.order.mapper.*