diff --git a/common/api/wx.js b/common/api/wx.js index 8fd7745..527b589 100644 --- a/common/api/wx.js +++ b/common/api/wx.js @@ -9,19 +9,23 @@ import {ToAsyncAwait, MsbRequest, MsbRequestTk} from '@/common/utils'; const BASE_URL = '/mall/trade'; +// 第三方鉴权服务 +const AUTH_URL = '/third'; const APPID = 'wxd2015f0c56defa02'; + + /** * 获取授权页面地址 * @param {*} data */ export const ApiGetAuthUrl = (params) => - ToAsyncAwait(MsbRequest.get(`${BASE_URL}/wx/mp/getAuthorizationUrl/${APPID}`, params)); + ToAsyncAwait(MsbRequest.get(`${AUTH_URL}/wx/mp/getAuthorizationUrl/${APPID}`, params)); /** * 获取openId * @param {*} data */ export const ApiGetOpenId = ({code}) => - ToAsyncAwait(MsbRequest.get(`${BASE_URL}/wx/mp/getOpenId/${APPID}`, {code})); + ToAsyncAwait(MsbRequest.get(`${AUTH_URL}/wx/mp/getOpenId/${APPID}`, {code})); /** * 微信h5支付，获取支付URL diff --git a/common/utils/websocket.js b/common/utils/websocket.js index 6ca0a64..0265d63 100644 --- a/common/utils/websocket.js +++ b/common/utils/websocket.js @@ -107,9 +107,9 @@ const token = 'eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjQwNzA4ODAwMDAsImlkIjo5LCJ0aW1lIjox export const MsbWebSktInit = () => { return new Promise((resolve, reject) => { MsbWebSkt = uni.connectSocket({ - // url : `wss://you-gateway.mashibing.com/ws?client=${store.state.token}`, // url是websocket连接ip + url : `wss://you-gateway.mashibing.com/ws?client=${store.state.token}`, // url是websocket连接ip // url : `wss://k8s-horse-gateway.mashibing.cn/ws?client=${store.state.token}`, // url是websocket连接ip - url : `ws://192.168.10.93:8090/ws?client=${token}&type=1`, // url是websocket连接ip + // url : `ws://192.168.10.93:8090/ws?client=${token}&type=1`, // url是websocket连接ip fail: e => { reject(e) } diff --git a/pages/account/message/system.vue b/pages/account/message/system.vue index 52039df..5835083 100644 --- a/pages/account/message/system.vue +++ b/pages/account/message/system.vue @@ -2,19 +2,19 @@ * @Author: ch * @Date: 2022-03-26 14:32:03 * @LastEditors: ch - * @LastEditTime: 2022-05-10 21:21:18 + * @LastEditTime: 2022-05-16 10:46:24 * @Description: file content -->