address-client 3.2.105-yangchun → 3.2.106-shimen

package/build/dev-server.js

@@ -3,103 +3,103 @@ 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://127.0.0.1:8288/', str2= 'http://172.168.1.11:9001/#'
-var str3= 'http://172.168.1.11:9001/#'
-var str4='http://127.0.0.1:8080'
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:31785']
+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': {
-    target: v4Url
-  },
-  '/invoice/rs/logic/getInvoice': {
-    target: serverRul
-  },
-  '/rs/sql/address_getarealist':{
-    target:str4
+  '/api/af-auth': {
+    target: str
   },
-  '/rs/sql/filemanage_getUserfies':{
-    target: 'http://127.0.0.1:8080/'
+  '/api/af-system': {
+    target: str
   },
-  '/rs/logic/importNetworkValve':{
-    target: 'http://127.0.0.1:8080/'
+  '/api/af-revenue': {
+    pathRewrite: {'/api/af-revenue': '/'},
+    target: 'http://127.0.0.1:9026'
   },
-  '/rs/file': {
-    target: localUrl
+  '/rs/entity': {
+    target: str
+    // secure:true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/webapps': {
-    target: serverRul
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/rs/sql/singleTable': {
-    target: serverRul
-  },
-  '/invoice': {
-    target: serverRul
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: serverRul
-  },
-  // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
-  // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true,
   },
   '/rs/logic/getSaleInitData': {
-    target: serverRul
+    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: serverRul
-  },
-  '/rs/path': {
-    target: serverRul
-  },
-  '/rs/data': {
-    target: serverRul
-  },
-  '/rs/license': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/db': {
-    target: serverRul
-  },
-  '/excel': {
-    target: serverRul
-  },
-  '/rs/config': {
-    target: serverRul
-  },
-  '/rs/report': {
-    target: serverRul
-  },
-  '/rs/vue': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
-  '/rs/logic/webHandReverse': {
-    target: 'http://localhost:8085'
+  '/rs/search': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/rs/logic': {
-    target: localUrl
+  '/rs/data': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/sql': {
-    target: localUrl
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/webmeter': {
-    target: serverRul
+  '/rs/logic': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: serverRul
-    // changeOrigin: true
+    // target: 'http://192.168.50.199:8300'
+    target: str3,
+    secure:true,
+    changeOrigin: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.105-yangchun",
+  "version": "3.2.106-shimen",
   "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",