diff --git a/canal-admin/canal-admin-server/pom.xml b/canal-admin/canal-admin-server/pom.xml index 9fcb1c86..87da9bcc 100644 --- a/canal-admin/canal-admin-server/pom.xml +++ b/canal-admin/canal-admin-server/pom.xml @@ -63,19 +63,6 @@ canal-admin-${project.version} - - org.springframework.boot - spring-boot-maven-plugin - 2.0.1.RELEASE - - - package - - repackage - - - - io.repaint.maven tiles-maven-plugin @@ -87,12 +74,52 @@ + + org.apache.maven.plugins + maven-assembly-plugin + 2.2.1 + + + assemble + + single + + package + + + + false + false + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + true + lib/ + com.alibaba.otter.canal.admin.CanalAdminApplication + + + + **/*.properties + **/*.xml + **/*.yml + static/** + public/** + templates/** + + + - release + npm env @@ -138,95 +165,57 @@ - - copy canal default conf - generate-resources - - copy-resources - - - src/main/resources/conf - true - - - ${project.parent.basedir}/../deployer/src/main/resources - - canal.properties - - - - - - - copy instance default conf - generate-resources - - copy-resources - - - src/main/resources/conf - true - - - ${project.parent.basedir}/../deployer/src/main/resources/example - - instance.properties - - - - - - - copy client default conf - generate-resources - - copy-resources - - - src/main/resources/conf - true - - - ${project.parent.basedir}/../client-adapter/launcher/src/main/resources - - application.yml - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - application.yml - canal_manager.sql - - - + + + + + + dev + + true + + env + !release + + + + + + + maven-assembly-plugin + + + ${basedir}/src/main/assembly/dev.xml + + canal-admin + ${project.build.directory} + + + + + + + + + release + + + env + release + + + + + maven-assembly-plugin - 2.2.1 - - - assemble - - single - - package - - - false - false ${basedir}/src/main/assembly/release.xml - canal-admin-${project.version} + canal.admin-${project.version} ${project.basedir}/../../target diff --git a/canal-admin/canal-admin-server/src/main/assembly/dev.xml b/canal-admin/canal-admin-server/src/main/assembly/dev.xml new file mode 100644 index 00000000..dc5d9e69 --- /dev/null +++ b/canal-admin/canal-admin-server/src/main/assembly/dev.xml @@ -0,0 +1,50 @@ + + dist + + dir + + false + + + . + / + + README* + + + + ./src/main/bin + bin + + **/* + + 0755 + + + ./src/main/resources + /conf + + application.yml + logback.xml + public/** + canal_manager.sql + + + + target + logs + + **/* + + + + + + lib + + junit:junit + + + + diff --git a/canal-admin/canal-admin-server/src/main/assembly/release.xml b/canal-admin/canal-admin-server/src/main/assembly/release.xml index f7b66376..84f3aa16 100644 --- a/canal-admin/canal-admin-server/src/main/assembly/release.xml +++ b/canal-admin/canal-admin-server/src/main/assembly/release.xml @@ -27,15 +27,25 @@ /conf application.yml - canal_manager.sql + logback.xml + public/** + canal_manager.sql - ./target - /lib - - canal-admin-*.jar - + target + logs + + **/* + - \ No newline at end of file + + + lib + + junit:junit + + + + diff --git a/canal-admin/canal-admin-server/src/main/resources/logback.xml b/canal-admin/canal-admin-server/src/main/resources/logback.xml new file mode 100644 index 00000000..ad3b7b50 --- /dev/null +++ b/canal-admin/canal-admin-server/src/main/resources/logback.xml @@ -0,0 +1,41 @@ + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56} - %msg%n + + + + + + + admin + admin + + + + ../logs/admin.log + + + ../logs/admin/%d{yyyy-MM-dd}/admin-%d{yyyy-MM-dd}-%i.log.gz + + + 512MB + + 60 + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56} - %msg%n + + + + + + + + + + + diff --git a/canal-admin/canal-admin-server/src/main/resources/public/index.html b/canal-admin/canal-admin-server/src/main/resources/public/index.html index 6f6beecc..1078f0d4 100644 --- a/canal-admin/canal-admin-server/src/main/resources/public/index.html +++ b/canal-admin/canal-admin-server/src/main/resources/public/index.html @@ -1 +1 @@ -Canal Admin
\ No newline at end of file +Canal Admin
\ No newline at end of file diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/app.38307ef0.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/app.a89b2d02.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/app.38307ef0.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/app.a89b2d02.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-101fc062.372a5ca5.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-101fc062.bc898027.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-101fc062.372a5ca5.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-101fc062.bc898027.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-137eaf06.539d27c7.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-137eaf06.4b6e5771.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-137eaf06.539d27c7.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-137eaf06.4b6e5771.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-1ef583f0.c799c803.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-1ef583f0.9f611126.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-1ef583f0.c799c803.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-1ef583f0.9f611126.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-238a81e9.da844a27.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-238a81e9.273bda76.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-238a81e9.da844a27.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-238a81e9.273bda76.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-37c49cbf.92ebe0ae.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-37c49cbf.64d26540.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-37c49cbf.92ebe0ae.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-37c49cbf.64d26540.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-4f09fed2.d107437b.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-4f09fed2.ff28d88d.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-4f09fed2.d107437b.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-4f09fed2.ff28d88d.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-5560c396.5eb91155.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-5560c396.55ba7544.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-5560c396.5eb91155.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-5560c396.55ba7544.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-69386cf0.bdbe3f0c.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-69386cf0.76d77f5c.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-69386cf0.bdbe3f0c.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-69386cf0.76d77f5c.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-6f6d6145.385d3c06.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-6f6d6145.8b7e1719.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-6f6d6145.385d3c06.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-6f6d6145.8b7e1719.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-7ec889b7.192dc04c.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-7ec889b7.6ba68ef0.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-7ec889b7.192dc04c.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-7ec889b7.6ba68ef0.js diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-e1a839e4.e9eb1b06.js b/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-e1a839e4.4357a0af.js similarity index 100% rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-e1a839e4.e9eb1b06.js rename to canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-e1a839e4.4357a0af.js diff --git a/canal-admin/canal-admin-ui/pom.xml b/canal-admin/canal-admin-ui/pom.xml index 5901780e..44d15c95 100644 --- a/canal-admin/canal-admin-ui/pom.xml +++ b/canal-admin/canal-admin-ui/pom.xml @@ -20,7 +20,7 @@ - release + npm env diff --git a/pom.xml b/pom.xml index afaf0749..fe0b8109 100644 --- a/pom.xml +++ b/pom.xml @@ -127,10 +127,7 @@ example prometheus client-adapter - - + canal-admin