From 050f33e5f4ab93f3c3f797616dd0b4e7ae43738c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cgrape=E2=80=9D?= <18746553572@163.com>
Date: Wed, 28 Dec 2022 10:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E7=BC=93=E5=AD=98=E4=B8=8E=E6=B7=BB=E5=8A=A0=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=A4=B4=E4=B8=8E=E8=81=94=E8=B0=83=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      | 24 +++++++++--
 src/components/common/PicketAcced.vue         |  2 -
 src/constants/api/login/common.api.ts         |  9 ++--
 src/constants/api/login/login-mgt.api.ts      |  4 +-
 .../api/ms-application/application.api.ts     |  3 +-
 src/constants/api/ms-system/system.api.ts     | 12 +++++-
 src/services/api.service.ts                   |  2 +
 src/views/authentication/LoginView.vue        | 15 ++++++-
 src/views/workbench/modifyInfo.vue            | 43 ++++++++++++++++---
 9 files changed, 95 insertions(+), 19 deletions(-)

diff --git a/.env.dev b/.env.dev
index 74ce16a..0ee36b1 100644
--- a/.env.dev
+++ b/.env.dev
@@ -10,16 +10,34 @@ VUE_APP_CLIENT_ID = web-loong
 VUE_APP_CLIENT_SECRET = web-loong-secret
 // 接口版本号
 VUE_APP_API_PREFIX = /api/v1
-// 网关服务
 
+
+
+
+
+//////////////// local
+// 网关服务
 VUE_APP_MS_GATEWAY_API =  http://192.168.14.1:9140
+//VUE_APP_ONLINE_API = http://192.168.14.1:9155/ms-online/api/v1
+VUE_APP_SYSTEM_API = ms-system/api/v1/
 
 
-// 业务服务
+//////////////// serve
+// 网关服务
+//VUE_APP_MS_GATEWAY_API =  http://10.2.3.118:9140
+//online
+VUE_APP_ONLINE_API = /ms-online/api/v1
+
 VUE_APP_AUTH_API = /ms-system/api/v1/sys-cust-info/permit_endpoint
 VUE_APP_MS_SYSTEM_API = /ms-system/api/v1/sys-cust-info/permit_endpoint
 
 
+
+
+
+
+
+
 VUE_APP_MS_AUTH_API = http://82.157.46.222:9125/ms-auth
 VUE_APP_MS_NETTY_API = http://15.1.48.21:9140/ms-netty
 
@@ -32,7 +50,7 @@ VUE_APP_ENABLE_GATEWAY = on
 
 VUE_APP_SYS_API = http://10.2.3.118:9165/online-financial-service/api/v1/cust-info/permit_endpoint
 
-VUE_APP_ONLINE_API = http://192.168.14.1:9155/ms-online/api/v1
+
 
 //http://10.0.3.144:9165/online-financial-service/api/v1/cust-info/permit_endpointy
 //服务器http://10.2.3.118:9165/online-financial-service/api/v1/cust-info/permit_endpoint
diff --git a/src/components/common/PicketAcced.vue b/src/components/common/PicketAcced.vue
index 37a14fb..7fa2c6c 100644
--- a/src/components/common/PicketAcced.vue
+++ b/src/components/common/PicketAcced.vue
@@ -32,9 +32,7 @@
                 <van-col span="10" class="lable"><span>到期日期</span></van-col>
                 <van-col span="14" class="time">{{ item.time }}</van-col>
               </van-row>
-
             </van-col>
-
           </van-col>
           <van-col span="8">
             <svg class="icon" aria-hidden="true" v-if="item.status === 1">
diff --git a/src/constants/api/login/common.api.ts b/src/constants/api/login/common.api.ts
index 690b4b0..79b60ac 100644
--- a/src/constants/api/login/common.api.ts
+++ b/src/constants/api/login/common.api.ts
@@ -10,10 +10,11 @@ import { MethodType } from "@/constants/enum/general/method-type.enum";
 import { HeaderType } from "@/constants/enum/general/header-type.enum";
 
 //网关
-// const prefix = process.env.VUE_APP_MS_GATEWAY_API + process.env.VUE_APP_AUTH_API ;
-const onlinePrefix = process.env.VUE_APP_ONLINE_API
+const prefix = process.env.VUE_APP_MS_GATEWAY_API + process.env.VUE_APP_AUTH_API ;
+const onlinePrefix = process.env.VUE_APP_MS_GATEWAY_API + process.env.VUE_APP_ONLINE_API
 //本地
