Merge branch 'master' of https://github.com/WeDataSphere/DataSphereStudio

Author: SunPengWan

conf/dss-apps-server.properties

@@ -3,6 +3,11 @@
 spring.server.port=9044
 spring.spring.application.name=dss-apps-server
 
+## spring update add conf
+spring.spring.main.allow-circular-references=true
+spring.spring.mvc.pathmatch.matching-strategy=ant_path_matcher
+spring.spring.cloud.loadbalancer.cache.enabled=false
+
 wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/dss/apiservice/core/dao/mapper/*.xml,classpath*:com/webank/wedatasphere/dss/scriptis/dao/mapper/*.xml,classpath*:com/webank/wedatasphere/dss/guide/server/dao/impl/*.xml
 wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.dss.apiservice.core.bo,com.webank.wedatasphere.dss.apiservice.core.vo,com.webank.wedatasphere.dss.scriptis.vo,com.webank.wedatasphere.dss.guide.server.entity
 wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.apiservice.core.dao,com.webank.wedatasphere.dss.scriptis.dao,com.webank.wedatasphere.dss.guide.server.dao

conf/dss-server.properties

@@ -3,6 +3,11 @@ wds.dss.appconn.framework.ismanager=true
 spring.server.port=9043
 spring.spring.application.name=dss-server-dev
 
+## spring update add conf
+spring.spring.main.allow-circular-references=true
+spring.spring.mvc.pathmatch.matching-strategy=ant_path_matcher
+spring.spring.cloud.loadbalancer.cache.enabled=false
+
 wds.linkis.log.clear=true
 
 wds.linkis.server.version=v1