Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 vue.config.js

@@ -14,12 +14,14 @@
  devServer: {
    proxy: {
      "/api-s": {
        target: "http://192.168.20.119:8005",
        // target: "http://192.168.20.119:8005", // 
        target:"http://fai365.com:9083",  // 
        ws: true,
        changeOrigin: true
      },
      "/api-wms": {
        target: "http://192.168.20.119:8005",
        // target: "http://192.168.20.119:8005",
        target:"http://fai365.com:9083",
        ws: true,
        changeOrigin: true
      }
@@ -30,13 +32,13 @@
    "crypto-js",
    "sockjs-client"
  ],
  configureWebpack: (config) => {
  configureWebpack: () => {
    const configNew = {}
    if (process.env.NODE_ENV === "production") {
      configNew.externals = externals
      configNew.plugins = []
    } else if (process.env.NODE_ENV === "development") {
      console.log("development", config)
      // console.log("development", config)
    }
    return configNew
  },