数据汇聚

src/main/java/com/sxtvs/open/api/news/controller/HotRankController.java

@@ -1,7 +1,6 @@
 package com.sxtvs.open.api.news.controller;
 
 import com.sxtvs.open.api.news.dto.HotRankDTO;
-import com.sxtvs.open.api.news.entity.HotRank;
 import com.sxtvs.open.api.news.service.impl.HotRankServiceImpl;
 import com.sxtvs.open.core.auth.LoginRequired;
 import jakarta.annotation.Resource;

src/main/java/com/sxtvs/open/api/news/controller/YoumeiDataController.java

@@ -2,7 +2,6 @@ package com.sxtvs.open.api.news.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sxtvs.open.api.news.dto.DataRequestDTO;
-import com.sxtvs.open.api.news.entity.YoumeiData;
 import com.sxtvs.open.api.news.entity.YoumeiEsData;
 import com.sxtvs.open.api.news.service.impl.YoumeiDataServiceImpl;
 import com.sxtvs.open.core.auth.LoginRequired;

src/main/java/com/sxtvs/open/api/news/entity/Area.java

@@ -1,14 +1,13 @@
 package com.sxtvs.open.api.news.entity;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 

src/main/java/com/sxtvs/open/api/news/entity/HotRank.java

@@ -3,11 +3,9 @@ package com.sxtvs.open.api.news.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.io.Serializable;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/entity/YoumeiData.java

@@ -1,18 +1,13 @@
 package com.sxtvs.open.api.news.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.data.annotation.Id;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/entity/YoumeiOffset.java

@@ -1,10 +1,11 @@
 package com.sxtvs.open.api.news.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/sxtvs/open/api/news/mapper/AreaMapper.java

@@ -1,8 +1,8 @@
 package com.sxtvs.open.api.news.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.sxtvs.open.api.news.entity.Area;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sxtvs.open.api.news.entity.Area;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/mapper/HotRankMapper.java

@@ -1,8 +1,8 @@
 package com.sxtvs.open.api.news.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.sxtvs.open.api.news.entity.HotRank;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sxtvs.open.api.news.entity.HotRank;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/mapper/YoumeiDataMapper.java

@@ -1,9 +1,9 @@
 package com.sxtvs.open.api.news.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sxtvs.open.api.news.entity.CategoryData;
 import com.sxtvs.open.api.news.entity.YoumeiData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/sxtvs/open/api/news/mapper/YoumeiOffsetMapper.java

@@ -1,8 +1,8 @@
 package com.sxtvs.open.api.news.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.sxtvs.open.api.news.entity.YoumeiOffset;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sxtvs.open.api.news.entity.YoumeiOffset;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/service/IAreaService.java

@@ -1,7 +1,7 @@
 package com.sxtvs.open.api.news.service;
 
-import com.sxtvs.open.api.news.entity.Area;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sxtvs.open.api.news.entity.Area;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/service/IHotRankService.java

@@ -1,7 +1,7 @@
 package com.sxtvs.open.api.news.service;
 
-import com.sxtvs.open.api.news.entity.HotRank;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sxtvs.open.api.news.entity.HotRank;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/service/IYoumeiDataService.java

@@ -1,7 +1,7 @@
 package com.sxtvs.open.api.news.service;
 
-import com.sxtvs.open.api.news.entity.YoumeiData;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sxtvs.open.api.news.entity.YoumeiData;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/service/IYoumeiOffsetService.java

@@ -1,7 +1,7 @@
 package com.sxtvs.open.api.news.service;
 
-import com.sxtvs.open.api.news.entity.YoumeiOffset;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sxtvs.open.api.news.entity.YoumeiOffset;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/service/impl/AreaServiceImpl.java

@@ -1,9 +1,9 @@
 package com.sxtvs.open.api.news.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.api.news.entity.Area;
 import com.sxtvs.open.api.news.mapper.AreaMapper;
 import com.sxtvs.open.api.news.service.IAreaService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/com/sxtvs/open/api/news/service/impl/HotRankServiceImpl.java

@@ -1,10 +1,10 @@
 package com.sxtvs.open.api.news.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.api.news.dto.HotRankDTO;
 import com.sxtvs.open.api.news.entity.HotRank;
 import com.sxtvs.open.api.news.mapper.HotRankMapper;
 import com.sxtvs.open.api.news.service.IHotRankService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.http.util.TextUtils;
 import org.springframework.stereotype.Service;
 

