Commit 30fb7b0f authored by 皮倩雯's avatar 皮倩雯

fix: '集成登录内外网限制'

parent f9fcf025
Pipeline #57620 waiting for manual action with stages
...@@ -106,7 +106,7 @@ const AddModal = props => { ...@@ -106,7 +106,7 @@ const AddModal = props => {
url = '//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer'; url = '//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer';
} else if (obj.type == 'mapbox-i-ia') { } else if (obj.type == 'mapbox-i-ia') {
url = '//api.mapbox.com/v4/mapbox.satellite'; url = '//api.mapbox.com/v4/mapbox.satellite';
} else if (obj.type == 'arcgis-i') { } else if (obj.type == 'tianditu-arcgis-i') {
url = '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'; url = '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer';
} }
arr = { arr = {
...@@ -343,7 +343,7 @@ const AddModal = props => { ...@@ -343,7 +343,7 @@ const AddModal = props => {
return 'GeoQ暖色'; return 'GeoQ暖色';
case 'mapbox-i-ia': case 'mapbox-i-ia':
return 'mapbox影像'; return 'mapbox影像';
case 'arcgis-i': case 'tianditu-arcgis-i':
return 'arcgis影像'; return 'arcgis影像';
case 'arcgis-i-ia': case 'arcgis-i-ia':
return 'arcgis影像注记'; return 'arcgis影像注记';
...@@ -539,7 +539,7 @@ const AddModal = props => { ...@@ -539,7 +539,7 @@ const AddModal = props => {
<Option value="streetGray">GeoQ水墨灰(streetGray)</Option> <Option value="streetGray">GeoQ水墨灰(streetGray)</Option>
<Option value="streetWarm">GeoQ暖色(streetWarm)</Option> <Option value="streetWarm">GeoQ暖色(streetWarm)</Option>
<Option value="mapbox-i-ia">mapbox影像(mapbox-i-ia)</Option> <Option value="mapbox-i-ia">mapbox影像(mapbox-i-ia)</Option>
<Option value="arcgis-i">arcgis影像(arcgis-i)</Option> <Option value="tianditu-arcgis-i">arcgis影像(tianditu-arcgis-i)</Option>
<Option value="arcgis-i-ia">arcgis影像注记(arcgis-i-ia)</Option> <Option value="arcgis-i-ia">arcgis影像注记(arcgis-i-ia)</Option>
</Select> </Select>
</Item> </Item>
......
...@@ -102,7 +102,7 @@ const NewEditModal = props => { ...@@ -102,7 +102,7 @@ const NewEditModal = props => {
url = '//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer'; url = '//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer';
} else if (obj.type == 'mapbox-i-ia') { } else if (obj.type == 'mapbox-i-ia') {
url = '//api.mapbox.com/v4/mapbox.satellite'; url = '//api.mapbox.com/v4/mapbox.satellite';
} else if (obj.type == 'arcgis-i') { } else if (obj.type == 'tianditu-arcgis-i') {
url = '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'; url = '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer';
} }
arr = { arr = {
...@@ -500,7 +500,7 @@ const NewEditModal = props => { ...@@ -500,7 +500,7 @@ const NewEditModal = props => {
<Option value="streetGray">GeoQ水墨灰(streetGray)</Option> <Option value="streetGray">GeoQ水墨灰(streetGray)</Option>
<Option value="streetWarm">GeoQ暖色(streetWarm)</Option> <Option value="streetWarm">GeoQ暖色(streetWarm)</Option>
<Option value="mapbox-i-ia">mapbox影像(mapbox-i-ia)</Option> <Option value="mapbox-i-ia">mapbox影像(mapbox-i-ia)</Option>
<Option value="arcgis-i">arcgis影像(arcgis-i)</Option> <Option value="tianditu-arcgis-i">arcgis影像(tianditu-arcgis-i)</Option>
<Option value="arcgis-i-ia">arcgis影像注记(arcgis-i-ia)</Option> <Option value="arcgis-i-ia">arcgis影像注记(arcgis-i-ia)</Option>
</Select> </Select>
</Item> </Item>
......
...@@ -210,9 +210,7 @@ const AddModal = props => { ...@@ -210,9 +210,7 @@ const AddModal = props => {
let data = []; let data = [];
if (obj.coordinate) { if (obj.coordinate) {
data = obj.coordinate.split(','); data = obj.coordinate.split(',');
console.log(data);
} }
if (type === 'add') { if (type === 'add') {
AddIntegratedLogin({ AddIntegratedLogin({
systemName: obj.systemName, systemName: obj.systemName,
...@@ -455,10 +453,58 @@ const AddModal = props => { ...@@ -455,10 +453,58 @@ const AddModal = props => {
<Input allowClear style={{ width: '100%' }} placeholder="请输入名称" /> <Input allowClear style={{ width: '100%' }} placeholder="请输入名称" />
</Item> </Item>
)} )}
<Item label="外网地址" name="internetAddress"> <Item
label="外网地址"
name="internetAddress"
rules={[
{
validator: (rule, value) => {
let aa = form.getFieldValue().internetAddress;
let bb = aa.split('//');
let cc = bb[1].split(':');
let regEn = /^10\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
let regFn = /^172\.(1[6789]|2[0-9]|3[01])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
let regCn = /^192\.168\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
let reg = /^(127\.0\.0\.1)|(localhost)/;
let ss = [];
ss.push(regEn.test(cc[0]));
ss.push(regFn.test(cc[0]));
ss.push(regCn.test(cc[0]));
ss.push(reg.test(cc[0]));
if (ss.indexOf(true) !== -1) {
return Promise.reject('外网IP不正确');
}
return Promise.resolve();
},
},
]}
>
<AutoComplete placeholder="建议使用公网IP或域名" options={options} allowClear /> <AutoComplete placeholder="建议使用公网IP或域名" options={options} allowClear />
</Item> </Item>
<Item label="内网地址" name="intranetAddress"> <Item
label="内网地址"
name="intranetAddress"
rules={[
{
validator: (rule, value) => {
let aa = form.getFieldValue().intranetAddress;
let bb = aa.split('//');
let cc = bb[1].split(':');
let regEn = /^10\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
let regFn = /^172\.(1[6789]|2[0-9]|3[01])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
let regCn = /^192\.168\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[0-9])$/;
let ss = [];
ss.push(regEn.test(cc[0]));
ss.push(regFn.test(cc[0]));
ss.push(regCn.test(cc[0]));
if (ss.indexOf(true) == -1) {
return Promise.reject('局域网IP不正确');
}
return Promise.resolve();
},
},
]}
>
<AutoComplete placeholder="建议使用局域网IP" options={options} allowClear /> <AutoComplete placeholder="建议使用局域网IP" options={options} allowClear />
</Item> </Item>
<Row> <Row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment