分支合并后bug调整

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

@@ -13,6 +13,7 @@ import com.uas.sso.AuthToken;
 import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

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

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

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

@@ -98,7 +98,7 @@ public interface BaseInfoService {
 	 * @return
 	 * @throws Exception
 	 */
-	SPage<UserSpaceDetail> getUserSpaceDetails(com.uas.search.b2b.model.PageParams params, String keyword) throws Exception;
+	SPage<UserSpaceDetail> getUserSpaceDetails(com.uas.search.b2b.model.PageParams  params, String keyword) throws Exception;
 
 	/**
 	 * 通过id获取附件信息

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

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.account.entity.RequsetStatus;
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.RequestStatus;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.DateUtils;
 import com.uas.platform.b2b.core.util.StringUtil;
 import com.uas.platform.b2b.core.util.ThreadTask;
@@ -523,17 +523,11 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	}
 
 	@Override
-	public SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword) throws Exception {
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-		pageParams.getFilters().put("searchstatus", Constant.YES);
-		// 排序条件
-		List<Sort> sortList = new ArrayList<>();
-		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);
+	public SPage<UserSpaceDetail> getUserSpaceDetails(com.uas.search.b2b.model.PageParams  params, String keyword) throws Exception {
+
 //		SPage<UserSpaceView> details = searchService.searchUserSpaceDetailCheckIds(keyword,
 //				pageParams);
-		Page<UserSpaceView> details = AccountUtils.getUserSpacesByKeyword(keyword, params.getPage(), params.getCount());
+		Page<UserSpaceView> details = AccountUtils.getUserSpacesByKeyword(keyword, params.getPage(), params.getSize());
 				SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
 		List<UserSpaceDetail> spaceDetails = new ArrayList<UserSpaceDetail>();
 
@@ -548,7 +542,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					}
 				}
 				BeanUtils.copyProperties(detail, spacetDetail);
-				RequsetStatus request = AccountUtils.getStatusByCustUidAndVendUid(spacetDetail.getBusinessCode(),
+				RequestStatus request = AccountUtils.getStatusByCustUidAndVendUid(spacetDetail.getBusinessCode(),
 						SystemSession.getUser().getEnterprise().getEnBussinessCode());
 				if (request != null) {
 					spacetDetail.setRequestStatus(request.getStatusCode());

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

@@ -2,17 +2,20 @@ package com.uas.platform.b2b.service.impl;
 
 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.account.util.AccountUtils;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.entity.UserSpaceDetail;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.EnterpriseNameAndUU;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.CommBufferedLogger;
+import com.uas.platform.b2b.support.SendMailService;
+import com.uas.platform.b2b.support.SysConf;
+import com.uas.platform.b2b.support.TokenService;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.exception.SystemException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
@@ -23,6 +26,7 @@ import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.encry.Md5Utils;
+import com.uas.sso.entity.UserSpaceView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;

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

@@ -368,7 +368,7 @@ public class VendorsServiceImpl implements VendorService {
 		Integer total = commonDao.queryForObject(totalSql.toString(), Integer.class);
 		List<VendorRecommend> vendorRecommends = commonDao.query(vendorRecommendUusSql.toString(), VendorRecommend.class);
 		System.out.println("查找完企业UU" + (System.currentTimeMillis() - start));
-		return new com.uas.account.support.Page<VendorRecommend>(page, size, vendorRecommends, total);
+		return new com.uas.sso.support.Page<VendorRecommend>(page, size, vendorRecommends, total);
 	}
 
 

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

@@ -10,6 +10,7 @@ import com.uas.platform.b2b.support.CommBufferedLogger;
 import com.uas.platform.b2b.v2.service.EnterpriseService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
+import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -71,6 +72,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
 		// 把管理员添加进企业
 		User user = userDao.findOne(enterprise.getEnAdminuu());
+		if (user == null) {
+			user = new User(detail.getAdmin());
+		}
 		user.addEnterprise(enterprise);
 		userDao.save(user);
 

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

@@ -2,8 +2,8 @@ package com.uas.platform.b2b.v2.service.impl;
 
 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.entity.PartnershipRecordView;
+import com.uas.sso.util.AccountUtils;
 import com.uas.message.mail.service.MailService;
 import com.uas.message.sms.service.SmsService;
 import com.uas.platform.b2b.core.util.ThreadUtils;
@@ -29,6 +29,8 @@ import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
+import com.uas.sso.entity.PartnershipRecordView;
+import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
@@ -193,7 +195,7 @@ public class InviteRecordServiceImpl implements InviteRecordService {
     @Override
     public ModelMap addPartner(Long userUU, Long enUU, Long inviteEnUU, String inviteUserName, String inviteUserTel, String app) throws Exception {
         ModelMap map = new ModelMap();
-        PartnershipRecord record = new PartnershipRecord();
+        PartnershipRecordView record = new PartnershipRecordView();
         Enterprise c = enterpriseService.findByEnUU(inviteEnUU);
         if (null == c) {
             throw new IllegalOperatorException("添加合作伙伴的企业未注册");
@@ -205,7 +207,7 @@ public class InviteRecordServiceImpl implements InviteRecordService {
         if (null != c.getEnAdminuu()) {
             user = userService.findUserByUserUU(c.getEnAdminuu());
             if (null != user) {
-                record.setCustUserCode(String.valueOf(user.getUserUU()));
+                record.setCustUserCode(user.getUserUU());
                 record.setCustUserEmail(user.getUserEmail());
                 record.setCustUserName(user.getUserName());
                 record.setCustUserTel(user.getUserTel());
@@ -219,7 +221,7 @@ public class InviteRecordServiceImpl implements InviteRecordService {
         record.setVendName(v.getEnName());
         record.setVendUID(v.getEnBussinessCode());
         record.setAppId(app);
-        record.setVendUserCode(String.valueOf(userUU));
+        record.setVendUserCode(userUU);
         User vu = userService.findUserByUserUU(userUU);
         if (null != vu) {
             record.setVendUserEmail(vu.getUserEmail());
@@ -233,7 +235,7 @@ public class InviteRecordServiceImpl implements InviteRecordService {
             if (!CollectionUtils.isEmpty(users)) {
                 cu = users.get(0);
                 String userName = StringUtils.isEmpty(inviteUserName) ? cu.getUserName() : inviteUserName;
-                record.setCustUserCode(String.valueOf(cu.getUserUU()));
+                record.setCustUserCode(cu.getUserUU());
                 record.setCustUserEmail(cu.getUserEmail());
                 record.setCustUserName(userName);
                 record.setCustUserTel(cu.getUserTel());

src/main/resources/prod/account.properties

@@ -1,7 +1,7 @@
 ### account center config, 
-account.us.save.url=http://10.10.100.133:8080/api/userspace
-account.user.save.url=http://10.10.100.133:8080/api/user
-account.user.getPartners.url = http://10.10.100.133:8080/api/partners
+account.us.save.url=https://sso.ubtob.com/api/userspace
+account.user.save.url=https://sso.ubtob.com/api/user
+account.user.getPartners.url = https://sso.ubtob.comapi/partners
 account.user.getContactPage.url=https://sso.ubtob.com/business/groups
 
 ### sso config
@@ -15,6 +15,8 @@ sso.login.url=https://sso.ubtob.com
 #cross domain
 sso.ask.url=https://sso.ubtob.com/sso/login/ask
 sso.askout.url=https://sso.ubtob.com/sso/logout/ask
+sso.updatePassword.url=https://sso.ubtob.com/reset/changePasswordChooseStyle
+sso.cloudcenter.url=https://sso.ubtob.com/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=