w-web-sso 1.0.13 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (76) hide show
  1. package/db/wsso/ips/data.mdb +0 -0
  2. package/db/wsso/ips/lock.mdb +0 -0
  3. package/db/wsso/tokens/data.mdb +0 -0
  4. package/db/wsso/tokens/lock.mdb +0 -0
  5. package/db/wsso/users/data.mdb +0 -0
  6. package/db/wsso/users/lock.mdb +0 -0
  7. package/dist/css/{app.03a2f95c.css → app.e4367a2b.css} +1 -1
  8. package/dist/index.tmp +6 -2
  9. package/dist/js/app-legacy.4ebeee34.js +2 -0
  10. package/dist/js/app-legacy.4ebeee34.js.map +1 -0
  11. package/dist/js/app.d1707f92.js +2 -0
  12. package/dist/js/app.d1707f92.js.map +1 -0
  13. package/dist/js/chunk-vendors-legacy.7380957a.js +15 -0
  14. package/dist/js/chunk-vendors-legacy.7380957a.js.map +1 -0
  15. package/dist/js/chunk-vendors.7380957a.js +15 -0
  16. package/dist/js/chunk-vendors.7380957a.js.map +1 -0
  17. package/dist/w-web-sso.umd.js +2 -2
  18. package/dist/w-web-sso.umd.js.map +1 -1
  19. package/docs/WWebSso.html +4 -112
  20. package/docs/WWebSso.mjs.html +460 -111
  21. package/docs/index.html +1 -1
  22. package/g.getSettings.mjs +0 -1
  23. package/g.initialData.mjs +8 -10
  24. package/g.mjs +0 -0
  25. package/package.json +7 -6
  26. package/public/index.html +13 -0
  27. package/server/WWebSso.mjs +459 -110
  28. package/server/procCore.mjs +871 -277
  29. package/server/procProtect.mjs +746 -0
  30. package/server/procStaInfor.mjs +393 -0
  31. package/server/provideUsers.mjs +0 -1
  32. package/server/srlog.mjs +12 -0
  33. package/server/staLogs/staIp.callWorker.mjs +35 -0
  34. package/server/staLogs/staIp.mjs +118 -0
  35. package/server/staLogs/staIp.shellWorker.mjs +18 -0
  36. package/server/staLogs/staToken.callWorker.mjs +35 -0
  37. package/server/staLogs/staToken.mjs +118 -0
  38. package/server/staLogs/staToken.shellWorker.mjs +18 -0
  39. package/server/staLogs/staUserAccountLogin.callWorker.mjs +35 -0
  40. package/server/staLogs/staUserAccountLogin.mjs +136 -0
  41. package/server/staLogs/staUserAccountLogin.shellWorker.mjs +18 -0
  42. package/server/staLogs/test_staIp.mjs +27 -0
  43. package/server/staLogs/test_staToken.mjs +27 -0
  44. package/server/staLogs/test_staUserAccountLogin.mjs +30 -0
  45. package/settings.json +15 -1
  46. package/src/components/Layout.vue +70 -15
  47. package/src/components/LayoutContent.vue +35 -33
  48. package/src/components/LayoutContentIps.vue +757 -0
  49. package/src/components/LayoutContentStaInfor.vue +917 -0
  50. package/src/components/LayoutContentTokens.vue +961 -0
  51. package/src/components/{LayoutContentInfor.vue → LayoutContentUserInfor.vue} +366 -73
  52. package/src/components/LayoutContentUsers.vue +21 -34
  53. package/src/components/PageLogin.vue +1 -1
  54. package/src/components/VeUser.vue.txt +9 -10
  55. package/src/components/ruleGroup.vue.txt +5 -6
  56. package/src/main.js +7 -13
  57. package/src/plugins/mLang.mjs +853 -520
  58. package/src/plugins/mShare.mjs +141 -3
  59. package/src/plugins/mUI.mjs +30 -21
  60. package/src/schema/index.mjs +2 -0
  61. package/src/schema/tables/ips.mjs +0 -9
  62. package/src/schema/tables/tokens.mjs +5 -1
  63. package/src/schema/tables/users.mjs +2 -14
  64. package/src/store/mutations.mjs +3 -3
  65. package/src/store/types.mjs +1 -1
  66. package/srv.mjs +55 -38
  67. package/_/350/246/217/345/212/203.md +0 -275
  68. package/dist/js/app-legacy.d468ef7f.js +0 -2
  69. package/dist/js/app-legacy.d468ef7f.js.map +0 -1
  70. package/dist/js/app.d468ef7f.js +0 -2
  71. package/dist/js/app.d468ef7f.js.map +0 -1
  72. package/dist/js/chunk-vendors-legacy.f51f58bb.js +0 -13
  73. package/dist/js/chunk-vendors-legacy.f51f58bb.js.map +0 -1
  74. package/dist/js/chunk-vendors.f51f58bb.js +0 -13
  75. package/dist/js/chunk-vendors.f51f58bb.js.map +0 -1
  76. package/src/components/LayoutContentSettings.vue +0 -1248
@@ -0,0 +1,118 @@
1
+ import ot from 'dayjs'
2
+ import get from 'lodash-es/get.js'
3
+ import size from 'lodash-es/size.js'
4
+ import groupBy from 'lodash-es/groupBy.js'
5
+ import each from 'lodash-es/each.js'
6
+ import mapValues from 'lodash-es/mapValues.js'
7
+ import merge from 'lodash-es/merge.js'
8
+ import genPm from 'wsemi/src/genPm.mjs'
9
+ import isestr from 'wsemi/src/isestr.mjs'
10
+ import randomIntRange from 'wsemi/src/randomIntRange.mjs'
11
+ import fsTreeFolder from 'wsemi/src/fsTreeFolder.mjs'
12
+ import fsBuildReadStreamText from 'wsemi/src/fsBuildReadStreamText.mjs'
13
+
14
+ async function staToken(timeLength = 7, timeInterval = 'hr', opt = {}) {
15
+
16
+ //fdLog
17
+ let fdLog = get(opt, 'fdLog')
18
+ if (!isestr(fdLog)) {
19
+ fdLog = './_logs'
20
+ }
21
+
22
+ //fmt
23
+ let fmt = timeInterval === 'day' ? 'YYYY-MM-DD' : 'YYYY-MM-DDTHH'
24
+
25
+ //unit
26
+ let unit = timeInterval === 'hr' ? 'hour' : 'day'
27
+
28
+ //kpTime, 產生完整的時間區間
29
+ let now = ot()
30
+ let tStart = now.subtract(timeLength, 'day')
31
+ let tCurr = tStart.startOf(unit)
32
+ let tEnd = now.startOf(unit)
33
+ let kpTime = {}
34
+ while (!tCurr.isAfter(tEnd)) {
35
+ kpTime[tCurr.format(fmt)] = { data: { count: 0 } }
36
+ tCurr = tCurr.add(1, unit)
37
+ }
38
+
39
+ //vpfs
40
+ let vpfs = fsTreeFolder(fdLog)
41
+
42
+ //logs
43
+ let logs = []
44
+ for (let vpf of vpfs) {
45
+
46
+ //fp
47
+ let fp = vpf.path
48
+
49
+ //ev
50
+ let ev = fsBuildReadStreamText(fp)
51
+
52
+ //line
53
+ ev.on('line', (line) => {
54
+ let v = null
55
+ try {
56
+ v = JSON.parse(line)
57
+ let t = ot(v.time)
58
+ let timeFmt = t.format(fmt)
59
+ let b1 = t.isAfter(tStart)
60
+ let b2 = v.event === 'fun-checkToken'
61
+ let b = b1 && b2
62
+ if (b) {
63
+ logs.push({
64
+ timeFmt,
65
+ ...v,
66
+ })
67
+ }
68
+ }
69
+ catch (err) {}
70
+ })
71
+
72
+ //await close
73
+ let pm = genPm()
74
+ ev.on('close', () => {
75
+ pm.resolve()
76
+ })
77
+ await pm
78
+
79
+ }
80
+
81
+ //gs
82
+ let gs = groupBy(logs, 'timeFmt')
83
+
84
+ //gsLog
85
+ let gsLog = mapValues(gs, vs => {
86
+ let count = size(vs)
87
+ let guid = groupBy(vs, 'userId')
88
+ let kp = {}
89
+ each(guid, (vvs, userId) => {
90
+ kp[userId] = size(vvs)
91
+ })
92
+ // for (let i = 1; i <= randomIntRange(10, 100); i++) {
93
+ // let userId = `user${i}`
94
+ // kp[userId] = randomIntRange(0, 1000)
95
+ // }
96
+ return {
97
+ data: {
98
+ count,
99
+ ...kp,
100
+ }
101
+ }
102
+ })
103
+
104
+ //merge
105
+ let mr = merge({}, kpTime, gsLog)
106
+
107
+ //rs
108
+ let rs = Object.keys(mr)
109
+ .sort()
110
+ .map(time => ({
111
+ time,
112
+ ...mr[time]
113
+ }))
114
+
115
+ return rs
116
+ }
117
+
118
+ export default staToken
@@ -0,0 +1,18 @@
1
+ import { parentPort } from 'worker_threads'
2
+ import staToken from './staToken.mjs'
3
+
4
+ parentPort.on('message', async (param) => {
5
+ try {
6
+ let r = await staToken(param.timeLength, param.timeInterval, param.opt)
7
+ parentPort.postMessage({
8
+ mode: 'done',
9
+ payload: r,
10
+ })
11
+ }
12
+ catch (err) {
13
+ parentPort.postMessage({
14
+ mode: 'error',
15
+ payload: err,
16
+ })
17
+ }
18
+ })
@@ -0,0 +1,35 @@
1
+ import { Worker } from 'worker_threads'
2
+ import genPm from 'wsemi/src/genPm.mjs'
3
+
4
+ async function staUserAccountLogin(timeLength = 7, timeInterval = 'hr', opt = {}) {
5
+ let pm = genPm()
6
+
7
+ let wk = new Worker('./server/staLogs/staUserAccountLogin.shellWorker.mjs')
8
+
9
+ wk.on('message', (msg) => {
10
+
11
+ if (msg.mode === 'done') {
12
+ pm.resolve(msg.payload)
13
+ }
14
+ else if (msg.mode === 'error') {
15
+ pm.reject(msg.payload)
16
+ }
17
+
18
+ wk.terminate()
19
+
20
+ })
21
+
22
+ wk.on('error', (err) => {
23
+ pm.reject(err)
24
+ })
25
+
26
+ wk.postMessage({
27
+ timeLength,
28
+ timeInterval,
29
+ opt,
30
+ })
31
+
32
+ return pm
33
+ }
34
+
35
+ export default staUserAccountLogin
@@ -0,0 +1,136 @@
1
+ import ot from 'dayjs'
2
+ import get from 'lodash/get.js'
3
+ import size from 'lodash/size.js'
4
+ import groupBy from 'lodash/groupBy.js'
5
+ import mapValues from 'lodash/mapValues.js'
6
+ import filter from 'lodash/filter.js'
7
+ import merge from 'lodash/merge.js'
8
+ import isestr from 'wsemi/src/isestr.mjs'
9
+ import genPm from 'wsemi/src/genPm.mjs'
10
+ import fsTreeFolder from 'wsemi/src/fsTreeFolder.mjs'
11
+ import fsBuildReadStreamText from 'wsemi/src/fsBuildReadStreamText.mjs'
12
+
13
+
14
+ async function staUserAccountLogin(timeLength = 7, timeInterval = 'hr', opt = {}) {
15
+
16
+ //fdLog
17
+ let fdLog = get(opt, 'fdLog')
18
+ if (!isestr(fdLog)) {
19
+ fdLog = './_logs'
20
+ }
21
+
22
+ //fmt
23
+ let fmt = timeInterval === 'day' ? 'YYYY-MM-DD' : 'YYYY-MM-DDTHH'
24
+
25
+ //unit
26
+ let unit = timeInterval === 'hr' ? 'hour' : 'day'
27
+
28
+ //kpTime, 產生完整的時間區間
29
+ let now = ot()
30
+ let tStart = now.subtract(timeLength, 'day')
31
+ let tCurr = tStart.startOf(unit)
32
+ let tEnd = now.startOf(unit)
33
+ let kpTime = {}
34
+ while (!tCurr.isAfter(tEnd)) {
35
+ kpTime[tCurr.format(fmt)] = { data: { attempt: 0, success: 0, error: 0 } }
36
+ tCurr = tCurr.add(1, unit)
37
+ }
38
+ // console.log('kpTime', kpTime)
39
+
40
+ //vpfs
41
+ let vpfs = fsTreeFolder(fdLog)
42
+ // console.log('vpfs', vpfs)
43
+
44
+ //logs
45
+ let logs = []
46
+ for (let vpf of vpfs) {
47
+
48
+ //fp
49
+ let fp = vpf.path
50
+
51
+ //ev
52
+ let ev = fsBuildReadStreamText(fp)
53
+
54
+ //line
55
+ ev.on('line', (line) => {
56
+ // console.log('line', line)
57
+ let v = null
58
+ try {
59
+
60
+ //v
61
+ v = JSON.parse(line)
62
+
63
+ //t
64
+ let t = ot(v.time)
65
+
66
+ //timeFmt
67
+ let timeFmt = t.format(fmt)
68
+
69
+ //b
70
+ let b1 = t.isAfter(tStart)
71
+ let b2 = (
72
+ v.event === 'kpfun-loginByAccountAndPassword-before' ||
73
+ v.event === 'kpfun-loginByAccountAndPassword-success' ||
74
+ v.event === 'kpfun-loginByAccountAndPassword-error'
75
+ )
76
+ let b = b1 && b2
77
+
78
+ //push
79
+ if (b) {
80
+ logs.push({
81
+ timeFmt,
82
+ ...v,
83
+ })
84
+ }
85
+
86
+ }
87
+ catch (err) {}
88
+ })
89
+
90
+ //await close
91
+ let pm = genPm()
92
+ ev.on('close', () => {
93
+ // console.log('close')
94
+ pm.resolve()
95
+ })
96
+ await pm
97
+
98
+ }
99
+ // console.log('logs', logs)
100
+
101
+ //gs
102
+ let gs = groupBy(logs, 'timeFmt')
103
+ // console.log('gs', gs)
104
+
105
+ //gsLog
106
+ let gsLog = mapValues(gs, vs => {
107
+ let vbefore = filter(vs, { event: 'kpfun-loginByAccountAndPassword-before' })
108
+ let vsuccess = filter(vs, { event: 'kpfun-loginByAccountAndPassword-success' })
109
+ let verror = filter(vs, { event: 'kpfun-loginByAccountAndPassword-error' })
110
+ return {
111
+ data: {
112
+ attempt: size(vbefore),
113
+ success: size(vsuccess),
114
+ error: size(verror),
115
+ }
116
+ }
117
+ })
118
+ // console.log('gsLog', gsLog)
119
+
120
+ //merge
121
+ let mr = merge({}, kpTime, gsLog)
122
+ // console.log('mr', mr)
123
+
124
+ //rs
125
+ let rs = Object.keys(mr)
126
+ .sort()
127
+ .map(time => ({
128
+ time,
129
+ ...mr[time]
130
+ }))
131
+ // console.log('rs', rs)
132
+
133
+ return rs
134
+ }
135
+
136
+ export default staUserAccountLogin
@@ -0,0 +1,18 @@
1
+ import { parentPort } from 'worker_threads'
2
+ import staUserAccountLogin from './staUserAccountLogin.mjs'
3
+
4
+ parentPort.on('message', async (param) => {
5
+ try {
6
+ let r = await staUserAccountLogin(param.timeLength, param.timeInterval, param.opt)
7
+ parentPort.postMessage({
8
+ mode: 'done',
9
+ payload: r,
10
+ })
11
+ }
12
+ catch (err) {
13
+ parentPort.postMessage({
14
+ mode: 'error',
15
+ payload: err,
16
+ })
17
+ }
18
+ })
@@ -0,0 +1,27 @@
1
+ // import staIp from './staIp.mjs' //一般版
2
+ import staIp from './staIp.callWorker.mjs' //worker版
3
+
4
+ async function main() {
5
+ let rs = await staIp(7, 'hr')
6
+ console.log(JSON.stringify(rs, null, 2))
7
+ }
8
+ main()
9
+ // [
10
+ // {
11
+ // "time": "2025-07-11T12",
12
+ // "data": {
13
+ // "count": 554,
14
+ // "127.0.0.1": 554
15
+ // }
16
+ // },
17
+ // {
18
+ // "time": "2025-07-11T13",
19
+ // "data": {
20
+ // "count": 747,
21
+ // "127.0.0.1": 747
22
+ // }
23
+ // },
24
+ // ...
25
+ // ]
26
+
27
+ //node server/staLogs/test_staIp.mjs
@@ -0,0 +1,27 @@
1
+ // import staToken from './staToken.mjs' //一般版
2
+ import staToken from './staToken.callWorker.mjs' //worker版
3
+
4
+ async function main() {
5
+ let rs = await staToken(7, 'hr')
6
+ console.log(JSON.stringify(rs, null, 2))
7
+ }
8
+ main()
9
+ // [
10
+ // {
11
+ // "time": "2025-07-11T12",
12
+ // "data": {
13
+ // "count": 342,
14
+ // "id-for-admin": 342
15
+ // }
16
+ // },
17
+ // {
18
+ // "time": "2025-07-11T13",
19
+ // "data": {
20
+ // "count": 477,
21
+ // "id-for-admin": 477
22
+ // }
23
+ // },
24
+ // ...
25
+ // ]
26
+
27
+ //node server/staLogs/test_staToken.mjs
@@ -0,0 +1,30 @@
1
+
2
+ // import staUserAccountLogin from './staUserAccountLogin.mjs' //一般版
3
+ import staUserAccountLogin from './staUserAccountLogin.callWorker.mjs' //worker版
4
+
5
+ async function main() {
6
+ let rs = await staUserAccountLogin(7, 'hr')
7
+ console.log(JSON.stringify(rs, null, 2))
8
+ }
9
+ main()
10
+ // [
11
+ // {
12
+ // "time": "2025-07-11T12",
13
+ // "data": {
14
+ // "attempt": 0,
15
+ // "success": 0,
16
+ // "error": 0
17
+ // }
18
+ // },
19
+ // {
20
+ // "time": "2025-07-11T13",
21
+ // "data": {
22
+ // "attempt": 0,
23
+ // "success": 0,
24
+ // "error": 0
25
+ // }
26
+ // },
27
+ // ...
28
+ // ]
29
+
30
+ //node server/staLogs/test_staUserAccountLogin.mjs
package/settings.json CHANGED
@@ -8,6 +8,10 @@
8
8
 
