修复打包后静态页面加载异常

panlinlin
1 parent 5b181728
Showing 7 changed files with 26 additions and 23 deletions
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
web_src/build/webpack.dev.conf.js
web_src/build/webpack.prod.conf.js
web_src/config/index.js
web_src/index.html
web_src/src/App.vue
web_src/src/main.js
@@ -69,9 +69,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         // 可以直接访问的静态数据
         web.ignoring()
                 .antMatchers("/")
-                .antMatchers("/css/**")
-                .antMatchers("/img/**")
-                .antMatchers("/fonts/**")
+                .antMatchers("/static/**")
                 .antMatchers("/index.html")
                 .antMatchers("/doc.html") // "/webjars/**", "/swagger-resources/**", "/v3/api-docs/**"
                 .antMatchers("/webjars/**")
@@ -100,6 +98,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.cors().and().csrf().disable();
+        // 设置允许添加静态文件
+        http.headers().contentTypeOptions().disable();
         http.authorizeRequests()
                 // 放行接口
                 .antMatchers("/api/user/login","/index/hook/**").permitAll()
@@ -64,8 +64,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
         to: config.dev.assetsSubDirectory,
         ignore: ['.*']
       },
-      { from: 'node_modules/@easydarwin/easywasmplayer/libDecoder.wasm'},
-      { from: 'node_modules/@easydarwin/easywasmplayer/EasyWasmPlayer.js', to: 'js/'}
+      { from: 'node_modules/@easydarwin/easywasmplayer/libDecoder.wasm', to: 'static/'},
+      { from: 'node_modules/@easydarwin/easywasmplayer/EasyWasmPlayer.js', to: 'static/js/'}
     ])
   ]
 })
@@ -46,7 +46,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       filename: utils.assetsPath('css/[name].[contenthash].css'),
       // Setting the following option to `false` will not extract CSS from codesplit chunks.
       // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
-      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, 
+      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
       // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
       allChunks: true,
     }),
@@ -115,8 +115,8 @@ const webpackConfig = merge(baseWebpackConfig, {
         to: config.build.assetsSubDirectory,
         ignore: ['.*']
       },
-      { from: 'node_modules/@easydarwin/easywasmplayer/libDecoder.wasm'},
-      { from: 'node_modules/@easydarwin/easywasmplayer/EasyWasmPlayer.js', to: 'js/'}
+      { from: 'node_modules/@easydarwin/easywasmplayer/libDecoder.wasm', to: 'static/'},
+      { from: 'node_modules/@easydarwin/easywasmplayer/EasyWasmPlayer.js', to: 'static/js/'}
     ])
   ]
 })
@@ -51,7 +51,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../../src/main/resources/static/'),
-    assetsSubDirectory: '.',
+    assetsSubDirectory: './static',
     assetsPublicPath: '/',
     /**
@@ -4,12 +4,12 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <title>国标28181</title>
-    <link rel="stylesheet" type="text/css" href="/static/css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="/static/css/login.css">
+    <link rel="stylesheet" type="text/css" href="./static/css/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="./static/css/login.css">
   </head>
   <body>
-    <script type="text/javascript" src="./js/EasyWasmPlayer.js"></script>
-    <script type="text/javascript" src="/static/js/ZLMRTCClient.js"></script>
+    <script type="text/javascript" src="./static/js/EasyWasmPlayer.js"></script>
+    <script type="text/javascript" src="./static/js/ZLMRTCClient.js"></script>
     <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=rk73w8dv1rkE4UdZsataG68VarhYQzrx&s=1"></script>
     <div id="app"></div>
     <!-- built files will be auto injected -->
@@ -21,6 +21,7 @@ export default {
   created() {
     if(!this.$cookies.get("session")){
       //如果没有登录状态则跳转到登录页
+      console.log("33333333")
       this.$router.push('/login');
     }
   },
@@ -42,6 +43,7 @@ export default {
       //cookie操作方法在源码里有或者参考网上的即可
       if(!this.$cookies.get("session")){
         //如果没有登录状态则跳转到登录页
+        console.log("222222222")
         this.$router.push('/login');
       }
     },
@@ -41,16 +41,17 @@ Vue.prototype.$notify = Notification;
 axios.defaults.baseURL = (process.env.NODE_ENV === 'development') ? process.env.BASE_API : "";
 // api 返回401自动回登陆页面
-axios.interceptors.response.use(function (response) {
-  // 对响应数据做点什么
-  return response;
-}, function (error) {
-  // 对响应错误做点什么
-  if (error.response.status === 401) {
-    router.push('/login');
-  }
-  return Promise.reject(error);
-});
+// axios.interceptors.response.use(function (response) {
+//   // 对响应数据做点什么
+//   return response;
+// }, function (error) {
+//   // 对响应错误做点什么
+//   if (error.response.status === 401) {
+//     console.log((1111))
+//     router.push('/login');
+//   }
+//   return Promise.reject(error);
+// });
 Vue.prototype.$cookies.config(60*30);