router done

This commit is contained in:
Jesse-Ma
2023-03-10 10:30:43 +08:00
parent fbb2c4064c
commit 11987b0a77
12 changed files with 21977 additions and 1054 deletions

20618
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -11,10 +11,12 @@
},
"dependencies": {
"axios": "^0.27.2",
"bluebird": "^3.7.2",
"clipboard": "^2.0.11",
"crypto-js": "^4.1.1",
"escape-html": "^1.0.3",
"file-saver": "^2.0.5",
"localforage": "^1.10.0",
"pako": "^2.1.0",
"qrcodejs2": "^0.0.2",
"view-design": "^4.7.0",

View File

@@ -24,29 +24,29 @@
background-color: #dddddd
}
</style>
<script src="https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/axios@0.27.2/dist/axios.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/axios@0.27.2/dist/axios.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/view-design@4.7.0/dist/iview.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/view-design@4.7.0/dist/iview.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/crypto-js@4.1.1/crypto-js.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/crypto-js@4.1.1/crypto-js.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-i18n@8.21.1/dist/vue-i18n.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/vue-i18n@8.21.1/dist/vue-i18n.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.5/dist/FileSaver.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.5/dist/FileSaver.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/qrcodejs2@0.0.2/qrcode.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/qrcodejs2@0.0.2/qrcode.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate.js"
type="text/javascript"></script>
<script>
<script type="text/javascript">
window.wasm_flate_bg_path = "https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate_bg.wasm"
</script>

73
public/redirect.html Normal file
View File

@@ -0,0 +1,73 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="renderer" content="webkit" />
<meta name="force-rendering" content="webkit" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport"
content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<meta name="keywords" content="flagnote" />
<meta name="description" content="flag note" />
<meta name="theme-color" content="#ed4014" />
<meta name="format-detection" content="telephone=no,email=no,adress=no" />
<meta name="google" content="notranslate">
<meta http-equiv="Expires" content="0" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Cache-control" content="no-cache" />
<meta http-equiv="Cache" content="no-cache" />
<link rel="icon" href="/static/favicon.png" />
<title>flagnote.com</title>
<style>
body {
background-color: #dddddd
}
</style>
<script>
const servicePath = "";
//const servicePath="https://flagnote.com";
function ajaxGet(url) {
let data = null;
let xmlhttp = new XMLHttpRequest();
xmlhttp.open("GET", url, false);
xmlhttp.onreadystatechange = () => {
if (xmlhttp.readyState == 4) {
if (xmlhttp.status == 200 || xmlhttp.status == 304) {
if (xmlhttp.responseText) {
let rs = JSON.parse(xmlhttp.responseText);
if (rs && rs.code == "000000") {
data = rs.data;
}
}
}
}
};
xmlhttp.send();
return data;
}
function getKeyMeta() {
let url = servicePath + "/note/keyMeta";
let keyMeta = null;
try {
keyMeta = ajaxGet(url);
} catch (error) {
console.log(error);
}
return keyMeta;
}
let keyMeta = getKeyMeta();
sessionStorage.setItem("keyMeta", JSON.stringify(keyMeta));
location.href = "/" + keyMeta.key;
</script>
</head>
<body><noscript><strong>Please enable JavaScript to continue.</strong></noscript>
</body>
</html>

View File

