diff --git a/performance-appraisal/.gitignore b/all-in-one/.gitignore similarity index 100% rename from performance-appraisal/.gitignore rename to all-in-one/.gitignore diff --git a/performance-appraisal/Dockerfile b/all-in-one/Dockerfile similarity index 72% rename from performance-appraisal/Dockerfile rename to all-in-one/Dockerfile index b6faf2b..ebe5551 100644 --- a/performance-appraisal/Dockerfile +++ b/all-in-one/Dockerfile @@ -1,5 +1,5 @@ FROM java:v0.0.1 -ADD micro-fast-pa.jar /workhome/app.jar +ADD micro-fast-all-in-one.jar /workhome/app.jar ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH diff --git a/performance-appraisal/pom.xml b/all-in-one/pom.xml similarity index 91% rename from performance-appraisal/pom.xml rename to all-in-one/pom.xml index 4dfd7e8..98083a9 100644 --- a/performance-appraisal/pom.xml +++ b/all-in-one/pom.xml @@ -3,11 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - performance-appraisal + com.lishouyu + all-in-one jar - performance-appraisal - performance-appraisal + all-in-one + all-in-one com.micro.fast @@ -60,6 +61,6 @@ docker-maven-plugin - micro-fast-pa + micro-fast-all-in-one diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/PerformanceAppraisalApplication.java b/all-in-one/src/main/java/com/lishouyu/PerformanceAppraisalApplication.java similarity index 95% rename from performance-appraisal/src/main/java/com/micro/fast/pa/PerformanceAppraisalApplication.java rename to all-in-one/src/main/java/com/lishouyu/PerformanceAppraisalApplication.java index b783e5b..3ae771a 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/PerformanceAppraisalApplication.java +++ b/all-in-one/src/main/java/com/lishouyu/PerformanceAppraisalApplication.java @@ -1,4 +1,4 @@ -package com.micro.fast.pa; +package com.lishouyu; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/common/package-info.java b/all-in-one/src/main/java/com/lishouyu/common/package-info.java similarity index 71% rename from performance-appraisal/src/main/java/com/micro/fast/pa/common/package-info.java rename to all-in-one/src/main/java/com/lishouyu/common/package-info.java index f5612e9..dbbf742 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/common/package-info.java +++ b/all-in-one/src/main/java/com/lishouyu/common/package-info.java @@ -4,4 +4,4 @@ * @version 1.0 * @since 1.0 */ -package com.micro.fast.pa.common; \ No newline at end of file +package com.lishouyu.common; \ No newline at end of file diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/controller/package-info.java b/all-in-one/src/main/java/com/lishouyu/controller/package-info.java similarity index 70% rename from performance-appraisal/src/main/java/com/micro/fast/pa/controller/package-info.java rename to all-in-one/src/main/java/com/lishouyu/controller/package-info.java index 8bf026e..bc41580 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/controller/package-info.java +++ b/all-in-one/src/main/java/com/lishouyu/controller/package-info.java @@ -4,4 +4,4 @@ * @version 1.0 * @since 1.0 */ -package com.micro.fast.pa.controller; \ No newline at end of file +package com.lishouyu.controller; \ No newline at end of file diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/dao/package-info.java b/all-in-one/src/main/java/com/lishouyu/dao/package-info.java similarity index 72% rename from performance-appraisal/src/main/java/com/micro/fast/pa/dao/package-info.java rename to all-in-one/src/main/java/com/lishouyu/dao/package-info.java index fd9ee85..f219f5c 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/dao/package-info.java +++ b/all-in-one/src/main/java/com/lishouyu/dao/package-info.java @@ -4,4 +4,4 @@ * @version 1.0 * @since 1.0 */ -package com.micro.fast.pa.dao; \ No newline at end of file +package com.lishouyu.dao; \ No newline at end of file diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/pojo/package-info.java b/all-in-one/src/main/java/com/lishouyu/pojo/package-info.java similarity index 72% rename from performance-appraisal/src/main/java/com/micro/fast/pa/pojo/package-info.java rename to all-in-one/src/main/java/com/lishouyu/pojo/package-info.java index 0b9bdd3..4397ee8 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/pojo/package-info.java +++ b/all-in-one/src/main/java/com/lishouyu/pojo/package-info.java @@ -4,4 +4,4 @@ * @version 1.0 * @since 1.0 */ -package com.micro.fast.pa.pojo; \ No newline at end of file +package com.lishouyu.pojo; \ No newline at end of file diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/service/impl/package-info.java b/all-in-one/src/main/java/com/lishouyu/service/impl/package-info.java similarity index 69% rename from performance-appraisal/src/main/java/com/micro/fast/pa/service/impl/package-info.java rename to all-in-one/src/main/java/com/lishouyu/service/impl/package-info.java index 0385d8d..ae5361c 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/service/impl/package-info.java +++ b/all-in-one/src/main/java/com/lishouyu/service/impl/package-info.java @@ -4,4 +4,4 @@ * @version 1.0 * @since 1.0 */ -package com.micro.fast.pa.service.impl; \ No newline at end of file +package com.lishouyu.service.impl; \ No newline at end of file diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/service/package-info.java b/all-in-one/src/main/java/com/lishouyu/service/package-info.java similarity index 71% rename from performance-appraisal/src/main/java/com/micro/fast/pa/service/package-info.java rename to all-in-one/src/main/java/com/lishouyu/service/package-info.java index d118fa1..442baba 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/service/package-info.java +++ b/all-in-one/src/main/java/com/lishouyu/service/package-info.java @@ -4,4 +4,4 @@ * @version 1.0 * @since 1.0 */ -package com.micro.fast.pa.service; \ No newline at end of file +package com.lishouyu.service; \ No newline at end of file diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/util/package-info.java b/all-in-one/src/main/java/com/lishouyu/util/package-info.java similarity index 72% rename from performance-appraisal/src/main/java/com/micro/fast/pa/util/package-info.java rename to all-in-one/src/main/java/com/lishouyu/util/package-info.java index e70760e..87c052a 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/util/package-info.java +++ b/all-in-one/src/main/java/com/lishouyu/util/package-info.java @@ -4,4 +4,4 @@ * @version 1.0 * @since 1.0 */ -package com.micro.fast.pa.util; \ No newline at end of file +package com.lishouyu.util; \ No newline at end of file diff --git a/performance-appraisal/src/main/java/com/micro/fast/pa/vo/package-info.java b/all-in-one/src/main/java/com/lishouyu/vo/package-info.java similarity index 73% rename from performance-appraisal/src/main/java/com/micro/fast/pa/vo/package-info.java rename to all-in-one/src/main/java/com/lishouyu/vo/package-info.java index fa9ea76..54f2151 100644 --- a/performance-appraisal/src/main/java/com/micro/fast/pa/vo/package-info.java +++ b/all-in-one/src/main/java/com/lishouyu/vo/package-info.java @@ -4,4 +4,4 @@ * @version 1.0 * @since 1.0 */ -package com.micro.fast.pa.vo; \ No newline at end of file +package com.lishouyu.vo; \ No newline at end of file diff --git a/performance-appraisal/src/main/resources/application-deploy.yml b/all-in-one/src/main/resources/application-deploy.yml similarity index 100% rename from performance-appraisal/src/main/resources/application-deploy.yml rename to all-in-one/src/main/resources/application-deploy.yml diff --git a/performance-appraisal/src/main/resources/application-dev.yml b/all-in-one/src/main/resources/application-dev.yml similarity index 95% rename from performance-appraisal/src/main/resources/application-dev.yml rename to all-in-one/src/main/resources/application-dev.yml index 64afcc5..ca8d1d2 100644 --- a/performance-appraisal/src/main/resources/application-dev.yml +++ b/all-in-one/src/main/resources/application-dev.yml @@ -34,7 +34,7 @@ jdbc: url: jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true driverClass: com.mysql.jdbc.Driver mybatis: - typeAliasesPackage: com.micro.fast.pa.pojo + typeAliasesPackage: com.lishouyu.pojo mappers: classpath:/mappers/*.xml pageHelperProperties: - dialect:mysql diff --git a/performance-appraisal/src/main/resources/application.yml b/all-in-one/src/main/resources/application.yml similarity index 100% rename from performance-appraisal/src/main/resources/application.yml rename to all-in-one/src/main/resources/application.yml diff --git a/performance-appraisal/src/test/java/com/micro/fast/pa/PerformanceAppraisalApplicationTests.java b/all-in-one/src/test/java/com/lishouyu/PerformanceAppraisalApplicationTests.java similarity index 92% rename from performance-appraisal/src/test/java/com/micro/fast/pa/PerformanceAppraisalApplicationTests.java rename to all-in-one/src/test/java/com/lishouyu/PerformanceAppraisalApplicationTests.java index 8863e8f..f2240b5 100644 --- a/performance-appraisal/src/test/java/com/micro/fast/pa/PerformanceAppraisalApplicationTests.java +++ b/all-in-one/src/test/java/com/lishouyu/PerformanceAppraisalApplicationTests.java @@ -1,4 +1,4 @@ -package com.micro.fast.pa; +package com.lishouyu; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/pom.xml b/pom.xml index 657f1c5..76ac5c9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,12 +21,15 @@ boot-starter ms - performance-appraisal + all-in-one + 0.0.1-SNAPSHOT 1.5.9.RELEASE + Edgware.RELEASE + registry.cn-hangzhou.aliyuncs.com/lishouyu/hub UTF-8 UTF-8 @@ -34,7 +37,6 @@ 1.8 1.8 1.8 - Edgware.RELEASE 5.6.0 1.16.6 20.0