src/main/java/com/sxtvs/open/api/news/service/impl/YoumeiDataServiceImpl.java

@@ -6,15 +6,13 @@ import co.elastic.clients.elasticsearch._types.SortOrder;
 import co.elastic.clients.elasticsearch._types.query_dsl.MatchQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.MultiMatchQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
-import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
 import co.elastic.clients.elasticsearch.core.BulkRequest;
 import co.elastic.clients.elasticsearch.core.SearchRequest;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
 import co.elastic.clients.json.JsonData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.api.news.dto.DataRequestDTO;
 import com.sxtvs.open.api.news.entity.CategoryData;
 import com.sxtvs.open.api.news.entity.YoumeiData;
@@ -22,13 +20,11 @@ import com.sxtvs.open.api.news.entity.YoumeiEsData;
 import com.sxtvs.open.api.news.entity.YoumeiOffset;
 import com.sxtvs.open.api.news.mapper.YoumeiDataMapper;
 import com.sxtvs.open.api.news.service.IYoumeiDataService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.core.es.EsClientPool;
 import com.sxtvs.open.core.sls.AliyunLogger;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -36,7 +32,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/news/service/impl/YoumeiOffsetServiceImpl.java

@@ -1,9 +1,9 @@
 package com.sxtvs.open.api.news.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.api.news.entity.YoumeiOffset;
 import com.sxtvs.open.api.news.mapper.YoumeiOffsetMapper;
 import com.sxtvs.open.api.news.service.IYoumeiOffsetService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/sxtvs/open/api/odata/controller/OauthRestController.java

@@ -1,9 +1,7 @@
 package com.sxtvs.open.api.odata.controller;
 
 import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSON;
 import com.sxtvs.open.api.odata.dto.RedirectDto;
-import com.sxtvs.open.api.odata.dto.weibo.WeiboCallbackDto;
 import com.sxtvs.open.api.odata.dto.wx.WxApiCreatePreAuthCodeResponse;
 import com.sxtvs.open.api.odata.entity.WxTicket;
 import com.sxtvs.open.api.odata.service.OauthService;
@@ -15,10 +13,8 @@ import com.sxtvs.open.core.advice.NoAPIResponse;
 import com.sxtvs.open.core.auth.HttpContextUtil;
 import com.sxtvs.open.core.auth.LoginRequired;
 import com.sxtvs.open.core.conf.Constant;
-import com.sxtvs.open.core.conf.OauthConfig;
 import com.sxtvs.open.core.sls.AliyunLogger;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/com/sxtvs/open/api/odata/entity/WbYmAccount.java

@@ -2,11 +2,12 @@ package com.sxtvs.open.api.odata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 

src/main/java/com/sxtvs/open/api/odata/mapper/WbYmAccountMapper.java

@@ -1,7 +1,7 @@
 package com.sxtvs.open.api.odata.mapper;
 
-import com.sxtvs.open.api.odata.entity.WbYmAccount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sxtvs.open.api.odata.entity.WbYmAccount;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/odata/service/IWbYmAccountService.java

@@ -1,7 +1,7 @@
 package com.sxtvs.open.api.odata.service;
 
-import com.sxtvs.open.api.odata.entity.WbYmAccount;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sxtvs.open.api.odata.entity.WbYmAccount;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/odata/service/OauthService.java

@@ -6,7 +6,6 @@ import com.sxtvs.open.api.odata.dto.wx.WxApiCreatePreAuthCodeRequest;
 import com.sxtvs.open.api.odata.dto.wx.WxApiCreatePreAuthCodeResponse;
 import com.sxtvs.open.api.youmei.service.YoumeiAccountServiceImpl;
 import com.sxtvs.open.core.conf.Constant;
-import com.sxtvs.open.core.conf.OauthConfig;
 import com.sxtvs.open.core.sls.AliyunLogger;
 import lombok.SneakyThrows;
 import org.apache.hc.client5.http.fluent.Request;

src/main/java/com/sxtvs/open/api/odata/service/WeiboAccountService.java

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sxtvs.open.api.odata.dao.WeiboAccountMapper;
 import com.sxtvs.open.api.odata.dto.weibo.WeiboAccessTokenResponse;
@@ -12,8 +11,6 @@ import com.sxtvs.open.api.odata.dto.weibo.WeiboCreateTask;
 import com.sxtvs.open.api.odata.dto.weibo.show.UserShowResponse;
 import com.sxtvs.open.api.odata.entity.WeiboAccount;
 import com.sxtvs.open.api.odata.entity.WeiboTask;
