Commit c50899f0 authored by 杨思琦's avatar 杨思琦

fix: 新增中台配置

parent f7423a2a
Pipeline #66715 passed with stages
......@@ -114,9 +114,9 @@
"@wisdom-map/arcgismap": "1.4.0-116",
"@wisdom-map/basemap": "1.1.0-20",
"@wisdom-map/util": "^1.0.28-0",
"@wisdom-utils/components": "0.1.286",
"@wisdom-utils/components": "0.1.287",
"@wisdom-utils/runtime": "0.0.38",
"@wisdom-utils/utils": "0.1.326",
"@wisdom-utils/utils": "0.1.327",
"animate.css": "^4.1.1",
"antd": "4.21.2",
"compression": "1.7.4",
......
......@@ -18,7 +18,6 @@ const App = props => {
useEffect(() => {
event.emit('loading', props.loading);
}, [props.loading]);
const metaSecurity = /https/.test(window.location.protocol) ? (
<meta httpEquiv="Content-Security-Policy" content="upgrade-insecure-requests" />
) : null;
......
......@@ -2,14 +2,16 @@ import { request } from '@wisdom-utils/utils';
import * as constants from '@wisdom-utils/components/lib/AppLayout/helpers/constants';
const API = {
GET_INFORMATION: '/PandaCore/GCK/Message/GetInformationInfo',
GET_MQTT_SITE_CODE: '/PandaOMS/OMS/HostManager/GetEmqtConfig',
GET_INFORMATION_THREE: '/PandaOMS/OMS/MessageConfig/GetInformationInfo',
GET_MQTT_SITE_CODE: '/PandaOMS/OMS/HostManager/GetHostConfig',
POST_INFORMATION_STATUS: '/PandaCore/GCK/Message/PostInformationStatus',
POST_ADD_OPTIONS: '/CityInterface/rest/services/WisdomUnion.svc/CustomerManage/AddOption',
};
const services = {
getInformationInfo: {
url: API.GET_INFORMATION,
url: () =>
window?.globalConfig?.mqtt_mess?.MessageLevel === '3.0' ? API.GET_INFORMATION_THREE : API.GET_INFORMATION,
method: constants.REQUEST_METHOD_GET,
type: constants.REQUEST_HTTP,
},
......@@ -30,7 +32,7 @@ const services = {
},
};
export const postInformationStatus = (param) =>
export const postInformationStatus = param =>
request({
url: API.POST_INFORMATION_STATUS,
method: constants.REQUEST_METHOD_GET,
......
......@@ -4,8 +4,7 @@ export const API = {
IOT_CHANGE_PASSWORD: 'CityInterface/rest/services/OMS.svc/U_UpdatePasswordQuickGCK',
FILE_DOWNLOAD: '/cityinterface/rest/services/filedownload.svc/download',
UPDATE_AVATAR: '/CityInterface/rest/services/OMs.svc/U_EditUser',
UPLOAD_FILE_URL:
'/cityinterface/rest/services/filedownload.svc/uploadfile/个人信息/{path}/{filename}',
UPLOAD_FILE_URL: '/cityinterface/rest/services/filedownload.svc/uploadfile/个人信息/{path}/{filename}',
AVATAR_FILE_URL: '/cityinterface/rest/services/filedownload.svc/download',
GET_VERSION: '/CityInterface/rest/services/OMs.svc/U_GetVersion',
};
......
......@@ -204,10 +204,12 @@ class Login {
mqtt_path: DEFAULT_MQTT_PATH,
nginxStart: false,
mqtt_IsSSL: true,
ipConfig: {},
};
if (Array.isArray(res.data) && res.data.length > 0) {
if (res.data[0]) {
const data = res.data[0];
mqttConfig.ipConfig = data;
mqttConfig.mqtt_IsSSL = data.IsSSL ? data.IsSSL : false;
mqttConfig.mqtt_mess.site_code = data.SiteCode || self.globalConfig.userInfo.site;
mqttConfig.mqtt_mess.TcpIP = data.TcpIP;
......
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