基金数据由直连库改为feign调用

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoNew.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoResp.java

@@ -20,9 +20,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel(description = "用户信息 圈子使用")
-public class UserInfoNew implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class UserInfoResp {
 
     @ApiModelProperty("主页等级 1普通主页 2首席投顾主页 3机构主页")
     private Integer personalCenterType;

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fund/FundCompanySimpleVO.java

+package com.tanpu.community.api.beans.vo.feign.fund;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description:
+ * @author: zejia zj wu
+ * @create: 2021-07-29 10:16
+ **/
+@ApiModel("基金公司信息 社区专用 ")
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Data
+public class FundCompanySimpleVO {
+
+    @ApiModelProperty(value="公司成立日期")
+    private Long establishDate;
+
+    @ApiModelProperty(value="备案编码")
+    private String registerNumber;
+
+    @ApiModelProperty(value="基金数量")
+    private Integer fundCount;
+}

community-service/src/main/java/com/tanpu/community/config/FeignConfiguration.java

+package com.tanpu.community.config;
+
+import feign.Logger;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @description:
+ * @author: zejia zj wu
+ * @create: 2021-07-23 19:48
+ **/
+@Configuration
+public class FeignConfiguration {
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        //这里记录所有，根据实际情况选择合适的日志level
+        return Logger.Level.FULL;
+    }
+}

community-service/src/main/java/com/tanpu/community/controller/HomePageController.java

@@ -11,8 +11,8 @@ import com.tanpu.community.api.beans.req.homepage.QueryRecordThemeReq;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.resp.Customer;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.manager.HomePageManager;
 import com.tanpu.community.manager.ThemeManager;
 import io.swagger.annotations.ApiImplicitParam;
@@ -45,9 +45,9 @@ public class HomePageController {
     @ApiOperation(value = "个人中心 查询")
     @GetMapping(value = "/queryUserInfoNew")
     @AuthLogin
-    public CommonResp<UserInfoNew> queryUsersListNew(@RequestParam(value = "userId", required = false) String userId) {
+    public CommonResp<UserInfoResp> queryUsersListNew(@RequestParam(value = "userId", required = false) String userId) {
         String userIdMyself = userHolder.getUserId();
-        return CommonResp.success(homePageManager.queryUsersListNew(userIdMyself, userId));
+        return CommonResp.success(homePageManager.queryUsersInfo(userIdMyself, userId));
     }
 
     // 理财师客户列表查询 (供圈子服务调用)

community-service/src/main/java/com/tanpu/community/dao/FundDataSourceConfig.java

-package com.tanpu.community.dao;
-
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.tanpu.community.api.CommunityConstant;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-
-import javax.sql.DataSource;
-
-/**
- * created by xd on 2021/6/3
- */
-@Configuration
-@Slf4j
-@MapperScan(basePackages = CommunityConstant.PACKAGE_BASE + ".dao.mapper.fund", sqlSessionTemplateRef = "fundSqlSessionTemplate")
-public class FundDataSourceConfig {
-    @ConfigurationProperties(prefix = "spring.datasource.fund")
-    @Bean(name = "fundDataSource")
-    public DataSource dataSource() {
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "fundSqlSessionFactory")
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("fundDataSource") DataSource dataSource) throws Exception {
-        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
-
-        bean.setDataSource(dataSource);
-        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(
-                "classpath*:mapper/fund/*.xml"));
-
-        return bean.getObject();
-    }
-
-    @Bean(name = "fundTransactionManager")
-    public DataSourceTransactionManager fundTransactionManager(@Qualifier("fundDataSource") DataSource dataSource) {
-        return new DataSourceTransactionManager(dataSource);
-    }
-
-    @Bean(name = "fundSqlSessionTemplate")
-    public SqlSessionTemplate fundSqlSessionTemplate(@Qualifier("fundSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
-        return new SqlSessionTemplate(sqlSessionFactory);
-    }
-}

community-service/src/main/java/com/tanpu/community/dao/JydbDataSourceConfig.java

-package com.tanpu.community.dao;
-
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.tanpu.community.api.CommunityConstant;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-
-import javax.sql.DataSource;
-
-/**
- * created by xd on 2021/6/3
- */
-@Configuration
-@Slf4j
-@MapperScan(basePackages = CommunityConstant.PACKAGE_BASE + ".dao.mapper.jydb", sqlSessionTemplateRef = "jydbSqlSessionTemplate")
-public class JydbDataSourceConfig {
-    @ConfigurationProperties(prefix = "spring.datasource.jydb")
-    @Bean(name = "jydbDataSource")
-    public DataSource dataSource() {
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "jydbSqlSessionFactory")
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("jydbDataSource") DataSource dataSource) throws Exception {
-        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
-
-        bean.setDataSource(dataSource);
-        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(
-                "classpath*:mapper/jydb/*.xml"));
-
-        return bean.getObject();
-    }
-
-    @Bean(name = "jydbTransactionManager")
-    public DataSourceTransactionManager jydbTransactionManager(@Qualifier("jydbDataSource") DataSource dataSource) {
-        return new DataSourceTransactionManager(dataSource);
-    }
-
-    @Bean(name = "jydbSqlSessionTemplate")
-    public SqlSessionTemplate jydbSqlSessionTemplate(@Qualifier("jydbSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
-        return new SqlSessionTemplate(sqlSessionFactory);
-    }
-}

