fix:通过管理员注册企业返回值修改

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

@@ -226,24 +226,45 @@ public class UserspaceRegisterController extends BaseController {
      * @throws UnsupportedEncodingException
      */
     @PostMapping("/admin")
-    public ModelMap registerLogin(AdminUserspaceRegister register) throws UnsupportedEncodingException {
+    public ModelMap registerLogin(AdminUserspaceRegister register) {
         // 1、拼装数据
+        String appId, spaceName, businessCode;
+        if (StringUtils.isEmpty(spaceName = register.getSpaceName())) {
+            return error("请填写正确的企业名称");
+        }
+        if (StringUtils.isEmpty(businessCode = register.getBusinessCode())) {
+            return error("请填写正确的企业营业执照号");
+        }
         Userspace userspace = new Userspace();
-        userspace.setSpaceName(register.getSpaceName());
-        userspace.setBusinessCode(register.getBusinessCode());
+        userspace.setSpaceName(spaceName);
+        userspace.setBusinessCode(businessCode);
         // 查询用户信息
-        User user = Optional.ofNullable(register.getUserUU())
+        User admin = Optional.ofNullable(register.getUserUU())
                 .map(userUU -> userService.findOne(userUU))
                 .orElse(null);
-        if (user == null) {
+        if (admin == null) {
             LOGGER.warn("通过登录管理员注册企业警告，用户uu号未注册，参数：{}", JSON.toJSONString(register));
             return error("用户uu号未注册");
         }
 
         ///2、注册
-        request.getSession().setAttribute("mobile", user.getMobile());
-        ModelMap data = this.register(userspace, user, register.getAppId(), register.getBaseUrl(), register.getT(), register.getReturnUrl(), true);
-        return data;
+        userspace.setAdmin(admin);
+        userspace = userspaceService.register(userspace, (appId = register.getAppId()) == null ? "sp" : appId);
+
+        // 发送邮件和短信
+        ModelMap info = new ModelMap();
+        info.addAttribute("enname", userspace.getSpaceName());
+        info.addAttribute("enuu", userspace.getSpaceUU());
+        sendEmail("templateForSendMailAfterRegister", admin.getEmail(), info);
+        sendSms("templateForSendSmsAfterRegister", admin.getMobile(), userspace.getSpaceName(), userspace.getSpaceUU());
+
+        // 添加日志
+        registerLogger.info(Type.REGISTER_USERSPACE.getValue(), Step.SECOND.getValue(), "通过管理员企业注册", userspace, appId);
+
+        ModelMap data = new ModelMap();
+        data.put("spaceUU", userspace.getSpaceUU());
+        data.put("accessSecret", userspace.getAccessSecret());
+        return success(data);
     }
 
     /**

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

@@ -112,6 +112,7 @@ public class UserspaceServiceImpl implements UserspaceService {
         userspace.setValidCode((short) Status.NOT_APPLYING.getCode());
         userspace.setRegisterDate(new Timestamp(System.currentTimeMillis()));
         userspace.setFromApp(appId);
+        userspace.setAccessSecret(UUID.randomUUID().toString().replaceAll("\\-", ""));
 
         // 注册企业
         App app = appService.findOne(appId);