Browse Source

b2b对管理平台,加添加用户的接口

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1627 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
yingp 10 years ago
parent
commit
57d5e5cf2a

+ 9 - 5
src/main/java/com/uas/platform/b2b/controller/UserController.java

@@ -44,6 +44,7 @@ public class UserController {
 
 	/**
 	 * 查看全部用户信息
+	 * 
 	 * @return
 	 */
 	@RequestMapping(method = RequestMethod.GET)
@@ -55,6 +56,7 @@ public class UserController {
 
 	/**
 	 * 手机号是否可用
+	 * 
 	 * @param tel
 	 * @return
 	 */
@@ -96,6 +98,7 @@ public class UserController {
 
 	/**
 	 * 验证用户输入的密码是否正确
+	 * 
 	 * @param email
 	 * @return
 	 */
@@ -174,30 +177,31 @@ public class UserController {
 		logger.log("用户信息", "删除用户,UU:" + uu);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
-	
-	
+
 	/**
 	 * 
 	 * 通过UU号、手机号或邮箱查找用户
+	 * 
 	 * @param keyWord
 	 * @author luoq
 	 * @return
 	 */
 	@RequestMapping(value = "/searchUser", method = RequestMethod.GET)
 	@ResponseBody
-	public UserInfo getUser(String keyWord){
+	public UserInfo getUser(String keyWord) {
 		return userService.findUserByKeyWord(keyWord);
 	}
-	
+
 	/**
 	 * 绑定用户到企业(管理员才能操作)
+	 * 
 	 * @param userUU
 	 * @author luoq
 	 * @return
 	 */
 	@RequestMapping(value = "/bindUser", method = RequestMethod.GET)
 	@ResponseBody
-	public ResponseEntity<String> bindUser(Long userUU){
+	public ResponseEntity<String> bindUser(Long userUU) {
 		userService.bindUserToMyEnterprise(userUU);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}

+ 15 - 20
src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseController.java

@@ -42,13 +42,7 @@ public class EnterpriseController {
 	private RegisterLogService registerLogService;
 
 	/**
-	 * 管理平台项目地址
-	 */
-	public static final String MANAGE_HOST = "http://10.10.100.81:8080/";
-//	public static final String MANAGE_HOST = "http://localhost:9090/platform-manage/";
-	
-	/**
-	 *管理平台获取需要审核的企业
+	 * 管理平台获取需要审核的企业
 	 * 
 	 * @param email
 	 * @return
@@ -58,13 +52,13 @@ public class EnterpriseController {
 	public List<Enterprise> getUnauditedEnterprises() {
 		return enterpriseService.getUnauditedEnterprises();
 	}
-	
+
 	/**
 	 * 成功上传到管理平台的待审核企业
 	 * 
 	 * @param email
 	 * @return
-	 * @throws UnsupportedEncodingException 
+	 * @throws UnsupportedEncodingException
 	 */
 	@RequestMapping(value = "/unauditedSuccess", method = RequestMethod.POST)
 	@ResponseBody
@@ -73,7 +67,7 @@ public class EnterpriseController {
 		List<Long> enUUs = FlexJsonUtils.fromJsonArray(jsonStr, Long.class);
 		enterpriseService.unauditedUploadSuccess(enUUs);
 	}
-	
+
 	/**
 	 * 将管理平台的审核结果写到平台
 	 * 
@@ -100,7 +94,7 @@ public class EnterpriseController {
 	public List<Long> getEnabledEnterprises() {
 		List<Enterprise> enterprises = enterpriseService.getEnabledEnterprises();
 		List<Long> enUUs = new ArrayList<Long>();
-		for(Enterprise enterprise : enterprises) {
+		for (Enterprise enterprise : enterprises) {
 			enUUs.add(enterprise.getUu());
 		}
 		return enUUs;
@@ -111,7 +105,7 @@ public class EnterpriseController {
 	 * 
 	 * @param email
 	 * @return
-	 * @throws UnsupportedEncodingException 
+	 * @throws UnsupportedEncodingException
 	 */
 	@RequestMapping(value = "/enabledSuccess", method = RequestMethod.POST)
 	@ResponseBody
@@ -120,7 +114,7 @@ public class EnterpriseController {
 		List<Long> enUUs = FlexJsonUtils.fromJsonArray(jsonStr, Long.class);
 		enterpriseService.enabledUploadSuccess(enUUs);
 	}
-	
+
 	/**
 	 * 获取平台上记录的注册相关记录
 	 * 
@@ -138,7 +132,7 @@ public class EnterpriseController {
 	 * 
 	 * @param email
 	 * @return
-	 * @throws UnsupportedEncodingException 
+	 * @throws UnsupportedEncodingException
 	 */
 	@RequestMapping(value = "/log", method = RequestMethod.POST)
 	@ResponseBody
@@ -147,29 +141,30 @@ public class EnterpriseController {
 		List<Long> ids = FlexJsonUtils.fromJsonArray(jsonStr, Long.class);
 		registerLogService.upLoadSuccessRegister(ids);
 	}
-	
+
 	/**
 	 * 重新发送激活邮件,可修改邮箱地址
 	 * 
 	 * @param email
 	 * @return
-	 * @throws UnsupportedEncodingException 
+	 * @throws UnsupportedEncodingException
 	 */
 	@RequestMapping(value = "/reSendEmail", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> reSendActivateEmail(Long enUU, String email, HttpServletRequest request) throws UnsupportedEncodingException {
+	public ResponseEntity<String> reSendActivateEmail(Long enUU, String email, HttpServletRequest request)
+			throws UnsupportedEncodingException {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		email = URLDecoder.decode(email, "UTF-8");
 		String result = null;
-		try{
+		try {
 			result = enterpriseService.reSendActivateEmail(enUU, email, request);
-		} catch(Exception e) {
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.EXPECTATION_FAILED);
 		}
 		return new ResponseEntity<String>(result, headers, HttpStatus.OK);
 	}
-	
+
 	/**
 	 * 管理平台创建好SAAS账套之后,邮件通知企业管理员
 	 * 

+ 36 - 0
src/main/java/com/uas/platform/b2b/manage/controller/UserController.java

@@ -0,0 +1,36 @@
+package com.uas.platform.b2b.manage.controller;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.manage.model.AccountInfo;
+import com.uas.platform.b2b.manage.service.UserService;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+
+@Controller(value = "manage.UserController")
+@RequestMapping(value = "/manage/user")
+public class UserController {
+
+	@Autowired
+	private UserService userService;
+
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	public Long add(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		if (!StringUtils.isEmpty(data)) {
+			data = URLDecoder.decode(data, "UTF-8");
+			AccountInfo info = FlexJsonUtils.fromJson(data, AccountInfo.class);
+			return userService.save(info.convert());
+		}
+		return null;
+	}
+
+}

+ 106 - 0
src/main/java/com/uas/platform/b2b/manage/model/AccountInfo.java

@@ -0,0 +1,106 @@
+package com.uas.platform.b2b.manage.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.User;
+
+public class AccountInfo {
+	/**
+	 * 企业UU号
+	 */
+	private Long enUU;
+	/**
+	 * 个人UU号
+	 */
+	private Long userUU;
+	private String name;
+	/**
+	 * 手机号
+	 */
+	private String tel;
+	/**
+	 * 邮箱
+	 */
+	private String email;
+	/**
+	 * 密码(密文)
+	 */
+	private String password;
+
+	public void setEnUU(Long enUU) {
+		this.enUU = enUU;
+	}
+
+	public Long getEnUU() {
+		return enUU;
+	}
+
+	public Long getUserUU() {
+		return userUU;
+	}
+
+	public void setUserUU(Long userUU) {
+		this.userUU = userUU;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getTel() {
+		return tel;
+	}
+
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public AccountInfo() {
+	}
+
+	public AccountInfo(User user) {
+		this.email = user.getUserEmail();
+		this.enUU = user.getEnterprise().getUu();
+		this.name = user.getUserName();
+		this.password = user.getUserPwd();
+		this.tel = user.getUserTel();
+		this.userUU = user.getUserUU();
+	}
+
+	public User convert() {
+		User user = new User();
+		user.setUserEmail(this.email);
+		user.setUserName(this.name);
+		user.setUserTel(this.tel);
+		user.setUserPwd(this.password);
+		Enterprise enterprise = new Enterprise();
+		enterprise.setUu(this.enUU);
+		Set<Enterprise> enterprises = new HashSet<Enterprise>();
+		enterprises.add(enterprise);
+		user.setEnterprises(enterprises);
+		return user;
+	}
+
+}

+ 15 - 0
src/main/java/com/uas/platform/b2b/manage/service/UserService.java

@@ -0,0 +1,15 @@
+package com.uas.platform.b2b.manage.service;
+
+import com.uas.platform.b2b.model.User;
+
+public interface UserService {
+
+	/**
+	 * 保存来自管理平台的新用户
+	 * 
+	 * @param user
+	 * @return
+	 */
+	public Long save(User user);
+
+}

+ 27 - 0
src/main/java/com/uas/platform/b2b/manage/service/impl/UserServiceImpl.java

@@ -0,0 +1,27 @@
+package com.uas.platform.b2b.manage.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.manage.service.UserService;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.util.encry.Md5Utils;
+
+@Service("manage.UserService")
+public class UserServiceImpl implements UserService {
+
+	@Autowired
+	private UserDao userDao;
+
+	@Override
+	public Long save(User user) {
+		user.setEnable(Constant.YES);
+		user = userDao.save(user);
+		user.setUserPwd(Md5Utils.encode(user.getUserPwd(), user.getUserUU()));
+		userDao.save(user);
+		return user.getUserUU();
+	}
+
+}

+ 13 - 21
src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -11,8 +11,8 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -22,12 +22,12 @@ import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.RegisterRecordDao;
 import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.manage.controller.EnterpriseController;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.RegisterRecord;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.HostConstant;
 import com.uas.platform.b2b.support.SendMailService;
 import com.uas.platform.b2b.support.TokenService;
 import com.uas.platform.core.exception.IllegalOperatorException;
@@ -61,8 +61,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	/**
 	 * 不可用的SAAS域名
 	 */
-	private static final String[] UNUSABLE_SAASURL = { "www", "uas", "make", "trade", "usoft", "usoftchina", "usofterp",
-			"report", "", "ubtob", "test" };
+	private static final String[] UNUSABLE_SAASURL = { "www", "uas", "make", "trade", "usoft", "usoftchina", "usofterp", "report", "",
+			"ubtob", "test" };
 
 	@Override
 	public String bussinessCodeEnable(String code) {
@@ -79,8 +79,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	@Override
 	public Enterprise registerEnterprise(Enterprise enterprise, Boolean isSaas) {
 		Enterprise en = enterpriseDao.findEnterpriseByEnBussinessCode(enterprise.getEnBussinessCode());
-		if (en == null && userService.isEmailUseable(enterprise.getEnAdminEmail())
-				&& userService.isTelUseable(enterprise.getEnAdminTel())) {
+		if (en == null && userService.isEmailUseable(enterprise.getEnAdminEmail()) && userService.isTelUseable(enterprise.getEnAdminTel())) {
 			enterprise.setEnDate(new Date());
 			enterprise.setEnable(Constant.NO);
 			if (isSaas != null && isSaas) {// 申请SAAS
@@ -165,8 +164,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		model.put("adminTel", admin.getUserTel());
 		model.put("checkcode", encodeString);
 		try {
-			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model,
-					"velocity/registerActivate.vm");
+			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
 			enterprise.setEnable(Constant.NO);
 			admin.setEnable(Constant.NO);
 			enterpriseDao.save(enterprise);
@@ -208,9 +206,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	 */
 	private void updateManagePassword(Long enUU, String password) {
 		try {
-			Response response = HttpUtil.sendPostRequest(
-					EnterpriseController.MANAGE_HOST + "public/enterprise/password?enUU=" + enUU + "&password=" + password,
-					null, true);
+			Response response = HttpUtil.sendPostRequest(HostConstant.MANAGE_HOST + "public/enterprise/password?enUU=" + enUU
+					+ "&password=" + password, null, true);
 			if (response.getStatusCode() != HttpStatus.OK.value())
 				throw new IllegalOperatorException(response.getResponseText());
 		} catch (Exception e) {
@@ -319,8 +316,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 							sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号和SAAS服务", model,
 									"velocity/registerActivateSaas.vm");
 						} else {
-							sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model,
-									"velocity/registerActivate.vm");
+							sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
 						}
 						registeRecord(enter, "发送审核通过邮件", "成功");
 					} catch (Exception e) {
@@ -341,8 +337,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					model.put("rootpath", AgentUtils.getHost(request));
 					model.put("reason", enterprise.getEnAuditRemark());
 					try {
-						sendMailService.sendTemplateMail(admin.getUserEmail(), "很遗憾账号未能通过审核", model,
-								"velocity/invalid.vm");
+						sendMailService.sendTemplateMail(admin.getUserEmail(), "很遗憾账号未能通过审核", model, "velocity/invalid.vm");
 						registeRecord(enter, "发送审核不通过邮件", "成功");
 					} catch (Exception e) {
 						registeRecord(enter, "发送审核不通过邮件", "失败");
@@ -419,8 +414,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		model.put("adminTel", admin.getUserTel());
 		model.put("checkcode", encodeString);
 		try {
-			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model,
-					"velocity/registerActivate.vm");
+			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
 			enterprise.setEnable(Constant.NO);
 			admin.setEnable(Constant.NO);
 			enterpriseDao.save(enterprise);
@@ -509,8 +503,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		if (!CollectionUtils.isEmpty(enterprises)) {
 			for (Enterprise enterprise : enterprises) {
 				Enterprise enter = enterpriseDao.findEnterpriseByUu(enterprise.getUu());
-				if (enter != null && enter.getEnSaasStatus() != null
-						&& enter.getEnSaasStatus() == Status.UNAUDIT.value()) {
+				if (enter != null && enter.getEnSaasStatus() != null && enter.getEnSaasStatus() == Status.UNAUDIT.value()) {
 					User admin = userDao.findOne(enter.getEnAdminuu());
 					registeRecord(enter, "创建SAAS账套", "成功");
 					enter.setEnSaasStatus((short) Status.ENABLED.value());
@@ -523,8 +516,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 						model.put("rootpath", AgentUtils.getHost(request));
 						model.put("uu", enter.getUu());
 						try {
-							sendMailService.sendTemplateMail(admin.getUserEmail(), "成功开通优软SAAS服务系统", model,
-									"velocity/createdSaas.vm");
+							sendMailService.sendTemplateMail(admin.getUserEmail(), "成功开通优软SAAS服务系统", model, "velocity/createdSaas.vm");
 							registeRecord(enter, "发送SAAS开通提醒邮件", "成功");
 						} catch (Exception e) {
 							registeRecord(enter, "发送SAAS开通提醒邮件", "失败");

+ 67 - 68
src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -90,7 +90,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Autowired
 	private PurchaseOrderIndexDao purchaseOrderIndexDao;
-	
+
 	@Autowired
 	private UserBaseInfoDao userBaseInfoDao;
 
@@ -107,16 +107,16 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			}
 		}, pageInfo);
 	}
-	
+
 	@Override
 	public Page<PurchaseOrderAll> findAllDetailByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
-		if(filter != null) {
-			if(StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
-						.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
-			if(filter.getFromDate() != null)
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword()))
+				pageInfo.expression(PredicateUtils.in("id",
+						purchaseOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
+			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if(filter.getEndDate() != null)
+			if (filter.getEndDate() != null)
 				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
 		}
 		Page<PurchaseOrderAll> pageOrders = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
@@ -124,24 +124,23 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 				Predicate[] predicates = pageInfo.getPredicates(root, query, builder);
 				if (filter != null && filter.getFromDelivery() != null) {
 					predicates = Arrays.copyOf(predicates, predicates.length + 1);
-					SetJoin<PurchaseOrderAll, PurchaseOrderAllItem> join = root.join(root.getModel().
-							getSet("orderItems", PurchaseOrderAllItem.class), JoinType.INNER);
-					Predicate p = builder.greaterThanOrEqualTo(join.get("delivery").as(Date.class), 
-							new Date(filter.getFromDelivery()));
+					SetJoin<PurchaseOrderAll, PurchaseOrderAllItem> join = root.join(
+							root.getModel().getSet("orderItems", PurchaseOrderAllItem.class), JoinType.INNER);
+					Predicate p = builder.greaterThanOrEqualTo(join.get("delivery").as(Date.class), new Date(filter.getFromDelivery()));
 					predicates[predicates.length - 1] = p;
 				}
 				return query.where(predicates).getRestriction();
 			}
 		}, pageInfo);
 		// 明细包含关键词
-		if(filter != null) {
+		if (filter != null) {
 			List<PurchaseOrderAll> orders = pageOrders.getContent();
-			if( ! CollectionUtils.isEmpty(orders)) {
-				for(PurchaseOrderAll order : orders) {
-					if( ! CollectionUtils.isEmpty(order.getOrderItems())) {
-						for(PurchaseOrderAllItem orderItem : order.getOrderItems()) {
-							if(StringUtils.hasText(filter.getKeyword())) {
-								if(FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderAll order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderAllItem orderItem : order.getOrderItems()) {
+							if (StringUtils.hasText(filter.getKeyword())) {
+								if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
 									orderItem.setKey(true);
 								}
 							}
@@ -191,10 +190,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		// 将回复信息推送给采购企业采购员(或管理员)
 		if (order.getUserUU() != null) {
 			Enterprise vendor = enterpriseDao.findOne(order.getVendUU());
-			if(vendor != null) {
+			if (vendor != null) {
 				UserBaseInfo user = userBaseInfoDao.findOne(order.getUserUU());
-				XingePusher.pushByUser(user, "新增采购单回复", "单号:" + order.getCode()
-					+ ",供应商:" + vendor.getEnName(), "", "");
+				XingePusher.pushByUser(user, "新增采购单回复", "单号:" + order.getCode() + ",供应商:" + vendor.getEnName(), "", "");
 			}
 		}
 		return reply;
@@ -206,7 +204,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	private PurchaseOrder updateOrderStatus(long orderId) {
 		int notReply = purchaseOrderItemDao.getCountByStatus(orderId, (short) Status.NOT_REPLY.value());
 		PurchaseOrder order = purchaseOrderDao.findOne(orderId);
-		if(order.getDisplay() == 1) order.setDisplay(Constant.NO);//设置查看状态为已查看
+		if (order.getDisplay() == 1)
+			order.setDisplay(Constant.NO);// 设置查看状态为已查看
 		order.setStatus((short) (notReply > 0 ? Status.NOT_REPLY.value() : Status.REPLIED.value()));
 		if (purchaseOrderItemDao.getCountByReply(orderId) > 0)
 			order.setReply(Constant.YES);
@@ -221,8 +220,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public PurchaseOrderAll findByCode(String code) {
-		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByVendUUAndCode(SystemSession.getUser()
-				.getEnterprise().getUu(), code);
+		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByVendUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
+				code);
 		if (purchaseOrderAlls.size() == 0)
 			throw new NotFoundException(code);
 		return purchaseOrderAlls.get(0);
@@ -260,8 +259,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public List<PurchaseOrderReply> findNotUploadReply() {
-		return purchaseOrderReplyDao.findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(),
-				(short) Status.NOT_UPLOAD.value());
+		return purchaseOrderReplyDao
+				.findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_UPLOAD.value());
 	}
 
 	@Override
@@ -342,19 +341,19 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public int getOnhandCount() {
-		return purchaseOrderDao.getCountByVendUUAndStatus(SystemSession.getUser().getEnterprise().getUu(),
-				(short) Status.NOT_REPLY.value());
+		return purchaseOrderDao
+				.getCountByVendUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_REPLY.value());
 	}
 
 	@Override
 	public Page<PurchaseOrderTodo> findTodoByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
-		if(filter != null) {
-			if(StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
-						.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
-			if(filter.getFromDate() != null)
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword()))
+				pageInfo.expression(PredicateUtils.in("id",
+						purchaseOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
+			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if(filter.getEndDate() != null)
+			if (filter.getEndDate() != null)
 				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
 		}
 		Page<PurchaseOrderTodo> pageOrders = purchaseOrderTodoDao.findAll(new Specification<PurchaseOrderTodo>() {
@@ -363,13 +362,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			}
 		}, pageInfo);
 		// 明细包含关键词
-		if(filter != null && StringUtils.hasText(filter.getKeyword())) {
+		if (filter != null && StringUtils.hasText(filter.getKeyword())) {
 			List<PurchaseOrderTodo> orders = pageOrders.getContent();
-			if( ! CollectionUtils.isEmpty(orders)) {
-				for(PurchaseOrderTodo order : orders) {
-					if( ! CollectionUtils.isEmpty(order.getOrderItems())) {
-						for(PurchaseOrderTodoItem orderItem : order.getOrderItems()) {
-							if(FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderTodo order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderTodoItem orderItem : order.getOrderItems()) {
+							if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
 								orderItem.setKey(true);
 							}
 						}
@@ -382,13 +381,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public Page<PurchaseOrderDone> findDoneByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
-		if(filter != null) {
-			if(StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
-						.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
-			if(filter.getFromDate() != null)
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword()))
+				pageInfo.expression(PredicateUtils.in("id",
+						purchaseOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
+			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if(filter.getEndDate() != null)
+			if (filter.getEndDate() != null)
 				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
 		}
 		Page<PurchaseOrderDone> pageOrders = purchaseOrderDoneDao.findAll(new Specification<PurchaseOrderDone>() {
@@ -397,13 +396,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			}
 		}, pageInfo);
 		// 明细包含关键词
-		if(filter != null && StringUtils.hasText(filter.getKeyword())) {
+		if (filter != null && StringUtils.hasText(filter.getKeyword())) {
 			List<PurchaseOrderDone> orders = pageOrders.getContent();
-			if( ! CollectionUtils.isEmpty(orders)) {
-				for(PurchaseOrderDone order : orders) {
-					if( ! CollectionUtils.isEmpty(order.getOrderItems())) {
-						for(PurchaseOrderDoneItem orderItem : order.getOrderItems()) {
-							if(FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderDone order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderDoneItem orderItem : order.getOrderItems()) {
+							if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
 								orderItem.setKey(true);
 							}
 						}
@@ -416,13 +415,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public Page<PurchaseOrderEnd> findEndByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
-		if(filter != null) {
-			if(StringUtils.hasText(filter.getKeyword()))
-				pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
-						.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
-			if(filter.getFromDate() != null)
+		if (filter != null) {
+			if (StringUtils.hasText(filter.getKeyword()))
+				pageInfo.expression(PredicateUtils.in("id",
+						purchaseOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
+			if (filter.getFromDate() != null)
 				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if(filter.getEndDate() != null)
+			if (filter.getEndDate() != null)
 				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
 		}
 		Page<PurchaseOrderEnd> pageOrders = purchaseOrderEndDao.findAll(new Specification<PurchaseOrderEnd>() {
@@ -431,13 +430,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			}
 		}, pageInfo);
 		// 明细包含关键词
-		if(filter != null && StringUtils.hasText(filter.getKeyword())) {
+		if (filter != null && StringUtils.hasText(filter.getKeyword())) {
 			List<PurchaseOrderEnd> orders = pageOrders.getContent();
-			if( ! CollectionUtils.isEmpty(orders)) {
-				for(PurchaseOrderEnd order : orders) {
-					if( ! CollectionUtils.isEmpty(order.getOrderItems())) {
-						for(PurchaseOrderEndItem orderItem : order.getOrderItems()) {
-							if(FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
+			if (!CollectionUtils.isEmpty(orders)) {
+				for (PurchaseOrderEnd order : orders) {
+					if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+						for (PurchaseOrderEndItem orderItem : order.getOrderItems()) {
+							if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
 								orderItem.setKey(true);
 							}
 						}
@@ -450,9 +449,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public void setDisplay(String[] idArray, Short status) {
-		for(String id : idArray) {
+		for (String id : idArray) {
 			PurchaseOrder order = purchaseOrderDao.findOne(Long.parseLong(id));
-			if(order != null) {
+			if (order != null) {
 				order.setDisplay(status);
 				purchaseOrderDao.save(order);
 			}
@@ -462,7 +461,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	@Override
 	public void print(Long id) {
 		PurchaseOrder order = purchaseOrderDao.findOne(id);
-		if(order != null) {
+		if (order != null) {
 			order.setPrint((short) ((order.getPrint() == null ? 0 : order.getPrint()) + 1));
 		}
 		purchaseOrderDao.save(order);

+ 92 - 33
src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -11,16 +11,19 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.manage.model.AccountInfo;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.UserInfo;
 import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.HostConstant;
 import com.uas.platform.b2b.support.SendMailService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.TokenService;
@@ -28,11 +31,13 @@ import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.AgentUtils;
+import com.uas.platform.core.util.HttpUtil;
+import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.encry.Md5Utils;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 @Service
 public class UserServiceImpl implements UserService {
-	
 
 	@Autowired
 	private UserDao userDao;
@@ -40,7 +45,7 @@ public class UserServiceImpl implements UserService {
 	private SendMailService sendMailService;
 	@Autowired
 	private TokenService tokenService;
-	
+
 	static final String TEL_REGEXP = "^((\\(\\d{3}\\))|(\\d{3}\\-))?(13|15|18)\\d{9}$";
 
 	static final String UU_REGEXP = "^\\d{4,}$";
@@ -54,7 +59,14 @@ public class UserServiceImpl implements UserService {
 	public User save(User user) {
 		user.setEnable(Constant.NO);
 		user.setUserPwd(Md5Utils.encode(user.getUserPwd(), user.getUserUU()));
-		return userDao.save(user);
+		try {
+			if (sendUserToManage(user)) {
+				return userDao.save(user);
+			}
+		} catch (Exception e) {
+			throw new RuntimeException(e.getMessage());
+		}
+		return null;
 	}
 
 	@Override
@@ -86,13 +98,13 @@ public class UserServiceImpl implements UserService {
 			throw new UsernameNotFoundException("没有找到您的账号 " + tel);
 		return users.get(0);
 	}
-	
-	public boolean bindUser(String userUU , String enUU){
-		//打印SystemSession
-		//UserEnterprise实体???
+
+	public boolean bindUser(String userUU, String enUU) {
+		// 打印SystemSession
+		// UserEnterprise实体???
 		return false;
 	}
-	
+
 	@Override
 	public boolean isTelUseable(String tel) {
 		return userDao.findUserByUserTel(tel).size() == 0;
@@ -124,10 +136,16 @@ public class UserServiceImpl implements UserService {
 			newUser.setUserTel(user.getUserTel().trim());
 			newUser.setUserSex(user.getUserSex());
 			newUser.setUserIdcode(user.getUserIdcode());
-			if( ! CollectionUtils.isEmpty(user.getRoles())) {// 修改用户角色
+			if (!CollectionUtils.isEmpty(user.getRoles())) {// 修改用户角色
 				newUser.setRoles(user.getRoles());
 			}
-			newUser = userDao.save(newUser);
+			try {
+				if (sendUserToManage(newUser)) {
+					newUser = userDao.save(newUser);
+				}
+			} catch (Exception e) {
+				throw new RuntimeException(e.getMessage());
+			}
 			newUser.setEnterprise(SystemSession.getUser().getEnterprise());
 			newUser.setIp(SystemSession.getUser().getIp());
 			if (SystemSession.getUser().getUserUU().equals(newUser.getUserUU()))
@@ -144,13 +162,40 @@ public class UserServiceImpl implements UserService {
 		if (result) {
 			User user1 = userDao.findOne(user.getUserUU());
 			user1.setUserPwd(Md5Utils.encode(newPassword, user1.getUserUU()));
-			userDao.save(user1);
+			try {
+				if (sendUserToManage(user1))
+					userDao.save(user1);
+			} catch (Exception e) {
+				throw new RuntimeException(e.getMessage());
+			}
 			return user1;
 		} else {
 			throw new IllegalOperatorException("原密码验证错误");
 		}
 	}
 
+	/**
+	 * 用户信息修改同时,修改到管理平台
+	 * 
+	 * @param newUserInfo
+	 * @throws Exception
+	 */
+	private boolean sendUserToManage(User newUserInfo) throws Exception {
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("data", FlexJsonUtils.toJson(new AccountInfo(newUserInfo)));
+		Response response = HttpUtil.sendPostRequest(HostConstant.MANAGE_HOST + "public/account", params, true);
+		if (response.getStatusCode() == HttpStatus.OK.value()) {
+			List<Map<String, Object>> resultMap = FlexJsonUtils.fromJsonArray(response.getResponseText(), HashMap.class);
+			if (resultMap.size() > 0) {
+				if ("true".equals(String.valueOf(resultMap.get(0).get("ok")))) {
+					return true;
+				}
+				throw new Exception(String.valueOf(resultMap.get(0).get("error")));
+			}
+		}
+		throw new Exception(response.getResponseText());
+	}
+
 	@Override
 	public User addUser(User user, HttpServletRequest request) {
 		List<User> users = userDao.findUserByUserTel(user.getUserTel().trim());
@@ -166,7 +211,14 @@ public class UserServiceImpl implements UserService {
 		user.setCurrentEnterprise();
 		user = userDao.save(user);
 		user.setUserPwd(Md5Utils.encode("111111", user.getUserUU()));
-		user = userDao.save(user);
+		try {
+			if (sendUserToManage(user)) {
+				user = userDao.save(user);
+			}
+		} catch (Exception e) {
+			userDao.delete(user);
+			throw new RuntimeException(e.getMessage());
+		}
 		// 发送邮件
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("userName", user.getUserName());
@@ -213,10 +265,11 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public List<User> findUsersByEnUU(Long enUU){
+	public List<User> findUsersByEnUU(Long enUU) {
 		List<User> users = userDao.findByEnUU(enUU);
 		return users;
 	}
+
 	@Override
 	public User findShieldUuserInfo(String userName) {
 		User user = null;
@@ -227,10 +280,10 @@ public class UserServiceImpl implements UserService {
 		} else if (userName.matches(UU_REGEXP)) {
 			user = findUserByUserUU(Long.parseLong(userName));
 		}
-		if(user == null)
+		if (user == null)
 			throw new IllegalOperatorException("未查找到您输入账号的用户信息");
 		user.setCurrentEnterprise();
-		if(user.getEnterprise() == null)
+		if (user.getEnterprise() == null)
 			throw new IllegalOperatorException("您的账号已被管理员删除,无法操作");
 		return user;
 	}
@@ -247,12 +300,12 @@ public class UserServiceImpl implements UserService {
 		model.put("uu", user.getUserUU());
 		model.put("checkcode", encodeString);
 		model.put("rootpath", AgentUtils.getHost(request));
-		if("admin".equals(type)) {//发送给管理员
+		if ("admin".equals(type)) {// 发送给管理员
 			User admin = userDao.findOne(user.getEnterprise().getEnAdminuu());
 			// 发送邮件
 			model.put("email", admin.getUserEmail());
 			sendMailService.sendTemplateMail(admin.getUserEmail(), "UAS商务平台找回密码", model, "velocity/forgetPwd.vm");
-		} else {//发送给自己
+		} else {// 发送给自己
 			// 发送邮件
 			model.put("email", user.getUserEmail());
 			sendMailService.sendTemplateMail(user.getUserEmail(), "UAS商务平台找回密码", model, "velocity/forgetPwd.vm");
@@ -262,7 +315,7 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public String checkForget(Long userUU, String checkcode) {
 		String encodeString = null;
-		if(tokenService.isCertified("user", userUU, checkcode)) {
+		if (tokenService.isCertified("user", userUU, checkcode)) {
 			encodeString = tokenService.getEncodeToken("user", userUU);
 		} else {
 			throw new IllegalOperatorException("验证码验证失败");
@@ -272,13 +325,19 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public void resetPwdByCheckcode(Long userUU, String newPwd, String checkcode) {
-		if(StringUtils.hasText(newPwd) && StringUtils.hasText(checkcode) && userUU != null) {
+		if (StringUtils.hasText(newPwd) && StringUtils.hasText(checkcode) && userUU != null) {
 			boolean result = tokenService.isCertified("user", userUU, checkcode);
 			if (result) {
 				User user = userDao.findOne(userUU);
-				if(user != null) {
+				if (user != null) {
 					user.setUserPwd(Md5Utils.encode(newPwd, userUU));
-					userDao.save(user);
+					try {
+						if (sendUserToManage(user)) {
+							userDao.save(user);
+						}
+					} catch (Exception e) {
+						throw new RuntimeException(e.getMessage());
+					}
 				}
 			} else {
 				throw new IllegalArgumentException();
@@ -289,35 +348,35 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public UserInfo findUserByKeyWord(String keyWord){
+	public UserInfo findUserByKeyWord(String keyWord) {
 		User user = null;
-		if (keyWord.contains("@")) { 	// 按邮箱查找
+		if (keyWord.contains("@")) { // 按邮箱查找
 			user = findUserByUserEmail(keyWord);
-		} else if (keyWord.matches(TEL_REGEXP)) {	// 按手机号查找
+		} else if (keyWord.matches(TEL_REGEXP)) { // 按手机号查找
 			user = findUserByUserTel(keyWord);
-		} else if (keyWord.matches(UU_REGEXP)) {	//按UU号查找
+		} else if (keyWord.matches(UU_REGEXP)) { // 按UU号查找
 			user = findUserByUserUU(Long.parseLong(keyWord));
 		}
-		if(user == null)
+		if (user == null)
 			throw new IllegalOperatorException("未查找到您输入账号的用户信息");
-		
-		UserInfo simpleUser = new UserInfo(user);	//将user重新封装为简单对象,只返回前台需要的用户信息
+
+		UserInfo simpleUser = new UserInfo(user); // 将user重新封装为简单对象,只返回前台需要的用户信息
 		return simpleUser;
 	}
-	
+
 	@Override
 	public void bindUserToMyEnterprise(Long userUU) {
 		User user = userDao.findOne(userUU);
-		if(user == null)
+		if (user == null)
 			throw new IllegalArgumentException("不存在的用户!");
-		
+
 		Set<Enterprise> enterprises = user.getEnterprises();
-		if(CollectionUtils.isEmpty(enterprises)) {
+		if (CollectionUtils.isEmpty(enterprises)) {
 			enterprises = new HashSet<Enterprise>();
 		}
 		enterprises.add(SystemSession.getUser().getEnterprise());
 		user.setEnterprises(enterprises);
 		userDao.save(user);
 	}
-	
+
 }

+ 10 - 0
src/main/java/com/uas/platform/b2b/support/HostConstant.java

@@ -0,0 +1,10 @@
+package com.uas.platform.b2b.support;
+
+public class HostConstant {
+
+	/**
+	 * 管理平台地址
+	 */
+	public static final String MANAGE_HOST = "http://10.10.100.81:8080/";
+
+}

+ 1 - 1
src/main/resources/jdbc.properties

@@ -2,7 +2,7 @@ jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 #jdbc.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
 #jdbc.username=uuplatformdemo
 #jdbc.password=selectuuplatform
-jdbc.url=jdbc:oracle:thin:@localhost:1521:orcl
+jdbc.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
 jdbc.username=platform$b2b
 jdbc.password=select*fromuu
 jdbc.initialSize=10

+ 25 - 16
src/main/webapp/WEB-INF/spring/webmvc.xml

@@ -5,22 +5,23 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<mvc:annotation-driven>
-        <mvc:message-converters register-defaults="true">
-            <!-- 避免IE执行AJAX时,返回JSON出现下载文件 -->
-            <bean id="fastJsonHttpMessageConverter" class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
-                <property name="supportedMediaTypes">
-                    <list>
-                        <value>application/json;charset=UTF-8</value>
-                    </list>
-                </property>
-                <property name="features">
-                	<list>
-                		<value>DisableCircularReferenceDetect</value>
-                	</list>
-                </property>
-            </bean>
-        </mvc:message-converters>
-    </mvc:annotation-driven>
+		<mvc:message-converters register-defaults="true">
+			<!-- 避免IE执行AJAX时,返回JSON出现下载文件 -->
+			<bean id="fastJsonHttpMessageConverter"
+				class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
+				<property name="supportedMediaTypes">
+					<list>
+						<value>application/json;charset=UTF-8</value>
+					</list>
+				</property>
+				<property name="features">
+					<list>
+						<value>DisableCircularReferenceDetect</value>
+					</list>
+				</property>
+			</bean>
+		</mvc:message-converters>
+	</mvc:annotation-driven>
 
 	<mvc:default-servlet-handler />
 
@@ -50,4 +51,12 @@
 	<mvc:view-controller path="/public" view-name="public" />
 	<mvc:view-controller path="/serve" view-name="serve" />
 	<mvc:view-controller path="/public/app" view-name="client" />
+
+	<mvc:interceptors>
+		<mvc:interceptor>
+			<mvc:mapping path="/erp/purchase"></mvc:mapping>
+			<mvc:mapping path="/manage/user"></mvc:mapping>
+			<bean class="com.uas.platform.b2b.filter.SignatureInterceptor"></bean>
+		</mvc:interceptor>
+	</mvc:interceptors>
 </beans>