Commit 3e4517b9 by chenweisong

更新

parent 32ca2f53
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.keymobile</groupId> <groupId>com.keymobile</groupId>
<artifactId>admin</artifactId> <artifactId>datacollector</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Activiti Demo</description> <description>Data Collector</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
<finalName>admin</finalName> <finalName>data-collector</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
eureka:
client:
healthcheck:
enabled: true
registryFetchIntervalSeconds: 5
region: default
serviceUrl:
defaultZone: http://192.168.0.240:8081/eureka/
enabled: true
instance:
prefer-ip-address: false
hostname: 192.168.0.48
feign:
hystrix:
enabled: true
spring:
application:
name: dataCollector
jpa:
show-sql: false
database-platform: org.hibernate.dialect.MySQL5Dialect
# hibernate:
# ddl-auto: update
datasource:
url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: test
password: test
hikari:
maximum-pool-size: 3
servlet:
multipart:
max-file-size: 20Mb
max-request-size: 100Mb
redis:
host: 192.168.0.192
# host: 127.0.0.1
port: 6379
session:
store-type: redis
redis:
namespace: cmb_dev
activiti:
check-process-definitions: false #关闭验证自动部署
server:
port: 8110
app:
active-process: MoreSubProcess.bpmn
swagger2:
host: localhost:8110
security:
permit: true
\ No newline at end of file
...@@ -17,16 +17,16 @@ feign: ...@@ -17,16 +17,16 @@ feign:
spring: spring:
application: application:
name: activiti name: dataCollector
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.MySQL5Dialect database-platform: org.hibernate.dialect.MySQL5Dialect
# hibernate: # hibernate:
# ddl-auto: update # ddl-auto: update
datasource: datasource:
url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: test username: root
password: test password: 123456
hikari: hikari:
maximum-pool-size: 3 maximum-pool-size: 3
servlet: servlet:
...@@ -51,6 +51,7 @@ app: ...@@ -51,6 +51,7 @@ app:
swagger2: swagger2:
host: localhost:8110 host: localhost:8110
# host: 47.105.236.43/activiti
security: security:
permit: true permit: true
\ No newline at end of file
spring:
application:
name: dataCollector
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment