企业添加注册来源

sso-common/src/main/java/com/uas/sso/util/AccountUtils.java

@@ -973,6 +973,7 @@ public class AccountUtils {
             userSpaceView.setAdmin(null);
             JSONObject data = JSON.parseObject(JSON.toJSONString(userSpaceView));
             data.putAll(JSON.parseObject(JSON.toJSONString(admin)));
+            data.put("appId", SSOHelper.getSSOService().getConfig().getAppName());
             HttpUtil.ResponseWrap res = HttpUtil.doPost(url, data);
 			if (!res.isSuccess()) {
                 throw new Exception(res.getContent());

sso-server/src/main/java/com/uas/sso/controller/UserspaceManagerController.java

@@ -9,10 +9,6 @@ import com.uas.account.entity.MasterInfo;
 import com.uas.account.entity.UserSpace;
 import com.uas.account.entity.UserSpaceDetail;
 import com.uas.account.support.Page;
-import com.uas.account.util.AccountUtils;
-import com.uas.sso.AuthToken;
-import com.uas.sso.SSOConfig;
-import com.uas.sso.SSOHelper;
 import com.uas.sso.common.util.HttpUtil;
 import com.uas.sso.core.Const;
 import com.uas.sso.core.Status;
@@ -28,15 +24,11 @@ import com.uas.sso.util.FileUrl;
 import com.uas.sso.util.HttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.CookiePolicy;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -316,7 +308,7 @@ public class UserspaceManagerController extends BaseController {
         Userspace userspace = parseObject(detail, Userspace.class);
 
         // 企业注册
-        userspace = userspaceService.register(userspace);
+        userspace = userspaceService.register(userspace, "uas");
 
         // 将用户绑定绑定到注册企业
         userspaceService.addUser(userspace, users);
@@ -577,12 +569,12 @@ public class UserspaceManagerController extends BaseController {
      * @param userspace 企业信息
      */
     @RequestMapping(value = "/register/other", method = RequestMethod.POST)
-    public ModelMap registerFromOther(Userspace userspace, User admin) {
+    public ModelMap registerFromOther(Userspace userspace, User admin, String appId) {
         if (userspace == null || admin == null) {
             return error("参数错误");
         }
         userspace.setAdmin(admin);
-        return success(userspaceService.register(userspace));
+        return success(userspaceService.register(userspace, appId));
     }
 
     /**

sso-server/src/main/java/com/uas/sso/controller/UserspaceRegisterController.java

@@ -141,7 +141,7 @@ public class UserspaceRegisterController extends BaseController {
 
         // 企业注册
         userspace.setAdmin(admin);
-        userspace = userspaceService.register(userspace);
+        userspace = userspaceService.register(userspace, appId);
 
         // 添加日志
         registerLogger.info(Type.REGISTER_USERSPACE.getValue(), Step.SECOND.getValue(), "企业注册", userspace, appId);

sso-server/src/main/java/com/uas/sso/entity/Userspace.java

@@ -49,6 +49,12 @@ public class Userspace implements Serializable {
     @Column(name = "space_register_date")
     private Timestamp registerDate;
 
+    /**
+     * 注册来源
+     */
+    @Column(name = "from_app")
+    private String fromApp;
+
     /**
      * 管理员uu号
      */
@@ -289,6 +295,14 @@ public class Userspace implements Serializable {
         this.registerDate = registerDate;
     }
 
+    public String getFromApp() {
+        return fromApp;
+    }
+
+    public void setFromApp(String fromApp) {
+        this.fromApp = fromApp;
+    }
+
     public Long getAdminUU() {
         return adminUU;
     }

sso-server/src/main/java/com/uas/sso/service/UserspaceService.java

@@ -1,14 +1,10 @@
 package com.uas.sso.service;
 
 import com.uas.sso.entity.User;
-import com.uas.sso.entity.UserSpaceDetailInfo;
-import com.uas.sso.entity.UserSpaceView;
 import com.uas.sso.entity.Userspace;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 企业service
@@ -21,9 +17,10 @@ public interface UserspaceService {
     /**
      * 企业注册，并开通默认应用
      * @param userspace 企业信息
+     * @param appId 应用id，记录注册来源
      * @return 注册后的企业信息
      */
-    Userspace register(Userspace userspace);
+    Userspace register(Userspace userspace, String appId);
 
     /**
      * 校验企业名称

sso-server/src/main/java/com/uas/sso/service/impl/UserspaceServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
-import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -58,7 +57,7 @@ public class UserspaceServiceImpl implements UserspaceService {
     public static final Long SPACE_INIT_UU = 10000000L;
 
     @Override
-    public Userspace register(Userspace userspace) {
+    public Userspace register(Userspace userspace, String appId) {
         User admin = userspace.getAdmin();
         if (admin == null) {
             throw new VisibleError("管理员不能为空");
@@ -99,6 +98,7 @@ public class UserspaceServiceImpl implements UserspaceService {
         userspace.setUsers(users);
         userspace.setValidCode((short) Status.TO_BE_CERTIFIED.getCode());
         userspace.setRegisterDate(new Timestamp(System.currentTimeMillis()));
+        userspace.setFromApp(appId);
 
         // 注册企业
         userspace.setApps(appService.findDefaultUseApp());