Merge branch 'master' into pim_meet

buhuazhen

8 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

 src/main/resources/application-demo.yml

@@ -45,7 +45,7 @@
  accessKey: admin
  secretKey: 12345678
  preview-expiry: 24 # 预览地址默认24小时
  default-bucket: uploadPath
  default-bucket: demo-product
# 用户配置
user:
  password:
@@ -135,7 +135,7 @@
  redis:
    # 地址
#    host: 127.0.0.1
    host: 172.17.0.1
    host: 192.168.1.185
    # 端口，默认为6379
    port: 6379
    # 数据库索引