记得上下班打卡 | git大法好,push需谨慎

Commit d981360a authored by anjiabin's avatar anjiabin

提交client-job相关代码

parent aedb3efa
<?xml version="1.0" encoding="UTF-8"?> <?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" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>liquidnet-bus-v1</artifactId>
<groupId>com.liquidnet</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.liquidnet</groupId> <groupId>com.liquidnet</groupId>
...@@ -48,54 +54,4 @@ ...@@ -48,54 +54,4 @@
<version>1.5.21</version> <version>1.5.21</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<includeSystemScope>true</includeSystemScope><!--外部进行打包-->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<compilerArguments>
<extdirs>libs</extdirs>
</compilerArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<includeFilterFile>findbugs.xml</includeFilterFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -4,13 +4,15 @@ import com.github.pagehelper.PageInfo; ...@@ -4,13 +4,15 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.controller.BaseController; import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao; import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam; import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/** /**
...@@ -43,9 +45,9 @@ public class KylinPerformancesController extends BaseController ...@@ -43,9 +45,9 @@ public class KylinPerformancesController extends BaseController
@ResponseBody @ResponseBody
public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam)
{ {
startPage(); startPage();/**/
// PageInfo<PerformanceAdminListDao> result = null; PageInfo<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
return getDataTable(kylinPerformancesService.getList(performanceAdminListParam).getList()); return getDataTable(result.getList());
// if (null != result) { // if (null != result) {
// return ResponseDto.success(result); // return ResponseDto.success(result);
// } else { // } else {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<label>排序字段:</label> <label>排序字段:</label>
<select name="orderItem"> <select name="orderItem">
<option value="">所有</option> <option value="">所有</option>
<option value="createdAt">创建时间</option> <option value="created_at">创建时间</option>
<option value="updatedAt">修改时间</option> <option value="updatedAt">修改时间</option>
</select> </select>
</li> </li>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
sortName: "sort", // sortName: "sort",
modalName: "演出", modalName: "演出",
columns: [{ columns: [{
checkbox: true checkbox: true
......
...@@ -201,7 +201,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -201,7 +201,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
public PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) { public PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
PageInfo<PerformanceAdminListDao> pageInfoTmp = null; PageInfo<PerformanceAdminListDao> pageInfoTmp = null;
try { try {
PageHelper.startPage(performanceAdminListParam.getPageNum(), performanceAdminListParam.getPageSize()); // PageHelper.startPage(performanceAdminListParam.getPageNum(), performanceAdminListParam.getPageSize());
List<PerformanceAdminListDao> newList = new ArrayList(); List<PerformanceAdminListDao> newList = new ArrayList();
List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(BeanUtil.convertBeanToMap(performanceAdminListParam)); List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(BeanUtil.convertBeanToMap(performanceAdminListParam));
for (PerformanceAdminListDao item:voList){ for (PerformanceAdminListDao item:voList){
......
<?xml version="1.0" encoding="UTF-8"?> <?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" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>liquidnet-bus-client</artifactId>
<groupId>com.liquidnet</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.liquidnet</groupId> <groupId>com.liquidnet</groupId>
...@@ -42,7 +48,7 @@ ...@@ -42,7 +48,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>2.2.2.RELEASE</version> <version>${spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
......
...@@ -11,18 +11,6 @@ ...@@ -11,18 +11,6 @@
<artifactId>liquidnet-client-job</artifactId> <artifactId>liquidnet-client-job</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- <dependencyManagement>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-parent</artifactId>-->
<!-- <version>${spring-boot.version}</version>-->
<!-- <type>pom</type>-->
<!-- <scope>import</scope>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </dependencyManagement>-->
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
......
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
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>
<artifactId>liquidnet-bus-v1</artifactId>
<groupId>com.liquidnet</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>liquidnet-bus-client</artifactId> <artifactId>liquidnet-bus-client</artifactId>
...@@ -23,89 +28,26 @@ ...@@ -23,89 +28,26 @@
</distributionManagement> </distributionManagement>
<modules> <modules>
<!-- <module>liquidnet-client-admin</module>--> <module>liquidnet-client-admin</module>
<!-- <module>liquidnet-client-job</module>--> <module>liquidnet-client-job</module>
</modules> </modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
</properties>
<dependencies>
</dependencies>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- SpringBoot的依赖配置-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>2.2.2.RELEASE</version> <version>${spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR1</version> <version>${spring-cloud.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build>
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<includeSystemScope>true</includeSystemScope><!--外部进行打包-->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<compilerArguments>
<extdirs>libs</extdirs>
</compilerArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<includeFilterFile>findbugs.xml</includeFilterFile>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>
\ No newline at end of file
...@@ -30,4 +30,9 @@ liquidnet: ...@@ -30,4 +30,9 @@ liquidnet:
port: 27017 port: 27017
user: root user: root
pwd: S&y$6d*JwJ pwd: S&y$6d*JwJ
service:
executor-main:
xxl:
admin:
addresses: 127.0.0.1:8090
#application-dev-end #application-dev-end
\ No newline at end of file
...@@ -7,4 +7,4 @@ liquidnet: ...@@ -7,4 +7,4 @@ liquidnet:
name: client-job name: client-job
path: ./logs path: ./logs
mysql: mysql:
database-name: liquidnet_clijob database-name: dev_ln_clijob
\ No newline at end of file \ No newline at end of file
...@@ -5,9 +5,12 @@ server: ...@@ -5,9 +5,12 @@ server:
context-path: ${liquidnet.info.context} context-path: ${liquidnet.info.context}
management: management:
server: server:
servlet: servlet:
context-path: /actuator context-path: /actuator
health:
mail:
enabled: false
spring: spring:
...@@ -33,6 +36,7 @@ spring: ...@@ -33,6 +36,7 @@ spring:
maximum-pool-size: 30 maximum-pool-size: 30
minimum-idle: 10 minimum-idle: 10
pool-name: HikariCP pool-name: HikariCP
validation-timeout: 1000
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
mvc: mvc:
servlet: servlet:
...@@ -53,6 +57,8 @@ spring: ...@@ -53,6 +57,8 @@ spring:
host: smtp.gmail.com host: smtp.gmail.com
password: gdczsltecflrhyjn password: gdczsltecflrhyjn
port: 587 port: 587
username: liquidnet@lightnet.io
from: iquidnet@lightnet.io
properties: properties:
mail: mail:
smtp: smtp:
...@@ -62,7 +68,7 @@ spring: ...@@ -62,7 +68,7 @@ spring:
starttls: starttls:
enable: true enable: true
required: true required: true
username: liquidnet@lightnet.io
# Eureka # Eureka
eureka: eureka:
......
...@@ -10,6 +10,7 @@ liquidnet: ...@@ -10,6 +10,7 @@ liquidnet:
accessToken: qk52rqSejRBm9enf6BTTxw== accessToken: qk52rqSejRBm9enf6BTTxw==
admin: admin:
# Job执行器注册地址,多个地址则用逗号分隔 # Job执行器注册地址,多个地址则用逗号分隔
# addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
addresses: ${liquidnet.service.executor-main.xxl.admin.addresses} addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
executor: executor:
# Job执行器IP,默认为空表示自动获取IP,多网卡时手动指定 # Job执行器IP,默认为空表示自动获取IP,多网卡时手动指定
......
...@@ -69,11 +69,11 @@ spring: ...@@ -69,11 +69,11 @@ spring:
refreshable: none refreshable: none
autoconfigure: autoconfigure:
exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
rabbitmq: # rabbitmq:
addresses: ${liquidnet.rabbitmq.host} # addresses: ${liquidnet.rabbitmq.host}
port: ${liquidnet.rabbitmq.port} # port: ${liquidnet.rabbitmq.port}
username: ${liquidnet.rabbitmq.username} # username: ${liquidnet.rabbitmq.username}
password: ${liquidnet.rabbitmq.password} # password: ${liquidnet.rabbitmq.password}
# datasource: # datasource:
# name: liquidnet_bus_db # name: liquidnet_bus_db
# url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=UTC&characterEncoding=utf-8&useSSL=false # url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=UTC&characterEncoding=utf-8&useSSL=false
......
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
AND p.time_end BETWEEN #{stopSellTime} AND NOW() AND p.time_end BETWEEN #{stopSellTime} AND NOW()
</if> </if>
</where> </where>
ORDER BY #{orderItem} #{orderSc} ORDER BY ${orderItem} ${orderSc}
</select> </select>
<!-- Mis 根据巡演查询演出列表 --> <!-- Mis 根据巡演查询演出列表 -->
<select id="misTitleByRoadShowIdList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult"> <select id="misTitleByRoadShowIdList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult">
......
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
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>spring-boot-starter-parent</artifactId> <artifactId>liquidnet-bus-v1</artifactId>
<groupId>org.springframework.boot</groupId> <groupId>com.liquidnet</groupId>
<version>2.2.2.RELEASE</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>liquidnet-bus-do</artifactId> <artifactId>liquidnet-bus-do</artifactId>
......
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
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>spring-boot-starter-parent</artifactId> <artifactId>liquidnet-bus-v1</artifactId>
<groupId>org.springframework.boot</groupId> <groupId>com.liquidnet</groupId>
<version>2.2.2.RELEASE</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>liquidnet-bus-service</artifactId> <artifactId>liquidnet-bus-service</artifactId>
...@@ -32,22 +33,91 @@ ...@@ -32,22 +33,91 @@
<module>liquidnet-service-adam</module> <module>liquidnet-service-adam</module>
<module>liquidnet-service-kylin</module> <module>liquidnet-service-kylin</module>
<module>liquidnet-service-consumer</module> <module>liquidnet-service-consumer</module>
<module>liquidnet-service-executor-all</module>
<!-- <module>liquidnet-service-example</module>--> <!-- <module>liquidnet-service-example</module>-->
<!-- <module>liquidnet-service-sequence</module>--> <!-- <module>liquidnet-service-sequence</module>-->
<!-- <module>liquidnet-service-account</module>--> <!-- <module>liquidnet-service-account</module>-->
<!-- <module>liquidnet-service-bank</module>--> <!-- <module>liquidnet-service-bank</module>-->
<!-- <module>liquidnet-service-executor-all</module>-->
<!-- <module>liquidnet-service-reconciliation</module>--> <!-- <module>liquidnet-service-reconciliation</module>-->
<!-- <module>liquidnet-service-notice</module>--> <!-- <module>liquidnet-service-notice</module>-->
</modules> </modules>
<properties> <dependencyManagement>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <dependencies>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <dependency>
<java.version>1.8</java.version> <groupId>org.springframework.boot</groupId>
</properties> <artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bytesoft/bytetcc-supports-springboot -->
<dependency>
<groupId>org.bytesoft</groupId>
<artifactId>bytetcc-supports-springboot</artifactId>
<version>0.5.9</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bytesoft/bytetcc-supports-springcloud -->
<!-- <dependency>-->
<!-- <groupId>org.bytesoft</groupId>-->
<!-- <artifactId>bytetcc-supports-springcloud</artifactId>-->
<!-- <version>0.5.9</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.slf4j</groupId>-->
<!-- <artifactId>slf4j-log4j12</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-typehandlers-jsr310</artifactId>
<version>1.0.2</version>
</dependency>
<!--阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>${druid.version}</version>
</dependency>
<!--多数据源配置 -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>2.5.3</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dypnsapi</artifactId>
<version>1.1.3</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
...@@ -194,119 +264,4 @@ ...@@ -194,119 +264,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bytesoft/bytetcc-supports-springboot -->
<dependency>
<groupId>org.bytesoft</groupId>
<artifactId>bytetcc-supports-springboot</artifactId>
<version>0.5.9</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bytesoft/bytetcc-supports-springcloud -->
<!-- <dependency>-->
<!-- <groupId>org.bytesoft</groupId>-->
<!-- <artifactId>bytetcc-supports-springcloud</artifactId>-->
<!-- <version>0.5.9</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.slf4j</groupId>-->
<!-- <artifactId>slf4j-log4j12</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-typehandlers-jsr310</artifactId>
<version>1.0.2</version>
</dependency>
<!--阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>${druid.version}</version>
</dependency>
<!--多数据源配置 -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>2.5.3</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dypnsapi</artifactId>
<version>1.1.3</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<includeSystemScope>true</includeSystemScope><!--外部进行打包-->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<compilerArguments>
<extdirs>libs</extdirs>
</compilerArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<includeFilterFile>findbugs.xml</includeFilterFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -2,12 +2,19 @@ ...@@ -2,12 +2,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
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>
<artifactId>liquidnet-bus-v1</artifactId>
<groupId>com.liquidnet</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.liquidnet</groupId> <groupId>com.liquidnet</groupId>
<artifactId>liquidnet-bus-support</artifactId> <artifactId>liquidnet-bus-support</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>release</id> <id>release</id>
...@@ -60,14 +67,14 @@ ...@@ -60,14 +67,14 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.2.RELEASE</version> <version>${spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR1</version> <version>${spring-cloud.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
...@@ -84,52 +91,4 @@ ...@@ -84,52 +91,4 @@
<!-- </dependency>--> <!-- </dependency>-->
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.2.2.RELEASE</version>
<configuration>
<includeSystemScope>true</includeSystemScope><!--外部进行打包-->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1</version>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<compilerArguments>
<extdirs>libs</extdirs>
</compilerArguments>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>
<?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">
<modelVersion>4.0.0</modelVersion>
<artifactId>liquidnet-bus-v1</artifactId>
<groupId>com.liquidnet</groupId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>liquidnet-bus-common</module>
<module>liquidnet-bus-do</module>
<module>liquidnet-bus-api</module>
<module>liquidnet-bus-service</module>
<module>liquidnet-bus-support</module>
<module>liquidnet-bus-client</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.test.skip>true</maven.test.skip>
<netty-all.version>4.1.58.Final</netty-all.version>
<gson.version>2.8.6</gson.version>
<spring.version>5.3.3</spring.version>
<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
<mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
<mysql-connector-java.version>8.0.23</mysql-connector-java.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<junit.version>5.7.1</junit.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<groovy.version>3.0.7</groovy.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
<spring-boot-maven-plugin.version>2.2.2.RELEASE</spring-boot-maven-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>2.1</maven-surefire-plugin.version>
<findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
</properties>
<build>
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot-maven-plugin.version}</version>
<configuration>
<includeSystemScope>true</includeSystemScope><!--外部进行打包-->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<compilerArguments>
<extdirs>libs</extdirs>
</compilerArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-maven-plugin.version}</version>
<configuration>
<includeFilterFile>findbugs.xml</includeFilterFile>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<repositories>
<repository>
<id>public</id>
<name>aliyun nexus</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>
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