saas--服务网关更换

53bb0c6f · kangzhenfei · 87f823a1 · 53bb0c6f · 53bb0c6f · 53bb0c6f
Commit 53bb0c6f authored Aug 12, 2020 by kangzhenfei
6 changed files
--- a/pages/system/account/api.js
+++ b/pages/system/account/api.js
 import Api from '@/plugins/request'
 export default {
-    index:`${system}/account/paged`,
+    index:`${systemNew}/account/paged`,
    paged(params){
-    return Api.post(`${system}/account/paged`,params);
+    return Api.post(`${systemNew}/account/paged`,params);
    },
    get(params){
-    return Api.get(`${system}/account/get`,params);
+    return Api.get(`${systemNew}/account/get`,params);
    },
    create(params){
-    return Api.post(`${system}/account/create`,params);
+    return Api.post(`${systemNew}/account/create`,params);
    },
    update(params){
-    return Api.post(`${system}/account/update`,params);
+    return Api.post(`${systemNew}/account/update`,params);
    },
    //删除：
    delete(params) {
-    return Api.delete(`${system}/account/delete`,{params:params});
+    return Api.delete(`${systemNew}/account/delete`,{params:params});
    },
    }
\ No newline at end of file
--- a/pages/system/dic/api.js
+++ b/pages/system/dic/api.js
 import api from '@/plugins/request'
 // const u=(path)=>`${systemUrl}/Dictionary/${path}`
