gaodandan il y a 6 ans
Parent
commit
9e60265d8d
3 fichiers modifiés avec 41 ajouts et 18 suppressions
  1. 2 2
      Dockerfile
  2. 2 2
      pom.xml
  3. 37 14
      src/main/resources/bootstrap.yml

+ 2 - 2
Dockerfile

@@ -1,5 +1,5 @@
1 1
 FROM 192.168.123.25:31104/unis/java:8
2 2
  
3
-ADD ./target/depot-device.jar /root
4
-CMD ["sh", "-c", "cd /root; java -Djava.security.egd=file:/dev/./urandom -jar /root/depot-device.jar --depot-device.server.enable-self-preservation=false"]
3
+ADD ./target/depot-device-yunnan.jar /root
4
+CMD ["sh", "-c", "cd /root; java -Djava.security.egd=file:/dev/./urandom -jar /root/depot-device-yunnan.jar --depot-device.server.enable-self-preservation=false"]
5 5
 EXPOSE 9005

+ 2 - 2
pom.xml

@@ -4,11 +4,11 @@
4 4
 	<modelVersion>4.0.0</modelVersion>
5 5
 
6 6
 	<groupId>com.chinaitop</groupId>
7
-	<artifactId>depot-device</artifactId>
7
+	<artifactId>depot-device-yunnan</artifactId>
8 8
 	<version>0.0.1-SNAPSHOT</version>
9 9
 	<packaging>jar</packaging>
10 10
 
11
-	<name>depot-device</name>
11
+	<name>depot-device-yunnan</name>
12 12
 	<description>Demo project for Spring Boot</description>
13 13
 
14 14
 	<parent>

+ 37 - 14
src/main/resources/bootstrap.yml

@@ -1,25 +1,48 @@
1 1
 server:
2
-  port: 9005
2
+  port: 9006
3 3
   tomcat:
4 4
     uri-encoding: utf-8
5
- 
5
+
6 6
 # 注册中心配置
7 7
 eureka:
8 8
   client:
9 9
     service-url:
10
-      defaultZone: http://eureka-depot:9001/eureka/
10
+      defaultZone: http://eureka-depot-yn:9001/eureka/
11 11
   instance:
12 12
     prefer-ip-address: true
13
- 
13
+
14 14
 spring:
15 15
   application:
16
-    name: depot-device
17
-  #配置中心配置
18
-  cloud:
19
-    config:
20
-      #使用discovery 时需要将eureka 写到该文件中,开发环境使用该方式,推荐使用。
21
-      discovery:
22
-        enabled: true
23
-        service-id: depot-config-server
24
-      profile: dev
25
-      label: master
16
+    name: depot-device-yunnan
17
+  # 数据库配置
18
+  datasource:
19
+    driver-class-name: com.mysql.jdbc.Driver
20
+    jdbcUrl: jdbc:mysql://192.168.123.38:3306/depot_yunnan?useUnicode=true&characterEncoding=utf-8
21
+    username: root
22
+    password: 123456
23
+  # 缓存配置
24
+  session:
25
+    store-type: redis
26
+  redis:
27
+    database: 0
28
+    host: 192.168.123.98
29
+    port: 6666
30
+    password: depotredis
31
+    timeout: 3000
32
+    jedis:
33
+      pool:
34
+        max-active: 8
35
+        max-wait: -1
36
+        max-idle: 8
37
+        min-idle: 0
38
+  # 静态资源配置
39
+  resources:
40
+    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
41
+
42
+  jackson:
43
+    date-format: yyyy-MM-dd
44
+    time-zone: GMT+8
45
+
46
+web:
47
+  upload-path: /upload
48
+