Merge branch 'master' of E:\IDEA-PROJECT\CadastralSystem with conflicts.

-VUE_APP_api = 'http://192.168.2.48:8006'
-VUE_APP_api1 = 'http://127.0.0.1:8006'
-VUE_APP_api2 = 'http://192.168.2.9:8006'
+VUE_APP_api = 'http://192.168.2.108:8000'
+VUE_APP_api1 = 'http://192.168.2.76:8000'
+VUE_APP_api2 = 'http://192.168.2.108:8006'
+VUE_APP_api5 = 'http://192.168.2.59:8443'
+VUE_APP_api3 = 'https://127.0.0.1:8006'
+VUE_APP_api4 = 'http://127.0.0.1:18080'
 VUE_APP_name = '开发环境'
 NODE_ENV="development"
 VUE_APP_VERSION = 'psh'
\ No newline at end of file

@@ -5,7 +5,6 @@ let Timestamp = new Date().getTime();
 function resolve(dir) {
     return path.join(__dirname, dir)
 }
-const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 
 module.exports = {
     publicPath: './',
@@ -20,7 +19,6 @@ module.exports = {
             .set('@libs', resolve('src/libs'))
             .set('@router', resolve('src/router'))
             .set('@components', resolve('src/components'))
-			.set('@assets', resolve('src/assets'))
     },
     pluginOptions: {
         'style-resources-loader': {
@@ -33,17 +31,8 @@ module.exports = {
             filename: `js/[name].${Timestamp}.js`,
             chunkFilename: `js/[name].${Timestamp}.js`
         },
-        plugins: [
-          // 去除console和debugger
-          // new UglifyJsPlugin({
-          //   uglifyOptions: {
-          //     compress: {
-          //       drop_console: true,
-          //       drop_debugger: true,
-          //     },
-          //   },
-          //   parallel: true,
-          // }),
+        // plugins: [
+
         //     new FileManagerPlugin({  //初始化 filemanager-webpack-plugin 插件实例
         //       onEnd: {
         //         mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹
@@ -52,20 +41,16 @@ module.exports = {
         //         ]
         //       }
         //     })
-        ]
+        // ]
     },
     devServer: {
-      host: "192.168.2.61",
       host: "0.0.0.0",
-      port: 8008,
+      port: 8006,
       https: false,
       hotOnly: false,
       proxy: {
         "/api": {
-          // target: 'https://192.168.2.119:8006', //泽平 
-          // target: process.env.VUE_APP_api1, //本地
-          target: process.env.VUE_APP_api, //赵千
-          // target: process.env.VUE_APP_api4, //赵千
+          target: process.env.VUE_APP_api3,
           changeOrigin: true,
           pathRewrite: {
             "^/api": "/",