合并分支 'dev_api_change' 到 'master'

登录相关接口修改

查看合并请求 coscoshipping/fe_service_ebtp_frontend!2

config/proxy.ts

@@ -13,10 +13,10 @@ export default {
     },
   },
   UAT: {
-    '/api/core-service-ebtp-userinfo': {
+    '/api/sys-manager-ebtp-project': {
       target: 'http://localhost:18023',
       changeOrigin: true,
-      pathRewrite: { '/api/core-service-ebtp-userinfo': '' },
+      pathRewrite: { '/api/sys-manager-ebtp-project': '' },
     },
     '/api/biz-service-ebtp-bid': {
       target: 'http://localhost:18003',

src/components/GlobalHeader/services.ts

@@ -9,7 +9,7 @@ export async function getMenu(params: any) {
 }
 
 export async function fgetUserMsg(params: any) {
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/get', {
+  return request('/api/sys-manager-ebtp-project/v1/userinfo/get', {
     method: 'GET',
     headers: { 'Authorization': params },
     data: params,
@@ -17,7 +17,7 @@ export async function fgetUserMsg(params: any) {
 }
 
 export async function getLogout() { // 退出登录，注销
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/logout', {
+  return request('/api/sys-manager-ebtp-project/v1/userinfo/logout', {
     method: 'get',
     // params
   });

src/pages/LoadingPage/service.ts

@@ -6,7 +6,7 @@ import request from '@/utils/request';
  * @returns 
  */
 export async function fgetUserMsg(params: any) {
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/get', {
+  return request('/api/sys-manager-ebtp-project/v1/userinfo/get', {
     method: 'GET',
     headers: { 'Authorization': params },
     data: params,
@@ -18,7 +18,7 @@ export async function fgetUserMsg(params: any) {
  * @returns 
  */
 export async function getTokenByCode(params: any) {
-  return request('/api/core-service-ebtp-userinfo/v1/auth/oauth/token', {
+  return request('/api/sys-manager-ebtp-project/v1/auth/oauth/token', {
     method: 'POST',
     params: params,
   });
@@ -70,7 +70,7 @@ export async function getProjectById(id?: any) {
  * 获取跳转2.0的URL
  */
 export async function getToSecondUrl() {
-  return request('/api/core-service-ebtp-userinfo/zglt/v1/getUrl');
+  return request('/api/sys-manager-ebtp-project/zglt/v1/getUrl');
 }
 
 

src/pages/userformal/login/service.ts

@@ -20,7 +20,7 @@ export async function rgbToBase64(params: any) {
     type: 'pixel',
     rgb: params.image
   });
-  return request('/api/core-service-ebtp-userinfo/outer/v1/ebtp/face/rgbArray2Base64', {
+  return request('/api/sys-manager-ebtp-project/outer/v1/ebtp/face/rgbArray2Base64', {
     method: 'post',
     body: _body,
   });

src/services/login.ts

@@ -64,7 +64,7 @@ export async function ZjfakeFaceLogin(params: FaceLoginParamsType) {
   var formData = new FormData();
   formData.append('idNo', params.userName);
   formData.append('multipartFiles', params.multipartFiles, 'upload_face.jpeg');
-  return request('/api/core-service-ebtp-userinfo/outer/v1/ebtp/face/faceCompare', {
+  return request('/api/sys-manager-ebtp-project/outer/v1/ebtp/face/faceCompare', {
     method: 'POST',
     requestType: 'form',
     mode: 'cors',
@@ -96,7 +96,7 @@ export async function CloudfakeAccountLogin(params: LoginParamsType) {
  * @returns 
  */
 export async function refreshTokenApi(params: any) {
-  return request('/api/core-service-ebtp-userinfo/v1/auth/oauth/token', {
+  return request('/api/sys-manager-ebtp-project/v1/auth/oauth/token', {
     method: 'POST',
     requestType: 'form',
     data: params,
@@ -104,7 +104,7 @@ export async function refreshTokenApi(params: any) {
 }
 
 export async function getPassword(params: any) { // 获取后台验证码接口
-  return request('/api/core-service-ebtp-userinfo/v1/userpassword/validatePassword', {
+  return request('/api/sys-manager-ebtp-project/v1/userpassword/validatePassword', {
     method: 'POST',
     params: params
   });
@@ -128,7 +128,7 @@ export async function getFakeCaptcha(params: any) {
  * @returns 
  */
 export async function logoutTokenApi() {
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/logout', {
+  return request('/api/sys-manager-ebtp-project/v1/userinfo/logout', {
     method: 'GET',
     // params: params
   });

src/utils/SupplierList/service.ts

@@ -22,7 +22,7 @@ export async function getSupplierUserByUserInfo(params: any) {
   /*
   *暂无url
   * */
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/findUserCountListBySupplierCodePage', {
+  return request('/api/sys-manager-ebtp-project/v1/userinfo/findUserCountListBySupplierCodePage', {
     method: 'post',
     data: {
       ...params

src/utils/request.ts

@@ -75,10 +75,10 @@ request.interceptors.request.use(async (url, options) => {
       url.startsWith('/api/auth/reloadToken') ||
       url.startsWith('/api/auth/reloadPartnerToken') ||
       url.startsWith('/api/api/mall-expe') ||
-      url == '/api/core-service-ebtp-userinfo/v1/userpassword/validatePassword' ||
+      url == '/api/sys-manager-ebtp-project/v1/userpassword/validatePassword' ||
       url.startsWith('/api/notification') ||
-      url == '/api/core-service-ebtp-userinfo/outer/v1/ebtp/face/faceCompare' ||
+      url == '/api/sys-manager-ebtp-project/outer/v1/ebtp/face/faceCompare' ||
-      url == '/api/core-service-ebtp-userinfo/outer/v1/ebtp/face/rgbArray2Base64' ||
+      url == '/api/sys-manager-ebtp-project/outer/v1/ebtp/face/rgbArray2Base64' ||
       url == '/api/notification/v1/notification/savaSmsByPhoneNew'
     ) {
       headers = {
@@ -86,7 +86,7 @@ request.interceptors.request.use(async (url, options) => {
       };
       url.startsWith('/api/api/mall-prox') ||
         url.startsWith('/api/api/mall-expe') ||
-        url == '/api/core-service-ebtp-userinfo/v1/userpassword/validatePassword' ||
+        url == '/api/sys-manager-ebtp-project/v1/userpassword/validatePassword' ||
         url == '/api/notification/v1/notification/savaSmsByPhoneNew'
         ? (options.credentials = 'omit')
         : null;