From a89dd9a839560d320fa0302a06891dc6bf6a70a3 Mon Sep 17 00:00:00 2001
From: xu_lw <xu_lw@murongtech.com>
Date: Sun, 1 Sep 2019 14:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 console-web/src/utils/httpRequest.js          |  2 +-
 .../opn/opninterfaceinf-add-or-update.vue     | 46 ++++++++++---------
 .../opn/model/OpnInterfaceInfUpdateReqBO.java |  8 ++--
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/console-web/src/utils/httpRequest.js b/console-web/src/utils/httpRequest.js
index e4fefaf6..97759b35 100644
--- a/console-web/src/utils/httpRequest.js
+++ b/console-web/src/utils/httpRequest.js
@@ -44,7 +44,7 @@ http.interceptors.response.use(
 
     if (!isGDASucc(response.data)) {
       // console.log(response.data)
-      // Message.error({message: getGDAMsgInf(response.data)})
+      Message.error({ message: getGDAMsgInf(response.data) })
     }
 
     return response
diff --git a/console-web/src/views/modules/opn/opninterfaceinf-add-or-update.vue b/console-web/src/views/modules/opn/opninterfaceinf-add-or-update.vue
index b136e705..35f94d48 100644
--- a/console-web/src/views/modules/opn/opninterfaceinf-add-or-update.vue
+++ b/console-web/src/views/modules/opn/opninterfaceinf-add-or-update.vue
@@ -41,23 +41,31 @@
         </el-row>
         <el-row type="flex" class="row-bg">
           <el-col :span="7">
-            <el-input :readonly="readonly" v-model="dataForm.gw_req_path" placeholder="网关请求路径" style="width:250px"></el-input>
+            <el-form-item prop="gw_req_path" label-width="0px">
+              <el-input :readonly="readonly" v-model="dataForm.gw_req_path" placeholder="网关请求路径" style="width:250px"></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="2">
             <span>>>></span>
           </el-col>
           <el-col :span="3">
-            <el-select :disabled="readonly" v-model="dataForm.backend_req_type" placeholder="请选择" style="width:100px">
-              <el-option v-for="item in reqTypeList" :key="item.key" :label="item.value" :value="item.key"></el-option>
-            </el-select>
+            <el-form-item prop="backend_req_type" label-width="0px">
+              <el-select :disabled="readonly" v-model="dataForm.backend_req_type" placeholder="请选择" style="width:100px">
+                <el-option v-for="item in reqTypeList" :key="item.key" :label="item.value" :value="item.key"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-select :disabled="readonly" v-model="dataForm.backend_service" placeholder="后端服务" style="width:170px">
-              <el-option v-for="item in backendServiceList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
+            <el-form-item prop="backend_service" label-width="0px">
+              <el-select :disabled="readonly" v-model="dataForm.backend_service" placeholder="后端服务" style="width:170px">
+                <el-option v-for="item in backendServiceList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-input :readonly="readonly" v-model="dataForm.backend_req_path" placeholder="后端请求路径" style="width:250px"></el-input>
+            <el-form-item prop="backend_req_path" label-width="0px">
+              <el-input :readonly="readonly" v-model="dataForm.backend_req_path" placeholder="后端请求路径" style="width:250px"></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
       </div>
@@ -119,7 +127,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-button type="primary" size="mini" @click="addReqParams()">增加</el-button>
+          <el-button :disabled="readonly" type="primary" size="mini" @click="addReqParams()">增加</el-button>
         </el-row>
       </div>
       <div style="padding: 5px"></div>
@@ -160,7 +168,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-button type="primary" size="mini" @click="addConstParams()">增加</el-button>
+          <el-button :disabled="readonly" type="primary" size="mini" @click="addConstParams()">增加</el-button>
         </el-row>
       </div>
       <div style="padding: 5px"></div>
@@ -218,12 +226,8 @@
           const_params: '',
           status: '',
           remark: '',
-          reqParams: [
-            { 'seq': '1', 'pos': 'B', 'must': true, 'name': '', 'bpos': 'B', 'bname': '' }
-          ],
-          constParams: [
-            { 'seq': '1', 'name': '', 'pos': 'B', 'value': '' }
-          ]
+          reqParams: [],
+          constParams: []
         },
         dataRule: {
           gateway_id: [
@@ -271,12 +275,11 @@
     methods: {
       init(id) {
         this.dataForm.id = id || 0
-        this.dataForm.reqParams = []
-        this.dataForm.constParams = []
-
         this.visible = true
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
+          this.dataForm.reqParams = []
+          this.dataForm.constParams = []
           if (this.dataForm.id) {
             this.$http({
               url: this.$http.adornUrl(`/buiopnbpc1/opninterfaceinf/query.do?id=${this.dataForm.id}`),
@@ -336,7 +339,7 @@
       },
       getBackendServiceList() {
         this.$http({
-          url: this.$http.adornUrl(`/buiopnbpc1/opnbackgroundman/list.do?gateway_id=${this.dataForm.gateway_id}`),
+          url: this.$http.adornUrl(`/buiopnbpc1/opnbackendserverinf/list.do?gateway_id=${this.dataForm.gateway_id}`),
           method: 'get',
           params: this.$http.adornParams()
         }).then(({ data }) => {
@@ -389,6 +392,7 @@
         }
         this.dataForm.req_params = JSON.stringify(this.dataForm.reqParams)
         this.dataForm.const_params = JSON.stringify(this.dataForm.constParams)
+        this.dataForm.req_method = this.dataForm.reqMethods.join(',')
 
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
@@ -400,7 +404,7 @@
                 'gateway_id': this.dataForm.gateway_id,
                 'group_id': this.dataForm.group_id,
                 'name': this.dataForm.name,
-                'req_method': this.dataForm.reqMethods.join(','),
+                'req_method': this.dataForm.req_method,
                 'gw_req_path': this.dataForm.gw_req_path,
                 'backend_req_type': this.dataForm.backend_req_type,
                 'backend_service': this.dataForm.backend_service,
diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/opn/model/OpnInterfaceInfUpdateReqBO.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/opn/model/OpnInterfaceInfUpdateReqBO.java
index 93897335..dd9695ba 100644
--- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/opn/model/OpnInterfaceInfUpdateReqBO.java
+++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/opn/model/OpnInterfaceInfUpdateReqBO.java
@@ -71,25 +71,25 @@ public class OpnInterfaceInfUpdateReqBO {
     /**
     * 请求参数
     */
-    @ECPDict(required = true,length = 2048, message = "reqParams值不合法")
+    @ECPDict(required = false,length = 2048, message = "reqParams值不合法")
     private String reqParams;
 
     /**
     * 响应参数
     */
-    @ECPDict(required = true,length = 2048, message = "rspParams值不合法")
+    @ECPDict(required = false,length = 2048, message = "rspParams值不合法")
     private String rspParams;
 
     /**
     * 常量参数
     */
-    @ECPDict(required = true,length = 256, message = "constParams值不合法")
+    @ECPDict(required = false,length = 256, message = "constParams值不合法")
     private String constParams;
 
     /**
     * 状态(1-有效,0-无效)
     */
-    @ECPDict(required = true,length = 1, message = "status值不合法")
+    @ECPDict(required = false,length = 1, message = "status值不合法")
     private String status;
 
     /**