diff --git a/jero-boot/jero-boot-module-demo/src/main/resources/application.yml b/jero-boot/jero-boot-module-demo/src/main/resources/application.yml index 5636272c..0153ab6f 100644 --- a/jero-boot/jero-boot-module-demo/src/main/resources/application.yml +++ b/jero-boot/jero-boot-module-demo/src/main/resources/application.yml @@ -2,4 +2,4 @@ server: port: 7002 spring: application: - name: jero-demo \ No newline at end of file + name: jero-demoa \ No newline at end of file diff --git a/jero-web/.env.development b/jero-web/.env.development index a05b1da6..083c815f 100644 --- a/jero-web/.env.development +++ b/jero-web/.env.development @@ -1,4 +1 @@ -NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8080/jero-boot -VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas -VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview \ No newline at end of file +NODE_ENV=development \ No newline at end of file diff --git a/jero-web/.env.production b/jero-web/.env.production index 4493bff5..995fca4a 100644 --- a/jero-web/.env.production +++ b/jero-web/.env.production @@ -1,4 +1 @@ -NODE_ENV=production -VUE_APP_API_BASE_URL=https://bootapi.jero.com -VUE_APP_CAS_BASE_URL=http://localhost:8888/cas -VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview \ No newline at end of file +NODE_ENV=production \ No newline at end of file diff --git a/jero-web/package-lock.json b/jero-web/package-lock.json index 91414538..a6486d63 100644 --- a/jero-web/package-lock.json +++ b/jero-web/package-lock.json @@ -1232,11 +1232,6 @@ "postcss": "^7.0.0" } }, - "@jeecg/antd-online-mini": { - "version": "2.4.22-beta", - "resolved": "https://registry.npmjs.org/@jeecg/antd-online-mini/-/antd-online-mini-2.4.22-beta.tgz", - "integrity": "sha512-fiivlcw7ovjpIl26vqudqDcf6+rIsn2aP1l853cDGjcBIpnlYVyQ2D/Cdi56Tz1ATdQOXEU8ydmCt2utpPF0LQ==" - }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -2902,6 +2897,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -2989,6 +2991,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -3019,18 +3028,17 @@ "dev": true }, "axios": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz", - "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", "requires": { - "follow-redirects": "1.5.10", - "is-buffer": "^2.0.2" + "follow-redirects": "^1.10.0" }, "dependencies": { - "is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" + "follow-redirects": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", + "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==" } } }, @@ -5524,6 +5532,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -6911,23 +6926,23 @@ "integrity": "sha512-N7FLvjDPADxad+OXXBuYfcvDvCBG0aW8ZZGr7G91sZMviYbnQJFxdSvUus4SJ0K7Q8dzMxE+Wx1d/CrJIIJ0sw==" }, "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", + "bn.js": "^4.11.9", + "brorand": "^1.1.0", "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" }, "dependencies": { "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" } } }, @@ -9505,9 +9520,9 @@ "dev": true }, "js-base64": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.6.0.tgz", + "integrity": "sha512-wVdUBYQeY2gY73RIlPrysvpYx+2vheGo8Y1SNQv/BzHToWpAZzJU7Z6uheKMAe+GLSBig5/Ps2nxg/8tRB73xg==" }, "js-cookie": { "version": "2.2.1", @@ -11411,6 +11426,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -11476,6 +11498,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -11540,6 +11569,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -11603,6 +11639,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -11666,6 +11709,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -11729,6 +11779,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -11792,6 +11849,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -11856,6 +11920,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -11919,6 +11990,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12070,6 +12148,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12133,6 +12218,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12220,6 +12312,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "postcss-selector-parser": { @@ -12300,6 +12399,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12364,6 +12470,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12430,6 +12543,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12496,6 +12616,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "postcss-selector-parser": { @@ -12652,6 +12779,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12786,6 +12920,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12860,6 +13001,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12924,6 +13072,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -12987,6 +13142,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -13052,6 +13214,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -13115,6 +13284,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -13192,6 +13368,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -13257,6 +13440,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -13327,6 +13517,13 @@ "js-base64": "^2.1.9", "source-map": "^0.5.6", "supports-color": "^3.2.3" + }, + "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + } } }, "source-map": { @@ -14533,11 +14730,6 @@ "is-plain-obj": "^1.0.0" } }, - "sortablejs": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz", - "integrity": "sha512-RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg==" - }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", diff --git a/jero-web/package.json b/jero-web/package.json index f4c389d7..b930f457 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -15,13 +15,14 @@ "@toast-ui/editor": "^2.1.2", "ant-design-vue": "^1.7.2", "area-data": "^5.0.6", - "axios": "^0.18.0", + "axios": "^0.21.1", "clipboard": "^2.0.4", "codemirror": "^5.46.0", "dayjs": "^1.8.0", "dom-align": "1.12.0", "echarts": "^5.0.2", "enquire.js": "^2.1.6", + "js-base64": "^3.6.0", "js-cookie": "^2.2.0", "lodash.get": "^4.4.2", "lodash.pick": "^4.4.0", diff --git a/jero-web/public/cdn/config/config.js b/jero-web/public/cdn/config/config.js new file mode 100644 index 00000000..8ff08ec3 --- /dev/null +++ b/jero-web/public/cdn/config/config.js @@ -0,0 +1,12 @@ +/** + * 防止打包部署时路径被写死 + */ +window._CONFIG = {} +window._CONFIG['domianURL'] = '/jero-boot' // 路由转发 devServer +window._CONFIG['domianWebSocketURL'] = 'http://localhost:8080/jero-boot' +// 单点登录地址 +window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static' +window._CONFIG['pdfDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe' +window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas' +// 预览文件地址 +window._CONFIG['onlinePreviewDomainURL'] = 'http://127.0.0.1:8012/onlinePreview' diff --git a/jero-web/public/index.html b/jero-web/public/index.html index 26e1c461..60563df8 100644 --- a/jero-web/public/index.html +++ b/jero-web/public/index.html @@ -8,6 +8,7 @@
+
+
@@ -145,6 +149,26 @@
}
.container-mobile{
/*移动端的logo样式*/
+ .top-bg{
+ width: 100%;
+ position: absolute;
+ top: -3.5rem;
+ img{
+ width: 100%;
+ }
+ }
+ .btm-bg{
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ max-width: 75%;
+ overflow: hidden;
+ img{
+ margin-left: -5rem;
+ max-width: 100%;
+ margin-bottom: -3rem;
+ }
+ }
background: #f0f2f5;
width: 100%;
height: 100%;
@@ -153,27 +177,30 @@
top: 6rem;
width: 100%;
display: flex;
+ flex-direction: column;
justify-content: center;
- align-items: flex-end;
+ align-items: center;
.logo{
max-width: 4rem;
img{
max-width: 100%;
+ margin-bottom: 0.5rem;
}
}
.company{
- margin-left: 0.8rem;
display: flex;
flex-direction: column;
justify-content: flex-end;
span:first-child{
+ color: #000;
font-size: 1.6rem;
font-weight: bold;
- letter-spacing: 0.1rem;
+ letter-spacing: 0.3rem;
}
span:last-child{
+ color: #000;
font-size: 0.8rem;
- line-height: 0.8rem;
+ line-height: 1.2rem;
font-weight: bold;
}
}
diff --git a/jero-web/src/components/onlineForm/onlineForm.js b/jero-web/src/components/onlineForm/onlineForm.js
index 86860902..6fb0bf70 100644
--- a/jero-web/src/components/onlineForm/onlineForm.js
+++ b/jero-web/src/components/onlineForm/onlineForm.js
@@ -13147,7 +13147,7 @@
}
function d(e) {
- return "object" === typeof e && "string" === typeof e.name && "string" === typeof e.theme && ("object" ===
+ return "object" === typeof e && "string" === typeof e.name && "string" === typeof e.theme && ("object" ===
typeof e.icon || "function" === typeof e.icon)
}
diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue
index 1d15db97..799069f1 100644
--- a/jero-web/src/components/tools/HeaderNotice.vue
+++ b/jero-web/src/components/tools/HeaderNotice.vue
@@ -199,7 +199,7 @@
initWebSocket: function () {
// WebSocket与普通的请求所用协议有所不同,ws等同于http,wss等同于https
var userId = store.getters.userInfo.id;
- var url = window._CONFIG['domianURL'].replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId;
+ var url = window._CONFIG['domianWebSocketURL'].replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId;
//console.log(url);
this.websock = new WebSocket(url);
this.websock.onopen = this.websocketOnopen;
diff --git a/jero-web/src/config/index.js b/jero-web/src/config/index.js
index 6601609b..e69de29b 100644
--- a/jero-web/src/config/index.js
+++ b/jero-web/src/config/index.js
@@ -1,10 +0,0 @@
-/** init domain config */
-import Vue from 'vue'
-//设置全局API_BASE_URL
-Vue.prototype.API_BASE_URL = process.env.VUE_APP_API_BASE_URL
-window._CONFIG['domianURL'] = Vue.prototype.API_BASE_URL
-//单点登录地址
-window._CONFIG['casPrefixUrl'] = process.env.VUE_APP_CAS_BASE_URL
-window._CONFIG['onlinePreviewDomainURL'] = process.env.VUE_APP_ONLINE_BASE_URL
-window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
-window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe'
\ No newline at end of file
diff --git a/jero-web/src/views/modules/oss/OSSFileList.vue b/jero-web/src/views/modules/oss/OSSFileList.vue
index 58fc7d37..40fa740b 100644
--- a/jero-web/src/views/modules/oss/OSSFileList.vue
+++ b/jero-web/src/views/modules/oss/OSSFileList.vue
@@ -37,21 +37,7 @@
@change="handleChange">