community-service/src/main/java/com/tanpu/community/dao/entity/jydb/MfInvestadvisoroutline.java

-package com.tanpu.community.dao.entity.jydb;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Builder;
-import lombok.Data;
-
-@ApiModel(value="com-tanpu-community-dao-entity-jydb-MfInvestadvisoroutline")
-@Data
-@Builder
-@TableName(value = "mf_investadvisoroutline")
-public class MfInvestadvisoroutline implements Serializable {
-    /**
-     * ID
-     */
-    @TableField(value = "ID")
-    @ApiModelProperty(value="ID")
-    private Long id;
-
-    /**
-     * 基金公司代码
-     */
-    @TableField(value = "InvestAdvisorCode")
-    @ApiModelProperty(value="基金公司代码")
-    private Integer investadvisorcode;
-
-    /**
-     * 基金管理人名称
-     */
-    @TableField(value = "InvestAdvisorName")
-    @ApiModelProperty(value="基金管理人名称")
-    private String investadvisorname;
-
-    /**
-     * 基金管理人简称
-     */
-    @TableField(value = "InvestAdvisorAbbrName")
-    @ApiModelProperty(value="基金管理人简称")
-    private String investadvisorabbrname;
-
-    /**
-     * 法人代表
-     */
-    @TableField(value = "LegalRepr")
-    @ApiModelProperty(value="法人代表")
-    private String legalrepr;
-
-    /**
-     * 总经理
-     */
-    @TableField(value = "GeneralManager")
-    @ApiModelProperty(value="总经理")
-    private String generalmanager;
-
-    /**
-     * 公司成立日期
-     */
-    @TableField(value = "EstablishmentDate")
-    @ApiModelProperty(value="公司成立日期")
-    private Date establishmentdate;
-
-    /**
-     * 组织形式
-     */
-    @TableField(value = "OrganizationForm")
-    @ApiModelProperty(value="组织形式")
-    private String organizationform;
-
-    /**
-     * 注册资本(元)
-     */
-    @TableField(value = "RegCapital")
-    @ApiModelProperty(value="注册资本(元)")
-    private BigDecimal regcapital;
-
-    /**
-     * 公司注册地址
-     */
-    @TableField(value = "RegAddr")
-    @ApiModelProperty(value="公司注册地址")
-    private String regaddr;
-
-    /**
-     * 公司办公地址
-     */
-    @TableField(value = "OfficeAddr")
-    @ApiModelProperty(value="公司办公地址")
-    private String officeaddr;
-
-    /**
-     * 邮编
-     */
-    @TableField(value = "ZipCode")
-    @ApiModelProperty(value="邮编")
-    private String zipcode;
-
-    /**
-     * 邮箱
-     */
-    @TableField(value = "Email")
-    @ApiModelProperty(value="邮箱")
-    private String email;
-
-    /**
-     * 公司联系地址
-     */
-    @TableField(value = "ContactAddr")
-    @ApiModelProperty(value="公司联系地址")
-    private String contactaddr;
-
-    /**
-     * 电话
-     */
-    @TableField(value = "Tel")
-    @ApiModelProperty(value="电话")
-    private String tel;
-
-    /**
-     * 传真
-     */
-    @TableField(value = "Fax")
-    @ApiModelProperty(value="传真")
-    private String fax;
-
-    /**
-     * 公司网址
-     */
-    @TableField(value = "WebSite")
-    @ApiModelProperty(value="公司网址")
-    private String website;
-
-    /**
-     * 联系人
-     */
-    @TableField(value = "LinkMan")
-    @ApiModelProperty(value="联系人")
-    private String linkman;
-
-    /**
-     * 简历
-     */
-    @TableField(value = "Background")
-    @ApiModelProperty(value="简历")
-    private String background;
-
-    /**
-     * 所属地区
-     */
-    @TableField(value = "Region")
-    @ApiModelProperty(value="所属地区")
-    private Integer region;
-
-    /**
-     * 修改日期
-     */
-    @TableField(value = "XGRQ")
-    @ApiModelProperty(value="修改日期")
-    private Date xgrq;
-
-    /**
-     * JSID
-     */
-    @TableField(value = "JSID")
-    @ApiModelProperty(value="JSID")
-    private Long jsid;
-
-    /**
-     * 客服热线
-     */
-    @TableField(value = "ServiceLine")
-    @ApiModelProperty(value="客服热线")
-    private String serviceline;
-
-    /**
-     * 存续截止日
-     */
-    @TableField(value = "MaturityEndDate")
-    @ApiModelProperty(value="存续截止日")
-    private Date maturityenddate;
-
-    /**
-     * 注册登记代码
-     */
-    @TableField(value = "TACode")
-    @ApiModelProperty(value="注册登记代码")
-    private String tacode;
-
-    /**
-     * 证监会标识码
-     */
-    @TableField(value = "CSRCCode")
-    @ApiModelProperty(value="证监会标识码")
-    private String csrccode;
-
-    private static final long serialVersionUID = 1L;
-
-    public static final String COL_ID = "ID";
-
-    public static final String COL_INVESTADVISORCODE = "InvestAdvisorCode";
-
-    public static final String COL_INVESTADVISORNAME = "InvestAdvisorName";
-
-    public static final String COL_INVESTADVISORABBRNAME = "InvestAdvisorAbbrName";
-
-    public static final String COL_LEGALREPR = "LegalRepr";
-
-    public static final String COL_GENERALMANAGER = "GeneralManager";
-
-    public static final String COL_ESTABLISHMENTDATE = "EstablishmentDate";
-
-    public static final String COL_ORGANIZATIONFORM = "OrganizationForm";
-
-    public static final String COL_REGCAPITAL = "RegCapital";
-
-    public static final String COL_REGADDR = "RegAddr";
-
-    public static final String COL_OFFICEADDR = "OfficeAddr";
-
-    public static final String COL_ZIPCODE = "ZipCode";
-
-    public static final String COL_EMAIL = "Email";
-
-    public static final String COL_CONTACTADDR = "ContactAddr";
-
-    public static final String COL_TEL = "Tel";
-
-    public static final String COL_FAX = "Fax";
-
-    public static final String COL_WEBSITE = "WebSite";
-
-    public static final String COL_LINKMAN = "LinkMan";
-
-    public static final String COL_BACKGROUND = "Background";
-
-    public static final String COL_REGION = "Region";
-
-    public static final String COL_XGRQ = "XGRQ";
-
-    public static final String COL_JSID = "JSID";
-
-    public static final String COL_SERVICELINE = "ServiceLine";
-
-    public static final String COL_MATURITYENDDATE = "MaturityEndDate";
-
-    public static final String COL_TACODE = "TACode";
-
-    public static final String COL_CSRCCODE = "CSRCCode";
-}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/dao/mapper/fund/CompanyInfoMapper.java

-package com.tanpu.community.dao.mapper.fund;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.community.dao.entity.fund.CompanyInfo;
-
-public interface CompanyInfoMapper extends BaseMapper<CompanyInfo> {
-}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/dao/mapper/fund/FundInfoMapper.java

-package com.tanpu.community.dao.mapper.fund;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.community.dao.entity.fund.FundInfo;
-
-public interface FundInfoMapper extends BaseMapper<FundInfo> {
-}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/dao/mapper/jydb/MfAdvisorscalerankMapper.java

-package com.tanpu.community.dao.mapper.jydb;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.community.dao.entity.jydb.MfAdvisorscalerank;
-
-public interface MfAdvisorscalerankMapper extends BaseMapper<MfAdvisorscalerank> {
-}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/dao/mapper/jydb/MfInvestadvisoroutlineMapper.java

-package com.tanpu.community.dao.mapper.jydb;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.community.dao.entity.jydb.MfInvestadvisoroutline;
-
-public interface MfInvestadvisoroutlineMapper extends BaseMapper<MfInvestadvisoroutline> {
-}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java

@@ -4,11 +4,12 @@ import com.tanpu.common.api.CommonResp;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
 import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
+import com.tanpu.community.config.FeignConfiguration;
 import com.tanpu.community.feign.diagnose.FeignBackClientForDiagnose;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -44,11 +45,11 @@ public interface FeignClientForFatools {
     // 用户信息查询 (供圈子服务调用)
     @ApiOperation(value = "查询用户信息")
     @GetMapping(value = "/queryUserInfoNew")
-    CommonResp<UserInfoNew> queryUsersListNew(@RequestParam("userId") String userId);
+    CommonResp<UserInfoResp> queryUsersListNew(@RequestParam("userId") String userId);
 
     @ApiOperation(value = "批量查询查询基本信息")
     @GetMapping(value = "/queryUserBaseInfoList")
-    List<UserInfoNew> queryUserListNew(@RequestParam("userIds") List<String> userIds);
+    List<UserInfoResp> queryUserListNew(@RequestParam("userIds") List<String> userIds);
 
     @ApiOperation(value = "根据机构用户id 查询旗下机构用户信息")
     @GetMapping(value = "/getUsetInfoByOrgUserId")

community-service/src/main/java/com/tanpu/community/feign/fatools/FeignbackForFatools.java

@@ -4,9 +4,9 @@ import com.tanpu.common.api.CommonResp;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
 import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
 import feign.hystrix.FallbackFactory;
@@ -50,13 +50,13 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
             }
 
             @Override
