周伟鹏 / cnlive_shenhe · Commits

Commit ccf9fcf35ea6a9517fdd6436c0183d4b3759215b

Authored by 王言钊
2 parents 388af642 c726a55d

Merge branch 'test' into dev

Inline Side-by-side
Showing 1 changed file with 6 additions and 7 deletions
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @ccf9fcf
... ... @@ -35,7 +35,6 @@ import java.util.Map;
35 35 * @Description:
36 36 */
37 37 @Controller
38   -@RequestMapping("/users")
39 38 public class UsersController extends BaseController {
40 39  
41 40 private static Logger logger = LoggerFactory.getLogger(UsersController.class);
... ... @@ -71,13 +70,13 @@ public class UsersController extends BaseController {
71 70 @Value("${CAS_SERVER_URL_PREFIX}")
72 71 private String CAS_SERVER_URL_PREFIX;
73 72  
74   - @GetMapping(value = "/{id}")
  73 + @GetMapping(value = "/users/{id}")
75 74 @ResponseBody
76 75 public Object getTest(@PathVariable Integer id) {
77 76 return usersService.get(id);
78 77 }
79 78  
80   - @RequestMapping("/login")
  79 + @RequestMapping({"/users/login", "/"})
81 80 public String index(HttpServletRequest request) {
82 81 AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
83 82 if (CommonUtils.isNull(principal)) {
... ... @@ -113,7 +112,7 @@ public class UsersController extends BaseController {
113 112 return "page/error.html";
114 113 }
115 114  
116   - @RequestMapping("/logout")
  115 + @RequestMapping("/users/logout")
117 116 public String logout(HttpSession session) {
118 117 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.SESSION_KEY);
119 118 if (sessionUser != null) {
... ... @@ -131,7 +130,7 @@ public class UsersController extends BaseController {
131 130 }
132 131  
133 132  
134   - @GetMapping(value = "/page")
  133 + @GetMapping(value = "/users/page")
135 134 public String page(Model model, UsersDTO usersDTO, HttpSession session) {
136 135 logger.info("列表请求参数:{}", JSON.toJSONString(usersDTO));
137 136 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
... ... @@ -169,7 +168,7 @@ public class UsersController extends BaseController {
169 168 * @param session
170 169 * @return
171 170 */
172   - @PostMapping(value = "/getNoticeShow")
  171 + @PostMapping(value = "/users/getNoticeShow")
173 172 @ResponseBody
174 173 public Map<String, Object> getNoticeShow(HttpSession session) {
175 174 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
... ... @@ -199,7 +198,7 @@ public class UsersController extends BaseController {
199 198 }
200 199  
201 200  
202   - @PostMapping(value = "/write")
  201 + @PostMapping(value = "/users/write")
203 202 public String write(Model model, Integer userId, String[] write_notice, HttpSession session, String redirect_url) {
204 203 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
205 204 ShyUsers user = usersService.get(userId);
... ...