Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -71,7 +71,7 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
        }
        saasService.create(saasDO);
        return success("创建成功");
        return success("创建成功",saasDO);
    }
    @PostMapping(value = BaseRequestMapping.Saas.SYSTEM_CONFIGURATION)
@@ -81,7 +81,7 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "saasDO") SaasDO saasDO) throws Exception {
        saasService.saveSystemConfig(saasDO);
        return success("创建成功");
        return success("创建成功",saasDO);
    }
    @PostMapping(value = BaseRequestMapping.Saas.THEME_STYLE)

svr/svr-base/src/main/resources/application.yml

@@ -32,6 +32,15 @@ spring:
      max-wait: -1  # 连接池最大阻塞等待时间（使用负值表示没有限制）
      max-idle: 20  # 连接池中的最大空闲连接
      min-idle: 5  # 连接池中的最小空闲连接
  mail:
    default-encoding: UTF-8
#端口
    port: 25
#协议
    protocol: smtp
    properties.mail.smtp.auth: true
    properties.mail.smtp.starttls.enable: true
    properties.mail.smtp.starttls.required: true
es:
  index:
    servicePackLog: base_service_package_log
@@ -80,19 +89,12 @@ spring:
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
  mail:
    default-encoding: UTF-8
    host: smtp.163.com
#发送者的邮箱密码
    password: xmijk181016jkzl
#端口
    port: 25
#协议
    protocol: smtp
#发送者的邮箱账号
    username: i_jiankang@163.com
    properties.mail.smtp.auth: true
    properties.mail.smtp.starttls.enable: true
    properties.mail.smtp.starttls.required: true
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
# 短信发送地址
@@ -120,6 +122,12 @@ spring:
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
  mail:
    host: smtp.163.com
#发送者的邮箱密码
    password: xmijk181016jkzl
#发送者的邮箱账号
    username: i_jiankang@163.com
#    password: jkzl_ehr
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
@@ -162,6 +170,12 @@ spring:
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
  mail:
    host: smtp.163.com
#发送者的邮箱密码
    password: xmijk181016jkzl
#发送者的邮箱账号
    username: i_jiankang@163.com
#    password: jkzl_ehr
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址