Merge remote-tracking branch 'origin/master'

# Conflicts: # modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
7 years ago · 018ee8900c
parent 3c751ac130 45d05692a2
commit 018ee8900c
1 changed files with 2 additions and 3 deletions
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@ -14,9 +14,8 @@ filter.shiro.saadmin.filteruri = /saoperate/*

 #是否允许前端跨域提交
 impp.web.cross = true
-#允许前端跨域提交ip地址
-impp.web.cross.host = http://localhost
-
+#允许前端跨域提交ip地址，多个以逗号分隔
+impp.web.cross.hosts = http://127.0.0.1,http://localhost

 ################ 主数据源 ################
 # mysql