Skip to content

A
apaas-ui
Commit 656f98cb authored by 张亚松's avatar 张亚松
Browse files
Options

Merge branch 'dev' into 'master' 

Dev

See merge request apaas-v3/apaas-ui!2
parents ff4146e8 86e30e10
Show whitespace changes
Inline Side-by-side
Showing with 8503 additions and 31 deletions
src/pages/workbench/fwgl/apply_service_detail.vue
View file @ 656f98cb
......@@ -948,7 +948,7 @@ export default {
this.$set(
this.service_header_arr["first"][2],
"text",
data.service_apply_info.service_end_time
data.service_apply_info.request_end_time
.replace(/T|Z/g, " ")
.split("+")[0]
);
......@@ -1123,6 +1123,15 @@ export default {
if (data.data_service_type1_name != "数据服务") {
this.servicead_arr = this.servicead_arr.slice(0, 4);
}
if(data.service_apply_info.approval_status == 3){
//审批通过
this.servicead_arr.unshift({
title: "Authorization：",
info: data.service_apply_info.apaas_token,
})
}
console.log(data.service_apply_info);
if (data.service_apply_info.approval_process) {
data.service_apply_info.approval_process.forEach((e) => {
......
src/pages/workbench/fwzc_fwcs.vue
View file @ 656f98cb
......@@ -239,7 +239,7 @@
name="2"
>
<el-row class="sqxx_row">
<el-col :span="6">
<el-col :span="8">
<div class="sqxx_title">授权方式：</div>
<el-select
v-model="sqfsVal"
......@@ -253,6 +253,18 @@
:value="item.value"
></el-option>
</el-select>
<div
class="registration"
style="width: 100%"
>
<p>注册说明：</p>
<p>1、服务提供方按需填写服务的地址、请求参数和返回参数进行正常注册。</p>
<p>2、服务被调用时，平台会提供一个动态token，由服务提供方访问身份认证地址，进行认证。由平台返回身份认证结果，由服务提供方依据结果判断是否可以提供服务。</p>
<p>3、详细流程和接口说明，请点击下载 <a
:href="fwdesc"
download
>服务注册说明</a>。</p>
</div>
</el-col>
<el-col
:span="2"
......@@ -260,12 +272,20 @@
>
<div class="center_line"></div>
</el-col>
<el-col :span="16">
<div class="sqxx_title">Token：</div>
<el-col :span="14">
<div v-if="sqfsVal==1||sqfsVal==3">
<div class="sqxx_title">Token名称：</div>
<el-input
v-model="tokenName"
placeholder="请输入token名称"
></el-input>
<div class="sqxx_title">Token值：</div>
<el-input
v-model="tokenVal"
placeholder="请输入内容"
placeholder="请输入Token值"
></el-input>
</div>
</el-col>
</el-row>
</el-tab-pane>
......@@ -641,7 +661,7 @@
name="2"
>
<el-row class="sqxx_row">
<el-col :span="6">
<el-col :span="8">
<div class="sqxx_title">授权方式：</div>
<el-select
v-model="itemOne.sqfsVal"
......@@ -655,6 +675,18 @@
:value="item.value"
></el-option>
</el-select>
<div
class="registration"
style="width: 100%"
>
<p>注册说明：</p>
<p>1、服务提供方按需填写服务的地址、请求参数和返回参数进行正常注册。</p>
<p>2、服务被调用时，平台会提供一个动态token，由服务提供方访问身份认证地址，进行认证。由平台返回身份认证结果，由服务提供方依据结果判断是否可以提供服务。</p>
<p>3、详细流程和接口说明，请点击下载 <a
:href="fwdesc"
download
>服务注册说明</a>。</p>
</div>
</el-col>
<el-col
:span="2"
......@@ -662,12 +694,19 @@
>
<div class="center_line_one"></div>
</el-col>
<el-col :span="16">
<div class="sqxx_title">Token：</div>
<el-col :span="14">
<div v-if="itemOne.sqfsVal==1||itemOne.sqfsVal==3">
<div class="sqxx_title">Token名称：</div>
<el-input
v-model="itemOne.tokenName"
placeholder="请输入Token名称"
></el-input>
<div class="sqxx_title">Token值：</div>
<el-input
v-model="itemOne.tokenVal"
placeholder="请输入内容"
placeholder="请输入Token值"
></el-input>
</div>
</el-col>
</el-row>
</el-tab-pane>
......@@ -959,7 +998,7 @@ export default {
serviceUrl: "",
datasSj: [],
sjfwQqt: "JSON",
sqfsVal: "",
sqfsVal: 0,
tokenVal: "",
noSearchUrl: "",
resultShow: false,
......@@ -1101,8 +1140,13 @@ export default {
emptyText: "暂无数据",
resultShow: false,
resSuccess: false,
optionsSq: [{ label: "Bearer Token", value: "Bearer" }],
sqfsVal: "",
optionsSq: [
{ label: "无授权", value: 0 },
{ label: "厂商静态token鉴权", value: 1 },
{ label: "动态token鉴权", value: 2 },
],
sqfsVal: 0,
tokenName: "Authorization",
tokenVal: "",
sjfwQqt: "JSON",
zhfwQqt: "JSON",
......@@ -1201,7 +1245,8 @@ export default {
user_id: "",
fwR: false,
mapR: false,
proR: false
proR: false,
fwdesc: "/apaas/service/v3/service/manager/register/instruction",
};
},
computed: {},
......@@ -1237,7 +1282,7 @@ export default {
serviceUrl: "",
datasSj: [],
sjfwQqt: "JSON",
sqfsVal: "",
sqfsVal: 0,
tokenVal: "",
noSearchUrl: "",
resultShow: false,
......@@ -1288,9 +1333,15 @@ export default {
let requestData = {};
let requestHeaderDataObj = {};
if (this.activeBtn == 0 || this.activeBtn == 3) {
if (this.sqfsVal != "") {
headers.Authorization = [];
headers.Authorization[0] = this.sqfsVal + " " + this.tokenVal;
if (this.sqfsVal == 1 || this.sqfsVal == 3) {
if (this.tokenName == "") {
this.$message.error("请输入token名称");
return;
}
if (this.tokenVal == "") {
this.$message.error("请输入token值");
return;
}
}
let request = this.$refs.fwcs_sjfw_qq.getTableData();
for (let i = 0; i < request.length; i++) {
......@@ -1398,6 +1449,11 @@ export default {
let query = {
method: this.select,
url: this.serviceUrl,
req_auth_mthod: this.sqfsVal,
req_auth_token:
this.sqfsVal == 1 || this.sqfsVal == 3 ? this.tokenVal : "",
req_auth_token_name:
this.sqfsVal == 1 || this.sqfsVal == 3 ? this.tokenName : "",
headers: headers,
params: requestData,
body: bodys,
......@@ -1607,6 +1663,7 @@ export default {
response_type: "JSON",
req_auth_mthod: 0,
req_auth_token: "",
req_auth_token_name: "",
method: "GET",
url: this.serviceUrl,
request_fields: [],
......@@ -1634,6 +1691,7 @@ export default {
response_type: "JSON",
req_auth_mthod: 0,
req_auth_token: "",
req_auth_token_name: "",
method: "GET",
url: this.serviceUrl,
request_fields: [],
......@@ -1757,8 +1815,10 @@ export default {
name: "",
response_type:
this.activeBtn == 3 ? this.gz_fhsjgs : "JSON",
req_auth_mthod: 0,
req_auth_token: this.tokenVal,
req_auth_mthod: this.sqfsVal,
req_auth_token: this.sqfsVal == 1 ? this.tokenVal : "",
req_auth_token_name:
this.sqfsVal == 1 ? this.tokenName : "",
method: this.select,
url: this.serviceUrl,
request_fields:
......@@ -1807,8 +1867,9 @@ export default {
urls.push({
req_name: item.one_input,
response_type: "JSON",
req_auth_mthod: 0,
req_auth_token: item.tokenVal,
req_auth_mthod: item.sqfsVal,
req_auth_token: item.sqfsVal == 1 ? item.tokenVal : "",
req_auth_token_name: item.sqfsVal == 1 ? item.tokenName : "",
method: item.select,
url: item.serviceUrl,
request_fields:
......@@ -2134,7 +2195,7 @@ export default {
serviceUrl: "",
datasSj: [],
sjfwQqt: "JSON",
sqfsVal: "",
sqfsVal: 0,
tokenVal: "",
noSearchUrl: "",
resultShow: false,
......@@ -2227,9 +2288,15 @@ export default {
let headers = {};
let requestData = {};
let dataOne = this.liucheng_list[indexOne];
if (dataOne.sqfsVal != "") {
headers.Authorization = [];
headers.Authorization[0] = dataOne.sqfsVal + " " + dataOne.tokenVal;
if (dataOne.sqfsVal == 1 || dataOne.sqfsVal == 3) {
if (dataOne.tokenName == "") {
this.$message.error("请输入token名称");
return;
}
if (dataOne.tokenVal == "") {
this.$message.error("请输入token值");
return;
}
}
let request = this.$refs["one_qqcs_" + indexOne][0].getTableData();
for (let i = 0; i < request.length; i++) {
......@@ -2260,6 +2327,11 @@ export default {
let query = {
method: dataOne.select,
url: dataOne.serviceUrl,
req_auth_mthod: dataOne.sqfsVal,
req_auth_token:
dataOne.sqfsVal == 1 || dataOne.sqfsVal == 3 ? dataOne.tokenVal : "",
req_auth_token_name:
dataOne.sqfsVal == 1 || dataOne.sqfsVal == 3 ? dataOne.tokenName : "",
headers: headers,
params: requestData,
body: bodys,
......@@ -2635,6 +2707,20 @@ export default {
.cp_mb {
padding: 0 0 16px 8px;
}
.registration {
width: 430px;
margin: 10px auto;
}
.registration a {
color: #0000ff;
text-decoration: none;
}
.registration p {
line-height: 26px;
}
.registration p:nth-of-type(1) {
color: #0000ff;
}
</style>
<style>
.fwcs_fwdz_inner .el-select .el-input {
......
yarn.lock 0 → 100644
View file @ 656f98cb
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment