Merge remote-tracking branch 'origin/dev' into feature-mallRegister-wangmh

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

@@ -155,6 +155,13 @@ public class UserspaceRegisterController extends BaseController {
         userspace.setAdmin(admin);
         userspace = userspaceService.register(userspace, 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);