diff --git a/.eslintrc.js b/.eslintrc.js index 2723647..5165cf6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,8 +7,8 @@ module.exports = { //商城2.0跳转地址 REACT_APP_MALL_V2_URL: false, //各系统跳转参数 - REACT_APP_CLIENT_KEY: true, - REACT_APP_CLIENT_SECRET: true, + // REACT_APP_CLIENT_KEY: true, + // REACT_APP_CLIENT_SECRET: true, //密码加密参数 REACT_APP_PASSWORD_CIPHERMODE: true, REACT_APP_PASSWORD_PUBLICKEY: true, diff --git a/config/config.UAT.ts b/config/config.UAT.ts index 19ebc69..55fdc6e 100644 --- a/config/config.UAT.ts +++ b/config/config.UAT.ts @@ -7,8 +7,8 @@ export default defineConfig({ REACT_APP_MALL_V2_URL:'http://111.198.162.67/zglt/index_hzf.jsp?id=dev', //各系统跳转参数 - REACT_APP_CLIENT_KEY : 'KgPEkttG', - REACT_APP_CLIENT_SECRET :'ae5bdb183c502355d2055b3de73300aa73cbfdf3', + // REACT_APP_CLIENT_KEY : 'KgPEkttG', + // REACT_APP_CLIENT_SECRET :'ae5bdb183c502355d2055b3de73300aa73cbfdf3', //密码加密参数 REACT_APP_PASSWORD_CIPHERMODE:'1', diff --git a/config/config.dev.ts b/config/config.dev.ts index 2b07069..a794033 100644 --- a/config/config.dev.ts +++ b/config/config.dev.ts @@ -7,8 +7,8 @@ export default defineConfig({ REACT_APP_MALL_V2_URL: 'http://111.198.162.67/zglt/index_hzf.jsp?id=dev', //各系统跳转参数 - REACT_APP_CLIENT_KEY: 'KgPEkttG', - REACT_APP_CLIENT_SECRET: 'ae5bdb183c502355d2055b3de73300aa73cbfdf3', + // REACT_APP_CLIENT_KEY: 'KgPEkttG', + // REACT_APP_CLIENT_SECRET: 'ae5bdb183c502355d2055b3de73300aa73cbfdf3', //密码加密参数 REACT_APP_PASSWORD_CIPHERMODE: '1', diff --git a/config/config.prod.ts b/config/config.prod.ts index a3545df..ff4fbea 100644 --- a/config/config.prod.ts +++ b/config/config.prod.ts @@ -7,8 +7,8 @@ export default defineConfig({ REACT_APP_MALL_V2_URL:'http://111.198.162.67/zglt/index_hzf.jsp?id=dev', //各系统跳转参数 - REACT_APP_CLIENT_KEY : 'KgPEkttG', - REACT_APP_CLIENT_SECRET :'ae5bdb183c502355d2055b3de73300aa73cbfdf3', + // REACT_APP_CLIENT_KEY : 'KgPEkttG', + // REACT_APP_CLIENT_SECRET :'ae5bdb183c502355d2055b3de73300aa73cbfdf3', //密码加密参数 REACT_APP_PASSWORD_CIPHERMODE:'1', diff --git a/config/config.sim.ts b/config/config.sim.ts index 2538565..57295b2 100644 --- a/config/config.sim.ts +++ b/config/config.sim.ts @@ -7,8 +7,8 @@ export default defineConfig({ REACT_APP_MALL_V2_URL: 'http://111.198.162.67/zglt/index_hzf.jsp?id=dev', //各系统跳转参数 - REACT_APP_CLIENT_KEY: 'KgPEkttG', - REACT_APP_CLIENT_SECRET: 'ae5bdb183c502355d2055b3de73300aa73cbfdf3', + // REACT_APP_CLIENT_KEY: 'KgPEkttG', + // REACT_APP_CLIENT_SECRET: 'ae5bdb183c502355d2055b3de73300aa73cbfdf3', //密码加密参数 REACT_APP_PASSWORD_CIPHERMODE: '1', diff --git a/src/pages/LoadingPage/index.tsx b/src/pages/LoadingPage/index.tsx index 024a97f..b381bb8 100644 --- a/src/pages/LoadingPage/index.tsx +++ b/src/pages/LoadingPage/index.tsx @@ -22,15 +22,15 @@ const Loading: React.FC<{}> = () => { clientId: REACT_APP_CLIENT_KEY, scope: getUserScope() } - const params = { - grant_type: "refresh_token", - refresh_token: getUserRefreshToken(), - client_id: REACT_APP_CLIENT_KEY, - client_secret: REACT_APP_CLIENT_SECRET, - } - const header = { - clientId: REACT_APP_CLIENT_KEY, - } + // const params = { + // grant_type: "refresh_token", + // refresh_token: getUserRefreshToken(), + // client_id: REACT_APP_CLIENT_KEY, + // client_secret: REACT_APP_CLIENT_SECRET, + // } + // const header = { + // clientId: REACT_APP_CLIENT_KEY, + // } if (userType == '0') {//联通用户 await cloudReloadToken('', headers) await getUserData(token, url, extra, 1) @@ -138,11 +138,9 @@ const Loading: React.FC<{}> = () => { //获取协议部分 http: https: const protocol = window.location.protocol const grant_type = 'authorization_code'; - const client_id = REACT_APP_CLIENT_KEY; - const client_secret = REACT_APP_CLIENT_SECRET; const redirect_uri = `${protocol}//${host}/redirect${e}`; let token = ''; - await getTokenByCode({ grant_type, client_id, client_secret, redirect_uri, code }).then(res => { + await getTokenByCode({ grant_type, redirect_uri, code }).then(res => { if (res?.success == true) { sessionStorage.setItem('Authorization', res?.data?.value) token = 'Bearer ' + res?.data?.value; diff --git a/src/pages/LoadingPage/service.ts b/src/pages/LoadingPage/service.ts index ea94093..c79fcbe 100644 --- a/src/pages/LoadingPage/service.ts +++ b/src/pages/LoadingPage/service.ts @@ -18,7 +18,7 @@ export async function fgetUserMsg(params: any) { * @returns */ export async function getTokenByCode(params: any) { - return request('/api/auth/oauth/token', { + return request('/api/core-service-ebtp-userinfo/v1/auth/oauth/token', { method: 'POST', params: params, }); diff --git a/src/pages/usercloud/login/index.tsx b/src/pages/usercloud/login/index.tsx index 2928fa1..fe641fa 100644 --- a/src/pages/usercloud/login/index.tsx +++ b/src/pages/usercloud/login/index.tsx @@ -62,13 +62,8 @@ const Login: React.FC = (props) => { const params = { grant_type: "refresh_token", refresh_token: data?.refreshToken?.value, - client_id: REACT_APP_CLIENT_KEY, - client_secret: REACT_APP_CLIENT_SECRET, } - const header = { - clientId: REACT_APP_CLIENT_KEY, - } - await refreshTokenApi(params, header).then(res => { + await refreshTokenApi(params).then(res => { if (res?.success == true) { sessionStorage.setItem('Authorization', res?.data?.value); // sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value); diff --git a/src/pages/usercooper/login/index.tsx b/src/pages/usercooper/login/index.tsx index 811925c..8606e15 100644 --- a/src/pages/usercooper/login/index.tsx +++ b/src/pages/usercooper/login/index.tsx @@ -63,13 +63,8 @@ const Login: React.FC = (props) => { const params = { grant_type: "refresh_token", refresh_token: data?.refreshToken?.value, - client_id: REACT_APP_CLIENT_KEY, - client_secret: REACT_APP_CLIENT_SECRET, } - const header = { - clientId: REACT_APP_CLIENT_KEY, - } - await refreshTokenApi(params, header).then(res => { + await refreshTokenApi(params).then(res => { if (res?.success == true) { sessionStorage.setItem('Authorization', res?.data?.value); // sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value); diff --git a/src/pages/userexpert/login/index.tsx b/src/pages/userexpert/login/index.tsx index 284adbc..5e016d6 100644 --- a/src/pages/userexpert/login/index.tsx +++ b/src/pages/userexpert/login/index.tsx @@ -62,13 +62,8 @@ const Login: React.FC = (props) => { const params = { grant_type: "refresh_token", refresh_token: data?.refreshToken?.value, - client_id: REACT_APP_CLIENT_KEY, - client_secret: REACT_APP_CLIENT_SECRET, } - const header = { - clientId: REACT_APP_CLIENT_KEY, - } - await refreshTokenApi(params, header).then(res => { + await refreshTokenApi(params).then(res => { if (res?.success == true) { sessionStorage.setItem('Authorization', res?.data?.value); // sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value); diff --git a/src/pages/userformal/login/index.tsx b/src/pages/userformal/login/index.tsx index 4ba4663..742c307 100644 --- a/src/pages/userformal/login/index.tsx +++ b/src/pages/userformal/login/index.tsx @@ -228,13 +228,8 @@ const Index: React.FC<{}> = () => { const params = { grant_type: "refresh_token", refresh_token: data?.refreshToken?.value, - client_id: REACT_APP_CLIENT_KEY, - client_secret: REACT_APP_CLIENT_SECRET, } - const header = { - clientId: REACT_APP_CLIENT_KEY, - } - await refreshTokenApi(params, header).then(res => { + await refreshTokenApi(params).then(res => { if (res?.success == true) { sessionStorage.setItem('Authorization', res?.data?.value); // sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value); diff --git a/src/services/login.ts b/src/services/login.ts index 86868c3..73f6a39 100644 --- a/src/services/login.ts +++ b/src/services/login.ts @@ -95,12 +95,11 @@ export async function CloudfakeAccountLogin(params: LoginParamsType) { * @param params * @returns */ -export async function refreshTokenApi(params: any, headers: any) { - return request('/api/auth/oauth/token', { +export async function refreshTokenApi(params: any) { + return request('/api/core-service-ebtp-userinfo/v1/auth/oauth/token', { method: 'POST', requestType: 'form', data: params, - headers: headers }); } diff --git a/src/typings.d.ts b/src/typings.d.ts index a79e395..6c827b7 100644 --- a/src/typings.d.ts +++ b/src/typings.d.ts @@ -43,9 +43,9 @@ declare const REACT_APP_ENV: 'test' | 'dev' | 'pre' | false; /**ENV-商城2.0跳转地址 */ declare const REACT_APP_MALL_V2_URL: string /**ENV-系统跳转参数KEY */ -declare const REACT_APP_CLIENT_KEY: string +// declare const REACT_APP_CLIENT_KEY: string /**ENV-系统跳转参数SECRET */ -declare const REACT_APP_CLIENT_SECRET: string +// declare const REACT_APP_CLIENT_SECRET: string /**ENV-密码加密参数CIPHERMODE */ declare const REACT_APP_PASSWORD_CIPHERMODE: string /**ENV-密码加密参数PUBLICKEY */