safecheck-client 3.0.31-gongyi → 3.0.32-10

package/.eslintrc.js

@@ -1,16 +1,16 @@
-module.exports = {
-  root: true,
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  // required to lint *.vue files
-  plugins: [
-    'eslint-plugin-html'
-  ],
-  // add your custom rules here
-  'rules': {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
-}
+// module.exports = {
+//   root: true,
+//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+//   extends: 'standard',
+//   // required to lint *.vue files
+//   plugins: [
+//     'eslint-plugin-html'
+//   ],
+//   // add your custom rules here
+//   'rules': {
+//     // allow paren-less arrow functions
+//     'arrow-parens': 0,
+//     // allow debugger during development
+//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+//   }
+// }

package/.project

@@ -5,7 +5,30 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1670813929598</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

package/README.md

@@ -36,4 +36,8 @@
 3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
 4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
 5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+# 新启动方式
+mac/linux版本： SAFE_CHECK=weinan npm run dev
+win版本：set SAFE_CHECK=tongchuan && npm run dev

package/build/webpack.base.conf.js

@@ -1,88 +1,129 @@
 var path = require('path')
-var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const webpack = require('webpack');
 
 module.exports = {
   entry: {
-    app: './src/main.js',
-    'android-app': './src/android.js'
+    app: './src/main.js'
   },
   output: {
-    path: path.resolve(__dirname, '../dist/safecheck'),
-    publicPath: 'safecheck/',
+    path: path.resolve(__dirname, '../dist/static'),
+    publicPath: 'static/',
     filename: '[name].js'
   },
   resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'src': path.resolve(__dirname, '../src'),
-      'vue-strap': path.resolve(__dirname, '../node_modules/vue-client/src/vue-strap')
-    }
+    extensions: ['.js', '.vue'],
+    modules: [
+      path.resolve(__dirname, 'src'),
+      'node_modules'
+    ]
   },
   resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  externals: {
-    'AMap': 'AMap'
+    modules: [
+      path.join(__dirname, 'loaders'),
+      'node_modules'
+    ]
   },
   module: {
     loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            // 将所有的样式提取到一个文件中，而不是将其注入到JavaScript文件中
+            // 注意，这里提取样式的loader也需要使用ExtractTextPlugin.loader
+            css: ExtractTextPlugin.extract({
+              use: 'css-loader',
+              fallback: 'vue-style-loader'
+            }),
+            less: ExtractTextPlugin.extract({
+              use: ['css-loader', 'less-loader'],
+              fallback: 'vue-style-loader'
+            }),
+            stylus: ExtractTextPlugin.extract({
+              use: ['css-loader', 'stylus-loader'],
+              fallback: 'vue-style-loader'
+            }),
+            sass: ExtractTextPlugin.extract({
+              use: ['css-loader', 'sass-loader'],
+              fallback: 'vue-style-loader'
+            })
+          }
+        }
       },
       {
         test: /\.js$/,
-        loader: 'babel',
+        loader: 'babel-loader',
         include: [
-          `${projectRoot}\\src`,
-          `${projectRoot}\\build`,
-          `${projectRoot}\\examples`,
-          `${projectRoot}\\test`,
-          `${projectRoot}\\node_modules\\vue-client\\src`,
-          `${projectRoot}\\node_modules\\vue-strap\\src`,
-          `${projectRoot}\\node_modules\\telephone-clients\\src`,
-          `${projectRoot}\\node_modules\\system-clients\\src`,
-          `${projectRoot}\\node_modules\\system-phone\\src`,
-          `${projectRoot}\\node_modules\\ol`
+          /src/,
+          /build/,
+          /examples/,
+          /singlepage/,
+          /test/,
+          /node_modules\/vue-client\/src/,
+          /node_modules\/vue-strap\/src/,
+          /node_modules\/system-clients\/src/,
+          /node_modules\/ldap-clients\/src/,
+          /node_modules\/sale-client\/src/,
+          /node_modules\/manage-client\/src/,
+          /node_modules\/address-client\/src/,
+          /node_modules\/apply-clients\/src/,
+          /node_modules\/telephone-clients\/src/,
+          /node_modules\/safecheck-client\/src/,
+          /node_modules\/webmeter-client\/src/,
+          /node_modules\/material-client\/src/,
+          /node_modules\/weixin-manage-client-wsd\/src/,
+          /node_modules\/annunciator-client\/src/
         ]
       },
       {
-        test: /\.json$/,
-        loader: 'json'
+        test: /\.html$/,
+        loader: 'vue-html-loader'
       },
       {
-        test: /\.html$/,
-        loader: 'vue-html'
+        test: /\.css$/,
+        loader: ExtractTextPlugin.extract({
+          use: 'css-loader',
+          fallback: 'vue-style-loader'
+        })
       },
       {
         test: /\.less$/,
-        loader: 'style!css!less'
+        loader: ExtractTextPlugin.extract({
+          use: ['css-loader', 'less-loader'],
+          fallback: 'vue-style-loader'
+        })
+      },
+      {
+        test: /\.stylus$/,
+        loader: ExtractTextPlugin.extract({
+          use: ['css-loader', 'stylus-loader'],
+          fallback: 'vue-style-loader'
+        })
+      },
+      {
+        test: /\.sass$/,
+        loader: ExtractTextPlugin.extract({
+          use: ['css-loader', 'sass-loader'],
+          fallback: 'vue-style-loader'
+        })
       },
       {
         test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
+        loader: 'url-loader',
         query: {
           limit: 10000,
-          name: '[name].[ext]?[hash:7]'
-        }
-      },
-      {
-        test: /\.css$/,
-        loader: 'style!css'
+          name: 'static/[name].[ext]?[hash:7]'
         }
