qmzreact 1.0.13 → 1.0.14

package/conf/config/webpack.prod.conf.js

@@ -1,76 +1,76 @@
-var webpack = require('webpack');
-var path = require('path');
-var { merge } = require('webpack-merge');
-var config = require('./index');
-var MiniCssExtractPlugin = require('mini-css-extract-plugin');
-var CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
-var baseWebpackConfig = require('./webpack.base.conf');
-var TerserPlugin = require('terser-webpack-plugin');
-var splitChunks = require('./chunks');
-var options = require('../options');
-var { utils } = options;
-
-var webpackConfig = merge(baseWebpackConfig, {
-    mode: 'production',
-    output: {
-      publicPath: config.build.assetsPublicPath,
-      path: config.build.assetsRoot,
-      filename: (chunk) => {
-          return utils.assetsPath('js/react-[name].js')
-      },
-      chunkFilename: (chunk) => {
-          return utils.assetsPath('js/react-[name].chunk.[contenthash].js')
-      }
-    },
-    cache: config.build.cachesDllDirectory,
-    // 拆包优化
-    optimization: {
-      minimize: true,
-      minimizer: [
-        new TerserPlugin({
-          terserOptions: {
-            warnings: false,
-            compress: {
-              comparisons: false,
-              drop_console: true,
-              drop_debugger: true,
-            },
-            parse: {},
-            mangle: true,
-            output: {
-              comments: false,
-              ascii_only: true
-            }
-          },
-          parallel: true,
-          extractComments: false
-        }),
-        new CssMinimizerPlugin({
-          parallel: true
-        })
-      ],
-      removeEmptyChunks: true,
-      sideEffects: true,
-      concatenateModules: true,
-      providedExports: true,
-      usedExports: true,
-      splitChunks: splitChunks,
-    },
-    plugins: [
-      // extract css into its own file
-      // vendor_alifd
-      new MiniCssExtractPlugin({
-        ignoreOrder: true,
-        filename: function(module){
-          let name = module && module.chunk && module.chunk.name
-          if (name != 'main') {
-            name = 'vendor'
-          }
-          return utils.assetsPath(`css/react-${name}.css`)
-        },
-        chunkFilename: utils.assetsPath('css/react-[name].chunk.[contenthash].css'),
-      }),
-    ]
-}, options.webpackConfig)
-
-module.exports = webpackConfig
+var webpack = require('webpack');
+var path = require('path');
+var { merge } = require('webpack-merge');
+var config = require('./index');
+var MiniCssExtractPlugin = require('mini-css-extract-plugin');
+var CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
+var baseWebpackConfig = require('./webpack.base.conf');
+var TerserPlugin = require('terser-webpack-plugin');
+var splitChunks = require('./chunks');
+var options = require('../options');
+var { utils } = options;
+
+var webpackConfig = merge(baseWebpackConfig, {
+    mode: 'production',
+    output: {
+      publicPath: config.build.assetsPublicPath,
+      path: config.build.assetsRoot,
+      filename: (chunk) => {
+          return utils.assetsPath('js/react-[name].js')
+      },
+      chunkFilename: (chunk) => {
+          return utils.assetsPath('js/react-[name].chunk.[contenthash].js')
+      }
+    },
+    cache: config.build.cachesDllDirectory,
+    // 拆包优化
+    optimization: {
+      minimize: true,
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            warnings: false,
+            compress: {
+              comparisons: false,
+              drop_console: true,
+              drop_debugger: true,
+            },
+            parse: {},
+            mangle: true,
+            output: {
+              comments: false,
+              ascii_only: true
+            }
+          },
+          parallel: true,
+          extractComments: false
+        }),
+        new CssMinimizerPlugin({
+          parallel: true
+        })
+      ],
+      removeEmptyChunks: true,
+      sideEffects: true,
+      concatenateModules: true,
+      providedExports: true,
+      usedExports: true,
+      splitChunks: splitChunks,
+    },
+    plugins: [
+      // extract css into its own file
+      // vendor_alifd
+      new MiniCssExtractPlugin({
+        ignoreOrder: true,
+        filename: function(module){
+          let name = module && module.chunk && module.chunk.name
+          if (name != 'main') {
+            name = 'vendor'
+          }
+          return utils.assetsPath(`css/react-${name}.css`)
+        },
+        chunkFilename: utils.assetsPath('css/react-[name].chunk.[contenthash].css'),
+      }),
+    ]
+}, options.webpackConfig)
+
+module.exports = webpackConfig

