Merge branch 'feature-migration-20230628' of...

Merge branch 'feature-migration-20230628' of git.quantgroup.cn:head_group/xyqb-user2 into feature-migration-20230628

src/main/java/cn/quantgroup/xyqb/controller/api/v2/UserApiV2Controller.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @RestController
-@RequestMapping("/api/v2/user")
+@RequestMapping("/api/v2/users")
 public class UserApiV2Controller {
 
     private final IUserRepository userRepository;

src/main/java/cn/quantgroup/xyqb/filter/InnerInterceptor.java

@@ -9,16 +9,12 @@ import cn.quantgroup.xyqb.remote.StmsRemoteService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.session.XyqbSessionContextHolder;
 import cn.quantgroup.xyqb.util.StringUtils;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
  * stms权限认证拦截器
@@ -41,19 +37,17 @@ public class InnerInterceptor implements HandlerInterceptor {
         if (StringUtils.isEmpty(tenantId)) {
             throw new BizException(BizExceptionEnum.UN_EXIT_TENANT_ID);
         }
-        if (StringUtils.isEmpty(registeredFrom)) {
-            throw new BizException(BizExceptionEnum.UN_EXIT_REGISTERED_FROM);
-        }
+
         if (StringUtils.isEmpty(stmsToken)) {
             throw new BizException(BizExceptionEnum.UN_EXIT_STMS_TOKEN);
         }
 
-        SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(stmsToken,Integer.valueOf(tenantId));
+        SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(stmsToken, Integer.valueOf(tenantId));
 
         if (sessionStruct == null) {
             OauthResult oauthResult = stmsRemoteService.checkToken(stmsToken);
             if (oauthResult != null && 2000 == oauthResult.getCode()) {
-                LinkedHashMap<String,Object> linkedHashMap = (LinkedHashMap<String, Object>) oauthResult.getData();
+                LinkedHashMap<String, Object> linkedHashMap = (LinkedHashMap<String, Object>) oauthResult.getData();
                 String userId = String.valueOf(linkedHashMap.get("id"));
                 String userName = String.valueOf(linkedHashMap.get("name"));
                 sessionStruct = XyqbSessionContextHolder.initSTMSSession(stmsToken, userId, userName);

src/main/java/cn/quantgroup/xyqb/session/XyqbSessionContextHolder.java

@@ -95,6 +95,11 @@ public class XyqbSessionContextHolder {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String tenantId = request.getHeader(Constants.X_AUTH_TENANT);
             String registered_from = request.getHeader(Constants.X_AUTH_FROM);
+
+            if (cn.quantgroup.xyqb.util.StringUtils.isEmpty(registered_from)) {
+                //TODO:唐峰，先默认给0
+                registered_from = "0";
+            }
             String ip = IpUtil.getRemoteIP(request);
             sessionStruct.setTenantId(Integer.valueOf(tenantId));
             sessionStruct.setRegisteredFrom(Long.valueOf(registered_from));