address-client 1.3.55 → 1.3.56-taiyuan

package/build/dev-server.js

@@ -1,134 +1,141 @@
-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://127.0.0.1:8090/ldap'
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    // target: 'http://192.168.50.202:8099'
-    // target: 'http://192.168.20.2:8081'
-    target: 'http://127.0.0.1:8090/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://127.0.0.1:8090/ldap'
-    // target: 'http://192.168.20.191:8011'
-  },
-  '/rs/data': {
-    target: 'http://127.0.0.1:8090/ldap'
-  },
-  '/rs/license': {
-    target: 'http://127.0.0.1:8090/ldap'
-  },
-  '/rs/db': {
-    target: 'http://127.0.0.1:8090/ldap'
-    // target: 'http://127.0.0.1:8012'
-    // target: 'http://192.168.20.191:s8011'
-  },
-  '/excel': {
-    // target: 'http://127.0.0.1:9090/product'
-    target: 'http://192.168.50.222:8300'
-  },
-  '/rs/file': {
-    target: 'http://192.168.50.222:8300'
-  },
-  '/rs': {
-    target: 'http://127.0.0.1:8080/address'
-  }
-}
-
-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(8084, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8084')
-})
+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.222:7000/ldap'
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    // target: 'http://192.168.50.202:8099'
+    // target: 'http://192.168.20.2:8081'
+    target: 'http://192.168.50.222: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.222: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.222: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.222:8200/system'
+    // target: 'http://192.168.20.191:8011'
+  },
+  '/rs/db': {
+    target: 'http://192.168.50.222:7000/ldap'
+    // target: 'http://127.0.0.1:8012'
+    // target: 'http://192.168.20.191:s8011'
+  },
+  '/excel': {
+    // target: 'http://127.0.0.1:9090/product'
+    target: 'http://192.168.50.222:8300'
+  },
+  '/rs/file': {
+    target: 'http://192.168.50.222:8300'
+  },
+  '/rs': {
+     // target: 'http://127.0.0.1:8090/address'
+    target: 'http://192.168.50.222: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(8084, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8084')
+})

package/build/webpack.base.conf.js

@@ -1,78 +1,77 @@
-var path = require('path')
-var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
-
-module.exports = {
-  entry: {
-    app: './src/main.js'
-  },
-  output: {
-    path: path.resolve(__dirname, '../dist/static'),
-    publicPath: 'static/',
-    filename: '[name].js'
-  },
-  resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'src': path.resolve(__dirname, '../src'),
-      'test': path.resolve(__dirname, '../test')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          `${projectRoot}\\src`,
-          `${projectRoot}\\build`,
-          `${projectRoot}\\examples`,
-          `${projectRoot}\\test`,
-          `${projectRoot}\\node_modules\\vue-client\\src`,
-          `${projectRoot}\\node_modules\\vue-strap\\src`,
-          `${projectRoot}\\node_modules\\system-clients\\src`,
-          `${projectRoot}\\node_modules\\ldap-clients\\src`,
-          `${projectRoot}\\node_modules\\sale-client\\src`,
-        ]
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
-        query: {
-          limit: 10000,
-          name: '[name].[ext]?[hash:7]'
-        }
-      }
-    ]
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
-    })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
-}
+var path = require('path')
+var cssLoaders = require('./css-loaders')
+var projectRoot = path.resolve(__dirname, '../')
+
+module.exports = {
+  entry: {
+    app: './src/main.js'
+  },
+  output: {
+    path: path.resolve(__dirname, '../dist/static'),
+    publicPath: 'static/',
+    filename: '[name].js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.vue'],
+    fallback: [path.join(__dirname, '../node_modules')],
+    alias: {
+      'src': path.resolve(__dirname, '../src'),
+      'test': path.resolve(__dirname, '../test')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          `${projectRoot}\\src`,
+          `${projectRoot}\\build`,
+          `${projectRoot}\\examples`,
+          `${projectRoot}\\test`,
+          `${projectRoot}\\node_modules\\vue-client\\src`,
+          `${projectRoot}\\node_modules\\vue-strap\\src`,
+          `${projectRoot}\\node_modules\\system-clients\\src`,
+          `${projectRoot}\\node_modules\\sale-client\\src`,
+        ]
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        loader: 'url',
+        query: {
+          limit: 10000,
+          name: '[name].[ext]?[hash:7]'
+        }
+      }
+    ]
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: false,
+      extract: false
+    })
+  },
+  plugins: [],
+  eslint: {
+    formatter: require('eslint-friendly-formatter')
+  }
+}

package/build.gradle

@@ -1,14 +1,14 @@
-buildscript {
-	repositories {
-		mavenCentral()
-		jcenter()
-	}
-}
-
-version = '1.3.55'
-
-apply plugin: 'java'
-task release(type:Exec) {
-	workingDir '.'
-	commandLine 'cmd', '/c', 'release.bat ' + version
-}
+buildscript {
+	repositories {
+		mavenCentral()
+		jcenter()
+	}
+}
+
+version = '1.3.52'
+
+apply plugin: 'java'
+task release(type:Exec) {
+	workingDir '.'
+	commandLine 'cmd', '/c', 'release.bat ' + version
+}

package/index.html

@@ -19,7 +19,6 @@
   </body>
 
 </html>
-
 <script>
   import NewAreaInfo from "./src/components/NewAreaInfo";
   export default {