ty 3 gadi atpakaļ
vecāks
revīzija
4425851e5d

+ 2 - 0
.env.development

@@ -4,6 +4,8 @@ VUE_APP_BASE_API=http://localhost:5000/yjlglapi2/
 VUE_APP_AUTH_SERVER=http://localhost:5000/yjlglapi2/
 VUE_APP_AUTH_CLIENT_ID=BackboneService_App_Dev
 VUE_APP_AUTH_CLIENT_SECRET=1q2w3e*
+VUE_APP_CREDENT_CLIENT_ID=webApp
+VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false

+ 2 - 0
.env.production

@@ -5,6 +5,8 @@ VUE_APP_API=https://apps.r93535.com/services/ZL03102/
 VUE_APP_AUTH_SERVER=https://apps.r93535.com/services/ZL03102/
 VUE_APP_AUTH_CLIENT_ID=BackboneService_App
 VUE_APP_AUTH_CLIENT_SECRET=1q2w3e*
+VUE_APP_CREDENT_CLIENT_ID=webApp
+VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false

+ 2 - 0
.env.qa

@@ -5,6 +5,8 @@ VUE_APP_API=https://demo.r93535.com/yjlwai/svc
 VUE_APP_AUTH_SERVER=https://demo.r93535.com/yjlwai/core-svc/
 VUE_APP_AUTH_CLIENT_ID=BackboneService_App
 VUE_APP_AUTH_CLIENT_SECRET=1q2w3e*
+VUE_APP_CREDENT_CLIENT_ID=webApp
+VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false

+ 2 - 0
.env.qa.bak

@@ -5,6 +5,8 @@ VUE_APP_API=https://47.106.222.151/grider-erection-service
 VUE_APP_AUTH_SERVER=https://47.106.222.151/backbone-service/
 VUE_APP_AUTH_CLIENT_ID=BackboneService_App
 VUE_APP_AUTH_CLIENT_SECRET=1q2w3e*
+VUE_APP_CREDENT_CLIENT_ID=webApp
+VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false

+ 2 - 0
.env.staging

@@ -5,6 +5,8 @@ VUE_APP_API=http://14.18.41.63:5001/grider-erection-service
 VUE_APP_AUTH_SERVER=http://14.18.41.63:5001/backbone-service/
 VUE_APP_AUTH_CLIENT_ID=BackboneService_App
 VUE_APP_AUTH_CLIENT_SECRET=1q2w3e*
+VUE_APP_CREDENT_CLIENT_ID=webApp
+VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false

+ 2 - 0
.env.yjlnei

@@ -5,6 +5,8 @@ VUE_APP_API=http://10.3.27.56:9004/yjlglapi2/
 VUE_APP_AUTH_SERVER=http://10.3.27.56:9004/yjlglapi2/
 VUE_APP_AUTH_CLIENT_ID=BackboneService_App
 VUE_APP_AUTH_CLIENT_SECRET=1q2w3e*
+VUE_APP_CREDENT_CLIENT_ID=webApp
+VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false

+ 2 - 0
.env.yjlwai

@@ -5,6 +5,8 @@ VUE_APP_API=https://apps.r93535.com/services/ZL03102/
 VUE_APP_AUTH_SERVER=https://apps.r93535.com/services/ZL03102/
 VUE_APP_AUTH_CLIENT_ID=BackboneService_App
 VUE_APP_AUTH_CLIENT_SECRET=1q2w3e*
+VUE_APP_CREDENT_CLIENT_ID=webApp
+VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false

+ 16 - 0
src/api/backbone/user.js

@@ -34,6 +34,22 @@ export function login(username, password, publicKey) {
   })
 }
 
+export function loginClient() {
+  return service({
+    url: '/connect/token',
+    method: 'post',
+    headers: {
+      'Content-type': 'application/x-www-form-urlencoded'
+    },
+    data: qs.stringify({
+      client_id: process.env.VUE_APP_CREDENT_CLIENT_ID,
+      client_secret: process.env.VUE_APP_CREDENT_CLIENT_SECRET,
+      // grant_type: 'password',
+      grant_type: 'client_credentials'
+    })
+  })
+}
+
 export function logout() {
   return new Promise(resolve => {
     resolve()

+ 10 - 1
src/store/modules/user.js

@@ -1,5 +1,5 @@
 
-import { getPublicKey, login, getMe } from '@/api/backbone/user'
+import { getPublicKey, login, getMe, loginClient } from '@/api/backbone/user'
 import { getGrantPermissions } from '@/api/permission'
 import { getToken, setToken, removeToken, getPubKey, setPubKey, removePubKey } from '@/utils/auth'
 import { resetRouter } from '@/router'
@@ -65,6 +65,15 @@ const actions = {
     commit('SET_ACCESS_TOKEN', res.access_token)
     setToken(res.access_token)
   },
+
+  async clientCredentials({ commit }) {
+    var publicKey = 'yjl1234569876584'
+    commit('SET_PUBLIC_KEY', publicKey)
+    setPubKey(publicKey)
+    var res = await loginClient()
+    commit('SET_ACCESS_TOKEN', res.access_token)
+    setToken(res.access_token)
+  },
   async loginOidc({ state }) {
     await state.authService.signIn()
   },

+ 6 - 6
src/views/grider-erections/gride-work-info/tky-index.vue

@@ -225,12 +225,12 @@ export default {
   },
   async mounted() {
     this.loading = true
-    // try {
-    //   await this.$store.dispatch('user/login', { username: 'test-grider', password: 'TestGrider*123' })
-    //   this.loading = false
-    // } catch (ex) {
-    //   console.log(ex)
-    // }
+    try {
+      await this.$store.dispatch('user/clientCredentials')
+      this.loading = false
+    } catch (ex) {
+      console.log(ex)
+    }
     griderErectionApi.getList(this.query).then(res => {
       this.data = res
       if (res.splitTypeNoGuideBeams.length > 0) {