Просмотр исходного кода

Merge branch 'master' of http://git.izouma.com/xiongzhu/tutuxiang

panhui 6 лет назад
Родитель
Сommit
c319015ffa

+ 5 - 1
src/main/java/com/izouma/awesomeadmin/web/SystemConfigController.java

@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/systemConfig")
-@RequiresAuthentication
 public class SystemConfigController {
 
     @Autowired
@@ -63,6 +62,7 @@ public class SystemConfigController {
     /**
     * <p>分页查询。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, SystemConfig record) {
@@ -79,6 +79,7 @@ public class SystemConfigController {
     /**
     * <p>保存。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(SystemConfig record) {
@@ -92,6 +93,7 @@ public class SystemConfigController {
     /**
     * <p>更新信息。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateSystemConfig(SystemConfig record) {
@@ -105,6 +107,7 @@ public class SystemConfigController {
     /**
     * <p>删除。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteSystemConfig(SystemConfig record) {
@@ -123,6 +126,7 @@ public class SystemConfigController {
     * @param record
     * @throws Exception
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, SystemConfig record) throws Exception {

+ 1 - 1
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.80cb3fa497e32f10a3907ec3acaaf110.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.8f3294bf90efb6c027cf.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/admin.16049591dfe787cc96f5.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.80cb3fa497e32f10a3907ec3acaaf110.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5d9fab8ae664c6096321.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/admin.16049591dfe787cc96f5.js></script></body></html>

+ 1 - 1
src/main/webapp/WEB-INF/html/index.html

@@ -10,7 +10,7 @@
         * {
             padding: 0;
             margin: 0
-        }</style><link href=/static/css/index.431add5826eb8712bcb7cbc28eea7743.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.8f3294bf90efb6c027cf.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/index.733cbe2c5a18056e767f.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.01ccf20b579acf64078f1bf660778049.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5d9fab8ae664c6096321.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/index.a5d379593138563cf942.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;

+ 1 - 1
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.39f9b620c942cbdba0e3f23640ac4990.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.8f3294bf90efb6c027cf.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/loginAdmin.9f3fcd1656128e06ce1a.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.39f9b620c942cbdba0e3f23640ac4990.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5d9fab8ae664c6096321.js></script><script type=text/javascript src=/static/js/vendor.bb9d33d099910f04d2dc.js></script><script type=text/javascript src=/static/js/loginAdmin.9f3fcd1656128e06ce1a.js></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/css/index.01ccf20b579acf64078f1bf660778049.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/31.51c03afd9f431c520d35.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/31.5b88381731db9620f199.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/index.a5d379593138563cf942.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/manifest.5d9fab8ae664c6096321.js


Некоторые файлы не были показаны из-за большого количества измененных файлов