-import com.sxtvs.open.api.odata.dto.weibo.YMWeiboAccount;
-import com.sxtvs.open.api.youmei.service.YoumeiAccountServiceImpl;
 import com.sxtvs.open.core.conf.Constant;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/sxtvs/open/api/odata/service/impl/WbYmAccountServiceImpl.java

@@ -1,13 +1,13 @@
 package com.sxtvs.open.api.odata.service.impl;
 
 import cn.hutool.http.HttpUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sxtvs.open.api.odata.dto.weibo.YMWeiboAccount;
 import com.sxtvs.open.api.odata.entity.WbYmAccount;
 import com.sxtvs.open.api.odata.mapper.WbYmAccountMapper;
 import com.sxtvs.open.api.odata.service.IWbYmAccountService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sxtvs.open.api.odata.service.QrcodeLogServiceImpl;
 import com.sxtvs.open.api.youmei.service.YoumeiAccountServiceImpl;
 import jakarta.annotation.Resource;
@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.Map;
 
 /**

src/main/java/com/sxtvs/open/api/user/entity/User.java

@@ -2,14 +2,13 @@ package com.sxtvs.open.api.user.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *

src/main/java/com/sxtvs/open/api/user/mapper/UserMapper.java

@@ -1,7 +1,7 @@
 package com.sxtvs.open.api.user.mapper;
 
-import com.sxtvs.open.api.user.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sxtvs.open.api.user.entity.User;
 
 /**
  * <p>

src/main/java/com/sxtvs/open/api/user/service/IUserService.java

@@ -1,7 +1,7 @@
 package com.sxtvs.open.api.user.service;
 
-import com.sxtvs.open.api.user.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sxtvs.open.api.user.entity.User;
 
 /**
  * <p>

src/test/data-service.http

@@ -40,4 +40,28 @@ GET http://localhost/news/area/province
 GET http://localhost/news/area/city?pid=017
 
 ### 省市区
-GET http://localhost/news/area/list
+GET http://localhost/news/area/list
+
+
+### weixin授权
+GET http://localhost/oauth/weixin/code
+Authorization: 518180cdebf3630ab4ba0e88aa75d984
+
+
+### weibo授权
+GET http://localhost/oauth/weibo/code
+Authorization: 518180cdebf3630ab4ba0e88aa75d984
+
+###
+GET http://localhost/oauth/weibo/callback?state=GdZIBNTtwuZQk7Pgmi-aA&network_group_id=2113129
+
+
+###
+GET http://localhost/oauth/weixin/code
+Authorization: 518180cdebf3630ab4ba0e88aa75d984
+
+###
+GET http://localhost/oauth/bilibili/callback?code=059d2204ec734392a62bee0d038b60d3&state=0xn_I3jPqVjpqV_mJdGPv
+
+###
+GET http://localhost/oauth/weixin/code/v1

src/test/java/com/sxtvs/open/GenCode.java

@@ -34,8 +34,8 @@ public class GenCode {
 
     @Test
     public void genCodeSyjPc() {
-        FastAutoGenerator.create("jdbc:mysql://172.16.101.1:4000/youmei",
-                "root", "msstar")
+        FastAutoGenerator.create("jdbc:mysql://rm-2vc3039h858t9ab7sfo.mysql.cn-chengdu.rds.aliyuncs.com:3306/open",
+                "cxzx", "sxtvs53$68HD")
                 .globalConfig(builder -> {
                     builder.author("syj") // 设置作者
 //                            .fileOverride() // 覆盖已生成文件
@@ -43,12 +43,12 @@ public class GenCode {
                 })
                 .packageConfig(builder -> {
                     builder.parent("com.sxtvs.open.api") // 设置父包名
-                            .moduleName("news") // 设置父包模块名
+                            .moduleName("odata") // 设置父包模块名
                             .pathInfo(Collections.singletonMap(OutputFile.xml,
                                     "D:\\dev\\java\\open\\src\\main\\resources\\com\\sxtvs")); // 设置mapperXml生成路径
                 })
                 .strategyConfig(builder -> {
-                    builder.addInclude("area"); // 设置需要生成的表名
+                    builder.addInclude("wb_ym_account"); // 设置需要生成的表名
                     builder.controllerBuilder().enableRestStyle();
                     builder.entityBuilder().enableLombok();
                 })