Browse Source

Merge remote-tracking branch 'origin/test'

anderx 8 years ago
parent
commit
efafc9028d

+ 4 - 5
src/main/java/com/goafanti/order/controller/UserOrderApiController.java

@@ -1,4 +1,4 @@
-package com.goafanti.order.controller;
+package com.goafanti.app.controller;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -16,10 +16,9 @@ import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.service.OrderService;
 
-
 @RestController
-@RequestMapping(value = "/api/user/order")
-public class UserOrderApiController extends CertifyApiController{
+@RequestMapping(value = "/app/order")
+public class AppOrderController extends CertifyApiController{
 	
 	@Resource
 	private OrderService orderServiceImpl;
@@ -221,4 +220,4 @@ public class UserOrderApiController extends CertifyApiController{
 		orderServiceImpl.updateConfirmIntention(Long.valueOf(orderNo),confirm);
 		return res;
 	}
-}
+}

+ 23 - 16
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -17,8 +17,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.view.RedirectView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -55,16 +53,29 @@ public class UserLoginController extends BaseController {
 		return res;
 	}
 
-	@RequestMapping(value = "/login", method = RequestMethod.POST)
-	public ModelAndView doLogin(User user, Boolean rememberMe, HttpServletRequest request, ModelAndView modelview) {
-		TokenManager.login(user, rememberMe);
-		RedirectView rv = new RedirectView();
-		rv.setUrl(request.getContextPath() + "/index");
-		rv.setExposeModelAttributes(false);
-		modelview.setView(rv);
-		return modelview;
+	/**
+	 * 用户登录
+	 * 
+	 * @param user
+	 * @param remember
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value = "/signin", method = RequestMethod.POST)
+	@ResponseBody
+	public Result signin(User user, Boolean remember, HttpServletRequest request) {
+		Result res = new Result();
+		JSONObject jo = (JSONObject) JSON.toJSON(TokenManager.login(user, remember));
+		SavedRequest sr = WebUtils.getAndClearSavedRequest(request);
+		if (sr != null) {
+			jo.put("requestURI", sr.getRequestURI());
+			jo.put("queryString", sr.getQueryString());
+		}
+		res.setToken(SecurityUtils.getSubject().getSession().getId());
+		return res;
 	}
 
+
 	/**
 	 * 用户登录
 	 * 
@@ -73,17 +84,13 @@ public class UserLoginController extends BaseController {
 	 * @param request
 	 * @return
 	 */
-	@RequestMapping(value = "/mLogin", method = RequestMethod.POST)
+	@RequestMapping(value = "/mlogin", method = RequestMethod.POST)
 	@ResponseBody
 	public Result mLogin(User user, Boolean remember, HttpServletRequest request) {
 		Result res = new Result();
 		JSONObject jo = (JSONObject) JSON.toJSON(TokenManager.login(user, remember));
+		
 		UserBasicInfo ubi=userService.selectBaseInfo();
-		/*SavedRequest sr = WebUtils.getAndClearSavedRequest(request);
-		if (sr != null) {
-			jo.put("requestURI", sr.getRequestURI());
-			jo.put("queryString", sr.getQueryString());
-		}*/
 		jo.put("easemobName",ubi.getEasemobName());
 		jo.put("easemobPass",ubi.getEasemobPass());
 		res.setToken(SecurityUtils.getSubject().getSession().getId());

+ 3 - 5
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -58,8 +58,7 @@ public class UserRegisterController extends BaseController {
 	 */
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
 	@ResponseBody
-	public Result register(@Valid InputUser user, String mobileCode,String uuid,
-			BindingResult bindingResult,HttpRequest req) {
+	public Result register(@Valid InputUser user, String mobileCode,BindingResult bindingResult,HttpRequest req) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -125,10 +124,9 @@ public class UserRegisterController extends BaseController {
 	 * @param user
 	 * @return
 	 */
-	@RequestMapping(value = "/mRegister", method = RequestMethod.POST)
+	@RequestMapping(value = "/mregister", method = RequestMethod.POST)
 	@ResponseBody
-	public Result mRegister(@Valid InputUser user, String mobileCode,String uuid,
-			BindingResult bindingResult,HttpRequest req) {
+	public Result mRegister(@Valid InputUser user, String mobileCode,String uuid,BindingResult bindingResult,HttpRequest req) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),

+ 3 - 5
src/main/resources/shiro_base_auth.ini

@@ -6,14 +6,12 @@
 /user/subscriberDetail.html=anon
 /user/login.html=anon
 /user/login=anon
-/user/msignIn=anon
-/user/msignIn.html=anon
-/user/login=anon
-/user/signIn.html=anon
 /admin/login=anon
 /admin/login.html=anon
 /admin/set.html=admin
 /admin/index.html=admin
+/app/mlogin=anon
+/app/mregister=anon
 /signin=anon
 /managesignin=anon
 /register=anon
@@ -22,7 +20,7 @@
 /static/**=anon
 /portal/**=anon
 /api/portal/**=anon
-/api/admin/**=admin,permission
+/api/admin/**=admin
 /api/user/partner/**=anon
 /api/user/**=login
 /admin/servicesManage/**=admin