Browse Source

Merge remote-tracking branch 'origin/test'

anderx 8 years ago
parent
commit
b1e8843929

+ 24 - 0
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -10,6 +10,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.crypto.hash.SimpleHash;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -361,4 +362,27 @@ public class AppUserController extends BaseApiController {
 		res.setData(demandService.selectDemandDetail( id));
 		return res;
 	}
+	
+
+	/**
+	 * 获取环信登录账号,如果未注册则先注册
+	 */
+	@RequestMapping(value = "/easemob", method = RequestMethod.GET)
+	public Result getEasemob() {
+		User u = TokenManager.getUserToken();
+		if (u != null) {
+			JSONObject res = easemobUtils.send(new EasemobInfo().uri("/users/" + u.getNumber()).method(HttpMethod.GET));
+			JSONObject resultObj = new JSONObject();
+			resultObj.put("easemobPass", new SimpleHash("md5", u.getId(), null, 1).toHex());
+			resultObj.put("easemobName", String.valueOf(u.getNumber()));
+			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
+			if (res == null || StringUtils.equals("service_resource_not_found", (CharSequence) res.get("error"))) {
+				easemobUtils.sendLater(
+						new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
+			}
+			return res().data(resultObj);
+		} else {
+			return res().error(buildError("user only", "必须是登录会员才能访问。"));
+		}
+	}
 }

+ 11 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -297,7 +297,18 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	
+	@RequestMapping(value = "/admin/order", method = RequestMethod.GET)
+	public ModelAndView adminOrder(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/admin/order");
+		return modelview;
+	}
 
+	@RequestMapping(value = "/admin/operate", method = RequestMethod.GET)
+	public ModelAndView adminOperate(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/admin/operate");
+		return modelview;
+	}
+	
 	/**
 	 * 首页
 	 */

+ 0 - 22
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -862,26 +862,4 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-
-	/**
-	 * 获取环信登录账号,如果未注册则先注册
-	 */
-	@RequestMapping(value = "/easemob", method = RequestMethod.GET)
-	public Result getEasemob() {
-		User u = TokenManager.getUserToken();
-		if (u != null) {
-			JSONObject res = easemobUtils.send(new EasemobInfo().uri("/users/" + u.getNumber()).method(HttpMethod.GET));
-			JSONObject resultObj = new JSONObject();
-			resultObj.put("easemobPass", new SimpleHash("md5", u.getId(), null, 1).toHex());
-			resultObj.put("easemobName", String.valueOf(u.getNumber()));
-			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
-			if (res == null || StringUtils.equals("service_resource_not_found", (CharSequence) res.get("error"))) {
-				easemobUtils.sendLater(
-						new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
-			}
-			return res().data(resultObj);
-		} else {
-			return res().error(buildError("user only", "必须是登录会员才能访问。"));
-		}
-	}
 }

+ 15 - 0
src/main/webapp/WEB-INF/views/admin/operate.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>平台管理</title>
+	<link th:href="${staticHost+'/admin/operate.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/operate.js'}"></script>
+	</div>
+</body>
+</html>

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/order.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>订单管理</title>
+	<link th:href="${staticHost+'/admin/order.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/order.js'}"></script>
+	</div>
+</body>
+</html>