feat: 支付功能

src/main/java/cn/com/poc/common/interceptor/AuthenticationInterceptor.java

 package cn.com.poc.common.interceptor;
 
 
-import cn.com.poc.thirdparty.resource.demand.auth.service.BizProjectService;
 import cn.com.yict.framemax.core.spring.mvc.MvcHandlerInterceptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -17,8 +15,8 @@ public class AuthenticationInterceptor implements MvcHandlerInterceptor {
 
     private final Logger logger = LoggerFactory.getLogger(AuthenticationInterceptor.class);
 
-    @Resource
-    private BizProjectService bizProjectService;
+//    @Resource
+//    private BizProjectService bizProjectService;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)

src/main/java/cn/com/poc/common/utils/GeneratingSnUtils.java

 package cn.com.poc.common.utils;
 
+import cn.com.poc.common.constant.BizSnKeyEnum;
 import cn.com.poc.common.constant.BizSnRedisKeyEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,7 +14,7 @@ public class GeneratingSnUtils {
 
     private static Logger logger = LoggerFactory.getLogger(GeneratingSnUtils.class);
 
-    public static List<String> batchGenerationSn(BizSnRedisKeyEnum bizType, Integer qty) {
+    public static List<String> batchGenerationSn(BizSnKeyEnum bizType, Integer qty) {
         Assert.notNull(bizType);
 
         qty = qty != null ? qty : 1;
@@ -30,7 +31,7 @@ public class GeneratingSnUtils {
         return sns;
     }
 
-    public static String generationSn(BizSnRedisKeyEnum bizType) {
+    public static String generationSn(BizSnKeyEnum bizType) {
         return batchGenerationSn(bizType, 1).get(0);
     }
 

src/main/java/cn/com/poc/common/utils/IPUtils.java

+package cn.com.poc.common.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+
+/**
+ * @author alex.yao
+ * @date 2023/6/15
+ **/
+public class IPUtils {
+
+    private static Logger logger = LoggerFactory.getLogger(IPUtils.class);
+
+    public static String getIP(HttpServletRequest request) {
+        // 获取请求主机IP地址,如果通过代理进来，则透过防火墙获取真实IP地址
+        String headerName = "x-forwarded-for";
+        String ip = request.getHeader(headerName);
+        if (null != ip && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) {
+            // 多次反向代理后会有多个IP值，第一个IP才是真实IP,它们按照英文逗号','分割
+            if (ip.indexOf(",") != -1) {
+                ip = ip.split(",")[0];
+            }
+        }
+        if (checkIp(ip)) {
+            headerName = "Proxy-Client-IP";
+            ip = request.getHeader(headerName);
+        }
+        if (checkIp(ip)) {
+            headerName = "WL-Proxy-Client-IP";
+            ip = request.getHeader(headerName);
+        }
+        if (checkIp(ip)) {
+            headerName = "HTTP_CLIENT_IP";
+            ip = request.getHeader(headerName);
+        }
+        if (checkIp(ip)) {
+            headerName = "HTTP_X_FORWARDED_FOR";
+            ip = request.getHeader(headerName);
+        }
+        if (checkIp(ip)) {
+            headerName = "X-Real-IP";
+            ip = request.getHeader(headerName);
+        }
+        if (checkIp(ip)) {
+            headerName = "remote addr";
+            ip = request.getRemoteAddr();
+            if ("127.0.0.1".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) {
+                //根据网卡取本机配置的IP
+                InetAddress inet = null;
+                try {
+                    inet = InetAddress.getLocalHost();
+                } catch (Exception e) {
+                    logger.error(e.getMessage());
+                    return null;
+                }
+                ip = inet.getHostAddress();
+            }
+        }
+        logger.info("getClientIp  IP is " + ip + ", headerName = " + headerName);
+        return ip;
+    }
+
+    private static boolean checkIp(String ip) {
+        if (null == ip || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            return true;
+        }
+        return false;
+    }
+
+}

src/main/java/cn/com/poc/equity/aggregate/EquityService.java

+package cn.com.poc.equity.aggregate;
+
+import cn.com.poc.equity.constants.EquityEnum;
+import cn.com.poc.equity.domain.AgentEquity;
+
+import java.util.List;
+
+public interface EquityService {
+
+    /**
+     * 获取权益包信息
+     *
+     * @param type 类型 normal-普通 professional-专业版 ， ultimate-旗舰版
+     * @return
+     */
+    List<AgentEquity> getEquityList(EquityEnum.TYPE type);
+
+    /**
+     * 获取积分包信息
+     */
+    Object getPointList();
+
+    /**
+     * 创建权益支付订单
+     *
+     * @param type         权益类型
+     * @param domain       权益域
+     * @param validityUnit 有效期单位
+     * @param memberID     会员ID
+     * @return 订单号
+     */
+    String createEquityOrder(EquityEnum.TYPE type, EquityEnum.DOMAIN domain, EquityEnum.VALIDITY_UNIT validityUnit, Long memberID) throws Exception;
+
+}

src/main/java/cn/com/poc/equity/aggregate/impl/EquityServiceImpl.java

+package cn.com.poc.equity.aggregate.impl;
+
+import cn.com.poc.common.constant.CommonConstant;
+import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.common.utils.StringUtils;
+import cn.com.poc.equity.aggregate.EquityService;
+import cn.com.poc.equity.constants.EquityEnum;
+import cn.com.poc.equity.domain.AgentEquity;
+import cn.com.poc.equity.entity.BizPaymentPackageConfigurationEntity;
+import cn.com.poc.equity.service.BizPaymentPackageConfigurationService;
+import cn.com.poc.thirdparty.resource.demand.dgTools.constants.CurrencyEnum;
+import cn.com.poc.thirdparty.resource.demand.pay.entity.DgtoolsPayOrderEntity;
+import cn.com.poc.thirdparty.resource.demand.pay.service.DgtoolsPayOrderService;
+import cn.com.yict.framemax.core.i18n.I18nMessageException;
+import org.apache.commons.collections4.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class EquityServiceImpl implements EquityService {
+
+    private final Logger logger = LoggerFactory.getLogger(EquityService.class);
+
+    @Resource
+    private BizPaymentPackageConfigurationService bizPaymentPackageConfigurationService;
+
+    @Resource
+    private DgtoolsPayOrderService dgtoolsPayOrderService;
+
+    @Override
+    public List<AgentEquity> getEquityList(EquityEnum.TYPE type) {
+        List<AgentEquity> result = new ArrayList<>();
+        BizPaymentPackageConfigurationEntity bizPaymentPackageConfigurationEntity = new BizPaymentPackageConfigurationEntity();
+        bizPaymentPackageConfigurationEntity.setType(type.name());
+        bizPaymentPackageConfigurationEntity.setDomain(EquityEnum.DOMAIN.equity.name());
+        bizPaymentPackageConfigurationEntity.setIsDeleted(CommonConstant.IsDeleted.N);
+        List<BizPaymentPackageConfigurationEntity> entities = bizPaymentPackageConfigurationService.findByExample(bizPaymentPackageConfigurationEntity, null);
+        if (CollectionUtils.isNotEmpty(entities)) {
+            for (BizPaymentPackageConfigurationEntity entity : entities) {
+                AgentEquity agentEquity = new AgentEquity();
+                String extraData = entity.getExtraData();
+                if (StringUtils.isNotBlank(extraData)) {
+                    agentEquity = JsonUtils.deSerialize(extraData, AgentEquity.class);
+                }
+                agentEquity.setAmount(entity.getAmount().longValue());
+                agentEquity.setPoints(entity.getResourceCount().longValue());
+                agentEquity.setValidityUnit(EquityEnum.VALIDITY_UNIT.valueOf(entity.getExpiredType()));
+                result.add(agentEquity);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public Object getPointList() {
+        BizPaymentPackageConfigurationEntity bizPaymentPackageConfigurationEntity = new BizPaymentPackageConfigurationEntity();
+        bizPaymentPackageConfigurationEntity.setType(EquityEnum.TYPE.normal.name());
+        bizPaymentPackageConfigurationEntity.setDomain(EquityEnum.DOMAIN.point.name());
+        bizPaymentPackageConfigurationEntity.setIsDeleted(CommonConstant.IsDeleted.N);
+        List<BizPaymentPackageConfigurationEntity> entities = bizPaymentPackageConfigurationService.findByExample(bizPaymentPackageConfigurationEntity, null);
+        return entities;
+    }
+
+    @Override
+    public String createEquityOrder(EquityEnum.TYPE type, EquityEnum.DOMAIN domain, EquityEnum.VALIDITY_UNIT validityUnit, Long memberId) throws Exception {
+        logger.info("创建权益订单,type:{},domain:{},validity_unit:{},member_id:{}", type, domain, validityUnit, memberId);
+        BizPaymentPackageConfigurationEntity bizPaymentPackageConfigurationEntity = new BizPaymentPackageConfigurationEntity();
+        bizPaymentPackageConfigurationEntity.setType(type.name());
+        bizPaymentPackageConfigurationEntity.setDomain(domain.name());
+        bizPaymentPackageConfigurationEntity.setExpiredType(validityUnit.name());
+        bizPaymentPackageConfigurationEntity.setIsDeleted(CommonConstant.IsDeleted.N);
+        List<BizPaymentPackageConfigurationEntity> paymentPackageConfigurationEntities = bizPaymentPackageConfigurationService.findByExample(bizPaymentPackageConfigurationEntity, null);
+        if (CollectionUtils.isEmpty(paymentPackageConfigurationEntities)) {
+            throw new I18nMessageException("exception/payment.package.configuration.not.exist");
+        }
+        BizPaymentPackageConfigurationEntity packageConfiguration = paymentPackageConfigurationEntities.get(0);
+        DgtoolsPayOrderEntity dgtoolsPayOrderEntity = new DgtoolsPayOrderEntity();
+        dgtoolsPayOrderEntity.setAmount(packageConfiguration.getAmount());
+        dgtoolsPayOrderEntity.setPayOrderType(type.name() + "_" + domain.name());
+        dgtoolsPayOrderEntity.setMemberId(memberId.intValue());
+        dgtoolsPayOrderEntity.setCurrency(CurrencyEnum.CHINA.getCurrencyCode());
+        dgtoolsPayOrderEntity.setDescription(packageConfiguration.getName());
+        dgtoolsPayOrderEntity.setRetainInformation(JsonUtils.serialize(packageConfiguration));
+
+        // 创建支付订单-支付中台
+        DgtoolsPayOrderEntity payOrder = dgtoolsPayOrderService.createPayOrder(dgtoolsPayOrderEntity, memberId);
+        logger.info("创建支付订单,pay_order:{}", JsonUtils.serialize(payOrder));
+        return payOrder.getPayOrderSn();
+    }
+}

src/main/java/cn/com/poc/equity/constants/EquityEnum.java

+package cn.com.poc.equity.constants;
+
+/**
+ * 会员权益枚举
+ *
+ * @author alex.yao
+ */
+public class EquityEnum {
+
+
+    /**
+     * 类型 normal-普通 professional-专业版 ， ultimate-旗舰版
+     */
+    public enum TYPE {
+        normal, professional, ultimate;
+
+        public static boolean isMatch(String type) {
+            TYPE[] values = values();
+            for (TYPE value : values) {
+                if (value.name().equals(type)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * 资源包领域 point-积分包 equity-权益包
+     */
+    public enum DOMAIN {
+        point,
+        equity;
+
+        public static boolean isMatch(String domain) {
+            DOMAIN[] values = values();
+            for (DOMAIN value : values) {
+                if (value.name().equals(domain)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * 有效期单位 month-月 year-年
+     */
+    public enum VALIDITY_UNIT {
+        month, year;
+
+        public static boolean isMatch(String validityUnit) {
+            VALIDITY_UNIT[] values = values();
+            for (VALIDITY_UNIT value : values) {
+                if (value.name().equals(validityUnit)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/convert/BizPaymentPackageConfigurationConvert.java

+package cn.com.poc.equity.convert;	
+
+import cn.com.poc.equity.model.BizPaymentPackageConfigurationModel;
+import cn.com.poc.equity.entity.BizPaymentPackageConfigurationEntity;
+import cn.com.poc.equity.dto.BizPaymentPackageConfigurationDto;
+
+
+public class BizPaymentPackageConfigurationConvert {
+
+    public static BizPaymentPackageConfigurationEntity modelToEntity(BizPaymentPackageConfigurationModel model){
+        BizPaymentPackageConfigurationEntity entity = new BizPaymentPackageConfigurationEntity();
+        entity.setId(model.getId());
+        entity.setType(model.getType());
+        entity.setDomain(model.getDomain());
+        entity.setName(model.getName());
+        entity.setExpiredNum(model.getExpiredNum());
+        entity.setExpiredType(model.getExpiredType());
+        entity.setAmount(model.getAmount());
+        entity.setResourceCount(model.getResourceCount());
+        entity.setOriginalPrice(model.getOriginalPrice());
+        entity.setIsShowOriginalPrice(model.getIsShowOriginalPrice());
+        entity.setSort(model.getSort());
+        entity.setDescription(model.getDescription());
+        entity.setExtraData(model.getExtraData());
+        entity.setIsDeleted(model.getIsDeleted());
+        entity.setCreator(model.getCreator());
+        entity.setCreatedTime(model.getCreatedTime());
+        entity.setModifier(model.getModifier());
+        entity.setModifiedTime(model.getModifiedTime());
+        entity.setSysVersion(model.getSysVersion());
+        return entity;
+    }
+
+    public static BizPaymentPackageConfigurationModel entityToModel(BizPaymentPackageConfigurationEntity entity){
+        BizPaymentPackageConfigurationModel model = new BizPaymentPackageConfigurationModel();
+        model.setId(entity.getId());
+        model.setType(entity.getType());
+        model.setDomain(entity.getDomain());
+        model.setName(entity.getName());
+        model.setExpiredNum(entity.getExpiredNum());
+        model.setExpiredType(entity.getExpiredType());
+        model.setAmount(entity.getAmount());
+        model.setResourceCount(entity.getResourceCount());
+        model.setOriginalPrice(entity.getOriginalPrice());
+        model.setIsShowOriginalPrice(entity.getIsShowOriginalPrice());
+        model.setSort(entity.getSort());
+        model.setDescription(entity.getDescription());
+        model.setExtraData(entity.getExtraData());
+        model.setIsDeleted(entity.getIsDeleted());
+        model.setCreator(entity.getCreator());
+        model.setCreatedTime(entity.getCreatedTime());
+        model.setModifier(entity.getModifier());
+        model.setModifiedTime(entity.getModifiedTime());
+        model.setSysVersion(entity.getSysVersion());
+        return model;
+    }
+    
+    public static BizPaymentPackageConfigurationDto entityToDto(BizPaymentPackageConfigurationEntity entity){
+        BizPaymentPackageConfigurationDto dto = new BizPaymentPackageConfigurationDto();
+        dto.setId(entity.getId());
+        dto.setType(entity.getType());
+        dto.setDomain(entity.getDomain());
+        dto.setName(entity.getName());
+        dto.setExpiredNum(entity.getExpiredNum());
+        dto.setExpiredType(entity.getExpiredType());
+        dto.setAmount(entity.getAmount());
+        dto.setResourceCount(entity.getResourceCount());
+        dto.setOriginalPrice(entity.getOriginalPrice());
+        dto.setIsShowOriginalPrice(entity.getIsShowOriginalPrice());
+        dto.setSort(entity.getSort());
+        dto.setDescription(entity.getDescription());
+        dto.setExtraData(entity.getExtraData());
+        dto.setIsDeleted(entity.getIsDeleted());
+        dto.setCreator(entity.getCreator());
+        dto.setCreatedTime(entity.getCreatedTime());
+        dto.setModifier(entity.getModifier());
+        dto.setModifiedTime(entity.getModifiedTime());
+        dto.setSysVersion(entity.getSysVersion());
+        return dto;
+    }
+
+    public static BizPaymentPackageConfigurationEntity dtoToEntity(BizPaymentPackageConfigurationDto dto){
+        BizPaymentPackageConfigurationEntity entity = new BizPaymentPackageConfigurationEntity();
+        entity.setId(dto.getId());
+        entity.setType(dto.getType());
+        entity.setDomain(dto.getDomain());
+        entity.setName(dto.getName());
+        entity.setExpiredNum(dto.getExpiredNum());
+        entity.setExpiredType(dto.getExpiredType());
+        entity.setAmount(dto.getAmount());
+        entity.setResourceCount(dto.getResourceCount());
+        entity.setOriginalPrice(dto.getOriginalPrice());
+        entity.setIsShowOriginalPrice(dto.getIsShowOriginalPrice());
+        entity.setSort(dto.getSort());
+        entity.setDescription(dto.getDescription());
+        entity.setExtraData(dto.getExtraData());
+        entity.setIsDeleted(dto.getIsDeleted());
+        entity.setCreator(dto.getCreator());
+        entity.setCreatedTime(dto.getCreatedTime());
+        entity.setModifier(dto.getModifier());
+        entity.setModifiedTime(dto.getModifiedTime());
+        entity.setSysVersion(dto.getSysVersion());
+        return entity;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/domain/AgentEquity.java

+package cn.com.poc.equity.domain;
+
+
+import cn.com.poc.equity.constants.EquityEnum;
+
+
+/**
+ * 应用权益
+ * 应用数上限
+ * 知识库数上限
+ *
+ * @alex.yao
+ */
+public class AgentEquity {
+    /**
+     * 金额-分
+     */
+    private Long amount;
+
+    /**
+     * 积分数
+     */
+    private Long points;
+
+    /**
+     * 应用数上限
+     */
+    private Integer agentNum;
+
+    /**
+     * 知识库上限
+     */
+    private Integer knowledgeNum;
+
+    /**
+     * 有效期单位
+     */
+    private EquityEnum.VALIDITY_UNIT validityUnit;
+
+    public Integer getAgentNum() {
+        return agentNum;
+    }
+
+    public void setAgentNum(Integer agentNum) {
+        this.agentNum = agentNum;
+    }
+
+    public Integer getKnowledgeNum() {
+        return knowledgeNum;
+    }
+
+    public void setKnowledgeNum(Integer knowledgeNum) {
+        this.knowledgeNum = knowledgeNum;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public Long getPoints() {
+        return points;
+    }
+
+    public void setPoints(Long points) {
+        this.points = points;
+    }
+
+    public EquityEnum.VALIDITY_UNIT getValidityUnit() {
+        return validityUnit;
+    }
+
+    public void setValidityUnit(EquityEnum.VALIDITY_UNIT validityUnit) {
+        this.validityUnit = validityUnit;
+    }
+}

src/main/java/cn/com/poc/equity/dto/BizPaymentPackageConfigurationDto.java

+package cn.com.poc.equity.dto;	
+
+
+public class BizPaymentPackageConfigurationDto {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *
+    */ 
+    private java.lang.Integer id;
+
+    public java.lang.Integer getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Integer id){
+        this.id = id;
+    }
+	/** type
+    *类型 normal-普通 professional-专业版 ， ultimate-旗舰版
+    */ 
+    private java.lang.String type;
+
+    public java.lang.String getType(){
+        return this.type;
+    }
+    
+    public void setType(java.lang.String type){
+        this.type = type;
+    }
+	/** domain
+    *资源包领域 point-积分包 equity-权益包
+    */ 
+    private java.lang.String domain;
+
+    public java.lang.String getDomain(){
+        return this.domain;
+    }
+    
+    public void setDomain(java.lang.String domain){
+        this.domain = domain;
+    }
+	/** name
+    *套餐名
+    */ 
+    private java.lang.String name;
+
+    public java.lang.String getName(){
+        return this.name;
+    }
+    
+    public void setName(java.lang.String name){
+        this.name = name;
+    }
+	/** expired_num
+    *过期数
+    */ 
+    private java.lang.Integer expiredNum;
+
+    public java.lang.Integer getExpiredNum(){
+        return this.expiredNum;
+    }
+    
+    public void setExpiredNum(java.lang.Integer expiredNum){
+        this.expiredNum = expiredNum;
+    }
+	/** expired_type
+    *套餐过期类型   day-天 month-月 year-年 indefinite-无限期
+    */ 
+    private java.lang.String expiredType;
+
+    public java.lang.String getExpiredType(){
+        return this.expiredType;
+    }
+    
+    public void setExpiredType(java.lang.String expiredType){
+        this.expiredType = expiredType;
+    }
+	/** amount
+    *支付金额(分)
+    */ 
+    private java.lang.Integer amount;
+
+    public java.lang.Integer getAmount(){
+        return this.amount;
+    }
+    
+    public void setAmount(java.lang.Integer amount){
+        this.amount = amount;
+    }
+	/** resource_count
+    *资源数
+    */ 
+    private java.lang.Integer resourceCount;
+
+    public java.lang.Integer getResourceCount(){
+        return this.resourceCount;
+    }
+    
+    public void setResourceCount(java.lang.Integer resourceCount){
+        this.resourceCount = resourceCount;
+    }
+	/** original_price
+    *原价 (分)
+    */ 
+    private java.lang.Integer originalPrice;
+
+    public java.lang.Integer getOriginalPrice(){
+        return this.originalPrice;
+    }
+    
+    public void setOriginalPrice(java.lang.Integer originalPrice){
+        this.originalPrice = originalPrice;
+    }
+	/** is_show_original_price
+    *是否显示原价
+    */ 
+    private java.lang.String isShowOriginalPrice;
+
+    public java.lang.String getIsShowOriginalPrice(){
+        return this.isShowOriginalPrice;
+    }
+    
+    public void setIsShowOriginalPrice(java.lang.String isShowOriginalPrice){
+        this.isShowOriginalPrice = isShowOriginalPrice;
+    }
+	/** sort
+    *排序
+    */ 
+    private java.lang.Integer sort;
+
+    public java.lang.Integer getSort(){
+        return this.sort;
+    }
+    
+    public void setSort(java.lang.Integer sort){
+        this.sort = sort;
+    }
+	/** description
+    *套餐描述
+    */ 
+    private java.lang.String description;
+
+    public java.lang.String getDescription(){
+        return this.description;
+    }
+    
+    public void setDescription(java.lang.String description){
+        this.description = description;
+    }
+	/** extra_data
+    *拓展-资源额外配置
+    */ 
+    private java.lang.String extraData;
+
+    public java.lang.String getExtraData(){
+        return this.extraData;
+    }
+    
+    public void setExtraData(java.lang.String extraData){
+        this.extraData = extraData;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/dto/EquityOrderCreateDto.java

+package cn.com.poc.equity.dto;
+
+import java.io.Serializable;
+
+/**
+ * 创建权益包订单 请求实体
+ *
+ * @author alex.yao
+ * @date 2024/12/2
+ */
+public class EquityOrderCreateDto implements Serializable {
+
+    /**
+     * professional-专业版 ultimate-旗舰版
+     */
+    private String type;
+    /**
+     * equity 权益包
+     */
+    private String domain;
+
+    /**
+     * 有效期  year-年 month-月
+     */
+    private String validityUnit;
+
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    public String getValidityUnit() {
+        return validityUnit;
+    }
+
+    public void setValidityUnit(String validityUnit) {
+        this.validityUnit = validityUnit;
+    }
+}

src/main/java/cn/com/poc/equity/dto/EquityPackagesDto.java

+package cn.com.poc.equity.dto;
+
+import cn.com.poc.equity.domain.AgentEquity;
+
+import java.util.List;
+
+/**
+ * 权益套餐DTO
+ */
+public class EquityPackagesDto {
+
+    private List<AgentEquity> professional;
+
+
+    private List<AgentEquity> ultimate;
+
+
+    public List<AgentEquity> getProfessional() {
+        return professional;
+    }
+
+    public void setProfessional(List<AgentEquity> professional) {
+        this.professional = professional;
+    }
+
+    public List<AgentEquity> getUltimate() {
+        return ultimate;
+    }
+
+    public void setUltimate(List<AgentEquity> ultimate) {
+        this.ultimate = ultimate;
+    }
+}

src/main/java/cn/com/poc/equity/entity/BizPaymentPackageConfigurationEntity.java

+package cn.com.poc.equity.entity;	
+
+
+public class BizPaymentPackageConfigurationEntity {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *
+    */ 
+    private java.lang.Integer id;
+
+    public java.lang.Integer getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Integer id){
+        this.id = id;
+    }
+	/** type
+    *类型 normal-普通 professional-专业版 ， ultimate-旗舰版
+    */ 
+    private java.lang.String type;
+
+    public java.lang.String getType(){
+        return this.type;
+    }
+    
+    public void setType(java.lang.String type){
+        this.type = type;
+    }
+	/** domain
+    *资源包领域 point-积分包 equity-权益包
+    */ 
+    private java.lang.String domain;
+
+    public java.lang.String getDomain(){
+        return this.domain;
+    }
+    
+    public void setDomain(java.lang.String domain){
+        this.domain = domain;
+    }
+	/** name
+    *套餐名
+    */ 
+    private java.lang.String name;
+
+    public java.lang.String getName(){
+        return this.name;
+    }
+    
+    public void setName(java.lang.String name){
+        this.name = name;
+    }
+	/** expired_num
+    *过期数
+    */ 
+    private java.lang.Integer expiredNum;
+
+    public java.lang.Integer getExpiredNum(){
+        return this.expiredNum;
+    }
+    
+    public void setExpiredNum(java.lang.Integer expiredNum){
+        this.expiredNum = expiredNum;
+    }
+	/** expired_type
+    *套餐过期类型   day-天 month-月 year-年 indefinite-无限期
+    */ 
+    private java.lang.String expiredType;
+
+    public java.lang.String getExpiredType(){
+        return this.expiredType;
+    }
+    
+    public void setExpiredType(java.lang.String expiredType){
+        this.expiredType = expiredType;
+    }
+	/** amount
+    *支付金额(分)
+    */ 
+    private java.lang.Integer amount;
+
+    public java.lang.Integer getAmount(){
+        return this.amount;
+    }
+    
+    public void setAmount(java.lang.Integer amount){
+        this.amount = amount;
+    }
+	/** resource_count
+    *资源数
+    */ 
+    private java.lang.Integer resourceCount;
+
+    public java.lang.Integer getResourceCount(){
+        return this.resourceCount;
+    }
+    
+    public void setResourceCount(java.lang.Integer resourceCount){
+        this.resourceCount = resourceCount;
+    }
+	/** original_price
+    *原价 (分)
+    */ 
+    private java.lang.Integer originalPrice;
+
+    public java.lang.Integer getOriginalPrice(){
+        return this.originalPrice;
+    }
+    
+    public void setOriginalPrice(java.lang.Integer originalPrice){
+        this.originalPrice = originalPrice;
+    }
+	/** is_show_original_price
+    *是否显示原价
+    */ 
+    private java.lang.String isShowOriginalPrice;
+
+    public java.lang.String getIsShowOriginalPrice(){
+        return this.isShowOriginalPrice;
+    }
+    
+    public void setIsShowOriginalPrice(java.lang.String isShowOriginalPrice){
+        this.isShowOriginalPrice = isShowOriginalPrice;
+    }
+	/** sort
+    *排序
+    */ 
+    private java.lang.Integer sort;
+
+    public java.lang.Integer getSort(){
+        return this.sort;
+    }
+    
+    public void setSort(java.lang.Integer sort){
+        this.sort = sort;
+    }
+	/** description
+    *套餐描述
+    */ 
+    private java.lang.String description;
+
+    public java.lang.String getDescription(){
+        return this.description;
+    }
+    
+    public void setDescription(java.lang.String description){
+        this.description = description;
+    }
+	/** extra_data
+    *拓展-资源额外配置
+    */ 
+    private java.lang.String extraData;
+
+    public java.lang.String getExtraData(){
+        return this.extraData;
+    }
+    
+    public void setExtraData(java.lang.String extraData){
+        this.extraData = extraData;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/model/BizPaymentPackageConfigurationModel.java

+package cn.com.poc.equity.model;	
+
+import java.io.Serializable;
+import cn.com.yict.framemax.data.model.BaseModelClass;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import javax.persistence.Version;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+/**
+ * Model class for biz_payment_package_configuration
+ * 资源套餐配置
+ */
+@Entity
+@Table(name = "biz_payment_package_configuration")
+@DynamicInsert
+@DynamicUpdate
+public class BizPaymentPackageConfigurationModel extends BaseModelClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+  
+    /** id
+    *
+    */ 
+    private java.lang.Integer id;
+    
+    @Column(name = "id",length = 10)
+	@Id @GeneratedValue(strategy = GenerationType.AUTO) 
+    public java.lang.Integer getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Integer id){
+        this.id = id;
+        super.addValidField("id");
+    }
+    
+  
+    /** type
+    *类型 normal-普通 professional-专业版 ， ultimate-旗舰版
+    */ 
+    private java.lang.String type;
+    
+    @Column(name = "type",length = 100)
+    public java.lang.String getType(){
+        return this.type;
+    }
+    
+    public void setType(java.lang.String type){
+        this.type = type;
+        super.addValidField("type");
+    }
+    
+  
+    /** domain
+    *资源包领域 point-积分包 equity-权益包
+    */ 
+    private java.lang.String domain;
+    
+    @Column(name = "domain",length = 100)
+    public java.lang.String getDomain(){
+        return this.domain;
+    }
+    
+    public void setDomain(java.lang.String domain){
+        this.domain = domain;
+        super.addValidField("domain");
+    }
+    
+  
+    /** name
+    *套餐名
+    */ 
+    private java.lang.String name;
+    
+    @Column(name = "name",length = 100)
+    public java.lang.String getName(){
+        return this.name;
+    }
+    
+    public void setName(java.lang.String name){
+        this.name = name;
+        super.addValidField("name");
+    }
+    
+  
+    /** expired_num
+    *过期数
+    */ 
+    private java.lang.Integer expiredNum;
+    
+    @Column(name = "expired_num",length = 10)
+    public java.lang.Integer getExpiredNum(){
+        return this.expiredNum;
+    }
+    
+    public void setExpiredNum(java.lang.Integer expiredNum){
+        this.expiredNum = expiredNum;
+        super.addValidField("expiredNum");
+    }
+    
+  
+    /** expired_type
+    *套餐过期类型   day-天 month-月 year-年 indefinite-无限期
+    */ 
+    private java.lang.String expiredType;
+    
+    @Column(name = "expired_type",length = 100)
+    public java.lang.String getExpiredType(){
+        return this.expiredType;
+    }
+    
+    public void setExpiredType(java.lang.String expiredType){
+        this.expiredType = expiredType;
+        super.addValidField("expiredType");
+    }
+    
+  
+    /** amount
+    *支付金额(分)
+    */ 
+    private java.lang.Integer amount;
+    
+    @Column(name = "amount",length = 10)
+    public java.lang.Integer getAmount(){
+        return this.amount;
+    }
+    
+    public void setAmount(java.lang.Integer amount){
+        this.amount = amount;
+        super.addValidField("amount");
+    }
+    
+  
+    /** resource_count
+    *资源数
+    */ 
+    private java.lang.Integer resourceCount;
+    
+    @Column(name = "resource_count",length = 10)
+    public java.lang.Integer getResourceCount(){
+        return this.resourceCount;
+    }
+    
+    public void setResourceCount(java.lang.Integer resourceCount){
+        this.resourceCount = resourceCount;
+        super.addValidField("resourceCount");
+    }
+    
+  
+    /** original_price
+    *原价 (分)
+    */ 
+    private java.lang.Integer originalPrice;
+    
+    @Column(name = "original_price",length = 10)
+    public java.lang.Integer getOriginalPrice(){
+        return this.originalPrice;
+    }
+    
+    public void setOriginalPrice(java.lang.Integer originalPrice){
+        this.originalPrice = originalPrice;
+        super.addValidField("originalPrice");
+    }
+    
+  
+    /** is_show_original_price
+    *是否显示原价
+    */ 
+    private java.lang.String isShowOriginalPrice;
+    
+    @Column(name = "is_show_original_price",length = 1)
+    public java.lang.String getIsShowOriginalPrice(){
+        return this.isShowOriginalPrice;
+    }
+    
+    public void setIsShowOriginalPrice(java.lang.String isShowOriginalPrice){
+        this.isShowOriginalPrice = isShowOriginalPrice;
+        super.addValidField("isShowOriginalPrice");
+    }
+    
+  
+    /** sort
+    *排序
+    */ 
+    private java.lang.Integer sort;
+    
+    @Column(name = "sort",length = 10)
+    public java.lang.Integer getSort(){
+        return this.sort;
+    }
+    
+    public void setSort(java.lang.Integer sort){
+        this.sort = sort;
+        super.addValidField("sort");
+    }
+    
+  
+    /** description
+    *套餐描述
+    */ 
+    private java.lang.String description;
+    
+    @Column(name = "description",length = 225)
+    public java.lang.String getDescription(){
+        return this.description;
+    }
+    
+    public void setDescription(java.lang.String description){
+        this.description = description;
+        super.addValidField("description");
+    }
+    
+  
+    /** extra_data
+    *拓展-资源额外配置
+    */ 
+    private java.lang.String extraData;
+    
+    @Column(name = "extra_data",length = 1073741824)
+    public java.lang.String getExtraData(){
+        return this.extraData;
+    }
+    
+    public void setExtraData(java.lang.String extraData){
+        this.extraData = extraData;
+        super.addValidField("extraData");
+    }
+    
+  
+    /** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+    
+    @Column(name = "is_deleted",length = 1)
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+        super.addValidField("isDeleted");
+    }
+    
+  
+    /** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+    
+    @Column(name = "CREATOR",length = 11)
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+        super.addValidField("creator");
+    }
+    
+  
+    /** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+    
+    @Column(name = "CREATED_TIME",length = 19)
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+        super.addValidField("createdTime");
+    }
+    
+  
+    /** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+    
+    @Column(name = "MODIFIER",length = 11)
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+        super.addValidField("modifier");
+    }
+    
+  
+    /** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+    
+    @Column(name = "MODIFIED_TIME",length = 19)
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+        super.addValidField("modifiedTime");
+    }
+    
+  
+    /** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+    
+    @Column(name = "SYS_VERSION",length = 10)
+	@Version
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+        super.addValidField("sysVersion");
+    }
+    
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/repository/BizPaymentPackageConfigurationRepository.java

+package cn.com.poc.equity.repository;	
+import cn.com.yict.framemax.data.repository.Repository;
+import cn.com.poc.equity.model.BizPaymentPackageConfigurationModel;
+
+public interface BizPaymentPackageConfigurationRepository extends Repository<BizPaymentPackageConfigurationModel,java.lang.Integer> {
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/rest/EquityOrderRest.java

+package cn.com.poc.equity.rest;
+
+import cn.com.poc.equity.dto.EquityOrderCreateDto;
+import cn.com.yict.framemax.core.rest.BaseRest;
+import cn.com.yict.framemax.web.permission.Access;
+import cn.com.yict.framemax.web.permission.Permission;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Permission(Access.Safety)
+public interface EquityOrderRest extends BaseRest {
+
+    /**
+     * 创建权益订单
+     *
+     * @return 订单号
+     */
+    @Deprecated
+    String createOrder(@RequestBody EquityOrderCreateDto createDto) throws Exception;
+
+}

src/main/java/cn/com/poc/equity/rest/EquityRest.java

+package cn.com.poc.equity.rest;
+
+
+import cn.com.poc.equity.dto.EquityPackagesDto;
+import cn.com.yict.framemax.core.rest.BaseRest;
+import cn.com.yict.framemax.web.permission.Access;
+import cn.com.yict.framemax.web.permission.Permission;
+
+@Permission(Access.Anonymous)
+public interface EquityRest extends BaseRest {
+
+    /**
+     * 获取会员权益充值包列表，专业版 /  旗舰版
+     * @return
+     */
+    EquityPackagesDto getPackageList();
+
+    /**
+     * 获取积分充值包列表
+     */
+    Object getPointPackageList();
+}

src/main/java/cn/com/poc/equity/rest/impl/EquityOrderRestImpl.java

+package cn.com.poc.equity.rest.impl;
+
+import cn.com.poc.common.utils.Assert;
+import cn.com.poc.common.utils.BlContext;
+import cn.com.poc.equity.aggregate.EquityService;
+import cn.com.poc.equity.constants.EquityEnum;
+import cn.com.poc.equity.dto.EquityOrderCreateDto;
+import cn.com.poc.equity.rest.EquityOrderRest;
+import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
+import cn.com.yict.framemax.core.i18n.I18nMessageException;
+import cn.hutool.core.util.ObjectUtil;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class EquityOrderRestImpl implements EquityOrderRest {
+
+
+    @Resource
+    private EquityService equityService;
+
+    @Override
+    public String createOrder(EquityOrderCreateDto createDto) throws Exception {
+        Assert.notNull(createDto);
+        Assert.notNull(createDto.getType());
+        Assert.isTrue(EquityEnum.TYPE.isMatch(createDto.getType()));
+        Assert.notNull(createDto.getDomain());
+        Assert.isTrue(EquityEnum.DOMAIN.isMatch(createDto.getDomain()));
+        Assert.notNull(createDto.getValidityUnit());
+        Assert.isTrue(EquityEnum.VALIDITY_UNIT.isMatch(createDto.getValidityUnit()));
+
+        // 获取当前登录用户
+        UserBaseEntity currentUser = BlContext.getCurrentUserNotException();
+        if (ObjectUtil.isEmpty(currentUser)) {
+            throw new I18nMessageException("exception/user.not.login");
+        }
+
+        return equityService.createEquityOrder(
+                EquityEnum.TYPE.valueOf(createDto.getType()),
+                EquityEnum.DOMAIN.valueOf(createDto.getDomain()),
+                EquityEnum.VALIDITY_UNIT.valueOf(createDto.getValidityUnit()),
+                currentUser.getUserId());
+    }
+}

src/main/java/cn/com/poc/equity/rest/impl/EquityRestImpl.java

+package cn.com.poc.equity.rest.impl;
+
+import cn.com.poc.equity.aggregate.EquityService;
+import cn.com.poc.equity.constants.EquityEnum;
+import cn.com.poc.equity.domain.AgentEquity;
+import cn.com.poc.equity.dto.EquityPackagesDto;
+import cn.com.poc.equity.rest.EquityRest;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Component
+public class EquityRestImpl implements EquityRest {
+
+
+    @Resource
+    private EquityService equityService;
+
+    @Override
+    public EquityPackagesDto getPackageList() {
+        List<AgentEquity> professinalList = equityService.getEquityList(EquityEnum.TYPE.professional);
+        List<AgentEquity> ultimateList = equityService.getEquityList(EquityEnum.TYPE.ultimate);
+        EquityPackagesDto equityPackagesDto = new EquityPackagesDto();
+        equityPackagesDto.setProfessional(professinalList);
+        equityPackagesDto.setUltimate(ultimateList);
+        return equityPackagesDto;
+    }
+
+
+    @Override
+    public Object getPointPackageList() {
+        return equityService.getPointList();
+    }
+}

src/main/java/cn/com/poc/equity/service/BizPaymentPackageConfigurationService.java

+package cn.com.poc.equity.service;
+
+import cn.com.yict.framemax.core.service.BaseService;
+import cn.com.poc.equity.entity.BizPaymentPackageConfigurationEntity;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import java.util.Collection;
+import java.util.List;
+
+public interface BizPaymentPackageConfigurationService extends BaseService {
+
+    BizPaymentPackageConfigurationEntity get(java.lang.Integer id) throws Exception;
+
+    List<BizPaymentPackageConfigurationEntity> findByExample(BizPaymentPackageConfigurationEntity example,PagingInfo pagingInfo);
+    
+    BizPaymentPackageConfigurationEntity save(BizPaymentPackageConfigurationEntity entity) throws Exception;
+
+    BizPaymentPackageConfigurationEntity update(BizPaymentPackageConfigurationEntity entity) throws Exception;
+
+    void deletedById(java.lang.Integer id) throws Exception;
+    
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/impl/BizPaymentPackageConfigurationServiceImpl.java

+package cn.com.poc.equity.service.impl;	
+
+import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
+import cn.com.poc.equity.service.BizPaymentPackageConfigurationService;
+import cn.com.poc.equity.model.BizPaymentPackageConfigurationModel;
+import cn.com.poc.equity.entity.BizPaymentPackageConfigurationEntity;
+import cn.com.poc.equity.convert.BizPaymentPackageConfigurationConvert;
+import cn.com.poc.equity.repository.BizPaymentPackageConfigurationRepository;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import org.springframework.stereotype.Service;
+
+import org.apache.commons.collections4.CollectionUtils;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.util.Assert;
+
+@Service
+public class BizPaymentPackageConfigurationServiceImpl extends BaseServiceImpl
+ 			 implements BizPaymentPackageConfigurationService {
+   
+   @Resource
+   private BizPaymentPackageConfigurationRepository repository;
+    			 
+   public BizPaymentPackageConfigurationEntity get(java.lang.Integer id) throws Exception{
+        Assert.notNull(id);
+        BizPaymentPackageConfigurationModel model =  this.repository.get(id);
+        if (model == null){
+            return null;
+        }
+        if ("Y".equals(model.getIsDeleted())){
+            return null;
+        }
+        return BizPaymentPackageConfigurationConvert.modelToEntity(model);
+   }
+
+       
+   public List<BizPaymentPackageConfigurationEntity> findByExample(BizPaymentPackageConfigurationEntity example,PagingInfo pagingInfo){
+        List<BizPaymentPackageConfigurationEntity> result = new  ArrayList<BizPaymentPackageConfigurationEntity>();
+        BizPaymentPackageConfigurationModel model = new BizPaymentPackageConfigurationModel();
+        if (example != null){
+            model = BizPaymentPackageConfigurationConvert.entityToModel(example);
+        }
+        model.setIsDeleted("N");
+        List<BizPaymentPackageConfigurationModel> models = this.repository.findByExample(model,pagingInfo);
+        if (CollectionUtils.isNotEmpty(models)) {
+            result = models.stream().map(BizPaymentPackageConfigurationConvert::modelToEntity).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    public BizPaymentPackageConfigurationEntity save(BizPaymentPackageConfigurationEntity entity) throws Exception{
+        Assert.notNull(entity);
+        entity.setId(null);
+        entity.setIsDeleted("N");
+        BizPaymentPackageConfigurationModel model = BizPaymentPackageConfigurationConvert.entityToModel(entity);
+        BizPaymentPackageConfigurationModel saveModel =  this.repository.save(model);
+        return BizPaymentPackageConfigurationConvert.modelToEntity(saveModel);
+    }
+
+    public BizPaymentPackageConfigurationEntity update(BizPaymentPackageConfigurationEntity entity) throws Exception{
+        Assert.notNull(entity);
+        Assert.notNull(entity.getId(),"update pk can not be null");
+        BizPaymentPackageConfigurationModel model = this.repository.get(entity.getId());
+
+       if (entity.getType() != null){
+        model.setType(entity.getType());
+       }
+       if (entity.getDomain() != null){
+        model.setDomain(entity.getDomain());
+       }
+       if (entity.getName() != null){
+        model.setName(entity.getName());
+       }
+       if (entity.getExpiredNum() != null){
+        model.setExpiredNum(entity.getExpiredNum());
+       }
+       if (entity.getExpiredType() != null){
+        model.setExpiredType(entity.getExpiredType());
+       }
+       if (entity.getAmount() != null){
+        model.setAmount(entity.getAmount());
+       }
+       if (entity.getResourceCount() != null){
+        model.setResourceCount(entity.getResourceCount());
+       }
+       if (entity.getOriginalPrice() != null){
+        model.setOriginalPrice(entity.getOriginalPrice());
+       }
+       if (entity.getIsShowOriginalPrice() != null){
+        model.setIsShowOriginalPrice(entity.getIsShowOriginalPrice());
+       }
+       if (entity.getSort() != null){
+        model.setSort(entity.getSort());
+       }
+       if (entity.getDescription() != null){
+        model.setDescription(entity.getDescription());
+       }
+       if (entity.getExtraData() != null){
+        model.setExtraData(entity.getExtraData());
+       }
+       if (entity.getIsDeleted() != null){
+        model.setIsDeleted(entity.getIsDeleted());
+       }
+       if (entity.getCreator() != null){
+        model.setCreator(entity.getCreator());
+       }
+       if (entity.getCreatedTime() != null){
+        model.setCreatedTime(entity.getCreatedTime());
+       }
+       if (entity.getModifier() != null){
+        model.setModifier(entity.getModifier());
+       }
+       if (entity.getModifiedTime() != null){
+        model.setModifiedTime(entity.getModifiedTime());
+       }
+       if (entity.getSysVersion() != null){
+        model.setSysVersion(entity.getSysVersion());
+       }
+        BizPaymentPackageConfigurationModel saveModel =  this.repository.save(model);
+        return BizPaymentPackageConfigurationConvert.modelToEntity(saveModel);
+    }
+
+    public void deletedById(java.lang.Integer id) throws Exception{
+        Assert.notNull(id);
+        BizPaymentPackageConfigurationModel model =  this.repository.get(id);
+        if (model != null){
+            if ("N".equals(model.getIsDeleted())){
+                model.setIsDeleted("Y");
+                this.repository.save(model);
+            }
+       }
+   }
+    
+}
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/dto/UpsertChunkInfoDto.java

 package cn.com.poc.knowledge.dto;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/support/security/oauth/MultiDomainOauthUserManagerImplementor.java

 package cn.com.poc.support.security.oauth;
 
 
-import cn.com.poc.support.security.oauth.entity.MemberResponse;
-import cn.com.poc.thirdparty.resource.demand.auth.entity.BizProjectEntity;
-import cn.com.poc.thirdparty.resource.demand.auth.service.BizProjectService;
 import cn.com.poc.support.security.oauth.constants.OauthConstants;
-import cn.com.poc.support.security.oauth.entity.OpenPlatformEntity;
+import cn.com.poc.support.security.oauth.entity.MemberResponse;
 import cn.com.poc.user.entity.MemberInfoEntity;
 import cn.com.poc.user.service.BizMemberInfoService;
 import cn.com.yict.framemax.core.i18n.I18nMessageException;
-import cn.com.yict.framemax.data.model.UserBaseModel;
-import cn.com.yict.framemax.frame.entity.UserSessionEntity;
-import cn.com.yict.framemax.frame.model.FmxRoleModel;
-import cn.com.yict.framemax.frame.model.FmxRoleUserModel;
-import cn.com.yict.framemax.frame.model.FmxUserModel;
-import cn.com.yict.framemax.frame.service.FmxRoleService;
-import cn.com.yict.framemax.frame.service.FmxRoleUserService;
-import cn.com.yict.framemax.frame.service.FmxUserService;
 import cn.com.yict.framemax.security.authentication.SecurityAuthenticationToken;
 import cn.com.yict.framemax.security.oauth.OauthUserManager;
 import cn.com.yict.framemax.security.oauth.entity.OauthTokenEntity;
 import cn.com.yict.framemax.security.oauth.support.OauthUserManagerImplementor;
-import cn.com.yict.framemax.security.service.SecurityService;
-import cn.hutool.core.lang.Assert;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.core.AuthenticationException;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/aggregate/impl/AICreateImageServiceImpl.java

@@ -7,7 +7,7 @@ import cn.com.poc.thirdparty.resource.demand.ai.aggregate.AICreateImageService;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.OpenAiResult;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.generations.*;
 import cn.com.poc.thirdparty.resource.demand.member.service.DemandAuthService;
-import cn.com.poc.support.dgTools.DgtoolsAbstractHttpClient;
+import cn.com.poc.thirdparty.resource.demand.dgTools.DgtoolsAbstractHttpClient;
 import cn.com.poc.thirdparty.resource.demand.ai.route.DgtoolsApiRoute;
 import cn.com.yict.framemax.core.i18n.I18nMessageException;
 import com.alibaba.fastjson.JSON;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/aggregate/impl/AIDialogueServiceImpl.java

@@ -7,7 +7,7 @@ import cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel.LargeModelDema
 import cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel.LargeModelDemandResult;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel.LargeModelResponse;
 import cn.com.poc.thirdparty.resource.demand.member.service.DemandAuthService;
-import cn.com.poc.support.dgTools.DgtoolsAbstractHttpClient;
+import cn.com.poc.thirdparty.resource.demand.dgTools.DgtoolsAbstractHttpClient;
 import cn.com.poc.thirdparty.resource.demand.ai.route.DgtoolsApiRoute;
 import org.apache.http.Header;
 import org.apache.http.client.methods.CloseableHttpResponse;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/aggregate/impl/DemandKnowledgeServiceImpl.java

 package cn.com.poc.thirdparty.resource.demand.ai.aggregate.impl;
 
-import cn.com.poc.support.dgTools.DgtoolsAbstractHttpClient;
+import cn.com.poc.thirdparty.resource.demand.dgTools.DgtoolsAbstractHttpClient;
 import cn.com.poc.thirdparty.resource.demand.ai.route.DgtoolsApiRoute;
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import cn.com.poc.thirdparty.resource.demand.ai.aggregate.DemandKnowledgeService;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.*;
 import cn.com.poc.thirdparty.resource.demand.member.service.DemandAuthService;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/AIRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/AIResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/AITextCensorRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/AITextCensorResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity;
 
 import cn.com.poc.thirdparty.resource.demand.ai.entity.censor.Datum;
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import com.alibaba.fastjson.annotation.JSONField;
 
 import java.util.List;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/BaiduErrorResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/OpenAiResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 /**
  * @author alex.yao

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/baidu/aicustom/BaiduErnieBotRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.baidu.aicustom;
 
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.Message;
-import cn.com.poc.support.dgTools.request.AbstractRequest;
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import com.alibaba.fastjson.annotation.JSONField;
 
 import java.io.Serializable;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/chatgpt/DgtoolsAIChatGptRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.chatgpt;
 
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.Message;
-import cn.com.poc.support.dgTools.request.AbstractRequest;
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/chatgpt/moderation/DgtoolsAIModerationsRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.chatgpt.moderation;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/chatgpt/moderation/DgtoolsAIModerationsResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.chatgpt.moderation;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.util.List;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/dialogue/Usage.java

+
+package cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue;
+
+public class Usage {
+
+    private Long completion_tokens;
+    private Long prompt_tokens;
+    private Long total_tokens;
+
+    public Long getCompletion_tokens() {
+        return completion_tokens;
+    }
+
+    public void setCompletion_tokens(Long completion_tokens) {
+        this.completion_tokens = completion_tokens;
+    }
+
+    public Long getPrompt_tokens() {
+        return prompt_tokens;
+    }
+
+    public void setPrompt_tokens(Long prompt_tokens) {
+        this.prompt_tokens = prompt_tokens;
+    }
+
+    public Long getTotal_tokens() {
+        return total_tokens;
+    }
+
+    public void setTotal_tokens(Long total_tokens) {
+        this.total_tokens = total_tokens;
+    }
+}

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/function/FunctionCallResponse.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.function;
 
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.Function;
 
 import java.io.Serializable;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/function/FunctionCallResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.function;
 
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.FunctionCall;
 
 import java.io.Serializable;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/generations/BaiduAISailsImage2TextRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.generations;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/generations/BaiduAISailsText2ImageRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.generations;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/generations/BaiduGenerationsRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.generations;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/generations/BaiduGenerationsV2Request.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.generations;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/generations/BaiduGetImageResult.java

 
 package cn.com.poc.thirdparty.resource.demand.ai.entity.generations;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import com.alibaba.fastjson.annotation.JSONField;
 
 public class BaiduGetImageResult extends AbstractResult {

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/generations/BaiduGetImageV2Result.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.generations;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 /**
  * @author alex.yao

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/generations/GenerationsRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.generations;
 
 import cn.com.poc.thirdparty.resource.demand.ai.entity.OpenAiResult;
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/generations/GenerationsResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.generations;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.util.List;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/DelKnowledgeRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/GetKnowledgeChunkInfoRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/GetKnowledgeChunkInfoResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/SearchKnowledgeRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/SearchKnowledgeResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.util.List;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/TrainKnowledgeRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/TrainKnowledgeResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/TrainKnowledgeStatusRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/TrainKnowledgeStatusResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/UpsertChunkInfoRequest.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/largemodel/LargeModelDemandResponse.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel;
 
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/largemodel/LargeModelDemandResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.Usage;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.ToolFunction;
 
 import java.io.Serializable;
@@ -15,6 +16,8 @@ public class LargeModelDemandResult extends AbstractResult implements Serializab
 
     private String finish_reason;
 
+    private Usage usage;
+
     public String getCode() {
         return code;
     }
@@ -47,6 +50,14 @@ public class LargeModelDemandResult extends AbstractResult implements Serializab
         this.finish_reason = finish_reason;
     }
 
+    public Usage getUsage() {
+        return usage;
+    }
+
+    public void setUsage(Usage usage) {
+        this.usage = usage;
+    }
+
     @Override
     public String toString() {
         return "LargeModelDemandResult{" +
@@ -54,6 +65,7 @@ public class LargeModelDemandResult extends AbstractResult implements Serializab
                 ", message='" + message + '\'' +
                 ", function=" + function +
                 ", finish_reason='" + finish_reason + '\'' +
+                ", usage=" + usage +
                 '}';
     }
-}
+}
\ No newline at end of file

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/orc/BaiduORCHandWritingResponse.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.orc;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/plugin/BaiduPluginResponse.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.plugin;
 
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.Message;
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/text_correction/BaiduTextCorrectionResponse.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.text_correction;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/route/DgtoolsApiRoute.java

@@ -101,9 +101,9 @@ public interface DgtoolsApiRoute {
     }
 
     /**
-     * 微信支付支付
+     * 中台支付
      */
-    public interface WxPay {
+    public interface DgtoolPay {
 
         /**
          * 支付

src/main/java/cn/com/poc/thirdparty/resource/demand/auth/dto/GetTokenResponse.java

-package cn.com.poc.thirdparty.resource.demand.auth.dto;
-
-import java.io.Serializable;
-
-/**
- * @author alex.yao
- * @date 2023/11/23
- **/
-public class GetTokenResponse implements Serializable {
-
-    private String appKey;
-
-    public String getAppKey() {
-        return appKey;
-    }
-
-    public void setAppKey(String appKey) {
-        this.appKey = appKey;
-    }
-}

src/main/java/cn/com/poc/thirdparty/resource/demand/auth/dto/GetTokenResult.java

-package cn.com.poc.thirdparty.resource.demand.auth.dto;
-
-import java.io.Serializable;
-
-/**
- * @author alex.yao
- * @date 2023/11/23
- **/
-public class GetTokenResult implements Serializable {
-
-    private String token;
-
-    private String expireDate;
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getExpireDate() {
-        return expireDate;
-    }
-
-    public void setExpireDate(String expireDate) {
-        this.expireDate = expireDate;
-    }
-
-    @Override
-    public String toString() {
-        return "token='" + token + '\'' +
-                ", expireDate=" + expireDate;
-
-    }
-}

src/main/java/cn/com/poc/thirdparty/resource/demand/auth/entity/BizProjectEntity.java

-package cn.com.poc.thirdparty.resource.demand.auth.entity;
-
-/**
- * @author alex.yao
- * @date 2023/11/23
- **/
-public class BizProjectEntity {
-
-    /** project_name
-     *项目名
-     */
-    private java.lang.String projectName;
-
-    public java.lang.String getProjectName(){
-        return this.projectName;
-    }
-
-    public void setProjectName(java.lang.String projectName){
-        this.projectName = projectName;
-    }
-
-
-    /** appKey
-     *项目appKey
-     */
-    private java.lang.String appKey;
-
-    public java.lang.String getAppKey(){
-        return this.appKey;
-    }
-
-    public void setAppKey(java.lang.String appKey){
-        this.appKey = appKey;
-    }
-
-
-    /** appSecret
-     *项目appSecret
-     */
-    private java.lang.String appSecret;
-
-    public java.lang.String getAppSecret(){
-        return this.appSecret;
-    }
-
-    public void setAppSecret(java.lang.String appSecret){
-        this.appSecret = appSecret;
-    }
-
-}

src/main/java/cn/com/poc/thirdparty/resource/demand/auth/repository/BizProjectRepository.java

-package cn.com.poc.thirdparty.resource.demand.auth.repository;
-import cn.com.yict.framemax.data.repository.Repository;
-import cn.com.poc.thirdparty.resource.demand.auth.model.BizProjectModel;
-
-public interface BizProjectRepository extends Repository<BizProjectModel,java.lang.Integer> {
-}
\ No newline at end of file

src/main/java/cn/com/poc/thirdparty/resource/demand/auth/service/BizProjectService.java

-package cn.com.poc.thirdparty.resource.demand.auth.service;
-
-import cn.com.poc.thirdparty.resource.demand.auth.entity.BizProjectEntity;
-import cn.com.yict.framemax.core.service.BaseService;
-
-public interface BizProjectService extends BaseService {
-
-    BizProjectEntity getSecretByAppKey(String appKey);
-
-}
\ No newline at end of file

src/main/java/cn/com/poc/thirdparty/resource/demand/auth/service/impl/BizProjectServiceImpl.java

-package cn.com.poc.thirdparty.resource.demand.auth.service.impl;
-
-import cn.com.poc.thirdparty.resource.demand.auth.entity.BizProjectEntity;
-import cn.com.poc.thirdparty.resource.demand.auth.model.BizProjectModel;
-import cn.com.poc.thirdparty.resource.demand.auth.repository.BizProjectRepository;
-import cn.com.poc.common.constant.CommonConstant;
-import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
-import cn.com.poc.thirdparty.resource.demand.auth.service.BizProjectService;
-import cn.hutool.core.lang.Assert;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class BizProjectServiceImpl extends BaseServiceImpl
-        implements BizProjectService {
-
-    @Resource
-    private BizProjectRepository repository;
-
-    @Override
-    public BizProjectEntity getSecretByAppKey(String appKey){
-        Assert.notBlank(appKey);
-
-        BizProjectModel bizProjectModel = new BizProjectModel();
-        bizProjectModel.setAppKey(appKey);
-        bizProjectModel.setIsDeleted(CommonConstant.IsDeleted.N);
-
-        List<BizProjectModel> models = this.repository.findByExample(bizProjectModel);
-        if (CollectionUtils.isEmpty(models)) {
-            return null;
-        }
-        BizProjectEntity bizProjectEntity = new BizProjectEntity();
-        bizProjectEntity.setProjectName(models.get(0).getProjectName());
-        bizProjectEntity.setAppKey(models.get(0).getAppKey());
-        bizProjectEntity.setAppSecret(models.get(0).getAppSecret());
-
-
-        return bizProjectEntity;
-    }
-}
\ No newline at end of file

src/main/java/cn/com/poc/thirdparty/resource/demand/clickhouse/entity/WebBrowseHarvestEntity.java

 package cn.com.poc.thirdparty.resource.demand.clickhouse.entity;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/clickhouse/entity/WebBrowseHarvestResult.java

 package cn.com.poc.thirdparty.resource.demand.clickhouse.entity;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 
 public class WebBrowseHarvestResult extends AbstractResult {
 

src/main/java/cn/com/poc/thirdparty/resource/demand/clickhouse/service/impl/DataReportServiceImpl.java

 package cn.com.poc.thirdparty.resource.demand.clickhouse.service.impl;
 
-import cn.com.poc.support.dgTools.DgtoolsAbstractHttpClient;
+import cn.com.poc.thirdparty.resource.demand.dgTools.DgtoolsAbstractHttpClient;
 import cn.com.poc.thirdparty.resource.demand.ai.route.DgtoolsApiRoute;
 import cn.com.poc.thirdparty.resource.demand.clickhouse.entity.WebBrowseHarvestEntity;
 import cn.com.poc.thirdparty.resource.demand.clickhouse.service.DataReportService;

src/main/java/cn/com/poc/support/dgTools/DgtoolsAbstractHttpClient.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/DgtoolsAbstractHttpClient.java

-package cn.com.poc.support.dgTools;
+package cn.com.poc.thirdparty.resource.demand.dgTools;
 
 import cn.com.poc.common.constant.FmxParamConfigConstant;
 import cn.com.poc.common.utils.ListUtils;
 import cn.com.poc.common.utils.http.LocalHttpClient;
 import cn.com.poc.thirdparty.resource.demand.ai.route.DgtoolsApiRoute;
-import cn.com.poc.support.dgTools.request.AbstractParam;
-import cn.com.poc.support.dgTools.request.AbstractRequest;
-import cn.com.poc.support.dgTools.request.ProjectTokenRequest;
-import cn.com.poc.support.dgTools.result.AbstractResult;
-import cn.com.poc.support.dgTools.result.DgtoolsApiResult;
-import cn.com.poc.support.dgTools.utils.AesEncodeUtil;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractParam;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.ProjectTokenRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.DgtoolsApiResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.utils.AesEncodeUtil;
 import cn.com.yict.framemax.core.i18n.I18nMessageException;
 import cn.com.yict.framemax.data.model.PagingInfo;
 import cn.com.yict.framemax.frame.service.FmxParamConfigService;

src/main/java/cn/com/poc/support/dgTools/constants/Channel.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/constants/Channel.java

-package cn.com.poc.support.dgTools.constants;
+package cn.com.poc.thirdparty.resource.demand.dgTools.constants;
 
 /**
  * 支付渠道名称
@@ -10,5 +10,7 @@ public enum Channel {
      */
     Wx,
 
+    Ali,
+
 
 }
\ No newline at end of file

src/main/java/cn/com/poc/support/dgTools/constants/CurrencyEnum.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/constants/CurrencyEnum.java

-package cn.com.poc.support.dgTools.constants;
+package cn.com.poc.thirdparty.resource.demand.dgTools.constants;
 
 /**
  * @author Roger Wu

src/main/java/cn/com/poc/support/dgTools/constants/DgtoolsPlatformEnum.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/constants/DgtoolsPlatformEnum.java

-package cn.com.poc.support.dgTools.constants;
+package cn.com.poc.thirdparty.resource.demand.dgTools.constants;
 
 /**
  * @author alex.yao

src/main/java/cn/com/poc/support/dgTools/constants/ErrorCodeEnum.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/constants/ErrorCodeEnum.java

-package cn.com.poc.support.dgTools.constants;
+package cn.com.poc.thirdparty.resource.demand.dgTools.constants;
 
 /**
  * @author Roger Wu

src/main/java/cn/com/poc/support/dgTools/constants/MerchantPayConfigConstants.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/constants/MerchantPayConfigConstants.java

-package cn.com.poc.support.dgTools.constants;
+package cn.com.poc.thirdparty.resource.demand.dgTools.constants;
 
 public class MerchantPayConfigConstants {
 

src/main/java/cn/com/poc/support/dgTools/constants/RedPacketConstants.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/constants/RedPacketConstants.java

-package cn.com.poc.support.dgTools.constants;
+package cn.com.poc.thirdparty.resource.demand.dgTools.constants;
 
 /**
  * @author Roger Wu

src/main/java/cn/com/poc/support/dgTools/constants/Scence.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/constants/Scence.java

-package cn.com.poc.support.dgTools.constants;
+package cn.com.poc.thirdparty.resource.demand.dgTools.constants;
 
 /**
  * 支付场景名称
@@ -15,11 +15,27 @@ public enum Scence {
      */
     wx_h5_program,
 
-
     /**
      * native
      */
     wx_native_program,
 
 
+    /**
+     * H5 - 电脑网站
+     */
+    ali_h5_program,
+
+    /**
+     * wap - 手机网站
+     */
+    ali_wap_program,
+
+    /**
+     * 统一收单线下交易预创建
+     */
+    ali_pre_create_program
+
+
+
 }
\ No newline at end of file

src/main/java/cn/com/poc/support/dgTools/constants/TradeType.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/constants/TradeType.java

-package cn.com.poc.support.dgTools.constants;
+package cn.com.poc.thirdparty.resource.demand.dgTools.constants;
 
 public enum TradeType {
 

src/main/java/cn/com/poc/support/dgTools/request/AbstractParam.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/request/AbstractParam.java

-package cn.com.poc.support.dgTools.request;
+package cn.com.poc.thirdparty.resource.demand.dgTools.request;
 
 public class AbstractParam<T> {
 

src/main/java/cn/com/poc/support/dgTools/request/AbstractRequest.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/request/AbstractRequest.java

-package cn.com.poc.support.dgTools.request;
+package cn.com.poc.thirdparty.resource.demand.dgTools.request;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.lang.reflect.ParameterizedType;

src/main/java/cn/com/poc/support/dgTools/request/CreateMerchantRequest.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/request/CreateMerchantRequest.java

-package cn.com.poc.support.dgTools.request;
+package cn.com.poc.thirdparty.resource.demand.dgTools.request;
 
 
-import cn.com.poc.support.dgTools.result.CreateMerchantResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.CreateMerchantResult;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/support/dgTools/request/H5PayRequest.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/request/H5PayRequest.java

-package cn.com.poc.support.dgTools.request;
+package cn.com.poc.thirdparty.resource.demand.dgTools.request;
 
 
-import cn.com.poc.support.dgTools.constants.Channel;
-import cn.com.poc.support.dgTools.constants.Scence;
-import cn.com.poc.support.dgTools.constants.TradeType;
-import cn.com.poc.support.dgTools.result.H5TranssactionsResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.constants.Channel;
+import cn.com.poc.thirdparty.resource.demand.dgTools.constants.Scence;
+import cn.com.poc.thirdparty.resource.demand.dgTools.constants.TradeType;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.H5TranssactionsResult;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/cn/com/poc/support/dgTools/request/PayRequest.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/request/PayRequest.java

-package cn.com.poc.support.dgTools.request;
+package cn.com.poc.thirdparty.resource.demand.dgTools.request;
 
 
-import cn.com.poc.support.dgTools.constants.Channel;
-import cn.com.poc.support.dgTools.constants.Scence;
-import cn.com.poc.support.dgTools.constants.TradeType;
-import cn.com.poc.support.dgTools.result.PayResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.constants.Channel;
+import cn.com.poc.thirdparty.resource.demand.dgTools.constants.Scence;
+import cn.com.poc.thirdparty.resource.demand.dgTools.constants.TradeType;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.PayResult;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/cn/com/poc/support/dgTools/request/ProjectTokenRequest.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/request/ProjectTokenRequest.java

-package cn.com.poc.support.dgTools.request;
+package cn.com.poc.thirdparty.resource.demand.dgTools.request;
 
-import cn.com.poc.support.dgTools.result.ProjectTokenResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.ProjectTokenResult;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 

src/main/java/cn/com/poc/support/dgTools/rest/AuthorizationRest.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/rest/AuthorizationRest.java

-package cn.com.poc.support.dgTools.rest;
+package cn.com.poc.thirdparty.resource.demand.dgTools.rest;
 
 import cn.com.yict.framemax.core.rest.BaseRest;
 import cn.com.yict.framemax.web.permission.Access;

src/main/java/cn/com/poc/support/dgTools/rest/impl/AuthorizationRestImpl.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/rest/impl/AuthorizationRestImpl.java

-package cn.com.poc.support.dgTools.rest.impl;
+package cn.com.poc.thirdparty.resource.demand.dgTools.rest.impl;
 
-import cn.com.poc.support.dgTools.rest.AuthorizationRest;
-import cn.com.poc.support.dgTools.service.AuthorizationService;
+import cn.com.poc.thirdparty.resource.demand.dgTools.rest.AuthorizationRest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.service.AuthorizationService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

src/main/java/cn/com/poc/support/dgTools/result/AbstractResult.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/result/AbstractResult.java

-package cn.com.poc.support.dgTools.result;
+package cn.com.poc.thirdparty.resource.demand.dgTools.result;
 
 /**
  * @author Roger Wu

src/main/java/cn/com/poc/support/dgTools/result/CreateMerchantResult.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/result/CreateMerchantResult.java

-package cn.com.poc.support.dgTools.result;
+package cn.com.poc.thirdparty.resource.demand.dgTools.result;
 
 /**
  * @author Roger Wu

src/main/java/cn/com/poc/support/dgTools/result/DgtoolsApiResult.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/result/DgtoolsApiResult.java

-package cn.com.poc.support.dgTools.result;
+package cn.com.poc.thirdparty.resource.demand.dgTools.result;
 
-import cn.com.poc.support.dgTools.constants.ErrorCodeEnum;
+import cn.com.poc.thirdparty.resource.demand.dgTools.constants.ErrorCodeEnum;
 import cn.com.yict.framemax.data.model.PagingInfo;
 
 /**

src/main/java/cn/com/poc/support/dgTools/result/H5TranssactionsResult.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/result/H5TranssactionsResult.java

-package cn.com.poc.support.dgTools.result;
+package cn.com.poc.thirdparty.resource.demand.dgTools.result;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

src/main/java/cn/com/poc/support/dgTools/result/PayResult.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/result/PayResult.java

-package cn.com.poc.support.dgTools.result;
+package cn.com.poc.thirdparty.resource.demand.dgTools.result;
 
 /**
  * @author Roger Wu

src/main/java/cn/com/poc/support/dgTools/result/ProjectTokenResult.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/result/ProjectTokenResult.java

-package cn.com.poc.support.dgTools.result;
+package cn.com.poc.thirdparty.resource.demand.dgTools.result;
 
 public class ProjectTokenResult extends AbstractResult {
 

src/main/java/cn/com/poc/support/dgTools/service/AuthorizationService.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/service/AuthorizationService.java

-package cn.com.poc.support.dgTools.service;
+package cn.com.poc.thirdparty.resource.demand.dgTools.service;
 
 import cn.com.yict.framemax.core.rest.BaseRest;
 

src/main/java/cn/com/poc/support/dgTools/service/impl/AuthorizationServiceImpl.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/service/impl/AuthorizationServiceImpl.java

-package cn.com.poc.support.dgTools.service.impl;
+package cn.com.poc.thirdparty.resource.demand.dgTools.service.impl;
 
 import cn.com.poc.common.constant.FmxParamConfigConstant;
 import cn.com.poc.common.constant.MkpRedisKeyConstant;
 import cn.com.poc.common.service.RedisService;
-import cn.com.poc.support.dgTools.DgtoolsAbstractHttpClient;
+import cn.com.poc.thirdparty.resource.demand.dgTools.DgtoolsAbstractHttpClient;
 import cn.com.poc.thirdparty.resource.demand.ai.route.DgtoolsApiRoute;
-import cn.com.poc.support.dgTools.request.ProjectTokenRequest;
-import cn.com.poc.support.dgTools.result.ProjectTokenResult;
-import cn.com.poc.support.dgTools.service.AuthorizationService;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.ProjectTokenRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.ProjectTokenResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.service.AuthorizationService;
 import cn.com.yict.framemax.core.i18n.I18nMessageException;
 import cn.com.yict.framemax.frame.service.FmxParamConfigService;
 import org.apache.commons.lang3.StringUtils;

src/main/java/cn/com/poc/support/dgTools/utils/AesEncodeUtil.java → src/main/java/cn/com/poc/thirdparty/resource/demand/dgTools/utils/AesEncodeUtil.java

-package cn.com.poc.support.dgTools.utils;
+package cn.com.poc.thirdparty.resource.demand.dgTools.utils;
 
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;

src/main/java/cn/com/poc/thirdparty/resource/demand/member/api/DemandAuthApi.java

@@ -2,7 +2,7 @@ package cn.com.poc.thirdparty.resource.demand.member.api;
 
 import cn.com.poc.thirdparty.resource.demand.member.entity.DemandAuthResponse;
 import cn.com.poc.thirdparty.resource.demand.member.entity.DemandAuthResult;
-import cn.com.poc.support.dgTools.DgtoolsAbstractHttpClient;
+import cn.com.poc.thirdparty.resource.demand.dgTools.DgtoolsAbstractHttpClient;
 import cn.com.poc.thirdparty.resource.demand.ai.route.DgtoolsApiRoute;
 import org.apache.http.Header;
 import org.springframework.stereotype.Service;

src/main/java/cn/com/poc/thirdparty/resource/demand/member/entity/DemandAuthResponse.java

 package cn.com.poc.thirdparty.resource.demand.member.entity;
 
-import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.thirdparty.resource.demand.dgTools.request.AbstractRequest;
 
 import java.io.Serializable;
 

src/main/java/cn/com/poc/thirdparty/resource/demand/member/entity/DemandAuthResult.java

 package cn.com.poc.thirdparty.resource.demand.member.entity;
 
-import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.dgTools.result.AbstractResult;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;