sale-client 3.5.171 → 3.5.173

package/README.md

@@ -1,39 +1,12 @@
 # sale-client
 
-#### 项目介绍
-{**以下是码云平台说明，您可以替换为您的项目简介**
-码云是开源中国推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+## 主要功能
 
-#### 软件架构
-软件架构说明
+## 如何构建
 
+node 14+
 
-#### 安装教程
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 使用说明
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 参与贡献
-
-1. Fork 本项目
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
-
-
-#### 码云特技
-
-1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+```shell
+npm install
+npm run dev
+```

package/build/dev-server.js

@@ -1,201 +1,67 @@
-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 bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400'
-// 公司测试服务
-// var fuwu = 'http://192.168.50.4:8450'
-// 梅河口
-// var fuwu = 'http://139.214.92.34:8301'
-// 单县
-// var fuwu = 'http://119.187.112.234:8400'
-// 中盛
-// var fuwu = 'http://39.99.85.14:8400'
-// 燎原
-var fuwu = 'http://121.40.52.133:9001'
-// 葛华
-// var fuwu = 'http://219.138.226.181:8401'
-// 乌海
-// var fuwu = 'http://203.57.101.233:8400'
-// 铜川
-//  var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-// 韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  // '/'
-  // '/rs/logic/stopBasicLivingNew':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getBatchOperaPro':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/sale_getUser':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getOperBtns':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/file/uploadFile':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/sql/getDownPlan':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/logic/saleExport': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/saleGetExportProgress': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/getWarningMsg': {
-  //   target: 'http://localhost:8080/'
-  // },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice': {
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target: fuwu
-  }
-}
-
-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')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// 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'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
+const app = express()
+const compiler = webpack(config)
+
+// 自己改了这里不要提交 来回覆盖挺麻烦的
+const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
+const port = 8089
+
+const proxyTable = {
+  '/text': {
+    target: local
+  },
+  '/files': {
+    target: server
+  },
+  '/excel': {
+    target: server
+  },
+  '/webmeter': {
+    target: server
+  },
+  '/rs/logic': {
+    target: server
+  },
+  '/rs': {
+    target: server
+  }
+}
+
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+const hotMiddleware = require('webpack-hot-middleware')(compiler)
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+Object.keys(proxyTable).forEach(function (context) {
+  let options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+app.use(require('connect-history-api-fallback')())
+app.use(devMiddleware)
+app.use(hotMiddleware)
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(port, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:' + port)
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.171",
+  "version": "3.5.173",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -71,7 +71,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.7",
+    "ldap-clients": "3.0.55-test-1",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",
@@ -86,7 +86,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.25",
+    "system-clients": "3.2.54-test-1",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.76",
     "vue-clipboard2": "0.3.1",