改进版本号
diff --git a/build.gradle b/build.gradle
index d45b97f..5d9f728 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,20 +22,15 @@
mavenCentral()
}
-springBoot {
- mainClassName = startClass
-}
-
-
bootJar {
- launchScript()
mainClassName = startClass
+ manifest {
+ attributes('Water-Version': version)
+ }
}
jar {
- manifest {
- attributes('Payapi-Version': version)
- }
+ baseName = "watermanager"
}
docker {
@@ -44,6 +39,8 @@
files jar.archivePath
}
+docker.dependsOn(jar)
+
dependencies {
compile(
'net.sf.json-lib:json-lib:2.4:jdk15'
diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt
index b385f9b..c8d359f 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt
@@ -14,7 +14,7 @@
@GetMapping("/version")
fun version(): ResponseEntity<Any> {
return try {
- Manifests.read("Payapi-Version").let {
+ Manifests.read("Water-Version").let {
ResponseEntity.ok(ResponseBodyBuilder.create()
.data("version", it)
.success())
diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt
index 10f6603..e4644a1 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt
@@ -200,7 +200,7 @@
model.addAttribute("loginOper", operUser as TOperator)
val funclist = functionService.getFunctionsByOperid(operUser.operid)
model.addAttribute("menus", functionService.getMenuTree(funclist, -1))
- model.addAttribute("payapiVersion", commonService.getSystemVersion())
+ model.addAttribute("waterVersion", commonService.getSystemVersion())
return "index"
}
}
diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/service/impl/framework_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/framework/service/impl/framework_service_impl.kt
index d5a13dd..7cfa16f 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/framework/service/impl/framework_service_impl.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/framework/service/impl/framework_service_impl.kt
@@ -30,7 +30,7 @@
override fun getSystemVersion(): String {
return try {
- Manifests.read("Payapi-Version") ?: "version 1.0"
+ Manifests.read("Water-Version") ?: "Unknown"
} catch (ex: Exception) {
// ex.printStackTrace()
"unknown"
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index e19d6f6..ccba95b 100755
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -122,7 +122,7 @@
</div>
<!-- 底部 -->
- <div class="layui-footer">Copyright © 2018 supwisdom All rights reserved. <span class="pull-right" th:text="${payapiVersion}">Version 1.0</span>
+ <div class="layui-footer">Copyright © 2018 supwisdom All rights reserved. <span class="pull-right" th:text="${waterVersion}">Version 1.0</span>
</div>
<!-- 手机屏幕遮罩层 -->