Skip to content

Commit

Permalink
Merge branch 'main' of github.com:pure-admin/vue-pure-admin into chor…
Browse files Browse the repository at this point in the history
…e/vite
  • Loading branch information
xiaoxian521 committed Nov 3, 2023
2 parents b674f74 + b4fd313 commit c670baa
Show file tree
Hide file tree
Showing 22 changed files with 428 additions and 437 deletions.
4 changes: 2 additions & 2 deletions mock/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default [
roles: ["admin"],
accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
expires: "2023/10/30 00:00:00"
expires: "2030/10/30 00:00:00"
}
};
} else {
Expand All @@ -27,7 +27,7 @@ export default [
roles: ["common"],
accessToken: "eyJhbGciOiJIUzUxMiJ9.common",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh",
expires: "2023/10/30 00:00:00"
expires: "2030/10/30 00:00:00"
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion mock/refreshToken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default [
accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh",
// `expires`选择这种日期格式是为了方便调试,后端直接设置时间戳或许更方便(每次都应该递增)。如果后端返回的是时间戳格式,前端开发请来到这个目录`src/utils/auth.ts`,把第`38`行的代码换成expires = data.expires即可。
expires: "2023/10/30 23:59:59"
expires: "2030/10/30 23:59:59"
}
};
} else {
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
"@howdyjs/mouse-menu": "^2.0.9",
"@logicflow/core": "^1.2.15",
"@logicflow/extension": "^1.2.16",
"@pureadmin/descriptions": "^1.1.1",
"@pureadmin/table": "^2.3.3",
"@howdyjs/mouse-menu": "2.0.9",
"@logicflow/core": "^1.2.17",
"@logicflow/extension": "^1.2.18",
"@pureadmin/descriptions": "^1.2.0",
"@pureadmin/table": "^2.3.4",
"@pureadmin/utils": "^1.9.10",
"@vueuse/core": "^10.5.0",
"@vueuse/motion": "^2.0.0",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
"axios": "^1.5.1",
"axios": "^1.6.0",
"china-area-data": "^5.0.1",
"cropperjs": "^1.6.1",
"dayjs": "^1.11.10",
Expand All @@ -83,13 +83,13 @@
"qs": "^6.11.2",
"responsive-storage": "^2.2.0",
"sortablejs": "^1.15.0",
"swiper": "^11.0.0",
"swiper": "^11.0.3",
"typeit": "^8.7.1",
"v-contextmenu": "3.0.0",
"v3-infinite-loading": "^1.3.1",
"version-rocket": "^1.7.0",
"vue": "^3.3.4",
"vue-i18n": "^9.6.4",
"vue": "^3.3.7",
"vue-json-pretty": "^2.2.4",
"vue-pdf-embed": "^1.2.1",
"vue-router": "^4.2.5",
Expand All @@ -99,7 +99,7 @@
"vue-waterfall-plugin-next": "^2.2.4",
"vue3-danmaku": "^1.6.0",
"vuedraggable": "^4.1.0",
"wavesurfer.js": "^7.3.8",
"wavesurfer.js": "^7.4.2",
"xgplayer": "^3.0.9",
"xlsx": "^0.18.5"
},
Expand Down Expand Up @@ -156,17 +156,17 @@
"stylelint-prettier": "^4.0.2",
"stylelint-scss": "^5.2.1",
"svgo": "^3.0.2",
"tailwindcss": "^3.3.3",
"terser": "^5.22.0",
"typescript": "^5.2.2",
"vite": "5.0.0-beta.15",
"tailwindcss": "^3.3.5",
"terser": "^5.24.0",
"vite-plugin-cdn-import": "^0.3.5",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-mock": "2.9.6",
"vite-plugin-remove-console": "^2.1.1",
"vite-svg-loader": "^4.0.0",
"vue-eslint-parser": "^9.3.2",
"vue-tsc": "^1.8.19"
"vue-tsc": "^1.8.22"
},
"engines": {
"node": "^18.0.0 || >=20.0.0",
Expand Down
Loading

0 comments on commit c670baa

Please sign in to comment.