package/conf/dev-client.js

@@ -1,6 +1,6 @@
-var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=false')
-hotClient.subscribe(function (event) {
-    if (event.action === 'reload') {
-        window.location.reload()
-    }
-})
+var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=false')
+hotClient.subscribe(function (event) {
+    if (event.action === 'reload') {
+        window.location.reload()
+    }
+})

package/conf/dev-server.js

@@ -1,97 +1,97 @@
-
-var config = require('./config');
-var path = require('path');
-var express = require('express');
-var https = require('https');
-var fs = require('fs');
-var webpack = require('webpack');
-var opn = require('open');
-var proxyMiddleware = require('http-proxy-middleware');
-var webpackConfig = require('./config/webpack.dev.conf');
-var options = require('./options');
-var { utils, processConfig } = options;
-var port = config.dev.port
-var proxyTable = config.dev.proxyTable
-var app = express()
-var compiler = webpack(webpackConfig)
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-    publicPath: webpackConfig.output.publicPath,
-    stats: {
-        colors: true,
-        chunks: false
-    }
-})
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// // force page reload when html-webpack-plugin template changes
-compiler.hooks.make.tap('compilation', function (compilation) {
-    compilation.hooks.finishModules.tap('html-webpack-plugin-after-emit', function (modules) {
-        hotMiddleware.publish({ action: 'reload' })
-    })
-})
-// print compiler finished info
-compiler.hooks.done.tap('AfterCompiler', function(stats) {
-  setTimeout(() => {
-    console.log('webpack \x1b[1mcompiled \x1B[32mfinished \x1B[37min',new Date().toLocaleString(),'\x1b[0m')
-  }, 1000)
-})
-
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-    var options = proxyTable[context]
-    if (typeof options === 'string') {
-        options = { target: options }
-    }
-    app.use(context, proxyMiddleware.createProxyMiddleware(options))
-})
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-// serve pure static assets
-app.use('/', express.static('./public'))
-app.use('/', function(req, res, next){
-    if (typeof processConfig.nodeMiddleware === 'function') {
-        processConfig.nodeMiddleware(req, res)
-    }
-    // res.cookie('process_env', process.env.NODE_ENV.replace(/\"/g, ""), {
-    //     // domain: '.cainiao.com'
-    // })
-    // res.cookie('WEB_BASE_URL', 'http://' + req.headers.host)
-    next()
-})
-
-var service = null;
-
-if (processConfig.isHttps) {
-    service = https.createServer({
-        key: fs.readFileSync(path.resolve(__dirname, './server.key')),
-        cert: fs.readFileSync(path.resolve(__dirname, './server.cert'))
-      }, app)
-      .listen(port, function (err) {
-        if (err) {
-            console.log(err)
-            return
-        }
-        var uri = 'https://localhost:' + port // 直接显示页面
-        console.log('Listening at ' + uri + '\n')
-        opn(uri)
-      })
-} else {
-    service = app.listen(port, function (err) {
-        if (err) {
-            console.log(err)
-            return
-        }
-        var uri = 'http://localhost:' + port // 直接显示页面
-        console.log('Listening at ' + uri + '\n')
-        opn(uri)
-
-    })
-}
-
-module.exports = service
+
+var config = require('./config');
+var path = require('path');
+var express = require('express');
+var https = require('https');
+var fs = require('fs');
+var webpack = require('webpack');
+var opn = require('open');
+var proxyMiddleware = require('http-proxy-middleware');
+var webpackConfig = require('./config/webpack.dev.conf');
+var options = require('./options');
+var { utils, processConfig } = options;
+var port = config.dev.port
+var proxyTable = config.dev.proxyTable
+var app = express()
+var compiler = webpack(webpackConfig)
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+    publicPath: webpackConfig.output.publicPath,
+    stats: {
+        colors: true,
+        chunks: false
+    }
+})
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// // force page reload when html-webpack-plugin template changes
+compiler.hooks.make.tap('compilation', function (compilation) {
+    compilation.hooks.finishModules.tap('html-webpack-plugin-after-emit', function (modules) {
+        hotMiddleware.publish({ action: 'reload' })
+    })
+})
+// print compiler finished info
+compiler.hooks.done.tap('AfterCompiler', function(stats) {
+  setTimeout(() => {
+    console.log('webpack \x1b[1mcompiled \x1B[32mfinished \x1B[37min',new Date().toLocaleString(),'\x1b[0m')
+  }, 1000)
+})
+
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+    var options = proxyTable[context]
+    if (typeof options === 'string') {
+        options = { target: options }
+    }
+    app.use(context, proxyMiddleware.createProxyMiddleware(options))
+})
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+// serve pure static assets
+app.use('/', express.static('./public'))
+app.use('/', function(req, res, next){
+    if (typeof processConfig.nodeMiddleware === 'function') {
+        processConfig.nodeMiddleware(req, res)
+    }
+    // res.cookie('process_env', process.env.NODE_ENV.replace(/\"/g, ""), {
+    //     // domain: '.cainiao.com'
+    // })
+    // res.cookie('WEB_BASE_URL', 'http://' + req.headers.host)
+    next()
+})
+
+var service = null;
+
+if (processConfig.isHttps) {
+    service = https.createServer({
+        key: fs.readFileSync(path.resolve(__dirname, './server.key')),
+        cert: fs.readFileSync(path.resolve(__dirname, './server.cert'))
+      }, app)
+      .listen(port, function (err) {
+        if (err) {
+            console.log(err)
+            return
+        }
+        var uri = 'https://localhost:' + port // 直接显示页面
+        console.log('Listening at ' + uri + '\n')
+        opn(uri)
+      })
+} else {
+    service = app.listen(port, function (err) {
+        if (err) {
+            console.log(err)
+            return
+        }
+        var uri = 'http://localhost:' + port // 直接显示页面
+        console.log('Listening at ' + uri + '\n')
+        opn(uri)
+
+    })
+}
+
+module.exports = service

