Merge branch 'main' into dev/chat

src/actions/ConversationActions.js

@@ -3,7 +3,7 @@ import { groupBy } from '@/utils/utils';
 import { fetchJSON, postJSON } from '@/utils/request'
 import { parseRenderMessageList } from '@/lib/msgUtils';
 
-const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_callback_cn';
+const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server';
 
 export const fetchTemplates = async () => {
   const data = await fetchJSON(`${API_HOST}/listtemplates`);

src/stores/ConversationStore.js

@@ -7,7 +7,7 @@ import { devtools } from 'zustand/middleware';
 
 // const WS_URL = 'ws://202.103.68.144:8888/whatever/';
 // const WS_URL = 'ws://120.79.9.217:10022/whatever/';
-const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_callback_cn'; // prod:
+const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_server'; // prod:
 
 const initialConversationState = {
   // websocket: null,

src/stores/Conversations/ConversationContext_bak.js

@@ -36,7 +36,7 @@ export async function postJSON(url, obj) {
   }
 }
 // const API_HOST = 'http://202.103.68.144:8888';
-const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_callback';
+const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server';
 
 export const useConversations = ({loginUser, realtimeAPI}) => {
   const { userId } = loginUser;

src/stores/OrderStore.js

@@ -2,7 +2,7 @@ import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
 import { fetchJSON, postJSON } from '@/utils/request'
 
-const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_callback_cn';
+const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server';
 
 const useOrderStore = create((set, get) => ({
 

src/views/OrderFollow.jsx

@@ -205,7 +205,7 @@ function OrderList({ formValues }) {
   const [orderData, setOrderData] = useState([])
   const [loading, setLoading] = useState(false)
   const { loginUser } = useAuthContext()
-  let fetchOrderUrl = `https://p9axztuwd7x8a7.mycht.cn/whatsapp_callback_cn/getwlorder?opisn=${loginUser.userId}&otype=${formValues.type}`
+  let fetchOrderUrl = `https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/getwlorder?opisn=${loginUser.userId}&otype=${formValues.type}`
 
   if (formValues.type === 'advance') {
     const fromDate = formValues.startDateRange[0].format('YYYY-MM-DD')
@@ -217,7 +217,7 @@ function OrderList({ formValues }) {
       confirmFromDate = formValues.confirmDateRange[0].format('YYYY-MM-DD')
       confirmThruDate = formValues.confirmDateRange[1].format('YYYY-MM-DD')
     }
-    fetchOrderUrl = prepareUrl('https://p9axztuwd7x8a7.mycht.cn/whatsapp_callback/getdvancedwlorder')
+    fetchOrderUrl = prepareUrl('https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/getdvancedwlorder')
       .append('opisn', loginUser.userId)
       .append('startdate', fromDate)
       .append('enddate', thruDate)