system-phone 1.1.21 → 1.1.22-OA

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/.editorconfig

@@ -1,9 +1,9 @@
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

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/.gradle/buildOutputCleanup/cache.properties

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

package/CHANGELOG.md

@@ -1,2 +1,2 @@
-# Change Log
+# Change Log
 所有关于本产品的变化都在该文档里。

package/Dockerfile

@@ -1,3 +1,3 @@
-FROM af/openresty
-COPY dist/ /usr/local/openresty/nginx/html
-COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf
+FROM af/openresty
+COPY dist/ /usr/local/openresty/nginx/html
+COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf

package/README.md

@@ -1,37 +1,37 @@
-# SystemPhone
-
-#### 项目介绍
-System手机前端模块
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 使用说明
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 参与贡献
-
-1. Fork 本项目
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
-
-
-#### 码云特技
-
-1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+# SystemPhone
+
+#### 项目介绍
+System手机前端模块
+
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 使用说明
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 参与贡献
+
+1. Fork 本项目
+2. 新建 Feat_xxx 分支
+3. 提交代码
+4. 新建 Pull Request
+
+
+#### 码云特技
+
+1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
+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/)

package/SystemPhone.iml

@@ -1,13 +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" external.system.module.group="" external.system.module.version="1.0.15" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/out" />
-    </content>
-    <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/css-loaders.js

@@ -1,34 +1,34 @@
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
-
-module.exports = function (options) {
-  // generate loader string to be used with extract text plugin
-  function generateLoaders (loaders) {
-    var sourceLoader = loaders.map(function (loader) {
-      var extraParamChar
-      if (/\?/.test(loader)) {
-        loader = loader.replace(/\?/, '-loader?')
-        extraParamChar = '&'
-      } else {
-        loader = loader + '-loader'
-        extraParamChar = '?'
-      }
-      return loader + (options.sourceMap ? extraParamChar + 'sourceMap' : '')
-    }).join('!')
-
-    if (options.extract) {
-      return ExtractTextPlugin.extract('vue-style-loader', sourceLoader)
-    } else {
-      return ['vue-style-loader', sourceLoader].join('!')
-    }
-  }
-
-  // http://vuejs.github.io/vue-loader/configurations/extract-css.html
-  return {
-    css: generateLoaders(['css']),
-    less: generateLoaders(['css', 'less']),
-    sass: generateLoaders(['css', 'sass?indentedSyntax']),
-    scss: generateLoaders(['css', 'sass']),
-    stylus: generateLoaders(['css', 'stylus']),
-    styl: generateLoaders(['css', 'stylus'])
-  }
-}
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
+
+module.exports = function (options) {
+  // generate loader string to be used with extract text plugin
+  function generateLoaders (loaders) {
+    var sourceLoader = loaders.map(function (loader) {
+      var extraParamChar
+      if (/\?/.test(loader)) {
+        loader = loader.replace(/\?/, '-loader?')
+        extraParamChar = '&'
+      } else {
+        loader = loader + '-loader'
+        extraParamChar = '?'
+      }
+      return loader + (options.sourceMap ? extraParamChar + 'sourceMap' : '')
+    }).join('!')
+
+    if (options.extract) {
+      return ExtractTextPlugin.extract('vue-style-loader', sourceLoader)
+    } else {
+      return ['vue-style-loader', sourceLoader].join('!')
+    }
+  }
+
+  // http://vuejs.github.io/vue-loader/configurations/extract-css.html
+  return {
+    css: generateLoaders(['css']),
+    less: generateLoaders(['css', 'less']),
+    sass: generateLoaders(['css', 'sass?indentedSyntax']),
+    scss: generateLoaders(['css', 'sass']),
+    stylus: generateLoaders(['css', 'stylus']),
+    styl: generateLoaders(['css', 'stylus'])
+  }
+}

package/build/dev-client.js

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

package/build/dev-server.js