9
9
  showModeEditUsers: 'y',
10
10
  modeEditUsers: 'y',
11
+ showModeEditTokens: 'y',
12
+ modeEditTokens: 'y',
13
+ showModeEditIps: 'y',
14
+ modeEditIps: 'y',
11
15
 
12
16
  webName: {
13
17
  'eng': 'Single Sign-On System',
@@ -20,6 +24,7 @@
20
24
  webLogo: 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgaWQ9Ikljb25zIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxzdHlsZT4uY2xzLTF7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtMntmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTN7ZmlsbDojM2QzYzQ0O30uY2xzLTR7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudC0zKTt9PC9zdHlsZT48bGluZWFyR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJsaW5lYXItZ3JhZGllbnQiIHgxPSIxMiIgeDI9IjEyIiB5MT0iMC4xOTEiIHkyPSI4Ljk4NCI+PHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjNWQ1YzY2Ii8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNDg0NzRmIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjEyIiB4Mj0iMTIiIHkxPSI5LjA4NSIgeTI9IjIzLjAwMSI+PHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjZmZmNjUwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjZmZhYjE3Ii8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhci1ncmFkaWVudC0zIiB4Mj0iMTIiIHhsaW5rOmhyZWY9IiNsaW5lYXItZ3JhZGllbnQiIHkxPSIxMi45MTUiIHkyPSIxNy4wOTYiLz48L2RlZnM+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTcsMTBhMSwxLDAsMCwxLTEtMVY2QTQsNCwwLDAsMCw4LDZWOUExLDEsMCwwLDEsNiw5VjZBNiw2LDAsMCwxLDE4LDZWOUExLDEsMCwwLDEsMTcsMTBaIi8+PHJlY3QgY2xhc3M9ImNscy0yIiBoZWlnaHQ9IjE0IiByeD0iMyIgd2lkdGg9IjE4IiB4PSIzIiB5PSI5Ii8+PHBhdGggY2xhc3M9ImNscy0zIiBkPSJNMTIsMjBhMSwxLDAsMCwxLTEtMVYxNmExLDEsMCwwLDEsMiwwdjNBMSwxLDAsMCwxLDEyLDIwWiIvPjxjaXJjbGUgY2xhc3M9ImNscy00IiBjeD0iMTIiIGN5PSIxNSIgcj0iMiIvPjwvc3ZnPg==',
21
25
  webBackgoundGradientColors: ['#FFE0B2', '#FFCC80', '#FFF59D', 'rgba(255, 224, 178, 0.5)', 'rgba(240, 220, 190, 0.7)'],
22
26
  webKey: 'ksso',
27
+ userLogo: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMjQgMjQiPgogIDxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEyLDEyKSBzY2FsZSgxLjIpIHRyYW5zbGF0ZSgtMTIsLTEyKSI+CiAgICA8cGF0aCBmaWxsPSJjdXJyZW50Q29sb3IiIGQ9Ik02LjE5NiAxNy40ODVxMS4yNzUtLjkxOCAyLjcwNi0xLjQ1MVExMC4zMzIgMTUuNSAxMiAxNS41dDMuMDk4LjUzNHQyLjcwNiAxLjQ1cS45OS0xLjAyNSAxLjU5My0yLjQyUTIwIDEzLjY2NyAyMCAxMnEwLTMuMzI1LTIuMzM3LTUuNjYzVDEyIDRUNi4zMzcgNi4zMzhUNCAxMnEwIDEuNjY3LjYwMyAzLjA2NHEuNjAzIDEuMzk2IDEuNTkzIDIuNDJtNS44MDUtNC45ODRxLTEuMjY0IDAtMi4xMzMtLjg2OFQ5IDkuNTAxdC44NjgtMi4xMzNUMTIgNi41dDIuMTMyLjg2OFQxNSA5LjV0LS44NjggMi4xMzJ0LTIuMTMxLjg2OE0xMiAyMXEtMS44ODMgMC0zLjUyNS0uNzAxdC0yLjg1OC0xLjkxNnQtMS45MTYtMi44NThUMyAxMnQuNzAxLTMuNTI1dDEuOTE2LTIuODU4cTEuMjE2LTEuMjE1IDIuODU4LTEuOTE2VDEyIDN0My41MjUuNzAxdDIuODU4IDEuOTE2dDEuOTE2IDIuODU4VDIxIDEydC0uNzAxIDMuNTI1dC0xLjkxNiAyLjg1OHEtMS4yMTYgMS4yMTUtMi44NTggMS45MTZUMTIgMjFtMC0xcTEuMzgzIDAgMi43MjEtLjQ4NHExLjMzOC0uNDgzIDIuMzEzLTEuMzI0cS0uOTc0LS43ODMtMi4yNTUtMS4yMzdUMTIgMTYuNXQtMi43ODkuNDQ1dC0yLjI0NiAxLjI0N3EuOTc1Ljg0IDIuMzE0IDEuMzI0VDEyIDIwbTAtOC41cS44NDIgMCAxLjQyMS0uNTc5VDE0IDkuNXQtLjU3OS0xLjQyMVQxMiA3LjV0LTEuNDIxLjU3OVQxMCA5LjV0LjU3OSAxLjQyMVQxMiAxMS41bTAgNi43NSIvPgogIDwvZz4KPC9zdmc+',
23
28
 
24
29
  // kpLangExt: {
25
30
  // mmUsersList: {
@@ -30,6 +35,15 @@
30
35
 
31
36
  salt: '{salt}',
32
37
 
33
- timeExpired: 30, //min
38
+ minExpired: 129600, //min, 60*24*30*3=525600, 約3個月
39
+ minForAccountLoginFailed: 10,
40
+ numForAccountLoginFailed: 3,
41
+ minBlockForAccountLoginFailed: 30,
42
+ minForTokenCallApi: 10,
43
+ numForTokenCallApi: 1000,
44
+ minBlockForTokenCallApi: 30,
45
+ minForIpCallApi: 10,
46
+ numForIpCallApi: 12000, //假設每ip每秒2次, 10分鐘須10*60*2=1200, 同網段ip使用者共10位, 須12000
47
+ minBlockForIpCallApi: 30,
34
48
 
35
49
  }
