账户中心 改版一

pom.xml

@@ -392,11 +392,6 @@
 			<artifactId>message-sms-api</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.uas.account</groupId>
-			<artifactId>account-common</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>com.uas.sso</groupId>
 			<artifactId>sso-common</artifactId>

src/main/java/com/uas/platform/b2c/common/account/api/AuthedWebPageController.java

@@ -1,6 +1,6 @@
+/*
 package com.uas.platform.b2c.common.account.api;
 
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.ResourceItem;
 import com.uas.platform.b2c.common.account.model.Role;
@@ -14,6 +14,7 @@ import com.uas.platform.b2c.core.support.TrustedAuthenticationToken;
 import com.uas.platform.core.exception.SystemError;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.AgentUtils;
+import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -32,12 +33,14 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+*/
 /**
  * 认证信息跳转界面
  * 
  * @author yingp
  * 
- */
+ *//*
+
 @RequestMapping("/api")
 @Controller
 public class AuthedWebPageController {
@@ -51,7 +54,8 @@ public class AuthedWebPageController {
 	@Autowired
 	private UserService userService;
 
-	/**
+	*/
+/**
 	 * 用token信息自动登录并打开web页面
 	 * 
 	 * @param request
@@ -59,7 +63,8 @@ public class AuthedWebPageController {
 	 * @param access_token
 	 * @param redirect_page
 	 * @throws IOException
-	 */
+	 *//*
+
 	@RequestMapping(value = "/webpage", method = RequestMethod.GET)
 	public void getWebPageAccessToken(HttpServletRequest request, HttpServletResponse response,
 			@RequestParam(value = "access_token", required = true) String access_token,
@@ -92,11 +97,13 @@ public class AuthedWebPageController {
 		throw new SystemError(AuthenErrors.ACCESS_TOKEN_EXPIRES);
 	}
 
-	/**
+	*/
+/**
 	 * 根据用户获取权限集合
 	 * @param user
 	 * @return
-	 */
+	 *//*
+
 	private Set<GrantedAuthority> getGrantedAuthorities(User user) {
 		Set<GrantedAuthority> authSet = new HashSet<GrantedAuthority>();
 		Set<Role> roles = user.getRoles();
@@ -118,3 +125,4 @@ public class AuthedWebPageController {
 	}
 
 }
+*/

src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -1,9 +1,5 @@
 package com.uas.platform.b2c.common.account.controller;
 
-import com.uas.account.entity.ApplyUserSpace;
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.support.Page;
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserBaseInfo;
@@ -14,6 +10,11 @@ import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
 import com.uas.platform.b2c.trade.support.ResultMap;
+import com.uas.sso.entity.ApplyUserSpaceView;
+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 org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -54,9 +55,9 @@ public class EnterpriseController {
 	 * @return 完整的企业信息
 	 */
 	@RequestMapping(value = "/{enuu}/detailInfo", method = RequestMethod.GET)
-	public UserSpaceDetail getUserSpaceDetailByEnuu(@PathVariable Long enuu){
+	public UserSpaceView getUserSpaceDetailByEnuu(@PathVariable Long enuu){
 		try {
-			return AccountUtils.findByBusinessCode(enterpriseService.getEnterpriseInfo(enuu).getEnBussinessCode()) ;
+			return AccountUtils.findBySpaceUU(enuu) ;
 		}catch (Exception e){
 			return null;
 		}
@@ -191,7 +192,9 @@ public class EnterpriseController {
 			return ResultMap.success("信息缺失");
 		}
 		try {
-			AccountUtils.applyUserSpace(phone,enName,businessCode);
+			User user = userService.findUserByUserTel(phone);
+			Enterprise enterprise = enterpriseService.findByEnBussinessCode(businessCode).get(0);
+			AccountUtils.applyUserSpace(user.getUserUU(),enterprise.getUu());
 		} catch (Exception e) {
 			return ResultMap.success(e.getMessage());
 		}
@@ -207,14 +210,15 @@ public class EnterpriseController {
 		if (StringUtils.isEmpty(phone)) {
 			throw new IllegalArgumentException("信息未填写完整！");
 		}
-		Page<ApplyUserSpace> applyUserSpacePage= null;
+		Page<ApplyUserSpaceView> applyUserSpacePage= null;
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		try {
-			applyUserSpacePage = AccountUtils.findApplyInfo(phone,1,1024*1024*1024);
+			User user = userService.findUserByUserTel(phone);
+			applyUserSpacePage = AccountUtils.findApplyInfo(user.getUserUU(),1,1024*1024*1024);
 			if (!CollectionUtils.isEmpty(applyUserSpacePage.getContent())) {
-				List<ApplyUserSpace> applyUserSpaceList = applyUserSpacePage.getContent();
-				for (ApplyUserSpace applyUserSpace : applyUserSpaceList) {
-					List<Enterprise> e = enterpriseService.findByEnBussinessCode(applyUserSpace.getBusinessCode());
+				List<ApplyUserSpaceView> applyUserSpaceList = applyUserSpacePage.getContent();
+				for (ApplyUserSpaceView applyUserSpace : applyUserSpaceList) {
+					List<Enterprise> e = enterpriseService.findByEnBussinessCode(applyUserSpace.getUserSpaceView().getBusinessCode());
 					User admin = null;
 					if (!CollectionUtils.isEmpty(e) && e.get(0).getEnAdminuu() != null) {
 						admin = userService.findUserByUserUU(e.get(0).getEnAdminuu());
@@ -254,7 +258,8 @@ public class EnterpriseController {
 		}
 		Map<String, Integer> result= null;
 		try {
-			result = AccountUtils.applyCount(businessCode);
+			Enterprise enterprise = enterpriseService.findByEnBussinessCode(businessCode).get(0);
+			result = AccountUtils.applyCount(enterprise.getUu());
 		} catch (Exception e) {
 			throw new IllegalArgumentException("系统异常");
 		}

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -1,10 +1,6 @@
 package com.uas.platform.b2c.common.account.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.entity.UserView;
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.dao.UserLoginTimeDao;
@@ -22,6 +18,10 @@ import com.uas.sso.AuthToken;
 import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.entity.UserView;
+import com.uas.sso.util.AccountUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -223,14 +223,14 @@ public class SecurityController {
 	 */
 	@RequestMapping(value = "/login/other")
 	@ResponseBody
-	public String afterCrossLogin(HttpServletRequest request, HttpServletResponse response, UserView userView, Integer maxage) {
+	public String afterCrossLogin(HttpServletRequest request, HttpServletResponse response, UserAccount userAccount, Integer maxage) {
 		String callback =request.getParameter("jsoncallback");
 		response.setContentType("text/html;charset=UTF-8");
-		if (userView != null && userView.getUid() != null) {
+		if (userAccount != null && userAccount.getMobile() != null) {
  				SSOToken tk = new SSOToken();
-				tk.setUid(userView.getUid());
+				tk.setUid(userAccount.getMobile());
 				tk.setTime(System.currentTimeMillis());
-				tk.setData(JSON.toJSONString(userView));
+				tk.setData(JSON.toJSONString(userAccount));
 				if (null != maxage) {
 					request.setAttribute("sso_cookie_maxage", maxage);
 				}
@@ -240,9 +240,9 @@ public class SecurityController {
 				response.setHeader("P3P","CP=\"CURaADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSPCOR\"");
 				User user = getUserByToken(tk);
 				if (user != null) {
-					if (!user.getUserPwd().equals(FlexJsonUtils.fromJson(tk.getData(), com.uas.account.entity.User.class).getPassword())){
+					/*if (!user.getUserPwd().equals(FlexJsonUtils.fromJson(tk.getData(), com.uas.account.entity.User.class).getPassword())){
 						return "successCallback({success:'0'})";
-					}
+					}*/
 					user.setIp(AgentUtils.getIp(request));
 					request.getSession().setAttribute("user", user);
 					SystemSession.setUser(user);
@@ -287,38 +287,36 @@ public class SecurityController {
 	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 (tokenUser.getUid() != null) {
+			UserAccount tokenUser = FlexJsonUtils.fromJson(token.getData(), UserAccount.class);
+			if (tokenUser.getMobile() != null) {
 				// UID表示所有系统公认的唯一标识，这里统一使用手机号
-				authedUser = userService.findUserByUserTel(tokenUser.getUid());
-			} else if (tokenUser.getDialectUID() != null) {
+				authedUser = userService.findUserByUserTel(tokenUser.getMobile());
+			} else if (tokenUser.getUserUU() != null) {
 				// dialectUID表示client系统自己的唯一标识，比如user_uu，手机号没设置的情况下使用
-				authedUser = userService.findUserByUserUU(Long.parseLong(tokenUser.getDialectUID()));
+				authedUser = userService.findUserByUserUU(tokenUser.getUserUU());
 			} 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) {
+				if (tokenUser.getSpaceUU() != null) {
 					// 如果企业不存在则更新该企业
 					for (Enterprise enterprise : authedUser.getEnterprises()) {
-						if (enterprise.getUu().equals(Long.parseLong(tokenUser.getSpaceDialectUID()))){
+						if (enterprise.getUu().equals(tokenUser.getSpaceUU())){
 							authedUser.setEnterprise(enterprise);
 						}
 					}
 					if (null == authedUser.getEnterprise()) {
-						Enterprise newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
+						Enterprise newEnterprise = enterpriseDao.findByUu(tokenUser.getSpaceUU());
 						if (null == newEnterprise) {
-							UserSpaceDetail userSpaceDetail = null;
+							UserSpaceView userSpaceDetail = null;
 							try {
-								userSpaceDetail = AccountUtils.findByBusinessCode(tokenUser.getSpaceUID());
+								userSpaceDetail = AccountUtils.findByBusinessCode(tokenUser.getBusinessCode());
 							} catch (Exception e) { }
-							UserSpace userSpace = new UserSpace();
-							userSpace.setDialectUID(tokenUser.getSpaceDialectUID());
 							if (null != userSpaceDetail) {
-								enterpriseService.update(userSpace,userSpaceDetail);
+								enterpriseService.update(userSpaceDetail);
 							}
-							newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
+							newEnterprise = enterpriseDao.findByUu(tokenUser.getSpaceUU());
 							authedUser.setEnterprise(newEnterprise);
 						} else {
 							authedUser.getEnterprises().add(newEnterprise);
@@ -326,10 +324,10 @@ public class SecurityController {
 							authedUser.setEnterprise(newEnterprise);
 						}
 					}
-				} else if (tokenUser.getSpaceUID() != null) {
+				} else if (tokenUser.getBusinessCode() != null) {
 					for (Enterprise enterprise : authedUser.getEnterprises()) {
 						// 企业资料在所有系统公认的唯一标识，这里使用商业登记证号
-						if (tokenUser.getSpaceUID().equals(enterprise.getEnBussinessCode())) {
+						if (tokenUser.getBusinessCode().equals(enterprise.getEnBussinessCode())) {
 							authedUser.setEnterprise(enterprise);
 							//保存登录时间
 							List<UserLoginTime> userLoginTimeList = userLoginTimeDao.findByUserUUAndEnUU(authedUser.getUserUU(),enterprise.getUu());

src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -1,8 +1,6 @@
 package com.uas.platform.b2c.common.account.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserBaseInfoDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
@@ -17,6 +15,7 @@ import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.SystemException;
 import com.uas.platform.core.model.Status;
+import com.uas.sso.util.AccountUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -122,28 +121,28 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 	}
 
 	private void postToAccountCenter(Enterprise enterprise) throws Exception {
-		UserSpaceDetail detail = new UserSpaceDetail();
+	/*	UserSpaceDetail detail = new UserSpaceDetail();
 		detail.setAddress(enterprise.getEnAddress());
-		/*detail.setArea(enterprise.getEnArea());
+		*//*detail.setArea(enterprise.getEnArea());
 		detail.setCorporation(enterprise.getEnCorporation());
 		detail.setFax(enterprise.getEnFax());
-		detail.setIndustry(enterprise.getEnIndustry());*/
+		detail.setIndustry(enterprise.getEnIndustry());*//*
 		detail.setName(enterprise.getEnName());
 		detail.setShortName(enterprise.getEnShortname());
-		/*enterprise.setEnType(detail.getType());
-		detail.setType(enterprise.getEnType());*/
+		*//*enterprise.setEnType(detail.getType());
+		detail.setType(enterprise.getEnType());*//*
 		detail.setUrl(enterprise.getEnUrl());
 		detail.setBusinessCode(enterprise.getEnBussinessCode());
 		UserBaseInfo user = userBaseInfoDao.findUserByUserUU(enterprise.getEnAdminuu());
 		detail.setAdminName(user.getUserName());
 		detail.setAdminEmail(user.getUserEmail());
 		detail.setAdminTel(user.getUserTel());
-		AccountUtils.saveUserSpace(enterprise.getUu(), detail);
+		AccountUtils.saveUserSpace(enterprise.getUu(), detail);*/
 	}
 
 	@Override
 	public ResultMap registerEnterprise(FormEnterprise enterprise, String filePath,  User user) {
-		UserSpaceDetail detail = new UserSpaceDetail();
+		/*UserSpaceDetail detail = new UserSpaceDetail();
 		detail.setName(enterprise.getName());
 		detail.setShortName(null);
 		detail.setBusinessCode(enterprise.getLicenceId());
@@ -179,9 +178,9 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		}
 		if (result.contains("errMsg") || !result.contains("enuu")){
 			return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
-		}
+		}*/
 
-		return ResultMap.success(JSONObject.parseObject(result));
+		return null; //ResultMap.success(JSONObject.parseObject(result));
 	}
 
 	@Override

src/main/java/com/uas/platform/b2c/common/account/service/impl/SecQuestionServiceImpl.java

@@ -1,7 +1,5 @@
 package com.uas.platform.b2c.common.account.service.impl;
 
-import com.uas.account.entity.UserDetail;
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.dao.SecQuestionDao;
 import com.uas.platform.b2c.common.account.model.SecQuestion;
 import com.uas.platform.b2c.common.account.model.User;

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserQuestionServiceImpl.java

@@ -1,6 +1,5 @@
 package com.uas.platform.b2c.common.account.service.impl;
 
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.dao.UserQuestionDao;
 import com.uas.platform.b2c.common.account.model.User;
@@ -8,6 +7,8 @@ import com.uas.platform.b2c.common.account.model.UserQuestion;
 import com.uas.platform.b2c.common.account.service.UserQuestionService;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import java.util.List;
+
+import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,7 +37,7 @@ public class UserQuestionServiceImpl implements UserQuestionService {
     }
 
     private void postToAccountCenter(UserQuestion question) {
-        com.uas.account.entity.UserQuestion accountUserQuestion = new com.uas.account.entity.UserQuestion();
+        /*com.uas.account.entity.UserQuestion accountUserQuestion = new com.uas.account.entity.UserQuestion();
         accountUserQuestion.setAnswer(question.getAnswer());
         accountUserQuestion.setQuestion(question.getQuestion());
         accountUserQuestion.setId(question.getId());
@@ -46,6 +47,6 @@ public class UserQuestionServiceImpl implements UserQuestionService {
             AccountUtils.saveUserQuestion(accountUserQuestion);
         } catch (Exception e) {
             e.printStackTrace();
-        }
+        }*/
     }
 }

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -1,7 +1,5 @@
 package com.uas.platform.b2c.common.account.service.impl;
 
-import com.uas.account.entity.UserDetail;
-import com.uas.account.util.AccountUtils;
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2c.common.account.dao.UserCacheEnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
@@ -31,6 +29,8 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.servlet.http.HttpServletRequest;
+
+import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -267,29 +267,30 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User updatePassword(User user, String password, String newPassword) {
-		boolean result = user.getUserPwd().equals(Md5Utils.encode(password, user.getUserUU()));
-		if (result) {
-			User user1 = userDao.findOne(user.getUserUU());
-			user1.setUserPwd(Md5Utils.encode(newPassword, user1.getUserUU()));
-			user1.setPwdSecLevel(user.getPwdSecLevel());
-			if (user1.getEnterprise() == null)
-				user1.setCurrentEnterprise();// 随便绑定一个用户所属企业
-			Enterprise enterprise = user1.getEnterprise();
-			try {
-					//判断是否为个人账户
-					if (enterprise == null){
-							AccountUtils.resetPassword(user1.getUserUU(), null, newPassword);
-					}else {
-							AccountUtils.resetPassword(user1.getUserUU(), enterprise.getUu(), newPassword);
-					}
-				user1 = userDao.save(user1);
-			} catch (Exception e) {
-				throw new SystemException(e.getMessage());
-			}
-			return user1;
-		} else {
-			throw new IllegalOperatorException("原密码验证错误");
-		}
+//		boolean result = user.getUserPwd().equals(Md5Utils.encode(password, user.getUserUU()));
+//		if (result) {
+//			User user1 = userDao.findOne(user.getUserUU());
+//			user1.setUserPwd(Md5Utils.encode(newPassword, user1.getUserUU()));
+//			user1.setPwdSecLevel(user.getPwdSecLevel());
+//			if (user1.getEnterprise() == null)
+//				user1.setCurrentEnterprise();// 随便绑定一个用户所属企业
+//			Enterprise enterprise = user1.getEnterprise();
+//			try {
+//					//判断是否为个人账户
+//					if (enterprise == null){
+//							//AccountUtils.resetPassword(user1.getUserUU(), null, newPassword);
+//					}else {
+//							//AccountUtils.resetPassword(user1.getUserUU(), enterprise.getUu(), newPassword);
+//					}
+//				user1 = userDao.save(user1);
+//			} catch (Exception e) {
+//				throw new SystemException(e.getMessage());
+//			}
+//			return user1;
+//		} else {
+//			throw new IllegalOperatorException("原密码验证错误");
+//		}
+		return null;
 	}
 
 
@@ -338,53 +339,34 @@ public class UserServiceImpl implements UserService {
 
 	//添加未注册
 	public void postToAccountCenter(User user, String password) throws Exception {
-		UserDetail detail = new UserDetail();
+		/*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);
-		//.uas.sso.util.AccountUtils.addUser();
+		//.uas.sso.util.AccountUtils.addUser();*/
 	}
 	public void postToAccountCenter(User user) 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());
 		//判断是否个人用户
 		if(SystemSession.getUser().getEnterprise()==null){
-			AccountUtils.saveUser(user.getUserUU(), null, detail);
+			AccountUtils.addUser(user.getUserUU(),null);
 		}else{
-			AccountUtils.saveUser(user.getUserUU(), SystemSession.getUser().getEnterprise().getUu(), detail);
+			AccountUtils.addUser(user.getUserUU(),SystemSession.getUser().getEnterprise().getUu());
 		}
 	}
 	@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");
-		userInfo.setName(user.getUserName());
-		userInfo.setSalt(String.valueOf(uu));
-		userInfo.setSpaceUID(SystemSession.getUser().getEnterprise().getEnBussinessCode());
-		userInfo.setUid(user.getUserTel());
-		userInfo.setSecondUID(user.getUserEmail());
-		userInfo.setDialectUID(String.valueOf(uu));
 		if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
-			user.removeEnterprise(SystemSession.getUser().getEnterprise());
-			if (user.getEnterprises().size() == 0)
-				user.setEnable((short) Status.DISABLED.value());
-			userDao.save(user);
-			if (user.getEnterprises().size() == 0) {
-				//userDao.delete(user);
-			}
+//			user.removeEnterprise(SystemSession.getUser().getEnterprise());
+//			if (user.getEnterprises().size() == 0)
+//				user.setEnable((short) Status.DISABLED.value());
+//			userDao.save(user);
 			try {
 				com.uas.sso.util.AccountUtils.removeUser(uu,SystemSession.getUser().getEnterprise().getUu());
-				//AccountUtils.unbindUser(userInfo);// 同步数据到账户中心
 			} catch (Exception e) {
-				// 尝试删除，存在关联的单据则不删
 			}
 		} else {
 			throw new IllegalArgumentException();
@@ -461,7 +443,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User updateUserTel(String oldTel, String newTel,Long uu) {
-		// 旧手机号是否正确
+		/*// 旧手机号是否正确
 		User user = userDao.findOne(uu);
 			if(!user.getUserTel().equals(oldTel)){
 				throw new IllegalOperatorException("旧手机号错误");
@@ -478,13 +460,13 @@ public class UserServiceImpl implements UserService {
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
-			}
+			}*/
 			return null;
 		}
 
 	@Override
 	public User updateUserEmail(String tel, String newEmail, Long uu) {
-
+/*
 		try {
 			if(!StringUtils.isEmpty(tel) && !StringUtils.isEmpty(newEmail)) {
 				User user = userDao.findOne(uu);
@@ -499,7 +481,7 @@ public class UserServiceImpl implements UserService {
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		}
+		}*/
 		throw new IllegalOperatorException("数据更新失败...");
 	}
 }

src/main/java/com/uas/platform/b2c/common/account/v2/controller/EnterpriseController.java

@@ -1,9 +1,8 @@
 package com.uas.platform.b2c.common.account.v2.controller;
 
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2c.common.account.model.ChangeAdminDetail;
 import com.uas.platform.b2c.common.account.v2.service.EnterpriseService;
+import com.uas.sso.entity.UserSpaceView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,15 +18,13 @@ public class EnterpriseController {
 
     /**
      * 企业信息更新
-     *
-     * @param userSpace
-     * @param userSpaceDetail
+     * @param userSpaceView
      */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void update(UserSpace userSpace, UserSpaceDetail userSpaceDetail) {
-		if (null != userSpace && null != userSpaceDetail) {
-			 enterpriseService.update(userSpace, userSpaceDetail);
+	public void update(UserSpaceView userSpaceView) {
+		if (null != userSpaceView) {
+			 enterpriseService.update(userSpaceView);
 		}
 	}
 

src/main/java/com/uas/platform/b2c/common/account/v2/controller/UserController.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2c.common.account.v2.controller;
-
-import com.uas.account.entity.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
+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;
@@ -16,29 +15,27 @@ public class UserController {
 	private UserService userService;
 
     /**
-     * b2b修改用户信息
+     * 账户中心保存用户信息接口
      *
      * @param user
      */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void save(User user) {
+	public void save(UserView user) {
 		if (user != null) {
 			 userService.save(user);
 		}
 	}
 
     /**
-     * 删除用户
+     * 账户中心用户 绑定/解绑
      *
      * @param
      */
-	@RequestMapping(value = "/removeUser", method = RequestMethod.POST)
+	@RequestMapping(value = "/bindUser", method = RequestMethod.POST)
     @ResponseBody
-    public void removeUser(User user) {
-		Long uu = Long.valueOf(user.getDialectUID());
-		Long enuu = Long.valueOf(user.getSpaceDialectUID());
-        userService.delete(uu, enuu);
+    public void bindUser(Long userUU, Long spaceUU, Integer type) {
+        userService.bindOrUnbind(userUU, spaceUU, type);
     }
 
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/EnterpriseService.java

@@ -1,18 +1,16 @@
 package com.uas.platform.b2c.common.account.v2.service;
 
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2c.common.account.model.ChangeAdminDetail;
+import com.uas.sso.entity.UserSpaceView;
 
 public interface EnterpriseService {
 
     /**
      * 更新企业信息
      *
-     * @param userSpace
-     * @param userSpaceDetail
+     * @param userSpaceView
      */
-    void update(UserSpace userSpace, UserSpaceDetail userSpaceDetail);
+    void update(UserSpaceView userSpaceView);
 
     /**
      * 更换管理员

src/main/java/com/uas/platform/b2c/common/account/v2/service/UserService.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2c.common.account.v2.service;
 
+import com.uas.sso.entity.UserView;
 
-import com.uas.account.entity.User;
 
 public interface UserService {
 
@@ -10,12 +10,12 @@ public interface UserService {
      *
      * @param user
      */
-	void save(User user);
+	void save(UserView user);
 
     /**
      * 删除用户
      *
      * @param uu
      */
-    void delete(Long uu, Long enuu);
+    void bindOrUnbind(Long uu, Long enuu, Integer type);
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -1,7 +1,5 @@
 package com.uas.platform.b2c.common.account.v2.service.impl;
 
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.ChangeAdminDetail;
@@ -10,6 +8,7 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.EnterpriseService;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.sso.entity.UserSpaceView;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,30 +33,26 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
     @Override
-    public void update(UserSpace userSpace, UserSpaceDetail userSpaceDetail) {
+    public void update(UserSpaceView userSpaceView) {
         Enterprise enterprise = new Enterprise();
-        if (null == userSpace.getDialectUID() && "".equals(userSpace.getDialectUID())){
+        if (null == userSpaceView.getSpaceUU() && "".equals(userSpaceView.getSpaceUU())){
             logger.log("更新企业信息出错，uu为空", "值为null", null,0L);
             return;
         }
-        try{
-            Long.valueOf(userSpace.getDialectUID());
-        }catch (RuntimeException e) {
-            return ;
-        }
-        Enterprise oldenterprise = enterpriseDao.findByUu(Long.valueOf(userSpace.getDialectUID()));
-        enterprise.setEnAddress(userSpaceDetail.getAddress());
-        enterprise.setEnArea(userSpaceDetail.getArea());
-        enterprise.setEnCorporation(userSpaceDetail.getCorporation());
-        enterprise.setEnBussinessCode(userSpaceDetail.getBusinessCode());
-        enterprise.setEnFax(userSpaceDetail.getFax());
-        enterprise.setEnEmail(userSpaceDetail.getAdminEmail());
-        enterprise.setEnIndustry(userSpaceDetail.getIndustry());
-        enterprise.setEnName(userSpaceDetail.getName());
-        enterprise.setEnLogoUrl(userSpaceDetail.getBusinessCodeImage());
-        enterprise.setUu(Long.valueOf(userSpace.getDialectUID()));
+        Enterprise oldenterprise = enterpriseDao.findByUu(Long.valueOf(userSpaceView.getSpaceUU()));
+        enterprise.setEnAddress(userSpaceView.getRegAddress());
+        //enterprise.setEnArea(userSpaceView.get());
+        enterprise.setEnCorporation(userSpaceView.getCorporation());
+        enterprise.setEnBussinessCode(userSpaceView.getBusinessCode());
+        enterprise.setEnFax(userSpaceView.getTelephone());
+        //enterprise.setEnEmail(userSpaceView.get());
+        //enterprise.setEnIndustry(userSpaceView.());
+        enterprise.setEnName(userSpaceView.getSpaceName());
+        enterprise.setEnLogoUrl(userSpaceView.getBusinessCodeImage());
+        enterprise.setUu(Long.valueOf(userSpaceView.getSpaceUU()));
+        enterprise.setEnAdminuu(userSpaceView.getAdmin().getUserUU());
         Enterprise newEn = enterpriseDao.save(enterprise);
-        List<User> users = userDao.findUserByUserTel(userSpaceDetail.getAdminTel());
+       /* List<User> users = userDao.findUserByUserTel(userSpaceDetail.getAdminTel());
         if (!CollectionUtils.isEmpty(users)){
             User adminUser = users.get(0);
             Set<Enterprise> enterprises = null;
@@ -70,7 +65,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             adminUser.setEnterprises(enterprises);
             enterprise.setEnAdminuu(adminUser.getUserUU());
             userDao.save(adminUser);
-        }
+        }*/
         if(null != oldenterprise) {
             logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         } else {

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -1,13 +1,16 @@
+
 package com.uas.platform.b2c.common.account.v2.service.impl;
 
-import com.uas.account.entity.User;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
+import com.uas.platform.b2c.core.constant.IntegerConstant;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
+import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -31,8 +34,13 @@ public class UserServiceImpl implements UserService {
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
     @Override
-    public void save(User user) {
-        com.uas.platform.b2c.common.account.model.User u = null;
+    public void save(UserView user) {
+        User oldUser = userDao.findOne(user.getUserUU());
+        if (null == oldUser) {
+            oldUser = new User();
+        }
+        oneSave(user,oldUser);
+       /* com.uas.platform.b2c.common.account.model.User u = null;
         if (!StringUtils.isEmpty(user.getDialectUID())) {
             u = userDao.findOne(Long.parseLong(user.getDialectUID()));
         }
@@ -49,41 +57,26 @@ public class UserServiceImpl implements UserService {
         if (null == u) {
             u = new com.uas.platform.b2c.common.account.model.User();
         }
-        oneSave(user,u);
-//        if (null == user.getDialectUID() || "".equals(user.getDialectUID())){
-//            List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(user.getUid());
-//            if (!CollectionUtils.isEmpty(users)){
-//                for (com.uas.platform.b2c.common.account.model.User u:users){
-//                    oneSave(user,u);
-//                }
-//            }
-//        }else {
-//            com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
-//            if (null == u) {
-//                u = new com.uas.platform.b2c.common.account.model.User();
-//                oneSave(user,u);
-//            }
-//        }
-
+        oneSave(user,u);*/
     }
-    private void oneSave(User user , com.uas.platform.b2c.common.account.model.User u) {
-        if (user.getPassword() != null) {
+    private void oneSave(UserView user , com.uas.platform.b2c.common.account.model.User u) {
+        /*if (user.getPassword() != null) {
             u.setUserPwd(user.getPassword());
-        }
+        }*/
         if (user.getName() != null) {
             u.setUserName(user.getName());
         }
-        if (user.getUid() != null) {
-            u.setUserTel(user.getUid());
+        if (user.getMobile() != null) {
+            u.setUserTel(user.getMobile());
         }
         u.setEnable((short) 1);
-        if (user.getSecondUID() != null) {
-            u.setUserEmail(user.getSecondUID());
+        if (user.getEmail() != null) {
+            u.setUserEmail(user.getEmail());
         }
-        if (!StringUtils.isEmpty(user.getDialectUID())) {
-            u.setUserUU(Long.valueOf(user.getDialectUID()));
+        if (!StringUtils.isEmpty(user.getUserUU())) {
+            u.setUserUU(Long.valueOf(user.getUserUU()));
         }
-        if (user.getPwdSecLevel() != null) {
+        /*if (user.getPwdSecLevel() != null) {
             u.setPwdSecLevel(user.getPwdSecLevel());
         }
         if (user.getLastLoginTime() != null) {
@@ -124,17 +117,19 @@ public class UserServiceImpl implements UserService {
                 enterprises.add(enterprise);
             }
             u.setEnterprises(enterprises);
-        }
+        }*/
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if (oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getDialectUID() + "" + (enterprise==null?"":enterprise.getUu()));
+            logger.log("更新用户信息", user.getMobile() );
         } else {
-            logger.log("新增用户信息", user.getDialectUID() + ", " + (enterprise==null?"":enterprise.getUu()) );
+            logger.log("新增用户信息", user.getMobile() );
         }
     }
 
-    @Override
+
+
+    /*@Override
     public void delete(Long uu, Long enuu) {
         com.uas.platform.b2c.common.account.model.User user = userDao.findOne(uu);
         Enterprise enterprise = enterpriseDao.findByUu(enuu);
@@ -152,5 +147,28 @@ public class UserServiceImpl implements UserService {
                 }
             }
         }
+    }*/
+
+    @Override
+    public void bindOrUnbind(Long uu, Long enuu, Integer type) {
+        User user = userDao.findOne(uu);
+        Enterprise enterprise = enterpriseDao.findByUu(enuu);
+        if (null == user) {
+            logger.log("绑定用户", uu + "用户不存在！");
+            return;
+        }
+        if (null == enterprise) {
+            logger.log("绑定用户", uu + "企业不存在！");
+            return;
+        }
+        if (null != type) {
+            if (type.equals(IntegerConstant.YES_SHORT)) { //1为绑定，0为解绑
+                user.addEnterprise(enterprise);
+                userDao.save(user);
+            } else {
+                user.removeEnterprise(enterprise);
+                userDao.save(user);
+            }
+        }
     }
 }

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -14,6 +14,7 @@ import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
 import com.uas.sso.common.SSOProperties;
 import com.uas.sso.common.util.HttpUtil;
+import com.uas.sso.entity.UserAccount;
 import com.uas.sso.web.spring.AbstractSSOInterceptor;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
@@ -66,24 +67,24 @@ 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());
+                authedUser = userService.findUserByUserTel(tokenUser.getMobile());
             } 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 (tokenUser.getBusinessCode() != null) {
                     for (Enterprise enterprise : authedUser.getEnterprises()) {
                         // 企业资料在所有系统公认的唯一标识，这里使用商业登记证号
-                        if (tokenUser.getSpaceUID().equals(enterprise.getEnBussinessCode())) {
+                        if (tokenUser.getBusinessCode().equals(enterprise.getEnBussinessCode())) {
                             authedUser.setEnterprise(enterprise);
                             break;
                         }

src/main/resources/dev/account.properties

@@ -1,20 +1,20 @@
 ### account center config, 
-account.us.save.url=http://192.168.253.66:8081/api/userspace
-account.user.save.url=http://192.168.253.66:8081/api/user
-
+account.us.save.url=http://192.168.253.149:3001/api/userspace
+account.user.save.url=http://192.168.253.149:3001/api/user
+account.user.getPartners.url=http://192.168.253.149:3001/api/partners
 ### sso config
 sso.app=mall
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.login.url=http://192.168.253.66:8081/sso/login
-sso.logout.url=http://192.168.253.66:8081/sso/logout
-sso.register.url=http://192.168.253.66:8081/sso/register_p
+sso.login.url=http://192.168.253.149:3001
+sso.logout.url=http://192.168.253.149:3001/sso/logout
+sso.register.url=http://192.168.253.149:3001/sso/register_p
 
 #cross domain
-sso.ask.url=http://192.168.253.66:8081/sso/login/ask
-sso.askout.url=http://192.168.253.66:8081/sso/logout/ask
+sso.ask.url=http://192.168.253.149:3001/sso/login/ask
+sso.askout.url=http://192.168.253.149:3001/sso/logout/ask
 
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

src/main/resources/spring/context.xml

@@ -196,7 +196,7 @@
 		<property name="defaultEncoding" value="utf-8"></property>
 	</bean>
 	<!-- 账户中心配置 -->
-	<bean id="accountConfigurer" class="com.uas.account.web.AccountConfigurer"
+	<bean id="accountConfigurer" class="com.uas.sso.web.AccountConfigurer"
 		init-method="init">
 		<property name="configPath" value="classpath:${profile}/account.properties" />
 	</bean>