Compare commits

..

No commits in common. "f67dd4d40a9fe9a762708060ea69320583a87eec" and "6cb4b877000143dbe716979e16b098768a19ae32" have entirely different histories.

19 changed files with 39 additions and 36 deletions

1
.gitignore vendored
View File

@ -1,7 +1,6 @@
.factorypath .factorypath
.classpath .classpath
.project .project
.idea
*.class *.class
.settings .settings
pom.properties pom.properties

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -29,7 +29,6 @@ spring:
username: nacos username: nacos
password: nacos password: nacos
discovery: discovery:
namespace: ${nacos.namespace:public}
register-enabled: true register-enabled: true
#server-addr: 10.10.1.6:8848 #server-addr: 10.10.1.6:8848
#ip: 10.10.1.2 #ip: 10.10.1.2

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <!DOCTYPE xml>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -21,7 +21,6 @@ spring:
username: nacos username: nacos
password: nacos password: nacos
discovery: discovery:
namespace: ${nacos.namespace:public}
register-enabled: true register-enabled: true
#server-addr: 10.10.1.6:8848 #server-addr: 10.10.1.6:8848
#ip: 192.168.5.200 #ip: 192.168.5.200

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <!DOCTYPE xml>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="https://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <!DOCTYPE xml>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="https://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <!DOCTYPE xml>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="https://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <!DOCTYPE xml>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="https://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <!DOCTYPE xml>
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <!DOCTYPE xml>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -27,7 +27,6 @@ spring:
username: nacos username: nacos
password: nacos password: nacos
discovery: discovery:
namespace: ${nacos.namespace:public}
register-enabled: true register-enabled: true
#server-addr: 10.10.1.6:8848 #server-addr: 10.10.1.6:8848
#ip: 10.10.1.2 #ip: 10.10.1.2

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <!DOCTYPE xml>
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -31,7 +31,6 @@ spring:
username: nacos username: nacos
password: nacos password: nacos
discovery: discovery:
namespace: ${nacos.namespace:public}
register-enabled: true register-enabled: true
#server-addr: 10.10.1.6:8848 #server-addr: 10.10.1.6:8848
#ip: 10.10.1.2 #ip: 10.10.1.2

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <!DOCTYPE xml>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>
<artifactId>battery-cloud</artifactId> <artifactId>battery-cloud</artifactId>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <!DOCTYPE xml>
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -22,7 +22,6 @@ spring:
username: nacos username: nacos
password: nacos password: nacos
discovery: discovery:
namespace: ${nacos.namespace:public}
register-enabled: true register-enabled: true
#server-addr: 10.10.1.6:8848 #server-addr: 10.10.1.6:8848
# ip: 10.10.1.2 # ip: 10.10.1.2

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <!DOCTYPE xml>
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.evotech.hd</groupId> <groupId>com.evotech.hd</groupId>

View File

@ -22,7 +22,6 @@ spring:
username: nacos username: nacos
password: nacos password: nacos
discovery: discovery:
namespace: ${nacos.namespace:public}
register-enabled: true register-enabled: true
#server-addr: 10.10.1.6:8848 #server-addr: 10.10.1.6:8848
# ip: 10.10.1.2 # ip: 10.10.1.2
@ -30,7 +29,6 @@ spring:
metadata: metadata:
management: management:
context-path: ${server.servlet.context-path}/actuator context-path: ${server.servlet.context-path}/actuator
# 为springbootadmin开启所有检查 # 为springbootadmin开启所有检查
management: management:
endpoints: endpoints: