Merge branch 'test' into dev

王言钊
2 parents 388af642 c726a55d
Showing 1 changed file with 6 additions and 7 deletions
src/main/java/com/cnlive/shenhe/controller/UsersController.java
@@ -35,7 +35,6 @@ import java.util.Map;
  * @Description:
  */
 @Controller
-@RequestMapping("/users")
 public class UsersController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(UsersController.class);
@@ -71,13 +70,13 @@ public class UsersController extends BaseController {
     @Value("${CAS_SERVER_URL_PREFIX}")
     private String CAS_SERVER_URL_PREFIX;
-    @GetMapping(value = "/{id}")
+    @GetMapping(value = "/users/{id}")
     @ResponseBody
     public Object getTest(@PathVariable Integer id) {
         return usersService.get(id);
     }
-    @RequestMapping("/login")
+    @RequestMapping({"/users/login", "/"})
     public String index(HttpServletRequest request) {
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         if (CommonUtils.isNull(principal)) {
@@ -113,7 +112,7 @@ public class UsersController extends BaseController {
         return "page/error.html";
     }
-    @RequestMapping("/logout")
+    @RequestMapping("/users/logout")
     public String logout(HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.SESSION_KEY);
         if (sessionUser != null) {
@@ -131,7 +130,7 @@ public class UsersController extends BaseController {
     }
-    @GetMapping(value = "/page")
+    @GetMapping(value = "/users/page")
     public String page(Model model, UsersDTO usersDTO, HttpSession session) {
         logger.info("列表请求参数:{}", JSON.toJSONString(usersDTO));
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
@@ -169,7 +168,7 @@ public class UsersController extends BaseController {
      * @param session
      * @return
      */
-    @PostMapping(value = "/getNoticeShow")
+    @PostMapping(value = "/users/getNoticeShow")
     @ResponseBody
     public Map<String, Object> getNoticeShow(HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
@@ -199,7 +198,7 @@ public class UsersController extends BaseController {
     }
-    @PostMapping(value = "/write")
+    @PostMapping(value = "/users/write")
     public String write(Model model, Integer userId, String[] write_notice, HttpSession session, String redirect_url) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         ShyUsers user = usersService.get(userId);