Просмотр исходного кода

Merge branch 'master' into dev_duxiangyu

duxiangyu 3 лет назад
Родитель
Сommit
acbabeea8b

+ 2 - 0
public/systemConf.js

@@ -1,6 +1,8 @@
 var __systemConf = {
   //基础数据根域名
   baseServiceUrl: '/api',
+  //系统图服务域名
+  sysGraphServiceUrl: 'http://127.0.0.1',
   //导航菜单
   menus: [{
     "id": "ready",

+ 6 - 0
src/controller/sysGraphController.ts

@@ -0,0 +1,6 @@
+import { sysGraphHttpUtils } from "@/utils/http/sysGraphHttpUtils";
+
+export class sysGraphController { 
+    //查询系统图列表
+    async getDiagrams(){}
+}

+ 21 - 1
src/utils/http/axiosUtils.ts

@@ -49,7 +49,7 @@ export class axiosUtils {
   protected async getRequest(url: string, data: any) {
     try {
       let response = await this.customRequest(url, {}, data, "get");
-      return response.data;
+      return response;
     } catch (err) {
       throw err;
     }
@@ -85,10 +85,30 @@ export class axiosUtils {
     method: string = "post"
   ) {
     try {
+      //headers里放入 groupCode、projectId  为了兼顾老ADM的写法,以后可删除
       headers = headers || {};
       headers.groupCode =
         headers.groupCode || vueStore.state.selectProject.groupCode;
       headers.projectId = headers.projectId || vueStore.state.selectProject.id;
+
+      var urlArr = url.split("?");
+      var urlPrefix = urlArr[0];
+      var urlParamStr = urlArr[1] || "";
+      if (urlParamStr.indexOf("projectId=") == -1) {
+        urlParamStr =
+          "projectId=" + vueStore.state.selectProject.id + "&" + urlParamStr;
+      }
+
+      if (urlParamStr.indexOf("groupCode=") == -1) {
+        urlParamStr =
+          "groupCode=" +
+          vueStore.state.selectProject.groupCode +
+          "&" +
+          urlParamStr;
+      }
+
+      url = urlPrefix + "?" + urlParamStr;
+
       let response = await axiosservice({
         url,
         headers: headers || {},

+ 12 - 0
src/utils/http/sysGraphHttpUtils.ts

@@ -0,0 +1,12 @@
+/**
+ * 系统图服务的http辅助类,供业务调用
+ * nh 2022.1.5
+ */
+
+import { httpUtils } from "./httpUtils";
+
+export class sysGraphHttpUtils extends httpUtils {
+    constructor() {
+        super((window as any).__systemConf.sysGraphServiceUrl);
+    };
+}