增加第三方接口-验证-获取用户列表

gateWay_server/src/main/java/com/bjtdba/gateWay/filter/ApiAuthFilter.java

@@ -0,0 +1,76 @@
+package com.bjtdba.gateWay.filter;
+// ApiAuthFilter.java
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+@Component
+public class ApiAuthFilter extends AbstractGatewayFilterFactory<ApiAuthFilter.Config> {
+
+    @Value("${external.api.secret}")
+    private String apiSecret;  // 从配置文件注入密钥
+
+    private static final long TIMESTAMP_THRESHOLD = 300000;  // 5分钟有效期
+
+    public ApiAuthFilter() {
+        super(Config.class);
+    }
+
+    @Override
+    public GatewayFilter apply(Config config) {
+        return (exchange, chain) -> {
+            // 仅处理/external路径的请求
+            if (!exchange.getRequest().getPath().value().startsWith("/external")) {
+                return chain.filter(exchange);
+            }
+
+            // 1. 获取认证头信息
+            String apiKey = exchange.getRequest().getHeaders().getFirst("X-API-KEY");
+            String timestamp = exchange.getRequest().getHeaders().getFirst("X-TIMESTAMP");
+            String signature = exchange.getRequest().getHeaders().getFirst("X-SIGNATURE");
+
+            // 2. 验证必要头信息存在
+            if (apiKey == null || timestamp == null || signature == null) {
+                return unauthorized(exchange, "Missing authentication headers");
+            }
+
+            // 3. 验证时间戳有效性
+            try {
+                long requestTime = Long.parseLong(timestamp);
+                long currentTime = System.currentTimeMillis();
+
+                if (Math.abs(currentTime - requestTime) > TIMESTAMP_THRESHOLD) {
+                    return unauthorized(exchange, "Timestamp expired");
+                }
+            } catch (NumberFormatException e) {
+                return unauthorized(exchange, "Invalid timestamp format");
+            }
+
+            // 4. 生成并验证签名
+//            String expectedSignature = generateSignature(apiKey, timestamp);
+//            if (!expectedSignature.equalsIgnoreCase(signature)) {
+//                return unauthorized(exchange, "Invalid signature");
+//            }
+            System.out.println("Forwarding to: " + exchange.getRequest().getURI());
+            return chain.filter(exchange);
+        };
+    }
+
+    private Mono<Void> unauthorized(ServerWebExchange exchange, String reason) {
+        exchange.getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
+        exchange.getResponse().getHeaders().add("X-Auth-Error", reason);
+        return exchange.getResponse().setComplete();
+    }
+
+    private String generateSignature(String apiKey, String timestamp) {
+        String data = apiKey + "|" + timestamp + "|" + apiSecret;
+        return DigestUtils.md5DigestAsHex(data.getBytes());
+    }
+
+    public static class Config {}
+}

gateWay_server/src/main/resources/application-dev.yml

@@ -7,6 +7,14 @@
     gateway:
       # 路由数组：指当请求满足什么样的断言时，转发到哪个服务上
       routes:
