diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/AbstractMongoDbConfig.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/AbstractMongoDbConfig.java new file mode 100644 index 0000000..4033844 --- /dev/null +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/AbstractMongoDbConfig.java @@ -0,0 +1,30 @@ +package com.m2pool.manage.config; + +import lombok.Data; +import org.springframework.data.mongodb.MongoDatabaseFactory; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +/** + * @Description TODO + * @Date 2023/4/17 18:46 + * @Author 杜懿 + */ +@Data +public abstract class AbstractMongoDbConfig { + private String host; + private String port; + private String username; + private String password; + private String database; + public MongoDatabaseFactory mongoDatabaseFactory() { + String connectionString = "mongodb://" + username + ":" + password+ "@"+ host+":"+port +"/" + database; + return new SimpleMongoClientDatabaseFactory(connectionString); + } + + public MongoDatabaseFactory mongoDatabaseNoUserFactory() { + String connectionString = "mongodb://"+ host+":"+port +"/" + database; + return new SimpleMongoClientDatabaseFactory(connectionString); + } + public abstract MongoTemplate getMongoTemplate(); +} diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/MongoDbConfig.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/MongoDbConfig.java new file mode 100644 index 0000000..2d6f39e --- /dev/null +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/MongoDbConfig.java @@ -0,0 +1,23 @@ +package com.m2pool.manage.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * @Description 管理系统html文档管理器 + * @Date 2025/7/23 10:00 + * @Author yyb + */ +@Configuration +@ConfigurationProperties("spring.data.mongodb.documentation") +public class MongoDbConfig extends AbstractMongoDbConfig{ + @Primary + @Bean(name = "docMongoTemplate") + @Override + public MongoTemplate getMongoTemplate() { + return new MongoTemplate(mongoDatabaseNoUserFactory()); + } +} diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDocumentDto.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDocumentDto.java index 265e13c..ab0b620 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDocumentDto.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDocumentDto.java @@ -37,9 +37,21 @@ public class ManageCatalogueDocumentDto { @ApiModelProperty(value = "创建时间",example = "2025-05-22 14:22:13") private LocalDateTime createTime; - @ApiModelProperty(value = "文档类型",example = "0其他 1服务条款 2api文档 3挖矿教程") + @ApiModelProperty(value = "文档类型",example = "1.挖矿教程 2.常见问题 3.公告中心 0.其他") private Integer type; @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档") private Integer childType; + + @ApiModelProperty(value = "文档标题链接",example = "https://www.m2pool.com") + private String titleUrl; + + @ApiModelProperty(value = "文档内容链接",example = "https://www.m2pool.com") + private String articleUrl; + + + @ApiModelProperty(value = "币种",example = "rxd") + private String coin; + + } diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageDocumentDto.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageDocumentDto.java index c37d21f..7a0224d 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageDocumentDto.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageDocumentDto.java @@ -40,10 +40,21 @@ public class ManageDocumentDto { @ApiModelProperty(value = "创建时间",example = "2025-05-22 14:22:13") private LocalDateTime createTime; - @ApiModelProperty(value = "文档类型",example = "0其他 1服务条款 2api文档 3挖矿教程") + @ApiModelProperty(value = "文档类型",example = "1.挖矿教程 2.常见问题 3.公告中心 0.其他") private Integer type; @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档") private Integer childType; + @ApiModelProperty(value = "文档标题链接",example = "https://www.m2pool.com") + private String titleUrl; + + @ApiModelProperty(value = "文档内容链接",example = "https://www.m2pool.com") + private String articleUrl; + + @ApiModelProperty(value = "币种",example = "rxd") + private String coin; + + + } diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/entity/ManageDocuments.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/entity/ManageDocuments.java index e1fde1d..eca10e6 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/entity/ManageDocuments.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/entity/ManageDocuments.java @@ -39,6 +39,8 @@ public class ManageDocuments { private String updateUser; + private String coin; + private Integer type; private Integer childType; @@ -47,6 +49,11 @@ public class ManageDocuments { private LocalDateTime updateTime; + private String titleUrl; + + private String articleUrl; + + private Boolean del; diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageBroadcastServiceImpl.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageBroadcastServiceImpl.java index 214045d..eb5ce57 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageBroadcastServiceImpl.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageBroadcastServiceImpl.java @@ -93,9 +93,9 @@ public class ManageBroadcastServiceImpl extends ServiceImpl { //如果英文为null，需要翻译并保存一下 - if("".equals(broadcast.getContentEn()) || "".equals(broadcast.getButtonContentEn())){ - broadcast.setContentEn(TranslateUtils.translate(broadcast.getContent(), "zh", "en")); + if("".equals(broadcast.getContentEn()) || ("".equals(broadcast.getButtonContentEn()) && "".equals(broadcast.getButtonContent()))){ broadcast.setButtonContentEn(TranslateUtils.translate(broadcast.getButtonContent(), "zh", "en")); + broadcast.setContentEn(TranslateUtils.translate(broadcast.getContent(), "zh", "en")); manageBroadcastMapper.updateById(broadcast); } return ManageBroadcastDto.builder() @@ -115,7 +115,6 @@ public class ManageBroadcastServiceImpl extends ServiceImpl getListDataByPage(ManageSearchDocumentVo manageSearchDocumentVo) { PageHelper.startPage(manageSearchDocumentVo.getPageNum(), manageSearchDocumentVo.getPageSize()); @@ -97,6 +108,9 @@ public class ManageDocumentsServiceImpl extends ServiceImpl 0){ return R.success("添加文章成功"); } @@ -123,6 +142,7 @@ public class ManageDocumentsServiceImpl extends ServiceImpl deleteDocument(ManageBaseVo manageBaseVo) { int delete = manageDocumentsMapper.deleteById(manageBaseVo.getId()); + DeleteResult remove = mongoTemplate.remove(new Query(Criteria.where("id").is(manageBaseVo.getId())), "documents"); if (delete > 0){ return R.success("删除文章成功"); } @@ -134,6 +154,7 @@ public class ManageDocumentsServiceImpl extends ServiceImpl 0){ return R.success("修改文章成功"); @@ -173,9 +228,23 @@ public class ManageDocumentsServiceImpl extends ServiceImpl findDataInfo(ManageBaseVo manageBaseVo) { - ManageDocuments documents = this.getById(manageBaseVo.getId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + if (manageBaseVo.getId() != null) { + wrapper.eq(ManageDocuments::getId, manageBaseVo.getId()); + } + if (manageBaseVo.getChildType() != null){ + wrapper.eq(ManageDocuments::getChildType, manageBaseVo.getChildType()); + } + + List manageDocuments = manageDocumentsMapper.selectList(wrapper); + if (manageDocuments.isEmpty()){ + return R.fail("未找到该文章"); + } + ManageDocuments documents = manageDocuments.get(0); + ManageDocumentDto build = null; if(documents != null){ build = ManageDocumentDto.builder() @@ -183,11 +252,15 @@ public class ManageDocumentsServiceImpl extends ServiceImpl params = buildParams(query, from, to); diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageBaseVo.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageBaseVo.java index 44c0e37..139876e 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageBaseVo.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageBaseVo.java @@ -25,4 +25,7 @@ public class ManageBaseVo { @ApiModelProperty(value = "语言",example = "zh") private String lang; + + @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档") + private Integer childType; } diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageCatalogueVo.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageCatalogueVo.java index 31fcee1..cc5aecb 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageCatalogueVo.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageCatalogueVo.java @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @ApiModel(value = "ManageCatalogueVo",description = "文档目录请求对象") public class ManageCatalogueVo extends PageVo{ - @ApiModelProperty(value = "文档类型",example = "0其他 1服务条款 2api文档 3挖矿教程") + @ApiModelProperty(value = "文档类型",example = "1.挖矿教程 2.常见问题 3.公告中心 0.其他") private Integer type; @ApiModelProperty(value = "语言",example = "zh") diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageDocumentVo.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageDocumentVo.java index 64ece38..ff05bd4 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageDocumentVo.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageDocumentVo.java @@ -1,9 +1,7 @@ package com.m2pool.manage.vo; -import com.m2pool.common.core.web.Result.PageResult; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -32,7 +30,7 @@ public class ManageDocumentVo { @ApiModelProperty(value = "内容",example = "文档内容") private String content; - @ApiModelProperty(value = "文档类型",example = "0其他 1服务条款 2api文档 3挖矿教程") + @ApiModelProperty(value = "文档类型",example = "1.挖矿教程 2.常见问题 3.公告中心 0.其他") private Integer type; @ApiModelProperty(value = "语言",example = "zh中文 en英文") @@ -40,4 +38,15 @@ public class ManageDocumentVo { @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档") private Integer childType; + + @ApiModelProperty(value = "文档标题链接",example = "https://www.m2pool.com") + private String titleUrl; + + @ApiModelProperty(value = "文档内容链接",example = "https://www.m2pool.com") + private String articleUrl; + + + @ApiModelProperty(value = "币种",example = "rxd") + private String coin; + } diff --git a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageDocumentsMapper.xml b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageDocumentsMapper.xml index 6d026a2..c788252 100644 --- a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageDocumentsMapper.xml +++ b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageDocumentsMapper.xml @@ -17,7 +17,10 @@ SELECT update_time as updateTime, create_time as createTime, type, - child_type as childType + child_type as childType, + article_url as articleUrl, + title_url as titleUrl, + coin FROM manage_documents @@ -64,7 +67,10 @@ FROM update_time as updateTime, create_time as createTime, type, - child_type as childType + child_type as childType, + article_url as articleUrl, + title_url as titleUrl, + coin FROM manage_documents @@ -103,11 +109,20 @@ FROM update_time as updateTime, create_time as createTime, type, - child_type as childType + child_type as childType, + article_url as articleUrl, + title_url as titleUrl, + coin from manage_documents - where - del = false and type = #{type} and child_type = #{childType} + + del = false and child_type = #{childType} + + AND type = #{type} + + + + order by id desc