diff --git a/src/stores/Auth.js b/src/stores/Auth.js
index 2338254..19b0447 100644
--- a/src/stores/Auth.js
+++ b/src/stores/Auth.js
@@ -11,12 +11,20 @@ const KEY_USER_ID = 'KEY_USER_ID';
const useAuthStore = create((set, get) => ({
+ tokenInterval: null,
+
+ loginStatus: 0,
+
loginUser: {
- userId: -1,
- username: '',
- avatarUrl: '',
- mobile: '',
- email: '',
+ token: '',
+ userId: 0, // LMI_SN
+ username: '0',
+ travelAgencyId: 0, // VEI_SN
+ travelAgencyName: '',
+ telephone: '',
+ emailAddress: '',
+ cityId: 0,
+ timeout: false,
permissionList: [],
},
@@ -36,15 +44,147 @@ const useAuthStore = create((set, get) => ({
},
- login: async (authCode) => {
+ valdateUserPassword: async (usr, pwd) => {
+ const formData = new FormData()
+ formData.append('username', usr)
+ formData.append('Password', pwd)
+
+
+ async function fetchLoginToken() {
+ const postUrl = HT_HOST + '/service-CooperateSOA/Login'
+ const json = await postForm(postUrl, formData)
+ if (json.errcode == 0 && isNotEmpty(json.Result)) {
+ return json.Result.token;
+ } else {
+ return 0;
+ }
+ }
+ const token = await fetchLoginToken()
+ console.info('token: ' + token)
+
+ const fetchUrl = prepareUrl(HT_HOST + '/service-CooperateSOA/GetLinkManInfo')
+ .append('token', token)
+ .build()
+
+ return fetchJSON(fetchUrl)
+ .then(json => {
+ if (json.errcode == 0) {
+ set(() => ({
+ loginUser: {
+ token: token,
+ timeout: false,
+ userId: json.Result.LMI_SN,
+ username: json.Result.LoginName,
+ travelAgencyId: json.Result.LMI_VEI_SN,
+ travelAgencyName: json.Result.VName,
+ telephone: json.Result.LkPhone,
+ emailAddress: json.Result.LMI_listmail,
+ cityId: json.Result.citysn,
+ },
+ loginStatus: 302
+ }))
+ // loadPageSpy(`${json.Result.VName}-${json.Result.LoginName}`)
+ // this.startTokenInterval()
+ } else {
+ throw new Error(json.errmsg + ': ' + json.errcode)
+ }
+ })
},
logout: () => {
+ window.sessionStorage.clearSession()
+ set(() => ({
+ loginUser: {
+ timeout: true
+ }
+ }))
+ },
+
+ fetchUserDetail: () => {
+ const { loginUser } = get()
+ const fetchUrl = prepareUrl(HT_HOST + '/service-CooperateSOA/GetLinkManInfo')
+ .append('token', loginUser.token)
+ .build();
+
+ return fetchJSON(fetchUrl)
+ .then(json => {
+ if (json.errcode == 0) {
+ set((state) => ({
+ loginUser: {
+ ...state.loginUser,
+ userId: json.Result.LMI_SN,
+ username: json.Result.LoginName,
+ travelAgencyId: json.Result.LMI_VEI_SN,
+ travelAgencyName: json.Result.VName,
+ telephone: json.Result.LkPhone,
+ emailAddress: json.Result.LMI_listmail,
+ cityId: json.Result.citysn,
+ }
+ }))
+
+ // loadPageSpy(`${json.Result.VName}-${json.Result.LoginName}`)
+ // this.startTokenInterval()
+ return loginUser
+ } else {
+ throw new Error(json.errmsg + ': ' + json.errcode)
+ }
+ });
},
+ startTokenInterval: () => {
+ const { loginUser } = get()
+ async function fetchLastRequet() {
+ const fetchUrl = prepareUrl(HT_HOST + '/service-CooperateSOA/GetLastReqDate')
+ .append('token', loginUser.token)
+ .build();
+ const json = await fetchJSON(fetchUrl)
+ if (json.errcode == 0 && isNotEmpty(json.result)) {
+ return json.result.LastReqDate;
+ } else {
+ return 0;
+ }
+ }
+
+ async function checkTokenTimeout() {
+ const lastRequest = await fetchLastRequet();
+ const lastReqDate = new Date(lastRequest);
+ const now = new Date();
+ const diffTime = now.getTime() - lastReqDate.getTime();
+ const diffHours = diffTime/1000/60/60;
+ if (diffHours > 4) {
+ authStore.logout();
+ }
+ }
+
+ const interval = setInterval(() => checkTokenTimeout(), 1000*60*20)
+ set(() => ({
+ tokenInterval: interval
+ }))
+ },
+
+ changeUserPassword: (password, newPassword) => {
+ const { loginUser } = get()
+ const formData = new FormData();
+ formData.append('UserID', loginUser.userId);
+ formData.append('Password', password);
+ formData.append('NewPassword', newPassword);
+ formData.append('token', loginUser.token);
+ const postUrl = HT_HOST + '/service-CooperateSOA/SetPassword';
+
+ return postForm(postUrl, formData)
+ .then(json => {
+ if (json.errcode == 0) {
+ return json;
+ } else {
+ throw new Error(json.errmsg + ': ' + json.errcode);
+ }
+ });
+ },
}))
-class Auth {
+export default useAuthStore
+
+export class Auth {
constructor(root) {
makeAutoObservable(this, { rootStore: false });
@@ -161,24 +301,6 @@ class Auth {
});
}
- //供应商列表
- fetchVendorList(){
- const authStore = this;
- const fetchUrl = prepareUrl(HT_HOST + '/service-cusservice/PTGetHWVendorList')
- .append('token', authStore.login.token)
- .build();
-
- return fetchJSON(fetchUrl)
- .then(json => {
- //console.log(json);
- if (json.errcode == 0) {
- runInAction(() => {
- this.VendorList = json.Result;
- });
- }
- });
- }
-
login = {
token: '',
userId: 0, // LMI_SN
@@ -192,4 +314,4 @@ class Auth {
}
}
-export default Auth;
+// export Auth;
diff --git a/src/stores/Reservation.js b/src/stores/Reservation.js
index 33f790c..ebde26a 100644
--- a/src/stores/Reservation.js
+++ b/src/stores/Reservation.js
@@ -2,8 +2,37 @@ import { makeAutoObservable, runInAction } from "mobx";
import { fetchJSON, postForm } from '@/utils/request';
import { HT_HOST } from "@/config";
import { prepareUrl } from '@/utils/commons';
+import { create } from 'zustand'
-class Reservation {
+const useReservationStore = create((set, get) => ({
+
+ fetchAllGuideList: (travelAgencyId, token) => {
+ const fetchUrl = prepareUrl(HT_HOST + '/service-cusservice/PTGetGuideList')
+ .append('VEI_SN', travelAgencyId)
+ .append("token", token)
+ .build();
+
+ return fetchJSON(fetchUrl)
+ .then(json => {
+ if (json.errcode == 0) {
+ const guideList = (json?.Result??[]).map((data, index) => {
+ return {
+ guideId: data.TGI_SN,
+ guideName: data.TGI2_Name,
+ mobileNo: data.TGI_Mobile
+ }
+ });
+ return guideList;
+ } else {
+ throw new Error(json.errmsg + ': ' + json.errcode);
+ }
+ });
+ },
+}))
+
+export default useReservationStore
+
+export class Reservation {
constructor(root) {
makeAutoObservable(this, { rootStore: false });
@@ -89,8 +118,8 @@ class Reservation {
const planChange = results[1]?.PlanChange??[];
runInAction(() => {
this.reservationDetail = {
- referenceNumber: planDetail.GRI_Name,
- tourGuide: planDetail.Guide,
+ referenceNumber: planDetail.GRI_Name,
+ tourGuide: planDetail.Guide,
arrivalDate: planDetail.eoi_getdate,
reservationId: reservationId
};
@@ -219,7 +248,7 @@ class Reservation {
formData.append('ConfirmText', confirmText);
formData.append('VAS_SN', this.selectedConfirmation.VAS_SN);
formData.append("token", this.root.authStore.login.token);
-
+
const postUrl = HT_HOST + '/service-cusservice/PTConfirmPlanChange';
return postForm(postUrl, formData)
@@ -263,9 +292,7 @@ class Reservation {
size: 10,
total: 0
}
-
+
confirmationList = [
];
-}
-
-export default Reservation;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/stores/Root.js b/src/stores/Root.js
index 50d3e12..2f93f8a 100644
--- a/src/stores/Root.js
+++ b/src/stores/Root.js
@@ -1,8 +1,8 @@
import { makeAutoObservable } from "mobx";
-import Reservation from "./Reservation";
+import { Reservation } from "./Reservation";
import Feedback from "./Feedback";
import Notice from "./Notice";
-import Auth from "./Auth";
+import { Auth } from "./Auth";
import Invoice from "./Invoice";
import Report from "./Report";
@@ -17,7 +17,7 @@ class Root {
makeAutoObservable(this);
}
- clearSession() {
+ clearSession() {
if (window.sessionStorage) {
const sessionStorage = window.sessionStorage;
sessionStorage.clear();
diff --git a/src/views/Login.jsx b/src/views/Login.jsx
index 674a779..29dd806 100644
--- a/src/views/Login.jsx
+++ b/src/views/Login.jsx
@@ -3,15 +3,18 @@ import { useEffect } from 'react';
import { Button, Checkbox, Form, Input, Row, App } from 'antd';
import { useStore } from '@/stores/StoreContext.js';
import { useTranslation } from 'react-i18next';
+import useAuthStore from '@/stores/Auth'
function Login() {
const { t, i18n } = useTranslation();
const { authStore, noticeStore } = useStore();
+ const [valdateUserPassword, fetchUserDetail, loginStatus] =
+ useAuthStore((state) => [state.valdateUserPassword, state.fetchUserDetail, state.loginStatus])
const { notification } = App.useApp();
- const navigate = useNavigate();
- const location = useLocation();
- const [form] = Form.useForm();
+ const navigate = useNavigate()
+ const location = useLocation()
+ const [form] = Form.useForm()
useEffect (() => {
if (location.search === '?out') {
@@ -23,23 +26,19 @@ function Login() {
};
}, []);
+ useEffect (() => {
+ if (loginStatus === 302) {
+ // navigate("/reservation/newest")
+ }
+ }, [loginStatus]);
+
const onFinish = (values) => {
- authStore.valdateUserPassword(values.username, values.password)
+ valdateUserPassword(values.username, values.password)
.then((userId) => {
- noticeStore.getBulletinUnReadCount(userId);
- authStore.fetchUserDetail()
- .then((user) => {
- // navigate(-1) is equivalent to hitting the back button.
- navigate("/reservation/newest");
- })
- .catch(ex => {
- notification.error({
- message: `Notification`,
- description: 'Failed to get user information.',
- placement: 'top',
- duration: 4,
- });
- });
+ // noticeStore.getBulletinUnReadCount(userId);
+
+ console.info('valdateUserPassword')
+//
})
.catch(ex => {
notification.error({
@@ -53,68 +52,71 @@ function Login() {
const onFinishFailed = (errorInfo) => {
console.log('Failed:', errorInfo);
- };
-
- return (
-
-
-
- );
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
}
export default Login;
diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx
index f7a7cbe..89d2a0c 100644
--- a/src/views/reservation/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@@ -8,6 +8,8 @@ import { useStore } from '@/stores/StoreContext.js';
import { isEmpty } from "@/utils/commons";
import { useTranslation } from 'react-i18next';
import usePresets from '@/hooks/usePresets';
+import useAuthStore from '@/stores/Auth'
+import useReservationStore from '@/stores/Reservation'
const { Title } = Typography;
@@ -108,6 +110,10 @@ function Newest() {
const [dataLoading, setDataLoading] = useState(false);
const [guideSelectOptions, setGuideSelectOptions] = useState([]);
const { reservationStore } = useStore();
+ const loginUser = useAuthStore((state) => state.loginUser)
+
+ const fetchAllGuideList = useReservationStore((state) => state.fetchAllGuideList)
+
const { reservationList, reservationPage, referenceNo, arrivalDateRange, cityList } = reservationStore;
const { notification } = App.useApp();
@@ -116,7 +122,7 @@ function Newest() {
// 第一页，未确认计划
onSearchClick(1, 1);
}
- reservationStore.fetchAllGuideList()
+ fetchAllGuideList(loginUser.travelAgencyId, loginUser.token)
.then((guideList) => {
const selectOptions = guideList.map((data, index) => {
return {
@@ -124,7 +130,7 @@ function Newest() {
label: data.guideName
}
});
- setGuideSelectOptions(selectOptions);
+ // setGuideSelectOptions(selectOptions);
});
return () => {
// unmount...