From ff4d232c0fd85e2a1a3e44f1ef63e9716f1b1cc5 Mon Sep 17 00:00:00 2001 From: yukai Date: Sat, 14 Sep 2024 03:26:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..e8452cb --- /dev/null +++ b/.drone.yml @@ -0,0 +1,38 @@ +kind: pipeline +type: docker +name: build + +steps: + - name: build + image: node:18.20.3-alpine + pull: if-not-exists + volumes: + - name: cache + path: /drone/src/.pnpm-store + - name: node-build + path: /app/build + commands: ## 此处自己定义项目工程的构建命令 + - npm install -g pnpm + - pnpm i + - pnpm run build:prod + - ls -l + - cp -r dist /app/build/ + when: ## 定义在什么情况下触发构建任务 + branch: master #定义在哪个分支触发构建任务 + - name: scp + image: appleboy/drone-scp + volumes: + - name: node-build + path: /app/build + settings: + host: 60.204.138.3 + username: root + password: 5xhqamyZ + port: 22 + target: /data/app/dmjs-merchant-admin + source: /app/build/dist + overwrite: true +volumes: + - name: node-build + host: + path: /data/app/dmjs-merchant-admin From 80b2c487be01b23140e3b50794291a1d72a4e41b Mon Sep 17 00:00:00 2001 From: yukai Date: Sat, 14 Sep 2024 03:34:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index dec3a81..afefe29 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "dependencies": { "@micro-zoe/micro-app": "^1.0.0-rc.5", "@riophae/vue-treeselect": "0.4.0", + "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0", "axios": "0.24.0", "clipboard": "2.0.8", "compressorjs": "^1.1.1", @@ -52,14 +53,17 @@ "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", + "lodash": "^4.17.21", "mockjs": "^1.1.0", "nprogress": "0.2.0", "obj-modal": "^1.2.2", "obj-table-plus": "^2.4.0", + "qs": "^6.13.0", "quill": "1.3.7", "screenfull": "5.0.2", "signature_pad": "^3.0.0-beta.4", "sortablejs": "1.10.2", + "throttle-debounce": "^5.0.2", "video.js": "^7.20.3", "vue": "^2.7.16", "vue-amap": "^0.5.10", From e55d93d55be79a486751b86639d4db926675c62d Mon Sep 17 00:00:00 2001 From: yukai Date: Sat, 14 Sep 2024 03:42:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=AD=90=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 262 +++++++++++++++++++++++++------------------------- 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/vue.config.js b/vue.config.js index 2e07a26..ddae177 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,131 +1,131 @@ -'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 // 端口 - -// 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" ? "/" : "/", - // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'dist', - // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: 'static', - // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', - // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 - productionSourceMap: false, - runtimeCompiler: true, - // webpack-dev-server 相关配置 - devServer: { - host: '0.0.0.0', - port: 4000, - open: true, - proxy: { - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API]: { - target: `http://localhost: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|jpe?g|png|gif|svg)?$/i, // 压缩文件格式 - filename: '[path][base].gz[query]', // 压缩后的文件名 - algorithm: 'gzip', // 使用gzip压缩 - minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩 - deleteOriginalAssets: false // 压缩后删除原文件 - }) - ], - }, - 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/icons')) - .end() - config.module - .rule('icons') - .test(/\.svg$/) - .include.add(resolve('src/icons')) - .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') - .options({ - symbolId: '[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 - test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm - priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app - }, - 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') - }) - } -} +'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 // 端口 + +// 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" ? "/merchant-admin" : "/", + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: 'dist', + // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） + assetsDir: 'static', + // 是否开启eslint保存检测，有效值：ture | false | 'error' + lintOnSave: process.env.NODE_ENV === 'development', + // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 + productionSourceMap: false, + runtimeCompiler: true, + // webpack-dev-server 相关配置 + devServer: { + host: '0.0.0.0', + port: 4000, + open: true, + proxy: { + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://localhost: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|jpe?g|png|gif|svg)?$/i, // 压缩文件格式 + filename: '[path][base].gz[query]', // 压缩后的文件名 + algorithm: 'gzip', // 使用gzip压缩 + minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩 + deleteOriginalAssets: false // 压缩后删除原文件 + }) + ], + }, + 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/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: '[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 + test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm + priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app + }, + 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 1c515bf08f8342e9aff3c66b59e0e92c676cc2fb Mon Sep 17 00:00:00 2001 From: yukai Date: Sat, 14 Sep 2024 03:48:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83api=E5=9C=B0=E5=9D=80=E6=8C=87=E5=90=91https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/index-prod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/config/index-prod.js b/public/config/index-prod.js index 94d58e2..477d250 100644 --- a/public/config/index-prod.js +++ b/public/config/index-prod.js @@ -13,7 +13,7 @@ window.SITE_CONFIG = {}; // 在线api接口请求地址 - window.SITE_CONFIG['baseUrl'] ="http://admin-test.damajishi.cn:8899" + window.SITE_CONFIG['baseUrl'] ="https://admin-test.damajishi.cn/merchant-api" // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './'; // 域名 From 397807a8d7d53cb358bdd228f78bec7cccc140d5 Mon Sep 17 00:00:00 2001 From: yukai Date: Sat, 14 Sep 2024 03:55:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83api=E5=9C=B0=E5=9D=80=E6=8C=87=E5=90=91https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/index-prod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/config/index-prod.js b/public/config/index-prod.js index 477d250..7ce89d8 100644 --- a/public/config/index-prod.js +++ b/public/config/index-prod.js @@ -13,7 +13,7 @@ window.SITE_CONFIG = {}; // 在线api接口请求地址 - window.SITE_CONFIG['baseUrl'] ="https://admin-test.damajishi.cn/merchant-api" + window.SITE_CONFIG['baseUrl'] ="https://admin-test.damajishi.cn" // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './'; // 域名