补充 pre 环境

src/main/java/com/ruoyi/RuoYiApplication.java

@@ -9,7 +9,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  *
  * @author ruoyi
  */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})   
 public class RuoYiApplication
 {
     public static void main(String[] args)

src/main/java/com/ruoyi/adsdesk/business/operation/AdsSimulateLoginBusiness.java

 package com.ruoyi.adsdesk.business.operation;
 
-import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-
 import com.ruoyi.adsdesk.param.SimulateLoginParam;
-import com.ruoyi.adsdesk.vo.AdsUserVo;
-import com.ruoyi.adsdesk.vo.ExpandFieldsVo;
-import com.ruoyi.adsdesk.vo.UserResponseDto;
 import com.ruoyi.common.constant.StrConstants;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.security.LoginUser;
 import org.apache.logging.log4j.util.Strings;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
-import javax.annotation.Resource;
+
 import java.net.URI;
-import java.util.List;
 
 /**
  * 模拟登录业务
@@ -41,14 +34,17 @@ public class AdsSimulateLoginBusiness {
         JSONObject param = new JSONObject();
         param.put("secret","20230000");
         param.put("userId",loginParam.getUserId());
-        param.put("userName",loginParam.getUserNick());
+        param.put("userName",loginParam.getUserName());
 
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
 
         HttpEntity<?> requestEntity = new HttpEntity<>(param, headers);
 
-        String url = "http://test-api2.adsdesk.cn/adsdesk/api/open_api/system/authorize";
+        String apiUrlPre = StringUtils.equals(loginParam.getOutEnv(), "test2") ? "test-api2" : "pre-api";
+        String urlPre = "http://" + apiUrlPre + loginParam.getOutApp() + "/";
+
+        String url = urlPre + "adsdesk/api/open_api/system/authorize";
         String responseStr = restTemplate.exchange(URI.create(url), HttpMethod.POST, requestEntity, String.class).getBody();
         responseStr = clearResponseStr(responseStr);
 
@@ -66,7 +62,7 @@ public class AdsSimulateLoginBusiness {
         loginJsonObject.put("user",loginUser.getUsername());
         loginJsonObject.put("uniqueCode","c_"+System.currentTimeMillis());
         loginJsonObject.put("token",token);
-        return loginJsonObject.toString();
+        return "http://" + loginParam.getOutEnv() + loginParam.getOutApp() + "?authToken=" + loginJsonObject;
     }
 
     private String clearResponseStr(String responseStr) {

src/main/java/com/ruoyi/adsdesk/business/user/AdsUserBusiness.java

 package com.ruoyi.adsdesk.business.user;
+
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.adsdesk.domain.AdsUser;
 import com.ruoyi.adsdesk.param.UserListParam;
 import com.ruoyi.adsdesk.vo.AdsUserVo;
 import com.ruoyi.adsdesk.vo.ExpandFieldsVo;
 import com.ruoyi.adsdesk.vo.UserResponseDto;
 import com.ruoyi.common.constant.StrConstants;
-import org.apache.commons.compress.utils.Lists;
+import com.ruoyi.common.utils.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -19,9 +19,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
-import javax.annotation.Resource;
+
 import java.net.URI;
 import java.util.List;
 
@@ -67,7 +65,10 @@ public class AdsUserBusiness {
 
         HttpEntity<?> requestEntity = new HttpEntity<>(param, headers);
 
-        String url = "http://test-api2.adsdesk.cn/adsdesk/api/open_api/system/user/list";
+        String apiUrlPre = StringUtils.equals(userListParam.getOutEnv(), "test2") ? "test-api2" : "pre-api";
+        String urlPre = "http://" + apiUrlPre + userListParam.getOutApp() + "/";
+
+        String url = urlPre + "adsdesk/api/open_api/system/user/list";
         String responseStr = restTemplate.exchange(URI.create(url), HttpMethod.POST, requestEntity, String.class).getBody();
         responseStr = clearResponseStr(responseStr);
 

src/main/java/com/ruoyi/adsdesk/param/SimulateLoginParam.java

@@ -10,6 +10,10 @@ import lombok.Data;
 @Data
 public class SimulateLoginParam {
 
+    private String outApp;
+
+    private String outEnv;
+
     /**
      * 用户ID
      */

src/main/java/com/ruoyi/adsdesk/param/UserListParam.java

@@ -3,8 +3,6 @@ package com.ruoyi.adsdesk.param;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
  * 用户查询param
  * @author Xingbz
@@ -14,6 +12,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class UserListParam extends AdsListBaseParam {
 
+    private String outApp;
+
+    private String outEnv;
+
     private String userId;
 
     private String userName;