Skip to content

D
device-back
提交 6fea8a9a authored 作者: Matrix's avatar Matrix
浏览文件
操作

[结构] 增加了多环境配置

上级 82f5dac6
隐藏空白字符变更
内嵌 并排
正在显示 包含 62 行增加 和 76 行删除
dev-union/pom.xml
浏览文件 @ 6fea8a9a
......@@ -14,6 +14,44 @@
<version>1.0-SNAPSHOT</version>
</parent>
<profiles>
<!--开发环境-->
<profile>
<id>dev</id>
<properties>
<activatedProperties>dev</activatedProperties>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<!--本地环境-->
<profile>
<id>local</id>
<properties>
<activatedProperties>local</activatedProperties>
</properties>
</profile>
<!--测试环境-->
<profile>
<id>simc</id>
<properties>
<activatedProperties>test</activatedProperties>
</properties>
</profile>
<!--生产环境-->
<profile>
<id>prod</id>
<properties>
<activatedProperties>prod</activatedProperties>
</properties>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -35,6 +73,7 @@
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/lib/oscarJDBC.jar</systemPath>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>misc</artifactId>
......@@ -132,18 +171,6 @@
</exclusions>
</dependency>
<!--<dependency>-->
<!--<groupId>com.tykj</groupId>-->
<!--<artifactId>dev-finalcheck</artifactId>-->
<!--<version>1.0-SNAPSHOT</version>-->
<!--<exclusions>-->
<!--<exclusion>-->
<!--<groupId>com.tykj.dev</groupId>-->
<!--<artifactId>union</artifactId>-->
<!--</exclusion>-->
<!--</exclusions>-->
<!--</dependency>-->
<dependency>
<groupId>com.tykj</groupId>
<artifactId>dev-library</artifactId>
......@@ -287,18 +314,6 @@
</exclusion>
</exclusions>
</dependency>
<!--<dependency>-->
<!--<groupId>com.tykj</groupId>-->
<!--<artifactId>dev-socket</artifactId>-->
<!--<version>1.0-SNAPSHOT</version>-->
<!--<exclusions>-->
<!--<exclusion>-->
<!--<groupId>com.tykj</groupId>-->
<!--<artifactId>dev-union</artifactId>-->
<!--</exclusion>-->
<!--</exclusions>-->
<!--</dependency>-->
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>rfid</artifactId>
......@@ -311,18 +326,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>socket</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj</groupId>
<artifactId>dev-file</artifactId>
......@@ -342,11 +345,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
......@@ -381,30 +379,5 @@
</configuration>
</plugin>
</plugins>
<!--<plugins>-->
<!--&lt;!&ndash;&lt;!&ndash;打包插件&ndash;&gt;&ndash;&gt;-->
<!--<plugin>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-maven-plugin</artifactId>-->
<!--<configuration>-->
<!--<fork>true</fork>-->
<!--<executable>true</executable>-->
<!--<includeSystemScope>true</includeSystemScope>-->
<!--</configuration>-->
<!--</plugin>-->
<!--&lt;!&ndash;&lt;!&ndash;跳过测试插件&ndash;&gt;&ndash;&gt;-->
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-surefire-plugin</artifactId>-->
<!--<version>2.20</version>-->
<!--<configuration>-->
<!--<skipTests>true</skipTests>-->
<!--&lt;!&ndash;&lt;!&ndash;默认关掉单元测试 &ndash;&gt;&ndash;&gt;-->
<!--</configuration>-->
<!--</plugin>-->
<!--</plugins>-->
</build>
</project>
dev-union/src/main/resources/application-dev.properties 0 → 100644
浏览文件 @ 6fea8a9a
spring.datasource.url=jdbc:mysql://192.168.100.249:3306/device?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=root
\ No newline at end of file
dev-union/src/main/resources/application-local.properties 0 → 100644
浏览文件 @ 6fea8a9a
spring.datasource.url=jdbc:mysql://localhost:3306/equipment?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=root
\ No newline at end of file
dev-union/src/main/resources/application-prod.properties 0 → 100644
浏览文件 @ 6fea8a9a
spring.datasource.driver-class-name=com.oscar.Driver
spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
spring.datasource.username=SYSDBA
spring.datasource.password=szoscar55
spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
\ No newline at end of file
dev-union/src/main/resources/application-test.properties 0 → 100644
浏览文件 @ 6fea8a9a
spring.datasource.driver-class-name=com.oscar.Driver
spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
spring.datasource.username=SYSDBA
spring.datasource.password=szoscar55
spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
\ No newline at end of file
dev-union/src/main/resources/application.properties
浏览文件 @ 6fea8a9a
# port
server.port=8087
spring.profiles.active=@activatedProperties@
logging.file=/opt/eqlog/equip.log
spring.servlet.multipart.max-file-size=400MB
......@@ -8,16 +9,6 @@ spring.jpa.hibernate.ddl-auto=none
spring.jpa.show-sql=false
spring.jpa.open-in-view=true
spring.main.allow-bean-definition-overriding=true
#spring.datasource.url=jdbc:mysql://localhost:3306/equipment?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
#spring.datasource.username=root
#spring.datasource.password=root
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.driver-class-name=com.oscar.Driver
spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
#spring.datasource.url=jdbc:mysql://192.168.1.249:3306/management?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
spring.datasource.username=SYSDBA
spring.datasource.password=szoscar55
spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
server.servlet.session.timeout=PT1H
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论