lizixuan
/
m2pool_web_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 后台管理系统出入账接口问题修复

This commit is contained in:
yyb 2025-08-27 15:58:57 +08:00
parent 981838726c
commit 182a2d6c43
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/M2ManageApplication.java
View File

@ -6,6 +6,7 @@ import com.m2pool.common.swagger.annotation.EnableCustomSwagger2;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.web.client.RestTemplate;
@ -17,7 +18,7 @@ import org.springframework.web.client.RestTemplate;
@EnableCustomConfig
@EnableCustomSwagger2
@EnableM2PoolFeignClients
@SpringBootApplication
@SpringBootApplication(exclude = {MongoAutoConfiguration.class})
@MapperScan({"com.m2pool.manage.mapper"})
public class M2ManageApplication {
@Bean

10
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/AbstractMongoDbConfig.java
View File

@ -12,16 +12,6 @@ import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
*/
@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 host, String port, String database) {
String connectionString = "mongodb://"+ host+":"+port +"/" + database;
return new SimpleMongoClientDatabaseFactory(connectionString);

2
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/MongoDbConfig.java
View File

@ -2,6 +2,7 @@ package com.m2pool.manage.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@ -14,6 +15,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
*/
@Data
@Configuration
@RefreshScope
@ConfigurationProperties("spring.data.mongodb.documentation")
public class MongoDbConfig extends AbstractMongoDbConfig{

5
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java
View File

@ -129,11 +129,6 @@ public class ManageUserServiceImpl implements ManageUserService {
powerUnit = new PowerUnitUtils.NetPowerUnit("GH/S", BigDecimal.valueOf(1000 * 1000 * 1000));
}
changeUnit(powerUnit, list,BigDecimal.valueOf(1000 * 1000));
if (manageMiningUserPowerVo.getStartDate()==null || manageMiningUserPowerVo.getEndDate()==null){
}
Date endDate = manageMiningUserPowerVo.getEndDate();
Date startDate = manageMiningUserPowerVo.getStartDate();
if (manageMiningUserPowerVo.getStartDate()==null || manageMiningUserPowerVo.getEndDate()==null){