Skip to content

D
dm_project
Commit 37b205bb authored by zhangc's avatar zhangc
Browse files
Options

Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev 

 Conflicts:
	jz-dm-mall/src/main/resources/application-test.yml
parents d89a6591 4b65d01d
Show whitespace changes
Inline Side-by-side
Showing with 310 additions and 258 deletions
jz-dm-common/pom.xml
View file @ 37b205bb
...@@ -74,6 +74,11 @@ ...@@ -74,6 +74,11 @@
<version>RELEASE</version> <version>RELEASE</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!--阿里云服务器短信平台--> <!--阿里云服务器短信平台-->
<dependency> <dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
......
jz-dm-common/src/main/java/com/jz/common/utils/SessionUtils.java 0 → 100644
View file @ 37b205bb
package com.jz.common.utils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* @ClassName:
* @Author: Carl
* @Date: 2020/12/3
* @Version:
*/
public class SessionUtils {
/**
* 把数据存储到session中
* @param objName 存储到session中的对象的变量名
* @param o 存储的任意数据
*/
public static void push(String objName, Object o) {
HttpServletRequest request =
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
request.getSession().setAttribute(objName, o);
}
/**
* 从session中获取数据
* @param objName 存储到session中的对象的变量名
*/
public static Object pop(String objName) {
HttpServletRequest request =
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
return request.getSession().getAttribute(objName);
}
}
jz-dm-mall/pom.xml
View file @ 37b205bb
...@@ -74,10 +74,10 @@ ...@@ -74,10 +74,10 @@
</dependency> </dependency>
<!-- spring boot 和mybatis --> <!-- spring boot 和mybatis -->
<dependency> <!--<dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
</dependency> </dependency>-->
<!-- mybatis plus --> <!-- mybatis plus -->
<dependency> <dependency>
......
jz-dm-mall/src/main/java/com/jz/dm/mall/config/DatabaseConfig.java
View file @ 37b205bb
package com.jz.dm.mall.config; //package com.jz.dm.mall.config;
//
import com.alibaba.druid.pool.DruidDataSource; //import com.alibaba.druid.pool.DruidDataSource;
import org.apache.ibatis.session.SqlSessionFactory; //import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean; //import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.annotation.MapperScan; //import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier; //import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties; //import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; //import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver; //import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager; //import org.springframework.jdbc.datasource.DataSourceTransactionManager;
//
import javax.sql.DataSource; //import javax.sql.DataSource;
import java.sql.SQLException; //import java.sql.SQLException;
//
/** ///**
* @ProjectName zhaxinle // * @ProjectName zhaxinle
* @Author: zeroJun // * @Author: zeroJun
* @Date: 2018/8/16 16:49 // * @Date: 2018/8/16 16:49
* @Description: 主数据源配置类 // * @Description: 主数据源配置类
*/ // */
@Configuration //@Configuration
// 前缀为primary.datasource.druid的配置信息 //// 前缀为primary.datasource.druid的配置信息
@ConfigurationProperties(prefix = "spring.datasource") //@ConfigurationProperties(prefix = "spring.datasource")
@MapperScan(basePackages = DatabaseConfig.PACKAGE, sqlSessionFactoryRef = "sqlSessionFactory") //@MapperScan(basePackages = DatabaseConfig.PACKAGE, sqlSessionFactoryRef = "sqlSessionFactory")
public class DatabaseConfig { //public class DatabaseConfig {
//
/** // /**
* dao层的包路径 // * dao层的包路径
*/ // */
static final String PACKAGE = "com.jz.dm.mall.moduls.mapper"; // static final String PACKAGE = "com.jz.dm.mall.moduls.mapper";
//
/** // /**
* mapper文件的相对路径 // * mapper文件的相对路径
*/ // */
private static final String MAPPER_LOCATION = "classpath:mapperconf/*.xml"; // private static final String MAPPER_LOCATION = "classpath:mapperconf/*.xml";
//
private String filters; // private String filters;
private String url; // private String url;
private String username; // private String username;
private String password; // private String password;
private String driverClassName; // private String driverClassName;
private int initialSize; // private int initialSize;
private int minIdle; // private int minIdle;
private int maxActive; // private int maxActive;
private long maxWait; // private long maxWait;
private long timeBetweenEvictionRunsMillis; // private long timeBetweenEvictionRunsMillis;
private long minEvictableIdleTimeMillis; // private long minEvictableIdleTimeMillis;
private String validationQuery; // private String validationQuery;
private boolean testWhileIdle; // private boolean testWhileIdle;
private boolean testOnBorrow; // private boolean testOnBorrow;
private boolean testOnReturn; // private boolean testOnReturn;
private boolean poolPreparedStatements; // private boolean poolPreparedStatements;
private int maxPoolPreparedStatementPerConnectionSize; // private int maxPoolPreparedStatementPerConnectionSize;
//
// 主数据源使用@Primary注解进行标识 // // 主数据源使用@Primary注解进行标识
//@Primary // //@Primary
@Bean(name = "dataSource") // @Bean(name = "dataSource")
public DataSource dataSource() throws SQLException { // public DataSource dataSource() throws SQLException {
DruidDataSource druid = new DruidDataSource(); // DruidDataSource druid = new DruidDataSource();
// 监控统计拦截的filters // // 监控统计拦截的filters
druid.setFilters(filters); // druid.setFilters(filters);
//
// 配置基本属性 // // 配置基本属性
druid.setDriverClassName(driverClassName); // druid.setDriverClassName(driverClassName);
druid.setUsername(username); // druid.setUsername(username);
druid.setPassword(password); // druid.setPassword(password);
druid.setUrl(url); // druid.setUrl(url);
//
//初始化时建立物理连接的个数 // //初始化时建立物理连接的个数
druid.setInitialSize(initialSize); // druid.setInitialSize(initialSize);
//最大连接池数量 // //最大连接池数量
druid.setMaxActive(maxActive); // druid.setMaxActive(maxActive);
//最小连接池数量 // //最小连接池数量
druid.setMinIdle(minIdle); // druid.setMinIdle(minIdle);
//获取连接时最大等待时间，单位毫秒。 // //获取连接时最大等待时间，单位毫秒。
druid.setMaxWait(maxWait); // druid.setMaxWait(maxWait);
//间隔多久进行一次检测，检测需要关闭的空闲连接 // //间隔多久进行一次检测，检测需要关闭的空闲连接
druid.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); // druid.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
//一个连接在池中最小生存的时间 // //一个连接在池中最小生存的时间
druid.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis); // druid.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
//用来检测连接是否有效的sql // //用来检测连接是否有效的sql
druid.setValidationQuery(validationQuery); // druid.setValidationQuery(validationQuery);
//建议配置为true，不影响性能，并且保证安全性。 // //建议配置为true，不影响性能，并且保证安全性。
druid.setTestWhileIdle(testWhileIdle); // druid.setTestWhileIdle(testWhileIdle);
//申请连接时执行validationQuery检测连接是否有效 // //申请连接时执行validationQuery检测连接是否有效
druid.setTestOnBorrow(testOnBorrow); // druid.setTestOnBorrow(testOnBorrow);
druid.setTestOnReturn(testOnReturn); // druid.setTestOnReturn(testOnReturn);
//是否缓存preparedStatement，也就是PSCache，oracle设为true，mysql设为false。分库分表较多推荐设置为false // //是否缓存preparedStatement，也就是PSCache，oracle设为true，mysql设为false。分库分表较多推荐设置为false
druid.setPoolPreparedStatements(poolPreparedStatements); // druid.setPoolPreparedStatements(poolPreparedStatements);
// 打开PSCache时，指定每个连接上PSCache的大小 // // 打开PSCache时，指定每个连接上PSCache的大小
druid.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize); // druid.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
//
return druid; // return druid;
} // }
//
// 创建该数据源的事务管理 // // 创建该数据源的事务管理
@Primary // @Primary
@Bean(name = "transactionManager") // @Bean(name = "transactionManager")
public DataSourceTransactionManager transactionManager() throws SQLException { // public DataSourceTransactionManager transactionManager() throws SQLException {
return new DataSourceTransactionManager(dataSource()); // return new DataSourceTransactionManager(dataSource());
} // }
//
// 创建Mybatis的连接会话工厂实例 // // 创建Mybatis的连接会话工厂实例
@Primary // @Primary
@Bean(name = "sqlSessionFactory") // @Bean(name = "sqlSessionFactory")
public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception { // public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception {
final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); // final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
sessionFactory.setDataSource(dataSource); // 设置数据源bean // sessionFactory.setDataSource(dataSource); // 设置数据源bean
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver() // sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
.getResources(DatabaseConfig.MAPPER_LOCATION)); // 设置mapper文件路径 // .getResources(DatabaseConfig.MAPPER_LOCATION)); // 设置mapper文件路径
//
return sessionFactory.getObject(); // return sessionFactory.getObject();
} // }
//
public String getFilters() { // public String getFilters() {
return filters; // return filters;
} // }
//
public void setFilters(String filters) { // public void setFilters(String filters) {
this.filters = filters; // this.filters = filters;
} // }
//
public String getUrl() { // public String getUrl() {
return url; // return url;
} // }
//
public void setUrl(String url) { // public void setUrl(String url) {
this.url = url; // this.url = url;
} // }
//
public String getUsername() { // public String getUsername() {
return username; // return username;
} // }
//
public void setUsername(String username) { // public void setUsername(String username) {
this.username = username; // this.username = username;
} // }
//
public String getPassword() { // public String getPassword() {
return password; // return password;
} // }
//
public void setPassword(String password) { // public void setPassword(String password) {
this.password = password; // this.password = password;
} // }
//
public String getDriverClassName() { // public String getDriverClassName() {
return driverClassName; // return driverClassName;
} // }
//
public void setDriverClassName(String driverClassName) { // public void setDriverClassName(String driverClassName) {
this.driverClassName = driverClassName; // this.driverClassName = driverClassName;
} // }
//
public int getInitialSize() { // public int getInitialSize() {
return initialSize; // return initialSize;
} // }
//
public void setInitialSize(int initialSize) { // public void setInitialSize(int initialSize) {
this.initialSize = initialSize; // this.initialSize = initialSize;
} // }
//
public int getMinIdle() { // public int getMinIdle() {
return minIdle; // return minIdle;
} // }
//
public void setMinIdle(int minIdle) { // public void setMinIdle(int minIdle) {
this.minIdle = minIdle; // this.minIdle = minIdle;
} // }
//
public int getMaxActive() { // public int getMaxActive() {
return maxActive; // return maxActive;
} // }
//
public void setMaxActive(int maxActive) { // public void setMaxActive(int maxActive) {
this.maxActive = maxActive; // this.maxActive = maxActive;
} // }
//
public long getMaxWait() { // public long getMaxWait() {
return maxWait; // return maxWait;
} // }
//
public void setMaxWait(long maxWait) { // public void setMaxWait(long maxWait) {
this.maxWait = maxWait; // this.maxWait = maxWait;
} // }
//
public long getTimeBetweenEvictionRunsMillis() { // public long getTimeBetweenEvictionRunsMillis() {
return timeBetweenEvictionRunsMillis; // return timeBetweenEvictionRunsMillis;
} // }
//
public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) { // public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis; // this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
} // }
//
public long getMinEvictableIdleTimeMillis() { // public long getMinEvictableIdleTimeMillis() {
return minEvictableIdleTimeMillis; // return minEvictableIdleTimeMillis;
} // }
//
public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) { // public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis; // this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
} // }
//
public String getValidationQuery() { // public String getValidationQuery() {
return validationQuery; // return validationQuery;
} // }
//
public void setValidationQuery(String validationQuery) { // public void setValidationQuery(String validationQuery) {
this.validationQuery = validationQuery; // this.validationQuery = validationQuery;
} // }
//
public boolean isTestWhileIdle() { // public boolean isTestWhileIdle() {
return testWhileIdle; // return testWhileIdle;
} // }
//
public void setTestWhileIdle(boolean testWhileIdle) { // public void setTestWhileIdle(boolean testWhileIdle) {
this.testWhileIdle = testWhileIdle; // this.testWhileIdle = testWhileIdle;
} // }
//
public boolean isTestOnBorrow() { // public boolean isTestOnBorrow() {
return testOnBorrow; // return testOnBorrow;
} // }
//
public void setTestOnBorrow(boolean testOnBorrow) { // public void setTestOnBorrow(boolean testOnBorrow) {
this.testOnBorrow = testOnBorrow; // this.testOnBorrow = testOnBorrow;
} // }
//
public boolean isTestOnReturn() { // public boolean isTestOnReturn() {
return testOnReturn; // return testOnReturn;
} // }
//
public void setTestOnReturn(boolean testOnReturn) { // public void setTestOnReturn(boolean testOnReturn) {
this.testOnReturn = testOnReturn; // this.testOnReturn = testOnReturn;
} // }
//
public boolean isPoolPreparedStatements() { // public boolean isPoolPreparedStatements() {
return poolPreparedStatements; // return poolPreparedStatements;
} // }
//
public void setPoolPreparedStatements(boolean poolPreparedStatements) { // public void setPoolPreparedStatements(boolean poolPreparedStatements) {
this.poolPreparedStatements = poolPreparedStatements; // this.poolPreparedStatements = poolPreparedStatements;
} // }
//
public int getMaxPoolPreparedStatementPerConnectionSize() { // public int getMaxPoolPreparedStatementPerConnectionSize() {
return maxPoolPreparedStatementPerConnectionSize; // return maxPoolPreparedStatementPerConnectionSize;
} // }
//
public void setMaxPoolPreparedStatementPerConnectionSize(int maxPoolPreparedStatementPerConnectionSize) { // public void setMaxPoolPreparedStatementPerConnectionSize(int maxPoolPreparedStatementPerConnectionSize) {
this.maxPoolPreparedStatementPerConnectionSize = maxPoolPreparedStatementPerConnectionSize; // this.maxPoolPreparedStatementPerConnectionSize = maxPoolPreparedStatementPerConnectionSize;
} // }
//
} //}
\ No newline at end of file \ No newline at end of file
jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/finance/FinanceTradeFlowController.java
View file @ 37b205bb
...@@ -37,7 +37,6 @@ public class FinanceTradeFlowController extends BaseController { ...@@ -37,7 +37,6 @@ public class FinanceTradeFlowController extends BaseController {
@GetMapping(value = "/getAccountMoney") @GetMapping(value = "/getAccountMoney")
@ApiOperation(value = "充值----获取账户余额", notes = "获取账户余额") @ApiOperation(value = "充值----获取账户余额", notes = "获取账户余额")
public Result<OrderDto> getAccountMoney(HttpServletRequest req) throws Exception { public Result<OrderDto> getAccountMoney(HttpServletRequest req) throws Exception {
return new Result<>(); return new Result<>();
} }
......
jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/entity/FinanceTradeFlow.java
View file @ 37b205bb
package com.jz.dm.mall.moduls.entity; package com.jz.dm.mall.moduls.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -20,6 +22,7 @@ public class FinanceTradeFlow implements Serializable { ...@@ -20,6 +22,7 @@ public class FinanceTradeFlow implements Serializable {
/** /**
* 交易流水id * 交易流水id
*/ */
@TableId(value = "trade_flow_id",type = IdType.AUTO)
private Long tradeFlowId; private Long tradeFlowId;
/** /**
* 订单id * 订单id
......
jz-dm-mall/src/main/resources/application-test.yml
View file @ 37b205bb
...@@ -56,6 +56,14 @@ spring: ...@@ -56,6 +56,14 @@ spring:
- 192.168.31.167:6382 - 192.168.31.167:6382
- 192.168.31.167:6383 - 192.168.31.167:6383
- 192.168.31.167:6384 - 192.168.31.167:6384
#mybatis的配置
mybatis:
#配置mapper.xml文件所在路径
mapper-locations: classpath:mapperconf/*.xml
#配置映射类所在的包名
type-aliases-package: com.jz.dm.mall.moduls.entity
logging: logging:
level: level:
com.jz.manage: debug com.jz.manage: debug
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment