新账户中心接口

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.sso.entity.PartnershipRecordView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -14,8 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.PartnershipRecord;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.model.AddPartner;
 import com.uas.platform.b2b.service.AddPartnerService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -111,7 +111,7 @@ public class AddPartnerController {
 	@ResponseBody
 	public ResponseEntity<ModelMap> addNewPartner(String name, String businessCode)
 			throws Exception {
-		PartnershipRecord newrecord = new PartnershipRecord();
+		PartnershipRecordView newrecord = new PartnershipRecordView();
 		ModelMap map = new ModelMap();
 		if (businessCode.equals(SystemSession.getUser().getEnterprise().getEnBussinessCode())) {
 			map.put("error", "不能添加自己为合作伙伴");
@@ -121,7 +121,7 @@ public class AddPartnerController {
 			newrecord.setAppId("b2b");
 			newrecord.setCustName(SystemSession.getUser().getEnterprise().getEnName());
 			newrecord.setCustUID(SystemSession.getUser().getEnterprise().getEnBussinessCode());
-			newrecord.setCustUserCode(String.valueOf(SystemSession.getUser().getUserUU()));
+			newrecord.setCustUserCode(SystemSession.getUser().getUserUU());
 			newrecord.setCustUserEmail(SystemSession.getUser().getUserEmail());
 			newrecord.setCustUserName(SystemSession.getUser().getUserName());
 			newrecord.setCustUserTel(SystemSession.getUser().getUserTel());

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

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.uas.sso.entity.UserAccount;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.GrantedAuthority;
@@ -54,10 +55,9 @@ public class AuthenticationController {
 		// 通知到账户中心
 		SSOToken token = SSOHelper.attrToken(request);
 		if (null != token) {
-			com.uas.account.entity.User tokenUser = FlexJsonUtils.fromJson(token.getData(), com.uas.account.entity.User.class);
-			tokenUser.setSpaceDialectUID(String.valueOf(enUU));
-			tokenUser.setId(null);
-			SSOToken newToken = new SSOToken(request, tokenUser.getUid());
+			UserAccount tokenUser = FlexJsonUtils.fromJson(token.getData(), UserAccount.class);
+			tokenUser.setSpaceUU(enUU);
+			SSOToken newToken = new SSOToken(request, tokenUser.getMobile());
 			newToken.setData(FlexJsonUtils.toJson(tokenUser));
 			SSOHelper.setSSOCookie(request, response, newToken, true);
 		}

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

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.Product;

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

@@ -2,7 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.support.Page;
+import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;

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

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.uas.sso.entity.UserAccount;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -183,24 +184,24 @@ 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) {
-					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/java/com/uas/platform/b2b/controller/UserController.java

@@ -20,6 +20,7 @@ import com.uas.platform.core.util.mq.AuthCodeSoap;
 import com.uas.platform.core.util.mq.MessageLog;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.b2b.model.SPage;
+import com.uas.sso.SSOHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
@@ -493,4 +495,24 @@ public class UserController {
 			return map;
 		}
 	}
+
+	@RequestMapping(value = "/getUrl", method = RequestMethod.GET, params = "_operate=updatePassword")
+	@ResponseBody
+	public ModelMap getUpdatePasswordUrl(HttpServletRequest request) {
+		ModelMap map = new ModelMap();
+		try {
+			map.put("url", SSOHelper.getUpdatePasswordUrl(request));
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		return map;
+	}
+
+	@RequestMapping(value = "/getUrl", method = RequestMethod.GET, params = "_operate=cloudcenter")
+	@ResponseBody
+	public ModelMap getCloudCenterUrl(HttpServletRequest request) {
+		ModelMap map = new ModelMap();
+		map.put("url", SSOHelper.getSSOService().getConfig().getSSOProperties().get("sso.cloudcenter.url"));
+		return map;
+	}
 }

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service;
 
 import com.uas.platform.b2b.erp.model.InquiryVendorInfo;
+import com.uas.platform.b2b.model.Vendor;
 
 import java.util.List;
 
@@ -29,4 +30,12 @@ public interface VendorService {
      * @param ids
      */
     void updateStatus(String ids);
+
+    /**
+     * 添加合作伙伴
+     *
+     * @param vendor 供应商资料
+     * @param appId 应用来源
+     */
+    void addPartnerShipRecord(Vendor vendor, String appId);
 }

src/main/java/com/uas/platform/b2b/erp/service/impl/ARCheckServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.SaleARCheckDao;
 import com.uas.platform.b2b.dao.SaleARCheckItemDao;

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryMouldServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.InquiryMould;
 import com.uas.platform.b2b.erp.model.InquiryMouldDecide;
@@ -9,7 +9,6 @@ import com.uas.platform.b2b.erp.service.InquiryMouldService;
 import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
@@ -28,7 +28,6 @@ import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;

src/main/java/com/uas/platform/b2b/erp/service/impl/MakeServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
@@ -14,8 +14,6 @@ import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.event.MakeOrderEndReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
-import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.account.util.AccountUtils;
+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.erp.model.MessageLog;
@@ -12,7 +12,6 @@ import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.core.exception.NotFoundException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
@@ -75,7 +74,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 				} else {// 供应商资料在平台上存在
 					vendor = vendors.get(0);
 					if (order.getVendUserUU() == null || order.getVendUserUU() == 0)// 单据不包含供应商联系人UU号&&供应商列表中有供应商联系人
+					{
 						order.setVendUserUU(vendor.getVendUserUU());// 将供应商列表中的联系人设为单据的供应商联系人
+					}
 					if (order.getUserUU() == null || order.getUserUU() == 0) {
 						order.setUserUU(SystemSession.getUser().getUserUU());
 					}
@@ -114,8 +115,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 	@Override
 	public List<PurchaseReply> convertPurchaseOrderReply(List<PurchaseOrderReply> orderReplies) {
 		List<PurchaseReply> replies = new ArrayList<PurchaseReply>();
-		for (PurchaseOrderReply orderReply : orderReplies)
+		for (PurchaseOrderReply orderReply : orderReplies) {
 			replies.add(new PurchaseReply(orderReply));
+		}
 		return replies;
 	}
 

src/main/java/com/uas/platform/b2b/erp/service/impl/TenderServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
@@ -241,6 +241,7 @@ public class TenderServiceImpl implements TenderService {
     public List<PurchaseTender> findOpen() {
         return purchaseTenderDao.findAll(new Specification<PurchaseTender>() {
 
+            @Override
             public Predicate toPredicate(Root<PurchaseTender> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 Predicate p1 = builder.equal(root.get("ifOpen"), Constant.YES);
                 Predicate p2 = builder.equal(root.get("isPublish"), Constant.YES);
@@ -772,8 +773,9 @@ public class TenderServiceImpl implements TenderService {
                                     if (saleTender.getUseruu() != null) {
                                         List<User> vendUsers = userDao.findByEnUUAndUserUU(vendor.getVendEnUU(),
                                                 saleTender.getUseruu());
-                                        if (vendUsers.size() == 0)
+                                        if (vendUsers.size() == 0) {
                                             saleTender.setUseruu(vendor.getVendUserUU());
+                                        }
                                     }
                                 }
                                 saleTender = saleTenderDao.save(saleTender);

src/main/java/com/uas/platform/b2b/erp/service/impl/VendorServiceImpl.java

@@ -1,7 +1,8 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.PartnershipRecordView;
+import com.uas.sso.util.AccountUtils;
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;
@@ -159,8 +160,7 @@ public class VendorServiceImpl implements VendorService{
     /**
      * 查询邀请是否已经发送
      *
-     * @param venduseremail
-     * @param vendusertel
+     * @param name
      * @return
      */
     private List<ErpInviteRecord> getRecord(String name) {
@@ -221,17 +221,17 @@ public class VendorServiceImpl implements VendorService{
     @Override
     public void addPartnerShipRecord(Vendor vendor, String appId) {
         PartnershipRecord shipRecord = new PartnershipRecord(appId, 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/mobile/controller/AppPubInquiryController.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.FileUpload;
 import com.uas.platform.b2b.model.PublicInquiryItem;
 import com.uas.platform.b2b.model.PublicInquiryItemInfo;

src/main/java/com/uas/platform/b2b/model/User.java

@@ -51,8 +51,8 @@ public class User implements Serializable {
 	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "users_gen")
-	@SequenceGenerator(name = "users_gen", sequenceName = "users_seq", allocationSize = 1)
+//	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "users_gen")
+//	@SequenceGenerator(name = "users_gen", sequenceName = "users_seq", allocationSize = 1)
 	@Column(name = "user_uu")
 	private Long userUU;
 

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

@@ -4,6 +4,7 @@ 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;
+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;
@@ -292,7 +293,7 @@ public class SearchController {
 	 */
 	@RequestMapping("/userspacedetail")
 	@ResponseBody
-	public SPage<UserSpaceDetail> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams)
+	public SPage<UserSpaceView> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams)
 			throws Exception {
 		return searchService.searchUserSpaceDetailCheckIds(keyword, pageParams);
 	}

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.sso.entity.RequestStatus;
+import com.uas.sso.entity.UserSpaceView;
 import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.DateUtils;
 import com.uas.platform.b2b.core.util.StringUtil;
@@ -583,52 +584,52 @@ 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.sso.entity.UserSpaceDetail> details = searchService.searchUserSpaceDetailCheckIds(keyword,
+		SPage<UserSpaceView> details = searchService.searchUserSpaceDetailCheckIds(keyword,
 				pageParams);
 		SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
 		List<UserSpaceDetail> spaceDetails = new ArrayList<UserSpaceDetail>();
 		if (!CollectionUtils.isEmpty(details.getContent())) {
-			for (com.uas.account.entity.UserSpaceDetail detail : details.getContent()) {
+			for (UserSpaceView detail : details.getContent()) {
 				UserSpaceDetail spacetDetail = new UserSpaceDetail();
 				if (null != detail.getBusinessCode() && !"None".equals(detail.getBusinessCode())) {
-					List<Enterprise> enterprises = enterpriseDao.findByEnBussinessCodeAndEnName(detail.getBusinessCode(), detail.getName());
+					List<Enterprise> enterprises = enterpriseDao.findByEnBussinessCodeAndEnName(detail.getBusinessCode(), detail.getSpaceName());
 					// 根据营业执照和企业名找到唯一企业时，才设置
 					if (enterprises.size() == 1) {
 						spacetDetail.setUu(enterprises.get(0).getUu());
 					}
 				}
-				spacetDetail.setAddress(detail.getAddress());
-				spacetDetail.setAdminEmail(detail.getAdminEmail());
-				spacetDetail.setAdminName(detail.getAdminName());
-				spacetDetail.setAdminTel(detail.getAdminTel());
-				spacetDetail.setApplyApps(detail.getApplyApps());
-				spacetDetail.setApproveStatus(detail.getApproveStatus());
+				spacetDetail.setAddress(detail.getRegAddress());
+				spacetDetail.setAdminEmail(detail.getAdmin().getEmail());
+				spacetDetail.setAdminName(detail.getAdmin().getName());
+				spacetDetail.setAdminTel(detail.getAdmin().getMobile());
+//				spacetDetail.setApplyApps(detail.getApplyApps());
+//				spacetDetail.setApproveStatus(detail.getApproveStatus());
 				spacetDetail.setArea(detail.getArea());
 				spacetDetail.setBusinessCode(detail.getBusinessCode());
 				spacetDetail.setBusinessCodeImage(detail.getBusinessCodeImage());
-				spacetDetail.setCity(detail.getCity());
+//				spacetDetail.setCity(detail.getci());
 				spacetDetail.setCorporation(detail.getCorporation());
-				spacetDetail.setDistrict(detail.getDistrict());
-				spacetDetail.setErrMsg(detail.getErrMsg());
-				spacetDetail.setFax(detail.getFax());
-				spacetDetail.setId(detail.getId());
-				spacetDetail.setIndustry(detail.getIndustry());
+//				spacetDetail.setDistrict(detail.getDistrict());
+//				spacetDetail.setErrMsg(detail.getErrMsg());
+//				spacetDetail.setFax(detail.getFax());
+//				spacetDetail.setId(detail.getId());
+//				spacetDetail.setIndustry(detail.getIndustry());
 				spacetDetail.setLogoImage(detail.getLogoImage());
-				spacetDetail.setName(detail.getName());
-				spacetDetail.setProvince(detail.getProvince());
-				spacetDetail.setRegisterDate(detail.getRegisterDate());
-				spacetDetail.setShortName(detail.getShortName());
-				spacetDetail.setStatus(detail.getStatus());
-				spacetDetail.setStreet(detail.getStreet());
-				spacetDetail.setTel(detail.getTel());
-				spacetDetail.setType(detail.getType());
-				spacetDetail.setUrl(detail.getUrl());
-				spacetDetail.setContactEmail(detail.getContactEmail());
-				spacetDetail.setContactTel(detail.getContactTel());
-				spacetDetail.setContactMan(detail.getContactMan());
+				spacetDetail.setName(detail.getSpaceName());
+//				spacetDetail.setProvince(detail.getProvince());
+				spacetDetail.setRegisterDate(detail.getRegisterDate().getTime());
+//				spacetDetail.setShortName(detail.getShortName());
+//				spacetDetail.setStatus(detail.getStatus());
+//				spacetDetail.setStreet(detail.getStreet());
+//				spacetDetail.setTel(detail.getTel());
+//				spacetDetail.setType(detail.getType());
+//				spacetDetail.setUrl(detail.getUrl());
+//				spacetDetail.setContactEmail(detail.getContactEmail());
+//				spacetDetail.setContactTel(detail.getContactTel());
+//				spacetDetail.setContactMan(detail.getContactMan());
 				spacetDetail.setProfession(detail.getProfession());
 				spacetDetail.setTags(detail.getTags());
-				RequsetStatus request = AccountUtils.getStatusByCustUidAndVendUid(spacetDetail.getBusinessCode(),
+				RequestStatus request = AccountUtils.getStatusByCustUidAndVendUid(spacetDetail.getBusinessCode(),
 						SystemSession.getUser().getEnterprise().getEnBussinessCode());
 				if (request != null) {
 					spacetDetail.setRequestStatus(request.getStatusCode());
@@ -839,7 +840,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				Enterprise en = enterpriseDao.findEnterpriseByUu(product.getEnUU());
 				// 先判断合作关系
 				if (null != en) {
-					RequsetStatus request = AccountUtils.getStatusByCustUidAndVendUid(en.getEnBussinessCode(),
+					RequestStatus request = AccountUtils.getStatusByCustUidAndVendUid(en.getEnBussinessCode(),
 							SystemSession.getUser().getEnterprise().getEnBussinessCode());
 					if (request != null) {
 						if (request.getStatusCode() != null) {

src/main/java/com/uas/platform/b2b/service/impl/BrandServiceImpl.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.model.Brand;
 import com.uas.platform.b2b.model.BrandInfo;
 import com.uas.platform.b2b.service.BrandService;
@@ -39,9 +39,10 @@ public class BrandServiceImpl implements BrandService {
 
 	// 判断一个字符串是否含有中文
 	public static boolean isChinese(String str) {
-		if (str == null) return false;
-		if (isChinese(str.toCharArray()[0])) return true;// 有一个中文字符就返回
-		return false;
+		if (str == null) {
+			return false;
+		}
+		return isChinese(str.toCharArray()[0]);
 	}
 
 	public static boolean isChinese(char c) {
@@ -101,7 +102,9 @@ public class BrandServiceImpl implements BrandService {
 	public List<Brand> findByNameCn(String brandNameCn) throws Exception {
 		String url = conf.getB2c() + "/api/product/brand/nameCn/" + brandNameCn;
 		HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
-		if(res.getStatusCode() != 200) throw  new Exception("暂未查询到相关数据");
+		if(res.getStatusCode() != 200) {
+			throw new Exception("暂未查询到相关数据");
+		}
 		return JSONObject.parseArray(res.getResponseText(), Brand.class);
 	}
 

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

@@ -50,6 +50,8 @@ import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.encry.Md5Utils;
 
+import static com.sun.scenario.effect.impl.state.RenderState.EffectCoordinateSpace.UserSpace;
+
 /**
  * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
  * @see com.uas.platform.b2b.v2.service.impl.EnterpriseServiceImpl
@@ -223,11 +225,13 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	@Override
 	public String setAdminPassword(Long enuu, String password) {
 		Enterprise enterprise = enterpriseDao.findOne(enuu);
-		if (enterprise == null)
+		if (enterprise == null) {
 			throw new IllegalArgumentException();
+		}
 		User admin = userDao.findOne(enterprise.getEnAdminuu());
-		if (admin == null)
+		if (admin == null) {
 			throw new IllegalArgumentException();
+		}
 		admin.setUserPwd(Md5Utils.encode(password, admin.getUserUU()));
 		userDao.save(admin);
 		enterprise.setEnAdminPassword(password);
@@ -252,8 +256,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		try {
 			Response response = HttpUtil.sendPostRequest(sysConf.getManageInner() + "/public/enterprise/password?enUU=" + enUU
 					+ "&password=" + password, null, true);
-			if (response.getStatusCode() != HttpStatus.OK.value())
+			if (response.getStatusCode() != HttpStatus.OK.value()) {
 				throw new IllegalOperatorException(response.getResponseText());
+			}
 		} catch (Exception e) {
 			throw new IllegalOperatorException(e.getMessage());
 		}
@@ -428,16 +433,18 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	public Set<Enterprise> findByShortName(String shortName) {
 		Set<Enterprise> enterprises = new HashSet<Enterprise>();
 		Set<String> keys = SearchKeyUtils.splitToKeys(shortName, true);
-		for (String key : keys)
+		for (String key : keys) {
 			enterprises.addAll(enterpriseDao.findByEnShortName(key));
+		}
 		return enterprises;
 	}
 
 	@Override
 	public String reSendActivateEmail(Long enUU, String email, HttpServletRequest request) {
 		Enterprise enterprise = enterpriseDao.findEnterpriseByUu(enUU);
-		if (enterprise == null)
+		if (enterprise == null) {
 			throw new IllegalOperatorException("不存在的企业UU号");
+		}
 		String encodeString = tokenService.getEncodeToken("enterprise", enUU);
 		User admin = userDao.findOne(enterprise.getEnAdminuu());
 		if (StringUtils.hasText(email) && !"null".equals(email) && email != null) {// 修改管理员Email
@@ -518,16 +525,18 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	@Override
 	public Enterprise save(Enterprise enterprise) {
 		Enterprise existEnterprise = enterpriseDao.findOne(enterprise.getUu());
-		if (existEnterprise == null)
+		if (existEnterprise == null) {
 			throw new IllegalArgumentException();
-		try {
-			postToAccountCenter(enterprise);
-			syncToManager(enterprise);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new SystemException("账户中心更新失败：" + e.getMessage());
 		}
+		/// 企业基本信息到账户中心修改，其他信息不用存到账户中心
+//		try {
+//			postToAccountCenter(enterprise);
+//			syncToManager(enterprise);
+//
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			throw new SystemException("账户中心更新失败：" + e.getMessage());
+//		}
 		return enterpriseDao.save(enterprise);
 	}
 
@@ -548,15 +557,15 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		detail.setAdminName(user.getUserName());
 		detail.setAdminEmail(user.getUserEmail());
 		detail.setAdminTel(user.getUserTel());
-		AccountUtils.saveUserSpace(enterprise.getUu(), detail);
+//		AccountUtils.saveUserSpace(enterprise.getUu(), detail);
 	}
 
 	private void syncToManager(Enterprise enterprise) throws Exception {
-		UserSpace userSpace = new UserSpace();
-		userSpace.setAppId("b2b");
-		userSpace.setDialectUID(String.valueOf(enterprise.getUu()));
-		userSpace.setName(enterprise.getEnName());
-		userSpace.setUid(enterprise.getEnBussinessCode());
+		UserSpaceView userSpace = new UserSpaceView();
+//		userSpace.setAppId("b2b");
+//		userSpace.setDialectUID(String.valueOf(enterprise.getUu()));
+//		userSpace.setName(enterprise.getEnName());
+//		userSpace.setUid(enterprise.getEnBussinessCode());
 		UserSpaceDetail userSpaceDetail = new UserSpaceDetail();
 		userSpaceDetail.setAddress(enterprise.getEnAddress());
 		userSpaceDetail.setBusinessCode(enterprise.getEnBussinessCode());
@@ -576,10 +585,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	@Override
 	public Enterprise applySaas(Long enUU, String enSaasUrl, String enAdminPassword) {
 		Enterprise enterprise = enterpriseDao.findOne(enUU);
-		if (enterprise == null)
+		if (enterprise == null) {
 			throw new IllegalArgumentException();
-		if (enterprise.getEnSaasStatus() != null && enterprise.getEnSaasStatus() != Status.UNAPPLY.value())
+		}
+		if (enterprise.getEnSaasStatus() != null && enterprise.getEnSaasStatus() != Status.UNAPPLY.value()) {
 			throw new IllegalOperatorException("您的企业已申请优企云服");
+		}
 		User admin = userDao.findOne(enterprise.getEnAdminuu());
 		boolean result = admin.getUserPwd().equals(Md5Utils.encode(enAdminPassword, admin.getUserUU()));
 		if (result) {

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.util.AccountUtils;
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;

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

@@ -68,12 +68,15 @@ public class PagingReleaseServiceImpl implements PagingReleaseService {
     public SPage<PagingReleaseDetail> findPagingReleaseByPageInfo(final SearchFilter filter,final String keyword, final PageInfo pageInfo) {
         SPage<PagingReleaseDetail> details = new SPage<>();
         if (filter != null) {
-            if (filter.getFromDate() != null)
+            if (filter.getFromDate() != null) {
                 pageInfo.expression(PredicateUtils.gte("pagingRelease.date", new Date(filter.getFromDate()), false));
-            if (filter.getEndDate() != null)
+            }
+            if (filter.getEndDate() != null) {
                 pageInfo.expression(PredicateUtils.lte("pagingRelease.date", new Date(filter.getEndDate()), false));
+            }
         }
         Page<PagingReleaseDetail> pagingReleaseDetails = pagingReleaseDetailDao.findAll(new Specification<PagingReleaseDetail>() {
+            @Override
             public Predicate toPredicate(Root<PagingReleaseDetail> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
             }
@@ -94,8 +97,8 @@ public class PagingReleaseServiceImpl implements PagingReleaseService {
      * @return
      */
     @Override
-    public com.uas.account.support.Page<MessageModel> getPublicMessage(String keyword, PageParams params, Short isRead) throws Exception {
-        com.uas.account.support.Page<MessageModel> page =  MessageUtils.getMessage(params, isRead, keyword);
+    public com.uas.sso.support.Page<MessageModel> getPublicMessage(String keyword, PageParams params, Short isRead) throws Exception {
+        com.uas.sso.support.Page<MessageModel> page =  MessageUtils.getMessage(params, isRead, keyword);
         if (page != null) {
             for (MessageModel messageModel : page.getContent()) {
                 // 拼接公共询价链接

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

@@ -376,7 +376,14 @@ public class UserServiceImpl implements UserService {
 			throw new IllegalOperatorException("邮箱地址重复，建议输入您自己的电子邮箱地址");
 		}
 
-		addUserToAccountCenter(user);
+		try {
+			Long userUU = addUserToAccountCenter(user);
+			user.setUserUU(userUU);
+			userDao.save(user);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e.getMessage());
+		}
 
 		// 发送邮件
 		Map<String, Object> model = new HashMap<String, Object>();
@@ -395,7 +402,7 @@ public class UserServiceImpl implements UserService {
 		return user;
 	}
 
-	private UserView addUserToAccountCenter(User user) throws Exception {
+	private Long addUserToAccountCenter(User user) throws Exception {
 		UserView userView = new UserView();
 		userView.setName(user.getUserName());
 		userView.setIdCard(user.getUserIdcode());
@@ -403,7 +410,7 @@ public class UserServiceImpl implements UserService {
 		userView.setEmail(user.getUserEmail());
 		userView.setPassword(defaultPassword);
 		userView.setSex(user.getUserSex());
-		return AccountUtils.addUser(SystemSession.getUser().getEnterprise().getUu(), userView);
+		return AccountUtils.addUser(SystemSession.getUser().getEnterprise().getUu(), userView).getUserUU();
 	}
 
 	@Override
@@ -414,23 +421,15 @@ public class UserServiceImpl implements UserService {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		UserView userInfo = new UserView();
-		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.setEnable((short) Status.DISABLED.value());
 			}
+			userDao.save(user);
 			try {
-				AccountUtils.unbindUser(userInfo);// 同步数据到账户中心
+				// 同步数据到账户中心
+				AccountUtils.removeUser(user.getUserUU(), SystemSession.getUser().getEnterprise().getUu());
 			} catch (Exception e) {
 				// 尝试删除，存在关联的单据则不删
 			}
@@ -468,8 +467,9 @@ public class UserServiceImpl implements UserService {
 		user = userDao.save(user);
 		user.setUserPwd(Md5Utils.encode(defaultPassword, user.getUserUU()));
 		try {
+			user.setUserPwd(defaultPassword);
+//			postToAccountCenter(user, defaultPassword);
 			user = userDao.save(user);
-			postToAccountCenter(user, defaultPassword);
 		} catch (Exception e) {
 			userDao.delete(user);
 			throw new RuntimeException(e.getMessage());
@@ -498,11 +498,13 @@ public class UserServiceImpl implements UserService {
 		} else if (userName.matches(UU_REGEXP)) {
 			user = findUserByUserUU(Long.parseLong(userName));
 		}
-		if (user == null)
+		if (user == null) {
 			throw new IllegalOperatorException("未查找到您输入账号的用户信息");
+		}
 		user.setCurrentEnterprise();
-		if (user.getEnterprise() == null)
+		if (user.getEnterprise() == null) {
 			throw new IllegalOperatorException("您的账号已被管理员删除，无法操作");
+		}
 		return user;
 	}
 
@@ -554,7 +556,7 @@ public class UserServiceImpl implements UserService {
 						user.setCurrentEnterprise();
 					try {
 						user = userDao.save(user);
-						AccountUtils.resetPassword(user.getUserUU(), user.getEnterprise().getUu(), newPwd);
+//						AccountUtils.resetPassword(user.getUserUU(), user.getEnterprise().getUu(), newPwd);
 					} catch (Exception e) {
 						e.printStackTrace();
 						throw new RuntimeException(e.getMessage());
@@ -655,8 +657,9 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public void bindUserToMyEnterprise(Long userUU) {
 		User user = userDao.findOne(userUU);
-		if (user == null)
+		if (user == null) {
 			throw new IllegalArgumentException("不存在的用户！");
+		}
 
 		Set<Enterprise> enterprises = user.getEnterprises();
 		if (CollectionUtils.isEmpty(enterprises)) {
@@ -688,7 +691,7 @@ public class UserServiceImpl implements UserService {
 		user.setEnterprises(enterprises);
 		userDao.save(user);
 		try {
-			postToAccountCenter(user, enter);
+			AccountUtils.addUser(userUU, enter.getUu());
 		} catch (Exception e) {
 			throw new SystemException(e.getMessage());
 		}

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

@@ -1,7 +1,9 @@
 package com.uas.platform.b2b.v2.controller;
 
 import com.uas.platform.b2b.support.CommBufferedLogger;
+import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
 import com.uas.platform.core.logging.BufferedLoggerManager;
+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;
@@ -10,8 +12,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.v2.service.EnterpriseService;
@@ -36,44 +36,40 @@ public class EnterpriseController {
 
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public UserSpace save(UserSpace userSpace, UserSpaceDetail userSpaceDetail) throws Exception {
-		if (userSpace != null && userSpaceDetail != null) {
-			Enterprise enterprise = enterpriseService.save(userSpace, userSpaceDetail);
-			userSpace.setDialectUID(String.valueOf(enterprise.getUu()));
+	public UserSpaceView save(UserSpaceView userSpaceDetail) throws Exception {
+		if (userSpaceDetail != null) {
+			Enterprise enterprise = enterpriseService.save(userSpaceDetail);
+			userSpaceDetail.setSpaceUU(enterprise.getUu());
 			// 为兼容以前模式，同时知会下管理系统。管理系统主要为了获取企业uu
 			try {
-				userSpace = syncToManager(userSpace, userSpaceDetail);
+				String masterId = syncToManager(userSpaceDetail);
 				// 从管理系统保存完，dialectUID是管理系统masters.id
-				enterprise.setEnMasterId(Long.parseLong(userSpace.getDialectUID()));
+				enterprise.setEnMasterId(Long.parseLong(masterId));
 				enterpriseService.save(enterprise);
-				// 返回给账户中心的，dialectUID表示商务平台的en_uu
-				userSpace.setDialectUID(String.valueOf(enterprise.getUu()));
 			} catch (Exception e) {
 				e.printStackTrace();
 				throw e;
 			}
-			return userSpace;
 		}
 		return null;
 	}
 
-	private UserSpace syncToManager(UserSpace userSpace, UserSpaceDetail userSpaceDetail) throws Exception {
-		JSONObject formData = JSON.parseObject(JSON.toJSONString(userSpace));
-		formData.putAll(JSON.parseObject(JSON.toJSONString(userSpaceDetail)));
+	private String syncToManager(UserSpaceView userSpaceDetail) throws Exception {
+		JSONObject formData = JSON.parseObject(JSON.toJSONString(userSpaceDetail));
 		ResponseWrap res = HttpUtil.doPost(conf.getManageInner() + "/public/enterprise", formData);
-		String enUU = userSpace.getDialectUID();
+		Long enUU = userSpaceDetail.getSpaceUU();
 		if (!res.isSuccess()) {
-			logger.log("同步数据", "error", "同步企业数据到管理平台失败",enUU != null ? Long.valueOf(enUU) : 0L);
+			logger.log("同步数据", "error", "同步企业数据到管理平台失败",enUU != null ? enUU : 0L);
 			throw new Exception(res.getContent());
 		} else {
 			logger.log("同步数据", "success", "同步企业数据到管理平台成功", enUU != null ? Long.valueOf(enUU) : 0L);
-			return JSON.parseObject(res.getContent(), UserSpace.class);
+			return JSON.parseObject(res.getContent()).getString("dialectUID");
 		}
 	}
 
 	@RequestMapping(method = RequestMethod.DELETE)
 	@ResponseBody
-	public void remove(UserSpace userSpace) {
+	public void remove(UserSpaceView userSpace) {
 		if (userSpace != null) {
 			enterpriseService.delete(userSpace);
 		}

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

@@ -1,15 +1,14 @@
 package com.uas.platform.b2b.v2.service;
 
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2b.model.Enterprise;
+import com.uas.sso.entity.UserSpaceView;
 
 public interface EnterpriseService {
 
-	Enterprise save(UserSpace userSpace, UserSpaceDetail detail);
+	Enterprise save(UserSpaceView userSpace);
 
 	Enterprise save(Enterprise enterprise);
 
-	void delete(UserSpace userSpace);
+	void delete(UserSpaceView userSpace);
 
 }

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.v2.service.impl;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.UserView;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.RoleDao;
 import com.uas.platform.b2b.dao.UserDao;
@@ -133,28 +134,24 @@ public class ChangeAdminServiceImpl implements ChangeAdminService {
 
 	private void EnterpriseDeleteUser(Enterprise enterprise) {
 		User user = userDao.findOne(enterprise.getEnAdminuu());
-		com.uas.account.entity.User userInfo = new com.uas.account.entity.User();
-		userInfo.setAppId("b2b");
-		userInfo.setName(user.getUserName());
-		userInfo.setSalt(String.valueOf(enterprise.getEnAdminuu()));
-		userInfo.setSpaceUID(enterprise.getEnBussinessCode());
-		userInfo.setUid(user.getUserTel());
-		userInfo.setSecondUID(user.getUserEmail());
-		userInfo.setDialectUID(String.valueOf(enterprise.getEnAdminuu()));
-		userInfo.setSpaceDialectUID(String.valueOf(enterprise.getUu()));
 		if (user.getEnterprises().contains(enterprise)) {
-			user.removeEnterprise(enterprise);
-			if (user.getEnterprises().size() == 0)
-				user.setEnable((short) Status.DISABLED.value());
-			userDao.save(user);
-			if (user.getEnterprises().size() == 0) {
-				try {
-					userDao.delete(user);
-					AccountUtils.unbindUser(userInfo);// 同步数据到账户中心
-				} catch (Exception e) {
-					// 尝试删除，存在关联的单据则不删
-				}
+			try {
+				AccountUtils.removeUser(user.getUserUU(), enterprise.getUu());
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
+//			user.removeEnterprise(enterprise);
+//			if (user.getEnterprises().size() == 0)
+//				user.setEnable((short) Status.DISABLED.value());
+//			userDao.save(user);
+//			if (user.getEnterprises().size() == 0) {
+//				try {
+//					userDao.delete(user);
+//					AccountUtils.removeUser(user.);// 同步数据到账户中心
+//				} catch (Exception e) {
+//					// 尝试删除，存在关联的单据则不删
+//				}
+//			}
 		}
 	}
 

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

@@ -29,8 +29,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	private final static CommBufferedLogger logger = BufferedLoggerManager.getLogger(CommBufferedLogger.class);
 
 	@Override
-	public Enterprise save(UserSpaceView userSpace, UserSpaceDetail detail) {
-		Enterprise enterprise = getEnterprise(userSpace);
+	public Enterprise save(UserSpaceView detail) {
+		Enterprise enterprise = getEnterprise(detail);
 		boolean isNew = false;
 		if (enterprise == null) {
 			enterprise = new Enterprise();
@@ -38,11 +38,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 			isNew = true;
 		}
 
-		enterprise.setEnAddress(detail.getAddress());
+		enterprise.setEnAddress(detail.getRegAddress());
 		enterprise.setBusinesscodeimg(detail.getBusinessCodeImage());
-		enterprise.setEnAdminEmail(detail.getAdminEmail());
-		enterprise.setEnAdminName(detail.getAdminName());
-		enterprise.setEnAdminTel(detail.getAdminTel());
+//		enterprise.setEnAdminEmail(detail.getAdmin().getEmail());
+//		enterprise.setEnAdminName(detail.getAdmin().getName());
+//		enterprise.setEnAdminTel(detail.getAdmin().getMobile());
 		enterprise.setEnArea(detail.getArea());
 		enterprise.setEnBussinessCode(detail.getBusinessCode());
 		enterprise.setEnCorporation(detail.getCorporation());
@@ -51,20 +51,20 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		} else {
 			enterprise.setEnDate(new Date());
 		}
-		enterprise.setEnEmail(detail.getAdminEmail());
-		enterprise.setEnFax(detail.getFax());
-		enterprise.setEnIndustry(detail.getIndustry());
-		enterprise.setEnName(detail.getName());
-		enterprise.setEnShortname(detail.getShortName());
-		enterprise.setEnTel(detail.getAdminTel());
-		enterprise.setEnType(detail.getType());
-		enterprise.setEnUrl(detail.getUrl());
+//		enterprise.setEnEmail(detail.getAdmin().getEmail());
+//		enterprise.setEnFax(detail.getFax());
+//		enterprise.setEnIndustry(detail.getIndustry());
+		enterprise.setEnName(detail.getSpaceName());
+//		enterprise.setEnShortname(detail.getShortName());
+//		enterprise.setEnTel(detail.getAdmin().getMobile());
+//		enterprise.setEnType(detail.getType());
+//		enterprise.setEnUrl(detail.get());
 		enterprise.setLogUrl(detail.getLogoImage());
 		enterprise.setProfession(detail.getProfession());
 		enterprise.setTags(detail.getTags());
-		enterprise.setContactMan(detail.getContactMan());
-		enterprise.setContactTel(detail.getContactTel());
-		enterprise.setContactEmail(detail.getContactEmail());
+//		enterprise.setContactMan(detail.getAdmin().getName());
+//		enterprise.setContactTel(detail.getAdmin().getMobile());
+//		enterprise.setContactEmail(detail.getAdmin().getEmail());
 		enterprise = enterpriseDao.save(enterprise);
 
 		if (isNew) {
@@ -80,17 +80,18 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		return enterprise;
 	}
 
-	private Enterprise getEnterprise(UserSpace userSpace) {
+	private Enterprise getEnterprise(UserSpaceView userSpace) {
 		Enterprise enterprise = null;
-		if (userSpace.getDialectUID() != null)
-			enterprise = enterpriseDao.findEnterpriseByUu(Long.parseLong(userSpace.getDialectUID()));
-		else if (userSpace.getUid() != null)
-			enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(userSpace.getUid());
+		if (userSpace.getSpaceUU() != null) {
+			enterprise = enterpriseDao.findEnterpriseByUu(userSpace.getSpaceUU());
+		} else if (userSpace.getBusinessCode() != null) {
+			enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(userSpace.getBusinessCode());
+		}
 		return enterprise;
 	}
 
 	@Override
-	public void delete(UserSpace userSpace) {
+	public void delete(UserSpaceView userSpace) {
 		Enterprise enterprise = getEnterprise(userSpace);
 		if (enterprise != null) {
 			List<User> users = userDao.findByEnUU(enterprise.getUu());

src/main/resources/spring/context.xml

@@ -219,7 +219,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>

src/main/resources/test/account.properties

@@ -1,20 +1,22 @@
 ### account center config, 
-account.us.save.url=http://113.105.74.135:8001/api/userspace
-account.user.save.url=http://113.105.74.135:8001/api/user
-account.user.getPartners.url = http://113.105.74.135:8001/api/partners
-account.user.getContactPage.url=http://113.105.74.135:8001/business/groups
+account.us.save.url=http://192.168.253.118:3001/api/userspace
+account.user.save.url=http://192.168.253.118:3001/api/user
+account.user.getPartners.url = http://192.168.253.118:3001/api/partners
+account.user.getContactPage.url=http://192.168.253.118:3001/business/groups
 
 ### sso config
 sso.app=b2b
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
-sso.login.url=http://113.105.74.135:8001/sso/login
-sso.logout.url=http://113.105.74.135:8001/sso/logout
+sso.login.url=http://192.168.253.12:32323/
+sso.logout.url=http://192.168.253.118:3001/sso/logout
 
 #cross domain
-sso.ask.url=http://113.105.74.135:8001/sso/login/ask
-sso.askout.url=http://113.105.74.135:8001/sso/logout/ask
+sso.ask.url=http://192.168.253.118:3001/sso/login/ask
+sso.askout.url=http://192.168.253.118:3001/sso/logout/ask
+sso.updatePassword.url=http://192.168.253.118:3001/reset/changePasswordChooseStyle
+sso.cloudcenter.url=http://192.168.253.118:3001/cloudcenter
 sso.proxy.uri=login/proxy
 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/webapp/resources/js/common/services.js

@@ -379,6 +379,20 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
             	url: 'account/user/info',
             	method: 'GET',
             	isArray: true
+            },
+            getUpdatePasswordUrl: {
+                url: 'account/user/getUrl',
+                params: {
+                    "_operate": "updatePassword"
+                },
+                method: 'GET'
+            },
+            getCloudCenterUrl: {
+                url: 'account/user/getUrl',
+                params: {
+                    "_operate": "cloudcenter"
+                },
+                method: 'GET'
             }
         });
     }]).factory('FeedBackService', ['$resource', 'BaseService', function($resource, BaseService) {

src/main/webapp/resources/js/index/app.js

@@ -11439,21 +11439,32 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         };
         $scope.updatePassword = function () {
-            var modalInstance = $modal.open({
-                animation: true,
-                templateUrl: 'updatePassword.html',
-                controller: 'PasswordCtrl',
-                resolve: {
-                    user: function () {
-                        return $scope.user;
-                    }
-                }
-            });
+            var newPage = window.open("about:black");
+            AccountUser.getUpdatePasswordUrl({}, function (data) {
+                newPage.location.href = data.url;
+            });
+            // var modalInstance = $modal.open({
+            //     animation: true,
+            //     templateUrl: 'updatePassword.html',
+            //     controller: 'PasswordCtrl',
+            //     resolve: {
+            //         user: function () {
+            //             return $scope.user;
+            //         }
+            //     }
+            // });
+            //
+            // modalInstance.result.then(function () {
+            // }, function () {
+            // });
+        };
 
-            modalInstance.result.then(function () {
-            }, function () {
+        $scope.updateDetail = function () {
+            var newPage = window.open("about:black");
+            AccountUser.getCloudCenterUrl({}, function (data) {
+                newPage.location.href = data.url;
             });
-        };
+        }
 
         $scope.newUser = {};
 

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -726,7 +726,7 @@
 	</div>
 
 	<div class="com_title01"><span>管理员信息</span>
-		<a href="https://account.ubtob.com/changeAdmin/changeAdmin" class="pull-right text-simple" target="_blank"><i class="fa fa-exchange fa-fw fa-lg"></i>更换管理员</a>
+		<a href="http://192.168.253.118:3001/appeals/changeManagerAppeal?appId=b2b" class="pull-right text-simple" target="_blank"><i class="fa fa-exchange fa-fw fa-lg"></i>更换管理员</a>
 	</div>
 	<div class="pane-body">
 		<form name="detailForm">

src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -208,14 +208,9 @@
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 		<span class="f14">我的个人资料</span>
 		<div class="pull-right">
-			<a ng-disabled="userForm.$invalid" class="text-simple text-success"
-				ng-show="editing" ng-click="saveUser()">
-				<i class="fa fa-save fa-fw"></i>保存修改</a> 
-				<a class="text-simple" ng-show="editing" ng-click="editing=false">
-				<i class="fa fa-reply-all fa-fw"></i>取消编辑</a> 
-				<a class="text-simple" ng-show="!editing" ng-click="editing=true">
-				<i class="fa fa-pencil fa-fw"></i>编辑</a> 
-				<a class="text-simple text-danger" ng-click="updatePassword()">
+			<a class="text-simple" ng-click="updateDetail()">
+				<i class="fa fa-pencil fa-fw"></i>修改信息</a>
+			<a class="text-simple text-danger" ng-click="updatePassword()">
 				<i class="fa fa-lock fa-fw"></i>修改密码</a>
 		</div>
 	</div>