@@ -97,6 +97,28 @@ export function getNoteBlob(key) {
});
}
export function getNoteMetaNew(key) {
let url = NoteConstant.servicePath + "/note/" + key + "/noteMeta";
return axios({
url: url,
method: "get",
ignoreError: 1,
original: true,
source: true,
});
}
export function getKeyMetaNew() {
let url = NoteConstant.servicePath + "/note/keyMeta";
return axios({
url: url,
method: "get",
ignoreError: 1,
original: true,
source: true,
});
}
export function getNoteMeta(key) {
let url = NoteConstant.servicePath + "/note/" + key + "/noteMeta";
let noteMeta = null;

View File

@@ -1,3 +1,5 @@
import localforage from "localforage";
class Storage {
constructor() {
this.session = new Session();
@@ -29,23 +31,23 @@ class Session {
class Local {
setObject(key, value) {
localStorage.setItem(key, JSON.stringify(value));
localforage.setItem(key, JSON.stringify(value));
}
getObject(key) {
return JSON.parse(localStorage.getItem(key));
return JSON.parse(localforage.getItem(key));
}
delete(key) {
localStorage.removeItem(key);
localforage.removeItem(key);
}
setText(key, value) {
localStorage.setItem(key, value);
localforage.setItem(key, value);
}
getText(key) {
return localStorage.getItem(key);
return localforage.getItem(key);
}
getUseSize() {

View File

@@ -1,12 +1,15 @@
import Vue from 'vue'
import App from './App.vue'
import router from './router'
import getRouter from './router/'
import axios from 'axios'
import VueAxios from 'vue-axios'
import './plugins/iview.js'
import {Promise} from "bluebird";
import i18n from './i18n/'
import NoteConstant from "@/libs/constants";
axios.defaults.baseURL = NoteConstant.servicePath;
Vue.use(VueAxios, axios)
@@ -16,10 +19,12 @@ Vue.config.debug = debugFlag;
Vue.config.devtools = debugFlag;
Vue.config.productionTip = debugFlag;
new Vue({
i18n,
router,
render: h => h(App)
}).$mount('#app')
Promise.try(getRouter).then((router)=>{
new Vue({
i18n,
router,
render: h => h(App)
}).$mount('#app')
});

149
src/router/index.bak.js Normal file
View File

@@ -0,0 +1,149 @@
import Vue from "vue";
import VueRouter from "vue-router";
import EditNote from "@/views/EditNote.vue";
import ViewNote from "@/views/ViewNote.vue";
import ErrorRoute from "@/views/ErrorRoute.vue";
import ErrorNote from "@/views/ErrorNote.vue";
import { getKeyMeta, getNoteMeta } from "@/api/note";
import { getStoreKey } from "@/api/lock";
import storage from "@/libs/storage";
Vue.use(VueRouter);
var keyMeta = null;
var noteMeta = null;
var errorMeta = null;
function getKeyMetaParam() {
return keyMeta;
}
function getNoteMetaParam() {
return noteMeta;
}
function getErrorMetaParam() {
return errorMeta;
}
function getNoteView() {
if (errorMeta) {
return;
}
let path = location.pathname;
let key = path.substring(1, path.length);
if (keyMeta && keyMeta.key) {
key = keyMeta.key;
}
let regKey = /^[abcdefhikmnopqstuvwxyz23456789]{16}$/;
if (!regKey.test(key)) {
errorMeta = 100002;
return ErrorNote;
}
if (keyMeta && keyMeta.key) {
//firstEdit
return EditNote;
}
//set noteMeta
noteMeta = getNoteMeta(key);
//server error
if (!noteMeta) {
errorMeta = 100006;
return ErrorNote;
}
//invalidated key
if (!noteMeta.key) {
errorMeta = 100002;
return ErrorNote;
}
//validated state
if (1 == noteMeta.state) {
return ViewNote;
}
//deleted
if (0 == noteMeta.state) {
let storeKey = getStoreKey(key);
storage.local.delete(storeKey);
// user deleted
if (noteMeta.ttl > 0) {
errorMeta = 100003;
return ErrorNote;
} else {// timeout
errorMeta = 100004;
return ErrorNote;
}
}
if (null == noteMeta.state) {
let storeKey = getStoreKey(key);
//if has storage , then edit
if (storage.local.getText(storeKey)) {
return EditNote;
} else {
//storage is empty
let df = storage.session.getText(storeKey + "_delete")
if (df) {//unsubmitted,user deleted.
errorMeta = 100003;
return ErrorNote;
} else {//unsubmitted
errorMeta = 100005;
return ErrorNote;
}
}
}
// other exception
errorMeta = 100001;
return ErrorNote;
}
function getHomeRedirect() {
let path = location.pathname;
if (path != "/") {
return;
}
//setKeyMeta
keyMeta = getKeyMeta();
// server error
if (!keyMeta) {
errorMeta = 100006;
return "/error_"+errorMeta;
}
return "/" + keyMeta.key;
}
const routes = [
{
path: "/",
name: "home",
redirect: getHomeRedirect(),
},
{ path: "/error_:code([0-9]{6})", component: ErrorNote },
{
path: "/:name([a-z0-9]{10,20})",
name: "note",
component: getNoteView(),
meta: { keyMeta: getKeyMetaParam(), noteMeta: getNoteMetaParam(), errorMeta: getErrorMetaParam() },
},
{ path: "/:path(.*)", component: ErrorRoute }
];
const router = new VueRouter({
routes,
mode: "history",
});
export default router;

53
src/router/index.bak2.js Normal file
View File

@@ -0,0 +1,53 @@
import VueRouter from "vue-router";
import { getKeyMetaNew } from "@/api/note";
import EditNote from "@/views/EditNote.vue";
import ViewNote from "@/views/ViewNote.vue";
import ErrorRoute from "@/views/ErrorRoute.vue";
import ErrorNote from "@/views/ErrorNote.vue";
export function getRouter() {
let path = location.pathname;
if (path == "/") {
return getKeyMetaNew().then(function (data) {
let keyMate = data;
return returnRouter(keyMate);
});
}
}
function returnEditViewRouter(keyMeta,noteMeta,errorMeta){
let routes = composeRoutes(homeRedirect,noteView,keyMeta,noteMeta,errorMeta);
let router = composeRouter(routes)
return new Promise((resolve) => {
resolve(router);
});
}
function composeRoutes(homeRedirect,noteView,keyMeta,noteMeta,errorMeta) {
const routes = [
{
path: "/",
name: "home",
redirect: homeRedirect,
}
];
return routes;
}
function composeRouter(routes) {
const router = new VueRouter({
routes,
mode: "history",
});
return router;
}

View File

@@ -1,149 +1,129 @@
import Vue from "vue";
import { getNoteMetaNew } from "@/api/note";
import VueRouter from "vue-router";
import EditNote from "@/views/EditNote.vue";
import ViewNote from "@/views/ViewNote.vue";
import ErrorRoute from "@/views/ErrorRoute.vue";
import ErrorNote from "@/views/ErrorNote.vue";
import { getKeyMeta, getNoteMeta } from "@/api/note";
import { getStoreKey } from "@/api/lock";
import storage from "@/libs/storage";
import { getStoreKey } from "@/api/lock";
Vue.use(VueRouter);
var keyMeta = null;
var noteMeta = null;
var errorMeta = null;
export default function getRouter() {
let path = location.pathname;
let key = path.substring(1, path.length);
//let errorMeta = null;
function getKeyMetaParam() {
return keyMeta;
}
function getNoteMetaParam() {
return noteMeta;
}
function getErrorMetaParam() {
return errorMeta;
}
function getNoteView() {
if (errorMeta) {
return;
}
let path = location.pathname;
let key = path.substring(1, path.length);
if (keyMeta && keyMeta.key) {
key = keyMeta.key;
}
let regKey = /^[abcdefhikmnopqstuvwxyz23456789]{16}$/;
if (!regKey.test(key)) {
errorMeta = 100002;
return ErrorNote;
}
if (keyMeta && keyMeta.key) {
//firstEdit
return EditNote;
}
//set noteMeta
noteMeta = getNoteMeta(key);
//server error
if (!noteMeta) {
errorMeta = 100006;
return ErrorNote;
}
//invalidated key
if (!noteMeta.key) {
errorMeta = 100002;
return ErrorNote;
}
//validated state
if (1 == noteMeta.state) {
return ViewNote;
}
//deleted
if (0 == noteMeta.state) {
let storeKey = getStoreKey(key);
storage.local.delete(storeKey);
// user deleted
if (noteMeta.ttl > 0) {
errorMeta = 100003;
return ErrorNote;
} else {// timeout
errorMeta = 100004;
return ErrorNote;
if (path == "/") {
//errorMeta = 100002;
return errorRouter(100002);
}
}
if (null == noteMeta.state) {
let storeKey = getStoreKey(key);
//if has storage , then edit
if (storage.local.getText(storeKey)) {
return EditNote;
} else {
//storage is empty
let df = storage.session.getText(storeKey + "_delete")
if (df) {//unsubmitted,user deleted.
errorMeta = 100003;
return ErrorNote;
} else {//unsubmitted
errorMeta = 100005;
return ErrorNote;
}
let keyMeta = storage.session.getObject("keyMeta");
let regKey = /^[abcdefhikmnopqstuvwxyz23456789]{16}$/;
if (!regKey.test(key)) {
return errorRouter(100002);
}
}
// other exception
errorMeta = 100001;
return ErrorNote;
if (keyMeta && keyMeta.key) {
// if(document.referrer=="/"){
// }
return noteRouter(EditNote, keyMeta, null);
}
return getNoteMetaNew(key).then(function (resp) {
if (null == resp || null == resp.data) {
return errorRouter(100006);
}
let result = resp.data;
if (result.code != '000000') {
return errorRouter(parseInt(result.code));
}
let noteMeta = result.data;
if (null == noteMeta) {
return errorRouter(100001);
}
if (null == noteMeta.key) {
return errorRouter(100002);
}
//view
if (1 == noteMeta.state) {
return noteRouter(ViewNote, keyMeta, noteMeta);
}
//deleted
if (0 == noteMeta.state) {
let storeKey = getStoreKey(key);
storage.local.delete(storeKey);
// user deleted
if (noteMeta.ttl > 0) {
// errorMeta = 100003;
return errorRouter(100003);
} else {// timeout
// errorMeta = 100004;
return errorRouter(100004);
}
}
//edit or unsubmitted
if (null == noteMeta.state) {
let storeKey = getStoreKey(key);
return storage.local.getText(storeKey).then(function (storeInfo) {
//if has storage , then edit
if (null != storeInfo) {
return noteRouter(EditNote, keyMeta, noteMeta);
}
//storage is empty
let df = storage.session.getText(storeKey + "_delete")
if (df) {//unsubmitted,user deleted.
// errorMeta = 100003;
return errorRouter(100003);
} else {//unsubmitted
// errorMeta = 100005;
return errorRouter(100005);
}
});
}
});
}
function getHomeRedirect() {
let path = location.pathname;
if (path != "/") {
return;
}
function noteRouter(noteView, keyMeta, noteMeta) {
const routes = [
{
path: "/:name([a-z0-9]{10,20})",
name: "note",
component: noteView,
meta: { keyMeta: keyMeta, noteMeta: noteMeta },
}
];
//setKeyMeta
keyMeta = getKeyMeta();
// server error
if (!keyMeta) {
errorMeta = 100006;
return "/error_"+errorMeta;
}
return "/" + keyMeta.key;
const router = new VueRouter({
routes,
mode: "history",
});
return router;
}
const routes = [
{
path: "/",
name: "home",
redirect: getHomeRedirect(),
},
{ path: "/error_:code([0-9]{6})", component: ErrorNote },
{
path: "/:name([a-z0-9]{10,20})",
name: "note",
component: getNoteView(),
meta: { keyMeta: getKeyMetaParam(), noteMeta: getNoteMetaParam(), errorMeta: getErrorMetaParam() },
},
{ path: "/:path(.*)", component: ErrorRoute }
];
const router = new VueRouter({
routes,
mode: "history",
});
function errorRouter(errorCode) {
const routes = [
{
path: "/error_:code([0-9]{6})",
name: "error",
component: ErrorNote,
errorMeta: errorCode
}
];
const router = new VueRouter({
routes,
mode: "history",
});
return router;
}
export default router;

View File

@@ -65,8 +65,8 @@ module.exports = defineConfig({
devServer: {
proxy: {
"/note": {
// target: "https://flagnote.com/", // 后台接口域名
target: "http://localhost:10000/", // 后台接口域名
target: "https://flagnote.com/", // 后台接口域名
// target: "http://localhost:10000/", // 后台接口域名
secure: false, // 如果是https接口需要配置这个参数
changeOrigin: true, //是否跨域
pathRewrite: {

1817
yarn.lock

File diff suppressed because it is too large Load Diff