diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 1f6d59f7d9ce8580130d5193d60f85b2ea390077..b83eaab24028e9b6fa533dddee9ca71a4cf4aab4 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -71,22 +71,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 79dda3c102d03cbf4d493da14f0a49ce908ffe54..9478b624480fc52fa917a599131ba7ae7a78dcf6 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -38,14 +38,6 @@ ${project.name} - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 3b481f175d301cd3bc03f869f2ae078fe810a4ab..3bc2ab530a5a547c9a057d4b0a095e59159ce873 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -98,22 +98,26 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + + false @@ -130,7 +134,7 @@ + file="${project.build.directory}/${artifactId}.jar"/> diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 03113ae7792524df4a2d2730776dd13246b1d305..ef4596719cd2727d45aa3d318fb3abc3d5e3e2e5 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -54,22 +54,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index b9a752a58314b2f61a11aa8627d286bee5746455..55789367f1de0faddc0e9dc7b295afa3e46b5d8a 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -59,14 +59,6 @@ - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - org.apache.maven.plugins maven-antrun-plugin diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index 018a22f7b901aff0b051e7afa68456105fde6e0f..7f0f1cc668a4e6bcbb3643e06e9ffce30b96730a 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -38,22 +38,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index db4d541a5a4e47a726ea94a7a592e87d2a9f3f66..a07badfca5646f3f872a29b7de1af6274ae9ac28 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -47,22 +47,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index 71dcad331f55badaa27926396e86e297c0574a40..f52689b0221a0222854d4fe9994f03c6fdadd8aa 100644 --- a/blade-ops/blade-swagger/pom.xml +++ b/blade-ops/blade-swagger/pom.xml @@ -31,22 +31,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-ops/blade-swagger/src/main/resources/application.yml b/blade-ops/blade-swagger/src/main/resources/application.yml index 78296a637521055fb81ae441adaf0ef95558dac6..4bf248435a5441f9202cc6db5d44bf3fedba21e6 100644 --- a/blade-ops/blade-swagger/src/main/resources/application.yml +++ b/blade-ops/blade-swagger/src/main/resources/application.yml @@ -6,11 +6,11 @@ knife4j: enable: true routes: - name: 授权模块 - uri: 127.0.0.1 + uri: 192.168.1.21:88 location: /blade-auth/v2/api-docs - name: 工作台模块 - uri: 127.0.0.1 + uri: 192.168.1.21:88 location: /blade-desk/v2/api-docs - name: 系统模块 - uri: 127.0.0.1 + uri: 192.168.1.21:88 location: /blade-system/v2/api-docs diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index d910c514f1d725f40d843c19264be1c698f519f1..b39b53f4514bc8a3e7788f520092f82dff1282eb 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -67,14 +67,6 @@ ${project.name} - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 50f5bde20a1af735d3a3f8094fa2b3a0e7fd6758..6c3cf8f89c8595d626d47f75e9cd4a27ced54ed9 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -47,6 +47,13 @@ + + com.spotify + dockerfile-maven-plugin + + false + + org.apache.maven.plugins maven-antrun-plugin diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index cb03b4a742737a4a3632a2354b6230162e8a4de1..b1857443d288b01548bf54db2994c0e2a2278807 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -25,6 +25,13 @@ + + com.spotify + dockerfile-maven-plugin + + false + + org.apache.maven.plugins maven-antrun-plugin diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 35f0799a6121fe0264952f23d91fb375add77386..39b49bc179f3d6d69548ab549d8acb14017f40aa 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -44,6 +44,13 @@ + + com.spotify + dockerfile-maven-plugin + + false + + org.apache.maven.plugins maven-antrun-plugin @@ -58,7 +65,7 @@ + file="${project.build.directory}/${artifactId}.jar"/> diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 9f4c17c93d48c7df2c875cbebf3ceecbd6a6619e..cec213d690069a72dafb12ecab021e7a7cef8cbb 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -50,6 +50,14 @@ + + com.spotify + dockerfile-maven-plugin + + false + + + org.apache.maven.plugins maven-antrun-plugin @@ -64,7 +72,7 @@ + file="${project.build.directory}/${artifactId}.jar"/> diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 37f1008c3b96fb02748eac4acb3c50dc53fe1190..d879af86836da1e0a476dcfe5f566f867d4136e8 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -32,29 +32,4 @@ - - - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true - - - - - diff --git a/doc/nacos/blade-test.yaml b/doc/nacos/blade-test.yaml index c428cf64e67c3f9fa7e36fa3af4da5e51e5aae5e..c163c4b02cb775a14c88dc3435d5b1a5e27bf7ff 100644 --- a/doc/nacos/blade-test.yaml +++ b/doc/nacos/blade-test.yaml @@ -2,7 +2,7 @@ spring: redis: ##redis 单机环境配置 - host: 10.211.55.5 + host: 192.168.1.21 port: 3379 password: database: 0 @@ -17,6 +17,6 @@ blade: #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: test: - url: jdbc:mysql://10.211.55.5:3306/blade?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.240:3306/blade?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8 username: root - password: root + password: 123456 diff --git a/pom.xml b/pom.xml index 11bd8816bd97d12376960c4be1b5a5bd2daa3050..bdbf68c5fd9ba7283bfe8c757b1e53cd8cc88088 100644 --- a/pom.xml +++ b/pom.xml @@ -30,9 +30,11 @@ Cairo-SR8 - 10.211.55.5 - http://${docker.registry.url}:2375 - 1.2.0 + harbor.fxb.com:5000 + blade + 1.4.13 + true + ${project.version} @@ -118,6 +120,30 @@ + + com.spotify + dockerfile-maven-plugin + ${docker.plugin.version} + + + default + + build + push + + + + + + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + + true + ${project.version} + + ${project.build.finalName}.jar + + +