address-client 3.2.103 → 3.2.104

package/build/dev-server.js

@@ -1,174 +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 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://127.0.0.1:8288/', str2= 'http://172.168.1.11:9001/#'
-var str3= 'http://172.168.1.11:9001/#'
-var proxyTable = {
-  '/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

@@ -0,0 +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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.103",
+  "version": "3.2.104",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -23,6 +23,7 @@
     "url": "https://gitee.com/aote/address_management.git"
   },
   "dependencies": {
+    "crypto-js": "^4.1.1",
     "less-loader": "^2.2.3",
     "vue": "^1.0.17"
   },
@@ -79,9 +80,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "ldap-clients": "3.0.48",
-    "system-clients": "3.2.68",
+    "system-clients": "3.2.95",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.98",
+    "vue-client": "1.24.150",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/AddAreaMsg.vue

@@ -401,7 +401,7 @@
         // }
         this.areaslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
           data: {
             items: '*',
             tablename: 't_area',
@@ -425,7 +425,7 @@
       async initpcds(pconditon){
         this.pcdslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_pcd',
@@ -449,7 +449,7 @@
       async initstreets(pconditon){
         this.streetslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street',
@@ -474,7 +474,7 @@
           this.$showAlert('请输入正确的位数', 'warning', 2000)
           this.areamodel.f_area_id = ''
         }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+          let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
             data: {
               items: '*',
               tablename: 't_area',
@@ -499,7 +499,7 @@
           f_filialeid: this.f_filialeids
         }
 
-        let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
+        let res = await this.$resetpost('api/af-revenue/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
         console.log('验证小区是否存在', res)
         if (res.data) {
           this.$showAlert('这个小区编号已存在！！！请核实', 'warning', 3000)
@@ -576,7 +576,7 @@
         this.buildingmodel.f_orgname = this.$login.f.orgs
         this.buildingmodel.f_depid = this.$login.f.depids
         this.buildingmodel.f_depname = this.$login.f.deps
-        await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
+        await this.$resetpost('api/af-revenue/logic/address_savebuilding', this.buildingmodel)
         this.$refs.buildinglist.search()
       },
       //保存小区
@@ -600,7 +600,7 @@
         this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
         this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
 
-        await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
+        await this.$resetpost('api/af-revenue/logic/address_updatearea', this.areamodel)
       },
       cleardara(){
         this.areamodel= {

package/src/components/AddCommunityManageMsg.vue

@@ -117,7 +117,7 @@ export default {
   methods: {
     async communityyanzheng() {
       console.log(this.communitymodel.f_community_code)
-      let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+      let res = await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
         data: {
           items: '*',
           tablename: 't_community',
@@ -147,7 +147,7 @@ export default {
       this.streetlist = []
       console.log("街道准备")
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+      HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
         data: {
           items: '*',
           tablename: 't_street',
@@ -189,7 +189,7 @@ export default {
       this.communitymodel.f_depname = this.$login.f.deps
       this.communitymodel.f_street = this.findbyid(this.streetlist, this.communitymodel.f_street_id).f_street
       console.log('获取社区model', this.communitymodel)
-      await this.$resetpost('rs/logic/address_updateCommunityManage', this.communitymodel)
+      await this.$resetpost('api/af-revenue/logic/address_updateCommunityManage', this.communitymodel)
     },
     cancel() {
       this.clearData()

package/src/components/AddStreetManageMsg.vue

@@ -101,7 +101,7 @@ export default {
   methods: {
     async streetyanzheng() {
       console.log(this.streetmanagemodel.f_street_manage_number.length)
-      let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+      let res = await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street_manage',
@@ -130,7 +130,7 @@ export default {
     initdata() {
       console.log("省市区准备")
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+      HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
         data: {
           items: '*',
           tablename: 't_pcd',
@@ -172,7 +172,7 @@ export default {
       this.streetmanagemodel.f_depname = this.$login.f.deps
       this.streetmanagemodel.f_pcd = this.findbyid(this.pcdslist, this.streetmanagemodel.f_pcd_id).f_pcd
       console.log('获取街道model', this.streetmanagemodel)
-      await this.$resetpost('rs/logic/address_updateStreetManage', this.streetmanagemodel)
+      await this.$resetpost('api/af-revenue/logic/address_updateStreetManage', this.streetmanagemodel)
     },
     cancel() {
       this.clearData()

package/src/components/AddStreetOrPcd.vue

@@ -150,23 +150,18 @@
     methods: {
       async streetyanzheng(){
         console.log(this.streetmodel.f_street_number.length)
-        if (this.streetmodel.f_street_number.length != 2){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.streetmodel.f_street_number = ''
-        }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
-            data: {
-              items: '*',
-              tablename: 't_street',
-              orderitem: 'id',
-              condition: `f_street_number = '${this.streetmodel.f_street_number}' and f_orgid = '${this.$login.f.orgid}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res.data.length>0){
-            if (res.data[0].id != this.streetmodel.id) {
-              this.$showAlert('当前编号已存在', 'warning', 2000)
-              this.streetmodel.f_street_number = ''
-            }
+        let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_street',
+            orderitem: 'id',
+            condition: `f_street_number = '${this.streetmodel.f_street_number}' and f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        if (res.data.length>0){
+          if (res.data[0].id != this.streetmodel.id) {
+            this.$showAlert('当前编号已存在', 'warning', 2000)
+            this.streetmodel.f_street_number = ''
           }
         }
       },
@@ -176,7 +171,7 @@
           this.$showAlert('请输入正确的位数', 'warning', 2000)
           this.pcdmodel.f_pcd_number = ''
         }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+          let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
             data: {
               items: '*',
               tablename: 't_pcd',
@@ -196,7 +191,7 @@
       initpcds(pconditon){
         console.log("省市区准备")
         let HttpReset = new HttpResetClass()
-        HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_pcd',
@@ -262,7 +257,7 @@
         this.pcdmodel.f_depid = this.$login.f.depids
         this.pcdmodel.f_depname = this.$login.f.deps
         this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
-        await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
+        await this.$resetpost('api/af-revenue/logic/address_updatepcd', this.pcdmodel)
       },
       //保存街道
       async savestreet(){
@@ -275,7 +270,7 @@
         this.streetmodel.f_depname = this.$login.f.deps
         this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
         console.log('获取街道model', this.streetmodel)
-        await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
+        await this.$resetpost('api/af-revenue/logic/address_updatestreet', this.streetmodel)
       },
       cancel(){
         this.cleardara()