加AccessSignatureInterceptor

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

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

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,7 +7,6 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
@@ -39,19 +37,18 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
 @Controller
 @RequestMapping("/sale/apCheck")
 public class SaleApCheckController {
-	
+
 	@Autowired
 	private ErpProdIODetailService erpProdIODetailService;
-	
+
 	@Autowired
 	PurchaseApCheckService purchaseApCheckService;
-	
+
 	@Autowired
 	private UserService userService;
-	
-	
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-	
+
 	/**
 	 * 作废应收对账单
 	 * 
@@ -64,7 +61,7 @@ public class SaleApCheckController {
 		map.put("result", result);
 		return map;
 	}
-	
+
 	/**
 	 * 作为卖家，获取应收对账单（全部）
 	 * 
@@ -75,12 +72,12 @@ public class SaleApCheckController {
 	@ResponseBody
 	public List<ErpProdIODetail> getAllApChecks() {
 		List<Long> distributes = null;
-		//判断当前用户是否被客户分配
+		// 判断当前用户是否被客户分配
 		if (!userService.IsNotadmin()) {
 			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
 			distributes = new ArrayList<Long>();
-			if(!CollectionUtils.isEmpty(vendors)) {
-				for(Vendor v : vendors) {
+			if (!CollectionUtils.isEmpty(vendors)) {
+				for (Vendor v : vendors) {
 					distributes.add(v.getMyEnUU());
 				}
 			} else {
@@ -89,11 +86,11 @@ public class SaleApCheckController {
 		}
 		return erpProdIODetailService.findAllApChecks(distributes);
 	}
-	
+
 	/**
 	 * 保存生成的应收对账单主记录
 	 */
-	@RequestMapping(value="/save",method = RequestMethod.POST)
+	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ResponseBody
 	public ModelMap saveApCheck(@RequestBody String json) {
 		ModelMap map = new ModelMap();
@@ -107,7 +104,7 @@ public class SaleApCheckController {
 			throw new IllegalOperatorException("保存失败！");
 		}
 	}
-	
+
 	/**
 	 * 获得应收对账单，对应id
 	 * 
@@ -120,29 +117,29 @@ public class SaleApCheckController {
 		logger.log("应收对账单", "查看单个应收对账单", null, null, id);
 		return purchaseApCheckService.findById(id);
 	}
-	
+
 	/**
-	 * 生成应收对账单的同时更新明细行来源表中，物料已转数 
+	 * 生成应收对账单的同时更新明细行来源表中，物料已转数
 	 * 
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
 	@ResponseBody
-	public void updateYCheckQty(@RequestBody String json){
+	public void updateYCheckQty(@RequestBody String json) {
 		List<HashMap<String, Object>> list = FlexJsonUtils.fromJsonArray(json, HashMap.class);
 		purchaseApCheckService.updateYCheckQty(list);
 	}
-	
+
 	/**
-	 * 删除最新生成未提交的应收对账单 
+	 * 删除最新生成未提交的应收对账单
 	 */
 	@RequestMapping(value = "/deleteApCheck", method = RequestMethod.DELETE)
 	@ResponseBody
 	public void deleteApCheck(Long id) {
 		purchaseApCheckService.deleteApCheck(id);
 	}
-	
+
 	/**
-	 * 提交生成的应收对账单 
+	 * 提交生成的应收对账单
 	 */
 	@RequestMapping(value = "/updateStatus", method = RequestMethod.GET)
 	@ResponseBody
@@ -151,14 +148,14 @@ public class SaleApCheckController {
 		map.put("result", purchaseApCheckService.updateApCheckStatus(id));
 		return map;
 	}
-	
+
 	/**
 	 * 作为买家，获取应收对账单（全部）
 	 * 
 	 * @param json
 	 * @return
 	 */
-	@RequestMapping(value = "/getAllCheck",method = RequestMethod.GET)
+	@RequestMapping(value = "/getAllCheck", method = RequestMethod.GET)
 	@ResponseBody
 	public Page<PurchaseApCheck> getReceivedPurchaseApChecks(PageParams params, String keyword, String searchFilter) {
 		logger.log("应收对账单", "获取全部应收对账单");
@@ -166,13 +163,12 @@ public class SaleApCheckController {
 		// 我作为卖家，把我的企业ID作为买方ID传入
 		info.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = null;
-		if(StringUtils.hasText(searchFilter)) {
+		if (StringUtils.hasText(searchFilter)) {
 			filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		}
 		return purchaseApCheckService.findAllByPageInfo(info, keyword, filter);
 	}
-	
-	
+
 	/**
 	 * 全部导出
 	 * 
@@ -182,12 +178,12 @@ public class SaleApCheckController {
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
 	public ModelAndView export() {
 		List<Long> distributes = null;
-		//判断当前用户是否被客户分配
+		// 判断当前用户是否被客户分配
 		if (!userService.IsNotadmin()) {
 			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
 			distributes = new ArrayList<Long>();
-			if(!CollectionUtils.isEmpty(vendors)) {
-				for(Vendor v : vendors) {
+			if (!CollectionUtils.isEmpty(vendors)) {
+				for (Vendor v : vendors) {
 					distributes.add(v.getMyEnUU());
 				}
 			} else {
@@ -197,9 +193,9 @@ public class SaleApCheckController {
 		ModelAndView modelAndView = new ModelAndView();
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data",erpProdIODetailService.findAllApChecks(distributes));
+		modelAndView.addObject("data", erpProdIODetailService.findAllApChecks(distributes));
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApCheck", "客户应收对账单"));
 		logger.log("客户应收对账单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
 	}
-}	
+}

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

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.controller;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -11,7 +10,6 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,7 +26,6 @@ import com.uas.platform.b2b.model.PurchaseOrderReply;
 import com.uas.platform.b2b.model.PurchaseOrderTodo;
 import com.uas.platform.b2b.model.PurchaseOrderWaiting;
 import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -53,7 +50,7 @@ public class SaleOrderController {
 
 	@Autowired
 	private PurchaseOrderService purchaseOrderService;
-	
+
 	@Autowired
 	private UserService userService;
 
@@ -72,9 +69,9 @@ public class SaleOrderController {
 		logger.log("客户采购单", "查看收到的客户采购订单列表");
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		//判断当前用户是否被客户分配
+		// 判断当前用户是否被客户分配
 		SearchFilter filter = userService.distribute();
-		if(filter != null && filter.getDistribute() == null) {
+		if (filter != null && filter.getDistribute() == null) {
 			return null;
 		}
 		return purchaseOrderService.findAllByPageInfo(info, filter);
@@ -91,7 +88,7 @@ public class SaleOrderController {
 	public PurchaseOrderAll getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
 		return purchaseOrderService.findById(id);
 	}
-	
+
 	/**
 	 * 作为卖家，根据采购单据ID查找采购订单(含明细)
 	 * 
@@ -102,7 +99,7 @@ public class SaleOrderController {
 	@ResponseBody
 	public ResponseEntity<String> printCount(@PathVariable("id") Long id) {
 		purchaseOrderService.print(id);
-		logger.log("客户采购单", "打印客户采购订单",id.toString());
+		logger.log("客户采购单", "打印客户采购订单", id.toString());
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
@@ -120,18 +117,17 @@ public class SaleOrderController {
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
+		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
+		if (filter2 != null) {
 			if (filter2.getDistribute() == null) {
 				return null;
 			} else {
 				filter.setDistribute(filter2.getDistribute());
 			}
-		} 
+		}
 		return purchaseOrderService.findAllDetailByPageInfo(info, filter);
 	}
-	
 
 	/**
 	 * 作为卖家，收到的采购订单(含明细)(待回复)
@@ -147,15 +143,15 @@ public class SaleOrderController {
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
+		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
+		if (filter2 != null) {
 			if (filter2.getDistribute() == null) {
 				return null;
 			} else {
 				filter.setDistribute(filter2.getDistribute());
 			}
-		} 
+		}
 		return purchaseOrderService.findTodoByPageInfo(info, filter);
 	}
 
@@ -173,15 +169,15 @@ public class SaleOrderController {
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
+		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
+		if (filter2 != null) {
 			if (filter2.getDistribute() == null) {
 				return null;
 			} else {
 				filter.setDistribute(filter2.getDistribute());
 			}
-		} 
+		}
 		return purchaseOrderService.findDoneByPageInfo(info, filter);
 	}
 
@@ -199,25 +195,23 @@ public class SaleOrderController {
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
+		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
+		if (filter2 != null) {
 			if (filter2.getDistribute() == null) {
 				return null;
 			} else {
 				filter.setDistribute(filter2.getDistribute());
 			}
-		} 
+		}
 		return purchaseOrderService.findEndByPageInfo(info, filter);
 	}
-	
-	
+
 	/**
-	  * @param params
-	  * @param searchFilter
-	  * @author yujia
-	  * 获取待发货的订单
-	  */
+	 * @param params
+	 * @param searchFilter
+	 * @author yujia 获取待发货的订单
+	 */
 	@RequestMapping(value = "/items", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
 	public Page<PurchaseOrderWaiting> getWaitingPurchaseOrderItems(PageParams params, String searchFilter) {
@@ -225,18 +219,17 @@ public class SaleOrderController {
 		PageInfo info = new PageInfo(params);
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
+		// 判断当前用户是否被客户分配
 		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
+		if (filter2 != null) {
 			if (filter2.getDistribute() == null) {
 				return null;
 			} else {
 				filter.setDistribute(filter2.getDistribute());
 			}
-		} 
+		}
 		return purchaseOrderService.findWaitingByPageInfo(info, filter);
 	}
-	
 
 	/**
 	 * 作为卖家，回复收到的采购订单
@@ -252,8 +245,7 @@ public class SaleOrderController {
 		orderItem.setId(orderItemId);
 		reply.setOrderItem(orderItem);
 		reply = purchaseOrderService.reply(reply);
-		logger.log("客户采购单", "单个回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
-				orderItemId);
+		logger.log("客户采购单", "单个回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(), orderItemId);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
@@ -280,8 +272,8 @@ public class SaleOrderController {
 	public ResponseEntity<String> replyOrderItems(@RequestBody String idString) {
 		List<PurchaseOrderReply> replies = purchaseOrderService.reply(idString.split(","));
 		for (PurchaseOrderReply reply : replies)
-			logger.log("客户采购单", "批量回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
-					reply.getOrderItem().getId());
+			logger.log("客户采购单", "批量回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(), reply.getOrderItem()
+					.getId());
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
@@ -350,7 +342,7 @@ public class SaleOrderController {
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_全部"));
 		logger.log("客户采购单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
-	} 
+	}
 
 	/**
 	 * 导出 - 待回复
@@ -417,7 +409,7 @@ public class SaleOrderController {
 		logger.log("客户采购单", "导出Excel列表", "导出已结案Excel列表");
 		return modelAndView;
 	}
-	
+
 	/**
 	 * 导出 - 待交货
 	 * 

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

@@ -19,6 +19,7 @@ public interface EnterpriseDao extends JpaSpecificationExecutor<Enterprise>,JpaR
 
 	public Enterprise findEnterpriseByEnBussinessCode(String enBussinessCode);
 
+	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	public Enterprise findEnterpriseByUu(Long uu);
 
 	public Enterprise findEnterpriseByUuAndEnBussinessCode(Long uu,String enBussinessCode);

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

@@ -4,27 +4,27 @@ import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.uas.platform.b2b.model.PurchaseApCheck;
 
 @Repository
-public interface PurchaseApCheckDao extends JpaSpecificationExecutor<PurchaseApCheck>, JpaRepository<PurchaseApCheck, Long>{
-	
+public interface PurchaseApCheckDao extends JpaSpecificationExecutor<PurchaseApCheck>, JpaRepository<PurchaseApCheck, Long> {
+
 	/**
 	 * 卖家根据客户UU号和下载状态获取需要下载的应收对账单
+	 * 
 	 * @return
 	 */
-	public List<PurchaseApCheck> findByCustUuAndStatusAndCheckStatus(Long enUu, Short status,String checkStatus);
-	
+	public List<PurchaseApCheck> findByCustUuAndStatusAndCheckStatus(Long enUu, Short status, String checkStatus);
+
 	/**
 	 * 卖家根据客户UU号和下载状态获取需要下载的应收对账单
+	 * 
 	 * @return
 	 */
 	public List<PurchaseApCheck> findByCustUuAndStatus(Long custUu, Short status);
-	
+
 	/**
 	 * 按所属卖方企业及编号查找应收对账单
 	 * 
@@ -33,7 +33,7 @@ public interface PurchaseApCheckDao extends JpaSpecificationExecutor<PurchaseApC
 	 * @return
 	 */
 	public List<PurchaseApCheck> findByEnUuAndCode(Long enUu, String code);
-	
+
 	/**
 	 * 按所属卖方企业及编号查找应收对账单
 	 * 
@@ -42,5 +42,5 @@ public interface PurchaseApCheckDao extends JpaSpecificationExecutor<PurchaseApC
 	 * @return
 	 */
 	public List<PurchaseApCheck> findByCustUuAndCode(Long custUu, String code);
-	
+
 }

src/main/java/com/uas/platform/b2b/erp/model/QuotationDetail.java

@@ -10,7 +10,6 @@ import org.apache.commons.collections.CollectionUtils;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.SaleQuotationItem;
 import com.uas.platform.b2b.model.SaleQuotationPrice;
-import com.uas.platform.b2b.support.SystemSession;
 
 /**
  * 供应商主动报价明细

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

@@ -22,7 +22,6 @@ import com.uas.platform.b2b.dao.PurchaseReturnItemDao;
 import com.uas.platform.b2b.erp.model.PurchaseProdInOut;
 import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
 import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.PurchaseAccept;
 import com.uas.platform.b2b.model.PurchaseAcceptItem;
 import com.uas.platform.b2b.model.PurchaseBadIn;

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

@@ -2,11 +2,9 @@ package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -0,0 +1,58 @@
+package com.uas.platform.b2b.filter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.service.EnterpriseService;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.util.encry.HmacUtils;
+
+/**
+ * 对需要签名认证的请求进行拦截认证
+ * 
+ * @author yingp
+ *
+ */
+public class AccessSignatureInterceptor extends HandlerInterceptorAdapter {
+
+	private final static String idParam = "access_id";
+	private final static String signatureParam = "_signature";
+
+	@Autowired
+	private EnterpriseService enterpriseService;
+
+	@Autowired
+	private UserService userService;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+		String id = request.getParameter(idParam);
+		String sign = request.getParameter(signatureParam);
+		if (id != null && sign != null) {
+			Enterprise enterprise = enterpriseService.findByEnUU(Long.parseLong(id));
+			if (enterprise.getAccessSecret() != null) {
+				String urlMessage = request.getRequestURL() + "?"
+						+ request.getQueryString().substring(0, request.getQueryString().indexOf(signatureParam) - 1);
+				if (sign.equals(HmacUtils.encode(urlMessage, enterprise.getAccessSecret()))) {
+					// 将企业信息、企业管理员信息写入SystemSession
+					User user = userService.findUserByUserUU(enterprise.getEnAdminuu());
+					if (user != null) {
+						user.setEnterprise(enterprise);
+						SystemSession.setUser(user);
+						return true;
+					}
+				}
+			}
+		}
+		response.setStatus(HttpStatus.FORBIDDEN.value());
+		return false;
+	}
+
+}

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

@@ -47,7 +47,7 @@ public class Enterprise implements Serializable {
 	@SequenceGenerator(name = "enterprises_gen", sequenceName = "enterprises_seq", allocationSize = 1)
 	@Column(name = "en_uu")
 	private Long uu;
-	
+
 	/**
 	 * 公司名称
 	 */
@@ -67,7 +67,7 @@ public class Enterprise implements Serializable {
 	/**
 	 * 企业注册地区
 	 */
-	@Column(name="en_area")
+	@Column(name = "en_area")
 	private String enArea;
 	/**
 	 * 状态
@@ -146,31 +146,31 @@ public class Enterprise implements Serializable {
 	 */
 	@Column(name = "en_adminuu")
 	private Long enAdminuu;
-	
+
 	/**
 	 * 所属行业
 	 */
 	@Column(name = "en_industry")
 	private String enIndustry;
-	
+
 	/**
 	 * saas域名
 	 */
 	@Column(name = "en_saasurl")
 	private String enSaasUrl;
-	
+
 	/**
 	 * SAAS状态
 	 */
 	@Column(name = "en_saasstatus")
 	private Short enSaasStatus;
-	
+
 	/**
 	 * SAAS传输状态
 	 */
 	@Column(name = "en_saassendstatus")
 	private Short enSaasSendStatus;
-	
+
 	/**
 	 * 管理员密码
 	 */
@@ -179,10 +179,10 @@ public class Enterprise implements Serializable {
 
 	@Transient
 	private User admin;// 管理员（前台页面显示）
-	
+
 	@Transient
 	private Long enBussinesscodeImg;// 营业执照号附件id（转化传到管理平台）
-	
+
 	@Transient
 	private String enAdminName;// 管理员名字(转化传到管理平台)
 
@@ -191,10 +191,16 @@ public class Enterprise implements Serializable {
 
 	@Transient
 	private String enAdminEmail;// 管理员邮箱(转化传到管理平台)
-	
+
 	@Transient
 	private String enAuditRemark;// 审核(从管理平台传过来)
 
+	/**
+	 * 私钥
+	 */
+	@Column(name = "en_accesssecret")
+	private String accessSecret;
+
 	@JSONField(serialize = false)
 	@JsonIgnore
 	public String getEnAuditRemark() {
@@ -457,6 +463,14 @@ public class Enterprise implements Serializable {
 		this.enAdminPassword = enAdminPassword;
 	}
 
+	public String getAccessSecret() {
+		return accessSecret;
+	}
+
+	public void setAccessSecret(String accessSecret) {
+		this.accessSecret = accessSecret;
+	}
+
 	@JsonIgnore
 	@JSONField(serialize = false)
 	public boolean isEnabled() {
@@ -487,5 +501,5 @@ public class Enterprise implements Serializable {
 			return false;
 		return true;
 	}
-	
+
 }

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

@@ -17,7 +17,6 @@ import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.ForeignKey;

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.service;
 import java.util.List;
 
 import com.uas.platform.b2b.model.ErpProdIODetail;
-import com.uas.platform.b2b.model.SearchFilter;
 
 public interface ErpProdIODetailService {
 	

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

@@ -4,7 +4,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.uas.platform.b2b.model.Distribute;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.model.User;