Commit 7871c64b authored by 1486327116's avatar 1486327116

Merge remote-tracking branch 'origin/master'

parents b567f188 c136b23b
...@@ -874,7 +874,7 @@ ...@@ -874,7 +874,7 @@
}, },
"node_modules/@madex/ex-js-common": { "node_modules/@madex/ex-js-common": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "git+ssh://git@bitbucket.org/biiigle/ex-js-common.git#09313abd76659b635b4843118ccf78761d43bd91", "resolved": "git+ssh://git@bitbucket.org/biiigle/ex-js-common.git#8454d948b63c279242837dddf00a1089b6f76223",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@madex/ex-js-dao": "git+ssh://git@bitbucket.org/biiigle/ex-js-dao.git#master", "@madex/ex-js-dao": "git+ssh://git@bitbucket.org/biiigle/ex-js-dao.git#master",
...@@ -940,7 +940,7 @@ ...@@ -940,7 +940,7 @@
}, },
"node_modules/@madex/ex-js-dao": { "node_modules/@madex/ex-js-dao": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "git+ssh://git@bitbucket.org/biiigle/ex-js-dao.git#fbb71554696094949acbdda94079bb63289641c6", "resolved": "git+ssh://git@bitbucket.org/biiigle/ex-js-dao.git#1cd641acf21ab34be602e6240ef542bda31195a2",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@madex/ex-js-public": "git+ssh://git@bitbucket.org/biiigle/ex-js-public.git#master", "@madex/ex-js-public": "git+ssh://git@bitbucket.org/biiigle/ex-js-public.git#master",
...@@ -1068,9 +1068,9 @@ ...@@ -1068,9 +1068,9 @@
} }
}, },
"node_modules/@madex/ex-ts-dao": { "node_modules/@madex/ex-ts-dao": {
"version": "0.0.10", "version": "0.0.15",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@madex/ex-ts-dao/-/@madex/ex-ts-dao-0.0.10.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@madex/ex-ts-dao/-/@madex/ex-ts-dao-0.0.15.tgz",
"integrity": "sha512-+mmRCR86JvKs0bx0UfrA1Ld5NzOjvh7fkCCs4h7mbTzJJUirUlgFE3/wsM1e4xTyURpJ0hsROkNvahkn1yrClQ==", "integrity": "sha512-O2Y/jNMOsTU7dYvgswVLgDzL3hVocD57z2KV293JlI2xJBBnclh+lYC1j1pt6FPbaSP/wo/IcITpfQhiFO6NZg==",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@madex/ex-js-public": "git+ssh://git@bitbucket.org/biiigle/ex-js-public.git#master", "@madex/ex-js-public": "git+ssh://git@bitbucket.org/biiigle/ex-js-public.git#master",
...@@ -1616,12 +1616,12 @@ ...@@ -1616,12 +1616,12 @@
} }
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "20.14.13", "version": "20.16.1",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@types/node/-/node-20.14.13.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@types/node/-/node-20.16.1.tgz",
"integrity": "sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==", "integrity": "sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"undici-types": "~5.26.4" "undici-types": "~6.19.2"
} }
}, },
"node_modules/@types/qs": { "node_modules/@types/qs": {
...@@ -2244,9 +2244,9 @@ ...@@ -2244,9 +2244,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/ali-oss": { "node_modules/ali-oss": {
"version": "6.20.0", "version": "6.21.0",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ali-oss/-/ali-oss-6.20.0.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ali-oss/-/ali-oss-6.21.0.tgz",
"integrity": "sha512-TzFXgGlw81sy2JvcCveSYsa2b2+6kv+HA6WTc+cXg6bu8nUAmVPfncRGbn3x2getSOniOFA+TyGy3V4l3Fks+Q==", "integrity": "sha512-dRvKWO/GJEa6dlsCnvmgHIbU5+yE/SmZsE4kZRGNU7Uotr9uIkQWGqv4szLTxRSxWv3YgL+BZgt+swIgitYGjA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"address": "^1.2.2", "address": "^1.2.2",
...@@ -2271,7 +2271,7 @@ ...@@ -2271,7 +2271,7 @@
"sdk-base": "^2.0.1", "sdk-base": "^2.0.1",
"stream-http": "2.8.2", "stream-http": "2.8.2",
"stream-wormhole": "^1.0.4", "stream-wormhole": "^1.0.4",
"urllib": "2.41.0", "urllib": "^2.44.0",
"utility": "^1.18.0", "utility": "^1.18.0",
"xml2js": "^0.6.2" "xml2js": "^0.6.2"
}, },
...@@ -2724,9 +2724,9 @@ ...@@ -2724,9 +2724,9 @@
} }
}, },
"node_modules/aws4": { "node_modules/aws4": {
"version": "1.13.0", "version": "1.13.1",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/aws4/-/aws4-1.13.0.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/aws4/-/aws4-1.13.1.tgz",
"integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==", "integrity": "sha512-u5w79Rd7SU4JaIlA/zFqG+gOiuq25q5VLyZ8E+ijJeILuTxVzZgp2CaGw/UTw6pXYN9XMO9yiqj/nEHmhTG5CA==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/axios": { "node_modules/axios": {
...@@ -3025,9 +3025,9 @@ ...@@ -3025,9 +3025,9 @@
} }
}, },
"node_modules/browserslist": { "node_modules/browserslist": {
"version": "4.23.2", "version": "4.23.3",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/browserslist/-/browserslist-4.23.2.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/browserslist/-/browserslist-4.23.3.tgz",
"integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==", "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
...@@ -3045,9 +3045,9 @@ ...@@ -3045,9 +3045,9 @@
], ],
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001640", "caniuse-lite": "^1.0.30001646",
"electron-to-chromium": "^1.4.820", "electron-to-chromium": "^1.5.4",
"node-releases": "^2.0.14", "node-releases": "^2.0.18",
"update-browserslist-db": "^1.1.0" "update-browserslist-db": "^1.1.0"
}, },
"bin": { "bin": {
...@@ -3321,9 +3321,9 @@ ...@@ -3321,9 +3321,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001646", "version": "1.0.30001651",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz",
"integrity": "sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==", "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
...@@ -3972,9 +3972,9 @@ ...@@ -3972,9 +3972,9 @@
} }
}, },
"node_modules/dayjs": { "node_modules/dayjs": {
"version": "1.11.12", "version": "1.11.13",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/dayjs/-/dayjs-1.11.12.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/dayjs/-/dayjs-1.11.13.tgz",
"integrity": "sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==", "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/debug": { "node_modules/debug": {
...@@ -4455,9 +4455,9 @@ ...@@ -4455,9 +4455,9 @@
} }
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.5.4", "version": "1.5.12",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/electron-to-chromium/-/electron-to-chromium-1.5.12.tgz",
"integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==", "integrity": "sha512-tIhPkdlEoCL1Y+PToq3zRNehUaKp3wBX/sr7aclAWdIWjvqAe/Im/H0SiCM4c1Q8BLPHCdoJTol+ZblflydehA==",
"dev": true, "dev": true,
"license": "ISC" "license": "ISC"
}, },
...@@ -5794,9 +5794,9 @@ ...@@ -5794,9 +5794,9 @@
} }
}, },
"node_modules/foreground-child": { "node_modules/foreground-child": {
"version": "3.2.1", "version": "3.3.0",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/foreground-child/-/foreground-child-3.2.1.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/foreground-child/-/foreground-child-3.3.0.tgz",
"integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"cross-spawn": "^7.0.0", "cross-spawn": "^7.0.0",
...@@ -6966,9 +6966,9 @@ ...@@ -6966,9 +6966,9 @@
} }
}, },
"node_modules/ignore": { "node_modules/ignore": {
"version": "5.3.1", "version": "5.3.2",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ignore/-/ignore-5.3.1.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ignore/-/ignore-5.3.2.tgz",
"integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
...@@ -7122,7 +7122,8 @@ ...@@ -7122,7 +7122,8 @@
"version": "1.1.9", "version": "1.1.9",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ip/-/ip-1.1.9.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ip/-/ip-1.1.9.tgz",
"integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
"license": "MIT" "license": "MIT",
"optional": true
}, },
"node_modules/ip-address": { "node_modules/ip-address": {
"version": "5.9.4", "version": "5.9.4",
...@@ -8926,9 +8927,9 @@ ...@@ -8926,9 +8927,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/luxon": { "node_modules/luxon": {
"version": "3.4.4", "version": "3.5.0",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/luxon/-/luxon-3.4.4.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/luxon/-/luxon-3.5.0.tgz",
"integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=12" "node": ">=12"
...@@ -11447,9 +11448,9 @@ ...@@ -11447,9 +11448,9 @@
} }
}, },
"node_modules/qs": { "node_modules/qs": {
"version": "6.12.3", "version": "6.13.0",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/qs/-/qs-6.12.3.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/qs/-/qs-6.13.0.tgz",
"integrity": "sha512-AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ==", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"dependencies": { "dependencies": {
"side-channel": "^1.0.6" "side-channel": "^1.0.6"
...@@ -14034,9 +14035,9 @@ ...@@ -14034,9 +14035,9 @@
} }
}, },
"node_modules/uglify-js": { "node_modules/uglify-js": {
"version": "3.19.1", "version": "3.19.2",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/uglify-js/-/uglify-js-3.19.1.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/uglify-js/-/uglify-js-3.19.2.tgz",
"integrity": "sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A==", "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ==",
"dev": true, "dev": true,
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"optional": true, "optional": true,
...@@ -14083,9 +14084,9 @@ ...@@ -14083,9 +14084,9 @@
"integrity": "sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==" "integrity": "sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ=="
}, },
"node_modules/undici-types": { "node_modules/undici-types": {
"version": "5.26.5", "version": "6.19.8",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/undici-types/-/undici-types-5.26.5.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/undici-types/-/undici-types-6.19.8.tgz",
"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/unescape": { "node_modules/unescape": {
...@@ -14210,21 +14211,19 @@ ...@@ -14210,21 +14211,19 @@
} }
}, },
"node_modules/urllib": { "node_modules/urllib": {
"version": "2.41.0", "version": "2.44.0",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/urllib/-/urllib-2.41.0.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/urllib/-/urllib-2.44.0.tgz",
"integrity": "sha512-pNXdxEv52L67jahLT+/7QE+Fup1y2Gc6EdmrAhQ6OpQIC2rl14oWwv9hvk1GXOZqEnJNwRXHABuwgPOs1CtL7g==", "integrity": "sha512-zRCJqdfYllRDA9bXUtx+vccyRqtJPKsw85f44zH7zPD28PIvjMqIgw9VwoTLV7xTBWZsbebUFVHU5ghQcWku2A==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"any-promise": "^1.3.0", "any-promise": "^1.3.0",
"content-type": "^1.0.2", "content-type": "^1.0.2",
"debug": "^2.6.9",
"default-user-agent": "^1.0.0", "default-user-agent": "^1.0.0",
"digest-header": "^1.0.0", "digest-header": "^1.0.0",
"ee-first": "~1.1.1", "ee-first": "~1.1.1",
"formstream": "^1.1.0", "formstream": "^1.1.0",
"humanize-ms": "^1.2.0", "humanize-ms": "^1.2.0",
"iconv-lite": "^0.4.15", "iconv-lite": "^0.6.3",
"ip": "^1.1.5",
"pump": "^3.0.0", "pump": "^3.0.0",
"qs": "^6.4.0", "qs": "^6.4.0",
"statuses": "^1.3.1", "statuses": "^1.3.1",
...@@ -14242,20 +14241,17 @@ ...@@ -14242,20 +14241,17 @@
} }
} }
}, },
"node_modules/urllib/node_modules/debug": { "node_modules/urllib/node_modules/iconv-lite": {
"version": "2.6.9", "version": "0.6.3",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/debug/-/debug-2.6.9.tgz", "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/iconv-lite/-/iconv-lite-0.6.3.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ms": "2.0.0" "safer-buffer": ">= 2.1.2 < 3.0.0"
}
}, },
"node_modules/urllib/node_modules/ms": { "engines": {
"version": "2.0.0", "node": ">=0.10.0"
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ms/-/ms-2.0.0.tgz", }
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"license": "MIT"
}, },
"node_modules/urllib/node_modules/statuses": { "node_modules/urllib/node_modules/statuses": {
"version": "1.5.0", "version": "1.5.0",
......
...@@ -24,5 +24,6 @@ export const ErrorCode = { ...@@ -24,5 +24,6 @@ export const ErrorCode = {
TOTP_KEY_OVERSTAYED: '30022',//密钥已失效,请重新获取 TOTP_KEY_OVERSTAYED: '30022',//密钥已失效,请重新获取
USER_TYPE_ILLEGAL: '30023',//用户类型不合法 USER_TYPE_ILLEGAL: '30023',//用户类型不合法
NEED_INPUT_GOOGLE_CODE: '30024',//请输入Google验证码 NEED_INPUT_GOOGLE_CODE: '30024',//请输入Google验证码
PUSH_NOT_UPDATE: '30025',//已经推送不允许修改
} }
import * as hotPairConfigService from "../service/hotPairConfig.service";
import { HotPairConfigVO, HotPairConfigPageVO } from "../service/hotPairConfig.service";
let { logger, Res3Utils, optionalUtils: Optional, apiAssertUtils: ApiAssert } = require('@madex/ex-js-public');
import { ErrorCode } from "../../../constant/errorCode";
/**
* 分页查询热门交易对配置列表
* @param req
* @param infoVO
*/
export const list = async (req: any, hotPairConfigPageVO: HotPairConfigPageVO) => {
let func_name = "hotPairConfigCtrl.list";
try {
hotPairConfigPageVO.page = Optional.opt(hotPairConfigPageVO, 'page', 1);
hotPairConfigPageVO.size = Optional.opt(hotPairConfigPageVO, 'size', 20);
let res = await hotPairConfigService.list(hotPairConfigPageVO.pair, Number(hotPairConfigPageVO.page), Number(hotPairConfigPageVO.size));
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 添加热门交易对
* @param req
* @param infoVO
*/
export const add = async (req: any, hotPairConfigVO: HotPairConfigVO) => {
let func_name = "hotPairConfigCtrl.add";
try {
ApiAssert.notNull(ErrorCode.PARAM_MISS, hotPairConfigVO.pair);
ApiAssert.notNull(ErrorCode.PARAM_MISS, hotPairConfigVO.weight);
let res = await hotPairConfigService.add(hotPairConfigVO);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 修改热门交易对
* @param req
* @param infoVO
*/
export const update = async (req: any, hotPairConfigVO: HotPairConfigVO) => {
let func_name = "hotPairConfigCtrl.update";
try {
ApiAssert.notNull(ErrorCode.PARAM_MISS, hotPairConfigVO.id);
ApiAssert.notNull(ErrorCode.PARAM_MISS, hotPairConfigVO.pair);
ApiAssert.notNull(ErrorCode.PARAM_MISS, hotPairConfigVO.weight);
let res = await hotPairConfigService.update(hotPairConfigVO);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 删除门交易对
* @param req
* @param authConfigVO
*/
export const del = async (req: any, hotPairConfigVO: HotPairConfigVO) => {
let func_name = "hotPairConfigCtrl.del";
try {
ApiAssert.notNull(ErrorCode.PARAM_MISS, hotPairConfigVO.id);
let res = await hotPairConfigService.del(Number(hotPairConfigVO.id));
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
\ No newline at end of file
import * as noticeService from "../service/notice.service";
import { NoticeVO, NoticePageVO } from "../service/notice.service";
let { logger, Res3Utils, optionalUtils: Optional, apiAssertUtils: ApiAssert } = require('@madex/ex-js-public');
import { ErrorCode } from "../../../constant/errorCode";
/**
* 消息列表
* @param req
* @param infoVO
*/
export const list = async (req: any, noticePageVO: NoticePageVO) => {
let func_name = "noticeCtrl.list";
try {
noticePageVO.page = Optional.opt(noticePageVO, 'page', 1);
noticePageVO.size = Optional.opt(noticePageVO, 'size', 20);
let res = await noticeService.list(noticePageVO);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 新增消息
* @param req
* @param infoVO
*/
export const add = async (req: any, noticeVO: NoticeVO) => {
let func_name = "noticeCtrl.add";
try {
ApiAssert.notNull(ErrorCode.PARAM_MISS, noticeVO.content);
ApiAssert.notNull(ErrorCode.PARAM_MISS, noticeVO.notice_type);
ApiAssert.notNull(ErrorCode.PARAM_MISS, noticeVO.push_time);
let res = await noticeService.add(noticeVO);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 修改消息 删除 就传 del_sign = 1
* 推送给指定的多个用户的消息 目前只能一个一个修改 不支持批量修改
* 需要支持的话 可能数据库要调整 增加一个 group_id 字段
* @param req
* @param infoVO
*/
export const update = async (req: any, noticeVO: NoticeVO) => {
let func_name = "noticeCtrl.update";
try {
ApiAssert.notNull(ErrorCode.PARAM_MISS, noticeVO.id);
let res = await noticeService.update(noticeVO);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
import { ormDB, hotPairConfig } from "@madex/ex-ts-dao";
import { ErrorCode } from "../../../constant/errorCode";
let _ = require('lodash');
let { logger } = require('@madex/ex-js-public');
export interface HotPairConfigVO {
id?: number;
pair?: string | any;
weight?: number;
createdAt?: Date | any;
updatedAt?: Date | any;
}
export interface HotPairConfigPageVO extends HotPairConfigVO {
page?: number,
size?: number
}
export async function list(pair: any, page: number, size: number) {
let where = Object.create(null);
if (pair) {
where.pair = { [ormDB.Op.like]: `${pair}%` };
}
let resList = await hotPairConfig.prototype.findAndCount({
where: where,
limit: size,
offset: (page - 1) * size,
order: [["weight", "desc"]],
raw: true
});
return resList;
}
export async function add(hotPairConfigVO: HotPairConfigVO) {
let dbInfo = await hotPairConfig.prototype.findOne({
where: {
pair: hotPairConfigVO.pair
},
raw: true
});
if (dbInfo) {
throw ErrorCode.DATA_EXIST;
}
hotPairConfigVO.createdAt = new Date();
hotPairConfigVO.updatedAt = new Date();
await hotPairConfig.prototype.create(hotPairConfigVO);
return 'success'
}
export async function update(hotPairConfigVO: HotPairConfigVO) {
let dbInfo = await hotPairConfig.prototype.findOne({
where: {
pair: hotPairConfigVO.pair,
id: { [ormDB.Op.ne]: hotPairConfigVO.id }
},
raw: true
});
if (dbInfo) {
throw ErrorCode.DATA_EXIST;
}
hotPairConfigVO.updatedAt = new Date();
await hotPairConfig.prototype.update({
pair: hotPairConfigVO.pair,
weight: hotPairConfigVO.weight
}, {
where: {
id: Number(hotPairConfigVO.id)
}
});
return 'success'
}
export async function del(id: number) {
let dbInfo = await hotPairConfig.prototype.findOne({
where: {
id: id
},
raw: true
});
if (!dbInfo) {
throw ErrorCode.DATA_NOT_EXIST;
}
await hotPairConfig.prototype.destroy({
where: {
id: Number(id)
}
});
return 'success'
}
import { ormDB, noticeModel, noticeRead } from "@madex/ex-ts-dao";
import { ErrorCode } from "../../../constant/errorCode";
let _ = require('lodash');
let { logger, datetimeUtils } = require('@madex/ex-js-public');
export interface NoticeVO {
id?: number;
content?: string | any;
publish_flag?: number;
user_id?: string | any;
notice_type?: number;
push_type?: number;
push_time?: Date | any;
del_sign?: number;
status?: number;
createdAt?: Date | any;
updatedAt?: Date | any;
}
export interface NoticePageVO extends NoticeVO {
page?: number,
size?: number
}
export async function list(noticePageVO: NoticePageVO) {
let where = Object.create(null);
if (noticePageVO.publish_flag) {
where.publish_flag = noticePageVO.publish_flag;
}
if (Number(noticePageVO.user_id) >= 0) {
where.user_id = noticePageVO.user_id;
}
if (noticePageVO.notice_type) {
where.notice_type = noticePageVO.notice_type;
}
if (noticePageVO.push_type) {
where.push_type = noticePageVO.push_type;
}
if (noticePageVO.push_time) {
let date = datetimeUtils.trim(noticePageVO.push_time, 's');
where.push_time = { [ormDB.Op.gte]: date };
}
if (!noticePageVO.del_sign) {
where.del_sign = 0;
}
if (noticePageVO.status) {
where.status = noticePageVO.status;
}
if (noticePageVO.createdAt) {
let date = datetimeUtils.trim(noticePageVO.createdAt, 's');
where.createdAt = { [ormDB.Op.gte]: date }
}
let resList = await noticeModel.prototype.findAndCount({
where: where,
limit: noticePageVO.size,
offset: (Number(noticePageVO.page) - 1) * Number(noticePageVO.size),
order: [["id", "desc"]],
raw: true
});
return resList;
}
export async function add(noticeVO: NoticeVO) {
let insertList: any = [];
if (!noticeVO.publish_flag) {
noticeVO.publish_flag = 0;
}
if (!noticeVO.push_type) {
noticeVO.push_type = 1;
}
noticeVO.del_sign = 0;
noticeVO.status = 0;
noticeVO.createdAt = new Date();
noticeVO.updatedAt = new Date();
if (!noticeVO.user_id) {
noticeVO.user_id = 0;
insertList.push(noticeVO);
}
else {//多个uid 的消息
let uids = noticeVO.user_id.split(',');
for (let oneUid of uids) {
let item = {
content: noticeVO.content,
publish_flag: noticeVO.publish_flag,
user_id: oneUid,
notice_type: noticeVO.notice_type,
push_type: noticeVO.push_type,
push_time: noticeVO.push_time,
del_sign: noticeVO.del_sign,
status: noticeVO.status,
createdAt: noticeVO.createdAt,
updatedAt: noticeVO.updatedAt,
}
insertList.push(item);
}
}
await noticeModel.prototype.bulkCreate(insertList);
return 'success'
}
export async function update(noticeVO: NoticeVO) {
let dbInfo = await noticeModel.prototype.findOne({
where: {
id: noticeVO.id
},
raw: true
});
if (!dbInfo) {
throw ErrorCode.DATA_NOT_EXIST;
}
if (dbInfo.status == 1) {
throw ErrorCode.PUSH_NOT_UPDATE;
}
let updateInfo = {};
if (noticeVO.content) {
updateInfo['content'] = noticeVO.content;
}
if (noticeVO.publish_flag) {
updateInfo['publish_flag'] = noticeVO.publish_flag;
}
if (noticeVO.notice_type) {
updateInfo['notice_type'] = noticeVO.notice_type;
}
if (noticeVO.push_type) {
updateInfo['push_type'] = noticeVO.push_type;
}
if (noticeVO.push_time) {
updateInfo['push_time'] = noticeVO.push_time;
}
if (noticeVO.del_sign) {
updateInfo['del_sign'] = noticeVO.del_sign;
}
updateInfo['updatedAt'] = new Date();
await noticeModel.prototype.update(updateInfo, {
where: {
id: Number(noticeVO.id)
}
});
return 'success'
}
...@@ -14,10 +14,12 @@ import * as aclUserCtrl from "../../mvc/control/aclUser.control"; ...@@ -14,10 +14,12 @@ import * as aclUserCtrl from "../../mvc/control/aclUser.control";
import * as aclRoleAuthCtrl from "../../mvc/control/aclRoleAuth.control"; import * as aclRoleAuthCtrl from "../../mvc/control/aclRoleAuth.control";
import * as userOptCtrl from "../../mvc/control/userOpt.control"; import * as userOptCtrl from "../../mvc/control/userOpt.control";
import * as userAuthConfigCtrl from "../../mvc/control/userAuthConfig.control"; import * as userAuthConfigCtrl from "../../mvc/control/userAuthConfig.control";
import * as hotPairConfigCtrl from "../../mvc/control/hotPairConfig.control";
import * as ReqUtils from "../../../utils/req-utils"; import * as ReqUtils from "../../../utils/req-utils";
import * as spotPairCtrl from "../../mvc/control/spotPair.control"; import * as spotPairCtrl from "../../mvc/control/spotPair.control";
import * as coinTypeCtrl from "../../mvc/control/coinType.control"; import * as coinTypeCtrl from "../../mvc/control/coinType.control";
import * as noticeCtrl from "../../mvc/control/notice.control";
const getFunc = { const getFunc = {
'user/info': userController.getUserInfo, 'user/info': userController.getUserInfo,
}; };
...@@ -75,6 +77,15 @@ const postFunc = { ...@@ -75,6 +77,15 @@ const postFunc = {
'user/auth/change/locked/status': userAuthConfigCtrl.changeLockedStatus, 'user/auth/change/locked/status': userAuthConfigCtrl.changeLockedStatus,
'user/auth/reset/totp': userAuthConfigCtrl.resetTotp, 'user/auth/reset/totp': userAuthConfigCtrl.resetTotp,
'hot/pair/config/list': hotPairConfigCtrl.list,
'hot/pair/config/add': hotPairConfigCtrl.add,
'hot/pair/config/update': hotPairConfigCtrl.update,
'hot/pair/config/del': hotPairConfigCtrl.del,
'notice/list': noticeCtrl.list,
'notice/add': noticeCtrl.add,
'notice/update': noticeCtrl.update,
}; };
......
...@@ -8,13 +8,16 @@ const { ...@@ -8,13 +8,16 @@ const {
let cmdWhiteList = { let cmdWhiteList = {'i18n/info/list': 1,
'i18n/info/list': 1,
'i18n/info/add': 1, 'i18n/info/add': 1,
'i18n/info/update': 1, 'i18n/info/update': 1,
'i18n/info/del': 1, 'i18n/info/del': 1,
'i18n/info/log/list': 1, 'i18n/info/log/list': 1,
'i18n/info/log/revert': 1, 'i18n/info/log/revert': 1,
'spotpair/add': 1,
'spotpair/list': 1,
'coinType/add': 1,
'coinType/list': 1,
'acl/user/add': 1, 'acl/user/add': 1,
'acl/user/list': 1, 'acl/user/list': 1,
'acl/user/update': 1, 'acl/user/update': 1,
...@@ -44,6 +47,13 @@ let cmdWhiteList = { ...@@ -44,6 +47,13 @@ let cmdWhiteList = {
'user/auth/change/force/status': 1, 'user/auth/change/force/status': 1,
'user/auth/change/locked/status': 1, 'user/auth/change/locked/status': 1,
'user/auth/reset/totp': 1, 'user/auth/reset/totp': 1,
'hot/pair/config/list': 1,
'hot/pair/config/add': 1,
'hot/pair/config/update': 1,
'hot/pair/config/del': 1,
'notice/list': 1,
'notice/add': 1,
'notice/update': 1,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment