il y a 6 ans · d4828c3964
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 
				 .idea
			
 
				 node_modules/
			
 
				 /target
			
 
				-*.iml
			
 
				+*.iml
			
 
				+/src/main/webapp/static
			
--- a/src/main/java/com/izouma/awesomeadmin/web/MainController.java
+++ b/src/main/java/com/izouma/awesomeadmin/web/MainController.java
@@ -29,12 +29,12 @@ public class MainController {
 
				 
			
 
				     @RequestMapping("/index")
			
 
				     public ModelAndView index(HttpServletRequest request) {
			
 
				-        return new ModelAndView("html/index.html");
			
 
				+        return new ModelAndView("html/admin.html");
			
 
				     }
			
 
				 
			
 
				     @RequestMapping("/")
			
 
				     public ModelAndView autoIndex(HttpServletRequest request) {
			
 
				-        return new ModelAndView("html/yimishijie.html");
			
 
				+        return new ModelAndView("html/admin.html");
			
 
				     }
			
 
				 
			
 
				     @RequestMapping("/admin")
			
@@ -49,7 +49,7 @@ public class MainController {
 
				 
			
 
				     @RequestMapping("/home")
			
 
				     public ModelAndView home(HttpServletRequest request) {
			
 
				-        return new ModelAndView("html/yimishijie.html");
			
 
				+        return new ModelAndView("html/admin.html");
			
 
				     }
			
 
				 
			
 
				     @RequestMapping("/loginAdmin")
			
--- a/src/main/vue/src/pages/Login.vue
+++ b/src/main/vue/src/pages/Login.vue
@@ -27,38 +27,41 @@ export default {
 
				             loading: false,
			
 
				             userInfo: {
			
 
				                 username: '',
			
 
				-                password: ''
			
 
				-            }
			
 
				-        }
			
 
				+                password: '',
			
 
				+            },
			
 
				+        };
			
 
				     },
			
 
				     methods: {
			
 
				         login() {
			
 
				             this.$refs.form.validate(valid => {
			
 
				                 if (valid) {
			
 
				                     this.loading = true;
			
 
				-                    this.$http.post({
			
 
				-                        url: '/auth/login',
			
 
				-                        data: {
			
 
				-                            username: this.userInfo.username,
			
 
				-                            password: this.userInfo.password,
			
 
				-                            remember: this.rememberMe
			
 
				-                        }
			
 
				-                    }).then(res => {
			
 
				-                        this.loading = false;
			
 
				-                        if (res.success) {
			
 
				-                            // this.$router.replace('/');
			
 
				-                            window.location = this.$baseUrl + 'admin'
			
 
				-                        } else {
			
 
				-                            this.$message.error('登录失败');
			
 
				-                        }
			
 
				-                    }).catch(() => {
			
 
				-                        this.loading = false;
			
 
				-                    })
			
 
				+                    this.$http
			
 
				+                        .post({
			
 
				+                            url: '/auth/login',
			
 
				+                            data: {
			
 
				+                                username: this.userInfo.username,
			
 
				+                                password: this.userInfo.password,
			
 
				+                                remember: this.rememberMe,
			
 
				+                            },
			
 
				+                        })
			
 
				+                        .then(res => {
			
 
				+                            this.loading = false;
			
 
				+                            if (res.success) {
			
 
				+                                this.$router.replace('/');
			
 
				+                                //window.location = this.$baseUrl + 'admin'
			
 
				+                            } else {
			
 
				+                                this.$message.error('登录失败');
			
 
				+                            }
			
 
				+                        })
			
 
				+                        .catch(() => {
			
 
				+                            this.loading = false;
			
 
				+                        });
			
 
				                 }
			
 
				-            })
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				+            });
			
 
				+        },
			
 
				+    },
			
 
				+};
			
 
				 </script>
			
 
				 <style lang="less" scoped>
			
 
				 .container {
			
--- a/src/main/vue/src/pages/StoreServices.vue
+++ b/src/main/vue/src/pages/StoreServices.vue
@@ -531,7 +531,7 @@ export default {
 
				                 searchKey: this.filter1,
			
 
				                 advancedQuery: this.advancedQuerySearchKey,
			
 
				                 orderByStr: this.orderByStr,
			
 
				-                typeFlag: this.type_flag,
			
 
				+                typeFlag: this.typeFlag,
			
 
				             };
			
 
				 
			
 
				             if (this.$route.query.column) {
			
--- a/src/main/webapp/WEB-INF/html/admin.html
+++ b/src/main/webapp/WEB-INF/html/admin.html
@@ -1 +1 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.e95f4bdd1cd9c08fb560ff59f29250f5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.48d91fedc1a08124414e.js></script><script type=text/javascript src=/static/js/vendor.7594de9aaa3d9dda0ec6.js></script><script type=text/javascript src=/static/js/admin.63eaf567edecf4ea8a86.js></script></body></html>
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.661cd1bd57d7b522fd0f1d007b3649f0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7555c15cf233ceffe8b8.js></script><script type=text/javascript src=/static/js/vendor.2d801d5bea528631b5ee.js></script><script type=text/javascript src=/static/js/admin.a06072df756e9bd581f2.js></script></body></html>
			
--- a/src/main/webapp/WEB-INF/html/loginAdmin.html
+++ b/src/main/webapp/WEB-INF/html/loginAdmin.html
@@ -1 +1 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.46a5161090cd0d8998f220733fc576f0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.48d91fedc1a08124414e.js></script><script type=text/javascript src=/static/js/vendor.7594de9aaa3d9dda0ec6.js></script><script type=text/javascript src=/static/js/loginAdmin.f71354eb64421d74f100.js></script></body></html>
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.3c1c8ab2212aab036253e14af8891636.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7555c15cf233ceffe8b8.js></script><script type=text/javascript src=/static/js/vendor.2d801d5bea528631b5ee.js></script><script type=text/javascript src=/static/js/loginAdmin.261b9900505e924a654f.js></script></body></html>
			
--- a/src/main/webapp/static/css/admin.e95f4bdd1cd9c08fb560ff59f29250f5.css
+++ b/src/main/webapp/static/css/admin.e95f4bdd1cd9c08fb560ff59f29250f5.css
--- a/src/main/webapp/static/css/loginAdmin.46a5161090cd0d8998f220733fc576f0.css
+++ b/src/main/webapp/static/css/loginAdmin.46a5161090cd0d8998f220733fc576f0.css
--- a/src/main/webapp/static/img/demo_picture.d0e14fc.jpg
+++ b/src/main/webapp/static/img/demo_picture.d0e14fc.jpg
--- a/src/main/webapp/static/js/0.7369281aa186a9b26892.js
+++ b/src/main/webapp/static/js/0.7369281aa186a9b26892.js
--- a/src/main/webapp/static/js/1.fc7c0688313884b523b5.js
+++ b/src/main/webapp/static/js/1.fc7c0688313884b523b5.js
--- a/src/main/webapp/static/js/10.939c5b18ae2d6609e5df.js
+++ b/src/main/webapp/static/js/10.939c5b18ae2d6609e5df.js
--- a/src/main/webapp/static/js/100.abc8d5b9377068791ea0.js
+++ b/src/main/webapp/static/js/100.abc8d5b9377068791ea0.js
--- a/src/main/webapp/static/js/101.022cad42e09739f14890.js
+++ b/src/main/webapp/static/js/101.022cad42e09739f14890.js
--- a/src/main/webapp/static/js/102.45d4f1f0cb7866682476.js
+++ b/src/main/webapp/static/js/102.45d4f1f0cb7866682476.js
--- a/src/main/webapp/static/js/103.3610745d28c79d804613.js
+++ b/src/main/webapp/static/js/103.3610745d28c79d804613.js
--- a/src/main/webapp/static/js/104.5ac8b4b388fa83b379dc.js
+++ b/src/main/webapp/static/js/104.5ac8b4b388fa83b379dc.js
--- a/src/main/webapp/static/js/105.db3d24805fbe4cec88ee.js
+++ b/src/main/webapp/static/js/105.db3d24805fbe4cec88ee.js
--- a/src/main/webapp/static/js/106.42a213c0b3a4abf526b2.js
+++ b/src/main/webapp/static/js/106.42a213c0b3a4abf526b2.js
--- a/src/main/webapp/static/js/107.4d5c5ac3795315c1ab6a.js
+++ b/src/main/webapp/static/js/107.4d5c5ac3795315c1ab6a.js
--- a/src/main/webapp/static/js/108.fc27d69ac2993db5f233.js
+++ b/src/main/webapp/static/js/108.fc27d69ac2993db5f233.js
--- a/src/main/webapp/static/js/109.43ca5e671cd30e78dd2c.js
+++ b/src/main/webapp/static/js/109.43ca5e671cd30e78dd2c.js
--- a/src/main/webapp/static/js/11.dc8425e3630d1051ff7f.js
+++ b/src/main/webapp/static/js/11.dc8425e3630d1051ff7f.js
--- a/src/main/webapp/static/js/110.a3e8f62bf4a833735f91.js
+++ b/src/main/webapp/static/js/110.a3e8f62bf4a833735f91.js
@@ -1 +0,0 @@
 
				-webpackJsonp([110],{izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("xnY9")},"data-v-04168182",null);e.default=c.exports},xnY9:function(t,e){}});
			
--- a/src/main/webapp/static/js/111.cf285bf1f4ff52b1b9f4.js
+++ b/src/main/webapp/static/js/111.cf285bf1f4ff52b1b9f4.js
--- a/src/main/webapp/static/js/112.612048cd8a4c080ead16.js
+++ b/src/main/webapp/static/js/112.612048cd8a4c080ead16.js
--- a/src/main/webapp/static/js/12.e30c3d3fd63ed330fd2d.js
+++ b/src/main/webapp/static/js/12.e30c3d3fd63ed330fd2d.js
--- a/src/main/webapp/static/js/13.e0bdde1e2925d4698bb1.js
+++ b/src/main/webapp/static/js/13.e0bdde1e2925d4698bb1.js
--- a/src/main/webapp/static/js/14.88eeae8c56b6e4edb0e3.js
+++ b/src/main/webapp/static/js/14.88eeae8c56b6e4edb0e3.js
--- a/src/main/webapp/static/js/15.c6641245ee8c914e6d73.js
+++ b/src/main/webapp/static/js/15.c6641245ee8c914e6d73.js
--- a/src/main/webapp/static/js/16.bc9cc27bcf22c1654120.js
+++ b/src/main/webapp/static/js/16.bc9cc27bcf22c1654120.js
--- a/src/main/webapp/static/js/17.9563e030fd61f6c15e00.js
+++ b/src/main/webapp/static/js/17.9563e030fd61f6c15e00.js
--- a/src/main/webapp/static/js/18.cd378ac2051ab8978fe2.js
+++ b/src/main/webapp/static/js/18.cd378ac2051ab8978fe2.js
--- a/src/main/webapp/static/js/19.a5297d82f675d5508dc6.js
+++ b/src/main/webapp/static/js/19.a5297d82f675d5508dc6.js
--- a/src/main/webapp/static/js/2.0b3c6d27be7789812b97.js
+++ b/src/main/webapp/static/js/2.0b3c6d27be7789812b97.js
--- a/src/main/webapp/static/js/20.428fcb45e607cf1f6d49.js
+++ b/src/main/webapp/static/js/20.428fcb45e607cf1f6d49.js
--- a/src/main/webapp/static/js/21.89d2174b1dd97cde7b9c.js
+++ b/src/main/webapp/static/js/21.89d2174b1dd97cde7b9c.js
--- a/src/main/webapp/static/js/22.03ef756df34eebefa0bf.js
+++ b/src/main/webapp/static/js/22.03ef756df34eebefa0bf.js
--- a/src/main/webapp/static/js/23.5d713dcd77f09466c963.js
+++ b/src/main/webapp/static/js/23.5d713dcd77f09466c963.js
--- a/src/main/webapp/static/js/24.f4bb95a492c71cf4df95.js
+++ b/src/main/webapp/static/js/24.f4bb95a492c71cf4df95.js
--- a/src/main/webapp/static/js/25.1b0f26684b4939aad821.js
+++ b/src/main/webapp/static/js/25.1b0f26684b4939aad821.js
--- a/src/main/webapp/static/js/26.03a6d17f5fd8c4887311.js
+++ b/src/main/webapp/static/js/26.03a6d17f5fd8c4887311.js
--- a/src/main/webapp/static/js/27.6c4705a440ab97b18a1d.js
+++ b/src/main/webapp/static/js/27.6c4705a440ab97b18a1d.js
--- a/src/main/webapp/static/js/28.aea645a5e7928972164c.js
+++ b/src/main/webapp/static/js/28.aea645a5e7928972164c.js
--- a/src/main/webapp/static/js/29.c57f3e3c61cdd0ad7f64.js
+++ b/src/main/webapp/static/js/29.c57f3e3c61cdd0ad7f64.js
--- a/src/main/webapp/static/js/3.3059e7a9f4084e900660.js
+++ b/src/main/webapp/static/js/3.3059e7a9f4084e900660.js
--- a/src/main/webapp/static/js/30.677a94647e443a8ca369.js
+++ b/src/main/webapp/static/js/30.677a94647e443a8ca369.js
--- a/src/main/webapp/static/js/31.090dac2673207699097b.js
+++ b/src/main/webapp/static/js/31.090dac2673207699097b.js
--- a/src/main/webapp/static/js/32.97e523460970a5ef486d.js
+++ b/src/main/webapp/static/js/32.97e523460970a5ef486d.js
--- a/src/main/webapp/static/js/33.c0749bbc10fe97ae7dee.js
+++ b/src/main/webapp/static/js/33.c0749bbc10fe97ae7dee.js
--- a/src/main/webapp/static/js/34.db15fdacb14bb2d772fd.js
+++ b/src/main/webapp/static/js/34.db15fdacb14bb2d772fd.js
--- a/src/main/webapp/static/js/35.e9a359dbff343e577be2.js
+++ b/src/main/webapp/static/js/35.e9a359dbff343e577be2.js
--- a/src/main/webapp/static/js/36.a7db0e5a8590caf54532.js
+++ b/src/main/webapp/static/js/36.a7db0e5a8590caf54532.js
--- a/src/main/webapp/static/js/37.f390c28fe31d2f80b4fc.js
+++ b/src/main/webapp/static/js/37.f390c28fe31d2f80b4fc.js
--- a/src/main/webapp/static/js/38.8a13aeb0af7b2dbfe2c6.js
+++ b/src/main/webapp/static/js/38.8a13aeb0af7b2dbfe2c6.js
--- a/src/main/webapp/static/js/39.de9bb8fe1b2ba2a8d8fa.js
+++ b/src/main/webapp/static/js/39.de9bb8fe1b2ba2a8d8fa.js
--- a/src/main/webapp/static/js/4.fbb3ac135b4a605464b6.js
+++ b/src/main/webapp/static/js/4.fbb3ac135b4a605464b6.js
--- a/src/main/webapp/static/js/40.a6bcb0f50bafc8861628.js
+++ b/src/main/webapp/static/js/40.a6bcb0f50bafc8861628.js
--- a/src/main/webapp/static/js/41.11e8ddd97e5a68a00f25.js
+++ b/src/main/webapp/static/js/41.11e8ddd97e5a68a00f25.js
--- a/src/main/webapp/static/js/42.2eb64def99bec4fe7e19.js
+++ b/src/main/webapp/static/js/42.2eb64def99bec4fe7e19.js
--- a/src/main/webapp/static/js/43.13652a0a0738faaac52c.js
+++ b/src/main/webapp/static/js/43.13652a0a0738faaac52c.js
--- a/src/main/webapp/static/js/44.350607e4f2160a9ba99b.js
+++ b/src/main/webapp/static/js/44.350607e4f2160a9ba99b.js
--- a/src/main/webapp/static/js/45.37dffe12d128668e7fcc.js
+++ b/src/main/webapp/static/js/45.37dffe12d128668e7fcc.js
--- a/src/main/webapp/static/js/46.b26c616f3d5f7b71fc35.js
+++ b/src/main/webapp/static/js/46.b26c616f3d5f7b71fc35.js
--- a/src/main/webapp/static/js/47.383edd76f598a2f06d60.js
+++ b/src/main/webapp/static/js/47.383edd76f598a2f06d60.js
--- a/src/main/webapp/static/js/48.99ff6cfc6e2022a3b835.js
+++ b/src/main/webapp/static/js/48.99ff6cfc6e2022a3b835.js
--- a/src/main/webapp/static/js/49.da7f5abd6857072df56c.js
+++ b/src/main/webapp/static/js/49.da7f5abd6857072df56c.js
--- a/src/main/webapp/static/js/5.b9648f1f21acd13f6135.js
+++ b/src/main/webapp/static/js/5.b9648f1f21acd13f6135.js
--- a/src/main/webapp/static/js/50.9a437f4ac706dec55f85.js
+++ b/src/main/webapp/static/js/50.9a437f4ac706dec55f85.js
--- a/src/main/webapp/static/js/51.6f1538118182f45526a5.js
+++ b/src/main/webapp/static/js/51.6f1538118182f45526a5.js
--- a/src/main/webapp/static/js/52.7723a40ad7777d6562e3.js
+++ b/src/main/webapp/static/js/52.7723a40ad7777d6562e3.js
--- a/src/main/webapp/static/js/53.67372b767496f4030acf.js
+++ b/src/main/webapp/static/js/53.67372b767496f4030acf.js
--- a/src/main/webapp/static/js/54.5b7868e58a78361d842e.js
+++ b/src/main/webapp/static/js/54.5b7868e58a78361d842e.js
--- a/src/main/webapp/static/js/55.633090a66d037d0be1f3.js
+++ b/src/main/webapp/static/js/55.633090a66d037d0be1f3.js
--- a/src/main/webapp/static/js/56.1cdccb668ab5451428e2.js
+++ b/src/main/webapp/static/js/56.1cdccb668ab5451428e2.js
--- a/src/main/webapp/static/js/57.15da053143e2621c0f96.js
+++ b/src/main/webapp/static/js/57.15da053143e2621c0f96.js
--- a/src/main/webapp/static/js/58.688ad395d5669fae1e51.js
+++ b/src/main/webapp/static/js/58.688ad395d5669fae1e51.js
--- a/src/main/webapp/static/js/59.e5c0e524d406a84fdab3.js
+++ b/src/main/webapp/static/js/59.e5c0e524d406a84fdab3.js
--- a/src/main/webapp/static/js/6.4a3d3f02738c9505a981.js
+++ b/src/main/webapp/static/js/6.4a3d3f02738c9505a981.js
--- a/src/main/webapp/static/js/60.b2659ae1208e4f7d9c95.js
+++ b/src/main/webapp/static/js/60.b2659ae1208e4f7d9c95.js
--- a/src/main/webapp/static/js/61.bcc511777c30eba85035.js
+++ b/src/main/webapp/static/js/61.bcc511777c30eba85035.js
--- a/src/main/webapp/static/js/62.ba126825731bc81c2c7d.js
+++ b/src/main/webapp/static/js/62.ba126825731bc81c2c7d.js
--- a/src/main/webapp/static/js/63.47b488fc7c1758243bdb.js
+++ b/src/main/webapp/static/js/63.47b488fc7c1758243bdb.js
--- a/src/main/webapp/static/js/64.fa7c0ff112d92c34e4ad.js
+++ b/src/main/webapp/static/js/64.fa7c0ff112d92c34e4ad.js
--- a/src/main/webapp/static/js/65.36795bc8a4382bc3fd85.js
+++ b/src/main/webapp/static/js/65.36795bc8a4382bc3fd85.js
--- a/src/main/webapp/static/js/66.66fad3cfc1b6079e6cb9.js
+++ b/src/main/webapp/static/js/66.66fad3cfc1b6079e6cb9.js
--- a/src/main/webapp/static/js/67.c23d5eda88502d704189.js
+++ b/src/main/webapp/static/js/67.c23d5eda88502d704189.js
--- a/src/main/webapp/static/js/68.82af26652ff5bcbb1a9a.js
+++ b/src/main/webapp/static/js/68.82af26652ff5bcbb1a9a.js
--- a/src/main/webapp/static/js/69.6f9e81a0e0c7def61a85.js
+++ b/src/main/webapp/static/js/69.6f9e81a0e0c7def61a85.js
--- a/src/main/webapp/static/js/7.eaaadeb6c5257b210674.js
+++ b/src/main/webapp/static/js/7.eaaadeb6c5257b210674.js
--- a/src/main/webapp/static/js/70.052bcd122066f4f6e0f2.js
+++ b/src/main/webapp/static/js/70.052bcd122066f4f6e0f2.js
--- a/src/main/webapp/static/js/71.fe994f9bb3b397715506.js
+++ b/src/main/webapp/static/js/71.fe994f9bb3b397715506.js
--- a/src/main/webapp/static/js/72.03165cf113972c03fdd1.js
+++ b/src/main/webapp/static/js/72.03165cf113972c03fdd1.js
--- a/src/main/webapp/static/js/73.7cf1234804145905ccb0.js
+++ b/src/main/webapp/static/js/73.7cf1234804145905ccb0.js
--- a/src/main/webapp/static/js/74.ab8e81cab6460a4a2fde.js
+++ b/src/main/webapp/static/js/74.ab8e81cab6460a4a2fde.js
--- a/src/main/webapp/static/js/75.fb7300f18d89824b3c26.js
+++ b/src/main/webapp/static/js/75.fb7300f18d89824b3c26.js
--- a/src/main/webapp/static/js/76.4f6a83adb5d98af46ada.js
+++ b/src/main/webapp/static/js/76.4f6a83adb5d98af46ada.js
--- a/src/main/webapp/static/js/77.0e90b135706e2c70eb74.js
+++ b/src/main/webapp/static/js/77.0e90b135706e2c70eb74.js
--- a/src/main/webapp/static/js/78.c1786d25326408222bd6.js
+++ b/src/main/webapp/static/js/78.c1786d25326408222bd6.js
--- a/src/main/webapp/static/js/79.2701e85a6e4bb88e4d3d.js
+++ b/src/main/webapp/static/js/79.2701e85a6e4bb88e4d3d.js