Merge branch 'master' of http://192.168.0.35:3000/lmp/lmp_web

src/api/GptController/applicationAccess.js → src/api/GptController/ApiManage.js

-export default class applicationAccess {
+export default class ApiManage {
   static list (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/applicationAccess/list', 'post', params, axiosOption, httpOption);
+    return sender.doUrl('/admin/app/apiManage/list', 'post', params, axiosOption, httpOption);
   }
 
   static view (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/applicationAccess/view', 'get', params, axiosOption, httpOption);
+    return sender.doUrl('/admin/app/apiManage/view', 'get', params, axiosOption, httpOption);
   }
 
   static add (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/applicationAccess/add', 'post', params, axiosOption, httpOption);
+    return sender.doUrl('/admin/app/apiManage/add', 'post', params, axiosOption, httpOption);
   }
 
   static update (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/applicationAccess/update', 'post', params, axiosOption, httpOption);
+    return sender.doUrl('/admin/app/apiManage/update', 'post', params, axiosOption, httpOption);
   }
 
   static delete (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/applicationAccess/delete', 'post', params, axiosOption, httpOption);
+    return sender.doUrl('/admin/app/apiManage/delete', 'post', params, axiosOption, httpOption);
   }
 }

src/api/gptController.js

@@ -21,6 +21,7 @@ import KnowledgeGraph from './GptController/KnowledgeGraph.js';
 import DataSetCleaning from './GptController/DataSetCleaning.js';
 import applicationAccess from './GptController/applicationAccess.js'
 import plugOrchestration from './GptController/plugOrchestration.js';
+import ApiManage from './GptController/ApiManage.js';
 
 export {
   TemplateController,
@@ -45,4 +46,5 @@ export {
   DataSetCleaning,
   applicationAccess,
   plugOrchestration
+  ApiManage
 }

src/router/systemRouters.js

@@ -56,7 +56,7 @@ const routers = [
       { path: 'modelDeployment', component: _import('gptTraining/modelManagement/modelDeployment/index'), name: 'modelDeployment', props: getProps, meta: { title: '模型部署' } },
       // 模型服务
       { path: 'serviceManagement', component: _import('gptTraining/modelService/serviceManagement/index'), name: 'serviceManagement', props: getProps, meta: { title: '在线服务' } },
-      { path: 'applicationAccess', component: _import('gptTraining/modelService/applicationAccess/index'), name: 'applicationAccess', props: getProps, meta: { title: '应用接入' } },
+      { path: 'apiManage', component: _import('gptTraining/modelService/apiManage/index'), name: 'apiManage', props: getProps, meta: { title: '应用接入' } },
       { path: 'testOnline', component: _import('gptTraining/modelService/testOnline/index'), name: 'testOnline', props: getProps, meta: { title: '在线测试' } },
       { path: 'callStatistics', component: _import('gptTraining/modelService/callStatistics/index'), name: 'callStatistics', props: getProps, meta: { title: '调用统计' } },
       { path: 'plugOrchestration', component: _import('gptTraining/modelService/plugOrchestration/index'), name: 'plugOrchestration', props: getProps, meta: { title: '插件编排' } },

src/views/gptTraining/modelService/applicationAccess/dialog/editOrAdd.vue → src/views/gptTraining/modelService/apiManage/dialog/editOrAdd.vue

@@ -3,12 +3,12 @@
 
   <el-form label-position="left" ref="form" label-width="100px" :model="form" :size="defaultFormItemSize" :rules="rules">
     <el-row class="title">基本信息</el-row>
-    <el-form-item label="应用名称:" prop="applicationAccessDto.applicationName">
-      <el-input v-model="form.applicationAccessDto.applicationName" class="inputWidth" :size="defaultFormItemSize"></el-input>
+    <el-form-item label="应用名称:" prop="apiManageDto.apiName">
+      <el-input v-model="form.apiManageDto.apiName" class="inputWidth" :size="defaultFormItemSize"></el-input>
       <el-row> <span class="introduce">支持中英文、数字、下划线(_)，2-20个字符，不能以下划线为开头</span></el-row>
     </el-form-item>
     <el-form-item label="应用描述:">
-      <el-input v-model="form.applicationAccessDto.applicationDescribe" type="textarea" class="inputWidth" :rows="5" :size="defaultFormItemSize"></el-input>
+      <el-input v-model="form.apiManageDto.remark" type="textarea" class="inputWidth" :rows="5" :size="defaultFormItemSize"></el-input>
     </el-form-item>
     <el-row type="flex" justify="end" class="dialog-btn-layer mt20">
       <el-button :size="defaultFormItemSize" :plain="true" @click="onCancel(false)">取消</el-button>
@@ -17,20 +17,20 @@
   </el-form>
 </template>
 <script>
-import { applicationAccess } from '@/api/gptController.js'
+import { ApiManage } from '@/api/gptController.js'
 export default {
   data() {
     return {
       taskList: [],
       runNameList: [],
       form: {
-        applicationAccessDto: {
-          applicationDescribe: '',
-          applicationName: ''
+        apiManageDto: {
+          remark: '',
+          apiName: ''
         }
       },
       rules: {
-        'applicationAccessDto.applicationName': [{ required: true, message: '请输入应用名称', trigger: 'blur' }]
+        'apiManageDto.apiName': [{ required: true, message: '请输入应用名称', trigger: 'blur' }]
       }
     }
   },
@@ -67,7 +67,7 @@ export default {
             params = { ...this.form }
 
             if (this.isEdit) {
-              applicationAccess.update(this, params)
+              ApiManage.update(this, params)
                 .then((res) => {
                   resolve(res)
                   this.$message.success('编辑成功')
@@ -77,7 +77,7 @@ export default {
                   reject(e)
                 })
             } else {
-              applicationAccess.add(this, params)
+              ApiManage.add(this, params)
                 .then((res) => {
                   resolve(res)
                   this.$message.success('添加成功')

src/views/gptTraining/modelService/applicationAccess/index.vue → src/views/gptTraining/modelService/apiManage/index.vue

@@ -32,17 +32,17 @@
             <el-button class="add" type="primary" icon="el-icon-plus" :size="defaultFormItemSize" @click="add">创建应用</el-button>
           </el-form-item>
           <el-form-item label="应用名称" prop="formFilter.modelName" label-width="120px">
-            <el-input class="filter-item" v-model="myDataSetPage.formFilter.applicationName" :clearable="true" placeholder="应用名称" />
+            <el-input class="filter-item" v-model="myDataSetPage.formFilter.apiName" :clearable="true" placeholder="应用名称" />
           </el-form-item>
         </filter-box>
       </el-form>
 
       <vxe-table border show-header-overflow show-overflow :row-config="{ isHover: true }" :data="myDataSetPage.tableData.impl.dataList" min-height="96">
-        <vxe-column field="applicationName" title="应用名称"></vxe-column>
+        <vxe-column field="apiName" title="应用名称"></vxe-column>
         <vxe-column field="appId" title="AppID"></vxe-column>
         <vxe-column field="apiKey" title="API Key"></vxe-column>
         <vxe-column field="secretKey" title="Secret Key"></vxe-column>
-        <vxe-column field="applicationDescribe" title="描述"></vxe-column>
+        <vxe-column field="remark" title="描述"></vxe-column>
         <vxe-column field="createTime" title="创建时间"></vxe-column>
         <vxe-column field="operation" title="操作">
           <template slot-scope="scope">
@@ -68,7 +68,7 @@
 import { mapGetters } from 'vuex'
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js'
-import { applicationAccess } from '@/api/gptController.js'
+import { ApiManage } from '@/api/gptController.js'
 import editOrAdd from './dialog/editOrAdd'
 export default {
   data() {
@@ -94,7 +94,7 @@ export default {
       ],
       myDataSetPage: {
         formFilter: {
-          applicationName: ''
+          apiName: ''
         },
 
         tableData: {
@@ -118,11 +118,11 @@ export default {
       if (params == null) params = {}
       params = {
         ...params,
-        applicationAccessDtoFilter: { ...this.myDataSetPage.formFilter }
+        apiManageDtoFilter: { ...this.myDataSetPage.formFilter }
       }
 
       return new Promise((resolve, reject) => {
-        applicationAccess
+        ApiManage
           .list(this, params)
           .then((res) => {
             resolve({
@@ -160,7 +160,7 @@ export default {
         type: 'warning'
       }).then(() => {
         let params = { kgId: item.kgId }
-        applicationAccess
+        ApiManage
           .delete(this, params)
           .then((res) => {
             this.$message.success('删除成功')