manage-client 1.60.9 → 1.60.10-10

package/build/dev-server.js

@@ -1,167 +1,148 @@
-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 proxyTable = {
-  '/images': {
-    // target: 'http://localhost:8086'
-    target: 'http://192.168.50.220:7000/ldap'
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    // target: 'http://192.168.50.202:8099'
-    // target: 'http://192.168.20.2:8081'
-    target: 'http://192.168.50.220:7000/ldap'
-    // target: 'http://192.168.20.191:8011'
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    // target: 'http://192.168.50.202:8099'
-    // target: 'http://192.168.2.77:8081'
-    target: 'http://192.168.50.220:7000/ldap'
-    // target: 'http://192.168.20.191:8011'
-  },
-  '/rs/path/getParams': {
-    // target: 'http://192.168.50.202:8099'
-    //target: 'http://127.0.0.1:8888/product'
-    target: 'http://192.168.50.220:8200/system'
-    // target: 'http://192.168.20.191:8011'
-  },
-   '/rs/logic/getInitData': {
-     // target: 'http://192.168.50.202:8099'
-     //target: 'http://127.0.0.1:8888/product'
-     target: 'http://192.168.50.220:8200/system'
-     // target: 'http://192.168.20.191:8011'
-   },
-  '/rs/sql/saleSingleTable': {
-    // target: 'http://192.168.50.202:8099'
-    //target: 'http://127.0.0.1:8888/product'
-    target: 'http://192.168.50.220:8300'
-    // target: 'http://192.168.20.191:8011'
-  },
-'/rs/sql/singleTable_OrderBy': {
-  // target: 'http://192.168.50.202:8099'
-  //target: 'http://127.0.0.1:8888/product'
-  target: 'http://192.168.50.220:8200/system'
-  // target: 'http://192.168.20.191:8011'
-},
-  '/rs/logic/getLogin': {
-    // target: 'http://192.168.50.202:8099'
-    //target: 'http://127.0.0.1:8888/product'
-    target: 'http://192.168.50.220:8200/system'
-    // target: 'http://192.168.20.191:8011'
-  },
-  '/rs/db': {
-    target: 'http://192.168.50.220:7000/ldap'
-    // target: 'http://127.0.0.1:8012'
-    // target: 'http://192.168.20.191:s8011'
-  },
-  '/excel': {
-    target: 'http://127.0.0.1:8080/'
-    // target: 'http://127.0.0.1:8080/manager'
-    // target: 'http://192.168.50.220:8300'
-  },
-  '/rs/file': {
-    target: 'http://192.168.50.220:8300'
-  },
-  '/rs/logic/getSaleInitData':{
-    target: 'http://192.168.50.220:8300'
-  },
-  '/rs/vue': {
-    target: 'http://192.168.50.220:8200/system'
-  },
-  '/rs': {//rs/sql/newsellQuery
-    // target: 'http://127.0.0.1:8088/mamage'
-    target: 'http://127.0.0.1:8080/'
-    // target: 'http://192.168.50.220:8300'
-  }
-}
-
-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 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 fuwu = 'http://sangfor.8d394835cb84b8f3a4d536a7f2074b47.com:8301/',  bendi = 'http://sangfor.8d394835cb84b8f3a4d536a7f2074b47.com:8301/'
+var proxyTable = {
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
+  '/files': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: bendi
+  },
+  '/rs/license': {
+    target: bendi
+  },
+  '/rs/db': {
+    target: bendi
+  },
+  '/excel': {
+    target: bendi
+  },
+  '/rs/config': {
+    target: bendi
+  },
+  '/rs/sql/getLicenseById': {
+    target: bendi
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs': {
+    target: bendi
+  }
+}
+
+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/webpack.base.conf.js

@@ -50,6 +50,10 @@ module.exports = {
         test: /\.html$/,
         loader: 'vue-html'
       },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
       {
         test: /\.less$/,
         loader: 'style!css!less'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "1.60.9",
+  "version": "1.60.10-10",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -8,6 +8,7 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "jsencrypt": "3.0.0-rc.1",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -60,9 +61,9 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "^1.6.21",
+    "system-clients": "1.6.25-taiyuan",
     "url-loader": "^0.5.7",
-    "vue-client": "^1.20.3",
+    "vue-client": "1.20.20",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",