@@ -4,14 +4,18 @@
4
4
  <!-- menu top, 因窄版導致名稱換行故須使用overflow-y:hidden -->
5
5
  <div :style="`height:${heightToolbar}px; overflow-y:hidden; padding:0px 10px; background:#fff; border-bottom:1px solid #ccc; display:flex; align-items:center;`">
6
6
 
7
- <div style="padding-left:5px; white-space:nowrap">
7
+ <div style="padding-left:5px;">
8
8
  <div style="display:flex; align-items:center;">
9
9
 
10
- <div style="padding-right:10px; display:flex; align-items:center;" v-if="webLogo">
11
- <img style="width:36px; height:36px;" :src="webLogo" />
10
+ <div
11
+ style="padding-right:10px; display:flex; align-items:center;"
12
+ v-if="webLogo"
13
+ >
14
+ <!-- 因chrome渲染機制變更須添加min-width避免被壓縮至無寬度 -->
15
+ <img style="width:36px; min-width:36px; height:36px;" :src="webLogo" />
12
16
  </div>
13
17
 
14
- <div>
18
+ <div style="white-space:nowrap;">
15
19
  <div style="font-size:1.2rem; color:#000;">{{webName}}</div>
16
20
  <div style="font-size:0.8rem; color:#666;">{{$t('webDescription')}}</div>
