diff --git a/gradle.properties b/gradle.properties index f33742a7c..232114402 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group =org.maxkey -version =1.0.0.RELEASE +version =1.2.0.RELEASE vendor =https://github.com/shimingxy/MaxKey author =shimingxy diff --git a/maxkey-dao/src/test/resources/config/applicationConfig.properties b/maxkey-dao/src/test/resources/config/applicationConfig.properties index c3ab4e035..bb822a3fb 100644 --- a/maxkey-dao/src/test/resources/config/applicationConfig.properties +++ b/maxkey-dao/src/test/resources/config/applicationConfig.properties @@ -24,6 +24,6 @@ config.datasource.database=mysql config.datasource.driverclass=com.mysql.jdbc.Driver config.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 config.datasource.username=root -config.datasource.password=connsec +config.datasource.password=maxkey ############################################################################ \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/application.properties b/maxkey-web-manage/src/main/resources/application.properties index 93275b766..fbcc41b87 100644 --- a/maxkey-web-manage/src/main/resources/application.properties +++ b/maxkey-web-manage/src/main/resources/application.properties @@ -6,7 +6,7 @@ server.port=9521 server.servlet.context-path=/maxkey-mgt application.name=MaxKey-Mgt -application.formatted-version=v1.1 GA +application.formatted-version=v1.2 GA #for freemarker spring.freemarker.template-loader-path=classpath:/templates/views diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties index 543d2a89d..4ac0292b1 100644 --- a/maxkey-web-maxkey/src/main/resources/application.properties +++ b/maxkey-web-maxkey/src/main/resources/application.properties @@ -14,7 +14,7 @@ server.ssl.key-store-type=JKS server.servlet.context-path=/maxkey application.name=MaxKey -application.formatted-version=v1.1 GA +application.formatted-version=v1.2 GA #for freemarker spring.freemarker.template-loader-path=classpath:/templates/views