Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-24 2a431ace3a7b7dcdd313bb2fa0eff5bb727946f8

 screen_standard/vite.config.js

@@ -51,6 +51,10 @@
          changeOrigin: true,
          ws: false,  // 允许websocket代理
          secure: false,
<<<<<<< HEAD
          rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/')
        }
=======
          rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/'),
          // rewrite: (path) => path.replace(/^\api/, ''), // 将api替换为空
        },
@@ -60,6 +64,7 @@
          ws: false,  // 允许websocket代理
          rewrite: (path) => path.replace(/^\api/, ''), // 将api替换为空
        }*/
>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
      }
    }
  }