From 6358ded97bfeba39ac0f3b066eae8cf51142e3a5 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Thu, 10 Apr 2025 11:17:26 +0800
Subject: [PATCH] =?UTF-8?q?4.10=E5=85=85=E5=80=BC=E6=98=8E=E7=BB=86?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9A=84=E4=BF=AE=E5=A4=8D=E4=BB=A5=E5=8F=8A?=
=?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 12 +++++++
.../java/com/example/demo/DemoApplication.java | 7 +++-
src/main/java/com/example/demo/Util/BaseDES.java | 2 +-
.../java/com/example/demo/config/DBSrcArticle.java | 34 ++++++++++++++++++++
.../com/example/demo/config/DataSourceConfig.java | 29 +++++++++++++++++
.../java/com/example/demo/config/dBSrcUser.java | 37 ++++++++++++++++++++++
.../example/demo/controller/AuditController.java | 4 +--
.../demo/controller/StatisticsController.java | 4 +--
.../java/com/example/demo/domain/vo/RechargeA.java | 2 +-
.../demo/mapper/{ => db1}/ActivityMapper.java | 2 +-
.../example/demo/mapper/{ => db1}/AdminMapper.java | 2 +-
.../example/demo/mapper/{ => db1}/AuditMapper.java | 2 +-
.../demo/mapper/{ => db1}/ConsumeMapper.java | 2 +-
.../demo/mapper/{ => db1}/DetailMapper.java | 2 +-
.../demo/mapper/{ => db1}/DetailYMapper.java | 2 +-
.../example/demo/mapper/{ => db1}/OneMapper.java | 2 +-
.../example/demo/mapper/{ => db1}/OtherMapper.java | 2 +-
.../demo/mapper/{ => db1}/PermissionMapper.java | 2 +-
.../demo/mapper/{ => db1}/ProductMapper.java | 2 +-
.../example/demo/mapper/{ => db1}/RateMapper.java | 2 +-
.../demo/mapper/{ => db1}/RechargeMapper.java | 2 +-
.../demo/mapper/{ => db1}/RefundMapper.java | 2 +-
.../demo/mapper/{ => db1}/StatisticsMapper.java | 4 +--
.../example/demo/mapper/{ => db1}/UserMapper.java | 2 +-
.../demo/serviceImpl/ActivityServiceImpl.java | 3 +-
.../example/demo/serviceImpl/AdminServiceImpl.java | 3 +-
.../example/demo/serviceImpl/AuditServiceImpl.java | 7 ++--
.../demo/serviceImpl/ConsumeServiceImpl.java | 7 ++--
.../demo/serviceImpl/DetailServiceImpl.java | 3 +-
.../demo/serviceImpl/DetailYServiceImpl.java | 3 +-
.../example/demo/serviceImpl/OneServiceImpl.java | 2 +-
.../example/demo/serviceImpl/OtherServiceImpl.java | 9 +++---
.../demo/serviceImpl/PermissionServiceImpl.java | 2 +-
.../demo/serviceImpl/ProductServiceImpl.java | 3 +-
.../example/demo/serviceImpl/RateServiceImpl.java | 2 +-
.../demo/serviceImpl/RechargeServiceImpl.java | 20 ++++--------
.../demo/serviceImpl/RefundServiceImpl.java | 2 +-
.../demo/serviceImpl/StatisticsServiceImpl.java | 9 ++----
.../demo/serviceImpl/UserDetailServiceImpl.java | 4 +--
.../example/demo/serviceImpl/UserServiceImpl.java | 2 +-
.../com/example/demo/sevice/DataExportService.java | 2 +-
src/main/resources/application.yml | 16 +++++++++-
.../resources/mapper/{ => db1}/ConsumeMapper.xml | 2 +-
.../resources/mapper/{ => db1}/DetailYMapper.xml | 2 +-
src/main/resources/mapper/{ => db1}/OneMapper.xml | 2 +-
.../resources/mapper/{ => db1}/ProductMapper.xml | 2 +-
.../resources/mapper/{ => db1}/RechargeMapper.xml | 16 +++++-----
.../resources/mapper/{ => db1}/RefundMapper.xml | 2 +-
.../mapper/{ => db1}/StatisticsMapper.xml | 2 +-
src/main/resources/mapper/{ => db1}/UserMapper.xml | 2 +-
50 files changed, 198 insertions(+), 94 deletions(-)
create mode 100644 src/main/java/com/example/demo/config/DBSrcArticle.java
create mode 100644 src/main/java/com/example/demo/config/DataSourceConfig.java
create mode 100644 src/main/java/com/example/demo/config/dBSrcUser.java
rename src/main/java/com/example/demo/mapper/{ => db1}/ActivityMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{ => db1}/AdminMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{ => db1}/AuditMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{ => db1}/ConsumeMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{ => db1}/DetailMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{ => db1}/DetailYMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{ => db1}/OneMapper.java (91%)
rename src/main/java/com/example/demo/mapper/{ => db1}/OtherMapper.java (87%)
rename src/main/java/com/example/demo/mapper/{ => db1}/PermissionMapper.java (89%)
rename src/main/java/com/example/demo/mapper/{ => db1}/ProductMapper.java (92%)
rename src/main/java/com/example/demo/mapper/{ => db1}/RateMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{ => db1}/RechargeMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{ => db1}/RefundMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{ => db1}/StatisticsMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{ => db1}/UserMapper.java (99%)
rename src/main/resources/mapper/{ => db1}/ConsumeMapper.xml (97%)
rename src/main/resources/mapper/{ => db1}/DetailYMapper.xml (99%)
rename src/main/resources/mapper/{ => db1}/OneMapper.xml (99%)
rename src/main/resources/mapper/{ => db1}/ProductMapper.xml (89%)
rename src/main/resources/mapper/{ => db1}/RechargeMapper.xml (93%)
rename src/main/resources/mapper/{ => db1}/RefundMapper.xml (98%)
rename src/main/resources/mapper/{ => db1}/StatisticsMapper.xml (94%)
rename src/main/resources/mapper/{ => db1}/UserMapper.xml (89%)
diff --git a/pom.xml b/pom.xml
index 09fb9bb..a7ef6dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,18 @@
jjwt
0.9.1
+
+
+ com.alibaba
+ druid
+ 1.1.0
+
+
+
+ mysql
+ mysql-connector-java
+ 8.0.33
+
javax.xml.bind
diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
index 309ab82..2dc9ce5 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/com/example/demo/DemoApplication.java
@@ -3,10 +3,15 @@ package com.example.demo;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
-@SpringBootApplication
+
+
@EnableCaching
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@MapperScan(basePackages = {"com.example.demo.mapper.db1"}, sqlSessionFactoryRef = "sqlSessionFactoryArticle")
+@MapperScan(basePackages = {"com.example.demo.mapper.db2"}, sqlSessionFactoryRef = "sqlSessionFactoryUser")
public class DemoApplication {
public static void main(String[] args) {
diff --git a/src/main/java/com/example/demo/Util/BaseDES.java b/src/main/java/com/example/demo/Util/BaseDES.java
index 900e3bf..c3a2365 100644
--- a/src/main/java/com/example/demo/Util/BaseDES.java
+++ b/src/main/java/com/example/demo/Util/BaseDES.java
@@ -93,7 +93,7 @@ public class BaseDES {
public static void main(String args[]) {
try {
BaseDES d = new BaseDES();
- String encryptedText = d.encrypt("94226013");
+ String encryptedText = d.encrypt("94616995");
System.out.println("加密结果：" + encryptedText);
System.out.println("加密字符串：90005179》"+d.encrypt("90005179"));
System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff"));
diff --git a/src/main/java/com/example/demo/config/DBSrcArticle.java b/src/main/java/com/example/demo/config/DBSrcArticle.java
new file mode 100644
index 0000000..6da0dbf
--- /dev/null
+++ b/src/main/java/com/example/demo/config/DBSrcArticle.java
@@ -0,0 +1,34 @@
+package com.example.demo.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.SqlSessionFactoryBean; // 正确导入SqlSessionFactoryBean
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据库leadnews_article配置
+ */
+@Configuration
+@MapperScan(basePackages = {"com.example.demo.mapper.db1"}, sqlSessionFactoryRef = "sqlSessionFactoryArticle")
+public class DBSrcArticle {
+
+ @Bean
+ public SqlSessionFactory sqlSessionFactoryArticle(@Qualifier("mysql1") DataSource dataSource) throws Exception {
+ SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); // 修正类名
+ sqlSessionFactory.setDataSource(dataSource);
+ sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+ .getResources("classpath:mapper/db1/*.xml"));
+ return sqlSessionFactory.getObject();
+ }
+
+ @Bean
+ public SqlSessionTemplate sqlSessionTemplateArticle(@Qualifier("sqlSessionFactoryArticle") SqlSessionFactory sqlSessionFactory) throws Exception {
+ return new SqlSessionTemplate(sqlSessionFactory);
+ }
+}
diff --git a/src/main/java/com/example/demo/config/DataSourceConfig.java b/src/main/java/com/example/demo/config/DataSourceConfig.java
new file mode 100644
index 0000000..bff4174
--- /dev/null
+++ b/src/main/java/com/example/demo/config/DataSourceConfig.java
@@ -0,0 +1,29 @@
+package com.example.demo.config;
+
+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.context.annotation.Primary;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据源配置
+ */
+@Configuration
+public class DataSourceConfig {
+ @Primary
+ @Bean(name = "mysql1")
+ @ConfigurationProperties(prefix = "spring.datasource.mysql1")
+ public DataSource dBSrcArticle() {
+ return DataSourceBuilder.create().build();
+ }
+
+ @Primary
+ @Bean(name = "mysql2")
+ @ConfigurationProperties(prefix = "spring.datasource.mysql2")
+ public DataSource dBSrcUser() {
+ return DataSourceBuilder.create().build();
+ }
+}
diff --git a/src/main/java/com/example/demo/config/dBSrcUser.java b/src/main/java/com/example/demo/config/dBSrcUser.java
new file mode 100644
index 0000000..fcc9561
--- /dev/null
+++ b/src/main/java/com/example/demo/config/dBSrcUser.java
@@ -0,0 +1,37 @@
+package com.example.demo.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean; // 修复：正确导入类
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据库leadnews_user配置
+ */
+@Configuration
+@MapperScan(basePackages = {"com.example.demo.mapper.db2"}, sqlSessionFactoryRef = "sqlSessionFactoryUser")
+public class dBSrcUser {
+
+ @Bean
+ @Primary
+ public SqlSessionFactory sqlSessionFactoryUser(@Qualifier("mysql2") DataSource dataSource) throws Exception {
+ SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); // 修复：使用正确类名
+ sqlSessionFactory.setDataSource(dataSource);
+ sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+ .getResources("classpath:mapper/db2/*.xml")); // 确保路径正确
+ return sqlSessionFactory.getObject();
+ }
+
+ @Bean
+ @Primary
+ public SqlSessionTemplate sqlSessionTemplateUser(@Qualifier("sqlSessionFactoryUser") SqlSessionFactory sqlSessionFactory) throws Exception {
+ return new SqlSessionTemplate(sqlSessionFactory);
+ }
+}
diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java
index cdcecd0..f993efe 100644
--- a/src/main/java/com/example/demo/controller/AuditController.java
+++ b/src/main/java/com/example/demo/controller/AuditController.java
@@ -5,7 +5,7 @@ import com.example.demo.Util.GoldTistV2;
import com.example.demo.domain.entity.*;
import com.example.demo.domain.vo.Page;
import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.*;
+import com.example.demo.mapper.db1.*;
import com.example.demo.sevice.AuditService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -19,8 +19,6 @@ import java.time.LocalDate;
import java.time.Month;
import java.util.Arrays;
-import static com.example.demo.Util.JWTUtil.getUserDetails;
-
@RestController
@RequestMapping("/audit/audit")
@RequiredArgsConstructor
diff --git a/src/main/java/com/example/demo/controller/StatisticsController.java b/src/main/java/com/example/demo/controller/StatisticsController.java
index 2483c6a..c7b2c40 100644
--- a/src/main/java/com/example/demo/controller/StatisticsController.java
+++ b/src/main/java/com/example/demo/controller/StatisticsController.java
@@ -2,18 +2,16 @@ package com.example.demo.controller;
import com.example.demo.domain.vo.*;
-import com.example.demo.mapper.StatisticsMapper;
+import com.example.demo.mapper.db1.StatisticsMapper;
import com.example.demo.serviceImpl.StatisticsServiceImpl;
import com.example.demo.serviceImpl.UserServiceImpl;
import com.example.demo.sevice.StatisticsService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
-import java.util.Date;
@RestController
diff --git a/src/main/java/com/example/demo/domain/vo/RechargeA.java b/src/main/java/com/example/demo/domain/vo/RechargeA.java
index 4be9baf..4788827 100644
--- a/src/main/java/com/example/demo/domain/vo/RechargeA.java
+++ b/src/main/java/com/example/demo/domain/vo/RechargeA.java
@@ -30,6 +30,6 @@ public class RechargeA {
private String payWay;
private String rechargeWay;
private String area;
- private Integer status;
+ private String auditStatus;
private List areas;
}
diff --git a/src/main/java/com/example/demo/mapper/ActivityMapper.java b/src/main/java/com/example/demo/mapper/db1/ActivityMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/ActivityMapper.java
rename to src/main/java/com/example/demo/mapper/db1/ActivityMapper.java
index 9b23163..8e9d1be 100644
--- a/src/main/java/com/example/demo/mapper/ActivityMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/ActivityMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
diff --git a/src/main/java/com/example/demo/mapper/AdminMapper.java b/src/main/java/com/example/demo/mapper/db1/AdminMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/AdminMapper.java
rename to src/main/java/com/example/demo/mapper/db1/AdminMapper.java
index 45ba51c..ca33e8c 100644
--- a/src/main/java/com/example/demo/mapper/AdminMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/AdminMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.Admin;
diff --git a/src/main/java/com/example/demo/mapper/AuditMapper.java b/src/main/java/com/example/demo/mapper/db1/AuditMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/AuditMapper.java
rename to src/main/java/com/example/demo/mapper/db1/AuditMapper.java
index 2518a8b..346703c 100644
--- a/src/main/java/com/example/demo/mapper/AuditMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/AuditMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.Audit;
diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/db1/ConsumeMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/ConsumeMapper.java
rename to src/main/java/com/example/demo/mapper/db1/ConsumeMapper.java
index d2e9585..e9b1afe 100644
--- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/ConsumeMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.*;
diff --git a/src/main/java/com/example/demo/mapper/DetailMapper.java b/src/main/java/com/example/demo/mapper/db1/DetailMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/DetailMapper.java
rename to src/main/java/com/example/demo/mapper/db1/DetailMapper.java
index abf6672..06e8a8f 100644
--- a/src/main/java/com/example/demo/mapper/DetailMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/DetailMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.Detail;
diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/db1/DetailYMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/DetailYMapper.java
rename to src/main/java/com/example/demo/mapper/db1/DetailYMapper.java
index e06e0cc..4d59e02 100644
--- a/src/main/java/com/example/demo/mapper/DetailYMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/DetailYMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.DetailY;
import com.example.demo.domain.entity.UserDetailExport;
diff --git a/src/main/java/com/example/demo/mapper/OneMapper.java b/src/main/java/com/example/demo/mapper/db1/OneMapper.java
similarity index 91%
rename from src/main/java/com/example/demo/mapper/OneMapper.java
rename to src/main/java/com/example/demo/mapper/db1/OneMapper.java
index 001d78e..5726016 100644
--- a/src/main/java/com/example/demo/mapper/OneMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/OneMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.work.One;
diff --git a/src/main/java/com/example/demo/mapper/OtherMapper.java b/src/main/java/com/example/demo/mapper/db1/OtherMapper.java
similarity index 87%
rename from src/main/java/com/example/demo/mapper/OtherMapper.java
rename to src/main/java/com/example/demo/mapper/db1/OtherMapper.java
index 4c58b99..1f33627 100644
--- a/src/main/java/com/example/demo/mapper/OtherMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/OtherMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/example/demo/mapper/PermissionMapper.java b/src/main/java/com/example/demo/mapper/db1/PermissionMapper.java
similarity index 89%
rename from src/main/java/com/example/demo/mapper/PermissionMapper.java
rename to src/main/java/com/example/demo/mapper/db1/PermissionMapper.java
index 6407a6d..174cf78 100644
--- a/src/main/java/com/example/demo/mapper/PermissionMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/PermissionMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.Permission;
import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/java/com/example/demo/mapper/ProductMapper.java b/src/main/java/com/example/demo/mapper/db1/ProductMapper.java
similarity index 92%
rename from src/main/java/com/example/demo/mapper/ProductMapper.java
rename to src/main/java/com/example/demo/mapper/db1/ProductMapper.java
index 521e478..612a0f7 100644
--- a/src/main/java/com/example/demo/mapper/ProductMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/ProductMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.Index;
diff --git a/src/main/java/com/example/demo/mapper/RateMapper.java b/src/main/java/com/example/demo/mapper/db1/RateMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/RateMapper.java
rename to src/main/java/com/example/demo/mapper/db1/RateMapper.java
index bf8cacc..6b8737e 100644
--- a/src/main/java/com/example/demo/mapper/RateMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/RateMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.Rate;
diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/db1/RechargeMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/RechargeMapper.java
rename to src/main/java/com/example/demo/mapper/db1/RechargeMapper.java
index 3817e5c..be0e3fd 100644
--- a/src/main/java/com/example/demo/mapper/RechargeMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/RechargeMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.Recharge;
diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/db1/RefundMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/RefundMapper.java
rename to src/main/java/com/example/demo/mapper/db1/RefundMapper.java
index 86e554f..fa0abf9 100644
--- a/src/main/java/com/example/demo/mapper/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/RefundMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.Detail;
diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/db1/StatisticsMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/StatisticsMapper.java
rename to src/main/java/com/example/demo/mapper/db1/StatisticsMapper.java
index 8c546fc..9183570 100644
--- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/StatisticsMapper.java
@@ -1,5 +1,5 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
@@ -10,8 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/db1/UserMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/UserMapper.java
rename to src/main/java/com/example/demo/mapper/db1/UserMapper.java
index 182fda2..c5279e4 100644
--- a/src/main/java/com/example/demo/mapper/UserMapper.java
+++ b/src/main/java/com/example/demo/mapper/db1/UserMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
import com.example.demo.domain.entity.User;
diff --git a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
index 1d4827c..9b13120 100644
--- a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Activity;
-import com.example.demo.mapper.ActivityMapper;
+import com.example.demo.mapper.db1.ActivityMapper;
import com.example.demo.sevice.ActivityService;
import com.github.pagehelper.PageHelper;
import lombok.RequiredArgsConstructor;
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageInfo;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
index a1922a1..cd8e6f1 100644
--- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
@@ -2,7 +2,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Admin;
-import com.example.demo.mapper.AdminMapper;
+import com.example.demo.mapper.db1.AdminMapper;
import com.example.demo.security.SecurityConfig;
import com.example.demo.sevice.AdminService;
import com.github.pagehelper.PageHelper;
@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
index a4cf37f..7831241 100644
--- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
@@ -5,12 +5,13 @@ package com.example.demo.serviceImpl;
import com.example.demo.Util.GoldTistV2;
import com.example.demo.domain.entity.*;
-import com.example.demo.domain.vo.ConsumeDetail;
-import com.example.demo.mapper.*;
+import com.example.demo.mapper.db1.AuditMapper;
+import com.example.demo.mapper.db1.DetailYMapper;
+import com.example.demo.mapper.db1.RefundMapper;
+import com.example.demo.mapper.db1.UserMapper;
import com.example.demo.sevice.AuditService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
index dd79e45..d97bb35 100644
--- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
@@ -5,11 +5,9 @@ package com.example.demo.serviceImpl;
import com.example.demo.Util.GoldTistV2;
import com.example.demo.domain.entity.*;
import com.example.demo.domain.vo.ConsumeDetail;
-import com.example.demo.domain.vo.DetailVo;
-import com.example.demo.domain.vo.DetailYVo;
import com.example.demo.domain.vo.SumConsume;
-import com.example.demo.mapper.ConsumeMapper;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.ConsumeMapper;
+import com.example.demo.mapper.db1.UserMapper;
import com.example.demo.sevice.ConsumeService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -17,7 +15,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java
index 79f4aec..5a3931e 100644
--- a/src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java
@@ -2,14 +2,13 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Detail;
-import com.example.demo.mapper.DetailMapper;
+import com.example.demo.mapper.db1.DetailMapper;
import com.example.demo.sevice.DetailService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
index f5742c9..ac2215b 100644
--- a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
@@ -5,7 +5,7 @@ import com.example.demo.domain.entity.UserDetailExport;
import com.example.demo.domain.vo.DetailExport;
import com.example.demo.domain.vo.DetailYgold;
import com.example.demo.domain.vo.SumDetailY;
-import com.example.demo.mapper.DetailYMapper;
+import com.example.demo.mapper.db1.DetailYMapper;
import com.example.demo.sevice.DetailYService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -15,7 +15,6 @@ import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
@Service
diff --git a/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java
index 9b3417d..a3e398b 100644
--- a/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.work.One;
import com.example.demo.domain.work.Three;
import com.example.demo.domain.work.Two;
-import com.example.demo.mapper.OneMapper;
+import com.example.demo.mapper.db1.OneMapper;
import com.example.demo.sevice.OneService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
index bfb6353..0033d4f 100644
--- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
@@ -5,11 +5,10 @@ import com.example.demo.domain.entity.DetailY;
import com.example.demo.domain.entity.Recharge;
import com.example.demo.domain.entity.UserGold;
import com.example.demo.domain.vo.ERP;
-import com.example.demo.domain.vo.RechargeVo;
-import com.example.demo.mapper.DetailYMapper;
-import com.example.demo.mapper.OtherMapper;
-import com.example.demo.mapper.RechargeMapper;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.DetailYMapper;
+import com.example.demo.mapper.db1.OtherMapper;
+import com.example.demo.mapper.db1.RechargeMapper;
+import com.example.demo.mapper.db1.UserMapper;
import com.example.demo.sevice.OtherService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java
index 242065b..dda436d 100644
--- a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java
@@ -1,7 +1,7 @@
package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Permission;
-import com.example.demo.mapper.PermissionMapper;
+import com.example.demo.mapper.db1.PermissionMapper;
import com.example.demo.sevice.PermissionService;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
diff --git a/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
index 2a5a990..39df052 100644
--- a/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
@@ -3,11 +3,10 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Index;
import com.example.demo.domain.entity.Product;
-import com.example.demo.mapper.ProductMapper;
+import com.example.demo.mapper.db1.ProductMapper;
import com.example.demo.sevice.ProductService;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
index ed175ef..d7d7839 100644
--- a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Rate;
import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.RateMapper;
+import com.example.demo.mapper.db1.RateMapper;
import com.example.demo.sevice.RateService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
index 1dcf9b1..3a87f13 100644
--- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
@@ -3,15 +3,13 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Audit;
import com.example.demo.domain.entity.Detail;
import com.example.demo.domain.entity.Recharge;
-import com.example.demo.domain.entity.User;
import com.example.demo.domain.vo.RechargeA;
import com.example.demo.domain.vo.RechargeVo;
-import com.example.demo.domain.vo.RefundA;
import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.AuditMapper;
-import com.example.demo.mapper.DetailMapper;
-import com.example.demo.mapper.RechargeMapper;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.AuditMapper;
+import com.example.demo.mapper.db1.DetailMapper;
+import com.example.demo.mapper.db1.RechargeMapper;
+import com.example.demo.mapper.db1.UserMapper;
import com.example.demo.sevice.RechargeService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -19,18 +17,14 @@ import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.Month;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
-import java.util.stream.Collectors;
@Transactional
@Service
@@ -185,14 +179,14 @@ public class RechargeServiceImpl implements RechargeService {
List fullStatuses = Arrays.asList("待审核", "已通过", "已驳回");
// 遍历分类列表，检查哪些分类在查询结果中缺失，并为其补充默认值
- for (String flag : fullStatuses) {
+ for (String auditStatus : fullStatuses) {
boolean categoryExists = result.stream()
- .anyMatch(recharge -> flag.equals(recharge.getFlag()));
+ .anyMatch(recharge -> auditStatus.equals(recharge.getAuditStatus()));
if (!categoryExists) {
// 如果分类缺失，补充默认值
RechargeA defaultRecharge = new RechargeA();
- defaultRecharge.setFlag(flag);
+ defaultRecharge.setAuditStatus(auditStatus);
// defaultRecharge.setAmount(BigDecimal.ZERO); // 默认值为 0
result.add(defaultRecharge);
}
diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
index 1c4d176..eb66470 100644
--- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Detail;
import com.example.demo.domain.vo.RefundA;
-import com.example.demo.mapper.RefundMapper;
+import com.example.demo.mapper.db1.RefundMapper;
import com.example.demo.sevice.RefundService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
index 2c5f723..e98e207 100644
--- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
@@ -9,21 +9,16 @@ import com.example.demo.domain.vo.Meium;
import com.example.demo.domain.vo.Statistics;
import com.example.demo.domain.vo.Statisticss;
import com.example.demo.domain.vo.SumCoin;
-import com.example.demo.mapper.StatisticsMapper;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.StatisticsMapper;
+import com.example.demo.mapper.db1.UserMapper;
import com.example.demo.sevice.StatisticsService;
import lombok.RequiredArgsConstructor;
-import org.apache.ibatis.annotations.Param;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
import java.util.List;
@RequiredArgsConstructor
diff --git a/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java
index b70138a..b05c49c 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java
@@ -2,11 +2,9 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Admin;
-import com.example.demo.mapper.AdminMapper;
+import com.example.demo.mapper.db1.AdminMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
index fb08232..e314d5d 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Detail;
import com.example.demo.domain.entity.User;
import com.example.demo.domain.vo.UserVo;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.UserMapper;
import com.example.demo.sevice.UserSevice;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/sevice/DataExportService.java b/src/main/java/com/example/demo/sevice/DataExportService.java
index 66d5f15..3ad47f1 100644
--- a/src/main/java/com/example/demo/sevice/DataExportService.java
+++ b/src/main/java/com/example/demo/sevice/DataExportService.java
@@ -1,7 +1,7 @@
package com.example.demo.sevice;
import com.example.demo.domain.entity.UserDetailExport;
-import com.example.demo.mapper.DetailYMapper;
+import com.example.demo.mapper.db1.DetailYMapper;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 44e4449..81392b2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,6 +12,7 @@ spring:
max-file-size: 10MB
max-request-size: 100MB
datasource:
+ mysql1:
hikari:
maximum-pool-size: 10
minimum-idle: 5
@@ -20,9 +21,22 @@ spring:
connection-timeout: 30000
pool-name: HwgoldHikariCP
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
+# url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
username: hwgold
password: 'AGX4Z3YMxiCG3GR2'
+ mysql2:
+ hikari:
+ maximum-pool-size: 10
+ minimum-idle: 5
+ idle-timeout: 30000
+ max-lifetime: 1800000
+ connection-timeout: 30000
+ pool-name: HwgoldHikariCP
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
+ username: hljw
+ password: '5dmWCCKfEk3TTeyn'
application:
name: demo
cache:
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/db1/ConsumeMapper.xml
similarity index 97%
rename from src/main/resources/mapper/ConsumeMapper.xml
rename to src/main/resources/mapper/db1/ConsumeMapper.xml
index b55e839..407db5e 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/db1/ConsumeMapper.xml
@@ -2,7 +2,7 @@
-
+