package/conf/options.js

@@ -1,45 +1,46 @@
-var utils = require('./utils');
-var userConfig = utils.getUserConfig();
-var { merge } = require('webpack-merge')
-var argvs = process.argv.slice(2);
-var isHttps = argvs.indexOf('--https') > -1;
-var argvPort = argvs.indexOf('--port') > -1 ? argvs[argvs.indexOf('--port') + 1] : null;
-var {
-    watch, port, dll, commonChunks, proxy, eslint, entry,
-    nodeMiddleware, publicPath, buildDir, eslintExclude, alias,
-    cssLoaderOptions, postcssLoaderOptions, sassLoaderOptions, 
-    babelLoaderOptions, cacheBuildDependencies, compileDependencies,
-    sassGlobalStyles,
-    ...webpackConfig
-} = userConfig;
-
-
-exports.utils = utils;
-
-exports.processConfig = {
-    watch: watch || ['./src/components'],
-    port: argvPort || port || 8888,
-    isHttps,
-    dll: dll ? merge({
-        chunks: [],
-        outpath: utils.rootPath('./dll')
-    }, utils.isObj(dll) ? dll : {}) : false,
-    commonChunks: {},
-    proxy: {},
-    eslint: eslint || false,
-    eslintExclude: eslintExclude || [],
-    nodeMiddleware,
-    publicPath: publicPath || '/',
-    outpath: utils.rootPath(buildDir || './build'),
-    entry: Array.isArray(entry) ? entry : entry ? [entry] : [],
-    alias: utils.isObj(alias) ? alias : {},
-    cssLoaderOptions: utils.isObj(cssLoaderOptions) ? cssLoaderOptions : {},
-    postcssLoaderOptions: utils.isObj(postcssLoaderOptions) ? postcssLoaderOptions : {},
-    sassLoaderOptions: utils.isObj(sassLoaderOptions) ? sassLoaderOptions : {},
-    babelLoaderOptions: utils.isObj(babelLoaderOptions) ? babelLoaderOptions : {},
-    cacheBuildDependencies: Array.isArray(cacheBuildDependencies) ? cacheBuildDependencies : [],
-    compileDependencies: Array.isArray(compileDependencies) ? compileDependencies : [],
-    sassGlobalStyles: Array.isArray(sassGlobalStyles) ? sassGlobalStyles : [],
-};
-
-exports.webpackConfig = merge({}, webpackConfig);
+var utils = require('./utils');
+var userConfig = utils.getUserConfig();
+var { merge } = require('webpack-merge')
+var argvs = process.argv.slice(2);
+var isHttps = argvs.indexOf('--https') > -1;
+var argvPort = argvs.indexOf('--port') > -1 ? argvs[argvs.indexOf('--port') + 1] : null;
+var {
+    watch, port, dll, commonChunks, proxy, eslint, entry,
+    nodeMiddleware, publicPath, buildDir, eslintExclude, alias,
+    cssLoaderOptions, postcssLoaderOptions, sassLoaderOptions, 
+    babelLoaderOptions, cacheBuildDependencies, compileDependencies,
+    sassGlobalStyles, compileDir,
+    ...webpackConfig
+} = userConfig;
+
+
+exports.utils = utils;
+
+exports.processConfig = {
+    compileDir: typeof compileDir === 'string' ? compileDir : 'src',
+    watch: Array.isArray(watch) ? watch : watch ? [watch] : [],
+    port: argvPort || port || 8888,
+    isHttps,
+    dll: dll ? merge({
+        chunks: [],
+        outpath: utils.rootPath('./dll')
+    }, utils.isObj(dll) ? dll : {}) : false,
+    commonChunks: {},
+    proxy: {},
+    eslint: eslint || false,
+    eslintExclude: eslintExclude || [],
+    nodeMiddleware,
+    publicPath: publicPath || '/',
+    outpath: utils.rootPath(buildDir || './build'),
+    entry: Array.isArray(entry) ? entry : entry ? [entry] : [],
+    alias: utils.isObj(alias) ? alias : {},
+    cssLoaderOptions: utils.isObj(cssLoaderOptions) ? cssLoaderOptions : {},
+    postcssLoaderOptions: utils.isObj(postcssLoaderOptions) ? postcssLoaderOptions : {},
+    sassLoaderOptions: utils.isObj(sassLoaderOptions) ? sassLoaderOptions : {},
+    babelLoaderOptions: utils.isObj(babelLoaderOptions) ? babelLoaderOptions : {},
+    cacheBuildDependencies: Array.isArray(cacheBuildDependencies) ? cacheBuildDependencies : [],
+    compileDependencies: Array.isArray(compileDependencies) ? compileDependencies : [],
+    sassGlobalStyles: Array.isArray(sassGlobalStyles) ? sassGlobalStyles : [],
+};
+
+exports.webpackConfig = merge({}, webpackConfig);

package/conf/server.cert

@@ -1,21 +1,21 @@
------BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUTHw4Uz7kMRvM2rEe0ZL0skDtjBYwDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTEyMDkwOTAyNDBaFw0yMjAx
-MDgwOTAyNDBaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
-HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDtwFyJkh8oRY+T04wieMQjwYiEW5IvrUraJZ+UfduR
-g+8yYlJM1EeVrkAf2+TNE1YMH00LzeayZvT6qcY+UrsJw+aip6IiKvs/WiEFktNM
-7VoQw7WRhbAq+qaFFwN7NoGt1Z4zS3IhrhVekvM8UR+zxw9bUlTcuqmphKD1g3Jq
-DV3hIyJz7I2BlIlzUVqHkILmmPhtPAOhYSio0pO+sOmPH8WeZZBzbdWGSvb3q0M0
-0eD1E1hgQInBoAeC3RGaOiEPhnBLVt0VIehU737Vyt/HohY37gTNJNKFmxn90Tg+
-sQMyPIWs6QuM8nmCF1IYtR0qcbQ8oQ2Y2RAppy5OFXqDAgMBAAGjUzBRMB0GA1Ud
-DgQWBBRI0jF3+AAdgnYk0e7K8XJRBm+XyzAfBgNVHSMEGDAWgBRI0jF3+AAdgnYk
-0e7K8XJRBm+XyzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAj
-guhXweD46v2XmkuYKxOFnBliY64MfJ8jYXVZN9eZJcgNw5j2Ap21eBXosOHF+9m9
-qlFCQEw1Lb6GQTGDFP3xQQhZYQ5jODjEwYHz8HCn0bPVXhNhxEyE/Y7liedii2Dw
-Avzm4dAqY99mdzS/ECcfmy9mdPZ2SK3kCh9Zis2xAN93K/r7jI/qx97PR5U/jwo8
-Ytqw7jGdtq9qF6pBKXHFNt8ZaB9DtMPjsAd4+uNtXu7YjgufND07BQ2ZCYRwcHTZ
-7G9NoRwUw6nbS92Ub3fQIAm8T7QBviY+ciAZxfPmXLOS9IXXN+W7bcnBEuW6FZMw
-l1lnvvkKpovYRTCmNf3k
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIUTHw4Uz7kMRvM2rEe0ZL0skDtjBYwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTEyMDkwOTAyNDBaFw0yMjAx
+MDgwOTAyNDBaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDtwFyJkh8oRY+T04wieMQjwYiEW5IvrUraJZ+UfduR
+g+8yYlJM1EeVrkAf2+TNE1YMH00LzeayZvT6qcY+UrsJw+aip6IiKvs/WiEFktNM
+7VoQw7WRhbAq+qaFFwN7NoGt1Z4zS3IhrhVekvM8UR+zxw9bUlTcuqmphKD1g3Jq
+DV3hIyJz7I2BlIlzUVqHkILmmPhtPAOhYSio0pO+sOmPH8WeZZBzbdWGSvb3q0M0
+0eD1E1hgQInBoAeC3RGaOiEPhnBLVt0VIehU737Vyt/HohY37gTNJNKFmxn90Tg+
+sQMyPIWs6QuM8nmCF1IYtR0qcbQ8oQ2Y2RAppy5OFXqDAgMBAAGjUzBRMB0GA1Ud
+DgQWBBRI0jF3+AAdgnYk0e7K8XJRBm+XyzAfBgNVHSMEGDAWgBRI0jF3+AAdgnYk
+0e7K8XJRBm+XyzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAj
+guhXweD46v2XmkuYKxOFnBliY64MfJ8jYXVZN9eZJcgNw5j2Ap21eBXosOHF+9m9
+qlFCQEw1Lb6GQTGDFP3xQQhZYQ5jODjEwYHz8HCn0bPVXhNhxEyE/Y7liedii2Dw
+Avzm4dAqY99mdzS/ECcfmy9mdPZ2SK3kCh9Zis2xAN93K/r7jI/qx97PR5U/jwo8
+Ytqw7jGdtq9qF6pBKXHFNt8ZaB9DtMPjsAd4+uNtXu7YjgufND07BQ2ZCYRwcHTZ
+7G9NoRwUw6nbS92Ub3fQIAm8T7QBviY+ciAZxfPmXLOS9IXXN+W7bcnBEuW6FZMw
+l1lnvvkKpovYRTCmNf3k
+-----END CERTIFICATE-----

