diff --git a/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java b/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java new file mode 100644 index 0000000..87d2af2 --- /dev/null +++ b/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java @@ -0,0 +1,60 @@ +package com.example.demo.config; + +import com.zaxxer.hikari.HikariDataSource; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +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 javax.sql.DataSource; + +@Slf4j +@Configuration +public class Mysql1DataSourceConfig { + +// @Bean(name = "mysql1DataSource") +//// @Primary +// public DataSource mysql1DataSource() { +// HikariDataSource dataSource = new HikariDataSource(); +// dataSource.setJdbcUrl("jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=UTF-8"); +// dataSource.setUsername("hwgold"); +// dataSource.setPassword("AGX4Z3YMxiCG3GR2"); +// dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); +// dataSource.setMaximumPoolSize(10); +// dataSource.setPoolName("mysql1HikariCP"); +// log.info("mysql1 DataSource initialized with pool-name: {}", dataSource.getPoolName()); +// return dataSource; +// } +@Bean(name = "mysql1DataSource") +@ConfigurationProperties(prefix = "spring.datasource.mysql1") +public DataSource mysql2DataSource() { + return DataSourceBuilder.create().type(HikariDataSource.class).build(); +} + @Bean(name = "mysql1SqlSessionFactory") +// @Primary + public SqlSessionFactory mysql1SqlSessionFactory(@Qualifier("mysql1DataSource") DataSource dataSource, + @Qualifier("globalConfiguration1") org.apache.ibatis.session.Configuration globalConfiguration1) throws Exception { + SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); + sessionFactory.setDataSource(dataSource); + sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/*.xml")); + sessionFactory.setConfiguration(globalConfiguration1); + return sessionFactory.getObject(); + } + + @Bean(name = "mysql1SqlSessionTemplate") +// @Primary + public SqlSessionTemplate mysql1SqlSessionTemplate(@Qualifier("mysql1SqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + return new SqlSessionTemplate(sqlSessionFactory); + } + @Bean + @ConfigurationProperties(prefix = "mybatis.configuration.mysql1") + public org.apache.ibatis.session.Configuration globalConfiguration1() { + return new org.apache.ibatis.session.Configuration(); + } +} diff --git a/src/main/java/com/example/demo/controller/GeneralController.java b/src/main/java/com/example/demo/controller/GeneralController.java new file mode 100644 index 0000000..a7ae932 --- /dev/null +++ b/src/main/java/com/example/demo/controller/GeneralController.java @@ -0,0 +1,44 @@ +package com.example.demo.controller; + +import com.example.demo.domain.vo.Result; +import com.example.demo.service.GeneralService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @program: GOLD + * @ClassName GeneralController + * @description: + * @author: huangqizhen + * @create: 2025−06-22 10:54 + * @Version 1.0 + **/ +@RestController +@RequestMapping("/general") +@RequiredArgsConstructor +@Slf4j +@CrossOrigin +public class GeneralController { + + @Autowired + private GeneralService generalService; + @PostMapping("/market") + public Result getMarket() + { + List list = generalService.getMarket(); + return Result.success(list); + } + @PostMapping("/platform") + public Result getPlatform() + { + List list = generalService.getPlatform(); + return Result.success(list); + } +} diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java index 33eef20..625421e 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/src/main/java/com/example/demo/domain/entity/User.java @@ -18,11 +18,11 @@ public class User implements Serializable { private Integer jwcode; // 精网号 private String name; // 客户姓名 private String market; // 所属地区 - private Integer sumPermentGold; // 历史永久金币 + private Integer sumPermanentGold; // 历史永久金币 private Integer sumFreeJune; // 历史六月免费金币 private Integer sumFreeDecember; // 历史十二月免费金币 private Integer sumTaskGold; // 历史任务金币 - private Integer currentPermentGold; // 当前永久金币 + private Integer currentPermanentGold; // 当前永久金币 private Integer currentFreeJune; // 当前六月免费金币 private Integer currentFreeDecember; // 当前十二月免费金币 private Integer currentTaskGold; // 当前任务金币 diff --git a/src/main/java/com/example/demo/domain/entity/UserGoldRecord.java b/src/main/java/com/example/demo/domain/entity/UserGoldRecord.java index da1e6a7..f796f30 100644 --- a/src/main/java/com/example/demo/domain/entity/UserGoldRecord.java +++ b/src/main/java/com/example/demo/domain/entity/UserGoldRecord.java @@ -19,7 +19,7 @@ public class UserGoldRecord implements Serializable { private Integer jwcode; // 精网号 private String activity; // 活动名称 private Integer sumGold; // 金币总数 - private Integer permentGold; // 永久金币 + private Integer permanentGold; // 永久金币 private Integer freeJune; // 六月免费金币 private Integer freeDecember; // 十二月免费金币 private Integer taskGold; // 任务金币 diff --git a/src/main/java/com/example/demo/mapper/GeneralMapper.java b/src/main/java/com/example/demo/mapper/GeneralMapper.java new file mode 100644 index 0000000..aca7d39 --- /dev/null +++ b/src/main/java/com/example/demo/mapper/GeneralMapper.java @@ -0,0 +1,19 @@ +package com.example.demo.mapper; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @program: GOLD + * @ClassName GeneralMapper + * @description: + * @author: huangqizhen + * @create: 2025−06-22 11:02 + * @Version 1.0 + **/ +@Mapper +public interface GeneralMapper { + List getMarket(); + List getPlatform(); +} diff --git a/src/main/java/com/example/demo/security/SecurityConfig.java b/src/main/java/com/example/demo/security/SecurityConfig.java index 5f0068f..4843f2a 100644 --- a/src/main/java/com/example/demo/security/SecurityConfig.java +++ b/src/main/java/com/example/demo/security/SecurityConfig.java @@ -60,7 +60,7 @@ public class SecurityConfig { request .requestMatchers( HttpMethod.POST, // 用户不登录就可以访问的路径 - "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**").permitAll() + "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**","/**").permitAll() .requestMatchers( "/error","alipay/**","/upload/**","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**" ).permitAll() diff --git a/src/main/java/com/example/demo/service/GeneralService.java b/src/main/java/com/example/demo/service/GeneralService.java new file mode 100644 index 0000000..530bc15 --- /dev/null +++ b/src/main/java/com/example/demo/service/GeneralService.java @@ -0,0 +1,17 @@ +package com.example.demo.service; + +import java.util.List; + +/** + * @program: GOLD + * @ClassName GeneralService + * @description: + * @author: huangqizhen + * @create: 2025−06-22 10:55 + * @Version 1.0 + **/ + +public interface GeneralService { + List getMarket(); + List getPlatform(); +} diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java new file mode 100644 index 0000000..5c6d8b5 --- /dev/null +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -0,0 +1,35 @@ +package com.example.demo.serviceImpl; + +import com.example.demo.mapper.GeneralMapper; +import com.example.demo.service.GeneralService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @program: GOLD + * @ClassName GeneralServiceImpl + * @description: + * @author: huangqizhen + * @create: 2025−06-22 11:01 + * @Version 1.0 + **/ +@Service +public class GeneralServiceImpl implements GeneralService { + + + @Autowired + private GeneralMapper generalMapper; + @Override + public List getMarket() { + List list = generalMapper.getMarket(); + return list; + } + + @Override + public List getPlatform() { + List list = generalMapper.getPlatform(); + return list; + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b7fab44..6d9081f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,6 +3,14 @@ spring: deserialization: fail-on-unknown-properties: false datasource: + mysql1: + jdbc-url: jdbc:mysql://localhost:3306/hwgold?serverTimezone=Asia/Shanghai + username: hwgold + password: 123456 + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + pool-name: mysql1HikariCP + maximum-pool-size: 10 # mysql1: # jdbc-url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai # username: hwgold @@ -11,14 +19,14 @@ spring: # hikari: # pool-name: mysql1HikariCP # maximum-pool-size: 10 - mysql1: - jdbc-url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai - username: hwgold - password: AGX4Z3YMxiCG3GR2 - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - pool-name: mysql1HikariCP - maximum-pool-size: 10 +# mysql1: +# jdbc-url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai +# username: hwgold +# password: AGX4Z3YMxiCG3GR2 +# driver-class-name: com.mysql.cj.jdbc.Driver +# hikari: +# pool-name: mysql1HikariCP +# maximum-pool-size: 10 # mysql2: # jdbc-url: jdbc:mysql://39.101.133.168:3306/hljw?serverTimezone=Asia/Shanghai # username: hljw @@ -69,12 +77,12 @@ mybatis: mysql1: map-underscore-to-camel-case: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mysql2: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mysql3: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# mysql2: +# map-underscore-to-camel-case: true +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# mysql3: +# map-underscore-to-camel-case: true +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl upload: path: D:\upload diff --git a/src/main/resources/mapper/GeneralMapper.xml b/src/main/resources/mapper/GeneralMapper.xml new file mode 100644 index 0000000..73522f5 --- /dev/null +++ b/src/main/resources/mapper/GeneralMapper.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file