diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c23b7f6..178eeaa 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -49,6 +49,13 @@ casic-app-version ${extension.version} + + com.sinopec + siam-am-agent-simple + 3.3.RELEASE + system + ${project.basedir}/lib/siam-am-agent-simple-3.3.RELEASE.jar + com.casic diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c23b7f6..178eeaa 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -49,6 +49,13 @@ casic-app-version ${extension.version} + + com.sinopec + siam-am-agent-simple + 3.3.RELEASE + system + ${project.basedir}/lib/siam-am-agent-simple-3.3.RELEASE.jar + com.casic diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index c9259ad..2854773 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -36,6 +36,14 @@ /config + src/main/resources/conf + true + + * + + /conf + + src/main/resources/i18n / diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c23b7f6..178eeaa 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -49,6 +49,13 @@ casic-app-version ${extension.version} + + com.sinopec + siam-am-agent-simple + 3.3.RELEASE + system + ${project.basedir}/lib/siam-am-agent-simple-3.3.RELEASE.jar + com.casic diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index c9259ad..2854773 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -36,6 +36,14 @@ /config + src/main/resources/conf + true + + * + + /conf + + src/main/resources/i18n / diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml index 7360352..ceb4509 100644 --- a/casic-web/src/main/resources/config/application-dm.yml +++ b/casic-web/src/main/resources/config/application-dm.yml @@ -47,7 +47,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token,/route/token db: init: enable: false diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c23b7f6..178eeaa 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -49,6 +49,13 @@ casic-app-version ${extension.version} + + com.sinopec + siam-am-agent-simple + 3.3.RELEASE + system + ${project.basedir}/lib/siam-am-agent-simple-3.3.RELEASE.jar + com.casic diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index c9259ad..2854773 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -36,6 +36,14 @@ /config + src/main/resources/conf + true + + * + + /conf + + src/main/resources/i18n / diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml index 7360352..ceb4509 100644 --- a/casic-web/src/main/resources/config/application-dm.yml +++ b/casic-web/src/main/resources/config/application-dm.yml @@ -47,7 +47,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token,/route/token db: init: enable: false diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 578276c..c5c878e 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -34,6 +34,11 @@ extUrl: sys sysUrl: /sys urlExclusion: /well/update,/well/add + cas-type: sso + sso: + noFilterURLs: /sys/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob,/user/login/token + web: + host: http://api.map.baidu.com/geoconv/v1/ #前端路径, 需提供授权异常页面,登录成功页面 config: export-path: D:\cz\203\管网\升级\2.0\casic-smartcity\casic-web\src\main\resources\config\export config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\