切换登录

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@5817 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -20,8 +20,12 @@ import com.uas.platform.b2b.support.SystemSession;
  * 账户管理--企业信息管理
  * 
  * @author yingp
+ * 
+ * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
+ * @see com.uas.platform.b2b.v2.controller.EnterpriseController
  *
  */
+@Deprecated
 @Controller
 @RequestMapping(value = "/account/enterprise")
 public class EnterpriseController {
@@ -44,8 +48,7 @@ public class EnterpriseController {
 	@ResponseBody
 	public Enterprise getEnterprise() {
 		Enterprise enterprise = SystemSession.getUser().getEnterprise();
-		enterprise.setAdmin(userService.findUserByUserUU(enterprise
-				.getEnAdminuu()));
+		enterprise.setAdmin(userService.findUserByUserUU(enterprise.getEnAdminuu()));
 		return enterprise;
 	}
 
@@ -66,7 +69,7 @@ public class EnterpriseController {
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value="/applySaas", method = RequestMethod.POST)
+	@RequestMapping(value = "/applySaas", method = RequestMethod.POST)
 	@ResponseBody
 	public void applySaas(Long enUU, String enSaasUrl, String enAdminPassword) {
 		Enterprise enterprise = enterpriseService.applySaas(enUU, enSaasUrl, enAdminPassword);

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

@@ -21,12 +21,16 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.uas.account.entity.UserDetail;
+import com.uas.account.entity.UserSpace;
+import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.SigninLog;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.SigninLogService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.sso.AuthToken;
@@ -215,4 +219,50 @@ public class SecurityController {
 		return SitePreference.NORMAL;
 	}
 
+	/**
+	 * 供账户中心回调的新增企业接口
+	 * 
+	 * @param space
+	 * @param spaceDetail
+	 * @return
+	 */
+	@RequestMapping(value = "/public/enterprise", method = RequestMethod.POST)
+	@ResponseBody
+	public UserSpace saveEnterprise(UserSpace space, UserSpaceDetail spaceDetail) {
+
+		return null;
+	}
+
+	/**
+	 * 供账户中心回调的新增用户接口
+	 * 
+	 * @param user
+	 * @param userDetail
+	 */
+	@RequestMapping(value = "/public/user", method = RequestMethod.POST)
+	@ResponseBody
+	public void saveUser(com.uas.account.entity.User user, UserDetail userDetail) {
+		User oldOne = null;
+		if (user.getDialectUID() != null) {
+			oldOne = userService.findUserByUserUU(Long.parseLong(user.getDialectUID()));
+		}
+		if (oldOne == null && userDetail.getMobile() != null) {
+			oldOne = userService.findUserByUserTel(userDetail.getMobile());
+		}
+		if (oldOne == null) {
+
+		}
+		User localUser = new User();
+		localUser.setEnable(Constant.YES);
+		localUser.setUserEmail(userDetail.getEmail());
+		localUser.setUserIdcode(userDetail.getIdCode());
+		localUser.setUserName(userDetail.getName());
+		localUser.setUserPwd(user.getPassword());
+		localUser.setUserSex(userDetail.getSex());
+		localUser.setUserTel(userDetail.getMobile());
+		if (user.getDialectUID() != null)
+			localUser.setUserUU(Long.parseLong(user.getDialectUID()));
+
+	}
+
 }

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

@@ -36,6 +36,11 @@ import com.uas.platform.core.util.mq.SendMessageUtil;
  * @author aof
  * 
  */
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理、客服中心提供服务
+ *
+ */
+@Deprecated
 @Controller
 @RequestMapping(value = "/serve")
 public class ServeController {

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

@@ -33,7 +33,11 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
  * 
  * @author suntg
  * @date 2015年3月10日17:37:37
+ * 
+ * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
+ * @see com.uas.platform.b2b.v2.controller.UserController
  */
+@Deprecated
 @Controller
 @RequestMapping(value = "/account/user")
 public class UserController {
@@ -54,12 +58,13 @@ public class UserController {
 		logger.log("用户信息", "查看用户信息");
 		return userService.findAll();
 	}
-	
-	@RequestMapping(value="/customer/{uu}",method = RequestMethod.POST)
+
+	@RequestMapping(value = "/customer/{uu}", method = RequestMethod.POST)
 	@ResponseBody
-    public List<User> getUsersAndDistribute(@PathVariable("uu") Long custUu) {
-    	return userService.findUserInfoDistribute(custUu);
-    }
+	public List<User> getUsersAndDistribute(@PathVariable("uu") Long custUu) {
+		return userService.findUserInfoDistribute(custUu);
+	}
+
 	/**
 	 * 手机号是否可用
 	 * 
@@ -211,7 +216,7 @@ public class UserController {
 		userService.bindUserToMyEnterprise(userUU);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
-	
+
 	/**
 	 * 为用户分配客户权限,查询客户（管理员才能操作）
 	 * 
@@ -224,7 +229,7 @@ public class UserController {
 	public List<Vendor> findVendor(@PathVariable("uu") Long userUU) {
 		return userService.findVendorToUser(userUU);
 	}
-	
+
 	/**
 	 * 为用户分配客户权限，保存绑定（管理员才能操作）
 	 * 
@@ -233,27 +238,28 @@ public class UserController {
 	 */
 	@RequestMapping(value = "/addVendor/{uu}", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> bindVendor(@PathVariable("uu") Long userUU , @RequestBody String json) {
+	public ResponseEntity<String> bindVendor(@PathVariable("uu") Long userUU, @RequestBody String json) {
 		List<Vendor> ids = FlexJsonUtils.fromJsonArray(json, Vendor.class);
-		boolean result = userService.addVendorToUser(userUU,ids);
-		if(result) {
+		boolean result = userService.addVendorToUser(userUU, ids);
+		if (result) {
 			return new ResponseEntity<String>(HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/bindUserToVendor/{uu}", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> bindUserToVendor(@PathVariable("uu") Long custUU , @RequestBody String json) {
+	public ResponseEntity<String> bindUserToVendor(@PathVariable("uu") Long custUU, @RequestBody String json) {
 		List<User> users = FlexJsonUtils.fromJsonArray(json, User.class);
 		boolean result = userService.addUserToVendor(custUU, users);
-		if(result) {
+		if (result) {
 			return new ResponseEntity<String>(HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
+
 	/**
 	 * 为用户分配客户权限,删除被选中客户（管理员才能操作）
 	 * 
@@ -266,13 +272,13 @@ public class UserController {
 	public ResponseEntity<String> removeChooseVendor(@PathVariable("uu") Long userUU, @RequestBody String json) {
 		List<Long> ids = FlexJsonUtils.fromJsonArray(json, Long.class);
 		boolean result = userService.removeChooseVendor(userUU, ids);
-		if(result) {
+		if (result) {
 			return new ResponseEntity<String>(HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	/**
 	 * 为用户分配客户权限,查询被选中客户（管理员才能操作）
 	 * 
@@ -285,8 +291,10 @@ public class UserController {
 	public List<Vendor> findChooseVendor(@PathVariable("uu") Long userUU) {
 		return userService.findChooseVendor(userUU);
 	}
+
 	/**
 	 * 查询当前登录用户的分分配企业
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/findDistribute", method = RequestMethod.GET)

src/main/java/com/uas/platform/b2b/dao/RegisterRecordDao.java

@@ -10,16 +10,24 @@ import org.springframework.stereotype.Repository;
 
 import com.uas.platform.b2b.model.RegisterRecord;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理
+ *
+ */
+@Deprecated
 @Repository
-public interface RegisterRecordDao extends JpaSpecificationExecutor<RegisterRecord>,JpaRepository<RegisterRecord, Long> {
+public interface RegisterRecordDao extends JpaSpecificationExecutor<RegisterRecord>, JpaRepository<RegisterRecord, Long> {
 	/**
 	 * 通过发送状态查找企业注册记录
+	 * 
 	 * @param sendStatus
 	 * @return
 	 */
 	public List<RegisterRecord> findBySendStatus(Short sendStatus);
+
 	/**
 	 * 通过企业号查询注册记录表
+	 * 
 	 * @param enUu
 	 * @return
 	 */

src/main/java/com/uas/platform/b2b/event/PurchaseOrderSaveEvent.java

@@ -7,7 +7,6 @@ import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderAllItem;
 import com.uas.platform.b2b.model.PurchaseOrderIndex;
-import com.uas.platform.b2b.support.mq.PushUtils;
 
 /**
  * 客户采购单保存事件
@@ -37,13 +36,13 @@ public class PurchaseOrderSaveEvent extends SaveEvent<PurchaseOrderIndex, Purcha
 		indexes.addAll(PurchaseOrderIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
 		// 客户UU号（匹配完整的UU号）
 		indexes.add(new PurchaseOrderIndex(enUU, key, saved.getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字） 
-		//送货工厂全称匹配
+		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
+		// 送货工厂全称匹配
 		for (PurchaseOrderAllItem item : saved.getOrderItems()) {
 			indexes.add(new PurchaseOrderIndex(enUU, key, item.getProduct().getCode()));
 			indexes.addAll(PurchaseOrderIndex.format(enUU, key, SearchKeyUtils.splitToKeys(item.getProduct().getTitle(), false)));
 			indexes.addAll(PurchaseOrderIndex.format(enUU, key, SearchKeyUtils.splitToKeys(item.getProduct().getSpec(), false)));
-			if(item.getFactory() != null) {
+			if (item.getFactory() != null) {
 				indexes.add(new PurchaseOrderIndex(enUU, key, item.getFactory()));
 			}
 		}
@@ -58,8 +57,9 @@ public class PurchaseOrderSaveEvent extends SaveEvent<PurchaseOrderIndex, Purcha
 				// 如果采购单单据存在客户联系人UU且UU正确--->客户联系人UU
 				// 如果不存在，但是平台中企业供应商资料存在供应商联系人UU--->平台中供应商资料中的联系人UU
 				// 否则不推送
-				/*PushUtils.push(order.getVendUU(), order.getVendUserUU(), "收到新的客户采购单", "单号：" + order.getCode() + "，客户："
-						+ order.getEnterprise().getEnName(), "#/sale/order/" + order.getId(), "客户采购订单");*/
+				/*
+				 * PushUtils.push(order.getVendUU(), order.getVendUserUU(), "收到新的客户采购单", "单号：" + order.getCode() + "，客户：" + order.getEnterprise().getEnName(), "#/sale/order/" + order.getId(), "客户采购订单");
+				 */
 			}
 		}
 	}

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

@@ -19,18 +19,23 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.model.ChangeAdmin;
 import com.uas.platform.b2b.service.ChangeAdminService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+
 /**
  * 管理平台数据接口
+ * 
  * @author aof
  * @date 2015年12月28日 上午10:38:21
+ * 
+ * @since 2016-9-26 21:18:35 账户中心统一管理
  */
+@Deprecated
 @Controller(value = "manage.ChangeAdminController")
 @RequestMapping(value = "/manage/changeadmin")
 public class ChangeAdminController {
-	
+
 	@Autowired
 	private ChangeAdminService changeAdminService;
-	
+
 	/**
 	 * 管理平台获取需要审核的申请表
 	 * 
@@ -41,7 +46,7 @@ public class ChangeAdminController {
 	public List<ChangeAdmin> getUnauditedChangeAdmin() {
 		return changeAdminService.getUnauditedChangeAdmin();
 	}
-	
+
 	/**
 	 * 修改申请表的状态（已下载）
 	 * 
@@ -49,12 +54,12 @@ public class ChangeAdminController {
 	 */
 	@RequestMapping(value = "/unauditedSuccess", method = RequestMethod.POST)
 	@ResponseBody
-	public void updatedChangeAdmin(@RequestParam("data") String data, HttpServletRequest request) throws UnsupportedEncodingException{
+	public void updatedChangeAdmin(@RequestParam("data") String data, HttpServletRequest request) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<Long> ids = FlexJsonUtils.fromJsonArray(jsonStr, Long.class);
 		changeAdminService.unauditedUploadSuccess(ids);
 	}
-	
+
 	/**
 	 * 审核通过的企业
 	 * 
@@ -67,13 +72,13 @@ public class ChangeAdminController {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		String result = null;
 		try {
-			changeAdminService.auditYesEnterprise(id,request);
+			changeAdminService.auditYesEnterprise(id, request);
 		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.EXPECTATION_FAILED);
 		}
 		return new ResponseEntity<String>(result, headers, HttpStatus.OK);
 	}
-	
+
 	/**
 	 * 审核不通过的企业
 	 * 
@@ -81,12 +86,12 @@ public class ChangeAdminController {
 	 */
 	@RequestMapping(value = "/auditNo", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> auditFail(Long id,String remark, HttpServletRequest request) {
+	public ResponseEntity<String> auditFail(Long id, String remark, HttpServletRequest request) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		String result = null;
 		try {
-			changeAdminService.auditNo(id,remark,request);
+			changeAdminService.auditNo(id, remark, request);
 		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.EXPECTATION_FAILED);
 		}

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

@@ -35,7 +35,10 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
  * 
  * @author suntg
  * @date 2015年5月19日18:49:28
+ * 
+ * @since 2016-9-26 21:18:35 账户中心统一管理
  */
+@Deprecated
 @Controller(value = "manage.EnterpriseController")
 @RequestMapping(value = "/manage/enterprise")
 public class EnterpriseController {
@@ -185,7 +188,7 @@ public class EnterpriseController {
 		List<Enterprise> enterprises = FlexJsonUtils.fromJsonArray(jsonStr, Enterprise.class);
 		enterpriseService.createdSaas(enterprises, request);
 	}
-	
+
 	/**
 	 * 管理平台获取需要全部企业信息
 	 * 
@@ -194,34 +197,35 @@ public class EnterpriseController {
 	 */
 	@RequestMapping(value = "/serve", method = RequestMethod.GET)
 	@ResponseBody
-	public Page<Enterprise> getB2bPageEnterprise(PageParams params,String keyword) {
+	public Page<Enterprise> getB2bPageEnterprise(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
-		Page<Enterprise> list = enterpriseService.getAllPageEnterprise(info,keyword);
+		Page<Enterprise> list = enterpriseService.getAllPageEnterprise(info, keyword);
 		return list;
 	}
-	
+
 	/**
-	 *  获取当前企业的所有用户信息（包括管理员密码）
+	 * 获取当前企业的所有用户信息（包括管理员密码）
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/users/{id}", method = RequestMethod.GET)
 	@ResponseBody
-	public List<ModelMap> getB2bUsersByenUU(@PathVariable("id") Long id){
+	public List<ModelMap> getB2bUsersByenUU(@PathVariable("id") Long id) {
 		List<User> users = userService.findUsersByEnUU(id);
 		Enterprise enter = enterpriseService.findByEnUU(id);
 		List<ModelMap> listMap = new ArrayList<ModelMap>();
 		ModelMap map1 = new ModelMap();
-		if (enter !=null) {
+		if (enter != null) {
 			List<User> admin = userService.findUsersByEnUU(enter.getEnAdminuu());
 			map1.put("enName", enter.getEnName());
-			if (admin.size() !=0){
+			if (admin.size() != 0) {
 				map1.put("adminName", admin.get(0).getUserName());
-			}else{
+			} else {
 				map1.put("adminName", "未设置");
 			}
-			if (enter.getEnAdminPassword() !=null && enter.getEnAdminPassword().length() != 0 ){
+			if (enter.getEnAdminPassword() != null && enter.getEnAdminPassword().length() != 0) {
 				map1.put("adminPwd", enter.getEnAdminPassword());
-			}else {
+			} else {
 				map1.put("adminPwd", "暂无");
 			}
 		}
@@ -229,7 +233,7 @@ public class EnterpriseController {
 		if (users != null) {
 			for (User user : users) {
 				ModelMap map = new ModelMap();
-				map.put("userName",user.getUserName());
+				map.put("userName", user.getUserName());
 				map.put("userUu", user.getUserUU());
 				map.put("userMail", user.getUserEmail());
 				listMap.add(map);
@@ -239,5 +243,5 @@ public class EnterpriseController {
 		}
 		return listMap;
 	}
-	
+
 }

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

@@ -15,6 +15,11 @@ import com.uas.platform.b2b.manage.model.AccountInfo;
 import com.uas.platform.b2b.manage.service.UserService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理
+ *
+ */
+@Deprecated
 @Controller(value = "manage.UserController")
 @RequestMapping(value = "/manage/user")
 public class UserController {

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

@@ -14,9 +14,11 @@ import javax.validation.constraints.NotNull;
 /**
  * 记录企业注册的记录，包括企业注册、审核、发送邮件、激活、再次激活等操作
  * 
+ * @since 2016-9-26 21:18:35 账户中心统一管理
  */
 @Entity
 @Table(name = "log$registe")
+@Deprecated
 public class RegisterRecord {
 	/**
 	 * ID
@@ -76,7 +78,7 @@ public class RegisterRecord {
 	 */
 	@Column(name = "lr_result")
 	private String result;
-	
+
 	/**
 	 * 传输状态
 	 */

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

@@ -10,30 +10,40 @@ import org.springframework.data.domain.Page;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.core.model.PageInfo;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
+ * @see com.uas.platform.b2b.v2.service.EnterpriseService
+ *
+ */
+@Deprecated
 public interface EnterpriseService {
-	
+
 	/**
 	 * 获取全部企业信息
+	 * 
 	 * @return
 	 */
 	public List<Enterprise> getAllEnterprises();
 
 	/**
 	 * 企业注册号是否可用
+	 * 
 	 * @param code
 	 * @return
 	 */
 	public String bussinessCodeEnable(String code);
-	
+
 	/**
 	 * 企业名称是否可用
+	 * 
 	 * @param enName
 	 * @return
 	 */
 	public String enNameEnable(String enName);
-	
+
 	/**
 	 * 修改企业信息
+	 * 
 	 * @param enterprise
 	 * @return
 	 */
@@ -46,9 +56,10 @@ public interface EnterpriseService {
 	 * @return
 	 */
 	public boolean isSaasUrlUseable(String saasUrl);
-	
+
 	/**
 	 * B2B企业申请SaaS
+	 * 
 	 * @param enUU
 	 * @param enSaasUrl
 	 * @param enAdminPassword
@@ -85,7 +96,7 @@ public interface EnterpriseService {
 	 * @return
 	 */
 	public List<Enterprise> findByName(String name);
-	
+
 	/**
 	 * 按名称查找企业
 	 * 
@@ -93,8 +104,10 @@ public interface EnterpriseService {
 	 * @return
 	 */
 	public List<Object[]> findByEnNames(List<String> names);
+
 	/**
 	 * 通过邮箱查询企业
+	 * 
 	 * @param enMail
 	 * @return
 	 */
@@ -102,20 +115,21 @@ public interface EnterpriseService {
 
 	/**
 	 * 根据营业执照号查询企业信息
+	 * 
 	 * @param businessCode
 	 * @return
 	 */
 	public Enterprise findByenBussinessCode(String enBussinessCode);
-	
+
 	/**
 	 * 根据企业UU和营业执照号查询企业信息
+	 * 
 	 * @param uu
 	 * @param enBussinessCode
 	 * @return
 	 */
-	public Enterprise findEnterpriseByUuAndEnBussinessCode(Long uu,String enBussinessCode);
-	
-	
+	public Enterprise findEnterpriseByUuAndEnBussinessCode(Long uu, String enBussinessCode);
+
 	/**
 	 * 按简称查找企业
 	 * 
@@ -147,20 +161,23 @@ public interface EnterpriseService {
 
 	/**
 	 * 管理平台创建SAAS账套后，发送邮件通知企业管理员
+	 * 
 	 * @param enterprises
 	 * @param request
 	 */
 	public void createdSaas(List<Enterprise> enterprises, HttpServletRequest request);
-	
+
 	/**
 	 * 获取全部企业
+	 * 
 	 * @param pageInfo
 	 * @return
 	 */
 	public Page<Enterprise> getAllPageEnterprise(PageInfo pageInfo, String keyword);
-	
+
 	/**
 	 * 通过企业UU号获取企业信息
+	 * 
 	 * @param enUU
 	 * @return
 	 */
@@ -168,6 +185,7 @@ public interface EnterpriseService {
 
 	/**
 	 * 通过ERP直接注册开通企业信息
+	 * 
 	 * @param newEnterprise
 	 * @return
 	 */
@@ -175,5 +193,4 @@ public interface EnterpriseService {
 
 	public Set<Enterprise> findByNameKey(String name);
 
-	
 }

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

@@ -4,6 +4,11 @@ import java.util.List;
 
 import com.uas.platform.b2b.model.RegisterRecord;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理
+ *
+ */
+@Deprecated
 public interface RegisterLogService {
 
 	/**
@@ -12,18 +17,20 @@ public interface RegisterLogService {
 	 * @param log
 	 */
 	public List<RegisterRecord> getNotUpLoadRegisterLog();
-	
+
 	/**
 	 * 成功上传到管理平台后修改注册记录的状态
+	 * 
 	 * @param idStr
 	 */
 	public void upLoadSuccessRegister(List<Long> ids);
-	
+
 	/**
-	 * 获取企业注册信息 
+	 * 获取企业注册信息
+	 * 
 	 * @param enUU
 	 * @return
 	 */
-	public List<RegisterRecord>  getRegisterLog(Long enUU);
+	public List<RegisterRecord> getRegisterLog(Long enUU);
 
 }

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

@@ -10,6 +10,12 @@ import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.UserInfo;
 import com.uas.platform.b2b.model.Vendor;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
+ * @see com.uas.platform.b2b.v2.service.UserService
+ *
+ */
+@Deprecated
 public interface UserService {
 
 	/**
@@ -27,7 +33,7 @@ public interface UserService {
 	 * @return
 	 */
 	boolean isTelUseable(String tel);
-	
+
 	/**
 	 * 检测手机号是否可用
 	 * 
@@ -43,7 +49,7 @@ public interface UserService {
 	 * @return
 	 */
 	User save(User user);
-	
+
 	/**
 	 * 修改user基本信息（不修改密码）
 	 * 
@@ -56,22 +62,24 @@ public interface UserService {
 	 * 修改user基本信息（不修改密码）
 	 * 
 	 * @param user
-	 * @param request 
+	 * @param request
 	 * @return
 	 */
 	User addUser(User user, HttpServletRequest request);
-	
+
 	/**
 	 * 新添加用户，保存到企业
+	 * 
 	 * @param user
 	 * @param request
 	 * @param enter
 	 * @return
 	 */
 	User addUser(User user, HttpServletRequest request, Enterprise enter);
-	
+
 	/**
 	 * 删除用户信息
+	 * 
 	 * @param uu
 	 */
 	void removeUser(Long uu);
@@ -83,7 +91,7 @@ public interface UserService {
 	 * @return
 	 */
 	User findUserByUserUU(Long userUU);
-	
+
 	/**
 	 * 按企业及个人uu取用户信息
 	 * 
@@ -92,7 +100,7 @@ public interface UserService {
 	 * @return
 	 */
 	User findUserByEnUUAndUserUU(Long enUU, Long userUU);
-	
+
 	/**
 	 * 按企业uu取用户信息
 	 * 
@@ -100,6 +108,7 @@ public interface UserService {
 	 * @return
 	 */
 	List<User> findUsersByEnUU(Long enUU);
+
 	/**
 	 * 按email取用户信息
 	 * 
@@ -133,28 +142,35 @@ public interface UserService {
 
 	/**
 	 * 修改用户密码
-	 * @param user 用户
-	 * @param password 原密码
-	 * @param newPassword 新密码
+	 * 
+	 * @param user
+	 *            用户
+	 * @param password
+	 *            原密码
+	 * @param newPassword
+	 *            新密码
 	 * @return
 	 */
 	public User updatePassword(User user, String password, String newPassword);
-	
+
 	/**
 	 * 获取用户的缺省信息
+	 * 
 	 * @param userName
 	 * @return
 	 */
 	public User findShieldUuserInfo(String userName);
-	
+
 	/**
 	 * 发送忘记密码激活邮件
+	 * 
 	 * @param type
 	 */
 	public void sendForgetEmai(Long userUU, String type, HttpServletRequest request);
-	
+
 	/**
 	 * 验证找回密码的验证码
+	 * 
 	 * @param userUU
 	 * @param checkcode
 	 * @return
@@ -163,84 +179,96 @@ public interface UserService {
 
 	/**
 	 * 忘记密码，根据邮箱验证码重设密码
+	 * 
 	 * @param type
 	 */
 	public void resetPwdByCheckcode(Long userUU, String newPwd, String checkcode);
-	
+
 	/**
 	 * 根据UU号、手机号或者邮箱查找用户
+	 * 
 	 * @param keyWord
 	 * @return
 	 */
 	public UserInfo findUserByKeyWord(String keyWord);
-	
+
 	/**
 	 * 管理员绑定用户到当前登录企业
+	 * 
 	 * @param userUU
 	 */
 	public void bindUserToMyEnterprise(Long userUU);
-	
+
 	/**
 	 * 管理员绑定用户到指定企业
+	 * 
 	 * @param userUU
 	 */
-	public void bindUserToMyEnterprise(Long userUU,Enterprise enter);
-	
+	public void bindUserToMyEnterprise(Long userUU, Enterprise enter);
+
 	/**
 	 * 为用户分配客户(查询)
+	 * 
 	 * @param userUU
 	 */
 	public List<Vendor> findVendorToUser(Long userUU);
-	
+
 	/**
 	 * 为用户分配客户(保存)
+	 * 
 	 * @param userUU
 	 * @param ids
 	 * @return
 	 */
-	public boolean addVendorToUser(Long userUU,List<Vendor> ids);
-	
+	public boolean addVendorToUser(Long userUU, List<Vendor> ids);
+
 	/**
 	 * 为用户分配客户(查询)
+	 * 
 	 * @param userUU
 	 */
 	public List<Vendor> findChooseVendor(Long userUU);
-	
+
 	/**
 	 * 为用户分配客户(删除)
+	 * 
 	 * @param userUU
 	 * @param ids
 	 * @return
 	 */
-	public boolean removeChooseVendor(Long userUU,List<Long> ids);
-	
+	public boolean removeChooseVendor(Long userUU, List<Long> ids);
+
 	/**
 	 * 查询当前客户是否有客户分配，返回分配客户的UU号
+	 * 
 	 * @return
 	 */
 	public SearchFilter distribute();
-	
+
 	/**
 	 * 查询当前用户分配的客户
+	 * 
 	 * @return
 	 */
 	public List<Vendor> findDistribute();
-	
+
 	/**
 	 * 根据客户Uu查询当前客户下的分配用户信息
+	 * 
 	 * @param enUu
 	 * @return
 	 */
 	public List<User> findUserInfoDistribute(Long enUu);
-	
+
 	/**
 	 * 为客户分配企业用户
+	 * 
 	 * @param enUu
 	 * @param users
 	 * @return
 	 */
-	public boolean addUserToVendor(Long custUU,List<User> users);
-	
+	public boolean addUserToVendor(Long custUU, List<User> users);
+
 	/**
 	 * 判断当前企业是否为saas用户
 	 */

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

@@ -37,6 +37,11 @@ import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理
+ *
+ */
+@Deprecated
 @Service
 public class ChangeAdminServiceImpl implements ChangeAdminService {
 

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

@@ -47,6 +47,12 @@ import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.encry.Md5Utils;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
+ * @see com.uas.platform.b2b.v2.service.impl.EnterpriseServiceImpl
+ *
+ */
+@Deprecated
 @Service
 public class EnterpriseServiceImpl implements EnterpriseService {
 

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

@@ -12,12 +12,17 @@ import com.uas.platform.b2b.model.RegisterRecord;
 import com.uas.platform.b2b.service.RegisterLogService;
 import com.uas.platform.core.model.Status;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理
+ *
+ */
+@Deprecated
 @Service
 public class RegisterLogServiceImpl implements RegisterLogService {
 
 	@Autowired
 	private RegisterRecordDao registerRecordDao;
-	
+
 	@Override
 	public List<RegisterRecord> getNotUpLoadRegisterLog() {
 		return registerRecordDao.findBySendStatus((short) Status.NOT_UPLOAD.value());
@@ -26,10 +31,10 @@ public class RegisterLogServiceImpl implements RegisterLogService {
 	@Override
 	public void upLoadSuccessRegister(List<Long> ids) {
 		List<RegisterRecord> registerRecords = new ArrayList<RegisterRecord>();
-		if(!CollectionUtils.isEmpty(ids)) {
-			for(Long id : ids) {
+		if (!CollectionUtils.isEmpty(ids)) {
+			for (Long id : ids) {
 				RegisterRecord registerRecord = registerRecordDao.findOne(id);
-				if(registerRecord != null) {
+				if (registerRecord != null) {
 					registerRecord.setSendStatus((short) Status.DOWNLOADED.value());
 					registerRecords.add(registerRecord);
 				}
@@ -39,11 +44,9 @@ public class RegisterLogServiceImpl implements RegisterLogService {
 	}
 
 	@Override
-	public List<RegisterRecord>  getRegisterLog(Long enUu) {
-		List<RegisterRecord> record=registerRecordDao.findByEnUu(enUu);
+	public List<RegisterRecord> getRegisterLog(Long enUu) {
+		List<RegisterRecord> record = registerRecordDao.findByEnUu(enUu);
 		return record;
 	}
 
-
-	
 }

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

@@ -45,6 +45,12 @@ import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
+/**
+ * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
+ * @see com.uas.platform.b2b.v2.service.impl.UserServiceImpl
+ *
+ */
+@Deprecated
 @Service
 public class UserServiceImpl implements UserService {
 

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

@@ -0,0 +1,5 @@
+package com.uas.platform.b2b.v2.controller;
+
+public class EnterpriseController {
+
+}

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

@@ -0,0 +1,5 @@
+package com.uas.platform.b2b.v2.controller;
+
+public class UserController {
+
+}

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

@@ -0,0 +1,5 @@
+package com.uas.platform.b2b.v2.service;
+
+public interface EnterpriseService {
+
+}

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

@@ -0,0 +1,5 @@
+package com.uas.platform.b2b.v2.service;
+
+public interface UserService {
+
+}

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

@@ -0,0 +1,7 @@
+package com.uas.platform.b2b.v2.service.impl;
+
+import com.uas.platform.b2b.v2.service.EnterpriseService;
+
+public class EnterpriseServiceImpl implements EnterpriseService {
+
+}

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

@@ -0,0 +1,7 @@
+package com.uas.platform.b2b.v2.service.impl;
+
+import com.uas.platform.b2b.v2.service.UserService;
+
+public class UserServiceImpl implements UserService {
+
+}

src/main/resources/test/account.properties

@@ -1,17 +1,17 @@
 ### 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.us.save.url=http://127.0.0.1/api/userspace
+account.user.save.url=http://127.0.0.1/api/user
 
 ### sso config
 sso.app=mall
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
-sso.login.url=http://113.105.74.135:8001/sso/login
+sso.login.url=http://127.0.0.1/sso/login
 
 #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://127.0.0.1/sso/login/ask
+sso.askout.url=http://127.0.0.1/sso/logout/ask
 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=