[improvement][project] supersonic 0.7.0 version backend update (#24)

* [improvement][project] supersonic 0.7.0 version backend update

* [improvement][project] supersonic 0.7.0 version backend update

* [improvement][project] supersonic 0.7.0 version readme update

---------

Co-authored-by: jolunoluo <jolunoluo@tencent.com>

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java

@@ -1,35 +1,30 @@
-package com.tencent.supersonic.auth.authentication.application;
+package com.tencent.supersonic.auth.authentication.adaptor;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor;
+import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
-import com.tencent.supersonic.auth.api.authentication.service.UserService;
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO;
-import com.tencent.supersonic.auth.authentication.domain.repository.UserRepository;
-import com.tencent.supersonic.auth.authentication.domain.utils.UserTokenUtils;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
+import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
+import com.tencent.supersonic.common.util.ContextUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserServiceImpl implements UserService {
-
-    private UserRepository userRepository;
-
-    private UserTokenUtils userTokenUtils;
-
-    public UserServiceImpl(UserRepository userRepository, UserTokenUtils userTokenUtils) {
-        this.userRepository = userRepository;
-        this.userTokenUtils = userTokenUtils;
-    }
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+public class DefaultUserAdaptor implements UserAdaptor {
 
     private List<UserDO> getUserDOList() {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
         return userRepository.getUserList();
     }
 
     private UserDO getUser(String name) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
         return userRepository.getUser(name);
     }
 
@@ -38,22 +33,26 @@ public class UserServiceImpl implements UserService {
         return getUserDOList().stream().map(UserDO::getName).collect(Collectors.toList());
     }
 
-
     @Override
     public List<User> getUserList() {
         List<UserDO> userDOS = getUserDOList();
         return userDOS.stream().map(this::convert).collect(Collectors.toList());
     }
 
+    @Override
+    public List<Organization> getOrganizationTree() {
+        return Lists.newArrayList();
+    }
+
     private User convert(UserDO userDO) {
         User user = new User();
         BeanUtils.copyProperties(userDO, user);
         return user;
     }
 
-
     @Override
     public void register(UserReq userReq) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
         List<String> userDOS = getUserNames();
         if (userDOS.contains(userReq.getName())) {
             throw new RuntimeException(String.format("user %s exist", userReq.getName()));
@@ -65,6 +64,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public String login(UserReq userReq) {
+        UserTokenUtils userTokenUtils = ContextUtils.getBean(UserTokenUtils.class);
         UserDO userDO = getUser(userReq.getName());
         if (userDO == null) {
             throw new RuntimeException("user not exist,please register");
@@ -77,5 +77,14 @@ public class UserServiceImpl implements UserService {
         throw new RuntimeException("password not correct, please try again");
     }
 
+    @Override
+    public List<User> getUserByOrg(String key) {
+        return Lists.newArrayList();
+    }
 
-}
+    @Override
+    public Set<String> getUserAllOrgId(String userName) {
+        return Sets.newHashSet();
+    }
+
+}

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationIgnore.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.interceptor;
+package com.tencent.supersonic.auth.authentication.interceptor;
 
 
 import java.lang.annotation.ElementType;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.auth.authentication.domain.interceptor;
+package com.tencent.supersonic.auth.authentication.interceptor;
 
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.constant.UserConstants;
-import com.tencent.supersonic.auth.authentication.application.UserServiceImpl;
-import com.tencent.supersonic.auth.authentication.domain.utils.UserTokenUtils;
+import com.tencent.supersonic.auth.authentication.service.UserServiceImpl;
+import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 import com.tencent.supersonic.common.util.S2ThreadContext;
 import java.lang.reflect.Field;
 import java.util.Arrays;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.auth.authentication.domain.interceptor;
+package com.tencent.supersonic.auth.authentication.interceptor;
 
 
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
-import com.tencent.supersonic.auth.authentication.application.UserServiceImpl;
-import com.tencent.supersonic.auth.authentication.domain.utils.UserTokenUtils;
+import com.tencent.supersonic.auth.authentication.service.UserServiceImpl;
+import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 import com.tencent.supersonic.common.pojo.exception.AccessException;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.S2ThreadContext;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/InterceptorFactory.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.interceptor;
+package com.tencent.supersonic.auth.authentication.interceptor;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.SpringFactoriesLoader;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDO.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.dataobject;
+package com.tencent.supersonic.auth.authentication.persistence.dataobject;
 
 public class UserDO {
 

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDOExample.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.dataobject;
+package com.tencent.supersonic.auth.authentication.persistence.dataobject;
 
 import java.util.ArrayList;
 import java.util.List;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/mapper/UserDOMapper.java

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.auth.authentication.infrastructure.mapper;
+package com.tencent.supersonic.auth.authentication.persistence.mapper;
 
 
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO;
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDOExample;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.auth.authentication.infrastructure.repository;
+package com.tencent.supersonic.auth.authentication.persistence.repository.Impl;
 
 
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO;
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDOExample;
-import com.tencent.supersonic.auth.authentication.domain.repository.UserRepository;
-import com.tencent.supersonic.auth.authentication.infrastructure.mapper.UserDOMapper;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample;
+import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
+import com.tencent.supersonic.auth.authentication.persistence.mapper.UserDOMapper;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.stereotype.Component;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.auth.authentication.domain.repository;
+package com.tencent.supersonic.auth.authentication.persistence.repository;
 
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
 import java.util.List;
 
 public interface UserRepository {

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java

@@ -1,19 +1,17 @@
 package com.tencent.supersonic.auth.authentication.rest;
 
 
+import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import java.util.List;
+import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/auth/user")
@@ -32,7 +30,6 @@ public class UserController {
         return UserHolder.findUser(httpServletRequest, httpServletResponse);
     }
 
-
     @GetMapping("/getUserNames")
     public List<String> getUserNames() {
         return userService.getUserNames();
@@ -43,6 +40,21 @@ public class UserController {
         return userService.getUserList();
     }
 
+    @GetMapping("/getOrganizationTree")
+    public List<Organization> getOrganizationTree() {
+        return userService.getOrganizationTree();
+    }
+
+    @GetMapping("/getUserAllOrgId/{userName}")
+    public Set<String> getUserAllOrgId(@PathVariable("userName") String userName) {
+        return userService.getUserAllOrgId(userName);
+    }
+
+    @GetMapping("/getUserByOrg/{org}")
+    public List<User> getUserByOrg(@PathVariable("org") String org) {
+        return userService.getUserByOrg(org);
+    }
+
     @PostMapping("/register")
     public void register(@RequestBody UserReq userCmd) {
         userService.register(userCmd);

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java

@@ -0,0 +1,52 @@
+package com.tencent.supersonic.auth.authentication.service;
+
+import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
+import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.auth.api.authentication.request.UserReq;
+import com.tencent.supersonic.auth.api.authentication.service.UserService;
+import com.tencent.supersonic.auth.authentication.utils.ComponentFactory;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserServiceImpl implements UserService {
+
+
+    @Override
+    public List<String> getUserNames() {
+         return ComponentFactory.getUserAdaptor().getUserNames();
+    }
+
+    @Override
+    public List<User> getUserList() {
+        return ComponentFactory.getUserAdaptor().getUserList();
+    }
+
+    @Override
+    public Set<String> getUserAllOrgId(String userName) {
+        return ComponentFactory.getUserAdaptor().getUserAllOrgId(userName);
+    }
+
+    @Override
+    public List<User> getUserByOrg(String key) {
+        return ComponentFactory.getUserAdaptor().getUserByOrg(key);
+    }
+
+    @Override
+    public List<Organization> getOrganizationTree() {
+        return ComponentFactory.getUserAdaptor().getOrganizationTree();
+    }
+
+    @Override
+    public void register(UserReq userReq) {
+        ComponentFactory.getUserAdaptor().register(userReq);
+    }
+
+    @Override
+    public String login(UserReq userReq) {
+        return ComponentFactory.getUserAdaptor().login(userReq);
+    }
+
+}

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.strategy;
+package com.tencent.supersonic.auth.authentication.strategy;
 
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.auth.authentication.domain.strategy;
+package com.tencent.supersonic.auth.authentication.strategy;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
-import com.tencent.supersonic.auth.authentication.domain.utils.UserTokenUtils;
+import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/UserStrategyFactory.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.strategy;
+package com.tencent.supersonic.auth.authentication.strategy;
 
 
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/ComponentFactory.java

@@ -0,0 +1,23 @@
+package com.tencent.supersonic.auth.authentication.utils;
+
+import com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor;
+import org.springframework.core.io.support.SpringFactoriesLoader;
+import java.util.Objects;
+
+public class ComponentFactory {
+
+    private static UserAdaptor userAdaptor;
+
+    public static UserAdaptor getUserAdaptor() {
+        if (Objects.isNull(userAdaptor)) {
+            userAdaptor = init(UserAdaptor.class);
+        }
+        return userAdaptor;
+    }
+
+    private static <T> T init(Class<T> factoryType) {
+        return SpringFactoriesLoader.loadFactories(factoryType,
+                Thread.currentThread().getContextClassLoader()).get(0);
+    }
+
+}

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.utils;
+package com.tencent.supersonic.auth.authentication.utils;
 
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_ALGORITHM;
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_CREATE_TIME;

auth/authentication/src/main/resources/mapper/UserDOMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tencent.supersonic.auth.authentication.infrastructure.mapper.UserDOMapper">
-  <resultMap id="BaseResultMap" type="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
+<mapper namespace="com.tencent.supersonic.auth.authentication.persistence.mapper.UserDOMapper">
+  <resultMap id="BaseResultMap" type="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="password" jdbcType="VARCHAR" property="password" />
@@ -40,7 +40,7 @@
   <sql id="Base_Column_List">
     id, name, password, display_name, email
   </sql>
-  <select id="selectByExample" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDOExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -67,13 +67,13 @@
     delete from s2_user
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
+  <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     insert into s2_user (id, name, password, 
       display_name, email)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{displayName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
+  <insert id="insertSelective" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     insert into s2_user
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -110,13 +110,13 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDOExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultType="java.lang.Long">
     select count(*) from s2_user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     update s2_user
     <set>
       <if test="name != null">
@@ -134,7 +134,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
+  <update id="updateByPrimaryKey" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     update s2_user
     set name = #{name,jdbcType=VARCHAR},
       password = #{password,jdbcType=VARCHAR},