修改访问路径

src/main/java/com/izouma/awesomeadmin/web/MainController.java

@@ -6,6 +6,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
+
 
 /**
  * 首页
@@ -15,13 +17,15 @@ import org.springframework.web.servlet.ModelAndView;
 public class MainController {
 
 
-
     @RequestMapping(value = "/index", method = RequestMethod.GET)
     @ResponseBody
     public ModelAndView home() {
-        return new ModelAndView("html/index.html");
+        return new ModelAndView("redirect:/admin");
     }
 
-
+    @RequestMapping("/admin")
+    public ModelAndView index(HttpServletRequest request) {
+        return new ModelAndView("html/admin.html");
+    }
 
 }

src/main/java/com/izouma/awesomeadmin/web/admin/AdminController.java

@@ -1,18 +0,0 @@
-package com.izouma.awesomeadmin.web.admin;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-@Controller
-@RequestMapping("/admin")
-public class AdminController {
-
-    @RequestMapping("/")
-    public ModelAndView index(HttpServletRequest request) {
-        return new ModelAndView("html/admin.html");
-    }
-
-}

src/main/java/com/izouma/awesomeadmin/web/admin/SuperUserController.java

@@ -1,201 +0,0 @@
-package com.izouma.awesomeadmin.web.admin;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.izouma.awesomeadmin.constant.AppConstant;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.dto.Result;
-import com.izouma.awesomeadmin.model.SuperUser;
-import com.izouma.awesomeadmin.service.SuperUserService;
-import com.izouma.awesomeadmin.util.CookieUtil;
-
-@Controller
-@RequestMapping("/super")
-//url：/模块/资源/{id}/细分
-public class SuperUserController {
-
-    @Autowired
-    private SuperUserService superUserService;
-
-
-    @RequestMapping(value = "/getSuperUser", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getSuperUser(@RequestParam(required = false, value = "userId") String userId) {
-
-        SuperUser superUser = superUserService.getSuperUserById(userId);
-        return new Result(true, superUser);
-
-    }
-
-
-    @RequestMapping(value = "/getSuperUserList", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getSuperUserList() {
-
-        Map<String, List<SuperUser>> result = new HashMap<>();
-        List<SuperUser> superUserList = superUserService.getSuperUserList();
-        result.put("superUserList", superUserList);
-        return new Result(true, result);
-
-    }
-
-
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    @ResponseBody
-    public List<SuperUser> getAllSuperUser() {
-
-        List<SuperUser> superUserList = superUserService.getSuperUserList();
-
-        return superUserList;
-    }
-
-
-    @RequestMapping(value = "/getSuperUserPage", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getSuperUserPage(Page page) {
-
-        // 创建分页对象
-
-        Map<String, Object> result = new HashMap<>();
-        List<SuperUser> superUserPage = superUserService.getSuperUserByPage(page);
-        result.put(AppConstant.PAGE, page);
-        result.put("superUserPage", superUserPage);
-        return new Result(true, result);
-
-    }
-
-
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateSuperUser(HttpServletRequest request) {
-
-        boolean isSuccess;
-
-        isSuccess = superUserService.updateSuperUserInfo(request);
-
-        if (isSuccess) {
-            return new Result(true, "更新成功");
-        } else {
-            return new Result(false, "更新失败");
-        }
-    }
-
-
-    @RequestMapping(value = "/updateUser", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateUser(SuperUser superUser) {
-
-        boolean isSuccess;
-
-        isSuccess = superUserService.updateUser(superUser);
-
-        if (isSuccess) {
-            return new Result(true, "更新成功");
-        } else {
-            return new Result(false, "更新失败");
-        }
-    }
-
-
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ResponseBody
-    public Result saveUserInfo(SuperUser superUser) {
-
-        boolean num = superUserService.createUser(superUser);
-        if (num) {
-            return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
-
-    }
-
-
-    /**
-     * <p>删除用户。</p>
-     *
-     * @param productId
-     * @return
-     */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    @ResponseBody
-    public Result deleteUserInfoById(@RequestParam(required = true, value = "userId") String userId) {
-
-        boolean num = superUserService.deleteUser(userId);
-        if (num) {
-            return new Result(true, "删除成功");
-        }
-        return new Result(false, "删除异常");
-
-    }
-
-
-    @ResponseBody
-    @RequestMapping(value = "login", method = RequestMethod.POST)
-    public Result Login(HttpServletRequest request, HttpServletResponse response, String userName, String password, boolean remember, String code) {
-
-        if (null == userName || "".equals(userName)) {
-            return new Result(false, "用户名或密码错误");
-        }
-        String authCode = (String) request.getSession(true).getAttribute("rand");
-        if (!code.toLowerCase().equals(authCode)) {
-            return new Result(false, "验证码错误");
-        }
-        SuperUser user = superUserService.UserLogin(userName, password);
-
-        if (null != user) {
-
-            String userId = user.getUserId() + "";
-
-            request.getSession(true).setAttribute("userId", userId);
-            request.getSession(true).setAttribute("superUserName", userName);
-
-            if (remember) {
-
-                int maxAge = 7 * 24 * 60 * 60;
-                CookieUtil.addCookie(response, "userId", userId, maxAge);
-                CookieUtil.addCookie(response, "superUserName", userName, maxAge);
-
-                if (request.getParameter("remember") != null) {
-                    if (request.getParameter("remember").equals("true")) {
-                        HttpSession session = request.getSession();
-                        CookieUtil.addCookie(response, "JSESSIONID", session.getId(), 7 * 24 * 60 * 60);
-                    }
-                }
-            }
-            return new Result(true, "登陆成功");
-        } else {
-            return new Result(false, "用户名或密码错误");
-        }
-
-    }
-
-
-    @ResponseBody
-    @RequestMapping(value = "logout", method = RequestMethod.POST)
-    public Result logout(HttpServletRequest request, HttpServletResponse response) {
-
-        //cookie生命周期设置为20小时
-        int maxAge = -1;
-        CookieUtil.addCookie(response, "userId", "-1", maxAge);
-        CookieUtil.addCookie(response, "superUserName", "-1", maxAge);
-
-        request.getSession().invalidate();
-        //设置登陆状态
-        return new Result(true, "退出成功");
-
-    }
-
-}

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><title>admin</title><script defer=defer src=https://use.fontawesome.com/releases/v5.0.10/js/all.js integrity=sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+ crossorigin=anonymous></script><link href=/static/css/app.c4e2089658114c0517988c62fc3e6808.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7c41e4571cc345006728.js></script><script type=text/javascript src=/static/js/vendor.e766ae602eb1e7d4c09d.js></script><script type=text/javascript src=/static/js/app.042e2283cddccddfa3ca.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=static/favicon.ico><script defer=defer src=https://use.fontawesome.com/releases/v5.0.10/js/all.js integrity=sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+ crossorigin=anonymous></script><link href=/static/css/app.088b4c7451f9da1efa0fce216e8a420c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.0aa8bc9b6ddaf29afc1d.js></script><script type=text/javascript src=/static/js/vendor.0cc822bc4c1bee3013ac.js></script><script type=text/javascript src=/static/js/app.78a637dc787e718dced1.js></script></body></html>

