Merge pull request #1214 from xiaohuangdou666/develop

fix: delete user and update authorization url

Author: scottsut

config/profiles/application-config.yml

@@ -73,7 +73,7 @@ datart:
   server:
     address: ${datart.address:http://127.0.0.1:8080}
 
-  # 租户管理模式：plateform-平台(默认)，team-团队
+  # 租户管理模式：platform-平台(默认)，team-团队
   tenant-management-mode: platform
   # 团队管理员用户名/密码: 仅team模式且两者都不为空时重置
   admin:

core/src/main/java/datart/core/mappers/ext/UserSettingsMapperExt.java

@@ -17,7 +17,7 @@ public interface UserSettingsMapperExt extends UserSettingsMapper {
     List<UserSettings> selectByUser(String userId);
 
     @Delete({
-            "DELETE FROM user_settings t WHERE t.user_id = #{userId}"
+            "DELETE FROM user_settings WHERE user_id = #{userId}"
     })
     int deleteByUser(String userId);
 

server/src/main/java/datart/server/config/ExternalRegisterRedirectStrategy.java

@@ -31,10 +31,10 @@
 @Component
 public class ExternalRegisterRedirectStrategy {
 
-    private static final String redirectUrl = "/auth";
+    private static final String redirectUrl = "/authorization";
 
     public void redirect(HttpServletRequest request, HttpServletResponse response, String token) throws Exception {
-        String target = redirectUrl + "?token=" + URLEncoder.encode(token, StandardCharsets.UTF_8.name());
+        String target = redirectUrl + "/" + URLEncoder.encode(token, StandardCharsets.UTF_8.name());
         response.setHeader(Const.TOKEN, token);
         response.sendRedirect(target);
     }

server/src/main/java/datart/server/service/impl/UserServiceImpl.java

@@ -138,6 +138,7 @@ public boolean register(UserRegisterParam userRegisterParam) throws MessagingExc
     }
 
     @Override
+    @Transactional
     public boolean register(UserRegisterParam userRegisterParam, boolean sendMail) throws MessagingException, UnsupportedEncodingException {
         if (!checkUserName(userRegisterParam.getUsername())) {
             log.error("The username({}) has been registered", userRegisterParam.getUsername());