address-client 3.2.111-fugou → 3.2.111

package/build/dev-server.js

@@ -3,26 +3,33 @@ 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://localhost:8080/', str2= 'http://192.168.50.4:8400/#'
-var str3= 'http://192.168.50.4:8400/'
+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 = {
-  '/rs/entity': {
+  '/api/af-auth': {
+    target: str
+  },
+  '/api/af-system': {
     target: str
-    // secure:true,
-    // changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
   },
   '/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,

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.111-fugou",
+  "version": "3.2.111",
   "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.87",
     "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/address.js

@@ -65,10 +65,10 @@ export default function (filiale) {
   Vue.component('community-area-list', (resolve) => { require(['./components/CommunityAreaList'], resolve) })
 
   // 分公司特殊页面注册替换
-  // if (filiale) {
-  //   let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
-  //   for (let key in filialeComp) {
-  //     Vue.component(key, filialeComp[key])
-  //   }
-  // }
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
 }