system-phone 3.1.90 → 3.1.91

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Oct 27 14:57:49 CST 2020
-gradle.version=6.1
+#Tue Oct 27 14:57:49 CST 2020
+gradle.version=6.1

package/SystemPhone.iml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="SystemPhone" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="SystemPhone" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/build/dev-server.js

@@ -1,141 +1,101 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var proxyTable = {
-  // '/rs/weixin': {
-  //   target: 'http://121.36.106.17:8400/'
-  // },
-  '/phone/rs/vue': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  // '/materials': {
-  //   target: 'http://121.36.106.17:8400/'
-  //   // target: 'http://192.168.2.77:8081'
-  // },
-  // '/umaterials': {
-  //   // target: 'http://192.168.50.202:8081'
-  //   target: 'http://121.36.106.17:8400/'
-  // },
-  // // 取图片的地址
-  // '/images': {
-  //   target: 'http://121.36.106.17:8400/'
-  //   // target: 'http://192.168.20.249:8081'
-  // },
-  // 'phone/rs/dir2': {
-  //   target: 'http://121.36.106.17:8400/'
-  //   // target: 'http://192.168.20.249:8081'
-  // },
-  // '/excel': {
-  //   // target: 'http://127.0.0.1:8082'
-  //   target: 'http://121.36.106.17:8400/'
-  // },
-  '/rs/sql/getUserByMeter': {
-     // target: 'http://127.0.0.1:8081'
-    target: 'http://121.36.106.17:8400'
-  },
-  '/rs/logic/againOpenAccount': {
-    // target: 'http://127.0.0.1:8081'
-    target: 'http://121.36.106.17:8400'
-  },
-  '/rs/logic/againSendInstruct': {
-    // target: 'http://127.0.0.1:8081'
-    target: 'http://121.36.106.17:8400'
-  },
-  '/rs/logic/cancelSendInstruct': {
-    // target: 'http://127.0.0.1:8081'
-    target: 'http://121.36.106.17:8400'
-  },
-  '/rs/logic/TipConfig': {
-    // target: 'http://127.0.0.1:8081'
-    target: 'http://127.0.0.1:8089'
-  },
-  '/rs/sql/iot_singleTable_OrderBy': {
-    // target: 'http://127.0.0.1:8081'
-    target: 'http://121.36.106.17:8400'
-  },
-  // 呼叫系统主数据服务
-  '/rs': {
-    // target: 'http://127.0.0.1:8082'
-    target: 'http://121.36.106.17:8400'
-  },
-  // 文字客服
-  // '/Dual': {
-  //   'target': 'http://127.0.0.1:8081/RestWork/rs'
-  // },
-  // // 安卓测试转发地址
-  // '/AndroidRest/rs': {
-  //   'target': 'http://192.168.50.199:8300'
-  // }
-}
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({ action: 'reload' })
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = { target: options }
-  }
-  // 改变源实现跨域
-  // options.changeOrigin = true
-  Object.assign(options, {
-    onProxyRes (proxyRes, req, res) {
-      // res.header('Access-Control-Allow-Origin', '*')
-      // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-    }
-  })
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// 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('/static', express.static('./static'))
-
-module.exports = app.listen(8083, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8083')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var proxyTable = {
+  // 呼叫系统主数据服务
+  '/phone/rs/vue': {
+    target: 'http://192.168.50.67:31467'
+  },
+  '/rs': {
+    target: 'http://192.168.50.67:31467'
+  },
+  '/api': {
+    target: 'http://192.168.50.67:31467'
+  },
+  // 文字客服
+  '/Dual': {
+    'target': 'http://127.0.0.1:8081/RestWork/rs'
+  },
+  '/AndroidRest/rs/path/getServiceMobile': {
+    'target': 'http://192.168.50.67:31467'
+  },
+  // 安卓测试转发地址
+  '/AndroidRest/rs': {
+    'target': 'http://192.168.50.67:31467',
+    pathRewrite: {
+      'AndroidRest/rs': '/rs'
+    }
+  }
+}
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({ action: 'reload' })
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = { target: options }
+  }
+  // 改变源实现跨域
+  // options.changeOrigin = true
+  Object.assign(options, {
+    onProxyRes (proxyRes, req, res) {
+      // res.header('Access-Control-Allow-Origin', '*')
+      // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+    }
+  })
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// 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('/static', express.static('./static'))
+
+module.exports = app.listen(8083, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8083')
+})