+      }
     ]
   },
-
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': {
+        'SAFE_CHECK': JSON.stringify(process.env.SAFE_CHECK)
+      }
     })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
+  ]
 }

package/build/webpack.dev.conf.js

@@ -2,39 +2,43 @@ var webpack = require('webpack')
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.base.conf')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 // add hot-reload related code to entry chunks
-Object.keys(baseConfig.entry).forEach(function (name) {
-  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
-})
+// Object.keys(baseConfig.entry).forEach(function (name) {
+//   baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+// })
 
 module.exports = merge(baseConfig, {
   // eval-source-map is faster for development
-  devtool: '#eval-source-map',
+  devtool: 'eval-cheap-module-source-map',
   output: {
     // necessary for the html plugin to work properly
     // when serving the html from in-memory
     publicPath: '/'
   },
+  stats: {
+    // all: false, // 关闭全部日志
+    colors: true, // 配置控制台输出彩色日志
+    // errors: true, // 输出构建错误日志
+    // warnings: true, // 输出构建警告日志
+    // moduleTrace: true, // 显示 module 路径信息
+    // errorDetails: true, // 显示构建错误的详细信息
+    chunks: false, // 不输出构建 chunk 信息
+    // entrypoints: false, // 不输出入口文件信息
+    children: false, // 不输出子模块构建信息
+    // performance: true // 输出性能提示
+  },
   plugins: [
-    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
-    new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin(),
-    // PC端html
+    new webpack.NoEmitOnErrorsPlugin(),
+    new ExtractTextPlugin('[name].css'),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: 'index.html',
       inject: true,
-      chunks: ['app']
-    }),
-    // 安卓模拟页面
-    new HtmlWebpackPlugin({
-      filename: 'android.html',
-      template: 'android.html',
-      inject: true,
-      chunks: ['android-app']
+      date: new Date().getTime()
     })
   ]
 })

package/build/webpack.prod.conf.js

@@ -1,32 +1,18 @@
-var fs = require('fs')
 var webpack = require('webpack')
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.base.conf')
-var cssLoaders = require('./css-loaders')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
-
+const TerserPlugin = require('terser-webpack-plugin-legacy')
+const path = require("path");
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 // whether to generate source map for production files.
 // disabling this can speed up the build.
-var SOURCE_MAP = true
-
-// 把examples下所有index.html转换成测试例子.html
-fs.readdirSync('./examples').forEach((file) => {
-  baseConfig.plugins.push(
-    // https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: file + '.html',
-      template: `examples/${file}/index.html`,
-      inject: false
-    })
-  )
-})
-
-// 把examples下子目录里的main.js打包成对应组件名的App.js
-baseConfig.entry = {}
-fs.readdirSync('./examples').forEach((file) => {
-  baseConfig.entry[file + 'App'] = `./examples/${file}/main.js`
-})
+var SOURCE_MAP = false
+if (process.env.VUE_APP_PAGE === 'true') {
+  console.log('page打包')
+  baseConfig.entry.app = './src/iotMain.js'
+}
 
 module.exports = merge(baseConfig, {
   stats: {
@@ -34,17 +20,12 @@ module.exports = merge(baseConfig, {
   },
   devtool: SOURCE_MAP ? '#source-map' : false,
   output: {
+    path: path.resolve(__dirname, '../dist'),
+    publicPath: './',
     // naming output files with hashes for better caching.
     // dist/index.html will be auto-generated with correct URLs.
-    publicPath: './',
-    filename: '[name].js',
-    chunkFilename: '[id].[chunkhash].js'
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: SOURCE_MAP,
-      extract: true
-    })
+    filename: 'static/[name][chunkhash].js',
+    chunkFilename: 'static/[id].[chunkhash].js'
   },
   plugins: [
     // http://vuejs.github.io/vue-loader/workflow/production.html
@@ -53,19 +34,35 @@ module.exports = merge(baseConfig, {
         NODE_ENV: '"production"'
       }
     }),
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks: Infinity
+    }),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'runtime'
+    }),
+    // new BundleAnalyzerPlugin(),
+    new TerserPlugin({
+      parallel: true,
+      cache: true,
+      terserOptions: {
+        parse: {
+          ecma: 6
+        }, compress: {
+          ecma: 5,
+          warnings: false,
+          comparisons: false,
+          inline: 2
+        }
       }
     }),
-    new webpack.optimize.OccurenceOrderPlugin(),
     // extract css into its own file
     new ExtractTextPlugin('[name].css'),
     // 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: '../index.html',
+    new HtmlWebpackPlugin({
+      filename: './index.html',
       template: 'index.html',
       inject: true,
       minify: {
@@ -74,7 +71,8 @@ module.exports = merge(baseConfig, {
         removeAttributeQuotes: true
         // more options:
         // https://github.com/kangax/html-minifier#options-quick-reference
-      }
-    })*/
+      },
+      date: new Date().getTime()
+    })
   ]
 })

package/examples/ChangeConfig/App.vue

@@ -12,7 +12,7 @@
 
     ready() {
       // if (this.$login) {
-      //   console.log('登录信息', this.$login.f)
+      //   //tag
       //   global.login=this.$login.f
       // }
       // 设置模板为测试,,
@@ -37,9 +37,9 @@
       loadWasm().then(() => {
         global.stat = new Comp()
         global.stat.ready().then(() => {
-          console.log(global.stat)
+          //tag
           run()
-          console.log(global.stat.isSend)
+          //tag
         })
       })
     }