@@ -11,49 +11,88 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 var proxyTable = {
-  '/rs/weixin': {
-    target: 'http://192.168.2.77:8081'
-  },
+  // '/rs/weixin': {
+  //   target: 'http://121.36.106.17:8400/'
+  // },
   '/phone/rs/vue': {
-    target: 'http://192.168.50.220:8500'
+    target: 'http://121.36.106.17:8400/'
   },
-  '/materials': {
-    target: 'http://192.168.50.202:8081'
-    // target: 'http://192.168.2.77:8081'
+  '/phoneoa': {
+    target: 'http://121.36.106.17:8555//'
   },
-  '/umaterials': {
-    // target: 'http://192.168.50.202:8081'
-    target: 'http://192.168.2.77:8081'
+  // '/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://192.168.50.4:8555'
   },
-  // 取图片的地址
-  '/images': {
-    target: 'http://192.168.50.202:8081'
-    // target: 'http://192.168.20.249:8081'
+  '/rs/logic/againOpenAccount': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://192.168.50.4:8555'
   },
-  'phone/rs/dir2': {
-    target: 'http://192.168.50.220:8500'
-    // target: 'http://192.168.20.249:8081'
+  '/rs/logic/againSendInstruct': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://192.168.50.4:8555'
   },
-  '/excel': {
-    // target: 'http://127.0.0.1:8082'
-    target: 'http://127.0.0.1:8081'
+  '/rs/logic/cancelSendInstruct': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://192.168.50.4:8555'
   },
-  '/SaleRest/rs': {
-     // target: 'http://127.0.0.1:8081'
-    target: 'http://192.168.2.77:8081/'
+  '/rs/logic/updatecustom': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://121.36.59.193:9601/telephone/'
+  },
+  '/rs/logic/addlink': {
+    target: 'http://121.36.59.193:9601/telephone/'
+    // target: 'http://121.36.59.193:9601/telephone/'
+  },
+  '/rs/sql/iot_singleTable_OrderBy': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://192.168.50.4:8555'
+  },
+  '/rs/sql/tel_singleTable_OrderBy': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://121.36.59.193:9601/telephone/'
+  },
+  '/rs/sql/queryproject': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://121.36.59.193:9601/telephone/'
+  },
+  '/rs/sql/custominfo': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://121.36.59.193:9601/telephone/'
   },
   // 呼叫系统主数据服务
   '/rs': {
     // target: 'http://127.0.0.1:8082'
-    target: 'http://192.168.50.222:8300'
+    target: 'http://121.36.106.17:8400'
   },
   // 文字客服
-  '/Dual': {
-    'target': 'http://127.0.0.1:8081/RestWork/rs'
-  },
+  // '/Dual': {
+  //   'target': 'http://127.0.0.1:8081/RestWork/rs'
+  // },
   // 安卓测试转发地址
   '/AndroidRest/rs': {
-    'target': 'http://127.0.0.1:8081'
+    'target': 'http://121.36.59.193:9601/telephone/'
   }
 }
 var devMiddleware = require('webpack-dev-middleware')(compiler, {

package/build/example-server.js

@@ -1,80 +1,80 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.example.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 = {
-  // '/api': {
-  //   target: 'http://jsonplaceholder.typicode.com',
-  //   changeOrigin: true,
-  //   pathRewrite: {
-  //     '^/api': ''
-  //   }
-  // }
-}
-
-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 }
-  }
-  app.use(proxyMiddleware(context, 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('/static', express.static('./static'))
-
-// app.all('/images/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-//
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8082'
-//   })
-// })
-
-module.exports = app.listen(8081, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8081')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.example.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 = {
+  // '/api': {
+  //   target: 'http://jsonplaceholder.typicode.com',
+  //   changeOrigin: true,
+  //   pathRewrite: {
+  //     '^/api': ''
+  //   }
+  // }
+}
+
+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 }
+  }
+  app.use(proxyMiddleware(context, 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('/static', express.static('./static'))
+
+// app.all('/images/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+//
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8082'
+//   })
+// })
+
+module.exports = app.listen(8081, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8081')
+})

package/build/release.sh

@@ -1,28 +1,28 @@
-set -e
-echo "Enter release version: "
-read VERSION
-
-read -p "Releasing $VERSION - are you sure? (y/n)" -n 1 -r
-echo    # (optional) move to a new line
-if [[ $REPLY =~ ^[Yy]$ ]]
-then
-  echo "Releasing $VERSION ..."
-
-  # lint
-  npm run lint 2>/dev/null
-
-  # e2e
-  npm run e2e 2>/dev/null
-
-  #build
-  npm run build
-  
-  # commit
-  git add -A
-  git commit -m "[build] $VERSION"
-  npm version $VERSION --message "[release] $VERSION"
-
-  # publish
-  git push origin refs/tags/v$VERSION
-  git push
-fi
+set -e
+echo "Enter release version: "
+read VERSION
+
+read -p "Releasing $VERSION - are you sure? (y/n)" -n 1 -r
+echo    # (optional) move to a new line
+if [[ $REPLY =~ ^[Yy]$ ]]
+then
+  echo "Releasing $VERSION ..."
+
+  # lint
+  npm run lint 2>/dev/null
+
+  # e2e
+  npm run e2e 2>/dev/null
+
+  #build
+  npm run build
+  
+  # commit
+  git add -A
+  git commit -m "[build] $VERSION"
+  npm version $VERSION --message "[release] $VERSION"
+
+  # publish
+  git push origin refs/tags/v$VERSION
+  git push
+fi