package/build/webpack.base.conf.js

@@ -1,82 +1,82 @@
-var path = require('path')
-var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
-
-module.exports = {
-  entry: {
-    app: 'src/main.js'
-  },
-  output: {
-    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'),
-      'test': path.resolve(__dirname, '../test')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          /src/,
-          /build/,
-          /examples/,
-          /test/,
-          /node_modules\/vue-client\/src/,
-          /node_modules\/vue-strap\/src/,
-          /node_modules\/safecheck-client\/src/,
-          /node_modules\/telephone-clients\/src/,
-          /node_modules\/readmeter-client\/src/
-        ]
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.css$/,
-        loader: 'style!css'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
-        query: {
-          limit: 10000,
-          name: '[name].[ext]?[hash:7]'
-        }
-      }
-    ]
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
-    })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
-}
+var path = require('path')
+var cssLoaders = require('./css-loaders')
+var projectRoot = path.resolve(__dirname, '../')
+
+module.exports = {
+  entry: {
+    app: 'src/main.js'
+  },
+  output: {
+    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'),
+      'test': path.resolve(__dirname, '../test')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          /src/,
+          /build/,
+          /examples/,
+          /test/,
+          /node_modules\/vue-client\/src/,
+          /node_modules\/vue-strap\/src/,
+          /node_modules\/safecheck-client\/src/,
+          /node_modules\/telephone-clients\/src/,
+          /node_modules\/readmeter-client\/src/
+        ]
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        loader: 'url',
+        query: {
+          limit: 10000,
+          name: '[name].[ext]?[hash:7]'
+        }
+      }
+    ]
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: false,
+      extract: false
+    })
+  },
+  plugins: [],
+  eslint: {
+    formatter: require('eslint-friendly-formatter')
+  }
+}

package/build.gradle

@@ -1,27 +1,27 @@
-buildscript {
-	repositories {
-		mavenCentral()
-		jcenter()
-	}
-	//使用Docker插件来构建Docker镜像，这样就可以直接在Gradle的脚本里配置Dockefile文件，
-	//之后就可以直接构建镜像了
-	dependencies {
-		classpath("se.transmode.gradle:gradle-docker:1.2")
-	}
-}
-
-version = '1.2.56'
-
-apply plugin: 'java'
-apply plugin: 'docker'
-
-// 以命令行方式做镜像
-task buildDocker(type:Exec) {
-  workingDir '.'
-  commandLine 'docker', 'build', '-t', jar.baseName + ':' + version, '.'
-}
-
-task release(type:Exec) {
-	workingDir '.'
-	commandLine 'cmd', '/c', 'release.bat ' + version
-}
+buildscript {
+	repositories {
+		mavenCentral()
+		jcenter()
+	}
+	//使用Docker插件来构建Docker镜像，这样就可以直接在Gradle的脚本里配置Dockefile文件，
+	//之后就可以直接构建镜像了
+	dependencies {
+		classpath("se.transmode.gradle:gradle-docker:1.2")
+	}
+}
+
+version = '1.2.56'
+
+apply plugin: 'java'
+apply plugin: 'docker'
+
+// 以命令行方式做镜像
+task buildDocker(type:Exec) {
+  workingDir '.'
+  commandLine 'docker', 'build', '-t', jar.baseName + ':' + version, '.'
+}
+
+task release(type:Exec) {
+	workingDir '.'
+	commandLine 'cmd', '/c', 'release.bat ' + version
+}

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists