新账户中心接口修改

pom.xml

@@ -272,10 +272,21 @@
             <artifactId>message-sms-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.uas.account</groupId>
-            <artifactId>account-common</artifactId>
+        <!--<dependency>-->
+            <!--<groupId>com.uas.account</groupId>-->
+            <!--<artifactId>account-common</artifactId>-->
+            <!--<version>0.0.1-SNAPSHOT</version>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>com.uas.sso</groupId>
+            <artifactId>sso-common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>tomcat-embed-core</artifactId>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

src/main/java/com/uas/platform/b2b/controller/BrandController.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.controller;
 
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.BrandInfo;
 import com.uas.platform.b2b.service.BrandService;
 import com.uas.platform.core.exception.IllegalOperatorException;

src/main/java/com/uas/platform/b2b/controller/UserController.java

@@ -219,8 +219,9 @@ public class UserController {
 		user = userService.updateUserInfo(user);
 		if (user != null) {
 			logger.log("用户信息", "修改用户信息，UU：" + user.getUserUU());
-			if (SystemSession.getUser().getUserUU().equals(user.getUserUU()))
+			if (SystemSession.getUser().getUserUU().equals(user.getUserUU())) {
 				request.getSession().setAttribute("user", user);
+			}
 		}
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}

src/main/java/com/uas/platform/b2b/erp/controller/RelationshipController.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.PartnershipRecordView;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.model.Enterprise;
@@ -66,17 +67,17 @@ public class RelationshipController {
 
 	private void addPartnerShipRecord(Vendor vendor) {
 		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
+		PartnershipRecordView record = new PartnershipRecordView();
 		record.setAppId(shipRecord.getAppId());
 		record.setCustName(shipRecord.getCustName());
 		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
+		record.setCustUserCode(Long.valueOf(shipRecord.getCustUserCode()));
 		record.setCustUserEmail(shipRecord.getCustUserEmail());
 		record.setCustUserName(shipRecord.getCustUserName());
 		record.setCustUserTel(shipRecord.getCustUserTel());
 		record.setVendName(shipRecord.getVendName());
 		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
+		record.setVendUserCode(Long.valueOf(shipRecord.getVendUserCode()));
 		record.setVendUserEmail(shipRecord.getVendUserEmail());
 		record.setVendUserName(shipRecord.getVendUserName());
 		record.setVendUserTel(shipRecord.getVendUserTel());

src/main/java/com/uas/platform/b2b/erp/controller/UserSpaceDetailController.java

@@ -1,8 +1,8 @@
 package com.uas.platform.b2b.erp.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.support.Page;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.erp.model.B2BCustomer;
 import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.PageInfo;
@@ -65,8 +65,8 @@ public class UserSpaceDetailController {
 	 * @throws UnsupportedEncodingException
 	 */
 	@RequestMapping(method = RequestMethod.GET)
-	public Page<UserSpaceDetail> UserSpaceInfo(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		Page<UserSpaceDetail> userSpaceDetails = new Page<UserSpaceDetail>();
+	public Page<UserSpaceView> UserSpaceInfo(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		Page<UserSpaceView> userSpaceDetails = new Page<UserSpaceView>();
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		PageInfo pageInfo = FlexJsonUtils.fromJson(jsonStr, PageInfo.class);
 		com.uas.platform.core.model.PageParams params = new com.uas.platform.core.model.PageParams();
@@ -75,7 +75,7 @@ public class UserSpaceDetailController {
 		PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("searchstatus", Constant.YES);
 		try {
-			SPage<UserSpaceDetail> details = searchService.searchUserSpaceDetailCheckIds(pageInfo.getKeyword(),
+			SPage<UserSpaceView> details = searchService.searchUserSpaceDetailCheckIds(pageInfo.getKeyword(),
 					pageParams);
 			userSpaceDetails.setContent(details.getContent());
 			userSpaceDetails.setNumber(details.getPage());

src/main/java/com/uas/platform/b2b/erp/controller/VendorRecommendController.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.controller;
 
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.erp.model.VendorRecommend;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.model.Product;

src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -16,6 +16,8 @@ import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
+import com.uas.sso.entity.UserView;
 import com.uas.sso.web.spring.AbstractSSOInterceptor;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
@@ -39,8 +41,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
 
-import static com.uas.platform.b2b.model.Token.UserType.user;
-
 @SuppressWarnings("deprecation")
 public class SSOInterceptor extends AbstractSSOInterceptor {
 
@@ -67,27 +67,27 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 	private User getUserByToken(SSOToken token) {
 		User authedUser = null;
 		if (token.getData() != null) {
-			com.uas.account.entity.User tokenUser = FlexJsonUtils.fromJson(token.getData(), com.uas.account.entity.User.class);
-			if (!StringUtils.isEmpty(tokenUser.getDialectUID())) {
+			UserAccount tokenUser = FlexJsonUtils.fromJson(token.getData(), UserAccount.class);
+			if (!StringUtils.isEmpty(tokenUser.getUserUU())) {
 				// dialectUID表示client系统自己的唯一标识，比如user_uu，手机号没设置的情况下使用
-				authedUser = userService.findUserByUserUU(Long.parseLong(tokenUser.getDialectUID()));
-			} else if (!StringUtils.isEmpty(tokenUser.getUid())) {
+				authedUser = userService.findUserByUserUU(tokenUser.getUserUU());
+			} else if (!StringUtils.isEmpty(tokenUser.getMobile())) {
 				// UID表示所有系统公认的唯一标识，这里统一使用手机号
-				authedUser = userService.findUserByUserTel(tokenUser.getUid());
-			} else if (!StringUtils.isEmpty(tokenUser.getSecondUID())) {
+				authedUser = userService.findUserByUserTel(tokenUser.getMobile());
+			} else if (!StringUtils.isEmpty(tokenUser.getEmail())) {
 				// UID表示所有系统公认的唯一标识，这里统一使用手机号
-				authedUser = userService.findUserByUserEmail(tokenUser.getSecondUID());
+				authedUser = userService.findUserByUserEmail(tokenUser.getEmail());
 			} else {
-				logger.error(String.format("invalid user %s, please set uid or dialectUID", tokenUser.getName()));
+				logger.error(String.format("invalid user %s, please set uid or dialectUID", tokenUser.getVipName()));
 			}
 			if (authedUser != null && authedUser.getEnterprises() != null) {
 				// 企业资料在client系统自己的唯一标识，比如en_uu
-				if (tokenUser.getSpaceDialectUID() != null) {
-					authedUser.setCurrentEnterprise(Long.parseLong(tokenUser.getSpaceDialectUID()));
-				} else if (tokenUser.getSpaceUID() != null) {
+				if (tokenUser.getSpaceUU() != null) {
+					authedUser.setCurrentEnterprise(tokenUser.getSpaceUU());
+				} else if (StringUtils.isEmpty(tokenUser.getBusinessCode())) {
 					for (Enterprise enterprise : authedUser.getEnterprises()) {
 						// 企业资料在所有系统公认的唯一标识，这里使用商业登记证号
-						if (tokenUser.getSpaceUID().equals(enterprise.getEnBussinessCode())) {
+						if (tokenUser.getBusinessCode().equals(enterprise.getEnBussinessCode())) {
 							authedUser.setEnterprise(enterprise);
 							break;
 						}
@@ -127,6 +127,10 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 			if (SecurityConstant.AUTHENTICATION_URL.equals(request.getRequestURI())) {
 				return true;
 			}
+			AntPathRequestMatcher matcher = new AntPathRequestMatcher("/account/enterprise/info/**");
+			if (matcher.matches(request)) {
+				return true;
+			}
 			response.setStatus(HttpStatus.UNAUTHORIZED.value());
 			return false;
 		}
@@ -148,10 +152,10 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 		} else {
 			// 从其他应用切换了企业的情况
 			if (token.getData() != null) {
-				com.uas.account.entity.User tokenUser = FlexJsonUtils.fromJson(token.getData(), com.uas.account.entity.User.class);
-				if (!StringUtils.isEmpty(tokenUser.getSpaceDialectUID())
-						&& !user.getEnterprise().getUu().equals(tokenUser.getSpaceDialectUID())) {
-					user.setCurrentEnterprise(Long.parseLong(tokenUser.getSpaceDialectUID()));
+				UserAccount tokenUser = FlexJsonUtils.fromJson(token.getData(), UserAccount.class);
+				if (!StringUtils.isEmpty(tokenUser.getSpaceUU())
+						&& !user.getEnterprise().getUu().equals(tokenUser.getSpaceUU())) {
+					user.setCurrentEnterprise(tokenUser.getSpaceUU());
 				}
 			}
 		}
@@ -310,8 +314,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 			}
 			String type = request.getParameter(typeParam);
 			if ("manage".equals(type)) {
-				if (user != null && UserCreater.isVirtual(user))
+				if (user != null && UserCreater.isVirtual(user)) {
 					return user;
+				}
 				Map<String, Object> data = accessTokenService.validFormManage(token);
 				if (data.containsKey("user") && data.containsKey("bind")) {
 					long enUU = Long.parseLong(data.get("bind").toString());
@@ -377,8 +382,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 				user.setIp(AgentUtils.getIp(request));
 				request.getSession().setAttribute("user", user);
 				setGrantedAuthorities(user);
-			} else
+			} else {
 				throw new UsernameNotFoundException(username + " 账号或密码错误");
+			}
 		}
 		return user;
 	}
@@ -392,8 +398,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 				break;
 			}
 		}
-		if (!choosed)
+		if (!choosed) {
 			throw new UsernameNotFoundException("企业与用户不匹配");
+		}
 	}
 
 }

src/main/java/com/uas/platform/b2b/manage/controller/UserController.java

@@ -47,4 +47,24 @@ public class UserController {
 			userService.remove(info.convert(), info.getEnUU());
 		}
 	}
+
+	/**
+	 * 用户绑定企业
+	 * @param spaceUU 企业uu号
+	 * @param userUU 用户uu号
+	 */
+	@RequestMapping(params = "type=bind", method = RequestMethod.POST)
+	public void add(Long spaceUU, Long userUU) {
+		userService.addUser(spaceUU, userUU);
+	}
+
+	/**
+	 * 用户绑定企业
+	 * @param spaceUU 企业uu号
+	 * @param userUU 用户uu号
+	 */
+	@RequestMapping(params = "type=unbind", method = RequestMethod.POST)
+	public void remove(Long spaceUU, Long userUU) {
+		userService.removeUser(spaceUU, userUU);
+	}
 }

src/main/java/com/uas/platform/b2b/manage/service/UserService.java

@@ -14,4 +14,17 @@ public interface UserService {
 
 	public void remove(User user, Long enUU);
 
+	/**
+	 * 企业添加用户
+	 * @param spaceUU
+	 * @param userUU
+	 */
+    void addUser(Long spaceUU, Long userUU);
+
+	/**
+	 * 企业删除用户用户
+	 * @param spaceUU
+	 * @param userUU
+	 */
+    void removeUser(Long spaceUU, Long userUU);
 }

src/main/java/com/uas/platform/b2b/manage/service/impl/UserServiceImpl.java

@@ -36,12 +36,15 @@ public class UserServiceImpl implements UserService {
 				}
 				oldUser.setUserEmail(user.getUserEmail());
 			}
-			if (user.getUserName() != null)
+			if (user.getUserName() != null) {
 				oldUser.setUserName(user.getUserName());
-			if (user.getUserIMId() != null)
+			}
+			if (user.getUserIMId() != null) {
 				oldUser.setUserIMId(user.getUserIMId());
-			if (user.getUserPwd() != null && !user.getUserPwd().equals(oldUser.getUserPwd()))
+			}
+			if (user.getUserPwd() != null && !user.getUserPwd().equals(oldUser.getUserPwd())) {
 				oldUser.setUserPwd(Md5Utils.encode(user.getUserPwd(), user.getUserUU()));
+			}
 			if (user.getUserTel() != null && !user.getUserTel().equals(oldUser.getUserTel())) {
 				List<User> users = userDao.findUserByUserTel(user.getUserTel());
 				if (users.size() > 0) {
@@ -98,4 +101,28 @@ public class UserServiceImpl implements UserService {
 		userDao.save(oldUser);
 	}
 
+	@Override
+	public void addUser(Long spaceUU, Long userUU) {
+		User user = userDao.findOne(userUU);
+		Enterprise enterprise = enterpriseDao.findOne(userUU);
+		if (user == null || enterprise == null) {
+			return;
+		}
+
+		user.getEnterprises().add(enterprise);
+		userDao.save(user);
+	}
+
+	@Override
+	public void removeUser(Long spaceUU, Long userUU) {
+		User user = userDao.findOne(userUU);
+		Enterprise enterprise = enterpriseDao.findOne(userUU);
+		if (user == null || enterprise == null) {
+			return;
+		}
+
+		user.getEnterprises().remove(enterprise);
+		userDao.save(user);
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.mobile.controller;
 
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
 import com.uas.platform.b2b.model.SearchFilter;

src/main/java/com/uas/platform/b2b/mobile/controller/AppPurcInquiryController.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.mobile.controller;
 
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.PurcInquiryItemInfo;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.search.SearchService;

src/main/java/com/uas/platform/b2b/mobile/controller/SaleController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.mobile.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
@@ -144,7 +144,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderAll> getPurchaseOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderAll> getPurchaseOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			// 当前登录企业作为供应商
@@ -203,7 +203,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderTodo> getTodoPurchaseOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderTodo> getTodoPurchaseOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			SearchFilter filter = userService.distribute();
@@ -252,7 +252,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderDone> getDonePurchaseOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderDone> getDonePurchaseOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			SearchFilter filter = userService.distribute();
@@ -306,7 +306,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value="/items", params = RequestState.UPDATE, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderAll> getToAgreedOrderItems(int page, int size, String keyword){
+	public Page<PurchaseOrderAll> getToAgreedOrderItems(int page, int size, String keyword){
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("客户采购单", "app搜索收到的客户采购订单列表（包括采购明细）（待结案）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -360,7 +360,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderEnd> getEndPurchaseOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderEnd> getEndPurchaseOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("客户采购单", "app查看收到的客户采购订单列表（包括采购明细）（已结案）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -410,7 +410,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.RECEIVED, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderReceived> getReceivedPurchaseOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderReceived> getReceivedPurchaseOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("客户采购单", "app查看收到的客户采购订单列表（包括采购明细）（已收货）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -459,7 +459,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderWaiting> getWaitingPurchaseOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderWaiting> getWaitingPurchaseOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("客户采购单", "app查看收到的客户采购订单列表（包括采购明细）（待交货）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -535,9 +535,10 @@ public class SaleController {
 	@RequestMapping(value = "/items/reply", method = RequestMethod.POST)
 	public ResponseEntity<String> replyOrderItems(Long date, @RequestBody String idString) {
 		List<PurchaseOrderReply> replies = purchaseOrderService.reply(idString.split(","), date);
-		for (PurchaseOrderReply reply : replies)
+		for (PurchaseOrderReply reply : replies) {
 			logger.log("客户采购单", "批量回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
 					reply.getOrderItem().getId());
+		}
 //        purchaseOrderService.replyByBatch(idString, SystemSession.getUser().getUserName(), SystemSession.getUser().getIp(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU());
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
@@ -552,7 +553,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/purc/info/search", method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderAll> getAllPurcOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderAll> getAllPurcOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（全部）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -586,7 +587,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/purc/info/search", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderTodo> getTodoPurcOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderTodo> getTodoPurcOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("采购单", "app查看发出的采购订单列表（包括采购明细）（待回复）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -619,7 +620,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/purc/info/search", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderDone> getDonePurcOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderDone> getDonePurcOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（已回复）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -651,7 +652,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/purc/info/search", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderEnd> getEndPurcOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderEnd> getEndPurcOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（已结案）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
@@ -681,7 +682,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/purc/info/search", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
-	public com.uas.account.support.Page<PurchaseOrderWaiting> getWaitingPurcOrderItems(int page, int size, String keyword) {
+	public Page<PurchaseOrderWaiting> getWaitingPurcOrderItems(int page, int size, String keyword) {
 		if (!StringUtils.isEmpty(keyword)) {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（待交货）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());

src/main/java/com/uas/platform/b2b/mobile/service/impl/AddUserServiceImpl.java

@@ -2,12 +2,12 @@ package com.uas.platform.b2b.mobile.service.impl;
 
 import java.util.List;
 
+import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.uas.account.entity.UserDetail;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.UserDao;
@@ -57,8 +57,8 @@ public class AddUserServiceImpl implements AddUserService {
 		user = userDao.save(user);
 		user.setUserPwd(Md5Utils.encode(defaultPassword, user.getUserUU()));
 		try {
-			user = userDao.save(user);
 			postToAccountCenter(user, enuu, defaultPassword);
+			user = userDao.save(user);
 			if (user.getUserUU() != null) {
 				UserPosition position = new UserPosition();
 				position.setDepartment(dept);
@@ -92,13 +92,15 @@ public class AddUserServiceImpl implements AddUserService {
 	 * @throws Exception
 	 */
 	public void postToAccountCenter(User user, Long enuu, String password) throws Exception {
-		UserDetail detail = new UserDetail();
+		UserView detail = new UserView();
 		detail.setEmail(user.getUserEmail());
-		detail.setIdCode(user.getUserIdcode());
+		detail.setIdCard(user.getUserIdcode());
 		detail.setMobile(user.getUserTel());
 		detail.setName(user.getUserName());
 		detail.setSex(user.getUserSex());
-		AccountUtils.addUser(user.getUserUU(), enuu, detail, password);
+		detail.setPassword(password);
+		UserView userView = AccountUtils.addUser(enuu, detail);
+		user.setUserUU(userView.getUserUU());
 	}
 
 }

src/main/java/com/uas/platform/b2b/ps/InquiryUtils.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.parser.Feature;
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SysConf;

src/main/java/com/uas/platform/b2b/ps/MessageUtils.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.parser.Feature;
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SystemSession;

src/main/java/com/uas/platform/b2b/search/SearchController.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.search;
 
-import com.uas.account.entity.UserSpaceDetail;
+import com.uas.sso.entity.UserSpaceDetail;
 import com.uas.platform.b2b.model.*;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;

src/main/java/com/uas/platform/b2b/search/SearchService.java

@@ -1,7 +1,8 @@
 package com.uas.platform.b2b.search;
 
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.support.Page;
+import com.uas.sso.entity.UserSpaceDetail;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.erp.model.B2BCustomer;
 import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
@@ -402,7 +403,7 @@ public interface SearchService {
 	 * @return
 	 * @throws Exception
 	 */
-	public SPage<UserSpaceDetail> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams) throws Exception;
+	public SPage<UserSpaceView> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams) throws Exception;
 
 	/**
 	 * 企业圈联想词

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -1,9 +1,10 @@
 package com.uas.platform.b2b.search;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.support.Page;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.UserSpaceDetail;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.support.Page;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.B2BCustomer;
@@ -245,7 +246,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	private <T> void sortByProperty(List<T> content, Class<T> targetCls, String properyName,
 									final List<Long> propertyList) {
 		final Field field = getPropertyField(targetCls, properyName);
-		if (null != field)
+		if (null != field) {
 			Collections.sort(content, new Comparator<T>() {
 
 				@Override
@@ -262,6 +263,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 				}
 
 			});
+		}
 	}
 
 	/**
@@ -1297,7 +1299,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	}
 
 	@Override
-	public SPage<UserSpaceDetail> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams)
+	public SPage<UserSpaceView> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams)
 			throws Exception {
 		// 限制最大返回页数为100
 		if (pageParams.getPage() > MAXPAGE_USERSPACEDETAIL) {
@@ -1312,30 +1314,29 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 			idsPage.setTotalPage(MAXPAGE_USERSPACEDETAIL);
 			idsPage.setTotalElement(MAXPAGE_USERSPACEDETAIL * pageParams.getSize());
 		}
-		List<UserSpaceDetail> content = AccountUtils.findAll(idsPage.getContent().toString());
-		sortByProperty(content, UserSpaceDetail.class, "id", idsPage.getContent());
+		List<UserSpaceView> content = AccountUtils.findAll(idsPage.getContent().toString());
+		sortByProperty(content, UserSpaceView.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
 
 	@Override
 	public List<Map<String, Object>> getSimilarEnterprise(String keyword) throws Exception {
 		SPage<String> codePages = searchService.similar(keyword, Table_name.AC$US$DETAIL, SIMILAR_NUM, "name");
-		List<UserSpaceDetail> contents = new ArrayList<UserSpaceDetail>();
+		List<UserSpaceView> contents = new ArrayList<UserSpaceView>();
 		for (String code : codePages.getContent()) {
 			PageParams pageParams = new PageParams();
 			pageParams.setPage((int) 1);
 			pageParams.setSize((int) 20);
-			SPage<UserSpaceDetail> details = searchUserSpaceDetailCheckIds(code, pageParams);
+			SPage<UserSpaceView> details = searchUserSpaceDetailCheckIds(code, pageParams);
 			contents.addAll(details.getContent());
 		}
 		List<Map<String, Object>> vendors = new ArrayList<Map<String, Object>>();
-		for (UserSpaceDetail userSpaceDetail : contents) {
+		for (UserSpaceView userSpaceView : contents) {
 			Map<String, Object> temp = new HashMap<>();
-			if (userSpaceDetail != null) {
-				temp.put("id", userSpaceDetail.getId());
-				temp.put("bussinesscode", userSpaceDetail.getBusinessCode());
-				temp.put("vendName", userSpaceDetail.getName());
-				temp.put("vendshortname", userSpaceDetail.getShortName());
+			if (userSpaceView != null) {
+				temp.put("id", userSpaceView.getSpaceUU());
+				temp.put("bussinesscode", userSpaceView.getBusinessCode());
+				temp.put("vendName", userSpaceView.getSpaceName());
 				vendors.add(temp);
 			}
 		}

src/main/java/com/uas/platform/b2b/service/AddPartnerService.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.service;
 
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.AddPartner;
 import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
 import com.uas.search.b2b.model.SPage;

src/main/java/com/uas/platform/b2b/service/BrandService.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.service;
 
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.Brand;
 import com.uas.platform.b2b.model.BrandInfo;
 import com.uas.platform.core.model.PageParams;

src/main/java/com/uas/platform/b2b/service/PagingReleaseService.java

@@ -39,7 +39,7 @@ public interface PagingReleaseService {
      * @param isRead 是否已阅读 1 为已阅读 0为未阅读
      * @return
      */
-    com.uas.account.support.Page<MessageModel> getPublicMessage(String keyword, PageParams params, Short isRead) throws Exception;
+    com.uas.sso.support.Page<MessageModel> getPublicMessage(String keyword, PageParams params, Short isRead) throws Exception;
 
     /**
      * 消息标为已读

src/main/java/com/uas/platform/b2b/service/VendorService.java

@@ -131,7 +131,7 @@ public interface VendorService {
 	 * @param size 每页条数
 	 * @return
 	 */
-	com.uas.account.support.Page<VendorRecommend> getVendorRecommend(String productMatchCondition, String enterpriseMatchCondition, String productCondition, int page, int size);
+	com.uas.sso.support.Page<VendorRecommend> getVendorRecommend(String productMatchCondition, String enterpriseMatchCondition, String productCondition, int page, int size);
 
 	/**
 	 * 获取推荐企业物料列表（匹配到的排前面）
@@ -141,5 +141,5 @@ public interface VendorService {
 	 * @param whereCondition where条件（product的筛选条件拼接）
 	 * @return
 	 */
-    com.uas.account.support.Page<Product> getProductsByVendorRecommend(int page, int size, Long vendUU, String productMatchCondition,  String whereCondition);
+    com.uas.sso.support.Page<Product> getProductsByVendorRecommend(int page, int size, Long vendUU, String productMatchCondition,  String whereCondition);
 }

src/main/java/com/uas/platform/b2b/service/impl/AddPartnerServiceImpl.java

@@ -1,9 +1,10 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.PartnershipRecord;
-import com.uas.account.support.Page;
-import com.uas.account.util.AccountUtils;
+import com.uas.platform.b2b.temporary.model.PartnershipRecord;
+import com.uas.sso.entity.PartnershipRecordView;
+import com.uas.sso.support.Page;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.model.*;
@@ -293,13 +294,13 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 			int pageNumber) throws Exception {
 	    // 供应商或客户存在一个即过滤
 		String businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
-		Page<PartnershipRecord> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
+		Page<PartnershipRecordView> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
 				pageSize);
 		Page<BasePartnersInfo> partnerRecords = new Page<>();
-		List<PartnershipRecord> records = pageRecords != null ? pageRecords.getContent() : null;
+		List<PartnershipRecordView> records = pageRecords != null ? pageRecords.getContent() : null;
 		List<BasePartnersInfo> baseInfos = new ArrayList<>();
 		if (!CollectionUtils.isEmpty(records)) {
-			for (PartnershipRecord record : records) {
+			for (PartnershipRecordView record : records) {
 				BasePartnersInfo partner = new BasePartnersInfo();
 				List<Vendor> vendor;
 				List<Vendor> customer;
@@ -311,7 +312,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setOperateDate(record.getOperateDate());
 					partner.setVendName(record.getVendName());
 					partner.setVendUID(record.getVendUID());
-					partner.setVendUserCode(record.getVendUserCode());
+					partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
 					partner.setVendUserName(record.getVendUserName());
 					partner.setVendUserTel(record.getVendUserTel());
 					partner.setMethod(Constant.YES);
@@ -363,7 +364,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setId(record.getId());
 					partner.setVendName(record.getCustName());
 					partner.setVendUID(record.getCustUID());
-					partner.setVendUserCode(record.getVendUserCode());
+					partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
 					partner.setVendUserName(record.getVendUserName());
 					partner.setVendUserTel(record.getVendUserTel());
 					partner.setMethod(Constant.NO);
@@ -426,13 +427,13 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 	public SPage<BasePartnersInfo> findByBusCodeAndKeyWord(String keyword, Integer statusCode, int pageSize,
 														   int pageNumber) throws Exception {
 		String businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
-		Page<PartnershipRecord> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
+		Page<PartnershipRecordView> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
 				pageSize);
 		SPage<BasePartnersInfo> partnerRecords = new SPage<>();
-		List<PartnershipRecord> records = pageRecords != null ? pageRecords.getContent() : null;
+		List<PartnershipRecordView> records = pageRecords != null ? pageRecords.getContent() : null;
 		List<BasePartnersInfo> baseInfos = new ArrayList<>();
 		if (!CollectionUtils.isEmpty(records)) {
-			for (PartnershipRecord record : records) {
+			for (PartnershipRecordView record : records) {
 				BasePartnersInfo partner = new BasePartnersInfo();
 				List<Vendor> vendor;
 				List<Vendor> customer;
@@ -444,7 +445,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setOperateDate(record.getOperateDate());
 					partner.setVendName(record.getVendName());
 					partner.setVendUID(record.getVendUID());
-					partner.setVendUserCode(record.getVendUserCode());
+					partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
 					partner.setVendUserName(record.getVendUserName());
 					partner.setVendUserTel(record.getVendUserTel());
 					partner.setMethod(Constant.YES);
@@ -496,7 +497,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setId(record.getId());
 					partner.setVendName(record.getCustName());
 					partner.setVendUID(record.getCustUID());
-					partner.setVendUserCode(record.getVendUserCode());
+					partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
 					partner.setVendUserName(record.getVendUserName());
 					partner.setVendUserTel(record.getVendUserTel());
 					partner.setMethod(Constant.NO);

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.account.entity.RequsetStatus;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.RequestStatus;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.DateUtils;
 import com.uas.platform.b2b.core.util.StringUtil;
 import com.uas.platform.b2b.core.util.ThreadTask;
@@ -579,7 +579,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
 		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		SPage<com.uas.account.entity.UserSpaceDetail> details = searchService.searchUserSpaceDetailCheckIds(keyword,
+		SPage<com.uas.sso.entity.UserSpaceDetail> details = searchService.searchUserSpaceDetailCheckIds(keyword,
 				pageParams);
 		SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
 		List<UserSpaceDetail> spaceDetails = new ArrayList<UserSpaceDetail>();

src/main/java/com/uas/platform/b2b/service/impl/CartServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.account.util.FlexJsonUtil;
+import com.uas.sso.util.FlexJsonUtil;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
 import com.uas.platform.b2b.dao.PurchaseOrderCartDao;

src/main/java/com/uas/platform/b2b/service/impl/EnquiryServiceImpl.java

@@ -1,6 +1,6 @@
  package com.uas.platform.b2b.service.impl;
 
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.service.AttachService;

src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -16,8 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.UserDetail;
-import com.uas.account.entity.UserSpace;
+import com.uas.sso.entity.UserSpaceView;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.*;
 import com.uas.platform.b2b.model.*;
@@ -34,8 +33,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.UserSpaceDetail;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.service.impl;
-import com.uas.account.entity.UserDetail;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.UserView;
+import com.uas.sso.util.AccountUtils;
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.model.*;
@@ -102,8 +102,9 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User findUserByUserUU(Long uu) {
 		List<User> users = userDao.findUserByUserUU(uu);
-		if (users.size() == 0)
+		if (users.size() == 0) {
 			throw new UsernameNotFoundException("没有找到您的账号 " + uu);
+		}
 		return users.get(0);
 	}
 
@@ -116,8 +117,9 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User findUserByUserEmail(String email) {
 		List<User> users = userDao.findUserByUserEmail(email);
-		if (users.size() == 0)
+		if (users.size() == 0) {
 			throw new UsernameNotFoundException("没有找到您的账号 " + email);
+		}
 		return users.get(0);
 	}
 
@@ -168,47 +170,11 @@ public class UserServiceImpl implements UserService {
 		User newUser = userDao.findOne(user.getUserUU());
 		Long enuu = SystemSession.getUser().getEnterprise().getUu();
 		if (newUser != null) {
-			if (!newUser.getUserTel().equals(user.getUserTel().trim())) {// 修改了用户手机号
-				List<User> users = userDao.findUserByUserTel(user.getUserTel().trim());
-				if (users.size() > 0) {
-					throw new IllegalOperatorException("电话号码重复，建议输入您自己的手机号");
-				}
-				try {
-					AccountUtils.updateTel(user.getUserTel().trim(),newUser.getUserTel().trim());
-					logger.log("修改用户信息", "success", "修改电话号码： " + user.getUserTel() + "->" + newUser.getUserTel() + "同步到账户中心成功", user.getUserUU(), enuu);
-				} catch (Exception e) {
-					logger.log("修改用户信息", "error", "修改电话号码： " + user.getUserTel() + "->" + newUser.getUserTel() + "同步到账户中心失败", user.getUserUU(), enuu);
-					e.printStackTrace();
-				}
-			}
-			if (user.getUserEmail() != null) {
-				if (!newUser.getUserEmail().equals(user.getUserEmail().trim())) {// 修改了用户邮箱地址
-					List<User> users = userDao.findUserByUserEmail(user.getUserEmail().trim());
-					if (users.size() > 0) {
-						throw new IllegalOperatorException("邮箱地址重复，建议输入您自己的电子邮箱地址");
-					}
-					try {
-						AccountUtils.updateEmail(user.getUserTel().trim(),newUser.getUserEmail().trim());
-						logger.log("修改用户信息", "error", "修改邮箱： " + user.getUserEmail() + "->" + newUser.getUserEmail() + "同步到账户中心失败", user.getUserUU(), enuu);
-					} catch (Exception e) {
-						logger.log("修改用户信息", "error", "修改邮箱： " + user.getUserEmail() + "->" + newUser.getUserEmail() + "同步到账户中心失败", user.getUserUU(), enuu);
-						e.printStackTrace();
-					}
-				}
-				newUser.setUserEmail(user.getUserEmail().trim());
-			}
 			newUser.setUserName(user.getUserName());
-			newUser.setUserTel(user.getUserTel().trim());
 			newUser.setUserSex(user.getUserSex());
 			newUser.setUserIdcode(user.getUserIdcode());
 			newUser.setEnterprise(SystemSession.getUser().getEnterprise());
 			newUser.setIp(SystemSession.getUser().getIp());
-			//只需要基本信息同步到账户中心
-			try {
-				postToAccountCenter(newUser);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
 			StringBuffer oldRoles = new StringBuffer();
 			StringBuffer newRoles = new StringBuffer();
 			// 修改用户角色，只对用户的当前企业的角色进行修改
@@ -375,19 +341,11 @@ public class UserServiceImpl implements UserService {
 		if (result) {
 			User user1 = userDao.findOne(user.getUserUU());
 			user1.setUserPwd(Md5Utils.encode(newPassword, user1.getUserUU()));
-			if (user1.getEnterprise() == null)
+			if (user1.getEnterprise() == null) {
 				user1.setCurrentEnterprise();// 随便绑定一个用户所属企业
-			Enterprise enterprise = user1.getEnterprise();
-			try {
-				user1 = userDao.save(user1);
-				AccountUtils.resetPassword(user1.getUserUU(), enterprise.getUu(), newPassword);
-				logger.log("修改用户信息", "success",
-						"修改密码： " + Md5Utils.encode(password, user.getUserUU()) + "->" + user1.getUserPwd() + "同步到账户中心成功", user.getUserUU(), SystemSession.getUser().getEnterprise().getUu());
-			} catch (Exception e) {
-				logger.log("修改用户信息", "error",
-						"修改密码： " + Md5Utils.encode(password, user.getUserUU()) + "->" + user1.getUserPwd() + "同步到账户中心失败", user.getUserUU(), SystemSession.getUser().getEnterprise().getUu());
-				throw new SystemException(e.getMessage());
 			}
+			Enterprise enterprise = user1.getEnterprise();
+			user1 = userDao.save(user1);
 			return user1;
 		} else {
 			throw new IllegalOperatorException("原密码验证错误");
@@ -396,33 +354,13 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public void postToAccountCenter(User user) throws Exception {
-		UserDetail detail = new UserDetail();
+		UserView detail = new UserView();
 		detail.setEmail(user.getUserEmail());
-		detail.setIdCode(user.getUserIdcode());
+		detail.setIdCard(user.getUserIdcode());
 		detail.setMobile(user.getUserTel());
 		detail.setName(user.getUserName());
 		detail.setSex(user.getUserSex());
-		AccountUtils.saveUser(user.getUserUU(), SystemSession.getUser().getEnterprise().getUu(), detail);
-	}
-
-	public void postToAccountCenter(User user, String password) throws Exception {
-		UserDetail detail = new UserDetail();
-		detail.setEmail(user.getUserEmail());
-		detail.setIdCode(user.getUserIdcode());
-		detail.setMobile(user.getUserTel());
-		detail.setName(user.getUserName());
-		detail.setSex(user.getUserSex());
-		AccountUtils.addUser(user.getUserUU(), SystemSession.getUser().getEnterprise().getUu(), detail, password);
-	}
-
-	public void postToAccountCenter(User user, Enterprise enterprise) throws Exception {
-		UserDetail detail = new UserDetail();
-		detail.setEmail(user.getUserEmail());
-		detail.setIdCode(user.getUserIdcode());
-		detail.setMobile(user.getUserTel());
-		detail.setName(user.getUserName());
-		detail.setSex(user.getUserSex());
-		AccountUtils.saveUser(user.getUserUU(), enterprise.getUu(), detail);
+		AccountUtils.saveUser(detail, null);
 	}
 
 	static final String defaultPassword = "111111";
@@ -437,20 +375,9 @@ public class UserServiceImpl implements UserService {
 		if (users2.size() > 0) {
 			throw new IllegalOperatorException("邮箱地址重复，建议输入您自己的电子邮箱地址");
 		}
-		Long uu = commonDao.queryForObject("select users_seq.nextval from dual", Long.class);
-		user.setUserUU(uu);
-		user.addEnterprise(SystemSession.getUser().getEnterprise());
-		user.setCurrentEnterprise();
-		user = userDao.save(user);
 
-		user.setUserPwd(Md5Utils.encode(defaultPassword, user.getUserUU()));
-		try {
-			user = userDao.save(user);
-			postToAccountCenter(user, defaultPassword);
-		} catch (Exception e) {
-			userDao.delete(user);
-			throw new RuntimeException(e.getMessage());
-		}
+		addUserToAccountCenter(user);
+
 		// 发送邮件
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("userName", user.getUserName());
@@ -468,11 +395,26 @@ public class UserServiceImpl implements UserService {
 		return user;
 	}
 
+	private UserView addUserToAccountCenter(User user) throws Exception {
+		UserView userView = new UserView();
+		userView.setName(user.getUserName());
+		userView.setIdCard(user.getUserIdcode());
+		userView.setMobile(user.getUserTel());
+		userView.setEmail(user.getUserEmail());
+		userView.setPassword(defaultPassword);
+		userView.setSex(user.getUserSex());
+		return AccountUtils.addUser(SystemSession.getUser().getEnterprise().getUu(), userView);
+	}
+
 	@Override
 	public void removeUser(Long uu) {
 		User user = userDao.findOne(uu);
-		com.uas.account.entity.User userInfo = new com.uas.account.entity.User();
-		userInfo.setAppId("b2b");
+		try {
+			AccountUtils.removeUser(uu, SystemSession.getUser().getEnterprise().getUu());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		UserView userInfo = new UserView();
 		userInfo.setName(user.getUserName());
 		userInfo.setSalt(String.valueOf(uu));
 		userInfo.setSpaceUID(SystemSession.getUser().getEnterprise().getEnBussinessCode());

src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -2,7 +2,7 @@ package com.uas.platform.b2b.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.DistributeDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
@@ -25,6 +25,7 @@ import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
+import com.uas.sso.entity.PartnershipRecordView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -91,17 +92,17 @@ public class VendorsServiceImpl implements VendorService {
 
 	private void addPartnerShipRecord(Vendor vendor) {
 		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
+		PartnershipRecordView record = new PartnershipRecordView();
 		record.setAppId(shipRecord.getAppId());
 		record.setCustName(shipRecord.getCustName());
 		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
+		record.setCustUserCode(Long.valueOf(shipRecord.getCustUserCode()));
 		record.setCustUserEmail(shipRecord.getCustUserEmail());
 		record.setCustUserName(shipRecord.getCustUserName());
 		record.setCustUserTel(shipRecord.getCustUserTel());
 		record.setVendName(shipRecord.getVendName());
 		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
+		record.setVendUserCode(Long.valueOf(shipRecord.getVendUserCode()));
 		record.setVendUserEmail(shipRecord.getVendUserEmail());
 		record.setVendUserName(shipRecord.getVendUserName());
 		record.setVendUserTel(shipRecord.getVendUserTel());
@@ -149,6 +150,7 @@ public class VendorsServiceImpl implements VendorService {
 	public Page<Vendor> findAllByPageInfo(final PageInfo pageInfo) {
 		return vendorDao.findAll(new Specification<Vendor>() {
 
+			@Override
 			public Predicate toPredicate(Root<Vendor> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
@@ -345,7 +347,7 @@ public class VendorsServiceImpl implements VendorService {
 	 * @return
 	 */
 	@Override
-	public com.uas.account.support.Page<VendorRecommend> getVendorRecommend(String productMatchCondition, String enterpriseMatchCondition, String productCondition, int page, int size) {
+	public com.uas.sso.support.Page<VendorRecommend> getVendorRecommend(String productMatchCondition, String enterpriseMatchCondition, String productCondition, int page, int size) {
 		System.out.println("进入方法:" + System.currentTimeMillis());
 		final Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		String cmpCodesSql = concatProductCondition(enUU, productMatchCondition, productCondition);
@@ -443,7 +445,7 @@ public class VendorsServiceImpl implements VendorService {
 	 * @param total 总条数
 	 * @return
 	 */
-	private com.uas.account.support.Page<VendorRecommend> getVendorRecommendByVendUUs(Long enUU, List<Long> vendUUs, int page, int size, Integer total) {
+	private com.uas.sso.support.Page<VendorRecommend> getVendorRecommendByVendUUs(Long enUU, List<Long> vendUUs, int page, int size, Integer total) {
 		List<VendorRecommend> content = new ArrayList<>();
 		for (final Long vendUU : vendUUs) {
 			Enterprise vendor = enterPriseDao.findOne(vendUU);
@@ -484,7 +486,7 @@ public class VendorsServiceImpl implements VendorService {
 		}
 		System.out.println("处理完所有数据：" + System.currentTimeMillis());
 		// 返回分页信息
-		return new com.uas.account.support.Page<VendorRecommend>(page, size, content, total);
+		return new com.uas.sso.support.Page<VendorRecommend>(page, size, content, total);
 	}
 
 	/**
@@ -498,7 +500,7 @@ public class VendorsServiceImpl implements VendorService {
 	 * @return
 	 */
 	@Override
-	public com.uas.account.support.Page<Product> getProductsByVendorRecommend(int page, int size, Long vendUU, String productMatchCondition, String whereCondition) {
+	public com.uas.sso.support.Page<Product> getProductsByVendorRecommend(int page, int size, Long vendUU, String productMatchCondition, String whereCondition) {
 		System.out.println("进入方法：" + System.currentTimeMillis());
 		// UAS企业UU
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
@@ -537,7 +539,7 @@ public class VendorsServiceImpl implements VendorService {
 		    products.add(product);
         }
 		System.out.println("返回数据：" + System.currentTimeMillis());
-		return new com.uas.account.support.Page<>(page, size, products, count);
+		return new com.uas.sso.support.Page<>(page, size, products, count);
 	}
 
 }

src/main/java/com/uas/platform/b2b/support/SPageUtils.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.support;
 
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.search.b2b.model.SPage;
 
 

src/main/java/com/uas/platform/b2b/v2/controller/PartnerShipController.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.v2.controller;
 
-import com.uas.account.entity.PartnershipRecord;
+import com.uas.sso.entity.PartnershipRecordView;
 import com.uas.platform.b2b.v2.service.PartnerShipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,7 +23,7 @@ public class PartnerShipController {
 
     @RequestMapping(method = RequestMethod.POST)
     @ResponseBody
-    public void addVendor(PartnershipRecord record) throws Exception {
+    public void addVendor(PartnershipRecordView record) throws Exception {
         if(null != record) {
             partnerShipService.addVendor(record);
         }

src/main/java/com/uas/platform/b2b/v2/controller/UserController.java

@@ -1,13 +1,12 @@
 package com.uas.platform.b2b.v2.controller;
 
+import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.uas.account.entity.User;
-import com.uas.account.entity.UserDetail;
 import com.uas.platform.b2b.v2.service.UserService;
 
 @Controller("v2.UserController")
@@ -19,27 +18,19 @@ public class UserController {
 
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public User save(User user, UserDetail userDetail) {
-		if (user != null && userDetail != null) {
-			return userService.save(user, userDetail);
+	public UserView save(UserView user) {
+		if (user != null) {
+			return userService.save(user);
 		}
 		return null;
 	}
 
 	@RequestMapping(value = "/pwd", method = RequestMethod.POST)
 	@ResponseBody
-	public void changePassword(User user, String password) {
+	public void changePassword(UserView user, String password) {
 		if (user != null && password != null) {
 			userService.changePassword(user, password);
 		}
 	}
 
-	@RequestMapping(method = RequestMethod.DELETE)
-	@ResponseBody
-	public void remove(User user) {
-		if (user != null) {
-			userService.delete(user);
-		}
-	}
-
 }

src/main/java/com/uas/platform/b2b/v2/service/PartnerShipService.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.v2.service;
 
-import com.uas.account.entity.PartnershipRecord; /**
+import com.uas.sso.entity.PartnershipRecordView;
+/**
  * Created by hejq on 2017-09-29.
  */
 public interface PartnerShipService {
@@ -10,5 +11,5 @@ public interface PartnerShipService {
      *
      * @param record
      */
-    void addVendor(PartnershipRecord record);
+    void addVendor(PartnershipRecordView record);
 }

src/main/java/com/uas/platform/b2b/v2/service/UserService.java

@@ -1,14 +1,16 @@
 package com.uas.platform.b2b.v2.service;
 
-import com.uas.account.entity.User;
-import com.uas.account.entity.UserDetail;
+import com.uas.sso.entity.UserView;
 
 public interface UserService {
 
-	User save(User user, UserDetail detail);
+	/**
+	 * 账户中心同步用户到b2b，只保存用户信息
+	 * @param user 用户信息
+	 * @return
+	 */
+	UserView save(UserView user);
 
-	void changePassword(User user, String password);
-
-	void delete(User user);
+	void changePassword(UserView user, String password);
 
 }

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.v2.service.impl;
 
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.entity.UserSpaceDetail;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.model.Enterprise;
@@ -29,7 +29,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	private final static CommBufferedLogger logger = BufferedLoggerManager.getLogger(CommBufferedLogger.class);
 
 	@Override
-	public Enterprise save(UserSpace userSpace, UserSpaceDetail detail) {
+	public Enterprise save(UserSpaceView userSpace, UserSpaceDetail detail) {
 		Enterprise enterprise = getEnterprise(userSpace);
 		boolean isNew = false;
 		if (enterprise == null) {

src/main/java/com/uas/platform/b2b/v2/service/impl/PartnerShipServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.v2.service.impl;
 
-import com.uas.account.entity.PartnershipRecord;
+import com.uas.platform.b2b.temporary.model.PartnershipRecord;
+import com.uas.sso.entity.PartnershipRecordView;
 import com.uas.platform.b2b.core.util.StringUtil;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.VendorDao;
@@ -9,6 +10,7 @@ import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.v2.service.PartnerShipService;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
+import com.uas.sso.util.AccountUtils;
 import org.apache.axis.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,7 +31,7 @@ public class PartnerShipServiceImpl implements PartnerShipService{
     private EnterpriseDao enterpriseDao;
 
     @Override
-    public void addVendor(PartnershipRecord record) {
+    public void addVendor(PartnershipRecordView record) {
         Enterprise myEn = enterpriseDao.findEnterpriseByEnBussinessCode(record.getCustUID());
         Enterprise vendEn = enterpriseDao.findEnterpriseByEnBussinessCode(record.getVendUID());
         if(null != myEn && null != vendEn) {

src/main/java/com/uas/platform/b2b/v2/service/impl/UserServiceImpl.java

@@ -1,21 +1,13 @@
 package com.uas.platform.b2b.v2.service.impl;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.axis.utils.StringUtils;
+import com.uas.platform.b2b.model.User;
+import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import com.uas.account.entity.User;
-import com.uas.account.entity.UserDetail;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.RoleDao;
 import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Role;
 import com.uas.platform.b2b.v2.service.UserService;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.encry.Md5Utils;
@@ -33,113 +25,42 @@ public class UserServiceImpl implements UserService {
 	static final String defaultPassword = "111111";
 
 	@Override
-	public User save(User user, UserDetail detail) {
-		com.uas.platform.b2b.model.User oldUser = getUser(user);
+	public UserView save(UserView user) {
+		User oldUser = getUser(user);
 		if (oldUser == null) { // 如果是新用户，就新增一个user
 			oldUser = new com.uas.platform.b2b.model.User();
 			oldUser.setEnable(Constant.YES);
 			oldUser.setUserPwd(Md5Utils.encode(defaultPassword, oldUser.getUserUU()));
 		}
-		if (null != detail.getEmail())
-			oldUser.setUserEmail(detail.getEmail());
-		if (null != detail.getIdCode())
-			oldUser.setUserIdcode(detail.getIdCode());
-		if (null != detail.getName())
-			oldUser.setUserName(detail.getName());
-		boolean needChangePwd = false;
+		oldUser.setUserEmail(user.getEmail());
+		oldUser.setUserIdcode(user.getIdCard());
+		oldUser.setUserName(user.getName());
+		oldUser.setUserSex(user.getSex());
+		oldUser.setUserTel(user.getMobile());
+		oldUser.setUserSex(user.getSex());
+		oldUser.setUserTel(user.getMobile());
 		if (user.getPassword() != null) {
 			if (user.getPassword().length() < 32) {// 传过来的是明文
-				if (oldUser.getUserUU() != null)
-					oldUser.setUserPwd(Md5Utils.encode(user.getPassword(), oldUser.getUserUU()));
-				else
-					needChangePwd = true;
+				oldUser.setUserPwd(Md5Utils.encode(user.getPassword(), user.getUserUU()));
 			} else {
 				oldUser.setUserPwd(user.getPassword());// 传过来的是密文
 			}
 		}
-		if (null != detail.getSex())
-			oldUser.setUserSex(detail.getSex());
-		if (null != detail.getMobile())
-			oldUser.setUserTel(detail.getMobile());
-
-		Enterprise enterprise = getEnterprise(user);
-		if (enterprise != null) {
-			oldUser.addEnterprise(enterprise);
-		}
-
-		oldUser = userDao.save(oldUser);
-		if (needChangePwd) {
-			oldUser.setUserPwd(Md5Utils.encode(user.getPassword(), oldUser.getUserUU()));
-			oldUser = userDao.save(oldUser);
-		}
-		if (enterprise != null) {
-			// 管理员账号
-			if (StringUtils.isEmpty(enterprise.getEnAdminTel()) && null == enterprise.getEnAdminuu()) {
-				enterprise.setEnAdminName(oldUser.getUserName());
-				enterprise.setEnAdminEmail(oldUser.getUserEmail());
-				enterprise.setEnAdminTel(oldUser.getUserTel());
-				enterprise.setEnAdminuu(oldUser.getUserUU());
-				enterpriseDao.save(enterprise);
-			} else if (oldUser.getUserTel().equals(enterprise.getEnAdminTel())) {
-				enterprise.setEnAdminName(oldUser.getUserName());
-				enterprise.setEnAdminEmail(oldUser.getUserEmail());
-				enterprise.setEnAdminuu(oldUser.getUserUU());
-				enterpriseDao.save(enterprise);
-			}
-			// 将用户设置为管理员，只对用户的当前企业的角色进行修改
-			Set<Role> existRoles = new HashSet<Role>(); // 新用户注册企业时为空
-			if (!CollectionUtils.isEmpty(oldUser.getRoles())) { // 老用户注册新企业
-				existRoles = oldUser.getRoles();
-			} 
-			// 设置为本企业管理员
-			List<Role> adminList = roleDao.findByEnUUAndDesc(enterprise.getUu(),"管理员");
-			existRoles.add(adminList.get(0));
-			oldUser.setRoles(existRoles);
-			oldUser = userDao.save(oldUser);
-		}
-		user.setDialectUID(String.valueOf(oldUser.getUserUU()));
-		user.setSalt(String.valueOf(oldUser.getUserUU()));
 
 		return user;
 	}
 
-	private com.uas.platform.b2b.model.User getUser(User user) {
+	private com.uas.platform.b2b.model.User getUser(UserView user) {
 		com.uas.platform.b2b.model.User oldUser = null;
-		if (!StringUtils.isEmpty(user.getDialectUID()))
-			oldUser = userDao.findOne(Long.parseLong(user.getDialectUID()));
-		else if (!StringUtils.isEmpty(user.getUid())) {
-			List<com.uas.platform.b2b.model.User> users = userDao.findUserByUserTel(user.getUid());
-			oldUser = CollectionUtils.isEmpty(users) ? null : users.get(0);
+		if (user.getUserUU() != null) {
+			oldUser = userDao.findOne(user.getUserUU());
 		}
 		return oldUser;
 	}
 
-	private Enterprise getEnterprise(User user) {
-		Enterprise enterprise = null;
-		if (user.getSpaceDialectUID() != null)
-			enterprise = enterpriseDao.findEnterpriseByUu(Long.parseLong(user.getSpaceDialectUID()));
-		else if (user.getSpaceUID() != null)
-			enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(user.getSpaceUID());
-		return enterprise;
-	}
-
-	@Override
-	public void delete(User user) {
-		com.uas.platform.b2b.model.User oldUser = getUser(user);
-		if (oldUser != null) {
-			Enterprise enterprise = getEnterprise(user);
-			if (enterprise != null) {
-				oldUser.getEnterprises().remove(enterprise);
-				userDao.save(oldUser);
-			} else if (CollectionUtils.isEmpty(oldUser.getEnterprises())) {
-				userDao.delete(oldUser);
-			}
-		}
-	}
-
 	@Override
-	public void changePassword(User user, String password) {
-		com.uas.platform.b2b.model.User oldUser = getUser(user);
+	public void changePassword(UserView user, String password) {
+		User oldUser = getUser(user);
 		if (oldUser != null) {
 			oldUser.setUserPwd(Md5Utils.encode(password, oldUser.getUserUU()));
 			userDao.save(oldUser);