address-client 3.2.111 → 4.0.1

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Dec 07 15:35:10 CST 2020
-gradle.version=5.2.1
+#Mon Dec 07 15:35:10 CST 2020
+gradle.version=5.2.1

package/CHANGELOG.md

@@ -1,15 +1,15 @@
-# Change Log
-所有关于本产品的变化都在该文档里。
-
-## 3.0.24-2020-10-15 @张科科
---地址管理 特殊建档 增加小区选择
-
-## 1.3.2-2018-11-12 @刘江涛
-- 地址查询修改
-
-## 1.3.1-2018-11-11 @何宁社
-- 地址管理完成
-- 地址查询完成
-
-## 1.2.0-2018-11-11 @何宁社
-- 删除样式
+# Change Log
+所有关于本产品的变化都在该文档里。
+
+## 3.0.24-2020-10-15 @张科科
+--地址管理 特殊建档 增加小区选择
+
+## 1.3.2-2018-11-12 @刘江涛
+- 地址查询修改
+
+## 1.3.1-2018-11-11 @何宁社
+- 地址管理完成
+- 地址查询完成
+
+## 1.2.0-2018-11-11 @何宁社
+- 删除样式

package/build/dev-server.js

@@ -1,185 +1,185 @@
-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 checkVersion = require('./versionCheck.js')
-checkVersion()
-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 str = 'http://192.168.50.4:8400', str2= 'http://192.168.50.4:8400'
-var str3= 'http://192.168.50.4:8400'
-var proxyTable = {
-  '/api/af-auth': {
-    target: str
-  },
-  '/api/af-system': {
-    target: str
-  },
-  '/api/af-revenue': {
-    pathRewrite: {'/api/af-revenue': '/'},
-    target: 'http://127.0.0.1:9026'
-  },
-  '/rs/entity': {
-    target: str
-    // secure:true,
-    // changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/webapps':{
-    target: str3,
-    secure:true,
-    changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/rs/logic/getLogin': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/logic/getInitData': {
-    target: str3,
-    secure:true,
-    changeOrigin:true,
-  },
-  '/rs/logic/getSaleInitData': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  // '/rs/logic':{
-  //   target: str3,
-  //   secure:true,
-  //   changeOrigin:true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  '/rs/vue': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/user': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/db': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/search': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/rs/data': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/sql': {
-    target: str
-    // secure: true,
-    // changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/rs/logic': {
-    target: str
-    // secure: true,
-    // changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    // target: 'http://192.168.50.199:8300'
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  }
-}
-
-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('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+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 checkVersion = require('./versionCheck.js')
+checkVersion()
+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 str = 'http://192.168.50.4:8400', str2= 'http://192.168.50.4:8400'
+var str3= 'http://192.168.50.4:8400'
+var proxyTable = {
+  '/api/af-auth': {
+    target: str
+  },
+  '/api/af-system': {
+    target: str
+  },
+  '/api/af-revenue': {
+    pathRewrite: {'/api/af-revenue': '/'},
+    target: 'http://127.0.0.1:9026'
+  },
+  '/rs/entity': {
+    target: str
+    // secure:true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/logic/getLogin': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic/getInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true,
+  },
+  '/rs/logic/getSaleInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  // '/rs/logic':{
+  //   target: str3,
+  //   secure:true,
+  //   changeOrigin:true
+  //   // target: 'http://127.0.0.1:8080'
+  // },
+  '/rs/vue': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/user': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/db': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/search': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/data': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/sql': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/logic': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    // target: 'http://192.168.50.199:8300'
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  }
+}
+
+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('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/build/versionCheck.js

@@ -1,31 +1,31 @@
-function isVersionGreaterThan (version1, version2) {
-  const v1parts = version1.split('.')
-  const v2parts = version2.split('.')
-  let flag = false
-  for (let i = 0; i < v1parts.length; ++i) {
-    if (v1parts[i] > v2parts[i]) {
-      flag = true
-      break
-    }
-  }
-
-  return flag
-}
-
-const pkg = require('../package.json')
-const checkVersion = () => {
-  console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 addressclient 版本, 会发送 api/af-revenue/sql ,api/af-revenue/logic 到v4 服务')
-  const {devDependencies} = pkg
-  if (devDependencies && devDependencies['system-clients']) {
-    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
-      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
-      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
-      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
-      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
-      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请查看营收后台升级日志：' +
-        'http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
-    }
-  }
-}
-
-module.exports = checkVersion
+function isVersionGreaterThan (version1, version2) {
+  const v1parts = version1.split('.')
+  const v2parts = version2.split('.')
+  let flag = false
+  for (let i = 0; i < v1parts.length; ++i) {
+    if (v1parts[i] > v2parts[i]) {
+      flag = true
+      break
+    }
+  }
+
+  return flag
+}
+
+const pkg = require('../package.json')
+const checkVersion = () => {
+  console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 addressclient 版本, 会发送 api/af-revenue/sql ,api/af-revenue/logic 到v4 服务')
+  const {devDependencies} = pkg
+  if (devDependencies && devDependencies['system-clients']) {
+    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请查看营收后台升级日志：' +
+        'http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
+    }
+  }
+}
+
+module.exports = checkVersion

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'),
-      '@src': path.resolve('src')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          `${projectRoot}\\src`,
-          `${projectRoot}\\build`,
-          `${projectRoot}\\examples`,
-          `${projectRoot}\\test`,
-          `${projectRoot}\\node_modules\\vue-client\\src`,
-          `${projectRoot}\\node_modules\\vue-strap\\src`,
-          `${projectRoot}\\node_modules\\system-clients\\src`,
-          `${projectRoot}\\node_modules\\ldap-clients\\src`,
-          `${projectRoot}\\node_modules\\sale-client\\src`,
-        ]
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.css$/,
-        loader: 'style!css'
-      },
-      {
-        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'),
+      '@src': path.resolve('src')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          `${projectRoot}\\src`,
+          `${projectRoot}\\build`,
+          `${projectRoot}\\examples`,
+          `${projectRoot}\\test`,
+          `${projectRoot}\\node_modules\\vue-client\\src`,
+          `${projectRoot}\\node_modules\\vue-strap\\src`,
+          `${projectRoot}\\node_modules\\system-clients\\src`,
+          `${projectRoot}\\node_modules\\ldap-clients\\src`,
+          `${projectRoot}\\node_modules\\sale-client\\src`,
+        ]
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
+      {
+        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')
+  }
+}