Bläddra i källkod

正式环境配置

yuanzhi_kuang 4 timmar sedan
förälder
incheckning
ac3a1328aa

+ 2 - 1
patch/正式单点部署/eas/server/bin/set-server-env.sh

@@ -63,7 +63,8 @@ export ADMINSERVER_PORT
 
 # ===== custom env =====
 # 部署环境标识	 dev  test  prod
-ENV=test
+# 【正式单点部署包】必须为 prod,否则仍读 integration-config-test.json
+ENV=prod
 export ENV
 
 # OAuth配置路径(按环境区分)

+ 6 - 2
patch/正式单点部署/eas/server/deploy/eas.ear/sso_web.war/common/js/login_withForm.js

@@ -51,8 +51,8 @@ var ENV_CONFIG = {
         weaverAppId: "cce4cd9a-9f55-4976-93b0-4f46b5b28a01"
     },
     prod: {
-        shrBaseUrl: "http://172.16.38.1:6888",
-        oaSsoUrl: "http://172.16.38.1:6888/qy/auth/weaver/app.do",
+        shrBaseUrl: "https://hr.szpgm.com",
+        oaSsoUrl: "https://hr.szpgm.com/qy/auth/weaver/app.do",
         weaverAppId: "cce4cd9a-9f55-4976-93b0-4f46b5b28a01"
     },
     keepLoginPath: "/shr/home.do",
@@ -75,6 +75,10 @@ function getCurrentEnv() {
     if (currentHost.indexOf("172.16.38.1") !== -1 || currentHost.indexOf(":6888") !== -1) {
         return ENV_CONFIG.test;
     }
+    // 正式:https://hr.szpgm.com/shr
+    if (currentHost.indexOf("hr.szpgm.com") !== -1) {
+        return ENV_CONFIG.prod;
+    }
     return ENV_CONFIG.prod;
 }
 

+ 4 - 4
patch/正式单点部署/eas/server/deploy/easweb.ear/shr_web.war/scripts/gui/logoutHR.js

