Bladeren bron

修改标签表 中 level改成 tag_level ,增加分页配置信息

2507040827 1 dag geleden
bovenliggende
commit
5be27785d1

+ 18 - 0
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/config/MyBatisPlusConfig.java

@@ -0,0 +1,18 @@
+package cn.com.yusys.yusp.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MyBatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

+ 1 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/dto/TagInfoDto.java

@@ -65,7 +65,7 @@ public class TagInfoDto {
      * 标签等级
      **/
     @ApiModelProperty(value = "标签等级")
-    private Integer level;
+    private Integer tagLevel;
 
     /**
      * tag1/tag2/tag3/...

+ 1 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/dto/TagInfoVersionDto.java

@@ -64,7 +64,7 @@ public class TagInfoVersionDto {
      * 标签等级
      **/
     @ApiModelProperty(value = "标签等级")
-    private Integer level;
+    private Integer tagLevel;
 
     /**
      * tag1/tag2/tag3/...

+ 1 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/entity/AitagTagInfoEntity.java

@@ -66,7 +66,7 @@ public class AitagTagInfoEntity {
      * 标签等级
      **/
     @ApiModelProperty(value = "标签等级")
-    private Integer level;
+    private Integer tagLevel;
 
     /**
      * tag1/tag2/tag3/...

+ 3 - 120
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/entity/AitagTagInfoVersionEntity.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.IdType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 
 /**
@@ -15,6 +16,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @TableName("aitag_tag_info_version")
 @ApiModel(value = "AitagTagInfoVersionEntity", description = "标签信息版本表")
+@Data
 public class AitagTagInfoVersionEntity {
 
     /**
@@ -64,7 +66,7 @@ public class AitagTagInfoVersionEntity {
      * 标签等级
      **/
     @ApiModelProperty(value = "标签等级")
-    private Integer level;
+    private Integer tagLevel;
 
     /**
      * tag1/tag2/tag3/...
@@ -109,124 +111,5 @@ public class AitagTagInfoVersionEntity {
     private String reviser;
 
 
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCategoryId() {
-        return this.categoryId;
-    }
-
-    public void setCategoryId(String categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public String getTagNm() {
-        return this.tagNm;
-    }
-
-    public void setTagNm(String tagNm) {
-        this.tagNm = tagNm;
-    }
-
-    public String getTagCode() {
-        return this.tagCode;
-    }
-
-    public void setTagCode(String tagCode) {
-        this.tagCode = tagCode;
-    }
-
-    public String getTagRemark() {
-        return this.tagRemark;
-    }
-
-    public void setTagRemark(String tagRemark) {
-        this.tagRemark = tagRemark;
-    }
-
-    public String getparentId() {
-        return this.parentId;
-    }
-
-    public void setparentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getReg() {
-        return this.reg;
-    }
-
-    public void setReg(String reg) {
-        this.reg = reg;
-    }
-
-    public Integer getLevel() {
-        return this.level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getTagPath() {
-        return this.tagPath;
-    }
-
-    public void setTagPath(String tagPath) {
-        this.tagPath = tagPath;
-    }
-
-    public Integer getIsDelete() {
-        return this.isDelete;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Integer getState() {
-        return this.state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getTagPrompt() {
-        return this.tagPrompt;
-    }
-
-    public void setTagPrompt(String tagPrompt) {
-        this.tagPrompt = tagPrompt;
-    }
-
-    public String getTagVersion() {
-        return this.tagVersion;
-    }
-
-    public void setTagVersion(String tagVersion) {
-        this.tagVersion = tagVersion;
-    }
-
-    public String getRevisionTime() {
-        return this.revisionTime;
-    }
-
-    public void setRevisionTime(String revisionTime) {
-        this.revisionTime = revisionTime;
-    }
-
-    public String getReviser() {
-        return this.reviser;
-    }
-
-    public void setReviser(String reviser) {
-        this.reviser = reviser;
-    }
 
 }

+ 4 - 97
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/vo/AitagTagInfoQueryVo.java

@@ -1,6 +1,7 @@
 package cn.com.yusys.yusp.domain.vo;
 
 import cn.com.yusys.yusp.commons.module.adapter.query.PageQuery;
+import lombok.Data;
 
 
 /**
@@ -9,6 +10,8 @@ import cn.com.yusys.yusp.commons.module.adapter.query.PageQuery;
  * @author 2507040827
  * @date 2026-02-26 14:34:56
  */
+
+@Data
 public class AitagTagInfoQueryVo extends PageQuery {
 
     /**
@@ -49,7 +52,7 @@ public class AitagTagInfoQueryVo extends PageQuery {
     /**
      * 标签等级
      **/
-    private Integer level;
+    private Integer tagLevel;
 
     /**
      * tag1/tag2/tag3/...
@@ -72,100 +75,4 @@ public class AitagTagInfoQueryVo extends PageQuery {
     private String tagPrompt;
 
 
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCategoryId() {
-        return this.categoryId;
-    }
-
-    public void setCategoryId(String categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public String getTagNm() {
-        return this.tagNm;
-    }
-
-    public void setTagNm(String tagNm) {
-        this.tagNm = tagNm;
-    }
-
-    public String getTagCode() {
-        return this.tagCode;
-    }
-
-    public void setTagCode(String tagCode) {
-        this.tagCode = tagCode;
-    }
-
-    public String getTagRemark() {
-        return this.tagRemark;
-    }
-
-    public void setTagRemark(String tagRemark) {
-        this.tagRemark = tagRemark;
-    }
-
-    public String getparentId() {
-        return this.parentId;
-    }
-
-    public void setparentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getReg() {
-        return this.reg;
-    }
-
-    public void setReg(String reg) {
-        this.reg = reg;
-    }
-
-    public Integer getLevel() {
-        return this.level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getTagPath() {
-        return this.tagPath;
-    }
-
-    public void setTagPath(String tagPath) {
-        this.tagPath = tagPath;
-    }
-
-    public Integer getIsDelete() {
-        return this.isDelete;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Integer getState() {
-        return this.state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getTagPrompt() {
-        return this.tagPrompt;
-    }
-
-    public void setTagPrompt(String tagPrompt) {
-        this.tagPrompt = tagPrompt;
-    }
-
 }

+ 4 - 121
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/vo/AitagTagInfoVersionQueryVo.java

@@ -1,6 +1,7 @@
 package cn.com.yusys.yusp.domain.vo;
 
 import cn.com.yusys.yusp.commons.module.adapter.query.PageQuery;
+import lombok.Data;
 
 
 /**
@@ -9,6 +10,8 @@ import cn.com.yusys.yusp.commons.module.adapter.query.PageQuery;
  * @author 2507040827
  * @date 2026-02-27 11:33:54
  */
+
+@Data
 public class AitagTagInfoVersionQueryVo extends PageQuery {
 
     /**
@@ -49,7 +52,7 @@ public class AitagTagInfoVersionQueryVo extends PageQuery {
     /**
      * 标签等级
      **/
-    private Integer level;
+    private Integer tagLevel;
 
     /**
      * tag1/tag2/tag3/...
@@ -87,124 +90,4 @@ public class AitagTagInfoVersionQueryVo extends PageQuery {
     private String reviser;
 
 
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCategoryId() {
-        return this.categoryId;
-    }
-
-    public void setCategoryId(String categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public String getTagNm() {
-        return this.tagNm;
-    }
-
-    public void setTagNm(String tagNm) {
-        this.tagNm = tagNm;
-    }
-
-    public String getTagCode() {
-        return this.tagCode;
-    }
-
-    public void setTagCode(String tagCode) {
-        this.tagCode = tagCode;
-    }
-
-    public String getTagRemark() {
-        return this.tagRemark;
-    }
-
-    public void setTagRemark(String tagRemark) {
-        this.tagRemark = tagRemark;
-    }
-
-    public String getparentId() {
-        return this.parentId;
-    }
-
-    public void setparentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getReg() {
-        return this.reg;
-    }
-
-    public void setReg(String reg) {
-        this.reg = reg;
-    }
-
-    public Integer getLevel() {
-        return this.level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getTagPath() {
-        return this.tagPath;
-    }
-
-    public void setTagPath(String tagPath) {
-        this.tagPath = tagPath;
-    }
-
-    public Integer getIsDelete() {
-        return this.isDelete;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Integer getState() {
-        return this.state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getTagPrompt() {
-        return this.tagPrompt;
-    }
-
-    public void setTagPrompt(String tagPrompt) {
-        this.tagPrompt = tagPrompt;
-    }
-
-    public String getTagVersion() {
-        return this.tagVersion;
-    }
-
-    public void setTagVersion(String tagVersion) {
-        this.tagVersion = tagVersion;
-    }
-
-    public String getRevisionTime() {
-        return this.revisionTime;
-    }
-
-    public void setRevisionTime(String revisionTime) {
-        this.revisionTime = revisionTime;
-    }
-
-    public String getReviser() {
-        return this.reviser;
-    }
-
-    public void setReviser(String reviser) {
-        this.reviser = reviser;
-    }
-
 }

+ 14 - 13
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/impl/AitagTagInfoServiceImpl.java

@@ -91,14 +91,14 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
         if (aitagTagInfoQueryVo.getTagRemark() != null) {
             queryWrapper.eq(AitagTagInfoEntity::getTagRemark, aitagTagInfoQueryVo.getTagRemark());
         }
-        if (aitagTagInfoQueryVo.getparentId() != null) {
-            queryWrapper.eq(AitagTagInfoEntity::getParentId, aitagTagInfoQueryVo.getparentId());
+        if (aitagTagInfoQueryVo.getParentId() != null) {
+            queryWrapper.eq(AitagTagInfoEntity::getParentId, aitagTagInfoQueryVo.getParentId());
         }
         if (aitagTagInfoQueryVo.getReg() != null) {
             queryWrapper.eq(AitagTagInfoEntity::getReg, aitagTagInfoQueryVo.getReg());
         }
-        if (aitagTagInfoQueryVo.getLevel() != null) {
-            queryWrapper.eq(AitagTagInfoEntity::getLevel, aitagTagInfoQueryVo.getLevel());
+        if (aitagTagInfoQueryVo.getTagLevel() != null) {
+            queryWrapper.eq(AitagTagInfoEntity::getTagLevel, aitagTagInfoQueryVo.getTagLevel());
         }
         if (aitagTagInfoQueryVo.getTagPath() != null) {
             queryWrapper.eq(AitagTagInfoEntity::getTagPath, aitagTagInfoQueryVo.getTagPath());
@@ -130,14 +130,14 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
             if(!aitagTagInfoEntities.isEmpty()){
                 AitagTagInfoEntity aitagTagInfoEntity = aitagTagInfoEntities.get(0);
                 aitagTagInfo.setTagPath(aitagTagInfoEntity.getTagPath()+"/"+aitagTagInfo.getTagNm());
-                aitagTagInfo.setLevel(aitagTagInfoEntity.getLevel()+1);
+                aitagTagInfo.setTagLevel(aitagTagInfoEntity.getTagLevel()+1);
             }else{
                 aitagTagInfo.setTagPath(aitagTagInfo.getTagNm());
-                aitagTagInfo.setLevel(1);
+                aitagTagInfo.setTagLevel(1);
             }
         }else{
             aitagTagInfo.setTagPath(aitagTagInfo.getTagNm());
-            aitagTagInfo.setLevel(1);
+            aitagTagInfo.setTagLevel(1);
         }
         aitagTagInfo.setRevisionTime(DateUtils.getCurrDateTimeStr());
         aitagTagInfo.setTagVersion("1");
@@ -184,7 +184,7 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
         aitagTagInfoEntity.setTagVersion(Integer.parseInt(tagInfo.getTagVersion())+1+"");
         AitagTagInfoEntity parentTagInfo = this.baseMapper.selectById(aitagTagInfoEntity.getParentId());
         aitagTagInfoEntity.setTagPath(parentTagInfo.getTagPath()+"/"+aitagTagInfoEntity.getTagNm());
-        aitagTagInfoEntity.setLevel(parentTagInfo.getLevel()+1);
+        aitagTagInfoEntity.setTagLevel(parentTagInfo.getTagLevel()+1);
         this.baseMapper.updateById(aitagTagInfoEntity);
     }
 
@@ -242,14 +242,14 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
         if (aitagTagInfoQueryVo.getTagRemark() != null) {
             queryWrapper.eq(AitagTagInfoEntity::getTagRemark, aitagTagInfoQueryVo.getTagRemark());
         }
-        if (aitagTagInfoQueryVo.getparentId() != null) {
-            queryWrapper.eq(AitagTagInfoEntity::getParentId, aitagTagInfoQueryVo.getparentId());
+        if (aitagTagInfoQueryVo.getParentId() != null) {
+            queryWrapper.eq(AitagTagInfoEntity::getParentId, aitagTagInfoQueryVo.getParentId());
         }
         if (aitagTagInfoQueryVo.getReg() != null) {
             queryWrapper.eq(AitagTagInfoEntity::getReg, aitagTagInfoQueryVo.getReg());
         }
-        if (aitagTagInfoQueryVo.getLevel() != null) {
-            queryWrapper.eq(AitagTagInfoEntity::getLevel, aitagTagInfoQueryVo.getLevel());
+        if (aitagTagInfoQueryVo.getTagLevel() != null) {
+            queryWrapper.eq(AitagTagInfoEntity::getTagLevel, aitagTagInfoQueryVo.getTagLevel());
         }
         if (aitagTagInfoQueryVo.getTagPath() != null) {
             queryWrapper.eq(AitagTagInfoEntity::getTagPath, aitagTagInfoQueryVo.getTagPath());
@@ -305,11 +305,12 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
                     AitagTagInfoEntity.class);
             String tagPath = tagImportDto.getTagPath();
             aitagTagInfo.setTagPath(categoryNm+"/"+tagPath);
-            aitagTagInfo.setLevel(aitagTagInfo.getTagPath().split("/").length);
+            aitagTagInfo.setTagLevel(aitagTagInfo.getTagPath().split("/").length);
             aitagTagInfo.setRevisionTime(DateUtils.getCurrDateTimeStr());
             aitagTagInfo.setReviser(reviser);
             aitagTagInfo.setTagVersion("1");
             aitagTagInfo.setIsDelete(TAG_UNDELETED);
+            aitagTagInfo.setCategoryId(categoryId);
             aitagTagInfo.setState(TAG_ENABLED);
             this.save(aitagTagInfo);
         }

+ 4 - 4
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/impl/AitagTagInfoVersionServiceImpl.java

@@ -44,14 +44,14 @@ public class AitagTagInfoVersionServiceImpl extends ServiceImpl<AitagTagInfoVers
         if (aitagTagInfoVersionQueryVo.getTagRemark() != null) {
             queryWrapper.eq(AitagTagInfoVersionEntity::getTagRemark, aitagTagInfoVersionQueryVo.getTagRemark());
         }
-        if (aitagTagInfoVersionQueryVo.getparentId() != null) {
-            queryWrapper.eq(AitagTagInfoVersionEntity::getparentId, aitagTagInfoVersionQueryVo.getparentId());
+        if (aitagTagInfoVersionQueryVo.getParentId() != null) {
+            queryWrapper.eq(AitagTagInfoVersionEntity::getParentId, aitagTagInfoVersionQueryVo.getParentId());
         }
         if (aitagTagInfoVersionQueryVo.getReg() != null) {
             queryWrapper.eq(AitagTagInfoVersionEntity::getReg, aitagTagInfoVersionQueryVo.getReg());
         }
-        if (aitagTagInfoVersionQueryVo.getLevel() != null) {
-            queryWrapper.eq(AitagTagInfoVersionEntity::getLevel, aitagTagInfoVersionQueryVo.getLevel());
+        if (aitagTagInfoVersionQueryVo.getTagLevel() != null) {
+            queryWrapper.eq(AitagTagInfoVersionEntity::getTagLevel, aitagTagInfoVersionQueryVo.getTagLevel());
         }
         if (aitagTagInfoVersionQueryVo.getTagPath() != null) {
             queryWrapper.eq(AitagTagInfoVersionEntity::getTagPath, aitagTagInfoVersionQueryVo.getTagPath());

+ 2 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/impl/AitagTagLogServiceImpl.java

@@ -117,7 +117,8 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
         if (StringUtils.isNotBlank(transactionReqVo.getLoanApplicationNo())){
             queryWrapper.le(AitagTagLogEntity::getBusinessAttr, transactionReqVo.getLoanApplicationNo());
         }
-        return this.baseMapper.selectPage(new Page<>(transactionReqVo.getPage() == null?0:transactionReqVo.getPage(),
+
+        return this.page(new Page<>(transactionReqVo.getPage() == null?0:transactionReqVo.getPage(),
                 transactionReqVo.getSize() == null?10:transactionReqVo.getSize()),queryWrapper);
     }
 

+ 4 - 4
server/yusp-tagging-core/src/main/resources/mapper/AitagTagInfoMapper.xml

@@ -9,7 +9,7 @@
         <result column="tag_remark" jdbcType="VARCHAR" property="tagRemark"/>
         <result column="parent_id" jdbcType="VARCHAR" property="parentId"/>
         <result column="reg" jdbcType="VARCHAR" property="reg"/>
-        <result column="level" jdbcType="INTEGER" property="level"/>
+        <result column="tag_level" jdbcType="INTEGER" property="tagLevel"/>
         <result column="tag_path" jdbcType="VARCHAR" property="tagPath"/>
         <result column="tag_prompt" jdbcType="VARCHAR" property="tagPrompt"/>
         <result column="tag_version" jdbcType="VARCHAR" property="tagVersion"/>
@@ -27,7 +27,7 @@
             <result property="tagRemark" column="version_tag_remark"/>
             <result property="parentId" column="version_parent_id"/>
             <result property="reg" column="version_reg"/>
-            <result property="level" column="version_level"/>
+            <result property="tagLevel" column="version_level"/>
             <result property="tagPath" column="version_tag_path"/>
             <result property="tagPrompt" column="version_tag_prompt"/>
             <result property="tagVersion" column="version_tag_version"/>
@@ -46,7 +46,7 @@
             ti.tag_remark,
             ti.parent_id,
             ti.reg,
-            ti.level,
+            ti.tag_level,
             ti.tag_path,
             ti.tag_prompt,
             ti.tag_version,
@@ -59,7 +59,7 @@
             tiv.tag_remark AS version_tag_remark,
             tiv.parent_id AS version_parent_id,
             tiv.reg AS version_reg,
-            tiv.level AS version_level,
+            tiv.tag_level AS version_level,
             tiv.tag_path AS version_tag_path,
             tiv.tag_prompt AS version_tag_prompt,
             tiv.tag_version AS version_tag_version,

+ 1 - 1
server/yusp-tagging-core/src/main/resources/mapper/AitagTagInfoVersionMapper.xml

@@ -9,7 +9,7 @@
         <result column="tag_remark" jdbcType="LONGVARCHAR" property="tagRemark"/>
         <result column="parent_id" jdbcType="VARCHAR" property="parentId"/>
         <result column="reg" jdbcType="LONGVARCHAR" property="reg"/>
-        <result column="level" jdbcType="INTEGER" property="level"/>
+        <result column="tag_level" jdbcType="INTEGER" property="tagLevel"/>
         <result column="tag_path" jdbcType="VARCHAR" property="tagPath"/>
         <result column="is_delete" jdbcType="INTEGER" property="isDelete"/>
         <result column="state" jdbcType="INTEGER" property="state"/>

+ 9 - 3
server/yusp-tagging-starter/pom.xml

@@ -123,11 +123,17 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.33</version> <!-- 使用最新稳定版本 -->
         </dependency>
-        <!-- PostgreSQL 的 JDBC 驱动-->
+
         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
+            <groupId>cn.com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+            <version>9.0.0</version>
         </dependency>
+        <!-- PostgreSQL 的 JDBC 驱动-->
+<!--        <dependency>-->
+<!--            <groupId>org.postgresql</groupId>-->
+<!--            <artifactId>postgresql</artifactId>-->
+<!--        </dependency>-->
         <!-- HikariCP -->
         <dependency>
             <groupId>com.zaxxer</groupId>

+ 0 - 42
server/yusp-tagging-starter/src/main/resources/application.yml

@@ -1,21 +1,6 @@
 spring:
   cache:
     type: redis #缓存类型
-  main:
-    allow-bean-definition-overriding: true
-  redis:
-    database: 0 #Redis默认情况下有16个分片,这里配置具体使用的分片,默认是0
-    host: 10.192.72.13 #Redis地址
-    port: 36379 #Redis端口
-    password: 123456 #Redis密码
-    timeout: 10000 #Redis连接超时时间
-    lettuce:
-      shutdown-timeout: 60000ms #关闭超时时间
-      pool:
-        max-active: 20 #连接池最大连接数(使用负值表示没有限制) 默认 8
-        max-wait: 10000ms #连接池最大阻塞等待时间(使用负值表示没有限制) 默认 -1
-        min-idle: 1 #连接池中的最小空闲连接 默认 0
-        max-idle: 20 #连接池中的最大空闲连接 默认 8
   application:
     jackson:
       date-format: yyyy-MM-dd HH:mm:ss  # 您已有的配置
@@ -26,28 +11,6 @@ spring:
       deserialization:
         fail-on-unknown-properties: false
       default-property-inclusion: non_null
-#  datasource:
-#    driver-class-name: org.postgresql.Driver # PostgreSQL数据库连接驱动
-#    type: com.zaxxer.hikari.HikariDataSource # 数据库连接池类型
-#    url: jdbc:postgresql://10.192.72.13:5656/fjnx?currentSchema=ai_tag # PostgreSQL数据库地址及schema
-#    username: ai_tag # 数据库用户名
-#    password: 3edc$RFV # 数据库密码
-#    hikari:
-#      minimum-idle: 1 # 空闲时最小连接数
-#      maximum-pool-size: 20 # 连接池大小
-#      connection-test-query: SELECT 1 # 连接池验证查询
-
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver #mysql数据库连接驱动
-    type: com.zaxxer.hikari.HikariDataSource #数据库连接池类型
-    url: jdbc:mysql://10.192.72.13:6780/fjnx?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&allowMultiQueries=true&useSSL=false #数据库地址
-    username: root #数据库用户名
-    password: 123456 #数据库密码(密文)
-    hikari:
-      minimum-idle: 1 #空闲时最小连接数
-      maximum-pool-size: 20 #连接池大小
-      connection-test-query: select 1 #连接池验证
-
 
 license:
   licenseContext: <?xml version="1.0" encoding="UTF-8"?><license build-time="Tue Dec 29 13:26:00 CST 2020" validate-code="6A1B578E7FDEF76A57917A12BC359ED4"><element name="customer_name">上海银行股份有限公司</element><element name="contract_code">KJ2020-0038</element><element name="license_code">0000019279</element><element name="product_code">0000001122</element><element name="product_name_zh-cn">宇信科技基于微服务框架统一开发平台</element><element name="product_name_en-us">YUSP</element><element name="version_major">1</element><element name="version_sub">0</element><element name="version_publish">1</element><element name="complie_date">2018-03-20</element><element name="license_type">客户销售许可证</element><element name="license_start_time">2020-12-29</element><element name="license_end_time">2040-12-27</element></license>
@@ -62,11 +25,6 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl  # 控制台输出
 
-fastapi:
-  service:
-    url: http://10.192.72.13:9876  # 你的FastAPI服务地址
-    timeout: 10000  # 请求超时时间
-
 # 认证配置
 auth:
   enabled: false  # 认证开关,true为开启,false为关闭

+ 4 - 2
server/yusp-tagging-starter/src/main/resources/bootstrap.yml

@@ -1,4 +1,6 @@
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: tag-server
   cloud:
@@ -6,6 +8,8 @@ spring:
       discovery:
         server-addr: 10.192.72.13:38848
         namespace: ai-tagging
+        username: nacos
+        password: nacos
       config:
         server-addr: 10.192.72.13:38848
         namespace: ai-tagging
@@ -19,7 +23,5 @@ spring:
         extension-configs[1]:
           data-id: application-license.yml
           refresh: true #配置扩展属性动态刷新
-
-
 server:
   port: 30001