Skip to content

C
cloud-platform
Commit e66ccbbc authored by 周健威's avatar 周健威
Browse files
Options

调整项目

parent cf7348f8
Hide whitespace changes
Inline Side-by-side
Showing with 1189 additions and 18 deletions
ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/CommonConstants.java
View file @ e66ccbbc
...@@ -13,6 +13,7 @@ public class CommonConstants { ...@@ -13,6 +13,7 @@ public class CommonConstants {
public static final Integer EX_CLIENT_INVALID_CODE = 40301; public static final Integer EX_CLIENT_INVALID_CODE = 40301;
public static final Integer EX_CLIENT_FORBIDDEN_CODE = 40331; public static final Integer EX_CLIENT_FORBIDDEN_CODE = 40331;
public static final Integer EX_OTHER_CODE = 500; public static final Integer EX_OTHER_CODE = 500;
public static final String CONTEXT_KEY_USER_TYPE = "currentUserType";
public static final String CONTEXT_KEY_USER_ID = "currentUserId"; public static final String CONTEXT_KEY_USER_ID = "currentUserId";
public static final String CONTEXT_KEY_USERNAME = "currentUserName"; public static final String CONTEXT_KEY_USERNAME = "currentUserName";
public static final String CONTEXT_KEY_USER_NAME = "currentUser"; public static final String CONTEXT_KEY_USER_NAME = "currentUser";
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/context/BaseContextHandler.java
View file @ e66ccbbc
...@@ -53,11 +53,6 @@ public class BaseContextHandler { ...@@ -53,11 +53,6 @@ public class BaseContextHandler {
return StringHelper.getObjectValue(value); return StringHelper.getObjectValue(value);
} }
// public static Integer getDataALL(){
// Object value = get(CommonConstants.CONTEXT_KEY_USER_NAME);
// return Integer.valueOf(StringHelper.getObjectValue(value));
// }
public static String getToken(){ public static String getToken(){
Object value = get(CommonConstants.CONTEXT_KEY_USER_TOKEN); Object value = get(CommonConstants.CONTEXT_KEY_USER_TOKEN);
return StringHelper.getObjectValue(value); return StringHelper.getObjectValue(value);
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/entity/BaseEntity.java 0 → 100644
View file @ e66ccbbc
package com.github.wxiaoqi.security.common.entity;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
import java.util.Date;
public class BaseEntity implements Serializable {
//主键
@Id
private Integer id;
//创建时间
@Column(name = "crt_time")
private Date crtTime;
//创建者id
@Column(name = "crt_user")
private String crtUser;
//创建者名称
@Column(name = "crt_name")
private String crtName;
//创建者ip
@Column(name = "crt_host")
private String crtHost;
//更新时间
@Column(name = "upd_time")
private Date updTime;
//更新者id
@Column(name = "upd_user")
private String updUser;
//更新者名称
@Column(name = "upd_name")
private String updName;
//更新者ip
@Column(name = "upd_host")
private String updHost;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Date getCrtTime() {
return crtTime;
}
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
public String getCrtUser() {
return crtUser;
}
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
public String getCrtName() {
return crtName;
}
public void setCrtName(String crtName) {
this.crtName = crtName;
}
public String getCrtHost() {
return crtHost;
}
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
public Date getUpdTime() {
return updTime;
}
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
public String getUpdUser() {
return updUser;
}
public void setUpdUser(String updUser) {
this.updUser = updUser;
}
public String getUpdName() {
return updName;
}
public void setUpdName(String updName) {
this.updName = updName;
}
public String getUpdHost() {
return updHost;
}
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
}
ace-modules/ace-generator/src/main/resources/application.yml
View file @ e66ccbbc
...@@ -10,9 +10,9 @@ spring: ...@@ -10,9 +10,9 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/world?useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8
username: root username: root
password: xx2019fc password: sslcloud123*()
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
......
ace-modules/ace-generator/src/main/resources/generator.properties
View file @ e66ccbbc
#代码生成器，配置信息 #代码生成器，配置信息
#包名 #包名
package=com.github.wxiaoqi.security.auth package=com.xxfc.platform.order
#作者 #作者
author=Mr.AG author=zjw
#Email #Email
email=463540703@qq.com email=nishijjo@qq.com
#表前错误的Unicode字符串! #表前错误的Unicode字符串!
tablePrefix=gate_ tablePrefix=
#前端模块前缀 #前端模块前缀
mainModule=auth mainModule=auth
......
application/application-api/pom.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>platform-common</artifactId>
<groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId>
<artifactId>application-api</artifactId>
</project>
\ No newline at end of file
application/application-server/pom.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>platform-web-common</artifactId>
<groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>application-server</artifactId>
<properties>
<mapper.version>3.4.0</mapper.version>
</properties>
<dependencies>
<!-- 自己项目 -->
<dependency>
<groupId>com.xxfc.platform</groupId>
<artifactId>application-api</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<finalName>application-server</finalName>
<plugins>
<!-- 此插件用来生成通用mapper的代码 -->
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.2</version>
<configuration>
<configurationFile>
${basedir}/src/main/resources/builder/generatorConfig.xml
</configurationFile>
<overwrite>true</overwrite>
<verbose>true</verbose>
</configuration>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.30</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper</artifactId>
<version>${mapper.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<!--<plugin>-->
<!--<groupId>com.spotify</groupId>-->
<!--<artifactId>docker-maven-plugin</artifactId>-->
<!--<version>${docker.plugin.version}</version>-->
<!--<executions>-->
<!--<execution>-->
<!--<phase>package</phase>-->
<!--<goals>-->
<!--<goal>build</goal>-->
<!--</goals>-->
<!--</execution>-->
<!--</executions>-->
<!--<configuration>-->
<!--<imageName>${docker.image.prefix}/${project.build.finalName}</imageName>-->
<!--<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>-->
<!--<resources>-->
<!--<resource>-->
<!--<targetPath>/</targetPath>-->
<!--<directory>${project.build.directory}</directory>-->
<!--<include>${project.build.finalName}.jar</include>-->
<!--</resource>-->
<!--</resources>-->
<!--</configuration>-->
<!--</plugin>-->
</plugins>
</build>
</project>
\ No newline at end of file
application/application-server/src/main/java/com/xxfc/platform/application/ApplicationApplication.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.application;
import com.ace.cache.EnableAceCache;
import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
import com.spring4all.swagger.EnableSwagger2Doc;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableDiscoveryClient
@EnableScheduling
@EnableAceAuthClient
@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.order.feign"})
@EnableAceCache
@MapperScan("com.xxfc.platform.order.mapper")
@EnableSwagger2Doc
public class ApplicationApplication {
public static void main(String[] args) {
SpringApplication.run(ApplicationApplication.class, args);
}
}
application/pom.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>com.xxfc.platform</groupId>
<modules>
<module>application-api</module>
<module>application-server</module>
</modules>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>application</artifactId>
</project>
\ No newline at end of file
common/platform-common/pom.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>platform-common</artifactId>
<groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<!-- ace -->
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<!-- 持久层 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.3</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
common/platform-web-common/pom.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>platform-common</artifactId>
<groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>platform-web-common</artifactId>
<properties>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
<!-- MyBatis Generator -->
<!-- Java接口和实体类 -->
<targetJavaProject>${basedir}/src/main/java</targetJavaProject>
<targetMapperPackage>com.xxfc.platform.order.mapper
</targetMapperPackage>
<targetModelPackage>com.xxfc.platform.order.entity
</targetModelPackage>
<!-- XML生成路径 -->
<targetResourcesProject>${basedir}/src/main/resources
</targetResourcesProject>
<targetXMLPackage>mapper</targetXMLPackage>
<!-- 依赖版本 -->
<mapper.version>3.4.0</mapper.version>
<mybatis.version>3.3.1</mybatis.version>
<mybatis.spring.version>1.2.4</mybatis.spring.version>
<poi.version>3.15</poi.version>
</properties>
<dependencies>
<!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>
<!-- 持久层 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- druid -->
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot2-starter</artifactId>
<version>1.1.10</version>
</dependency>
<!-- 加入batis通用mapper -->
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper-spring-boot-starter</artifactId>
<version>1.1.2</version>
</dependency>
<!-- 缓存 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!--nacos相关配置-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>0.2.1.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
</dependency>
<!--引入开源后台项目的公共包-->
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-interface</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-client</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<!-- 引用缓存开源项目 -->
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-cache</artifactId>
<version>0.0.2</version>
</dependency>
<!-- 其他 -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- swagger -->
<dependency>
<groupId>com.spring4all</groupId>
<artifactId>swagger-spring-boot-starter</artifactId>
<version>1.6.0.RELEASE</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
common/pom.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc</groupId>
<artifactId>common</artifactId>
<packaging>pom</packaging>
<modules>
<module>platform-common</module>
<module>platform-web-common</module>
</modules>
</project>
\ No newline at end of file
order/order-api/pom.xml
View file @ e66ccbbc
...@@ -3,13 +3,12 @@ ...@@ -3,13 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>order</artifactId> <artifactId>platform-common</artifactId>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.0-SNAPSHOT</version>
<groupId>com.xxfc.platform</groupId>
<artifactId>order-api</artifactId> <artifactId>order-api</artifactId>
</project> </project>
\ No newline at end of file
order/order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.entity;
import com.github.wxiaoqi.security.common.entity.BaseEntity;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
/**
*
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-05-15 21:30:33
*/
@Table(name = "base_order")
@Data
public class BaseOrder extends BaseEntity {
private static final long serialVersionUID = 1L;
//主键
@Id
private Integer id;
//订单号
@Column(name = "no")
private String no;
//订单类型
@Column(name = "type")
private Integer type;
//订单详情id
@Column(name = "detail_id")
private Integer detailId;
//订单状态
@Column(name = "status")
private Integer status;
//商品价格
@Column(name = "product_amount")
private BigDecimal productAmount;
//实际价格
@Column(name = "order_amount")
private BigDecimal orderAmount;
//详情json信息
@Column(name = "detail_json")
private String detailJson;
//第三方类型（支付渠道）
@Column(name = "third_type")
private Integer thirdType;
//流水号
@Column(name = "out_trade_no")
private String outTradeNo;
//创建时间
@Column(name = "crt_time")
private Date crtTime;
//创建者id
@Column(name = "crt_user")
private String crtUser;
//创建者名称
@Column(name = "crt_name")
private String crtName;
//创建者ip
@Column(name = "crt_host")
private String crtHost;
//更新时间
@Column(name = "upd_time")
private Date updTime;
//更新者id
@Column(name = "upd_user")
private String updUser;
//更新者名称
@Column(name = "upd_name")
private String updName;
//更新者ip
@Column(name = "upd_host")
private String updHost;
}
order/order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentCar.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
/**
* 租车订单详情
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-05-16 14:36:45
*/
@Table(name = "order_rent_car")
public class OrderRentCar implements Serializable {
private static final long serialVersionUID = 1L;
//主键
@Id
private Integer id;
//基础订单id
@Column(name = "order_id")
private Integer orderId;
//创建时间
@Column(name = "crt_time")
private Date crtTime;
//创建者id
@Column(name = "crt_user")
private String crtUser;
//创建者名称
@Column(name = "crt_name")
private String crtName;
//varchar(255)
@Column(name = "crt_host")
private String crtHost;
//datetime
@Column(name = "upd_time")
private Date updTime;
//varchar(255)
@Column(name = "upd_user")
private String updUser;
//varchar(255)
@Column(name = "upd_name")
private String updName;
//varchar(255)
@Column(name = "upd_host")
private String updHost;
/**
* 设置：主键
*/
public void setId(Integer id) {
this.id = id;
}
/**
* 获取：主键
*/
public Integer getId() {
return id;
}
/**
* 设置：基础订单id
*/
public void setOrderId(Integer orderId) {
this.orderId = orderId;
}
/**
* 获取：基础订单id
*/
public Integer getOrderId() {
return orderId;
}
/**
* 设置：创建时间
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* 获取：创建时间
*/
public Date getCrtTime() {
return crtTime;
}
/**
* 设置：创建者id
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* 获取：创建者id
*/
public String getCrtUser() {
return crtUser;
}
/**
* 设置：创建者名称
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* 获取：创建者名称
*/
public String getCrtName() {
return crtName;
}
/**
* 设置：varchar(255)
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* 获取：varchar(255)
*/
public String getCrtHost() {
return crtHost;
}
/**
* 设置：datetime
*/
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
/**
* 获取：datetime
*/
public Date getUpdTime() {
return updTime;
}
/**
* 设置：varchar(255)
*/
public void setUpdUser(String updUser) {
this.updUser = updUser;
}
/**
* 获取：varchar(255)
*/
public String getUpdUser() {
return updUser;
}
/**
* 设置：varchar(255)
*/
public void setUpdName(String updName) {
this.updName = updName;
}
/**
* 获取：varchar(255)
*/
public String getUpdName() {
return updName;
}
/**
* 设置：varchar(255)
*/
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
/**
* 获取：varchar(255)
*/
public String getUpdHost() {
return updHost;
}
}
order/order-api/src/main/java/com/xxfc/platform/order/vo/OrderVO.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.vo;
import com.xxfc.platform.order.entity.BaseOrder;
import lombok.Data;
import java.util.List;
@Data
public class OrderVO<OrderDetail> {
BaseOrder baseOrder;
List<OrderDetail> orderDetails;
}
order/order-server/pom.xml
View file @ e66ccbbc
...@@ -3,12 +3,95 @@ ...@@ -3,12 +3,95 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>order</artifactId> <artifactId>platform-web-common</artifactId>
<groupId>com.xxfc.platform</groupId> <groupId>com.xxfc.common</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>order-server</artifactId> <artifactId>order-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>order-server</name>
<description>订单管理</description>
<properties>
<mapper.version>3.4.0</mapper.version>
</properties>
<dependencies>
<!-- 自己项目 -->
<dependency>
<groupId>com.xxfc.platform</groupId>
<artifactId>order-api</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<finalName>order-server</finalName>
<plugins>
<!-- 此插件用来生成通用mapper的代码 -->
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.2</version>
<configuration>
<configurationFile>
${basedir}/src/main/resources/builder/generatorConfig.xml
</configurationFile>
<overwrite>true</overwrite>
<verbose>true</verbose>
</configuration>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.30</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper</artifactId>
<version>${mapper.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<!--<plugin>-->
<!--<groupId>com.spotify</groupId>-->
<!--<artifactId>docker-maven-plugin</artifactId>-->
<!--<version>${docker.plugin.version}</version>-->
<!--<executions>-->
<!--<execution>-->
<!--<phase>package</phase>-->
<!--<goals>-->
<!--<goal>build</goal>-->
<!--</goals>-->
<!--</execution>-->
<!--</executions>-->
<!--<configuration>-->
<!--<imageName>${docker.image.prefix}/${project.build.finalName}</imageName>-->
<!--<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>-->
<!--<resources>-->
<!--<resource>-->
<!--<targetPath>/</targetPath>-->
<!--<directory>${project.build.directory}</directory>-->
<!--<include>${project.build.finalName}.jar</include>-->
<!--</resource>-->
<!--</resources>-->
<!--</configuration>-->
<!--</plugin>-->
</plugins>
</build>
</project> </project>
\ No newline at end of file
order/order-server/src/main/java/com/xxfc/platform/order/OrderApplication.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order;
import com.ace.cache.EnableAceCache;
import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
import com.spring4all.swagger.EnableSwagger2Doc;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableDiscoveryClient
@EnableScheduling
@EnableAceAuthClient
@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.order.feign"})
@EnableAceCache
@MapperScan("com.xxfc.platform.order.mapper")
@EnableSwagger2Doc
public class OrderApplication {
public static void main(String[] args) {
SpringApplication.run(OrderApplication.class, args);
}
}
order/order-server/src/main/java/com/xxfc/platform/order/biz/OrderRentCarBiz.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.biz;
import com.xxfc.platform.order.mapper.OrderRentCarMapper;
import org.springframework.stereotype.Service;
import com.xxfc.platform.order.entity.OrderRentCar;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
/**
* 租车订单详情
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-05-16 14:36:45
*/
@Service
public class OrderRentCarBiz extends BaseBiz<OrderRentCarMapper,OrderRentCar> {
}
\ No newline at end of file
order/order-server/src/main/java/com/xxfc/platform/order/mapper/OrderRentCarMapper.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.OrderRentCar;
import tk.mybatis.mapper.common.Mapper;
/**
* 租车订单详情
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-05-16 14:36:45
*/
public interface OrderRentCarMapper extends Mapper<OrderRentCar> {
}
order/order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentCarController.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.rest;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.CommonBaseController;
import com.xxfc.platform.order.entity.OrderRentCar;
import com.xxfc.platform.order.service.OrderRentCarService;
import com.xxfc.platform.order.vo.OrderVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
@Controller
@RequestMapping("orderRentCar")
public class OrderRentCarController extends CommonBaseController {
@Autowired
OrderRentCarService orderRentCarService;
@RequestMapping(value = "add",method = RequestMethod.POST)
@ResponseBody
public ObjectRestResponse<OrderRentCar> add(@RequestBody OrderVO<OrderRentCar> vo){
orderRentCarService.createOrder(vo);
return new ObjectRestResponse<OrderRentCar>();
}
}
\ No newline at end of file
order/order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.service;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.xxfc.platform.order.biz.BaseOrderBiz;
import com.xxfc.platform.order.vo.OrderVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
public abstract class AbstractOrderHandle<Biz extends BaseBiz, VO extends OrderVO> implements OrderHandle {
@Autowired
protected Biz DetailOrderBiz;
@Autowired
protected BaseOrderBiz baseOrderBiz;
public void createOrder(VO vo) {
baseOrderBiz.insertSelective(vo.getBaseOrder());
}
public void modifyOrder(VO vo) {
baseOrderBiz.updateSelectiveById(vo.getBaseOrder());
}
}
order/order-server/src/main/java/com/xxfc/platform/order/service/OrderHandle.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.service;
public interface OrderHandle {
// public void addOrder();
// public void updateOrder();
// public void updateOrder();
}
order/order-server/src/main/java/com/xxfc/platform/order/service/OrderRentCarService.java 0 → 100644
View file @ e66ccbbc
package com.xxfc.platform.order.service;
import org.springframework.stereotype.Service;
@Service
public class OrderRentCarService extends AbstractOrderHandle {
}
order/order-server/src/main/resources/application.yml 0 → 100644
View file @ e66ccbbc
server:
port: 8091
tomcat:
uri-encoding: UTF-8
logging:
level:
com.xxfc.platform.order.mapper: debug
spring:
application:
name: order-server
datasource:
database: xxfc_order
name: test
url: jdbc:mysql://${MYSQL_HOST:10.5.52.3}:${MYSQL_PORT:3306}/xxfc_order?useUnicode=true&characterEncoding=UTF8
username: root
password: sslcloud123*()
# 使用druid数据源
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
filters: stat
maxActive: 20
initialSize: 1
maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
validationQuery: select 'x'
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
cloud:
nacos:
discovery:
server-addr: localhost:8848
sentinel:
transport:
dashboard: localhost:8080
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
default-property-inclusion: non_null
#--------------------以下为redis相关配置----------------------
redis:
database: 2
host: ${REDIS_HOST:10.5.52.3}
port: ${REDIS_PORT:6379}
password: xx2019fc
jedis:
pool:
max-active: 20
#--------------------以下为mybatis相关配置----------------------
mybatis:
type-aliases-package: com.xxfc.platform.order.entity
mapper-locations: classpath*:mapper/*.xml
basepackage: com.xxfc.platform.order.mapper
xmlLocation: classpath*:mapper/*.xml
configuration:
map-underscore-to-camel-case: true
#--------------------以下为开源项目验证相关配置----------------------
auth:
serviceId: order-server
user:
token-header: Authorization
client:
token-header: x-client-token
#不填则默认读取spring.application.name
id: order-server
secret: 123456
#--------------------#redis-cache 相关----------------------
redis:
pool:
maxActive: 300
maxIdle: 100
maxWait: 1000
host: ${REDIS_HOST:10.5.52.3}
port: ${REDIS_PORT:6379}
password: xx2019fc
timeout: 2000
# 服务或应用名
sysName: order-server
enable: true
database: 0
order/order-server/src/main/resources/bootstrap.yml 0 → 100644
View file @ e66ccbbc
spring:
profiles:
active: dev
application:
name: order-server
cloud:
nacos:
config:
file-extension: yaml
---
spring:
profiles: dev
cloud:
nacos:
config:
server-addr: 127.0.0.1:8848
---
spring:
profiles: pro
cloud:
nacos:
config:
server-addr: 10.5.52.2:8848
\ No newline at end of file
order/order-server/src/main/resources/builder/generatorConfig.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE generatorConfiguration
PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
<!--<properties resource="dev.properties"/>-->
<context id="Mysql" targetRuntime="MyBatis3Simple" defaultModelType="flat">
<property name="beginningDelimiter" value="`"/>
<property name="endingDelimiter" value="`"/>
<property name="mergeable" value="false"></property>
<plugin type="tk.mybatis.mapper.generator.MapperPlugin">
<property name="mappers" value="tk.mybatis.mapper.common.Mapper"/>
</plugin>
<jdbcConnection driverClass="com.mysql.jdbc.Driver"
connectionURL="jdbc:mysql://localhost:3306/vehicle?useUnicode=true&amp;characterEncoding=UTF8"
userId="root"
password="xx2019fc">
</jdbcConnection>
<javaModelGenerator targetPackage="${targetModelPackage}" targetProject="${targetJavaProject}"/>
<sqlMapGenerator targetPackage="${targetXMLPackage}" targetProject="${targetResourcesProject}"/>
<javaClientGenerator targetPackage="${targetMapperPackage}" targetProject="${targetJavaProject}"
type="XMLMAPPER"/>
<!-- <table tableName="vehicle" domainObjectName="Vehicle">-->
<!-- </table>-->
<!-- <table tableName="vehicle_book_info" domainObjectName="VehicleBookInfo">-->
<!-- </table>-->
<!-- <table tableName="vehicle_book_record" domainObjectName="VehicleBookRecord">-->
<!-- </table>-->
<!-- <table tableName="branch_company" domainObjectName="BranchCompany">-->
<!-- </table>-->
<!-- <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
<!-- <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
<table tableName="vehicle_upkeep_item" domainObjectName="VehicleUpkeepItem"></table>
<table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>
</context>
</generatorConfiguration>
\ No newline at end of file
order/order-server/src/main/resources/mapper/BaseOrderMapper.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxfc.platform.order.mapper.BaseOrderMapper">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.xxfc.platform.order.entity.BaseOrder" id="baseOrderMap">
<result property="id" column="id"/>
<result property="no" column="no"/>
<result property="type" column="type"/>
<result property="detailId" column="detail_id"/>
<result property="status" column="status"/>
<result property="productAmount" column="product_amount"/>
<result property="orderAmount" column="order_amount"/>
<result property="detailJson" column="detail_json"/>
<result property="thirdType" column="third_type"/>
<result property="outTradeNo" column="out_trade_no"/>
<result property="crtTime" column="crt_time"/>
<result property="crtUser" column="crt_user"/>
<result property="crtName" column="crt_name"/>
<result property="crtHost" column="crt_host"/>
<result property="updTime" column="upd_time"/>
<result property="updUser" column="upd_user"/>
<result property="updName" column="upd_name"/>
<result property="updHost" column="upd_host"/>
</resultMap>
</mapper>
\ No newline at end of file
order/order-server/src/main/resources/mapper/OrderRentCarMapper.xml 0 → 100644
View file @ e66ccbbc
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxfc.platform.order.mapper.OrderRentCarMapper">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.xxfc.platform.order.entity.OrderRentCar" id="orderRentCarMap">
<result property="id" column="id"/>
<result property="orderId" column="order_id"/>
<result property="crtTime" column="crt_time"/>
<result property="crtUser" column="crt_user"/>
<result property="crtName" column="crt_name"/>
<result property="crtHost" column="crt_host"/>
<result property="updTime" column="upd_time"/>
<result property="updUser" column="upd_user"/>
<result property="updName" column="upd_name"/>
<result property="updHost" column="upd_host"/>
</resultMap>
</mapper>
\ No newline at end of file
pom.xml
View file @ e66ccbbc
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
<module>xx-third-party</module> <module>xx-third-party</module>
<module>xx-third-party-api</module> <module>xx-third-party-api</module>
<module>vehicle</module> <module>vehicle</module>
<module>application</module>
<module>common</module>
<module>order</module> <module>order</module>
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>
......
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