#IQBX #comment [Other] 集中配置下载更换为总行业务链接

Module/mod_DeviceControl/mod_DeviceControl.cpp

@@ -567,6 +567,20 @@ std::pair<ErrorCodeEnum, CSimpleStringA> CDeviceControlEntity::__ReadCenterConfi
             entityName == CSimpleStringA("") ? "IEBrowser" : (const char*)entityName.GetData()
             , (const char*)key.GetData(), str);
 
+    if (str.IsNullOrEmpty() && key.Compare("CenterConfigUrl") == 0 && entityName.Compare("CenterSetting") == 0) {
+        Dbg("Try to read CenterSettings download url from shell.ini again");
+        CSmartPointer<IConfigInfo> pConfigShell;
+        GetFunction()->OpenConfig(Config_Shell, pConfigShell);
+        CSimpleStringA section("CenterSettingsDownloadUrl");
+#ifndef UNDER_PRODUCT_ENV
+        section.Append("_ST");
+#endif
+        pConfigShell->ReadConfigValue(section, "LAN", str);
+        if (Error_Succeed != err && !str.IsNullOrEmpty()) {
+            err = Error_Succeed;
+        }
+    }
+
     return std::make_pair(err, str);
 }
 

addin/res/ManagerDesktop/errPage.html

@@ -52,9 +52,9 @@
 				<h5 class="fz_24">下载集中配置</h5>
 				<div class="rows">
 					<label for="configAddr">集中配置地址</label>
-					<input type="text" name="configAddr" placeholder="请输入..." onblur="onblurAddr('config')" />
+					<input type="text" name="configAddr" style="width:520px;" placeholder="请输入..." onblur="onblurAddr('config')" />
 				</div>
-				<div class="rows">
+				<div class="rows" style="display:none;">
 					<label for="configPort">集中配置端口</label>
 					<input type="number" name="configPoint" placeholder="请输入..." />
 				</div>
@@ -148,9 +148,9 @@
 			$("input[name='configAddr']").focus(function(){
 				NumberFocus()
 			})
-			$("input[name='configPoint']").focus(function(){
-				NumberFocus()
-			})
+			//$("input[name='configPoint']").focus(function(){
+			//	NumberFocus()
+			//})
 			$("input[name='accessAddr']").focus(function(){
 				NumberFocus()
 			})

addin/res/ManagerDesktop/initPassword.html

@@ -30,9 +30,9 @@
 			<h5 class="fz_24">下载集中配置</h5>
 			<div class="rows">
 				<label for="configAddr">集中配置地址</label>
-				<input type="text" name="configAddr"  onfocus="En26Focus()" placeholder="请输入..." onblur="onblurAddr('config')" />
+				<input type="text" name="configAddr" style="width:520px;" onfocus="En26Focus()" placeholder="请输入..." onblur="onblurAddr('config')" />
 			</div>
-			<div class="rows">
+			<div class="rows"  style="display:none;">
 				<label for="configPort">集中配置端口</label>
 				<input type="number" name="configPoint" onfocus="NumberFocus()" onblur="UnFocus()" placeholder="请输入..." />
 			</div>

addin/res/ManagerDesktop/js/initPsd.js

@@ -62,15 +62,18 @@ function RegExpNull(vals){
  * @return: 
  */
 function onblurAddr(IPType){
-	let RegxIP = new RegExp("^((25[0-5]|2[0-4]\\d|[1]{1}\\d{1}\\d{1}|[1-9]{1}\\d{1}|\\d{1})($|(?!\\.$)\\.)){4}$");
+	let RegxIP;
 	let tips,IpAddr
 	switch(IPType)
 	{
 		case 'config': 
+			var strRegex = '^((https|http)://)' + '(([0-9a-zA-Z_!~*\'().&=+$%-]+: )?[0-9a-zA-Z_!~*\'().&=+$%-]+@)?' + '(([0-9]{1,3}\.){3}[0-9]{1,3}' + '|' + '([0-9a-zA-Z_!~*\'()-]+\.)*' + '([0-9a-zA-Z][0-9A-Za-z-]{0,61})?[0-9A-Za-z]\.' + '[a-zA-Z]{2,6})' + '(:[0-9]{1,4})?' + '((/?)|' + '(/[0-9A-Za-z_!~*\'().;?:@&=+$,%#-]+)+/?)$';
+			RegxIP = new RegExp(strRegex);
 			IpAddr = $(".config input[name='configAddr']").val(); 
 			tips = '集中配置地址格式不正确'
 			break;
 		case 'access': 
+			RegxIP = new RegExp("^((25[0-5]|2[0-4]\\d|[1]{1}\\d{1}\\d{1}|[1-9]{1}\\d{1}|\\d{1})($|(?!\\.$)\\.)){4}$");
 			IpAddr = $(".setting input[name='accessAddr']").val();
 			tips = '准入服务地址格式不正确'
 			break;
@@ -99,7 +102,7 @@ function downLoad(){
 	let req = new Request(),reqIn ={};
 	let data = document.getElementsByTagName('input');
 	reqIn.strAddr = data['configAddr'].value;
-	reqIn.nPort = Number( data['configPoint'].value)
+	reqIn.nPort = 0; //Number( data['configPoint'].value)
 	req.timeout = 60000
 	req = Object.assign({},req,reqIn)
 
@@ -159,7 +162,7 @@ function ReadCenterConfig(readType,readConfig){
 		req.key = 'Server' 
 	}else{
 		req.entityName = 'CenterSetting' 
-		req.key = 'Server' 
+		req.key = 'CenterConfigUrl' 
 	}
 	req.reserved1 = 0
 	req.reserved2 = 0
@@ -176,28 +179,32 @@ function ReadCenterConfig(readType,readConfig){
 			clearTimeout(timeoutFn)
 		}
 
-		if(ret.errorCode ===0){
-			let result = JSON.parse(ret['{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}'] )
-			let addr = result.value.split(' ')[0]
-			let port = result.value.split(' ')[1]
+		if (ret.errorCode === 0) {
+
+			let result = JSON.parse(ret['{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}'])
+
+			if (readType === 'access') {
+
+				let addr = result.value.split(' ')[0]
+				let port = result.value.split(' ')[1]
 
-			if(readType==='access'){
 				$('.setting input[name=accessAddr]').val(addr)
 				$('.setting input[name=accessPort]').val(port)
-			}else{
+
+			} else {
+
+				let addr = result.value;
+
 				$('.config input[name=configAddr]').val(addr)
-				$('.config input[name=configPoint]').val(port)
+				$('.config input[name=configPoint]').val('0')
 			}
-			
 
-		}else{
+		} else {
 			let tips ='读取集中配置失败'+ret.errorCode.toString(16)
 			if(readConfig==='readConfig'){
 				ModalStyle(tips,'pathN')	
-
 			}
 		}
-		
 	})
 }
 
@@ -264,7 +271,7 @@ function ResetRSA(){
 					let tips = Number(ret.Errcode).toString(16)+ (ret.ErrMsg?ret.ErrMsg:'重置密钥失败') 
 					ModalStyle(tips,'pathN')
 				}else{
-					let tips = '加载DES主密钥成功'
+					let tips = '重置密钥成功'
 					ModalStyle(tips,'pathY')
 				}
 			}