feat：添加管理员使用uu号注册企业信息接口

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.uas.sso.AccountConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
-import com.uas.sso.foreign.bihe.entity.BiHeInfo;
+import com.uas.sso.entity.register.AdminUserspaceRegister;
 import com.uas.sso.core.PasswordStrength;
 import com.uas.sso.core.Status;
 import com.uas.sso.core.Step;
@@ -25,12 +25,14 @@ import com.uas.sso.util.encry.Md5Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -44,7 +46,7 @@ import java.util.Optional;
  * @date 2018/1/4
  */
 @RequestMapping("/sso/userspace/register")
-@Controller
+@RestController
 public class UserspaceRegisterController extends BaseController {
 
     @Autowired
@@ -110,8 +112,7 @@ public class UserspaceRegisterController extends BaseController {
      * @return
      */
     @RequestMapping(method = RequestMethod.POST)
-    @ResponseBody
-    public ModelMap register(Userspace userspace, User user, String appId, String baseUrl, String t, String returnUrl) throws UnsupportedEncodingException {
+    public ModelMap register(Userspace userspace, User user, String appId, String baseUrl, String t, String returnUrl, @RequestParam(defaultValue = "false") boolean isEncry) throws UnsupportedEncodingException {
         // 获取企业信息
         String spaceName = userspace.getSpaceName();
         String businessCode = userspace.getBusinessCode();
@@ -158,7 +159,7 @@ public class UserspaceRegisterController extends BaseController {
             admin.setEmail(adminEmail);
         } else {
             // 老用户校验密码
-            userService.checkPassword(admin.getUserUU(), user.getPassword(), false);
+            userService.checkPassword(admin.getUserUU(), user.getPassword(), isEncry);
 
             // 老用户邮箱不为已认证的话设置邮箱
             if (admin.getEmailValidCode() != Status.AUTHENTICATED.getCode()) {
@@ -183,7 +184,9 @@ public class UserspaceRegisterController extends BaseController {
         admin.setFromUrl(URLDecoder.decode(returnUrl, "utf-8"));
         userspace = userspaceService.register(userspace, appId);
 
-        tokenService.delete(t);
+        if (!StringUtils.isEmpty(t)) {
+            tokenService.delete(t);
+        }
 
         // 发送邮件和短信
         ModelMap info = new ModelMap();
@@ -226,10 +229,36 @@ public class UserspaceRegisterController extends BaseController {
             LOGGER.info("用户（{}）注册并登录成功，时间：{}", admin.getUserUU(), System.currentTimeMillis());
             return success(data);
         }
-        LOGGER.info("用户（{}）注册成功，时间：{}", user.getUserUU(), System.currentTimeMillis());
+        LOGGER.info("用户（{}）注册企业（{}）成功，时间：{}", user.getUserUU(), userspace.getSpaceUU(), System.currentTimeMillis());
         return success();
     }
 
+    /**
+     * 通过登录管理员注册企业
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    @PostMapping("/admin")
+    public ModelMap registerLogin(AdminUserspaceRegister register) throws UnsupportedEncodingException {
+        // 1、拼装数据
+        Userspace userspace = new Userspace();
+        userspace.setSpaceName(register.getSpaceName());
+        userspace.setBusinessCode(register.getBusinessCode());
+        // 查询用户信息
+        User user = Optional.ofNullable(register.getUserUU())
+                .map(userUU -> userService.findOne(userUU))
+                .orElseGet(null);
+        if (user == 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;
+    }
+
     /**
      * 获取验证码
      *

sso-server/src/main/java/com/uas/sso/entity/register/AdminUserspaceRegister.java

@@ -0,0 +1,49 @@
+package com.uas.sso.entity.register;
+
+/**
+ * 通过登录管理员账号注册
+ *
+ * @author wangmh
+ * @create 2018-11-13 16:36
+ **/
+public class AdminUserspaceRegister extends BaseRegister {
+
+    /**
+     * 管理员uu号
+     */
+    private Long userUU;
+
+    /**
+     * 企业名称
+     */
+    private String spaceName;
+
+    /**
+     * 企业营业执照号
+     */
+    private String businessCode;
+
+    public Long getUserUU() {
+        return userUU;
+    }
+
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
+    }
+
+    public String getSpaceName() {
+        return spaceName;
+    }
+
+    public void setSpaceName(String spaceName) {
+        this.spaceName = spaceName;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+}

sso-server/src/main/java/com/uas/sso/entity/register/BaseRegisterLogin.java → sso-server/src/main/java/com/uas/sso/entity/register/BaseRegister.java

@@ -9,7 +9,7 @@ import org.springframework.util.StringUtils;
  * @create 2018-08-09 13:47
  * @desc 注册实体基类
  **/
-public abstract class BaseRegisterLogin {
+public abstract class BaseRegister {
 
     /**
      * 应用id（默认sso）

sso-server/src/main/java/com/uas/sso/entity/register/SmsPersonalRegister.java

@@ -6,7 +6,7 @@ package com.uas.sso.entity.register;
  * @author wangmh
  * @create 2018-10-29 13:49
  **/
-public class SmsPersonalRegister extends BaseRegisterLogin {
+public class SmsPersonalRegister extends BaseRegister {
 
     /**
      * 手机号