-const prefix = "http://localhost:9130"+ process.env.VUE_APP_AUTH_API ;
+// const prefix = "http://10.2.3.118:9130"+ process.env.VUE_APP_AUTH_API ;
+// const onlinePrefix = "http://localhost:9155" + process.env.VUE_APP_ONLINE_API
 const commonApi = {
   getPicCode: {
     url: prefix + "/get_phone_verify_code",
@@ -30,3 +31,5 @@ const commonApi = {
 };
 
 export default commonApi;
+
+
diff --git a/src/constants/api/login/login-mgt.api.ts b/src/constants/api/login/login-mgt.api.ts
index 05edb48..93f3baf 100644
--- a/src/constants/api/login/login-mgt.api.ts
+++ b/src/constants/api/login/login-mgt.api.ts
@@ -15,8 +15,8 @@ const prefix = process.env.VUE_APP_MS_GATEWAY_API + process.env.VUE_APP_AUTH_API
 // //本地
 // const prefix = "http://localhost:9130"+ process.env.VUE_APP_AUTH_API ;
 
-
-// const prefix = "http://10.0.3.144:9165/online-financial-service/api/v1/cust-info/permit_endpoint"
+//server
+// const prefix = "http://10.2.3.118:9130"+ process.env.VUE_APP_AUTH_API ;
 // console.log(prefix+"=================");
 const loginApi = {
   updatePicCode: {
diff --git a/src/constants/api/ms-application/application.api.ts b/src/constants/api/ms-application/application.api.ts
index 873cf25..27f152e 100644
--- a/src/constants/api/ms-application/application.api.ts
+++ b/src/constants/api/ms-application/application.api.ts
@@ -1,7 +1,8 @@
 import { MethodType } from "@/constants/enum/general/method-type.enum";
 import { HeaderType } from "@/constants/enum/general/header-type.enum";
 // const prefix = process.env.VUE_APP_MS_GATEWAY_API+process.env.VUE_APP_MS_APPLICATION_API+process.env.VUE_APP_API_PREFIX;
-const prefix = "http://localhost:9145"+process.env.VUE_APP_MS_APPLICATION_API+process.env.VUE_APP_API_PREFIX;
+// const prefix = "http://localhost:9145"+process.env.VUE_APP_MS_APPLICATION_API+process.env.VUE_APP_API_PREFIX;
+const prefix = "http://10.2.3.118:9145"+process.env.VUE_APP_MS_APPLICATION_API+process.env.VUE_APP_API_PREFIX;
 
 console.log(prefix+"============")
 const applicationApi = {
diff --git a/src/constants/api/ms-system/system.api.ts b/src/constants/api/ms-system/system.api.ts
index 9431616..f53af4d 100644
--- a/src/constants/api/ms-system/system.api.ts
+++ b/src/constants/api/ms-system/system.api.ts
@@ -1,6 +1,10 @@
 import { MethodType } from "@/constants/enum/general/method-type.enum";
 import { HeaderType } from "@/constants/enum/general/header-type.enum";
-const prefix = `${process.env.VUE_APP_MS_SYSTEM_API}${process.env.VUE_APP_API_PREFIX}`;
+// const prefix = `${process.env.VUE_APP_MS_SYSTEM_API}${process.env.VUE_APP_API_PREFIX}`;
+//网关
+// const prefix = process.env.VUE_APP_MS_GATEWAY_API + process.env.VUE_APP_AUTH_API;
+//local
+const prefix = "http://192.168.14.1:9140" + process.env.VUE_APP_SYSTEM_API;
 const systemApi = {
   // 通用请求地址
   commonRq: {
@@ -122,5 +126,11 @@ const systemApi = {
     methodType: MethodType.POST.code,
     headerType: HeaderType.AUTH.code
   },
+    //获取个人信息
+  getSysCustInfoById: {
+      url: prefix + "/sys-cust-info/getSysCustInfoById",
+      methodType: MethodType.GET.code,
+      headerType: HeaderType.AUTH.code,
+  },
 };
 export default systemApi;
diff --git a/src/services/api.service.ts b/src/services/api.service.ts
index 530a1c0..c4299d7 100644
--- a/src/services/api.service.ts
+++ b/src/services/api.service.ts
@@ -37,8 +37,10 @@ class ApiService {
           config.headers['Content-Type'] = 'application/json; charset=utf-8';
         }
         const token = sessionStorage.getItem('accessToken');
+        const jti = sessionStorage.getItem('jti');
         if (token && token != '') {
           config.headers.Authorization = 'bearer ' + token;
+          config.headers.jti = jti;
         }
         return Promise.resolve(config);
       },
diff --git a/src/views/authentication/LoginView.vue b/src/views/authentication/LoginView.vue
index 8ca8276..fd2607d 100644
--- a/src/views/authentication/LoginView.vue
+++ b/src/views/authentication/LoginView.vue
@@ -113,6 +113,7 @@ import { RestfulResponse } from "@/model/domain/RestfulResponse";
 import commonApi from "@/constants/api/login/common.api";
 import { sys } from "typescript";
 import { log } from "mathjs";
+import { tokenStore, TokenStore } from "@/stores";
 
 
 @Component({
@@ -130,7 +131,7 @@ export default class LoginView extends Vue {
   imageSrcValue: string = "";//图形验证码
   sms: string = "";//短信验证
   timer: any = "";//定时器
-  time: number = 60;//计数
+  time: number = 5;//计数
   imageVerifyKey: string = "";//验证码Key
   passwordType = "password";
   showCode = false;
@@ -222,7 +223,7 @@ export default class LoginView extends Vue {
     }
     //禁用 超链接并设置倒计时时间
     this.smsCss="smsCss"
-    this.time=60;
+    this.time=5;
     apiService.general(commonApi.getPicCode, param, undefined, undefined).then((response: RestfulResponse) => {
 
       if (response.code == Code.SUCCESS.code) {
@@ -230,6 +231,8 @@ export default class LoginView extends Vue {
         Toast('短信发送成功，5分钟有效');
         //开始倒计时
         this.changeCmstotal()
+        //todo  暂时没有短信接口所以直接反显到页面上
+        this.sms=response.data
       } else {
         Toast('短信发送失败,请重试');
          //取消不可点击
@@ -260,7 +263,14 @@ export default class LoginView extends Vue {
       //发送请求就保存账号  账号：18746555531 密码：123456
          localStorage.setItem('loginNo', this.loginNo);
         //  debugger;
+
       if (response.code == Code.SUCCESS.code) {
+        //todo
+        // this.$store.commit("token",response.data.token);
+        // console.log(tokenStore.token);
+        sessionStorage.setItem("sysCustInfo",JSON.stringify(response.data.sysCustInfo));
+        sessionStorage.setItem("accessToken",response.data.token.accessToken);
+        sessionStorage.setItem("jti",response.data.token.jti);
         Toast(response.msg+"");
         this.$router.push({
           name: `Mianview`,
@@ -271,6 +281,7 @@ export default class LoginView extends Vue {
         //登录成功后保存账号
         //  localStorage.setItem('loginNo', this.loginNo);
       } else {
+        
         // this._updatePicCode();
         // Toast(response.msg + "");
       }
diff --git a/src/views/workbench/modifyInfo.vue b/src/views/workbench/modifyInfo.vue
index b5d4a20..4d19675 100644
--- a/src/views/workbench/modifyInfo.vue
+++ b/src/views/workbench/modifyInfo.vue
@@ -70,7 +70,13 @@
 </template>
 
 <script lang="ts">
+import systemApi from "@/constants/api/ms-system/system.api";
+import { Code } from "@/constants/enum/general/code.enum";
+import { RestfulResponse } from "@/model/domain/RestfulResponse";
+import apiService from "@/services/api.service";
 import { Component, Vue, Prop, Watch, Emit } from "vue-property-decorator";
+
+
 /*
 * title
 */
@@ -87,14 +93,41 @@ export default class PersonLod extends Vue {
   newPassword : String =""//原始密码
 
   mounted() {
-    this.name = this.$route.params.name;
-    this.IdCard = this.$route.params.IdCard;
-    this.phone = this.$route.params.phone;
-    this.liveAdress = this.$route.params.liveAdress;
+    // this.name = this.$route.params.name;
+    // this.IdCard = this.$route.params.IdCard;
+    // this.phone = this.$route.params.phone;
+    // this.liveAdress = this.$route.params.liveAdress;
+    this.getInfo();
   }
 
   modifyInfo(){
-      this.$router.back();
+
+
+  
+      // this.$router.back();
+  }
+
+  getInfo(){
+        let custInfo: any = sessionStorage.getItem("sysCustInfo");
+    custInfo = JSON.parse(custInfo);
+    let id = custInfo.id;
+    console.log(id);
+
+     let query = {
+       id: custInfo.id,
+    }
+     let param = {
+    }
+
+    apiService.general(systemApi.getSysCustInfoById, query, query, undefined).then((response: RestfulResponse) => {
+      if (response.code == Code.SUCCESS.code) {
+          this.name = response.data.records.custName;
+         this.IdCard = response.data.records.idcard;
+         this.phone = response.data.records.phone;
+         this.liveAdress = response.data.records.address;
+      }
+    });
+
   }
 }
 </script>
-- 
2.22.0