-            public CommonResp<UserInfoNew> queryUsersListNew(String userId) {
+            public CommonResp<UserInfoResp> queryUsersListNew(String userId) {
                 log.info("FeignbackForFatools.queryUsersListNew", throwable);
                 return CommonResp.error();
             }
 
             @Override
-            public List<UserInfoNew> queryUserListNew(List<String> userIds) {
+            public List<UserInfoResp> queryUserListNew(List<String> userIds) {
                 log.info("FeignbackForFatools.queryUserListNew", throwable);
                 return Collections.emptyList();
             }

community-service/src/main/java/com/tanpu/community/feign/fund/FeignClientForFund.java

+package com.tanpu.community.feign.fund;
+
+import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
+import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
+import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
+import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
+import com.tanpu.community.config.FeignConfiguration;
+import com.tanpu.community.feign.fatools.FeignbackForFatools;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@FeignClient(value = "service-fund", fallbackFactory = FeignbackForFund.class, url = "http://tp-fund-svc", path = "/fund")
+//@FeignClient(value = "service-fund",configuration = FeignConfiguration.class, fallbackFactory = FeignbackForFund.class,url = "http://127.0.0.1:8199/fund", path = "/fund")
+public interface FeignClientForFund {
+
+    @ApiOperation("基金公司-简单信息")
+    @GetMapping("/fund/companyInfoSimple")
+    CommonResp<FundCompanySimpleVO> getFundCompanyInfoSimple(@ApiParam("基金公司id") @RequestParam("id") String id);
+
+    @ApiOperation("私募类型基金公司-持有产品数")
+    @GetMapping("/fund/companyFundCount")
+    CommonResp<FundCompanySimpleVO> getCompanyFundCount(@ApiParam("基金公司id") @RequestParam("id") String id);
+}

community-service/src/main/java/com/tanpu/community/feign/fund/FeignbackForFund.java

+package com.tanpu.community.feign.fund;
+
+import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class FeignbackForFund implements FallbackFactory<FeignClientForFund> {
+
+    @Override
+    public FeignClientForFund create(Throwable throwable) {
+        return new FeignClientForFund() {
+            @Override
+            public CommonResp<FundCompanySimpleVO> getFundCompanyInfoSimple(String id) {
+                log.info("FeignbackForFund.getFundCompanyInfoSimple 调用失败 id:{}", id);
+                log.error("FeignbackForFund.getFundCompanyInfoSimple 调用失败", throwable);
+                return CommonResp.error();
+            }
+
+            @Override
+            public CommonResp<FundCompanySimpleVO> getCompanyFundCount(String id) {
+                log.info("FeignbackForFund.getCompanyFundCount 调用失败 id:{}", id);
+                log.error("FeignbackForFund.getCompanyFundCount 调用失败", throwable);
+                return CommonResp.error();
+            }
+        };
+    }
+
+}

community-service/src/main/java/com/tanpu/community/feign/publicFund/FeignClientForPublicFund.java

+package com.tanpu.community.feign.publicFund;
+
+import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = "service-fundpublic", fallbackFactory = FeignbackForPublicFund.class, url = "http://tp-fundpublic-svc", path = "/fundpublic")
+//@FeignClient(value = "service-fundpublic",configuration = FeignConfiguration.class, fallbackFactory = FeignbackForPublicFund.class,url = "http://127.0.0.1:8200/fundpublic", path = "/fundpublic")
+public interface FeignClientForPublicFund {
+
+    @ApiOperation("基金公司-简单信息")
+    @GetMapping("/publicFund/companyInfoSimple")
+    CommonResp<FundCompanySimpleVO> getFundCompanyInfoSimple(@ApiParam("基金公司id") @RequestParam("id") String id);
+
+    @ApiOperation("私募类型基金公司-持有产品数")
+    @GetMapping("/publicFund/companyFundCount")
+    CommonResp<FundCompanySimpleVO> getCompanyFundCount(@ApiParam("基金公司id") @RequestParam("id") String id);
+
+}

community-service/src/main/java/com/tanpu/community/feign/publicFund/FeignbackForPublicFund.java

+package com.tanpu.community.feign.publicFund;
+
+import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
+import com.tanpu.community.feign.fund.FeignClientForFund;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class FeignbackForPublicFund implements FallbackFactory<FeignClientForPublicFund> {
+
+    @Override
+    public FeignClientForPublicFund create(Throwable throwable) {
+        return new FeignClientForPublicFund() {
+            @Override
+            public CommonResp<FundCompanySimpleVO> getFundCompanyInfoSimple(String id) {
+                log.info("FeignClientForPublicFund.getFundCompanyInfoSimple 调用失败 id:{}", id);
+                log.error("FeignClientForPublicFund.getFundCompanyInfoSimple 调用失败", throwable);
+                return CommonResp.error();
+            }
+
+            @Override
+            public CommonResp<FundCompanySimpleVO> getCompanyFundCount(String id) {
+                log.info("FeignClientForPublicFund.getCompanyFundCount 调用失败 id:{}", id);
+                log.error("FeignClientForPublicFund.getCompanyFundCount 调用失败", throwable);
+                return CommonResp.error();
+            }
+        };
+    }
+
+}

community-service/src/main/java/com/tanpu/community/manager/CommentManager.java

@@ -6,7 +6,7 @@ import com.tanpu.community.api.beans.qo.CommentQo;
 import com.tanpu.community.api.beans.req.comment.CreateCommentReq;
 import com.tanpu.community.api.beans.req.comment.LikeCommentReq;
 import com.tanpu.community.api.beans.req.comment.ReportCommentReq;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.enums.CollectionTypeEnum;
 import com.tanpu.community.api.enums.CommentTypeEnum;
 import com.tanpu.community.api.enums.OperationTypeEnum;
@@ -74,8 +74,8 @@ public class CommentManager {
         for (CommentQo commentQo : commentQos) {
             //查询用户信息
             String authorId = commentQo.getAuthorId();
-            UserInfoNew userInfo = redisCache.getObject(StringUtils.joinWith("_", CACHE_FEIGN_USER_INFO, authorId),
-                    60 * 10, () ->this.getUserInfo(authorId) , UserInfoNew.class);
+            UserInfoResp userInfo = redisCache.getObject(StringUtils.joinWith("_", CACHE_FEIGN_USER_INFO, authorId),
+                    60 * 10, () ->this.getUserInfo(authorId) , UserInfoResp.class);
             if (userInfo != null) {
                 commentQo.setUserImg(userInfo.getHeadImageUrl());
                 commentQo.setNickName(userInfo.getNickName());
@@ -98,8 +98,8 @@ public class CommentManager {
                 .collect(Collectors.toList());
     }
 
-    private UserInfoNew getUserInfo(String authorId){
-        CommonResp<UserInfoNew> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(authorId);
+    private UserInfoResp getUserInfo(String authorId){
+        CommonResp<UserInfoResp> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(authorId);
         if (userInfoNewCommonResp.isNotSuccess()) {
             throw new BizException("内部接口调用失败");
         }

community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java

@@ -10,23 +10,18 @@ import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.resp.Customer;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
+import com.tanpu.community.api.beans.vo.feign.fund.FundCompanySimpleVO;
 import com.tanpu.community.api.enums.*;
 import com.tanpu.community.dao.entity.community.FollowRelEntity;
-import com.tanpu.community.dao.entity.fund.CompanyInfo;
-import com.tanpu.community.dao.entity.fund.FundInfo;
-import com.tanpu.community.dao.entity.jydb.MfAdvisorscalerank;
-import com.tanpu.community.dao.entity.jydb.MfInvestadvisoroutline;
 import com.tanpu.community.dao.mapper.community.FollowRelMapper;
-import com.tanpu.community.dao.mapper.fund.CompanyInfoMapper;
-import com.tanpu.community.dao.mapper.fund.FundInfoMapper;
-import com.tanpu.community.dao.mapper.jydb.MfAdvisorscalerankMapper;
-import com.tanpu.community.dao.mapper.jydb.MfInvestadvisoroutlineMapper;
 import com.tanpu.community.feign.course.FeignClientForCourse;
 import com.tanpu.community.feign.diagnose.FeignClientForDiagnose;
 import com.tanpu.community.feign.fatools.FeignClientForFatools;
+import com.tanpu.community.feign.fund.FeignClientForFund;
+import com.tanpu.community.feign.publicFund.FeignClientForPublicFund;
 import com.tanpu.community.service.FollowRelService;
 import com.tanpu.community.util.ConvertUtil;
 import com.tanpu.community.util.PageUtils;
@@ -50,23 +45,19 @@ public class HomePageManager {
     @Resource
     private FollowRelMapper followRelMapper;
     @Resource
-    private MfInvestadvisoroutlineMapper mfInvestadvisoroutlineMapper;
-    @Resource
-    private MfAdvisorscalerankMapper mfAdvisorscalerankMapper;
-    @Resource
-    private CompanyInfoMapper companyInfoMapper;
-    @Resource
-    private FundInfoMapper fundInfoMapper;
-    @Resource
     private FeignClientForDiagnose feignClientForDiagnose;
     @Resource
     private FeignClientForCourse feignClientForCourse;
+    @Resource
+    private FeignClientForFund feignClientForFund;
+    @Resource
+    private FeignClientForPublicFund feignClientForPublicFund;
 
     //查询 个人中心 相关信息
-    public UserInfoNew queryUsersListNew(String userIdMyself, String userId) {
-        CommonResp<UserInfoNew> queryUsersListNew = feignClientForFatools.queryUsersListNew(StringUtils.isNotBlank(userId) ? userId : userIdMyself);
+    public UserInfoResp queryUsersInfo(String userIdMyself, String userId) {
+        CommonResp<UserInfoResp> queryUsersListNew = feignClientForFatools.queryUsersListNew(StringUtils.isNotBlank(userId) ? userId : userIdMyself);
         if (queryUsersListNew.isNotSuccess() || !ObjectUtils.anyNotNull(queryUsersListNew.getData())) throw new BizException("内部接口调用失败");
-        UserInfoNew userInfoNew = queryUsersListNew.getData();
+        UserInfoResp userInfoNew = queryUsersListNew.getData();
 
         if (StringUtils.isNotBlank(userId) && !StringUtils.equals(userIdMyself, userId)) { //查询别人的个人主页
             // 关注 按钮的显示逻辑
@@ -105,28 +96,28 @@ public class HomePageManager {
             // 机构账号
             userInfoNew.setPersonalCenterType(PersonalCenterTypeEnum.ORG.getCode());
             if (FundCompanyTypeEnum.PUBLIC.getCode() == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())) { // 公募
-                //设置 基金数
-                MfAdvisorscalerank mfAdvisorscalerank = mfAdvisorscalerankMapper.selectOne(new LambdaQueryWrapper<MfAdvisorscalerank>()
-                        .eq(MfAdvisorscalerank::getInvestadvisorcode, userInfoNew.getUserInfoNewOrg().getBelongOrgId())
-                        .last("limit 1"));
-                userInfoNew.setFundNumber(ObjectUtils.anyNotNull(mfAdvisorscalerank) ? mfAdvisorscalerank.getTotalfundn() : 0);
-                //设置成立时间 和 备案编号(公募没有备案编号)
-                MfInvestadvisoroutline mfInvestadvisoroutline = mfInvestadvisoroutlineMapper.selectOne(new LambdaQueryWrapper<MfInvestadvisoroutline>()
-                        .eq(MfInvestadvisoroutline::getInvestadvisorcode, userInfoNew.getUserInfoNewOrg().getBelongOrgId())
-                        .last("limit 1"));
-                userInfoNew.setFounded(ObjectUtils.anyNotNull(mfInvestadvisoroutline) ? mfInvestadvisoroutline.getEstablishmentdate().getTime() : null);
+                // 设置 基金数
+                CommonResp<FundCompanySimpleVO> companyFundCount = feignClientForPublicFund.getCompanyFundCount(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
+                userInfoNew.setFundNumber(companyFundCount.isSuccess() ? companyFundCount.getData().getFundCount() : 0);
+                // 设置成立时间 和 备案编号(公募没有备案编号)
+                CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignClientForPublicFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
+                if (fundCompanyInfoSimple.isSuccess()) {
+                    FundCompanySimpleVO data = fundCompanyInfoSimple.getData();
+                    userInfoNew.setFounded(data.getEstablishDate());
+                    userInfoNew.setRecordNumber(data.getRegisterNumber());
+                }
             }
             if (FundCompanyTypeEnum.PRIVATE.getCode() == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())) { // 私募
-                //设置 基金数
-                Integer integer = fundInfoMapper.selectCount(new LambdaQueryWrapper<FundInfo>().eq(FundInfo::getTrustId, userInfoNew.getUserInfoNewOrg().getBelongOrgId()));
-                userInfoNew.setFundNumber(integer);
-
-                //设置成立时间 和 备案编号
-                CompanyInfo companyInfo = companyInfoMapper.selectById(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
-                if (ObjectUtils.anyNotNull(companyInfo)) {
-                    userInfoNew.setFounded(companyInfo.getEstablishDate().getTime());
-                    userInfoNew.setRecordNumber(companyInfo.getRegisterNumber());
+                // 设置成立时间 和 备案编号
+                CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignClientForFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
+                if (fundCompanyInfoSimple.isSuccess()) {
+                    FundCompanySimpleVO data = fundCompanyInfoSimple.getData();
+                    userInfoNew.setFounded(data.getEstablishDate());
+                    userInfoNew.setRecordNumber(data.getRegisterNumber());
                 }
+                // 设置 基金数
+                CommonResp<FundCompanySimpleVO> companyFundCount = feignClientForFund.getCompanyFundCount(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
+                userInfoNew.setFundNumber(companyFundCount.isSuccess() ? companyFundCount.getData().getFundCount() : 0);
             }
             //设置团队成员
             CommonResp<List<UserInfoOrg>> usetInfoByOrgUserId = feignClientForFatools.getUsetInfoByOrgUserId(userId);
@@ -162,7 +153,7 @@ public class HomePageManager {
 
     }
 
-    private void getFansNUmAndFollowNum(UserInfoNew userInfoNew) {
+    private void getFansNUmAndFollowNum(UserInfoResp userInfoNew) {
         Integer fansNumber = followRelMapper.selectCount(new LambdaQueryWrapper<FollowRelEntity>().eq(FollowRelEntity::getFollowUserId, userInfoNew.getUserId())
                 .eq(FollowRelEntity::getDeleteTag, BizStatus.DeleteTag.tag_init));
         Integer followNumber = followRelMapper.selectCount(new LambdaQueryWrapper<FollowRelEntity>().eq(FollowRelEntity::getFollowerId, userInfoNew.getUserId())
@@ -185,7 +176,7 @@ public class HomePageManager {
                 followRelService.queryFansByIdolId(req.getUserId()) : followRelService.queryFansByFollowerId(req.getUserId());
         List<FollowQo> followQos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(userIds)) {
-            List<UserInfoNew> userInfoNews = feignClientForFatools.queryUserListNew(userIds);
+            List<UserInfoResp> userInfoNews = feignClientForFatools.queryUserListNew(userIds);
             List<FollowQo> collect = userInfoNews.stream().map(ConvertUtil::userInfoNew2FollowQo).collect(Collectors.toList());
             followQos = judgeFollowed(collect, userId);
         }

community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java

@@ -13,7 +13,7 @@ import com.tanpu.community.api.beans.req.theme.*;
 import com.tanpu.community.api.beans.resp.CreateThemeResp;
 import com.tanpu.community.api.beans.resp.ThemeFullSearchResp;
 import com.tanpu.community.api.beans.resp.ThemeListResp;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.enums.*;
 import com.tanpu.community.cache.RedisCache;
 import com.tanpu.community.dao.entity.community.*;
@@ -480,8 +480,8 @@ public class ThemeManager {
         //评论列表
         List<CommentEntity> commentEntities = commentService.queryCommentsByUserId(req.getUserId(), req.getLastId(), req.getPageSize());
         //当前用户信息
-        UserInfoNew userInfo = redisCache.getObject(StringUtils.joinWith(CACHE_FEIGN_USER_INFO, req.getUserId()),
-                60 * 10, () -> this.getUserInfo(req.getUserId()), UserInfoNew.class);
+        UserInfoResp userInfo = redisCache.getObject(StringUtils.joinWith(CACHE_FEIGN_USER_INFO, req.getUserId()),
+                60 * 10, () -> this.getUserInfo(req.getUserId()), UserInfoResp.class);
         Set<String> replyThemeIds = commentEntities.stream().map(CommentEntity::getThemeId).collect(Collectors.toSet());
         if (CollectionUtils.isEmpty(replyThemeIds)) {
             return commentThemeList;
@@ -530,8 +530,8 @@ public class ThemeManager {
     }
 
 
-    private UserInfoNew getUserInfo(String authorId) {
-        CommonResp<UserInfoNew> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(authorId);
+    private UserInfoResp getUserInfo(String authorId) {
+        CommonResp<UserInfoResp> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(authorId);
         if (userInfoNewCommonResp.isNotSuccess()) {
             throw new BizException("内部接口调用失败");
         }

community-service/src/main/java/com/tanpu/community/service/BatchFeignCallService.java

@@ -11,7 +11,7 @@ import com.tanpu.community.api.beans.qo.ThemeQo;
 import com.tanpu.community.api.beans.vo.ImagesDTO;
 import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp;
 import com.tanpu.community.api.beans.vo.feign.product.ProductInfoVO;
 import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp;
@@ -97,7 +97,7 @@ public class BatchFeignCallService {
         // 话题标题
         Map<String, String> topicMap = Maps.newHashMap();
         // 图片信息
-        Map<String, UserInfoNew> userMap = Maps.newHashMap();
+        Map<String, UserInfoResp> userMap = Maps.newHashMap();
         // 批量查询资源信息
         this.getResInfo(shortVideoMap, curriculumMap, courseMap, zhiboMap, fundMap, imgMap, topicMap, userMap, themeQos);
         //逐个装入
@@ -121,7 +121,7 @@ public class BatchFeignCallService {
                             Map<String, FundInfoBaseResp> fundMap,
                             Map<String, FileRecordEntity> imgMap,
                             Map<String, String> topicMap,
-                            Map<String, UserInfoNew> userMap,
+                            Map<String, UserInfoResp> userMap,
                             List<ThemeQo> themeQos
     ) {
         // 白名单基金id
@@ -242,10 +242,10 @@ public class BatchFeignCallService {
         }
         if (!CollectionUtils.isEmpty(userIds)) {
             // 查询用户信息
-            List<UserInfoNew> queryUsersListNew = feignClientForFatools.queryUserListNew(setToList(userIds));
+            List<UserInfoResp> queryUsersListNew = feignClientForFatools.queryUserListNew(setToList(userIds));
             if (!CollectionUtils.isEmpty(userIds)) {
                 userMap.putAll(queryUsersListNew.stream().collect(Collectors
-                        .toMap(UserInfoNew::getUserId, o -> o)));
+                        .toMap(UserInfoResp::getUserId, o -> o)));
             }
 
         }
@@ -373,7 +373,7 @@ public class BatchFeignCallService {
                             Map<String, ZhiboListResp> zhiboMap,
                             Map<String, FundInfoBaseResp> fundMap,
                             Map<String, FileRecordEntity> imgUrlMap,
-                            Map<String, UserInfoNew> userMap,
+                            Map<String, UserInfoResp> userMap,
                             Map<String, String> topicMap) {
         for (ThemeQo themeQo : themeQos) {
             if (!StringUtils.isEmpty(themeQo.getTopicId()) && topicMap.containsKey(themeQo.getTopicId())) {
@@ -382,7 +382,7 @@ public class BatchFeignCallService {
             }
             if (!StringUtils.isEmpty(themeQo.getAuthorId()) && userMap.containsKey(themeQo.getAuthorId())) {
                 //用户信息
-                UserInfoNew userInfo = userMap.get(themeQo.getAuthorId());
+                UserInfoResp userInfo = userMap.get(themeQo.getAuthorId());
                 //昵称头像简介
                 themeQo.setNickName(userInfo.getNickName());
                 themeQo.setUserImg(userInfo.getHeadImageUrl());

community-service/src/main/java/com/tanpu/community/service/FeignService.java

@@ -2,7 +2,7 @@ package com.tanpu.community.service;
 
 import com.tanpu.common.api.CommonResp;
 import com.tanpu.common.exception.BizException;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.feign.fatools.FeignClientForFatools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,8 +13,8 @@ public class FeignService {
     @Autowired
     private FeignClientForFatools fatools;
 
-    public UserInfoNew getUserInfoById(String userId) {
-        CommonResp<UserInfoNew> userInfoNewCommonResp = fatools.queryUsersListNew(userId);
+    public UserInfoResp getUserInfoById(String userId) {
+        CommonResp<UserInfoResp> userInfoNewCommonResp = fatools.queryUsersListNew(userId);
         if (userInfoNewCommonResp.isNotSuccess()) {
             throw new BizException("内部接口调用失败");
         }

community-service/src/main/java/com/tanpu/community/service/RankService.java

@@ -2,7 +2,7 @@ package com.tanpu.community.service;
 
 import com.tanpu.community.api.beans.qo.ThemeAnalysDO;
 import com.tanpu.community.api.beans.qo.TopicRankQo;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.enums.CollectionTypeEnum;
 import com.tanpu.community.api.enums.TopicStatusEnum;
 import com.tanpu.community.api.enums.VisitTypeEnum;
@@ -78,8 +78,8 @@ public class RankService {
             theme.setViewCount(visitCountMap.getOrDefault(themeId,0));
             //查询用户质量
             String authorId = theme.getAuthorId();
-            UserInfoNew authorInfo = redisCache.getObject(StringUtils.joinWith(CACHE_FEIGN_USER_INFO, authorId),
-                    60 * 10, () -> feignService.getUserInfoById(authorId), UserInfoNew.class);
+            UserInfoResp authorInfo = redisCache.getObject(StringUtils.joinWith(CACHE_FEIGN_USER_INFO, authorId),
+                    60 * 10, () -> feignService.getUserInfoById(authorId), UserInfoResp.class);
             if (authorInfo == null || authorInfo.getLevelGrade() == null) {
                 theme.setUserWeight(0.0);
             } else {

community-service/src/main/java/com/tanpu/community/util/ConvertUtil.java

@@ -8,7 +8,7 @@ import com.tanpu.community.api.beans.req.theme.ThemeContentReq;
 import com.tanpu.community.api.beans.resp.FileUploadResp;
 import com.tanpu.community.api.beans.vo.ImagesDTO;
 import com.tanpu.community.api.beans.vo.KafkaDurationUptMsg;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.enums.DeleteTagEnum;
 import com.tanpu.community.api.enums.RelTypeEnum;
 import com.tanpu.community.api.enums.TopicStatusEnum;
@@ -183,7 +183,7 @@ public class ConvertUtil {
     }
 
 
-    public static FollowQo userInfoNew2FollowQo(UserInfoNew entity) {
+    public static FollowQo userInfoNew2FollowQo(UserInfoResp entity) {
         if (entity == null) {
             return null;
         }

community-service/src/main/resources/application-dev.yml

@@ -29,22 +29,6 @@ spring.datasource:
     maxActive: 2
     minIdle: 2
     initialSize: 2
-  jydb:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://47.101.189.151:31931/jydb?autoReconnect=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
-    username: dev
-    password: qimeng123
-    maxActive: 2
-    minIdle: 2
-    initialSize: 2
-  fund:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://47.101.189.151:31931/tamp_fund?autoReconnect=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
-    username: dev
-    password: qimeng123
-    maxActive: 2
-    minIdle: 2
-    initialSize: 2
 
 spring.redis:
   host: 118.190.63.109

community-service/src/main/resources/application-test.yml

@@ -28,22 +28,6 @@ spring.datasource:
     maxActive: 2
     minIdle: 2
     initialSize: 2
-  jydb:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://rm-uf6r22t3d798q4kmk.mysql.rds.aliyuncs.com:3306/tamp_jydb?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-    username: tamp_admin
-    password: '@imeng123'
-    maxActive: 2
-    minIdle: 2
-    initialSize: 2
-  fund:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://rm-uf6r22t3d798q4kmk.mysql.rds.aliyuncs.com:3306/tamp_fund?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-    username: tamp_admin
-    password: '@imeng123'
-    maxActive: 2
-    minIdle: 2
-    initialSize: 2
 
 spring.redis:
   host: 118.190.63.109