Browse Source

修改proxy 代理

zhaojijng 2 years ago
parent
commit
b5f6606be2
3 changed files with 55 additions and 69 deletions
  1. 0 17
      config/proxy.ts
  2. 15 12
      src/services/ant-design-pro/environment.ts
  3. 40 40
      src/services/ant-design-pro/equipment.js

+ 0 - 17
config/proxy.ts

@@ -9,23 +9,6 @@
 export default {
   dev: {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
-    '/server/': {
-      // 要代理的地址
-      target: 'https://duoduoenv.sagacloud.cn/',
-      // 配置了这个可以从 http 代理到 https
-      // 依赖 origin 的功能可能需要这个,比如 cookie
-      changeOrigin: true,
-      //   pathRewrite: { '^/': '' },
-    },
-    '/api2/': {
-      // 要代理的地址
-      //target: 'http://192.168.0.14:52010/',
-      target: 'http://api.sagacloud.cn/',
-      // 配置了这个可以从 http 代理到 https
-      // 依赖 origin 的功能可能需要这个,比如 cookie
-      changeOrigin: true,
-      pathRewrite: { '^/api2': '' },
-    },
     '/api': {
       target: 'https://duoduoenv.sagacloud.cn/',
       // target: 'http://192.168.12.13:52011/',

+ 15 - 12
src/services/ant-design-pro/environment.ts

@@ -2,7 +2,7 @@
 import { request } from 'umi';
 
 export async function getMapList(body: any, options?: { [key: string]: any }) {
-  return request<API.MapInfoRes>('/api2/duoduo-service/setup-service/map/queryMapInfo', {
+  return request<API.MapInfoRes>('/api/duoduo-service/setup-service/map/queryMapInfo', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -13,7 +13,7 @@ export async function getMapList(body: any, options?: { [key: string]: any }) {
 }
 export async function getBuildingList(body: any, options?: { [key: string]: any }) {
   //debugger;
-  return request<API.BuildFloorList>('/api2/duoduo-service/object-service/object/building/query', {
+  return request<API.BuildFloorList>('/api/duoduo-service/object-service/object/building/query', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -24,7 +24,7 @@ export async function getBuildingList(body: any, options?: { [key: string]: any
 }
 export async function getFloorList(body: any, options?: { [key: string]: any }) {
   // debugger;
-  return request<API.BuildFloorList>('/api2/duoduo-service/object-service/object/floor/query', {
+  return request<API.BuildFloorList>('/api/duoduo-service/object-service/object/floor/query', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -36,7 +36,7 @@ export async function getFloorList(body: any, options?: { [key: string]: any })
 export async function queryDeviceTimeManage(params: any, options?: { [key: string]: any }) {
   //  '/api3/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage'
   return request<API.DeviceTimeType>(
-    '/api2/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage',
+    '/api/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage',
     {
       method: 'GET',
       params: {
@@ -52,16 +52,19 @@ function commonParams() {
 }
 // chart
 export async function queryPropertyData(params: any, options?: { [key: string]: any }) {
-  return request<API.DeviceTimeType>(`/server/spaceAdjust/queryPropertyData?${commonParams()}`, {
-    method: 'GET',
-    params: params,
-    ...(options || {}),
-  });
+  return request<API.DeviceTimeType>(
+    `/api/duoduo-service/duoduoenv-service/spaceAdjust/queryPropertyData?${commonParams()}`,
+    {
+      method: 'GET',
+      params: params,
+      ...(options || {}),
+    },
+  );
 }
 export async function queryEnvironmentParam(body: any, otherParam: { [key: string]: any }) {
-  //api2/duoduo-service/object-service/object/floor/queryParam
+  //api/duoduo-service/object-service/object/floor/queryParam
   return request<API.EnvironmentParam>(
-    `/api2/duoduo-service/object-service/object/floor/queryParam?endTime=${otherParam.endTime}&startTime=${otherParam.startTime}&param=${otherParam.param}`,
+    `/api/duoduo-service/object-service/object/floor/queryParam?endTime=${otherParam.endTime}&startTime=${otherParam.startTime}&param=${otherParam.param}`,
     {
       method: 'POST',
       headers: {
@@ -91,7 +94,7 @@ export async function queryEquipStatistics(params: any, options?: { [key: string
 
 export async function querySpace(body: any, options?: { [key: string]: any }) {
   //
-  return request<API.EnvironmentParam>(`/api2/duoduo-service/object-service/object/space/query`, {
+  return request<API.EnvironmentParam>(`/api/duoduo-service/object-service/object/space/query`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',

+ 40 - 40
src/services/ant-design-pro/equipment.js

@@ -5,38 +5,38 @@ function commonParams() {
     //   &userId=9a1ecfbacb6b4f249bf2dd3ec7793ead`;
 }
 function getProjectId() {
-  return 'Pj1101080259';
+    return 'Pj1101080259';
 }
 
 //窗帘  设置设备
 //窗帘  设置设备
-export const setEquipeHttp = (params)=> {
-    return request(`/server/object/eqp/infocode/set?${commonParams()}`,{
-      method: 'POST',
-      isNotShowErrorToast: true,
-      errorSave: true,
-      data: JSON.stringify(params),
-      headers: {
-          'Content-Type': 'application/json',
-      },
+export const setEquipeHttp = (params) => {
+    return request(`/api/duoduo-service/duoduoenv-service/object/eqp/infocode/set?${commonParams()}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify(params),
+        headers: {
+            'Content-Type': 'application/json',
+        },
     });
-  }
+}
 
 //窗帘 获取设备
 export const getObjectDataEqpGroupHttp = (params) => {
-  return request(`/server/object/objectDataEqpGroup/query?${commonParams()}`, {
-    method: 'POST',
-    isNotShowErrorToast: true,
-    errorSave: true,
-    data: JSON.stringify(params),
-  });
+    return request(`/api/duoduo-service/duoduoenv-service/object/objectDataEqpGroup/query?${commonParams()}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify(params),
+    });
 }
 
 
 
 // 灯的状态
 export const getLampHttp = (params) => {
-    return request(`/server/light/status/query?${commonParams()}&spaceId=${params}`, {
+    return request(`/api/duoduo-service/duoduoenv-service/light/status/query?${commonParams()}&spaceId=${params}`, {
         isNotShowErrorToast: true,
         errorSave: true,
         method: 'GET',
@@ -49,34 +49,34 @@ export const getLampHttp = (params) => {
 
 // 批量 开关灯
 export const setallLampHttp = (params) => {
-  return request(`/server/light/onoff/set?${commonParams()}`, {
-    method: 'POST',
-    isNotShowErrorToast: true,
-    errorSave: true,
-    data: JSON.stringify(params),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
+    return request(`/api/duoduo-service/duoduoenv-service/light/onoff/set?${commonParams()}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify(params),
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
 };
 
 // 开关失败时 定时查询灯状态
 export const getStatusHttp = (params) => {
-  return request(`/server/light/onoff/setSatus?${commonParams()}`, {
-    method: 'POST',
-    isNotShowErrorToast: true,
-    errorSave: true,
-    data: JSON.stringify(params),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
+    return request(`/api/duoduo-service/duoduoenv-service/light/onoff/setSatus?${commonParams()}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify(params),
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
 };
 
 
 //  空调 - 调节文案/空调信息
 export const getFeedbackDocumentsHttp = (params) => {
-    return request(`/server/custom/feedback/documents?${commonParams()}`, {
+    return request(`/api/duoduo-service/duoduoenv-service/custom/feedback/documents?${commonParams()}`, {
         isNotShowErrorToast: true,
         errorSave: true,
         method: 'POST',
@@ -89,7 +89,7 @@ export const getFeedbackDocumentsHttp = (params) => {
 
 //  空调 调节
 export const changeAirHttp = (params) => {
-    return request(`/server/custom/feedbackCreate/v2?${commonParams()}`, {
+    return request(`/api/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
@@ -102,7 +102,7 @@ export const changeAirHttp = (params) => {
 
 // 空间环境质量
 export const getSpaceAdjustList = (params) => {
-    return request(`/server/space/property?${commonParams()}`, {
+    return request(`/api/duoduo-service/duoduoenv-service/space/property?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
@@ -114,7 +114,7 @@ export const getSpaceAdjustList = (params) => {
 }
 //  批量空调 调节
 export const changeAllAirHttp = (body) => {
-    return request(`/server/custom/feedbackCreate/v2Batch?${commonParams()}`, {
+    return request(`/api/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2Batch?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,