-const u=(path)=>`${systemNew}/api/services/app/dictionary/${path}` //49.232.68.61:10130/api/services/app/dictionary/getall
+const u=(path)=>`${systemNew}/dictionary/${path}` //49.232.68.61:10130/api/services/app/dictionary/getall
 export default {
    getChildren(id) {
        return api.get(u("getchildren"), { id })

--- a/pages/system/host/api.js
+++ b/pages/system/host/api.js
 import Api from '@/plugins/request'
 export default {
    // index:`${authUrl}/api/services/app/host/paged`,
-    index:`${systemNew}/api/services/app/host/paged`, //new
+    index:`${systemNew}/host/paged`, //new
    paged(params){
        // return Api.post(`${authUrl}/api/services/app/host/paged`,params); systemNew
-        return Api.post(`${systemNew}/api/services/app/host/paged`,params); 
+        return Api.post(`${systemNew}/host/paged`,params); 
    },
    get(params){
-        return Api.get(`${systemNew}/api/services/app/host/get`,params);
+        return Api.get(`${systemNew}/host/get`,params);
    },
    create(params){
-        return Api.post(`${systemNew}/api/services/app/host/create`,params);
+        return Api.post(`${systemNew}/host/create`,params);
    },
    update(params){
-        return Api.post(`${systemNew}/api/services/app/host/update`,params);
+        return Api.post(`${systemNew}/host/update`,params);
    },
    //删除：
    delete(params) {
-        return Api.delete(`${systemNew}/api/services/app/host/delete`,{params:params});
+        return Api.delete(`${systemNew}/host/delete`,{params:params});
    },
    }
\ No newline at end of file
--- a/pages/system/tanant/api.js
+++ b/pages/system/tanant/api.js
 import Api from '@/plugins/request'
 export default {
-    index: `${authUrl}/api/services/app/tanant/paged`,
+    index: `${systemNew}/tenant/paged`,
    paged(params) {
-        return Api.post(`${authUrl}/api/services/app/tanant/paged`, params);
+        return Api.post(`${systemNew}/tenant/paged`, params);
    },
    get(params) {
-        return Api.get(`${authUrl}/api/services/app/tanant/get`, params);
+        return Api.get(`${systemNew}/tenant/get`, params);
    },
    create(params) {
-        return Api.post(`${authUrl}/api/services/app/tanant/create`, params);
+        return Api.post(`${systemNew}/tenant/create`, params);
    },
    update(params) {
-        return Api.post(`${authUrl}/api/services/app/tanant/update`, params);
+        return Api.post(`${systemNew}/tenant/update`, params);
    },
    //删除：
    delete(params) {
-        return Api.delete(`${authUrl}/api/services/app/tanant/delete`, { params: params });
+        return Api.delete(`${systemNew}/tenant/delete`, { params: params });
    },
    bindhostlist() {
-        return Api.post(`${authUrl}/api/services/app/host/list`, {});
+        return Api.post(`${systemNew}/host/list`, {});///tanant
    },
    tanantinit(params) {
-        return Api.post(`${authUrl}/api/services/app/tanant/tanantinit`,params );
+        return Api.post(`${systemNew}/tenant/tenantinit`,params );
    },
    setMenu(params) {
-        return Api.post(`${system}/setmenucompany/create`,params );
+        return Api.post(`${systemNew}/setmenucompany/create`,params );
    },
    setAps(params){
-        return Api.post(`${system}/setschedulecompany/create`,params );
+        return Api.post(`${systemNew}/setschedulecompany/create`,params );
    },
    apsList(params){
-        return Api.post(`${system}/setschedulecompany/list`,params );
+        return Api.post(`${systemNew}/setschedulecompany/list`,params );
    }
 }
\ No newline at end of file
--- a/pages/system/tanant/search.vue
+++ b/pages/system/tanant/search.vue
 <template>
  <Form ref="form" :model="condition" :label-width="90">
    <Row>
-<Col :span="12" :v-if="condition.id.show"><FormItem :label="l('id')" prop="id">                    <Input v-model="condition.id.value"> </Input>
+      <Col :span="12" :v-if="condition.id.show">
-</FormItem></Col>
+        <FormItem :label="l('id')" prop="id">
-<Col :span="12" :v-if="condition.name.show"><FormItem :label="l('name')" prop="name">                    <Input v-model="condition.name.value"> </Input>
+          <Input v-model="condition.id.value"></Input>
-</FormItem></Col>
+        </FormItem>
-<Col :span="12" :v-if="condition.code.show"><FormItem :label="l('code')" prop="code">                    <Input v-model="condition.code.value"> </Input>
+      </Col>
-</FormItem></Col>
+      <Col :span="12" :v-if="condition.name.show">
-<Col :span="12" :v-if="condition.typeId.show"><FormItem :label="l('typeId')" prop="typeId">                    <Input v-model="condition.typeId.value"> </Input>
+        <FormItem :label="l('name')" prop="name">
-</FormItem></Col>
+          <Input v-model="condition.name.value"></Input>
-<Col :span="12" :v-if="condition.startTime.show"><FormItem :label="l('startTime')" prop="startTime">                    <DatePicker type="daterange" v-model="condition.startTime.value"></DatePicker>
+        </FormItem>
-</FormItem></Col>
+      </Col>
-<Col :span="12" :v-if="condition.endTime.show"><FormItem :label="l('endTime')" prop="endTime">                    <DatePicker type="daterange" v-model="condition.endTime.value"></DatePicker>
+      <Col :span="12" :v-if="condition.code.show">
-</FormItem></Col>
+        <FormItem :label="l('code')" prop="code">
-<Col :span="12" :v-if="condition.initialized.show"><FormItem :label="l('initialized')" prop="initialized">                    <Dictionary code="system.tanant.initialized" v-model="condition.initialized.value"></Dictionary>
+          <Input v-model="condition.code.value"></Input>
-</FormItem></Col>
+        </FormItem>
-<Col :span="12" :v-if="condition.dataSourceId.show"><FormItem :label="l('dataSourceId')" prop="dataSourceId">                    <Input v-model="condition.dataSourceId.value"> </Input>
+      </Col>
-</FormItem></Col>
+      <Col :span="12" :v-if="condition.typeId.show">
-<Col :span="12" :v-if="condition.creationTime.show"><FormItem :label="l('creationTime')" prop="creationTime">                    <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
+        <FormItem :label="l('typeId')" prop="typeId">
-</FormItem></Col>
+          <Input v-model="condition.typeId.value"></Input>
-<Col :span="12" :v-if="condition.creatorUserId.show"><FormItem :label="l('creatorUserId')" prop="creatorUserId">                    <Input v-model="condition.creatorUserId.value"> </Input>
+        </FormItem>
-</FormItem></Col>
+      </Col>
-<Col :span="12" :v-if="condition.lastModificationTime.show"><FormItem :label="l('lastModificationTime')" prop="lastModificationTime">                    <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
+      <Col :span="12" :v-if="condition.startTime.show">
-</FormItem></Col>
+        <FormItem :label="l('startTime')" prop="startTime">
-<Col :span="12" :v-if="condition.lastModifierUserId.show"><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">                    <Input v-model="condition.lastModifierUserId.value"> </Input>
+          <DatePicker type="daterange" v-model="condition.startTime.value"></DatePicker>
-</FormItem></Col>
+        </FormItem>
-<Col :span="12" :v-if="condition.isDeleted.show"><FormItem :label="l('isDeleted')" prop="isDeleted">                    <Input v-model="condition.isDeleted.value"> </Input>
+      </Col>
-</FormItem></Col>
+      <Col :span="12" :v-if="condition.endTime.show">
-<Col :span="12" :v-if="condition.deletionTime.show"><FormItem :label="l('deletionTime')" prop="deletionTime">                    <DatePicker type="daterange" v-model="condition.deletionTime.value"></DatePicker>
+        <FormItem :label="l('endTime')" prop="endTime">
-</FormItem></Col>
+          <DatePicker type="daterange" v-model="condition.endTime.value"></DatePicker>
-<Col :span="12" :v-if="condition.deleterUserId.show"><FormItem :label="l('deleterUserId')" prop="deleterUserId">                    <Input v-model="condition.deleterUserId.value"> </Input>
+        </FormItem>
-</FormItem></Col>
+      </Col>
-<Col :span="12" :v-if="condition.hostId.show"><FormItem :label="l('hostId')" prop="hostId">                    <Input v-model="condition.hostId.value"> </Input>
+      <Col :span="12" :v-if="condition.initialized.show">
-</FormItem></Col>
+        <FormItem :label="l('initialized')" prop="initialized">
+          <Dictionary code="system.tanant.initialized" v-model="condition.initialized.value"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.dataSourceId.show">
+        <FormItem :label="l('dataSourceId')" prop="dataSourceId">
+          <Input v-model="condition.dataSourceId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.creationTime.show">
+        <FormItem :label="l('creationTime')" prop="creationTime">
+          <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.creatorUserId.show">
+        <FormItem :label="l('creatorUserId')" prop="creatorUserId">
+          <Input v-model="condition.creatorUserId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.lastModificationTime.show">
+        <FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
+          <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.lastModifierUserId.show">
+        <FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
+          <Input v-model="condition.lastModifierUserId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.isDeleted.show">
+        <FormItem :label="l('isDeleted')" prop="isDeleted">
+          <Input v-model="condition.isDeleted.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.deletionTime.show">
+        <FormItem :label="l('deletionTime')" prop="deletionTime">
+          <DatePicker type="daterange" v-model="condition.deletionTime.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.deleterUserId.show">
+        <FormItem :label="l('deleterUserId')" prop="deleterUserId">
+          <Input v-model="condition.deleterUserId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.hostId.show">
+        <FormItem :label="l('hostId')" prop="hostId">
+          <Input v-model="condition.hostId.value"></Input>
+        </FormItem>
+      </Col>
    </Row>
  </Form>
 </template>
 <script>
-    import Api from './api'
+import Api from "./api";
-    export default {
+export default {
-        name: 'Add',
+  name: "Add",
  data() {
    return {
      condition: {
-id:{op:"Equal",value:null,show:false},
+        id: { op: "Equal", value: null, show: false },
-name:{op:"Equal",value:null,show:true},
+        name: { op: "Equal", value: null, show: true },
-code:{op:"Equal",value:null,show:true},
+        code: { op: "Equal", value: null, show: true },
-typeId:{op:"Equal",value:null,show:true},
+        typeId: { op: "Equal", value: null, show: true },
-startTime:{op:"Range",value:null,show:true},
+        startTime: { op: "Range", value: null, show: true },
-endTime:{op:"Range",value:null,show:true},
+        endTime: { op: "Range", value: null, show: true },
-initialized:{op:"Equal",value:null,show:true},
+        initialized: { op: "Equal", value: null, show: true },
-dataSourceId:{op:"Equal",value:null,show:false},
+        dataSourceId: { op: "Equal", value: null, show: false },
-creationTime:{op:"Range",value:null,show:false},
+        creationTime: { op: "Range", value: null, show: false },
-creatorUserId:{op:"Equal",value:null,show:false},
+        creatorUserId: { op: "Equal", value: null, show: false },
-lastModificationTime:{op:"Range",value:null,show:false},
+        lastModificationTime: { op: "Range", value: null, show: false },
-lastModifierUserId:{op:"Equal",value:null,show:false},
+        lastModifierUserId: { op: "Equal", value: null, show: false },
-isDeleted:{op:"Equal",value:null,show:false},
+        isDeleted: { op: "Equal", value: null, show: false },
-deletionTime:{op:"Range",value:null,show:false},
+        deletionTime: { op: "Range", value: null, show: false },
-deleterUserId:{op:"Equal",value:null,show:false},
+        deleterUserId: { op: "Equal", value: null, show: false },
-hostId:{op:"Equal",value:null,show:true},
+        hostId: { op: "Equal", value: null, show: true }
-                                },
      }
+    };
  },
  methods: {
    handleClose() {
-                                this.$emit('on-close')
+      this.$emit("on-close");
    },
    l(key) {
      key = "tanant" + "." + key;
-                                return this.$t(key)
+      return this.$t(key);
-      }
    }
  }
+};
 </script>
\ No newline at end of file
--- a/static/config.js
+++ b/static/config.js
@@ -11,7 +11,8 @@ let address=systemApi.dev;
 window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
 window.system =`http://${address}:10000/auth`;//多租户后台系统
-window.systemNew =`http://${address}:10130`;//多租户后台系统-new 10130/platform/host/paged
+// window.system =`http://${address}:10000/platform`;//多租户后台系统 
+window.systemNew =`http://${address}:10000/platform`;//多租户后台系统-new 10130/platform/host/paged
 window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证  
 window.designUrl = `http://${address}:10000/process`; // 工艺规程
 window.PlanUrl = `http://${address}:10000/plan`; //订单