账户中心ip企业申请bu修复2

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

@@ -10,6 +10,7 @@ import com.uas.platform.b2c.common.base.service.AccessTokenService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.core.exception.SystemError;
 import com.uas.platform.core.util.AgentUtils;
+import com.uas.sso.SSOHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -106,4 +107,9 @@ public class TokenController {
 		return map;
 	}
 
+	@RequestMapping("/test")
+	public ModelMap test(HttpServletRequest request) {
+		SSOHelper.getToken(request);
+		return new ModelMap("success", true);
+	}
 }

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

@@ -193,7 +193,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		try {
 			JSONObject data = JSON.parseObject(JSON.toJSONString(detail));
 			String userSpa = data.toJSONString();
-			AccountUtils.register(detail);
+			AccountUtils.register(detail,userView);
 		} catch (Exception e) {
 			return new ResultMap(CodeType.SYSTEM_ERROR, "账户中心异常，注册失败");
 		}

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

@@ -26,8 +26,7 @@ public class UserController {
 	@ResponseBody
 	public void save(UserView user) {
 		if (user != null) {
-			User newUser = userService.save(user);
-			SystemSession.setUser(newUser);
+			userService.save(user);
 		}
 	}
 

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

@@ -11,7 +11,7 @@ public interface UserService {
      *
      * @param user
      */
-	User save(UserView user);
+    void save(UserView user);
 
     /**
      * 删除用户

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

@@ -11,7 +11,9 @@ import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
 import com.uas.sso.entity.UserView;
+import netscape.security.UserTarget;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.expression.spel.ast.NullLiteral;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -34,12 +36,12 @@ public class UserServiceImpl implements UserService {
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
     @Override
-    public User save(UserView user) {
+    public void save(UserView user) {
         User oldUser = userDao.findOne(user.getUserUU());
         if (null == oldUser) {
             oldUser = new User();
         }
-        User newUser = oneSave(user, oldUser);
+        oneSave(user, oldUser);
        /* com.uas.platform.b2c.common.account.model.User u = null;
         if (!StringUtils.isEmpty(user.getDialectUID())) {
             u = userDao.findOne(Long.parseLong(user.getDialectUID()));
@@ -58,75 +60,59 @@ public class UserServiceImpl implements UserService {
             u = new com.uas.platform.b2c.common.account.model.User();
         }
         oneSave(user,u);*/
-       return newUser;
     }
-    private User oneSave(UserView user , com.uas.platform.b2c.common.account.model.User u) {
-        /*if (user.getPassword() != null) {
-            u.setUserPwd(user.getPassword());
-        }*/
-        if (user.getName() != null) {
-            u.setUserName(user.getName());
-        }
-        if (user.getMobile() != null) {
-            u.setUserTel(user.getMobile());
-        }
-        u.setEnable((short) 1);
-        if (user.getEmail() != null) {
-            u.setUserEmail(user.getEmail());
-        }
-        if (!StringUtils.isEmpty(user.getUserUU())) {
-            u.setUserUU(Long.valueOf(user.getUserUU()));
-        }
-        /*if (user.getPwdSecLevel() != null) {
-            u.setPwdSecLevel(user.getPwdSecLevel());
-        }
-        if (user.getLastLoginTime() != null) {
-            u.setLastLoginTime(user.getLastLoginTime());
-        }
-        Enterprise enterprise = null;
-        if (user.getSpaceDialectUID() != null){
-            enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
-        }
-        if (null != enterprise) {
-            u.setEnterprise(enterprise);
-            if (null == enterprise.getEnAdminuu()) {
-                enterprise.setEnAdminuu(u.getUserUU());
-                enterpriseDao.save(enterprise);
-                logger.log("设置管理员", enterprise.getEnName() + ":" + enterprise.getUu() + ";" + u.getUserName() + ":" + u.getUserUU());
-            }
-        }
-        boolean isMember = false;
-        //将该成员添加至企业
-        Set<Enterprise> ens = u.getEnterprises();
-        if (!CollectionUtils.isEmpty(ens)){
-            Iterator<Enterprise> it = ens.iterator();
-            while (it.hasNext()) {
-                if (it.next().getUu().equals(enterprise.getUu())) {
-                    isMember = true;
-                }
-            }
+
+    private void oneSave(UserView user, com.uas.platform.b2c.common.account.model.User u) {
+        Long userUU = user.getUserUU();
+        if (userUU != null) {
+            u.setUserUU(userUU);
+        }
+        String name = user.getName();
+        if (!StringUtils.isEmpty(name)) {
+            u.setUserName(name);
+        }
+        String sex = user.getSex();
+        if (!StringUtils.isEmpty(sex)) {
+            u.setUserSex(sex);
+        }
+        String password = user.getPassword();
+        if (!StringUtils.isEmpty(password)) {
+            u.setUserPwd(password);
+        }
+        String mobile = user.getMobile();
+        if (!StringUtils.isEmpty(mobile)) {
+            u.setUserTel(mobile);
+        }
+        String mobileArea = user.getMobileArea();
+        Short mobileValidCode = user.getMobileValidCode();
+        String email = user.getEmail();
+        if (!StringUtils.isEmpty(email)) {
+            u.setUserEmail(email);
+        }
+        Short emailValidCode = user.getEmailValidCode();
+        String realName = user.getRealName();
+        String idCard = user.getIdCard();
+        if (!StringUtils.isEmpty(idCard)) {
+            u.setUserIdcode(idCard);
+        }
+        Short identityValidCode = user.getIdentityValidCode();
+        String imId = user.getImId();
+        if (!StringUtils.isEmpty(imId)) {
+            u.setUserIMId(Long.parseLong(imId));
+        }
+        Short lock = user.getLock();
+        if (lock != null) {
+            u.setEnable(lock);
+        } else {
+            u.setEnable((short)1);
         }
-        if (!isMember) {
-            Set<Enterprise> enterprises = null;
-            if (null == u.getEnterprises()) {
-                enterprises = new HashSet<Enterprise>();
-            } else {
-                enterprises = u.getEnterprises();
-            }
-            if (null != enterprise) {
-                u.setEnterprise(enterprise);
-                enterprises.add(enterprise);
-            }
-            u.setEnterprises(enterprises);
-        }*/
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if (oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getMobile() );
+            logger.log("更新用户信息", user.getMobile());
         } else {
-            logger.log("新增用户信息", user.getMobile() );
+            logger.log("新增用户信息", user.getMobile());
         }
-        return u;
     }
 
 

src/main/webapp/resources/js/help/controllers/supplyChainCtrl.js

@@ -1,6 +1,7 @@
 define([ 'app/app' ], function(app) {
 	'use strict';	
-	app.register.controller('supplyChainCtrl', ['$scope', 'makerDemandServices', 'toaster', '$state', 'SessionService', '$upload', 'SuDemand', '$modal', '$http', '$timeout', function($scope, makerDemandServices, toaster, $state, SessionService, $upload, SuDemand, $modal, $http, $timeout) {
+	app.
+	register.controller('supplyChainCtrl', ['$scope', 'makerDemandServices', 'toaster', '$state', 'SessionService', '$upload', 'SuDemand', '$modal', '$http', '$timeout', function($scope, makerDemandServices, toaster, $state, SessionService, $upload, SuDemand, $modal, $http, $timeout) {
 		
 		if(SessionService.get('authenticated')) {
 			makerDemandServices.getBasicInfo(null, function(data) {