src/main/webapp/static/js/23.756da192a4ed8e5ce106.js

@@ -0,0 +1,2 @@
+webpackJsonp([23],{BXS2:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=o("mtWM"),a=o.n(r),n={data:function(){return{taskForm:[],taskFormData:{},loading:!1}},created:function(){var t=this;this.$http.get({url:"/rest/form/form-data",data:{taskId:this.$route.query.id}}).then(function(e){t.taskForm=e.formProperties,t.taskFormData={}})},methods:{completeTask:function(){var t=this;this.$refs.taskForm.validate(function(e){e&&(t.loading=!0,a.a.post("rest/form/form-data",{taskId:t.$route.query.id,properties:t.$refs.taskForm.getData()}).then(function(e){t.loading=!1,t.$message.success("成功"),t.$router.go(-1)}).catch(function(e){console.log(e),t.loading=!1,t.$message.error("失败")}))})}},components:{DynamicForm:o("uBmv").a}},s={render:function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div",[o("h3"),t._v(" "),o("dynamic-form",{ref:"taskForm",staticStyle:{width:"500px"},attrs:{formProps:t.taskForm}},[o("el-form-item",[o("el-button",{on:{click:function(e){t.$router.go(-1)}}},[t._v("取消")]),t._v(" "),o("el-button",{attrs:{type:"primary",loading:t.loading},on:{click:t.completeTask}},[t._v("完成")])],1)],1)],1)},staticRenderFns:[]};var i=o("VU/8")(n,s,!1,function(t){o("j9OR")},"data-v-75280462",null);e.default=i.exports},j9OR:function(t,e){}});
+//# sourceMappingURL=23.756da192a4ed8e5ce106.js.map

src/main/webapp/static/js/12.d02b67152ebd1f618c98.js → src/main/webapp/static/js/35.ff2dfa1ec6141f726df6.js

@@ -1,2 +1,2 @@
-webpackJsonp([12],{Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("Zzdq")},"data-v-3122cd72",null);t.default=s.exports},Zzdq:function(e,t){}});
-//# sourceMappingURL=12.d02b67152ebd1f618c98.js.map
+webpackJsonp([35],{Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("awIv")},"data-v-3d1f3150",null);t.default=s.exports},awIv:function(e,t){}});
+//# sourceMappingURL=35.ff2dfa1ec6141f726df6.js.map

