wvp-pro.git - Gitblit

parent: 5b181728 | 补丁 | 提交 | ignore whitespace

panlinlin

2021-04-19 41ca4e938d63027931447ebe343f47366194cac2

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

7个文件已修改

	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/build/webpack.dev.conf.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/build/webpack.prod.conf.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/config/index.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/index.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/src/App.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/src/main.js	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java

@@ -69,9 +69,7 @@
        // 可以直接访问的静态数据
        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 @@
    @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()

 web_src/build/webpack.dev.conf.js

@@ -64,8 +64,8 @@
        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/'}
    ])
  ]
})

 web_src/build/webpack.prod.conf.js

@@ -46,7 +46,7 @@
      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 @@
        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/'}
    ])
  ]
})

 web_src/config/index.js

@@ -51,7 +51,7 @@

    // Paths
    assetsRoot: path.resolve(__dirname, '../../src/main/resources/static/'),
    assetsSubDirectory: '.',
    assetsSubDirectory: './static',
    assetsPublicPath: '/',

    /**

 web_src/index.html

@@ -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 -->

 web_src/src/App.vue

@@ -21,6 +21,7 @@
  created() {
    if(!this.$cookies.get("session")){
      //如果没有登录状态则跳转到登录页
      console.log("33333333")
      this.$router.push('/login');
    }
  },
@@ -42,6 +43,7 @@
      //cookie操作方法在源码里有或者参考网上的即可
      if(!this.$cookies.get("session")){
        //如果没有登录状态则跳转到登录页
        console.log("222222222")
        this.$router.push('/login');
      }
    },

 web_src/src/main.js

@@ -41,16 +41,17 @@
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);

			@@ -69,9 +69,7 @@
			// 可以直接访问的静态数据
			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 @@
			@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 @@
			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 @@
			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 @@
			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 @@

			// 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 @@
			created() {
			if(!this.$cookies.get("session")){
			//如果没有登录状态则跳转到登录页
			console.log("33333333")
			this.$router.push('/login');
			}
			},
			@@ -42,6 +43,7 @@
			//cookie操作方法在源码里有或者参考网上的即可
			if(!this.$cookies.get("session")){
			//如果没有登录状态则跳转到登录页
			console.log("222222222")
			this.$router.push('/login');
			}
			},

			@@ -41,16 +41,17 @@
			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);