From fe5a7605f035210a97242ebb5bd14a52593a9883 Mon Sep 17 00:00:00 2001 From: isummer Date: Sun, 16 Oct 2022 05:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/index/FirContact.vue | 7 +++--- .../src/components/index/FirIndexTem.vue | 7 +++--- fir_client/src/restful/download.js | 3 ++- fir_client/src/restful/index.js | 2 +- fir_client/vue.config.js | 23 ++++++++++--------- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/fir_client/src/components/index/FirContact.vue b/fir_client/src/components/index/FirContact.vue index fab782b..d8ea1de 100644 --- a/fir_client/src/components/index/FirContact.vue +++ b/fir_client/src/components/index/FirContact.vue @@ -16,11 +16,11 @@

应用举报

-

FlyApps

 +

FlyApps
- @@ -34,7 +34,8 @@ export default { name: "FirContact", data() { return { - bg_img: require("@/assets/imgs/banner_1.jpg") + bg_img: require("@/assets/imgs/banner_1.jpg"), + github: process.env.base_env.github } }, } diff --git a/fir_client/src/components/index/FirIndexTem.vue b/fir_client/src/components/index/FirIndexTem.vue index 412c2bf..165d5ae 100644 --- a/fir_client/src/components/index/FirIndexTem.vue +++ b/fir_client/src/components/index/FirIndexTem.vue @@ -24,7 +24,7 @@ 联系我们 - Github + Github @@ -64,10 +64,11 @@ export default { 'line-height': '45px', background: '#e7eaf1' }, + github: process.env.base_env.github } }, methods: { - github() { - window.open('https://github.com/nineaiyu/FlyApps', '_blank', ''); + goGithub() { + window.open(this.github, '_blank', ''); } } } diff --git a/fir_client/src/restful/download.js b/fir_client/src/restful/download.js index b6ca583..cee28e0 100644 --- a/fir_client/src/restful/download.js +++ b/fir_client/src/restful/download.js @@ -4,7 +4,8 @@ import {geetestbase} from "@/utils/base/utils"; const DOMAIN = process.env.base_env.baseShortUrl; const USERSEVER = 'api/v1/fir/server'; - +// eslint-disable-next-line no-console +console.log("js build version:" + process.env.base_env.version); // create an axios instance const service = Axios.create({ baseURL: DOMAIN, // url = base url + request url diff --git a/fir_client/src/restful/index.js b/fir_client/src/restful/index.js index 582cee8..09c750f 100644 --- a/fir_client/src/restful/index.js +++ b/fir_client/src/restful/index.js @@ -16,7 +16,7 @@ export function requestAbort() { } // eslint-disable-next-line no-console -console.log("flyapps js version:" + process.env.base_env.version); +console.log("js build version:" + process.env.base_env.version); const DOMAIN = process.env.base_env.baseUrl; const USERSEVER = 'api/v1/fir/server'; diff --git a/fir_client/vue.config.js b/fir_client/vue.config.js index 6509b29..c6c7ece 100644 --- a/fir_client/vue.config.js +++ b/fir_client/vue.config.js @@ -1,15 +1,14 @@ const IS_PROD = ['production', 'prod'].includes(process.env.NODE_ENV); const path = require('path'); const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); +const dateFormat = require("./src/utils/format.js"); +const CompressionWebpackPlugin = require('compression-webpack-plugin'); +const argv = process.argv; function resolve(dir) { return path.join(__dirname, dir); } -const argv = process.argv; - -const CompressionWebpackPlugin = require('compression-webpack-plugin'); - const compress = new CompressionWebpackPlugin( { filename: info => { @@ -19,7 +18,7 @@ const compress = new CompressionWebpackPlugin( threshold: 10240, test: new RegExp( '\\.(' + - ['js','css'].join('|') + + ['js', 'css'].join('|') + ')$' ), minRatio: 0.8, @@ -28,7 +27,7 @@ const compress = new CompressionWebpackPlugin( ); const index = { - outputDir:'dist_index', + outputDir: 'dist_index', // page 的入口 entry: 'src/main.js', // 模板来源 @@ -40,11 +39,11 @@ const index = { title: 'Fly分发平台', // 在这个页面中包含的块，默认情况下会包含 // 提取出来的通用 chunk 和 vendor chunk。 - chunks: ['chunk-vendors', 'chunk-common', 'index', 'elementui','runtime', 'alioss', 'qiniujs', 'qrcodejs2'] + chunks: ['chunk-vendors', 'chunk-common', 'index', 'elementui', 'runtime', 'alioss', 'qiniujs', 'qrcodejs2'] }; // eslint-disable-next-line no-unused-vars const mshort = { - outputDir:'dist_mshort', + outputDir: 'dist_mshort', // page 的入口 entry: 'src/main.short.js', // 模板来源 @@ -59,7 +58,7 @@ const mshort = { chunks: ['chunk-vendors', 'chunk-common', 'mshort', 'chunk-elementUI', 'runtime'] }; const short = { - outputDir:'dist_short', + outputDir: 'dist_short', // page 的入口 entry: 'src/short.js', // 模板来源 @@ -90,6 +89,7 @@ for (const key of Object.keys(pages)) { } const version='2.3.8'; +const github = 'https://github.com/nineaiyu/FlyApps'; const pro_base_env = { baseUrl: '/', //该选项可以填写web-api的域名，类似 https://api.xxx.com/ @@ -164,8 +164,9 @@ module.exports = { args[0]['process.env']['base_env'] = JSON.stringify({ baseUrl: base_evn.baseUrl, baseShortUrl: base_evn.baseShortUrl, - version: base_evn.version, - footer: base_evn.footer_info + version: dateFormat("yyyyMMdd.hhmmss") + '.' + base_evn.version, + footer: base_evn.footer_info, + github }); return args });