+      # 新增外部系统专用路由（放在现有路由之前）
+      - id: external-api
+        uri: lb://userCenter-service
+        predicates:
+          - Path=/external/**  # 外部系统专用路径
+        filters:
+          - ApiAuthFilter  # 应用鉴权过滤器
+          - StripPrefix=1  # 移除/external前缀
       - id: wares
         uri: lb://wares-service # 路由对应的微服务转发地址   服务名称
         predicates:
@@ -85,3 +93,8 @@ logging:
     com:
       bjtdba:
         gateWay: DEBUG
+
+external:
+  api:
+    key: "EXTERNAL_SYSTEM_B_KEY"   # 分配给外部系统B的API Key
+    secret: "STRONG_SECRET_123456"  # 高强度密钥（实际使用中应更复杂）

gateWay_server/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9000
+  port: 9002
 spring:
   application:
     name: gateWay-server

thirdPartyWares_service/src/main/resources/static/baichuan.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,userEntity-scalable=no"/>
 <title></title>
 </head>
 <body>

userCenter_service/pom.xml

@@ -98,6 +98,10 @@
             <artifactId>hutool-all</artifactId>
             <version>4.4.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

userCenter_service/src/main/java/com/bjtdba/userCenter/controller/UserController.java

@@ -5,6 +5,9 @@ import com.bjtdba.entity.order.User;
 import com.bjtdba.entity.userCenter.UserAddress;
 import com.bjtdba.entity.userCenter.UserBill;
 import com.bjtdba.entity.userCenter.UserCertification;
+import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.response.common.PageResult;
+import com.bjtdba.userCenter.dto.response.common.UserDTO;
 import com.bjtdba.userCenter.service.UserAddressService;
 import com.bjtdba.userCenter.service.UserCertificationService;
 import com.bjtdba.userCenter.service.UserService;
@@ -13,8 +16,10 @@ import com.bjtdba.userCenter.vo.UserAddressVo;
 import com.bjtdba.userCenter.vo.UserInfoVo;
 import com.bjtdba.utils.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
@@ -594,4 +599,8 @@ public class UserController {
         return ResponseUtil.ok(data);
     }
 
+    @GetMapping("/getUserList")
+    public ResponseEntity<PageResult<UserDTO>> getUserList(@Valid GetUserListRequest request) {
+        return ResponseEntity.ok(userService.getUserList(request));
+    }
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/dao/UserDao.java

@@ -1,8 +1,10 @@
 package com.bjtdba.userCenter.dao;
 
 import com.bjtdba.entity.userCenter.User;
+import com.bjtdba.userCenter.entity.UserEntity;
 import com.bjtdba.userCenter.vo.UserInviteVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
@@ -36,4 +38,20 @@ public interface UserDao {
     void updateUserMerIdByPhone(int mer_id, Integer uid);
 
     void updateSpreadCount(int uid, int spread_count);
+
+    List<UserEntity> getUserList(
+            @Param("phone") String phone,
+            @Param("nickname") String nickname,
+            @Param("uid") Long uid,
+            @Param("status") Integer status,
+            @Param("offset") int offset,
+            @Param("pageSize") int pageSize
+    );
+
+    long getUserListCount(
+            @Param("phone") String phone,
+            @Param("nickname") String nickname,
+            @Param("uid") Long uid,
+            @Param("status") Integer status
+    );
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/request/GetUserListRequest.java

@@ -0,0 +1,34 @@
+package com.bjtdba.userCenter.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Positive;
+
+@Getter
+@Setter
+public class GetUserListRequest {
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式错误")
+    private String phone;
+
+    private String nickname;
+
+    @Positive(message = "用户ID必须为正数")
+    private Long uid;
+
+    @Positive(message = "状态值必须为正数")
+    private Integer status;
+
+    @Positive(message = "页码必须为正数")
+    private Integer pageNum = 1;
+
+    @Positive(message = "每页数量必须为正数")
+    private Integer pageSize = 10;
+
+    // 分页偏移量计算
+    public int getOffset() {
+        return (pageNum - 1) * pageSize;
+    }
+
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/response/common/PageResult.java

@@ -0,0 +1,19 @@
+package com.bjtdba.userCenter.dto.response.common;
+
+import lombok.Getter;
+import java.util.List;
+
+@Getter
+public class PageResult<T> {
+    private final List<T> list;
+    private final int pageNum;
+    private final int pageSize;
+    private final long total;
+
+    public PageResult(List<T> list, int pageNum, int pageSize, long total) {
+        this.list = list;
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+        this.total = total;
+    }
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/response/common/UserDTO.java

@@ -0,0 +1,25 @@
+package com.bjtdba.userCenter.dto.response.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+@Getter
+@Setter
+public class UserDTO {
+    private Long uid;
+    private String nickname;
+    private String avatar;
+    private String phone;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Timestamp createTime;
+    private BigDecimal nowMoney;
+    private Integer status;
+    private String userType;
+    private Integer identity;
+    private BigDecimal contribute;
+    private BigDecimal jingdou;
+}
+

userCenter_service/src/main/java/com/bjtdba/userCenter/entity/UserEntity.java

@@ -0,0 +1,114 @@
+package com.bjtdba.userCenter.entity;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+
+@Getter
+@Setter
+public class UserEntity {
+    private Long uid;
+    private String wechatUserId;
+    private String aliUserId;
+    private String account;
+    private String pwd; // 敏感字段，DTO中不返回
+    private String realName;
+    private Long spreadUid;
+    private Integer sex;
+    private Date birthday;
+    private String cardId; // 敏感字段
+    private String mark;
+    private String labelId;
+    private Integer groupId;
+    private String nickname;
+    private String avatar;
+    private String phone;
+    private String addres;
+    private Timestamp createTime;
+    private Timestamp lastTime;
+    private String lastIp;
+    private BigDecimal score;
+    private BigDecimal nowMoney;
+    private BigDecimal brokeragePrice;
+    private BigDecimal repurchasePrice;
+    private BigDecimal memberBrokeragePrice;
+    private Integer status;
+    private Timestamp spreadTime;
+    private String userType;
+    private Timestamp promoterTime;
+    private BigDecimal nowScore;
+    private Integer isPromoter;
+    private Long mainUid;
+    private Integer payCount;
+    private BigDecimal payPrice;
+    private Integer spreadCount;
+    private Integer adrId;
+    private Integer identity;
+    private Integer merId;
+    private Integer merTopping;
+    private String userName;
+    private BigDecimal annuityFrozen;
+    private Integer annuityNum;
+    private BigDecimal annuity;
+    private BigDecimal agentRebate;
+    private BigDecimal merRebate;
+    private BigDecimal promoterRebate;
+    private BigDecimal crossStore;
+    private BigDecimal jurisdiction;
+    private BigDecimal otherJurisdictions;
+    private BigDecimal advFee;
+    private BigDecimal xqxiaofei;
+    private Date birthday60;
+    private String cardNumber;
+    private BigDecimal annuityYiqu;
+    private String isNew;
+    private BigDecimal adminAgentRate;
+    private String locktime;
+    private String userNumber;
+    private Integer im;
+    private String imUuid;
+    private String imUserid;
+    private String imPassword;
+    private Integer testUser;
+    private Integer isChannel;
+    private Integer annuityOnce;
+    private Integer firstSign;
+    private Integer isDel;
+    private Integer firstShopping;
+    private Integer external;
+    private Integer externalId;
+    private BigDecimal scoreBeishengtang;
+    private Integer levelId;
+    private Integer level;
+    private Integer isShow;
+    private Integer userGroup;
+    private Timestamp upVipTime;
+    private Timestamp upAgencyTime;
+    private String manageAddress;
+    private Integer isShopPartner;
+    private BigDecimal contribute;
+    private BigDecimal jingdou;
+    private BigDecimal vr;
+    private BigDecimal pv;
+    private BigDecimal hongbao;
+    private BigDecimal oldVipLimit;
+    private Integer isOld;
+    private BigDecimal fugou;
+    private Integer jbpIdOld;
+    private String unameOld;
+    private BigDecimal amountOld;
+    private Integer spreadOld;
+    private Integer inviteIdOd;
+    private String isTeamOld;
+    private Integer serverIdOld;
+    private String parentIdsOld;
+    private Integer userLevelIdOld;
+    private Integer originatorIdOld;
+    private BigDecimal totalAmountOld;
+    private BigDecimal totalWithdrawQuotaOld;
+    private BigDecimal tobeAmountOld;
+    private BigDecimal perContribute;
+    private BigDecimal withdrawQuotaOld;
+    private Timestamp identityUpTime;
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/service/UserService.java

@@ -2,6 +2,9 @@ package com.bjtdba.userCenter.service;
 
 import com.bjtdba.entity.order.User;
 import com.bjtdba.entity.userCenter.UserBill;
+import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.response.common.PageResult;
+import com.bjtdba.userCenter.dto.response.common.UserDTO;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -35,4 +38,6 @@ public interface UserService {
     public Integer getUserBillCount(UserBill userBill);
 
     public BigDecimal getUserCommission(Integer uid);
+
+    PageResult<UserDTO> getUserList(GetUserListRequest request);
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/service/impl/UserServiceImpl.java

@@ -4,13 +4,21 @@ import com.bjtdba.entity.order.User;
 import com.bjtdba.entity.userCenter.UserBill;
 import com.bjtdba.userCenter.dao.MerchantDao;
 import com.bjtdba.userCenter.dao.UserBillDao;
+import com.bjtdba.userCenter.dao.UserDao;
 import com.bjtdba.userCenter.dao.UserInfoDao;
+import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.response.common.PageResult;
+import com.bjtdba.userCenter.dto.response.common.UserDTO;
+import com.bjtdba.userCenter.entity.UserEntity;
 import com.bjtdba.userCenter.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service("userService")
 public class UserServiceImpl  implements UserService {
@@ -20,6 +28,8 @@ public class UserServiceImpl  implements UserService {
     private MerchantDao merchantDao;
     @Autowired
     private UserBillDao userBillDao;
+    @Autowired
+    private UserDao userDao;
 
 
     public User queryByid(Integer uid){
@@ -52,4 +62,60 @@ public class UserServiceImpl  implements UserService {
         return  userBillDao.getUserCommission(uid);
     }
 
+    @Override
+    public PageResult<UserDTO> getUserList(GetUserListRequest request) {
+
+        // 查询数据
+        List<UserEntity> userEntityList = userDao.getUserList(
+                request.getPhone(),
+                request.getNickname(),
+                request.getUid(),
+                request.getStatus(),
+                request.getOffset(),
+                request.getPageSize()
+        );
+
+        // 转换DTO
+        List<UserDTO> dtoList = convertToDTOList(userEntityList);
+
+        // 查询总数
+        long total = userDao.getUserListCount(
+                request.getPhone(),
+                request.getNickname(),
+                request.getUid(),
+                request.getStatus()
+        );
+
+        return new PageResult<>(
+                dtoList,
+                request.getPageNum(),
+                request.getPageSize(),
+                total
+        );
+    }
+
+    private List<UserDTO> convertToDTOList(List<UserEntity> userEntityList) {
+        if (CollectionUtils.isEmpty(userEntityList)) {
+            return Collections.emptyList();
+        }
+        return userEntityList.stream()
+                .map(this::convertToBasicDTO)
+                .collect(Collectors.toList());
+    }
+
+    private UserDTO convertToBasicDTO(UserEntity userEntity) {
+        UserDTO dto = new UserDTO();
+        dto.setUid(userEntity.getUid());
+        dto.setNickname(userEntity.getNickname());
+        dto.setAvatar(userEntity.getAvatar());
+        dto.setPhone(userEntity.getPhone());
+        dto.setCreateTime(userEntity.getCreateTime());
+        dto.setNowMoney(userEntity.getNowMoney());
+        dto.setStatus(userEntity.getStatus());
+        dto.setUserType(userEntity.getUserType());
+        dto.setIdentity(userEntity.getIdentity());
+        dto.setContribute(userEntity.getContribute());
+        dto.setJingdou(userEntity.getJingdou());
+        return dto;
+    }
 }

userCenter_service/src/main/resources/mapper/UserMapper.xml

@@ -175,4 +175,40 @@
         where uid=#{uid}
     </update>
 
+    <sql id="baseColumn">
+                uid, nickname, avatar, phone, create_time, now_money, status, user_type,
+                identity, contribute, jingdou
+    </sql>
+
+    <sql id="queryCondition">
+        <where>
+            is_del = 0
+            <if test="phone != null and phone != ''">
+                AND phone = #{phone}
+            </if>
+            <if test="nickname != null and nickname != ''">
+                AND nickname LIKE CONCAT('%', #{nickname}, '%')
+            </if>
+            <if test="uid != null">
+                AND uid = #{uid}
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+        </where>
+    </sql>
+
+    <select id="getUserList" resultType="com.bjtdba.userCenter.entity.UserEntity">
+        SELECT <include refid="baseColumn"/>
+        FROM rrx_user
+        <include refid="queryCondition"/>
+        ORDER BY create_time DESC
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+    <select id="getUserListCount" resultType="long">
+        SELECT COUNT(uid)
+        FROM rrx_user
+        <include refid="queryCondition"/>
+    </select>
 </mapper>