17
21
  </div>
@@ -21,7 +25,10 @@
21
25
 
22
26
  <div style="width:100%;"></div>
23
27
 
24
- <div style="padding-right:10px; white-space:nowrap;">
28
+ <div
29
+ style="padding-right:10px; white-space:nowrap;"
30
+ v-if="showLangSelect"
31
+ >
25
32
  <WTextSelect
26
33
  style="width:100px;"
27
34
  :items="keysLang"
@@ -37,7 +44,7 @@
37
44
  </WTextSelect>
38
45
  </div>
39
46
 
40
- <div style="padding-right:10px;">
47
+ <div style="padding-right:10px; display:flex; align-items:center;">
41
48
 
42
49
  <WPopup
43
50
  :isolated="true"
@@ -64,7 +71,7 @@
64
71
 
65
72
  <div
66
73
  style="display:flex; align-items:center; white-space:nowrap; user-select:none; cursor:pointer;"
67
- @click="logOut"
74
+ @click="logout"
68
75
  >
69
76
  <div style="padding-top:2px;">
70
77
  <WIcon
@@ -120,6 +127,8 @@ export default {
120
127
  mdiAccountCircleOutline,
121
128
  mdiLogoutVariant,
122
129
 
130
+ t: null,
131
+
123
132
  firstSetting: true,
124
133
 
125
134
  showLangSelect: false,
@@ -137,8 +146,8 @@ export default {
137
146
 
138
147
  }
139
148
  },
