Commit b15347dd authored by zengtianlai3's avatar zengtianlai3

Merge branch 'for-yx' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license into for-yx

parents fbb116ac bd9d4ab8
...@@ -5,11 +5,13 @@ spring: ...@@ -5,11 +5,13 @@ spring:
name: iot_license #当前服务的名称 name: iot_license #当前服务的名称
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
# 这个邮箱部署的时候要改成自己公司的
mail: mail:
host: smtp.mxhichina.com host: smtp.mxhichina.com
port: 465 port: 465
username: dev_team@huahuico.com username: dev_team@huahuico.com
password: Jas@7777777 password: ENC(eUd8aq15PjmiIF1GBeRwkJJvGZKaAYKu)
# 需要配置成管理员邮箱
to: MAllk33@163.com to: MAllk33@163.com
default-encoding: UTF-8 default-encoding: UTF-8
properties: properties:
...@@ -29,5 +31,6 @@ server: ...@@ -29,5 +31,6 @@ server:
port-header: HEAD,PUT,DELETE,OPTIONS,TRACE,COPY,SEARCH,PROPFIND port-header: HEAD,PUT,DELETE,OPTIONS,TRACE,COPY,SEARCH,PROPFIND
cros: cros:
# 需要设置访问白名单
cros_allowed_origins: http://192.168.1.88:8080, http://localhost:8868 cros_allowed_origins: http://192.168.1.88:8080, http://localhost:8868
cros_allowed_method: GET,POST cros_allowed_method: GET,POST
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment