Explorar o código

Merge branch 'zzy' into test

zhouzeyu@c-top.com.cn %!s(int64=3) %!d(string=hai) anos
pai
achega
6e3a4b0d6d

+ 12 - 12
jeecg-boot-material-view/src/main/resources/application-prod.yml

@@ -11,10 +11,10 @@ server:
     min-response-size: 1024
     mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 management:
- endpoints:
-  web:
-   exposure:
-    include: metrics,httptrace
+  endpoints:
+    web:
+      exposure:
+        include: metrics,httptrace
 spring:
   cloud:
     nacos:
@@ -22,9 +22,9 @@ spring:
         server-addr: 172.30.0.7:8848
         service: jeecg-cloud-material
   servlet:
-     multipart:
-        max-file-size: 10MB
-        max-request-size: 10MB
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 10MB
   mail:
     host: smtp.163.com
     username: jeecgos@163.com
@@ -140,14 +140,14 @@ mybatis-plus:
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #minidao 设置
-minidao :
+minidao:
   base-package: org.jeecg.modules.jmreport.*
   db-type: mysql
 #jeecg专用配置
-jeecg :
+jeecg:
   # 本地:local\Minio:minio\阿里云:alioss
   uploadType: local
-  path :
+  path:
     #文件上传根目录 设置
     upload: D://opt//upFiles
     #webapp文件路径
@@ -205,7 +205,7 @@ jeecg :
     port: 30007
     logPath: logs/jeecg/job/jobhandler/
     logRetentionDays: 30
-   #自定义路由配置 yml nacos database
+    #自定义路由配置 yml nacos database
   route:
     config:
       data-id: jeecg-gateway-router
@@ -223,7 +223,7 @@ cas:
 #Mybatis输出sql日志
 logging:
   level:
-    org.jeecg.modules.system.mapper : info
+    org.jeecg.modules.system.mapper: info
 #swagger
 knife4j:
   production: false

+ 1 - 1
jeecg-boot-material-view/src/main/resources/application-test.yml

@@ -15,7 +15,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 139.186.134.115:8848
+        server-addr: 192.168.0.195:8848
         service: jeecg-cloud-material
   servlet:
     multipart: