From 51a52790d78a642ae2b81d33922754b506adef08 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 九月 2022 16:38:55 +0800
Subject: [PATCH] 1

---
 src/resources/application.properties |    4 ++--
 WebContent/WEB-INF/web.xml           |    3 +++
 etc/cas/config/cas.properties        |    6 +++---
 etc/cas/config/application.yml       |   14 +++++++-------
 src/resources/bootstrap.properties   |    4 ++--
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 3b443ac..32f2a40 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" id="WebApp_ID" version="3.1">
+  <!-- 姝ゅ娣诲姞 absolute-ordering 鏍囩 -->
+  <!--  <absolute-ordering/>-->
+
   <display-name>cas</display-name>
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>
diff --git a/etc/cas/config/application.yml b/etc/cas/config/application.yml
index d0a6cb6..4dcc14e 100644
--- a/etc/cas/config/application.yml
+++ b/etc/cas/config/application.yml
@@ -11,21 +11,21 @@
   #SSL閰嶇疆
   ssl:
     enabled: false  #娉ㄦ剰!!: 鍊间负true鍚敤https,涓篺alse鍒欎娇鐢╤ttp
-    key-store: file:/D:/etc/cas/thekeystore  #榛樿涓篶as閮ㄧ讲鎵�鍦▁鐩樼殑etc鏂囦欢澶�
+    key-store: file:/E:/terrait/TianJin/cas5.0.3/etc/cas/saml  #榛樿涓篶as閮ㄧ讲鎵�鍦▁鐩樼殑etc鏂囦欢澶�
     key-store-password: changeit
     keyAlias: cas
 
 ##
 # thymeleaf 缂撳瓨(寮�鍙戞椂鎵撳紑)
 spring.thymeleaf.cache: false
-#鐢ㄦ埛楠岃瘉鏁版嵁搴撻厤缃�
+#鐢ㄦ埛楠岃瘉鏁版嵁搴撻厤缃紝jdbc:postgresql://127.0.0.1:5432/langfang?currentSchema=magbg
 cas:
   authn:
     jdbc:
       query[0]:
         sql: SELECT PASSWORD as psw FROM MAGBG.ORG_USER WHERE LOGINNAME=?
         healthQuery: SELECT 1 FROM MAGBG.ORG_USER
-        url: jdbc:postgresql://127.0.0.1:5432/czxy
+        url: jdbc:postgresql://127.0.0.1:5432/langfang
         user: postgres
         password: postgres
 
@@ -96,20 +96,20 @@
     ignoreSameIp: true   #鏄惁蹇界暐鐩稿悓IP涓嬬殑鐧诲綍
   log:
     enabled: false
-    logServiceUrl: http://LT-PC.gdlthy.cn:8081/api/log/logininfo/addLoginInfo
+    logServiceUrl: http://192.168.20.106:8081/api/log/logininfo/addLoginInfo
   rabbit:
     enabled: false
     rmq_exchange_name: landtool.radar.warn
     rmq_exchange_type: topic
     rmq_routing_key_prefix_cas: cas.
 terra:
-  admissionQueryUrl: http://127.0.0.1:8081/api/sys/systeminfo/isAdmitSysByUserid
+  admissionQueryUrl: http://192.168.20.106:8081/api/sys/systeminfo/isAdmitSysByUserid
   
 ojdbc:
-     jdbcUrl: jdbc:postgresql://127.0.0.1:5432/czxy
+     jdbcUrl: jdbc:postgresql://127.0.0.1:5432/langfang
      username: postgres
      password: postgres
      updatesql: UPDATE MAGBG.ORG_USER SET PASSWORD='%s', ISFIRSTLOGIN=1 WHERE LOGINNAME='%s'
      querysql: SELECT * FROM MAGBG.ORG_USER WHERE LOGINNAME=?
      driverclass: org.postgresql.Driver
-      
+
diff --git a/etc/cas/config/cas.properties b/etc/cas/config/cas.properties
index a7b215a..ef5cbc0 100644
--- a/etc/cas/config/cas.properties
+++ b/etc/cas/config/cas.properties
@@ -1,11 +1,11 @@
 # https://cas.tb.org
-cas.server.name: http://127.0.0.1:8088
-cas.server.prefix: http://127.0.0.1:8088/cas
+cas.server.name: http://127.0.0.1:8081
+cas.server.prefix: http://127.0.0.1:8081/cas
 
 cas.adminPagesSecurity.ip=127.0.0.1
 
 # logging.config: file:/D:/etc/cas/config/log4j2.xml
-logging.config: file:/E:/terrait/TianJin/cas5.0.3/etc/cas/configlog4j2.xml
+logging.config: file:/E:/terrait/TianJin/cas5.0.3/etc/cas/config/log4j2.xml
 #cas.serviceRegistry.config.location: classpath:/services
 
 # 鍚敤鍗曠偣鐧诲嚭鍚庣殑servcie璺宠浆
diff --git a/src/resources/application.properties b/src/resources/application.properties
index 8d688a2..2f53722 100644
--- a/src/resources/application.properties
+++ b/src/resources/application.properties
@@ -69,8 +69,8 @@
 spring.thymeleaf.cache=false
 spring.thymeleaf.mode=HTML
 
-#cas.view.defaultRedirectUrl=http://portal.nmsmp.com:8088/
-cas.view.defaultRedirectUrl=http://127.0.0.1:8082/
+#cas.view.defaultRedirectUrl=http://portal.nmsmp.com:8088/锛宧ttp://127.0.0.1:8085/login/loginChoose.html
+cas.view.defaultRedirectUrl=http://192.168.20.106:8082/
 ##
 # CAS Log4j Configuration
 #
diff --git a/src/resources/bootstrap.properties b/src/resources/bootstrap.properties
index 8dcaa81..c31f363 100644
--- a/src/resources/bootstrap.properties
+++ b/src/resources/bootstrap.properties
@@ -16,7 +16,7 @@
 spring.profiles.active=native
 #spring.cloud.config.server.native.searchLocations=file:/E:/etc/cas/config
 #spring.cloud.config.server.native.searchLocations=file:/root/soft/etc/cas/config
-spring.cloud.config.server.native.searchLocations=file:/D:/etc/cas/config
+spring.cloud.config.server.native.searchLocations=file:/E:/terrait/TianJin/cas5.0.3/etc/cas/config
 #spring.cloud.config.server.native.searchLocations=file:/D:/tomcat8.0-CAS5.0.3/etc/cas/config
 
 #浠巊it浠撳簱鍔犺浇閰嶇疆
@@ -44,7 +44,7 @@
 #cas.authn.samlIdp.metadata.cacheExpirationMinutes=30
 #cas.authn.samlIdp.metadata.failFast=true
 #cas.authn.samlIdp.metadata.location=E:\\etc\\cas\\saml
-cas.authn.samlIdp.metadata.location=D:\\etc\\cas\\saml
+cas.authn.samlIdp.metadata.location=E:\\terrait\\TianJin\\cas5.0.3\\etc\\cas\\saml
 #cas.authn.samlIdp.metadata.location=D:\\tomcat8.0-CAS5.0.3\\etc\\cas\\saml
 
 #cas.authn.samlIdp.metadata.privateKeyAlgName=RSA

--
Gitblit v1.9.3