140
- beforeMount: function() {
141
- // console.log('beforeMount')
149
+ mounted: function() {
150
+ // console.log('mounted')
142
151
 
143
152
  let vo = this
144
153
 
@@ -154,6 +163,42 @@ export default {
154
163
  vo.firstSetting = false
155
164
  }
156
165
 
166
+ //setInterval
167
+ vo.t = setInterval(() => {
168
+ if (isestr(vo.userToken)) {
169
+
170
+ // console.log('refreshToken...', vo.userToken)
171
+ // vo.$fapi.refreshToken(vo.userToken)
172
+ // .then((timeEnd) => {
173
+ // console.log('refreshToken then', timeEnd)
174
+ // })
175
+ // .catch((err) => {
176
+ // console.log('refreshToken catch', err)
177
+
178
+ // //logout, 登出與轉跳登入頁
179
+ // vo.logout()
180
+
181
+ // })
182
+
183
+ // console.log('checkToken...', vo.userToken)
184
+ vo.$fapi.checkToken(vo.userToken) //斷線有重試機制, resolve僅回傳true, reject代表無效token或檢測token發生錯誤
185
+ .catch((err) => {
186
+ console.log('checkToken catch', err)
187
+ vo.logout() //登出與轉跳登入頁
188
+ })
189
+
190
+ }
191
+ }, 1 * 1000) //每1min更新
192
+
193
+ },
194
+ beforeDestroy: function() {
195
+ // console.log('beforeDestroy')
196
+
197
+ let vo = this
198
+
199
+ //clearInterval
200
+ clearInterval(vo.t)
201
+
157
202
  },
158
203
  computed: {
159
204
 
@@ -167,6 +212,16 @@ export default {
167
212
  return get(vo, `$store.state.heightToolbar`, 0)
168
213
  },
169
214
 
215
+ userToken: function() {
216
+ let vo = this
217
+ return get(vo, `$store.state.userToken`)
218
+ },
219
+
220
+ webInfor: function() {
221
+ let wi = get(this, `$store.state.webInfor`)
222
+ return wi
223
+ },
224
+
170
225
  webName: {
171
226
  get() {
172
227
  let vo = this
@@ -227,22 +282,22 @@ export default {
227
282
 
228
283
  },
229
284
 
230
- logOut: function() {
231
- // console.log('methods logOut')
285
+ logout: function() {
286
+ // console.log('methods logout')
232
287
 
233
288
  let vo = this
234
289
 
235
- //logOut
236
- vo.$ui.logOut()
290
+ //logout
291
+ vo.$ui.logout()
237
292
  .then(() => {
238
293
 
239
294
  //登出時提交變更viewState返回登入頁
240
295
  vo.$ui.updateViewState('login')
241
- console.log(`logOut, goto view['login'] page`)
296
+ console.log(`logout, goto view['login'] page`)
242
297
 
243
298
  })
244
299
  .catch((err) => {
245
- console.log(`logOut err[${err}]`)
300
+ console.log(`logout err[${err}]`)
246
301
  })
247
302
 
248
303
  },