hanqingsong преди 1 година
родител
ревизия
ac846711bf
променени са 3 файла, в които са добавени 107 реда и са изтрити 52 реда
  1. 52 0
      src/main/resources/application-dev.yml
  2. 52 0
      src/main/resources/application-prod.yml
  3. 3 52
      src/main/resources/application.yml

+ 52 - 0
src/main/resources/application-dev.yml

@@ -0,0 +1,52 @@
1
+spring:
2
+  datasource:
3
+    driverClassName: com.mysql.jdbc.Driver
4
+    url: jdbc:mysql://172.16.0.36:3306/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
5
+    username: root
6
+    password: admin@1234
7
+  session:
8
+    store-type: redis
9
+  redis:
10
+    database: 0
11
+    host: 101.36.160.140
12
+    port: 10316
13
+    password: admin@1234
14
+    timeout: 60000ms
15
+    jedis:
16
+      pool:
17
+        # 连接池最大连接数(使用负值表示没有限制)
18
+        max-active: 16
19
+        # 连接池最大阻塞等待时间(使用负值表示没有限制)
20
+        max-wait: -1ms
21
+        # 连接池中的最大空闲连接
22
+        max-idle: 16
23
+        # 连接池中的最小空闲连接
24
+        min-idle: 0
25
+  resources:
26
+    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
27
+eureka:
28
+  client:
29
+    serviceUrl:
30
+      defaultZone: http://localhost:9001/eureka/
31
+  instance:
32
+    # 每隔10s发送一次心跳(默认30s)
33
+    lease-renewal-interval-in-seconds: 10
34
+    # 告知服务端30秒还未收到心跳的话,就将该服务移除列表(默认90s)
35
+    lease-expiration-duration-in-seconds: 30
36
+    status-page-url: http://localhost:${server.port}/swagger-ui.html
37
+#图片地址
38
+web:
39
+  upload-path: D:/depotImg/
40
+#设置全局变量判断是云端还是库端;1云端,2本地
41
+localOrCloud: 1
42
+#设置出入库连接
43
+forTheConnection: http://101.36.160.210:9905/Base/Main.action
44
+#forTheConnection=http://101.36.160.210:9901/Base/Login.action
45
+#登录密码输入错误限制登录时间
46
+loginTime: 5
47
+
48
+#出入库接口参数
49
+FLATID: 511100008
50
+KEY: 229558d3f8a9e2c67a7661a50487c790
51
+#webservice接口地址
52
+wsdlUrl: http://10.223.3.62:9025/yhzx/webServices/ExchangeServer?wsdl

+ 52 - 0
src/main/resources/application-prod.yml

@@ -0,0 +1,52 @@
1
+spring:
2
+  datasource:
3
+    driverClassName: com.mysql.jdbc.Driver
4
+    url: jdbc:mysql://172.18.93.244:3306/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
5
+    username: root
6
+    password: qh_admin@3579
7
+  session:
8
+    store-type: redis
9
+  redis:
10
+    database: 0
11
+    host: 172.18.93.229
12
+    port: 6379
13
+    password: qh_redis@3579
14
+    timeout: 60000ms
15
+    jedis:
16
+      pool:
17
+        # 连接池最大连接数(使用负值表示没有限制)
18
+        max-active: 16
19
+        # 连接池最大阻塞等待时间(使用负值表示没有限制)
20
+        max-wait: -1ms
21
+        # 连接池中的最大空闲连接
22
+        max-idle: 16
23
+        # 连接池中的最小空闲连接
24
+        min-idle: 0
25
+  resources:
26
+    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
27
+eureka:
28
+  client:
29
+    serviceUrl:
30
+      defaultZone: http://localhost:9001/eureka/
31
+  instance:
32
+    # 每隔10s发送一次心跳(默认30s)
33
+    lease-renewal-interval-in-seconds: 10
34
+    # 告知服务端30秒还未收到心跳的话,就将该服务移除列表(默认90s)
35
+    lease-expiration-duration-in-seconds: 30
36
+    status-page-url: http://localhost:${server.port}/swagger-ui.html
37
+#图片地址
38
+web:
39
+  upload-path: /home/qh/depot/depotImg/
40
+#设置全局变量判断是云端还是库端;1云端,2本地
41
+localOrCloud: 1
42
+#设置出入库连接
43
+forTheConnection: http://101.36.160.210:9905/Base/Main.action
44
+#forTheConnection=http://101.36.160.210:9901/Base/Login.action
45
+#登录密码输入错误限制登录时间
46
+loginTime: 5
47
+
48
+#出入库接口参数
49
+FLATID: 511100008
50
+KEY: 229558d3f8a9e2c67a7661a50487c790
51
+#webservice接口地址
52
+wsdlUrl: http://10.223.3.62:9025/yhzx/webServices/ExchangeServer?wsdl

+ 3 - 52
src/main/resources/application.yml

@@ -5,56 +5,7 @@ server:
5 5
 spring:
6 6
   application:
7 7
     name: depot-system
8
-  datasource:
9
-    driverClassName: com.mysql.jdbc.Driver
10
-    url: jdbc:mysql://172.16.0.36:3306/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
11
-    username: root
12
-    password: admin@1234
13
-  session:
14
-    store-type: redis
15
-  redis:
16
-    database: 0
17
-    host: 101.36.160.140
18
-    port: 10316
19
-    password: admin@1234
20
-    timeout: 60000ms
21
-    jedis:
22
-      pool:
23
-        # 连接池最大连接数(使用负值表示没有限制)
24
-        max-active: 16
25
-        # 连接池最大阻塞等待时间(使用负值表示没有限制)
26
-        max-wait: -1ms
27
-        # 连接池中的最大空闲连接
28
-        max-idle: 16
29
-        # 连接池中的最小空闲连接
30
-        min-idle: 0
31
-  resources:
32
-    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
8
+  profiles:
9
+    active: prod
33 10
 mybatis:
34
-  config-location: classpath:mybatis/mybatis-config.xml
35
-eureka:
36
-  client:
37
-    serviceUrl:
38
-      defaultZone: http://localhost:9001/eureka/
39
-  instance:
40
-    # 每隔10s发送一次心跳(默认30s)
41
-    lease-renewal-interval-in-seconds: 10
42
-    # 告知服务端30秒还未收到心跳的话,就将该服务移除列表(默认90s)
43
-    lease-expiration-duration-in-seconds: 30
44
-    status-page-url: http://localhost:${server.port}/swagger-ui.html
45
-#图片地址
46
-web:
47
-  upload-path: D:/depotImg/
48
-#设置全局变量判断是云端还是库端;1云端,2本地
49
-localOrCloud: 1
50
-#设置出入库连接
51
-forTheConnection: http://101.36.160.210:9905/Base/Main.action
52
-#forTheConnection=http://101.36.160.210:9901/Base/Login.action
53
-#登录密码输入错误限制登录时间
54
-loginTime: 5
55
-
56
-#出入库接口参数
57
-FLATID: 511100008
58
-KEY: 229558d3f8a9e2c67a7661a50487c790
59
-#webservice接口地址
60
-wsdlUrl: http://10.223.3.62:9025/yhzx/webServices/ExchangeServer?wsdl
11
+  config-location: classpath:mybatis/mybatis-config.xml