From 8445c480ff8260154f5af98e986d8b3dea17d766 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Wed, 24 Apr 2024 11:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/apiChunks/index.js | 6 +- src/api/apis/auth.js | 200 ++++++------- src/api/apis/detailData.js | 22 +- src/api/apis/integration.js | 4 +- src/api/apis/logo.js | 4 +- .../integrationOption/integrationOption.js | 2 +- src/api/login.js | 2 +- src/api/system/integrationOption.js | 2 +- src/views/applicationList/applicationAdd.vue | 4 +- src/views/applicationList/index.vue | 2 +- src/views/applicationList/settingMenu.vue | 2 +- src/views/masterDataOptions/index.vue | 2 +- src/views/masterDataOptions/masterDataAdd.vue | 4 +- src/views/masterDataOptions/settingMenu.vue | 2 +- vue.config.js | 283 +++++++++--------- 15 files changed, 271 insertions(+), 270 deletions(-) diff --git a/src/api/apiChunks/index.js b/src/api/apiChunks/index.js index 10a33e9..42b755d 100644 --- a/src/api/apiChunks/index.js +++ b/src/api/apiChunks/index.js @@ -4,7 +4,7 @@ import request from '@/utils/request' // 动态模版请求 export function getApiModuleApi(obj, data = {}) { return request({ - url: 'kangarooDataCenter/entranceController/option', + url: 'kangarooDataCenterV3/entranceController/option', method: 'post', headers: obj, data @@ -12,7 +12,7 @@ export function getApiModuleApi(obj, data = {}) { } export function getApiResultApi(data = {}) { return request({ - url: 'kangarooDataCenter/entranceController/option ', + url: 'kangarooDataCenterV3/entranceController/option ', method: 'post', headers: { tl: "appApiService", @@ -24,7 +24,7 @@ export function getApiResultApi(data = {}) { } export function getExcelApi(obj, data = {}) { return request({ - url: 'kangarooDataCenter/entranceController/option ', + url: 'kangarooDataCenterV3/entranceController/option ', method: 'post', responseType: "blob", headers: obj, diff --git a/src/api/apis/auth.js b/src/api/apis/auth.js index 27c9106..887c223 100644 --- a/src/api/apis/auth.js +++ b/src/api/apis/auth.js @@ -1,100 +1,100 @@ -import request from "@/utils/request"; - -export function authApi(tl,as,dj,url = '',data){ - return request({ - url: 'kangarooDataCenter/entranceController/option' + url, - headers: { - tl:tl, - as:as, - dj:dj, - }, - method: 'post', - data: data - }) -} - -//登录 -export function loginToken(data) { - return request({ - url: "/Api/Token/CreateToken", - method: "post", - data, - }); -} - -//token认证 -export function CheckToken(data) { - return request({ - url: "Api/Base/CheckToken", - method: "post", - data, - }); -} -//组织机构列表 -export function GetOrganTree(data) { - return request({ - url: "OrganManage/GetOrganTree", - method: "post", - data, - }); -} -//上传文件管理器 -export function UploadFiles(data, onUploadProgress) { - return request({ - url: "/Api/Attachments/UploadToMinio", - method: "post", - data, - onUploadProgress, - }); -} -//上传服务器本地 -export function UploadFilesLocal(data, onUploadProgress) { - return request({ - url: "/api/Attachments/UploadFiles", - method: "post", - data, - onUploadProgress, - }); -} -// 上传列表 -export function UploadList(data, onUploadProgress) { - return request({ - url: "/api/Attachments/GetFileList", - method: "post", - data, - onUploadProgress, - }); -} -export function DownloadFiles(data) { - return request({ - url: "/Api/Attachments/DownloadFiles", - method: "post", - data, - responseType: "blob", - }); -} -// 查看 -export function downloadFromMinio(data) { - return request({ - url: "/api/Attachments/DownloadFromMinio", - method: "post", - data, - responseType: "blob", - }); -} -//获取token -export function getToken(data) { - return request({ - url: "/Api/Token/CreateToken", - method: "post", - data, - }); -} - -export function commonFun(url, data) { - return request({ - url: url, - method: "post", - data, - }); -} +import request from "@/utils/request"; + +export function authApi(tl,as,dj,url = '',data){ + return request({ + url: 'kangarooDataCenterV3/entranceController/option' + url, + headers: { + tl:tl, + as:as, + dj:dj, + }, + method: 'post', + data: data + }) +} + +//登录 +export function loginToken(data) { + return request({ + url: "/Api/Token/CreateToken", + method: "post", + data, + }); +} + +//token认证 +export function CheckToken(data) { + return request({ + url: "Api/Base/CheckToken", + method: "post", + data, + }); +} +//组织机构列表 +export function GetOrganTree(data) { + return request({ + url: "OrganManage/GetOrganTree", + method: "post", + data, + }); +} +//上传文件管理器 +export function UploadFiles(data, onUploadProgress) { + return request({ + url: "/Api/Attachments/UploadToMinio", + method: "post", + data, + onUploadProgress, + }); +} +//上传服务器本地 +export function UploadFilesLocal(data, onUploadProgress) { + return request({ + url: "/api/Attachments/UploadFiles", + method: "post", + data, + onUploadProgress, + }); +} +// 上传列表 +export function UploadList(data, onUploadProgress) { + return request({ + url: "/api/Attachments/GetFileList", + method: "post", + data, + onUploadProgress, + }); +} +export function DownloadFiles(data) { + return request({ + url: "/Api/Attachments/DownloadFiles", + method: "post", + data, + responseType: "blob", + }); +} +// 查看 +export function downloadFromMinio(data) { + return request({ + url: "/api/Attachments/DownloadFromMinio", + method: "post", + data, + responseType: "blob", + }); +} +//获取token +export function getToken(data) { + return request({ + url: "/Api/Token/CreateToken", + method: "post", + data, + }); +} + +export function commonFun(url, data) { + return request({ + url: url, + method: "post", + data, + }); +} diff --git a/src/api/apis/detailData.js b/src/api/apis/detailData.js index d92bf1b..f2b64ae 100644 --- a/src/api/apis/detailData.js +++ b/src/api/apis/detailData.js @@ -1,11 +1,11 @@ -import request from '@/utils/request' - -// 获取全部插件列表 -export function option(obj, data = {}) { - return request({ - url: 'kangarooDataCenter/entranceController/option', - method: 'post', - headers: obj, - data - }) -} +import request from '@/utils/request' + +// 获取全部插件列表 +export function option(obj, data = {}) { + return request({ + url: 'kangarooDataCenterV3/entranceController/option', + method: 'post', + headers: obj, + data + }) +} diff --git a/src/api/apis/integration.js b/src/api/apis/integration.js index 4f3e23d..9052a74 100644 --- a/src/api/apis/integration.js +++ b/src/api/apis/integration.js @@ -6,7 +6,7 @@ import request from '@/utils/request' */ export function login(obj) { return request({ - url: 'kangarooDataCenter/entranceController/option', + url: 'kangarooDataCenterV3/entranceController/option', headers: { isToken: false, tl:obj.tl, @@ -15,4 +15,4 @@ export function login(obj) { }, method: 'post', }) - } \ No newline at end of file + } diff --git a/src/api/apis/logo.js b/src/api/apis/logo.js index c1d1dbc..ba7366a 100644 --- a/src/api/apis/logo.js +++ b/src/api/apis/logo.js @@ -3,7 +3,7 @@ import request from "@/utils/request"; export function uploadLogo(data) { return request({ - url: "/kangarooDataCenter/entranceController/fileUpload", + url: "/kangarooDataCenterV3/entranceController/fileUpload", method: "post", data, }); @@ -11,7 +11,7 @@ export function uploadLogo(data) { //下载 export function downloadLogo(id) { return request({ - url: "/kangarooDataCenter/entranceController/fileDownloadNew?id=" + id, + url: "/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + id, method: "get", responseType: "arraybuffer", }); diff --git a/src/api/integrationOption/integrationOption.js b/src/api/integrationOption/integrationOption.js index dbb7d00..1ab3aa5 100644 --- a/src/api/integrationOption/integrationOption.js +++ b/src/api/integrationOption/integrationOption.js @@ -3,7 +3,7 @@ import request from '@/utils/request' export function getUserModuleApi(obj, data = {}) { return request({ - url: 'kangarooDataCenter/entranceController/option', + url: 'kangarooDataCenterV3/entranceController/option', method: 'post', headers: obj, data diff --git a/src/api/login.js b/src/api/login.js index 2a31e26..4286edf 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -13,7 +13,7 @@ export function login(login_name, password) { } return request({ - url: 'kangarooDataCenter/entranceController/option', + url: 'kangarooDataCenterV3/entranceController/option', headers: { isToken: false, tl: 'loginService', diff --git a/src/api/system/integrationOption.js b/src/api/system/integrationOption.js index 71ef1d7..aea2038 100644 --- a/src/api/system/integrationOption.js +++ b/src/api/system/integrationOption.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 集成应用请求 export function getPagesApi(obj, data = {}) { return request({ - url: 'kangarooDataCenter/entranceController/option', + url: 'kangarooDataCenterV3/entranceController/option', method: 'post', headers: obj, data diff --git a/src/views/applicationList/applicationAdd.vue b/src/views/applicationList/applicationAdd.vue index a36a381..823abe7 100644 --- a/src/views/applicationList/applicationAdd.vue +++ b/src/views/applicationList/applicationAdd.vue @@ -103,7 +103,7 @@ export default { // this.appLogo = el.id // } return request({ - url: "/kangarooDataCenter/entranceController/fileUpload", + url: "/kangarooDataCenterV3/entranceController/fileUpload", method: "post", data: formData, }).then((res) => { @@ -230,7 +230,7 @@ export default { getLogoUrl() { let id = this.appLogo ? this.appLogo : this.$route.query.appLogo return request({ - url: "/kangarooDataCenter/entranceController/fileDownloadNew?id=" + id, + url: "/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + id, method: "get", responseType: 'arraybuffer' }).then((res) => { diff --git a/src/views/applicationList/index.vue b/src/views/applicationList/index.vue index d4c3201..8f9ae77 100644 --- a/src/views/applicationList/index.vue +++ b/src/views/applicationList/index.vue @@ -202,7 +202,7 @@ export default { this.pageModel.total = res.attribute.total; res.attribute.list.map(el => { return request({ - url: "/kangarooDataCenter/entranceController/fileDownloadNew?id=" + el.appLogo, + url: "/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + el.appLogo, method: "get", responseType: 'arraybuffer' }).then((res) => { diff --git a/src/views/applicationList/settingMenu.vue b/src/views/applicationList/settingMenu.vue index 00e0c59..2bff7e8 100644 --- a/src/views/applicationList/settingMenu.vue +++ b/src/views/applicationList/settingMenu.vue @@ -79,7 +79,7 @@ export default { this.versionNumber = res.attribute.versionNumber //下载logo return request({ - url: "/kangarooDataCenter/entranceController/fileDownloadNew?id=" + res.attribute.appLogo, + url: "/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + res.attribute.appLogo, method: "get", responseType: 'arraybuffer' }).then((res) => { diff --git a/src/views/masterDataOptions/index.vue b/src/views/masterDataOptions/index.vue index 20f0d7e..cf786cb 100644 --- a/src/views/masterDataOptions/index.vue +++ b/src/views/masterDataOptions/index.vue @@ -183,7 +183,7 @@ export default { res.attribute.list.map(el => { this.$set(el,'imgLoading',true) return request({ - url: "/kangarooDataCenter/entranceController/fileDownloadNew?id=" + el.mdmLogo, + url: "/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + el.mdmLogo, method: "get", responseType: 'arraybuffer' }).then((res) => { diff --git a/src/views/masterDataOptions/masterDataAdd.vue b/src/views/masterDataOptions/masterDataAdd.vue index d3745df..44f83c6 100644 --- a/src/views/masterDataOptions/masterDataAdd.vue +++ b/src/views/masterDataOptions/masterDataAdd.vue @@ -92,7 +92,7 @@ export default { formData.append("fileFlag", true); formData.append("businessType", "application"); return request({ - url: "/kangarooDataCenter/entranceController/fileUpload", + url: "/kangarooDataCenterV3/entranceController/fileUpload", method: "post", data: formData, }).then((res) => { @@ -210,7 +210,7 @@ export default { this.imgLoading = true let id = this.appLogo ? this.appLogo : this.$route.query.appLogo return request({ - url: "/kangarooDataCenter/entranceController/fileDownloadNew?id=" + id, + url: "/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + id, method: "get", responseType: 'arraybuffer' }).then((res) => { diff --git a/src/views/masterDataOptions/settingMenu.vue b/src/views/masterDataOptions/settingMenu.vue index 7453f84..ff7ce6e 100644 --- a/src/views/masterDataOptions/settingMenu.vue +++ b/src/views/masterDataOptions/settingMenu.vue @@ -63,7 +63,7 @@ export default { //下载logo this.imgLoading = true return request({ - url: "/kangarooDataCenter/entranceController/fileDownloadNew?id=" + res.attribute.mdmLogo, + url: "/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + res.attribute.mdmLogo, method: "get", responseType: 'arraybuffer' }).then((res) => { diff --git a/vue.config.js b/vue.config.js index e291c8d..a5c91ee 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,141 +1,142 @@ -"use strict"; -const path = require("path"); - -function resolve(dir) { - return path.join(__dirname, dir); -} - -const CompressionPlugin = require("compression-webpack-plugin"); - -const name = process.env.VUE_APP_TITLE || "用安数智中台"; // 网页标题 - -const port = process.env.port || process.env.npm_config_port || 80; // 端口 - -const webpack = require('webpack'); - -// vue.config.js 配置说明 -//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions -// 这里只列一部分，具体配置参考文档 -module.exports = { - // 部署生产环境和开发环境下的URL。 - // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - // publicPath: process.env.NODE_ENV === "production" ? "/" : "./", - publicPath: "./", - // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: "dist", - // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: "webPc", - // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === "development", - // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 - productionSourceMap: false, - // webpack-dev-server 相关配置 - devServer: { - host: "0.0.0.0", - // host:"localhost",z - port: port, - open: true, - proxy: { - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API]: { - // target: `http://hzya.ufyct.com:9067/`, - // target: `http://127.0.0.1:9081/`, - target: `http://192.168.2.78:9999`, - changeOrigin: true, - pathRewrite: { - ["^" + process.env.VUE_APP_BASE_API]: "", - }, - }, - }, - disableHostCheck: true, - }, - css: { - loaderOptions: { - sass: { - sassOptions: { outputStyle: "expanded" }, - }, - }, - }, - configureWebpack: { - name: name, - resolve: { - alias: { - "@": resolve("src"), - }, - }, - plugins: [ - // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 - new CompressionPlugin({ - cache: false, // 不启用文件缓存 - test: /\.(js|css|html)?$/i, // 压缩文件格式 - filename: "[path].gz[query]", // 压缩后的文件名 - algorithm: "gzip", // 使用gzip压缩 - minRatio: 0.8, // 压缩率小于1才会压缩 - }), - new webpack.ProvidePlugin({ - 'window.Quill': 'quill/dist/quill.js', - 'Quill': 'quill/dist/quill.js' - }) - ], - }, - chainWebpack(config) { - config.plugins.delete("preload"); // TODO: need test - config.plugins.delete("prefetch"); // TODO: need test - - // set svg-sprite-loader - config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end(); - config.module - .rule("icons") - .test(/\.svg$/) - .include.add(resolve("src/assets/icons")) - .end() - .use("svg-sprite-loader") - .loader("svg-sprite-loader") - .options({ - symbolId: "icon-[name]", - }) - .end(); - - config.when(process.env.NODE_ENV !== "development", (config) => { - config - .plugin("ScriptExtHtmlWebpackPlugin") - .after("html") - .use("script-ext-html-webpack-plugin", [ - { - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/, - }, - ]) - .end(); - config.optimization.splitChunks({ - chunks: "all", - cacheGroups: { - libs: { - name: "chunk-libs", - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: "initial", // only package third parties that are initially dependent - }, - elementUI: { - name: "chunk-elementUI", // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm - }, - commons: { - name: "chunk-commons", - test: resolve("src/components"), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true, - }, - }, - }); - config.optimization.runtimeChunk("single"), - { - from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件 - to: "./", //到根目录下 - }; - }); - }, -}; +"use strict"; +const path = require("path"); + +function resolve(dir) { + return path.join(__dirname, dir); +} + +const CompressionPlugin = require("compression-webpack-plugin"); + +const name = process.env.VUE_APP_TITLE || "用安数智中台"; // 网页标题 + +const port = process.env.port || process.env.npm_config_port || 80; // 端口 + +const webpack = require('webpack'); + +// vue.config.js 配置说明 +//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions +// 这里只列一部分，具体配置参考文档 +module.exports = { + // 部署生产环境和开发环境下的URL。 + // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 + // publicPath: process.env.NODE_ENV === "production" ? "/" : "./", + publicPath: "./", + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: "dist", + // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） + assetsDir: "webPc", + // 是否开启eslint保存检测，有效值：ture | false | 'error' + lintOnSave: process.env.NODE_ENV === "development", + // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 + productionSourceMap: false, + // webpack-dev-server 相关配置 + devServer: { + host: "0.0.0.0", + // host:"localhost",z + port: port, + open: true, + proxy: { + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://hzya.ufyct.com:9067/`, + // target: `http://127.0.0.1:9081/`, + // target: `http://192.168.2.78:9999`, + // target: `http://192.168.2.78:8080`, + changeOrigin: true, + pathRewrite: { + ["^" + process.env.VUE_APP_BASE_API]: "", + }, + }, + }, + disableHostCheck: true, + }, + css: { + loaderOptions: { + sass: { + sassOptions: { outputStyle: "expanded" }, + }, + }, + }, + configureWebpack: { + name: name, + resolve: { + alias: { + "@": resolve("src"), + }, + }, + plugins: [ + // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 + new CompressionPlugin({ + cache: false, // 不启用文件缓存 + test: /\.(js|css|html)?$/i, // 压缩文件格式 + filename: "[path].gz[query]", // 压缩后的文件名 + algorithm: "gzip", // 使用gzip压缩 + minRatio: 0.8, // 压缩率小于1才会压缩 + }), + new webpack.ProvidePlugin({ + 'window.Quill': 'quill/dist/quill.js', + 'Quill': 'quill/dist/quill.js' + }) + ], + }, + chainWebpack(config) { + config.plugins.delete("preload"); // TODO: need test + config.plugins.delete("prefetch"); // TODO: need test + + // set svg-sprite-loader + config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end(); + config.module + .rule("icons") + .test(/\.svg$/) + .include.add(resolve("src/assets/icons")) + .end() + .use("svg-sprite-loader") + .loader("svg-sprite-loader") + .options({ + symbolId: "icon-[name]", + }) + .end(); + + config.when(process.env.NODE_ENV !== "development", (config) => { + config + .plugin("ScriptExtHtmlWebpackPlugin") + .after("html") + .use("script-ext-html-webpack-plugin", [ + { + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/, + }, + ]) + .end(); + config.optimization.splitChunks({ + chunks: "all", + cacheGroups: { + libs: { + name: "chunk-libs", + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: "initial", // only package third parties that are initially dependent + }, + elementUI: { + name: "chunk-elementUI", // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm + }, + commons: { + name: "chunk-commons", + test: resolve("src/components"), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true, + }, + }, + }); + config.optimization.runtimeChunk("single"), + { + from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件 + to: "./", //到根目录下 + }; + }); + }, +};