src/main/webapp/static/js/36.a13305a657fd2b1a4dea.js

@@ -0,0 +1,2 @@
+webpackJsonp([36],{Ll7Y:function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=i("mtWM"),a=i.n(n),s={data:function(){return{url:"",percentage:0,building:!1}},methods:{deploy:function(){var t=this;this.$confirm("确定重新部署?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){a.a.post("http://49.4.67.181:8000/job/信牧基础平台/build",{auth:{username:"admin",password:"3edc#EDC"}}).then(function(e){201===e.status&&(t.buildid=/(.*)\/(.+?)\/$/.exec(e.headers.location)[2],t.percentage=0,t.building=!0,t.pollingStatus())})}).catch(function(){})},pollingStatus:function(){var t=this;a.a.get("http://49.4.67.181:8000/job/信牧基础平台/"+this.buildid+"/api/json").then(function(e){if(200===e.status)if(e.data.building){var i=100*((new Date).getTime()-e.data.timestamp)/e.data.estimatedDuration;i=i<0?0:i>=100?99:parseInt(i),t.percentage=i,setTimeout(function(){t.pollingStatus()},500)}else t.percentage=100,t.building=!1,t.$message.success("部署成功")})}}},o={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",[this.building?e("div",[e("div",{staticStyle:{color:"#606266","font-size":"14px"}},[this._v("部署中")]),this._v(" "),e("el-progress",{attrs:{percentage:this.percentage}})],1):e("div",[e("el-alert",{attrs:{title:"请谨慎操作",type:"warning",description:"重新部署会导致网站暂时无法访问",closable:!1,"show-icon":""}}),this._v(" "),e("el-button",{staticStyle:{"margin-top":"20px"},attrs:{size:"small"},on:{click:this.deploy}},[this._v("重新部署")])],1)])},staticRenderFns:[]};var c=i("VU/8")(s,o,!1,function(t){i("iIFa")},"data-v-2fc804dc",null);e.default=c.exports},iIFa:function(t,e){}});
+//# sourceMappingURL=36.a13305a657fd2b1a4dea.js.map