Merge branch 'master' of https://gitee.com/liu-jiangs-project/RuoYi-Vue

ruoyi-admin/src/main/resources/application-dev.yml

@@ -53,10 +53,10 @@ ocr:
   endpoint: ocr-api.cn-hangzhou.aliyuncs.com
 es:
   #多个用","分割
-  hosts: 49.234.41.39:9222
+  hosts: 47.99.90.75:9200
   ssl: false
   username: elastic
-  password: eguMAH-Fg*dPETkgJTkD
+  password: wXd3iRUcqHzxZPtKsDRn
   maxConnTotal: 4
   maxConnPerRoute: 2
 # 开发环境配置

ruoyi-admin/src/main/resources/application-prod.yml

@@ -236,7 +236,7 @@ pagehelper:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: true
+  enabled: false
   # 请求前缀
   pathMapping: /