diff --git a/.gitignore b/.gitignore index 8b1926a..46b6b14 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ target/ ### NetBeans ### nbproject/private/ -build/ nbbuild/ dist/ nbdist/ diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/README.md b/boot-starter/boot-starter-security/boot-starter-security-browser/README.md index 5bc54c1..0da2694 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/README.md +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/README.md @@ -1,12 +1,10 @@ #欢迎查看spring security browser权限认证框架说明 ##相关配置参数说明 -- `ms.security.browser.html` 自定义登录页面的地址 -- `ms.security.browser.loginType` 身份认证后响应类型`REDIRECT`页面形式响应 -- `ms.security.browser.rememberMeSeconds` 记住我的时间,单位是秒,默认的时间是3600秒 - `JSON`, json形式的响应 -- 定义自己的根据用户名获取密码的bean,定义自己的bean的名字为`userServiceImpl`即可 +- `ms.security.browser.html` 自定义登录页面的地址(必须参数) +- `ms.security.browser.loginType` 身份认证后响应类型`REDIRECT`页面形式响应,`JSON`, json形式的响应 +- `ms.security.browser.rememberMeSeconds` 记住我的时间,单位是秒,默认的时间是3600秒,`remember-me`参数,值为`true` - `/authentication/require`处理身份认证跳转的接口地址 -- 需要注入`userServiceImpl`获取用户详细信息的bean -- 需要注入数据源`masterDataSource`用于记住我功能的bean,记住我功能需要在登录的时候传入 - `remember-me`参数,值为`true` \ No newline at end of file +- 需要注入`userServiceImpl`获取用户详细信息的bean (必须参数) +- 需要注入数据源`masterDataSource`用于记住我功能的bean,记住我功能需要在登录的时候传入(必须参数) + \ No newline at end of file diff --git a/ms-web/.babelrc b/ms-web/.babelrc new file mode 100644 index 0000000..9390d16 --- /dev/null +++ b/ms-web/.babelrc @@ -0,0 +1,18 @@ +{ + "presets": [ + ["env", { + "modules": false, + "targets": { + "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] + } + }], + "stage-2" + ], + "plugins": ["transform-vue-jsx", "transform-runtime"], + "env": { + "test": { + "presets": ["env", "stage-2"], + "plugins": ["transform-vue-jsx", "transform-es2015-modules-commonjs", "dynamic-import-node"] + } + } +} diff --git a/ms/web-system-management/.editorconfig b/ms-web/.editorconfig similarity index 100% rename from ms/web-system-management/.editorconfig rename to ms-web/.editorconfig diff --git a/ms/web-system-management/.eslintignore b/ms-web/.eslintignore similarity index 100% rename from ms/web-system-management/.eslintignore rename to ms-web/.eslintignore diff --git a/ms/web-system-management/.eslintrc.js b/ms-web/.eslintrc.js similarity index 72% rename from ms/web-system-management/.eslintrc.js rename to ms-web/.eslintrc.js index e0dd62d..2e2e211 100644 --- a/ms/web-system-management/.eslintrc.js +++ b/ms-web/.eslintrc.js @@ -16,12 +16,10 @@ module.exports = { 'html' ], // add your custom rules here - 'rules': { - // allow paren-less arrow functions - 'arrow-parens': 0, + rules: { // allow async-await - 'generator-star-spacing': 0, + 'generator-star-spacing': 'off', // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' } } diff --git a/ms/web-system-management/.gitignore b/ms-web/.gitignore similarity index 100% rename from ms/web-system-management/.gitignore rename to ms-web/.gitignore diff --git a/ms/web-system-management/.postcssrc.js b/ms-web/.postcssrc.js similarity index 100% rename from ms/web-system-management/.postcssrc.js rename to ms-web/.postcssrc.js diff --git a/ms/web-system-management/README.md b/ms-web/README.md similarity index 96% rename from ms/web-system-management/README.md rename to ms-web/README.md index 5964c03..c5d7ef7 100644 --- a/ms/web-system-management/README.md +++ b/ms-web/README.md @@ -1,4 +1,4 @@ -# system-management +# ms-web > A Vue.js project diff --git a/ms-web/build/build.js b/ms-web/build/build.js new file mode 100644 index 0000000..2b648b8 --- /dev/null +++ b/ms-web/build/build.js @@ -0,0 +1,41 @@ +'use strict' +require('./check-versions')() + +process.env.NODE_ENV = 'production' + +const ora = require('ora') +const rm = require('rimraf') +const path = require('path') +const chalk = require('chalk') +const webpack = require('webpack') +const config = require('../config') +const webpackConfig = require('./webpack.prod.conf') + +const spinner = ora('building for production...') +spinner.start() + +rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { + if (err) throw err + webpack(webpackConfig, (err, stats) => { + spinner.stop() + if (err) throw err + process.stdout.write(stats.toString({ + colors: true, + modules: false, + children: false, // if you are using ts-loader, setting this to true will make tyescript errors show up during build + chunks: false, + chunkModules: false + }) + '\n\n') + + if (stats.hasErrors()) { + console.log(chalk.red(' Build failed with errors.\n')) + process.exit(1) + } + + console.log(chalk.cyan(' Build complete.\n')) + console.log(chalk.yellow( + ' Tip: built files are meant to be served over an HTTP server.\n' + + ' Opening index.html over file:// won\'t work.\n' + )) + }) +}) diff --git a/ms-web/build/check-versions.js b/ms-web/build/check-versions.js new file mode 100644 index 0000000..3ef972a --- /dev/null +++ b/ms-web/build/check-versions.js @@ -0,0 +1,54 @@ +'use strict' +const chalk = require('chalk') +const semver = require('semver') +const packageConfig = require('../package.json') +const shell = require('shelljs') + +function exec (cmd) { + return require('child_process').execSync(cmd).toString().trim() +} + +const versionRequirements = [ + { + name: 'node', + currentVersion: semver.clean(process.version), + versionRequirement: packageConfig.engines.node + } +] + +if (shell.which('npm')) { + versionRequirements.push({ + name: 'npm', + currentVersion: exec('npm --version'), + versionRequirement: packageConfig.engines.npm + }) +} + +module.exports = function () { + const warnings = [] + + for (let i = 0; i < versionRequirements.length; i++) { + const mod = versionRequirements[i] + + if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { + warnings.push(mod.name + ': ' + + chalk.red(mod.currentVersion) + ' should be ' + + chalk.green(mod.versionRequirement) + ) + } + } + + if (warnings.length) { + console.log('') + console.log(chalk.yellow('To use this template, you must update following to modules:')) + console.log() + + for (let i = 0; i < warnings.length; i++) { + const warning = warnings[i] + console.log(' ' + warning) + } + + console.log() + process.exit(1) + } +} diff --git a/ms/web-system-management/src/assets/logo.png b/ms-web/build/logo.png similarity index 100% rename from ms/web-system-management/src/assets/logo.png rename to ms-web/build/logo.png diff --git a/ms-web/build/utils.js b/ms-web/build/utils.js new file mode 100644 index 0000000..e534fb0 --- /dev/null +++ b/ms-web/build/utils.js @@ -0,0 +1,101 @@ +'use strict' +const path = require('path') +const config = require('../config') +const ExtractTextPlugin = require('extract-text-webpack-plugin') +const packageConfig = require('../package.json') + +exports.assetsPath = function (_path) { + const assetsSubDirectory = process.env.NODE_ENV === 'production' + ? config.build.assetsSubDirectory + : config.dev.assetsSubDirectory + + return path.posix.join(assetsSubDirectory, _path) +} + +exports.cssLoaders = function (options) { + options = options || {} + + const cssLoader = { + loader: 'css-loader', + options: { + sourceMap: options.sourceMap + } + } + + const postcssLoader = { + loader: 'postcss-loader', + options: { + sourceMap: options.sourceMap + } + } + + // generate loader string to be used with extract text plugin + function generateLoaders (loader, loaderOptions) { + const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader] + + if (loader) { + loaders.push({ + loader: loader + '-loader', + options: Object.assign({}, loaderOptions, { + sourceMap: options.sourceMap + }) + }) + } + + // Extract CSS when that option is specified + // (which is the case during production build) + if (options.extract) { + return ExtractTextPlugin.extract({ + use: loaders, + fallback: 'vue-style-loader' + }) + } else { + return ['vue-style-loader'].concat(loaders) + } + } + + // https://vue-loader.vuejs.org/en/configurations/extract-css.html + return { + css: generateLoaders(), + postcss: generateLoaders(), + less: generateLoaders('less'), + sass: generateLoaders('sass', { indentedSyntax: true }), + scss: generateLoaders('sass'), + stylus: generateLoaders('stylus'), + styl: generateLoaders('stylus') + } +} + +// Generate loaders for standalone style files (outside of .vue) +exports.styleLoaders = function (options) { + const output = [] + const loaders = exports.cssLoaders(options) + + for (const extension in loaders) { + const loader = loaders[extension] + output.push({ + test: new RegExp('\\.' + extension + '$'), + use: loader + }) + } + + return output +} + +exports.createNotifierCallback = () => { + const notifier = require('node-notifier') + + return (severity, errors) => { + if (severity !== 'error') return + + const error = errors[0] + const filename = error.file && error.file.split('!').pop() + + notifier.notify({ + title: packageConfig.name, + message: severity + ': ' + error.name, + subtitle: filename || '', + icon: path.join(__dirname, 'logo.png') + }) + } +} diff --git a/ms-web/build/vue-loader.conf.js b/ms-web/build/vue-loader.conf.js new file mode 100644 index 0000000..33ed58b --- /dev/null +++ b/ms-web/build/vue-loader.conf.js @@ -0,0 +1,22 @@ +'use strict' +const utils = require('./utils') +const config = require('../config') +const isProduction = process.env.NODE_ENV === 'production' +const sourceMapEnabled = isProduction + ? config.build.productionSourceMap + : config.dev.cssSourceMap + +module.exports = { + loaders: utils.cssLoaders({ + sourceMap: sourceMapEnabled, + extract: isProduction + }), + cssSourceMap: sourceMapEnabled, + cacheBusting: config.dev.cacheBusting, + transformToRequire: { + video: ['src', 'poster'], + source: 'src', + img: 'src', + image: 'xlink:href' + } +} diff --git a/ms-web/build/webpack.base.conf.js b/ms-web/build/webpack.base.conf.js new file mode 100644 index 0000000..99b5169 --- /dev/null +++ b/ms-web/build/webpack.base.conf.js @@ -0,0 +1,92 @@ +'use strict' +const path = require('path') +const utils = require('./utils') +const config = require('../config') +const vueLoaderConfig = require('./vue-loader.conf') + +function resolve (dir) { + return path.join(__dirname, '..', dir) +} + +const createLintingRule = () => ({ + test: /\.(js|vue)$/, + loader: 'eslint-loader', + enforce: 'pre', + include: [resolve('src'), resolve('test')], + options: { + formatter: require('eslint-friendly-formatter'), + emitWarning: !config.dev.showEslintErrorsInOverlay + } +}) + +module.exports = { + context: path.resolve(__dirname, '../'), + entry: { + app: './src/main.js' + }, + output: { + path: config.build.assetsRoot, + filename: '[name].js', + publicPath: process.env.NODE_ENV === 'production' + ? config.build.assetsPublicPath + : config.dev.assetsPublicPath + }, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: { + 'vue$': 'vue/dist/vue.esm.js', + '@': resolve('src'), + } + }, + module: { + rules: [ + ...(config.dev.useEslint ? [createLintingRule()] : []), + { + test: /\.vue$/, + loader: 'vue-loader', + options: vueLoaderConfig + }, + { + test: /\.js$/, + loader: 'babel-loader', + include: [resolve('src'), resolve('test')] + }, + { + test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('img/[name].[hash:7].[ext]') + } + }, + { + test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('media/[name].[hash:7].[ext]') + } + }, + { + test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('fonts/[name].[hash:7].[ext]') + } + } + ] + }, + node: { + // prevent webpack from injecting useless setImmediate polyfill because Vue + // source contains it (although only uses it if it's native). + setImmediate: false, + // prevent webpack from injecting mocks to Node native modules + // that does not make sense for the client + dgram: 'empty', + fs: 'empty', + net: 'empty', + tls: 'empty', + child_process: 'empty' + } +} diff --git a/ms-web/build/webpack.dev.conf.js b/ms-web/build/webpack.dev.conf.js new file mode 100644 index 0000000..03e9428 --- /dev/null +++ b/ms-web/build/webpack.dev.conf.js @@ -0,0 +1,80 @@ +'use strict' +const utils = require('./utils') +const webpack = require('webpack') +const config = require('../config') +const merge = require('webpack-merge') +const baseWebpackConfig = require('./webpack.base.conf') +const HtmlWebpackPlugin = require('html-webpack-plugin') +const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') +const portfinder = require('portfinder') + +const HOST = process.env.HOST +const PORT = process.env.PORT && Number(process.env.PORT) + +const devWebpackConfig = merge(baseWebpackConfig, { + module: { + rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) + }, + // cheap-module-eval-source-map is faster for development + devtool: config.dev.devtool, + + // these devServer options should be customized in /config/index.js + devServer: { + clientLogLevel: 'warning', + historyApiFallback: true, + hot: true, + compress: true, + host: HOST || config.dev.host, + port: PORT || config.dev.port, + open: config.dev.autoOpenBrowser, + overlay: config.dev.errorOverlay + ? { warnings: false, errors: true } + : false, + publicPath: config.dev.assetsPublicPath, + proxy: config.dev.proxyTable, + quiet: true, // necessary for FriendlyErrorsPlugin + watchOptions: { + poll: config.dev.poll, + } + }, + plugins: [ + new webpack.DefinePlugin({ + 'process.env': require('../config/dev.env') + }), + new webpack.HotModuleReplacementPlugin(), + new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update. + new webpack.NoEmitOnErrorsPlugin(), + // https://github.com/ampedandwired/html-webpack-plugin + new HtmlWebpackPlugin({ + filename: 'index.html', + template: 'index.html', + inject: true + }), + ] +}) + +module.exports = new Promise((resolve, reject) => { + portfinder.basePort = process.env.PORT || config.dev.port + portfinder.getPort((err, port) => { + if (err) { + reject(err) + } else { + // publish the new Port, necessary for e2e tests + process.env.PORT = port + // add port to devServer config + devWebpackConfig.devServer.port = port + + // Add FriendlyErrorsPlugin + devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ + compilationSuccessInfo: { + messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], + }, + onErrors: config.dev.notifyOnErrors + ? utils.createNotifierCallback() + : undefined + })) + + resolve(devWebpackConfig) + } + }) +}) diff --git a/ms-web/build/webpack.prod.conf.js b/ms-web/build/webpack.prod.conf.js new file mode 100644 index 0000000..478cda8 --- /dev/null +++ b/ms-web/build/webpack.prod.conf.js @@ -0,0 +1,149 @@ +'use strict' +const path = require('path') +const utils = require('./utils') +const webpack = require('webpack') +const config = require('../config') +const merge = require('webpack-merge') +const baseWebpackConfig = require('./webpack.base.conf') +const CopyWebpackPlugin = require('copy-webpack-plugin') +const HtmlWebpackPlugin = require('html-webpack-plugin') +const ExtractTextPlugin = require('extract-text-webpack-plugin') +const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') +const UglifyJsPlugin = require('uglifyjs-webpack-plugin') + +const env = process.env.NODE_ENV === 'testing' + ? require('../config/test.env') + : require('../config/prod.env') + +const webpackConfig = merge(baseWebpackConfig, { + module: { + rules: utils.styleLoaders({ + sourceMap: config.build.productionSourceMap, + extract: true, + usePostCSS: true + }) + }, + devtool: config.build.productionSourceMap ? config.build.devtool : false, + output: { + path: config.build.assetsRoot, + filename: utils.assetsPath('js/[name].[chunkhash].js'), + chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') + }, + plugins: [ + // http://vuejs.github.io/vue-loader/en/workflow/production.html + new webpack.DefinePlugin({ + 'process.env': env + }), + new UglifyJsPlugin({ + uglifyOptions: { + compress: { + warnings: false + } + }, + sourceMap: config.build.productionSourceMap, + parallel: true + }), + // extract css into its own file + new ExtractTextPlugin({ + filename: utils.assetsPath('css/[name].[contenthash].css'), + // Setting the following option to `false` will not extract CSS from codesplit chunks. + // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. + // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, + // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 + allChunks: true, + }), + // Compress extracted CSS. We are using this plugin so that possible + // duplicated CSS from different components can be deduped. + new OptimizeCSSPlugin({ + cssProcessorOptions: config.build.productionSourceMap + ? { safe: true, map: { inline: false } } + : { safe: true } + }), + // generate dist index.html with correct asset hash for caching. + // you can customize output by editing /index.html + // see https://github.com/ampedandwired/html-webpack-plugin + new HtmlWebpackPlugin({ + filename: process.env.NODE_ENV === 'testing' + ? 'index.html' + : config.build.index, + template: 'index.html', + inject: true, + minify: { + removeComments: true, + collapseWhitespace: true, + removeAttributeQuotes: true + // more options: + // https://github.com/kangax/html-minifier#options-quick-reference + }, + // necessary to consistently work with multiple chunks via CommonsChunkPlugin + chunksSortMode: 'dependency' + }), + // keep module.id stable when vender modules does not change + new webpack.HashedModuleIdsPlugin(), + // enable scope hoisting + new webpack.optimize.ModuleConcatenationPlugin(), + // split vendor js into its own file + new webpack.optimize.CommonsChunkPlugin({ + name: 'vendor', + minChunks (module) { + // any required modules inside node_modules are extracted to vendor + return ( + module.resource && + /\.js$/.test(module.resource) && + module.resource.indexOf( + path.join(__dirname, '../node_modules') + ) === 0 + ) + } + }), + // extract webpack runtime and module manifest to its own file in order to + // prevent vendor hash from being updated whenever app bundle is updated + new webpack.optimize.CommonsChunkPlugin({ + name: 'manifest', + minChunks: Infinity + }), + // This instance extracts shared chunks from code splitted chunks and bundles them + // in a separate chunk, similar to the vendor chunk + // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk + new webpack.optimize.CommonsChunkPlugin({ + name: 'app', + async: 'vendor-async', + children: true, + minChunks: 3 + }), + + // copy custom static assets + new CopyWebpackPlugin([ + { + from: path.resolve(__dirname, '../static'), + to: config.build.assetsSubDirectory, + ignore: ['.*'] + } + ]) + ] +}) + +if (config.build.productionGzip) { + const CompressionWebpackPlugin = require('compression-webpack-plugin') + + webpackConfig.plugins.push( + new CompressionWebpackPlugin({ + asset: '[path].gz[query]', + algorithm: 'gzip', + test: new RegExp( + '\\.(' + + config.build.productionGzipExtensions.join('|') + + ')$' + ), + threshold: 10240, + minRatio: 0.8 + }) + ) +} + +if (config.build.bundleAnalyzerReport) { + const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin + webpackConfig.plugins.push(new BundleAnalyzerPlugin()) +} + +module.exports = webpackConfig diff --git a/ms/web-system-management/config/dev.env.js b/ms-web/config/dev.env.js similarity index 100% rename from ms/web-system-management/config/dev.env.js rename to ms-web/config/dev.env.js diff --git a/ms/web-system-management/config/index.js b/ms-web/config/index.js similarity index 96% rename from ms/web-system-management/config/index.js rename to ms-web/config/index.js index cb24cb8..924e1fa 100644 --- a/ms/web-system-management/config/index.js +++ b/ms-web/config/index.js @@ -1,5 +1,5 @@ 'use strict' -// Template version: 1.2.3 +// Template version: 1.2.7 // see http://vuejs-templates.github.io/webpack for documentation. const path = require('path') @@ -14,7 +14,7 @@ module.exports = { // Various Dev Server settings host: 'localhost', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.HOST, if port is in use, a free one will be determined + port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, @@ -47,7 +47,7 @@ module.exports = { // just be aware of this issue when enabling this option. cssSourceMap: false, }, - + build: { // Template for index.html index: path.resolve(__dirname, '../dist/index.html'), @@ -64,14 +64,14 @@ module.exports = { productionSourceMap: true, // https://webpack.js.org/configuration/devtool/#production devtool: '#source-map', - + // Gzip off by default as many popular static hosts such as // Surge or Netlify already gzip all static assets for you. // Before setting to `true`, make sure to: // npm install --save-dev compression-webpack-plugin productionGzip: false, productionGzipExtensions: ['js', 'css'], - + // Run the build command with an extra argument to // View the bundle analyzer report after build finishes: // `npm run build --report` diff --git a/ms/web-system-management/config/prod.env.js b/ms-web/config/prod.env.js similarity index 100% rename from ms/web-system-management/config/prod.env.js rename to ms-web/config/prod.env.js diff --git a/ms/web-system-management/config/test.env.js b/ms-web/config/test.env.js similarity index 100% rename from ms/web-system-management/config/test.env.js rename to ms-web/config/test.env.js diff --git a/ms/web-system-management/index.html b/ms-web/index.html similarity index 86% rename from ms/web-system-management/index.html rename to ms-web/index.html index 20f1d2b..1945198 100644 --- a/ms/web-system-management/index.html +++ b/ms-web/index.html @@ -3,7 +3,7 @@ - system-management + ms-web
diff --git a/ms/web-system-management/package.json b/ms-web/package.json similarity index 74% rename from ms/web-system-management/package.json rename to ms-web/package.json index c80e446..c4a0c0d 100644 --- a/ms/web-system-management/package.json +++ b/ms-web/package.json @@ -1,20 +1,19 @@ { - "name": "system-management", + "name": "ms-web", "version": "1.0.0", "description": "A Vue.js project", - "author": "lsy <18332763730@163.com>", + "author": "winLsy <18332763730@163.com>", "private": true, "scripts": { "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "start": "npm run dev", - "unit": "jest test/unit/specs --coverage", + "unit": "jest --config test/unit/jest.conf.js --coverage", "e2e": "node test/e2e/runner.js", "test": "npm run unit && npm run e2e", "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs", "build": "node build/build.js" }, "dependencies": { - "element-ui": "^2.0.5", "vue": "^2.5.2", "vue-router": "^3.0.1" }, @@ -22,78 +21,59 @@ "autoprefixer": "^7.1.2", "babel-core": "^6.22.1", "babel-eslint": "^7.1.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", "babel-preset-env": "^1.3.2", "babel-preset-stage-2": "^6.22.0", "babel-register": "^6.22.0", "chalk": "^2.0.1", + "chromedriver": "^2.27.2", "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", "css-loader": "^0.28.0", "eslint": "^3.19.0", + "eslint-config-standard": "^10.2.1", "eslint-friendly-formatter": "^3.0.0", "eslint-loader": "^1.7.1", "eslint-plugin-html": "^3.0.0", - "eslint-config-standard": "^10.2.1", - "eslint-plugin-promise": "^3.4.0", - "eslint-plugin-standard": "^3.0.1", "eslint-plugin-import": "^2.7.0", "eslint-plugin-node": "^5.2.0", - "eventsource-polyfill": "^0.9.6", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", "extract-text-webpack-plugin": "^3.0.0", "file-loader": "^1.1.4", "friendly-errors-webpack-plugin": "^1.6.1", "html-webpack-plugin": "^2.30.1", - "webpack-bundle-analyzer": "^2.9.0", - "babel-jest": "^21.0.2", "jest": "^21.2.0", - "vue-jest": "^1.0.2", - "node-notifier": "^5.1.2", - "chromedriver": "^2.27.2", - "cross-spawn": "^5.0.1", + "jest-serializer-vue": "^0.3.0", "nightwatch": "^0.9.12", - "selenium-server": "^3.0.1", - "postcss-import": "^11.0.0", - "postcss-loader": "^2.0.8", - "semver": "^5.3.0", - "shelljs": "^0.7.6", + "node-notifier": "^5.1.2", "optimize-css-assets-webpack-plugin": "^3.2.0", "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", "rimraf": "^2.6.0", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", "vue-loader": "^13.3.0", "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.5.2", - "portfinder": "^1.0.13", "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", "webpack-dev-server": "^2.9.1", "webpack-merge": "^4.1.0" }, - "jest": { - "moduleFileExtensions": [ - "js", - "json", - "vue" - ], - "moduleNameMapper": { - "^@/(.*)$": "/src/$1" - }, - "transform": { - "^.+\\.js$": "/node_modules/babel-jest", - ".*\\.(vue)$": "/node_modules/vue-jest" - }, - "setupFiles": [ - "/test/unit/setup" - ], - "mapCoverage": true, - "coverageDirectory": "/test/unit/coverage", - "collectCoverageFrom": [ - "src/**/*.{js,vue}", - "!src/main.js", - "!src/router/index.js", - "!**/node_modules/**" - ] - }, "engines": { "node": ">= 4.0.0", "npm": ">= 3.0.0" diff --git a/ms/web-system-management/src/App.vue b/ms-web/src/App.vue similarity index 100% rename from ms/web-system-management/src/App.vue rename to ms-web/src/App.vue diff --git a/ms-web/src/assets/logo.png b/ms-web/src/assets/logo.png new file mode 100644 index 0000000..f3d2503 Binary files /dev/null and b/ms-web/src/assets/logo.png differ diff --git a/ms/web-system-management/src/components/HelloWorld.vue b/ms-web/src/components/HelloWorld.vue similarity index 99% rename from ms/web-system-management/src/components/HelloWorld.vue rename to ms-web/src/components/HelloWorld.vue index 617be4f..7c17dd6 100644 --- a/ms/web-system-management/src/components/HelloWorld.vue +++ b/ms-web/src/components/HelloWorld.vue @@ -48,4 +48,3 @@ a { color: #42b983; } - diff --git a/ms/web-system-management/src/main.js b/ms-web/src/main.js similarity index 100% rename from ms/web-system-management/src/main.js rename to ms-web/src/main.js diff --git a/ms/web-system-management/src/router/index.js b/ms-web/src/router/index.js similarity index 100% rename from ms/web-system-management/src/router/index.js rename to ms-web/src/router/index.js diff --git a/ms/web-system-management/static/.gitkeep b/ms-web/static/.gitkeep similarity index 100% rename from ms/web-system-management/static/.gitkeep rename to ms-web/static/.gitkeep diff --git a/ms/web-system-management/test/e2e/custom-assertions/elementCount.js b/ms-web/test/e2e/custom-assertions/elementCount.js similarity index 84% rename from ms/web-system-management/test/e2e/custom-assertions/elementCount.js rename to ms-web/test/e2e/custom-assertions/elementCount.js index c0d5fe0..818e602 100644 --- a/ms/web-system-management/test/e2e/custom-assertions/elementCount.js +++ b/ms-web/test/e2e/custom-assertions/elementCount.js @@ -1,11 +1,12 @@ // A custom Nightwatch assertion. -// the name of the method is the filename. -// can be used in tests like this: +// The assertion name is the filename. +// Example usage: // // browser.assert.elementCount(selector, count) // -// for how to write custom assertions see +// For more information on custom assertions see: // http://nightwatchjs.org/guide#writing-custom-assertions + exports.assertion = function (selector, count) { this.message = 'Testing if element <' + selector + '> has count: ' + count this.expected = count diff --git a/ms/web-system-management/test/e2e/nightwatch.conf.js b/ms-web/test/e2e/nightwatch.conf.js similarity index 100% rename from ms/web-system-management/test/e2e/nightwatch.conf.js rename to ms-web/test/e2e/nightwatch.conf.js diff --git a/ms/web-system-management/test/e2e/runner.js b/ms-web/test/e2e/runner.js similarity index 100% rename from ms/web-system-management/test/e2e/runner.js rename to ms-web/test/e2e/runner.js diff --git a/ms/web-system-management/test/e2e/specs/test.js b/ms-web/test/e2e/specs/test.js similarity index 100% rename from ms/web-system-management/test/e2e/specs/test.js rename to ms-web/test/e2e/specs/test.js diff --git a/ms/web-system-management/test/unit/.eslintrc b/ms-web/test/unit/.eslintrc similarity index 100% rename from ms/web-system-management/test/unit/.eslintrc rename to ms-web/test/unit/.eslintrc diff --git a/ms-web/test/unit/jest.conf.js b/ms-web/test/unit/jest.conf.js new file mode 100644 index 0000000..4f7da15 --- /dev/null +++ b/ms-web/test/unit/jest.conf.js @@ -0,0 +1,30 @@ +const path = require('path') + +module.exports = { + rootDir: path.resolve(__dirname, '../../'), + moduleFileExtensions: [ + 'js', + 'json', + 'vue' + ], + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + transform: { + '^.+\\.js$': '/node_modules/babel-jest', + '.*\\.(vue)$': '/node_modules/vue-jest' + }, + testPathIgnorePatterns: [ + '/test/e2e' + ], + snapshotSerializers: ['/node_modules/jest-serializer-vue'], + setupFiles: ['/test/unit/setup'], + mapCoverage: true, + coverageDirectory: '/test/unit/coverage', + collectCoverageFrom: [ + 'src/**/*.{js,vue}', + '!src/main.js', + '!src/router/index.js', + '!**/node_modules/**' + ] +} diff --git a/ms/web-system-management/test/unit/setup.js b/ms-web/test/unit/setup.js similarity index 100% rename from ms/web-system-management/test/unit/setup.js rename to ms-web/test/unit/setup.js diff --git a/ms/web-system-management/test/unit/specs/HelloWorld.spec.js b/ms-web/test/unit/specs/HelloWorld.spec.js similarity index 100% rename from ms/web-system-management/test/unit/specs/HelloWorld.spec.js rename to ms-web/test/unit/specs/HelloWorld.spec.js diff --git a/ms/cms/docker-run-cms.sh b/ms/cms/docker-run-cms.sh index 0ee683e..5414d2a 100755 --- a/ms/cms/docker-run-cms.sh +++ b/ms/cms/docker-run-cms.sh @@ -4,4 +4,7 @@ docker run -d -p 10012:10012 -p 10013:10013 registry.cn-hangzhou.aliyuncs.com/l -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka/,http://micro:fast@172.17.0.1:10004/eureka/ \ -Deureka.instance.prefer-ip-address=true \ -Deureka.instance.ip-address=172.17.0.1 \ + -Dspring.cloud.config.profile=deploy \ /workhome/app.jar + + diff --git a/ms/gateway/docker-run-gateway.sh b/ms/gateway/docker-run-gateway.sh index 48fc7d5..2752d54 100755 --- a/ms/gateway/docker-run-gateway.sh +++ b/ms/gateway/docker-run-gateway.sh @@ -4,4 +4,5 @@ docker run -d -p 10006:10006 -p 10007:10007 registry.cn-hangzhou.aliyuncs.com/ -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka/,http://micro:fast@172.17.0.1:10004/eureka/ \ -Deureka.instance.prefer-ip-address=true \ -Deureka.instance.ip-address=172.17.0.1 \ + -Dspring.cloud.config.profile=deploy \ /workhome/app.jar \ No newline at end of file diff --git a/ms/register-center1/docker-run-register-center1.sh b/ms/register-center1/docker-run-register-center1.sh index a5612ae..903854f 100755 --- a/ms/register-center1/docker-run-register-center1.sh +++ b/ms/register-center1/docker-run-register-center1.sh @@ -5,4 +5,5 @@ docker run -d -p 10002:10002 -p 10003:10003 registry.cn-hangzhou.aliyuncs.com/ -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10004/eureka \ -Deureka.instance.prefer-ip-address=true \ -Deureka.instance.ip-address=172.17.0.1 \ + -Dspring.cloud.config.profile=deploy \ /workhome/app.jar diff --git a/ms/register-center2/docker-run-register-center2.sh b/ms/register-center2/docker-run-register-center2.sh index b90407f..028bec7 100755 --- a/ms/register-center2/docker-run-register-center2.sh +++ b/ms/register-center2/docker-run-register-center2.sh @@ -5,4 +5,5 @@ docker run -d -p 10004:10004 -p 10005:10005 registry.cn-hangzhou.aliyuncs.com/ -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka \ -Deureka.instance.prefer-ip-address=true \ -Deureka.instance.ip-address=172.17.0.1 \ + -Dspring.cloud.config.profile=deploy \ /workhome/app.jar \ No newline at end of file diff --git a/ms/ucenter/docker-run-ucenter.sh b/ms/ucenter/docker-run-ucenter.sh index 6177447..e58a22a 100755 --- a/ms/ucenter/docker-run-ucenter.sh +++ b/ms/ucenter/docker-run-ucenter.sh @@ -4,4 +4,5 @@ docker run -d -p 10010:10010 -p 10011:10011 registry.cn-hangzhou.aliyuncs.com/ -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka/,http://micro:fast@172.17.0.1:10004/eureka/ \ -Deureka.instance.prefer-ip-address=true \ -Deureka.instance.ip-address=172.17.0.1 \ + -Dspring.cloud.config.profile=deploy \ /workhome/app.jar \ No newline at end of file diff --git a/ms/upms/docker-run-upms.sh b/ms/upms/docker-run-upms.sh index b7deaca..b96fc6f 100755 --- a/ms/upms/docker-run-upms.sh +++ b/ms/upms/docker-run-upms.sh @@ -4,4 +4,5 @@ docker run -d -p 10008:10008 -p 10009:10009 registry.cn-hangzhou.aliyuncs.com/ -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka/,http://micro:fast@172.17.0.1:10004/eureka/ \ -Deureka.instance.prefer-ip-address=true \ -Deureka.instance.ip-address=172.17.0.1 \ + -Dspring.cloud.config.profile=deploy \ /workhome/app.jar diff --git a/ms/web-system-management/.babelrc b/ms/web-system-management/.babelrc deleted file mode 100644 index 7cda411..0000000 --- a/ms/web-system-management/.babelrc +++ /dev/null @@ -1,13 +0,0 @@ -{ - "presets": [ - ["env", { - "modules": false - }], - "stage-2" - ], - "plugins": ["transform-runtime"], - "env": { - "test": { - "presets": ["env", "stage-2"] } - } -}