From 584e6a7781c3c3e53a517a6ffd8e97dbf2f737ba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 Aug 2022 09:33:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 14 +++++++-------
pom.xml | 13 +++++++++++++
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c76c78f..abe6904 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
<scope>import</scope>
</dependency>
</dependencies>
+
</dependencyManagement>
<dependencies>
@@ -211,6 +212,18 @@
<classifier>jdk15</classifier>
</dependency>
+<!-- jap-->
+<!-- <dependency>-->
+<!-- <groupId>com.fujieid</groupId>-->
+<!-- <artifactId>jap-simple</artifactId>-->
+<!-- <version>1.0.5</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>xyz.dong6662.jap.spring.boot</groupId>-->
+<!-- <artifactId>jap-spring-boot-starter-template</artifactId>-->
+<!-- <version>1.0.0</version>-->
+<!-- </dependency>-->
+
</dependencies>
<build>
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fa0e441..427298a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,13 +12,13 @@
# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
# commandTimeout: 5000
datasource:
- url: jdbc:mysql://localhost:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- username: root
- password: root
+# url: jdbc:mysql://localhost:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+# username: root
+# password: root
# MySql
-# url: jdbc:mysql://127.0.0.1:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-# username: zhny
-# password: ZHny@2022
+ url: jdbc:mysql://127.0.0.1:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ username: zhny
+ password: ZHny@2022
# PostgreSQL
#url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
#username: postgres
@@ -61,5 +61,5 @@
# 溯源码扫描读取页面 url
zhny:
- codeUrl: http://dev.jxpskj.com:8013/traceablityInfo.html
+ codeUrl: http://dev.jxpskj.com:8020/zhny-web/traceablityInfo.html
--
Gitblit v1.9.3