@@ -11,13 +11,13 @@ function logoutHR(callback) {
 	// 地址:当前用测试环境;生产 prod.ecologyUrl。
 	var WEAVER_LOGOUT_ENV = {
 		test: {
-			ecologyUrl: 'http://172.16.37.23:20600/'
+			ecologyUrl: 'http://172.16.38.6:20600/'
 		},
 		prod: {
-			// TODO 生产泛微地址,上线前填写,例如 https://oa.xxx.com/
-			ecologyUrl: ''
+			// 正式泛微 OpenAPI/ecology
+			ecologyUrl: 'http://172.16.37.23:20600/'
 		},
-		currentEnv: 'test'
+		currentEnv: 'prod'
 	};
 	var weaverEcologyUrl = (WEAVER_LOGOUT_ENV[WEAVER_LOGOUT_ENV.currentEnv] || WEAVER_LOGOUT_ENV.test).ecologyUrl;
 	if (weaverEcologyUrl) {

+ 1 - 1
patch/正式单点部署/eas/server/profiles/server1/config/portalConfig/WSConfig.xml

@@ -3,7 +3,7 @@
 	<class>
 		<server>192.168.17.70*9090#http://192.168.61.120:6910/easweb/cp/uc/imsso.jsp?username=#useraccount&amp;redirectTo=http://192.168.61.120:6910/easweb/cp/uc/checkUrl.jsf</server>
 		<path>com.kingdee.eas.custom.weaverTodo.WeaverMessageWebServiceDao</path>
-		<dataCenter>test0527</dataCenter>
+		<dataCenter>SNG</dataCenter>
 		<task value="true">
 			<workflow>true</workflow>
 		</task>

+ 9 - 11
patch/正式单点部署/eas/server/properties/baoye/weaverTodoConfig.properties

@@ -1,11 +1,11 @@
 # Copy to weaverTodoConfig.properties on server (not committed with secrets)
 # Optional override: -DWEAVER_TODO_CONFIG_PATH=...
 # 本文件编码:UTF-8(WeaverTodoConfig 按 UTF-8 加载)
+# 【正式环境】覆盖部署用
 
 weaver.todo.enabled=true
-# OpenAPI 与门户可同域名端口;私有化实测需 /papi/openapi 前缀
-# 测试=172.16.38.6:20600;正式=172.16.37.23:20600
-weaver.openapi.host=http://172.16.38.6:20600
+# OpenAPI:正式=172.16.37.23:20600;测试=172.16.38.6:20600
+weaver.openapi.host=http://172.16.37.23:20600
 weaver.openapi.authorizePath=/papi/openapi/oauth2/authorize
 weaver.openapi.accessTokenPath=/papi/openapi/oauth2/access_token
 weaver.openapi.receivePath=/papi/openapi/api/open_intunifytodo/server_engine/receiveRequestInfo
@@ -14,8 +14,8 @@ weaver.app_key=8a30c568cb2540eea832e0b89ab007de
 weaver.app_secret=65b6cf3ac6311518a91233e6d074f8
 # 统一待办异构系统标识,长度<=10,以后台注册为准
 weaver.syscode=s-HRCloud
-weaver.shrServerName=http://172.16.38.1:6888
-# 已通 SSO 的 oauth appId(integration-config)
+weaver.shrServerName=https://hr.szpgm.com/shr
+# 已通 SSO 的 oauth appId(须与 integration-config-prod.json 一致
 weaver.sso.appId=cce4cd9a-9f55-4976-93b0-4f46b5b28a01
 # 待办 pcurl SSO 入口(相对路径);以后换入口只改此项
 weaver.sso.entryPath=/qy/auth/weaver/app.do
@@ -23,12 +23,10 @@ weaver.path.pc.approve=/easweb/webviews/workflow/transferApprove.jsp
 # 新增待办:短轮询 AssignmentId 预算 + 落库后再 sleep 的间隔(毫秒)
 weaver.wf.delayMs=8000
 
-# 通知消息中心 sendMsg(与待办同 host/token,不再走 receiveRequestInfo isremark=8)
-# 固定参数按环境区分(tenantKey 测试/生产相同):
-#   测试:moduleId=139141 eventId=287602
-#   生产:moduleId=100011 eventId=241221
+# 通知消息中心 sendMsg(与待办同 host/token)
+# 生产:moduleId=100011 eventId=241221;测试:139141 / 287602
 weaver.openapi.sendMsgPath=/papi/openapi/api/mc/msg/sendMsg
 weaver.notify.tenantKey=t6srq5l4vh
-weaver.notify.moduleId=139141
-weaver.notify.eventId=287602
+weaver.notify.moduleId=100011
+weaver.notify.eventId=241221
 weaver.notify.channels=1

+ 5 - 12
patch/正式单点部署/eas/server/properties/baoye/weaverTodoConfig.properties.example

@@ -1,34 +1,27 @@
 # Copy to weaverTodoConfig.properties on server (not committed with secrets)
 # Optional override: -DWEAVER_TODO_CONFIG_PATH=...
 # 本文件编码:UTF-8(WeaverTodoConfig 按 UTF-8 加载)
+# 【正式环境】示例,与 weaverTodoConfig.properties 同值
 
 weaver.todo.enabled=true
-# OpenAPI 与门户可同域名端口;私有化实测需 /papi/openapi 前缀
-# 测试=172.16.38.6:20600;正式=172.16.37.23:20600
-weaver.openapi.host=http://172.16.38.6:20600
+# OpenAPI:正式=172.16.37.23:20600;测试=172.16.38.6:20600
+weaver.openapi.host=http://172.16.37.23:20600
 weaver.openapi.authorizePath=/papi/openapi/oauth2/authorize
 weaver.openapi.accessTokenPath=/papi/openapi/oauth2/access_token
 weaver.openapi.receivePath=/papi/openapi/api/open_intunifytodo/server_engine/receiveRequestInfo
 weaver.corpid=76044c1d5e196b6d4951eae18210a7dc
 weaver.app_key=8a30c568cb2540eea832e0b89ab007de
 weaver.app_secret=65b6cf3ac6311518a91233e6d074f8
-# 统一待办异构系统标识,长度<=10,以后台注册为准
 weaver.syscode=s-HRCloud
-weaver.shrServerName=http://172.16.38.1:6888
-# 已通 SSO 的 oauth appId(integration-config)
+weaver.shrServerName=https://hr.szpgm.com/shr
 weaver.sso.appId=cce4cd9a-9f55-4976-93b0-4f46b5b28a01
-# 待办 pcurl SSO 入口(相对路径);以后换入口只改此项
 weaver.sso.entryPath=/qy/auth/weaver/app.do
 weaver.path.pc.approve=/easweb/webviews/workflow/transferApprove.jsp
-# 新增待办:短轮询 AssignmentId 预算 + 落库后再 sleep 的间隔(毫秒)
 weaver.wf.delayMs=8000
 
-# 通知消息中心 sendMsg(与待办同 host/token,不再走 receiveRequestInfo isremark=8)
+# 通知:生产 moduleId=100011 eventId=241221
 weaver.openapi.sendMsgPath=/papi/openapi/api/mc/msg/sendMsg
 weaver.notify.tenantKey=t6srq5l4vh
 weaver.notify.moduleId=100011
 weaver.notify.eventId=241221
-weaver.notify.senderName=SHR
-# 发送人工号解析失败时的兑底;有 BMC 发送人时优先用工号
-weaver.notify.senderWorkCode=
 weaver.notify.channels=1

+ 5 - 4
patch/正式单点部署/eas/server/properties/integration-config-prod.json

@@ -1,8 +1,8 @@
 {
   "common": {
-    "dataCenter": "test0527",
+    "dataCenter": "SNG",
     "locale": "L2",
-    "shrServerName": "http://172.16.38.1:6888",
+    "shrServerName": "https://hr.szpgm.com/shr",
     "mobileBosUrl": "https://mbos.kdeascloud.com"
   },
   "oauth": {
@@ -10,7 +10,8 @@
       "enabledAllowed": true,
       "allowedPrefixes": [
         "https://mbos.kdeascloud.com/",
-        "http://172.16.38.1:6888/"
+        "https://hr.szpgm.com/",
+        "https://hr.szpgm.com/shr/"
       ]
     },
     "apps": [
@@ -19,7 +20,7 @@
         "appType": "pa",
         "appId": "cce4cd9a-9f55-4976-93b0-4f46b5b28a01",
         "appSecret": "lIQIzvTH8IGOqeQ2vuwLdANf",
-        "callbackUrl": "http://172.16.38.1:6888/qy/auth/callback/weaver/pa",
+        "callbackUrl": "https://hr.szpgm.com/qy/auth/callback/weaver/pa",
         "authEntry": "/auth/weaver",
         "userMappingField": "PERSON_NUMBER",
         "mobileRedirectType": "TO_MBOS",