Browse Source

与管理平台传输

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@802 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 years ago
parent
commit
613e9fdce3

+ 7 - 5
src/main/java/com/uas/platform/b2b/controller/RegisterController.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.controller;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -82,11 +84,11 @@ public class RegisterController {
 	 * 处理审核结果
 	 */
 	@RequestMapping(value = "/audit", method = RequestMethod.POST)
-	public @ResponseBody ResponseEntity<ModelMap> aduit(Long uu, String result, String reason) {
+	public @ResponseBody ResponseEntity<ModelMap> aduit(Long uu, String result, String reason, HttpServletRequest request) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
-		String aduitReslt = enterpriseService.audit(uu, result, reason);
+		String aduitReslt = enterpriseService.audit(uu, result, reason, request);
 		map.put("aduit", aduitReslt);
 		if (aduitReslt.equals("ALLOW") || aduitReslt.equals("NOTALLOW")) {
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
@@ -94,7 +96,7 @@ public class RegisterController {
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
 		}
 	}
-
+	
 	/**
 	 * 激活码验证激活
 	 */
@@ -133,11 +135,11 @@ public class RegisterController {
 	 * 重新发送激活邮件
 	 */
 	@RequestMapping(value = "/setEmailAgain", method = RequestMethod.GET)
-	public @ResponseBody ResponseEntity<ModelMap> setActivateEmailAgain(Long enuu) {
+	public @ResponseBody ResponseEntity<ModelMap> setActivateEmailAgain(Long enuu, HttpServletRequest request) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
-		String result = enterpriseService.sendActivateEmail(enuu);
+		String result = enterpriseService.sendActivateEmail(enuu, request);
 		map.put("result", result);
 		if (result.equals("SUCCESS")) {// 验证通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);