package/conf/server.key

@@ -1,28 +1,28 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDtwFyJkh8oRY+T
-04wieMQjwYiEW5IvrUraJZ+UfduRg+8yYlJM1EeVrkAf2+TNE1YMH00LzeayZvT6
-qcY+UrsJw+aip6IiKvs/WiEFktNM7VoQw7WRhbAq+qaFFwN7NoGt1Z4zS3IhrhVe
-kvM8UR+zxw9bUlTcuqmphKD1g3JqDV3hIyJz7I2BlIlzUVqHkILmmPhtPAOhYSio
-0pO+sOmPH8WeZZBzbdWGSvb3q0M00eD1E1hgQInBoAeC3RGaOiEPhnBLVt0VIehU
-737Vyt/HohY37gTNJNKFmxn90Tg+sQMyPIWs6QuM8nmCF1IYtR0qcbQ8oQ2Y2RAp
-py5OFXqDAgMBAAECggEBAN0j1W7oiS6ONRQM6wWNSvLvKqnh+sF58GukHyChSD+7
-dhtpNJ/du4/P+jkn8VOGrryryKA4LmK2PRuCGrERhoN4wed9AOPDEttEW/6xKPUe
-uG1rfFEVBl2TspuMYmKSumAUmAeiH1CQebPz/2aVFmXDu9b3Z5O/09unT4fNcfiN
-F1OP0pzFyDKK8F7cq9B5Oh8C2QqGIQ0ur6oF9Ma5GYpGhmdM3FmncdoXA/haAhPt
-C1zw2suMBy86cZqHRcG8OsAWsj572wHjGBm3bZmmCGHKeBdkgV3yvX3OEOx7YLvI
-hRB5ATHT+kvqsBzpO+W+U7EvpKREwA7FnNUAGBcpBUECgYEA+Q7in4sETxdPip5t
-WU8Lrj5ICJyivOxMA0fS9dswCKgrSE4wcfcAFqy14vWCtCBnqxr7UQpWa18Gl6vX
-7/3qjGxSNx+rH/d05qUbenkbYHbWMr3JGavc0qslOeo+CdczIYd4ni7lh0EWuXfB
-O8qvAtkr1V4eFJc1lzDdbrWAA/MCgYEA9GDMgCKzW7OsiYmJbLe4hFwhkJ7jH7zi
-9ynTWXc6wrwaFwljaJ+00D0AFYO5mE1oRetyHIiXjR2CRtbXCP8i3pdje/+OxZ30
-7eDH5lsB2gLdZsY/QVidaduSLXkYWIv0tc9+qZYhosk0TZX3vl6CtSrqnRytRRJh
-Ldrf4lrrozECgYBdYFpRDLLZ4Fh/FTTUJhGwC0PAjtFo2YMKO9R5Put8Y2iO3FnH
-cJ7E4Y30AK43UGrtuNj+okySRvdWyCPWo7FbYoVUi3gCLSnUC5UIzv0XppZaQdNy
-33+UMHxtgUgvMlLGQF9VlymREzMs6Bw3iZ8iB0Aq5/WJLMP34mcyybOsRwKBgQCK
-51Z14sN19Tu19ZJCVG8x9LgzXsyUZqXPfVufd7DTrV1bCMATYOvCjVm14OimVCFX
-1MtIwq75y/MX1tflSjgEs6IdghYh53WnnGOjYMk9pPE5kKe1uevHlsGQzUr0UaDn
-kqhZNnep8pmjHAH0l/3NgjZW1Uz7fMX17XniTHGxkQKBgHxeyUPOuRxhZ/7rBsrH
-4jpEkd9FGrimMpR5rd5lSlpBw1jmBo02GHaH2NiCRXhWBvDSjoPpK5ph6kLriUy9
-eRLn+sqxwDDGicUj1J2rXpxzcuiP4qaBjCRvvQq7zSE2ous1veztr+SfMdjFZEPK
-MAiS9spPHk2h/zbO4PVCdFrH
------END PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDtwFyJkh8oRY+T
+04wieMQjwYiEW5IvrUraJZ+UfduRg+8yYlJM1EeVrkAf2+TNE1YMH00LzeayZvT6
+qcY+UrsJw+aip6IiKvs/WiEFktNM7VoQw7WRhbAq+qaFFwN7NoGt1Z4zS3IhrhVe
+kvM8UR+zxw9bUlTcuqmphKD1g3JqDV3hIyJz7I2BlIlzUVqHkILmmPhtPAOhYSio
+0pO+sOmPH8WeZZBzbdWGSvb3q0M00eD1E1hgQInBoAeC3RGaOiEPhnBLVt0VIehU
+737Vyt/HohY37gTNJNKFmxn90Tg+sQMyPIWs6QuM8nmCF1IYtR0qcbQ8oQ2Y2RAp
+py5OFXqDAgMBAAECggEBAN0j1W7oiS6ONRQM6wWNSvLvKqnh+sF58GukHyChSD+7
+dhtpNJ/du4/P+jkn8VOGrryryKA4LmK2PRuCGrERhoN4wed9AOPDEttEW/6xKPUe
+uG1rfFEVBl2TspuMYmKSumAUmAeiH1CQebPz/2aVFmXDu9b3Z5O/09unT4fNcfiN
+F1OP0pzFyDKK8F7cq9B5Oh8C2QqGIQ0ur6oF9Ma5GYpGhmdM3FmncdoXA/haAhPt
+C1zw2suMBy86cZqHRcG8OsAWsj572wHjGBm3bZmmCGHKeBdkgV3yvX3OEOx7YLvI
+hRB5ATHT+kvqsBzpO+W+U7EvpKREwA7FnNUAGBcpBUECgYEA+Q7in4sETxdPip5t
+WU8Lrj5ICJyivOxMA0fS9dswCKgrSE4wcfcAFqy14vWCtCBnqxr7UQpWa18Gl6vX
+7/3qjGxSNx+rH/d05qUbenkbYHbWMr3JGavc0qslOeo+CdczIYd4ni7lh0EWuXfB
+O8qvAtkr1V4eFJc1lzDdbrWAA/MCgYEA9GDMgCKzW7OsiYmJbLe4hFwhkJ7jH7zi
+9ynTWXc6wrwaFwljaJ+00D0AFYO5mE1oRetyHIiXjR2CRtbXCP8i3pdje/+OxZ30
+7eDH5lsB2gLdZsY/QVidaduSLXkYWIv0tc9+qZYhosk0TZX3vl6CtSrqnRytRRJh
+Ldrf4lrrozECgYBdYFpRDLLZ4Fh/FTTUJhGwC0PAjtFo2YMKO9R5Put8Y2iO3FnH
+cJ7E4Y30AK43UGrtuNj+okySRvdWyCPWo7FbYoVUi3gCLSnUC5UIzv0XppZaQdNy
+33+UMHxtgUgvMlLGQF9VlymREzMs6Bw3iZ8iB0Aq5/WJLMP34mcyybOsRwKBgQCK
+51Z14sN19Tu19ZJCVG8x9LgzXsyUZqXPfVufd7DTrV1bCMATYOvCjVm14OimVCFX
+1MtIwq75y/MX1tflSjgEs6IdghYh53WnnGOjYMk9pPE5kKe1uevHlsGQzUr0UaDn
+kqhZNnep8pmjHAH0l/3NgjZW1Uz7fMX17XniTHGxkQKBgHxeyUPOuRxhZ/7rBsrH
+4jpEkd9FGrimMpR5rd5lSlpBw1jmBo02GHaH2NiCRXhWBvDSjoPpK5ph6kLriUy9
+eRLn+sqxwDDGicUj1J2rXpxzcuiP4qaBjCRvvQq7zSE2ous1veztr+SfMdjFZEPK
+MAiS9spPHk2h/zbO4PVCdFrH
+-----END PRIVATE KEY-----