govolokatliai/wts
1
0
Fork 0
forked from wts/wts
Code Pull Requests Activity

修改JWT在构建时的行为，尝试减少错误的出现

Browse Source
This commit is contained in:
Linus Torvalds
2026-02-27 10:37:34 +08:00
parent 7c1a37216d
commit fd7ea1cff2
2 changed files with 149 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
front/src/lib/jwt.ts
View File

@@ -30,20 +30,7 @@ export function CheckAndGetJWT(tx: 'raw'): string | null;
export function CheckAndGetJWT(tx: 'raw' | 'parsed'): WtsJWT | string | null {
if (!browser) {
if (tx === 'parsed') {
return {
openid: '',
access: 'unregistered',
sid: '',
username: '',
avatar: '',
name: '',
} as WtsJWT;
}
if (tx === 'raw') {
return "aaaaa";
}
return null;
}
let token: string;
token = localStorage.getItem('jwt');
@@ -105,6 +92,10 @@ export function Guard(a: (subject: WtsAccess) => boolean) {
return;
}
if (!a(jwt.access)) {
if(jwt.access === "unregistered"){
goto('/register');
return;
}
console.log('Guard():权限不足，跳转到首页');
goto('/forbidden');
return;

277
front/src/routes/op/ticket_search/+page.svelte
View File

@@ -1,11 +1,11 @@
<script lang="ts">
import type { PageProps } from './$types';
import type {PageProps} from './$types';
let { data }: PageProps = $props();
let {data}: PageProps = $props();
import { CheckAndGetJWT, Guard } from '$lib/jwt';
import { IsAdmin, IsOperator, PriorityMap, CategoryMap, ISPMap } from '$lib/types/enum';
import { onMount } from 'svelte';
import {CheckAndGetJWT, Guard} from '$lib/jwt';
import {IsAdmin, IsOperator, PriorityMap, CategoryMap, ISPMap} from '$lib/types/enum';
import {onMount} from 'svelte';
import {
RadioButtonGroup,
RadioButton,
@@ -22,16 +22,21 @@
NotificationQueue,
Toggle
} from 'carbon-components-svelte';
import type { FilterTicketsReq } from '$lib/types/apiRequest';
import { ZoneMap, ZoneToBlock, StatusMap, type WtsZone } from '$lib/types/enum';
import { RFC3339 } from '$lib/types/RFC3339';
import { startOfDay, endOfDay } from 'date-fns';
import { criteria } from '$lib/states/ticketCriteriaSearch.svelte';
import { goto } from '$app/navigation';
import type { WtsStatus, WtsPriority, WtsCategory, WtsISP } from '$lib/types/enum';
import type {FilterTicketsReq} from '$lib/types/apiRequest';
import {ZoneMap, ZoneToBlock, StatusMap, type WtsZone} from '$lib/types/enum';
import {RFC3339} from '$lib/types/RFC3339';
import {startOfDay, endOfDay} from 'date-fns';
import {criteria} from '$lib/states/ticketCriteriaSearch.svelte';
import {goto} from '$app/navigation';
import type {WtsStatus, WtsPriority, WtsCategory, WtsISP} from '$lib/types/enum';
import {WtsJWT} from '$lib/jwt'
onMount(() => Guard(IsOperator));
let token: WtsJWT = $state({} as WtsJWT);
onMount(()=>{token =CheckAndGetJWT('parsed');})
let req = $state(criteria.r as FilterTicketsReq);
let zoneSelected: WtsZone[] = $state(criteria._blocks_in_zone ?? []);
@@ -50,7 +55,7 @@
// });
let onDateChange = (which: 'newer' | 'older') => (event: CustomEvent) => {
const { dateStr } = event.detail;
const {dateStr} = event.detail;
if (dateStr) {
const date = new Date(dateStr);
const adjustedDate = which === 'newer' ? startOfDay(date) : endOfDay(date);
@@ -77,11 +82,11 @@
}
const allZones = Object.keys(ZoneMap) as WtsZone[];
const allStatuses = IsAdmin(CheckAndGetJWT('parsed').access)
const allStatuses = IsAdmin(token.access)
? (Object.keys(StatusMap) as WtsStatus[])
: (Object.keys(StatusMap).filter(
(status) => status !== 'solved' && status !== 'canceled'
) as WtsStatus[]);
(status) => status !== 'solved' && status !== 'canceled'
) as WtsStatus[]);
const allPriorities = Object.keys(PriorityMap) as WtsPriority[];
const allCategories = Object.keys(CategoryMap) as WtsCategory[];
const allISPs = Object.keys(ISPMap) as WtsISP[];
@@ -111,7 +116,7 @@
'delay',
'escalated'
] as const satisfies readonly WtsStatus[];
const statusOptions: readonly WtsStatus[] = IsAdmin(CheckAndGetJWT('parsed').access)
const statusOptions: readonly WtsStatus[] = IsAdmin(token.access)
? statusOptionsAdmin
: statusOptionsUser;
@@ -179,7 +184,7 @@
if (!sameArray(req.isp, nextIsp)) req.isp = nextIsp;
});
$effect(() =>{
$effect(() => {
isScheduledSelected = req.status?.includes('scheduled') ?? false;
})
</script>
@@ -190,12 +195,12 @@
<br />
<p>选择您需要检索报修工单的条件</p>
{#if IsAdmin(CheckAndGetJWT('parsed').access)}
<br />
<RadioButtonGroup id="scope" legendText="范围" bind:selected={req.scope} required={true}>
<RadioButton labelText="只看活跃的" value="active" />
<RadioButton labelText="所有报修单" value="all" />
</RadioButtonGroup>
{#if IsAdmin(token.access)}
<br />
<RadioButtonGroup id="scope" legendText="范围" bind:selected={req.scope} required={true}>
<RadioButton labelText="只看活跃的" value="active" />
<RadioButton labelText="所有报修单" value="all" />
</RadioButtonGroup>
{/if}
<br />
@@ -213,26 +218,39 @@
<CheckboxGroup legendText="片区" id="block" bind:selected={zoneSelected} required={true}>
<Grid narrow>
<Row>
<Column sm={2} md={2} lg={4}><Checkbox value="FX" labelText={ZoneMap['FX']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="BM" labelText={ZoneMap['BM']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="DM" labelText={ZoneMap['DM']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="QT" labelText={ZoneMap['QT']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="XHAB" labelText={ZoneMap['XHAB']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="XHCD" labelText={ZoneMap['XHCD']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="ZH" labelText={ZoneMap['ZH']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="other" labelText={ZoneMap['other']} /></Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="FX" labelText={ZoneMap['FX']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="BM" labelText={ZoneMap['BM']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="DM" labelText={ZoneMap['DM']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="QT" labelText={ZoneMap['QT']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="XHAB" labelText={ZoneMap['XHAB']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="XHCD" labelText={ZoneMap['XHCD']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="ZH" labelText={ZoneMap['ZH']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="other" labelText={ZoneMap['other']} />
</Column>
</Row>
</Grid>
</CheckboxGroup>
<div class="toggle">
<Toggle
size="sm"
toggled={allSelected(zoneSelected, zoneOptions)}
on:toggle={(e) => {
const { toggled } = e.detail as { toggled: boolean };
zoneSelected = toggled ? [...zoneOptions] : [];
<Toggle size="sm" toggled={allSelected(zoneSelected, zoneOptions)} on:toggle={(e)=> {
const { toggled } = e.detail as { toggled: boolean };
zoneSelected = toggled ? [...zoneOptions] : [];
}}
>
>
<span slot="labelA">全不选</span>
<span slot="labelB">全选</span>
</Toggle>
@@ -243,36 +261,35 @@
<CheckboxGroup legendText="状态" id="status" bind:selected={req.status} required={true}>
<Grid narrow>
<Row>
<Column sm={2} md={2} lg={4}><Checkbox value="fresh" labelText={StatusMap['fresh']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="scheduled" labelText={StatusMap['scheduled']} /></Column
>
<Column sm={2} md={2} lg={4}><Checkbox value="delay" labelText={StatusMap['delay']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="escalated" labelText={StatusMap['escalated']} /></Column
>
{#if IsAdmin(CheckAndGetJWT('parsed').access)}
<Column sm={2} md={2} lg={4}
><Checkbox value="solved" labelText={StatusMap['solved']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="canceled" labelText={StatusMap['canceled']} /></Column
>
<Column sm={2} md={2} lg={4}>
<Checkbox value="fresh" labelText={StatusMap['fresh']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="scheduled" labelText={StatusMap['scheduled']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="delay" labelText={StatusMap['delay']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="escalated" labelText={StatusMap['escalated']} />
</Column>
{#if IsAdmin(token.access)}
<Column sm={2} md={2} lg={4}>
<Checkbox value="solved" labelText={StatusMap['solved']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="canceled" labelText={StatusMap['canceled']} />
</Column>
{/if}
</Row>
</Grid>
</CheckboxGroup>
<div class="toggle">
<Toggle
size="sm"
toggled={allSelected(req.status, statusOptions)}
on:toggle={(e) => {
const { toggled } = e.detail as { toggled: boolean };
req.status = toggled ? [...statusOptions] : [];
<Toggle size="sm" toggled={allSelected(req.status, statusOptions)} on:toggle={(e)=> {
const { toggled } = e.detail as { toggled: boolean };
req.status = toggled ? [...statusOptions] : [];
}}
>
>
<span slot="labelA">全不选</span>
<span slot="labelB">全选</span>
</Toggle>
@@ -283,34 +300,33 @@
<CheckboxGroup legendText="优先级" id="priority" bind:selected={req.priority} required={true}>
<Grid narrow>
<Row>
<Column sm={2} md={2} lg={4}><Checkbox value="highest" labelText="最高" /></Column>
<Column sm={2} md={2} lg={4}
><Checkbox value="assigned" labelText={PriorityMap['assigned']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="mainline" labelText={PriorityMap['mainline']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="normal" labelText={PriorityMap['normal']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="in-passing" labelText={PriorityMap['in-passing']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="least" labelText={PriorityMap['least']} /></Column
>
<Column sm={2} md={2} lg={4}>
<Checkbox value="highest" labelText="最高" />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="assigned" labelText={PriorityMap['assigned']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="mainline" labelText={PriorityMap['mainline']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="normal" labelText={PriorityMap['normal']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="in-passing" labelText={PriorityMap['in-passing']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="least" labelText={PriorityMap['least']} />
</Column>
</Row>
</Grid>
</CheckboxGroup>
<div class="toggle">
<Toggle
size="sm"
toggled={allSelected(req.priority, priorityOptions)}
on:toggle={(e) => {
const { toggled } = e.detail as { toggled: boolean };
req.priority = toggled ? [...priorityOptions] : [];
<Toggle size="sm" toggled={allSelected(req.priority, priorityOptions)} on:toggle={(e)=> {
const { toggled } = e.detail as { toggled: boolean };
req.priority = toggled ? [...priorityOptions] : [];
}}
>
>
<span slot="labelA">全不选</span>
<span slot="labelB">全选</span>
</Toggle>
@@ -320,33 +336,30 @@
<CheckboxGroup legendText="类型" id="category" bind:selected={req.category} required={true}>
<Grid narrow>
<Row>
<Column sm={2} md={2} lg={4}
><Checkbox value="first-install" labelText={CategoryMap['first-install']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="client-or-account" labelText={CategoryMap['client-or-account']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="ip-or-device" labelText={CategoryMap['ip-or-device']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="low-speed" labelText={CategoryMap['low-speed']} /></Column
>
<Column sm={2} md={2} lg={4}
><Checkbox value="others" labelText={CategoryMap['others']} /></Column
>
<Column sm={2} md={2} lg={4}>
<Checkbox value="first-install" labelText={CategoryMap['first-install']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="client-or-account" labelText={CategoryMap['client-or-account']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="ip-or-device" labelText={CategoryMap['ip-or-device']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="low-speed" labelText={CategoryMap['low-speed']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="others" labelText={CategoryMap['others']} />
</Column>
</Row>
</Grid>
</CheckboxGroup>
<div class="toggle">
<Toggle
size="sm"
toggled={allSelected(req.category, categoryOptions)}
on:toggle={(e) => {
const { toggled } = e.detail as { toggled: boolean };
req.category = toggled ? [...categoryOptions] : [];
<Toggle size="sm" toggled={allSelected(req.category, categoryOptions)} on:toggle={(e)=> {
const { toggled } = e.detail as { toggled: boolean };
req.category = toggled ? [...categoryOptions] : [];
}}
>
>
<span slot="labelA">全不选</span>
<span slot="labelB">全选</span>
</Toggle>
@@ -357,28 +370,31 @@
<CheckboxGroup legendText="运营商" id="isp" bind:selected={req.isp} required={true}>
<Grid narrow>
<Row>
<Column sm={2} md={2} lg={4}
><Checkbox value="telecom" labelText={ISPMap['telecom']} /></Column
>
<Column sm={2} md={2} lg={4}><Checkbox value="unicom" labelText={ISPMap['unicom']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="mobile" labelText={ISPMap['mobile']} /></Column>
<Column sm={2} md={2} lg={4}><Checkbox value="others" labelText={ISPMap['others']} /></Column>
<Column sm={2} md={2} lg={4}
><Checkbox value="broadnet" labelText={ISPMap['broadnet']} hidden /></Column
>
<Column sm={2} md={2} lg={4}>
<Checkbox value="telecom" labelText={ISPMap['telecom']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="unicom" labelText={ISPMap['unicom']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="mobile" labelText={ISPMap['mobile']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="others" labelText={ISPMap['others']} />
</Column>
<Column sm={2} md={2} lg={4}>
<Checkbox value="broadnet" labelText={ISPMap['broadnet']} hidden />
</Column>
<!--暂时藏起来-->
</Row>
</Grid>
</CheckboxGroup>
<div class="toggle">
<Toggle
size="sm"
toggled={allSelected(req.isp, ispOptions)}
on:toggle={(e) => {
const { toggled } = e.detail as { toggled: boolean };
req.isp = toggled ? [...ispOptions] : [];
<Toggle size="sm" toggled={allSelected(req.isp, ispOptions)} on:toggle={(e)=> {
const { toggled } = e.detail as { toggled: boolean };
req.isp = toggled ? [...ispOptions] : [];
}}
>
>
<span slot="labelA">全不选</span>
<span slot="labelB">全选</span>
</Toggle>
@@ -396,19 +412,12 @@
<br />
<br />
<NumberInput
min={1}
max={20}
step={1}
bind:value={floor}
allowEmpty={true}
allowDecimal={false}
labelText="只看如下楼层(不填代表查看全部楼层)"
/>
<NumberInput min={1} max={20} step={1} bind:value={floor} allowEmpty={true} allowDecimal={false}
labelText="只看如下楼层(不填代表查看全部楼层)" />
<br />
<br />
<Toggle labelText="只显示预约在今天的预约单" bind:toggled={viewTodayScheduled} disabled={!isScheduledSelected}/>
<Toggle labelText="只显示预约在今天的预约单" bind:toggled={viewTodayScheduled} disabled={!isScheduledSelected} />
<br />
<br />
<Button on:click={search}>搜索</Button>