Browse Source

添加出入库归档查询接口

lvzhikai 5 years ago
parent
commit
e1143abeb4
1 changed files with 105 additions and 117 deletions
  1. 105 117
      src/main/resources/bootstrap.yml

+ 105 - 117
src/main/resources/bootstrap.yml

@@ -1,41 +1,14 @@
1
-spring:
2
-  profiles:
3
-    active: clouda
4
-  jackson:
5
-    date-format: yyyy-MM-dd HH:mm:ss
6
-    time-zone: GMT+8
7
-    #No serializer found for class com.gbasedbt.jdbc.IfxLobInputStream
8
-    #and no properties discovered to create BeanSerializer
9
-    #(to avoid exception, disable SerializationFeature.FAIL_ON_EMPTY_BEANS)
10
-    #(through reference chain: java.util.ArrayList[1]->java.util.HashMap["imgdata"]->com.gbasedbt.jdbc.IfxBblob["binaryStream"])
11
-    # 将Springboot中对Json格式输出的严格控制--JackSon关闭
12
-    # spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
13
-    serialization:
14
-      FAIL_ON_EMPTY_BEANS: false
15 1
 server:
16 2
   port: 9028
17 3
   tomcat:
18 4
     uri-encoding: utf-8
19
-mybatis:
20
-  config-location: classpath:mybatis/mybatis-config.xml
21
-reportUrl: http://101.36.160.140:8097
22
-#socket地址
23
-socket-url: 58.214.246.30
24
-socket-port: 42121
25
-#设置全局变量判断是云端还是库端;1云端,2本地
26
-localOrCloud: 2
27
-# 多通道气体
28
-gas-org-ids: 386,177
29
-# 数量检测版本区分version3
30
-num_version3: :20013
31
----
5
+  max-http-header-size: 102400
6
+
32 7
 # 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
33 8
 eureka:
34 9
   client:
35 10
     service-url:
36
-      defaultZone: http://localhost:9001/eureka/
37
-    register-with-eureka: false
38
-    fetchRegistry: false
11
+      defaultZone: http://localhost:9002/eureka/
39 12
   instance:
40 13
     prefer-ip-address: true
41 14
     # 每隔10s发送一次心跳(默认30s)
@@ -43,8 +16,25 @@ eureka:
43 16
     # 告知服务端30秒还未收到心跳的话,就将该服务移除列表(默认90s)
44 17
     lease-expiration-duration-in-seconds: 30
45 18
 
19
+
20
+#spring:
21
+#  application:
22
+#    name: depot-intelligent
23
+#  #配置中心配置
24
+#  cloud:
25
+#    config:
26
+#      #使用discovery 时需要将eureka 写到该文件中,开发环境使用该方式,推荐使用。
27
+#      discovery:
28
+#        enabled: true
29
+#        service-id: depot-config-server
30
+#      profile: dev
31
+#      label: master
32
+#  jackson:
33
+#    date-format: yyyy-MM-dd HH:mm:ss
34
+#    time-zone: GMT+8
35
+
36
+
46 37
 spring:
47
-  profiles: locala
48 38
   application:
49 39
     name: depot-intelligent
50 40
   # 数据库配置
@@ -59,7 +49,7 @@ spring:
59 49
     store-type: redis
60 50
   redis:
61 51
     database: 2
62
-    host: 127.0.0.1
52
+    host: localhost
63 53
     port: 6379
64 54
     password:
65 55
     timeout: 3000
@@ -69,90 +59,88 @@ spring:
69 59
         max-wait: -1
70 60
         max-idle: 8
71 61
         min-idle: 0
72
-web:
73
-  upload-path: D:/upload/image
74
-logging:
75
-    level:
76
-      com.chinaitop.depot.intelligent.basicdata.mapper: DEBUG
77
----
78
-# 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
79
-eureka:
80
-  client:
81
-    service-url:
82
-      defaultZone: http://172.16.0.4:9711/eureka/
83
-  instance:
84
-    prefer-ip-address: true
85
-    # 每隔10s发送一次心跳(默认30s)
86
-    lease-renewal-interval-in-seconds: 10
87
-    # 告知服务端30秒还未收到心跳的话,就将该服务移除列表(默认90s)
88
-    lease-expiration-duration-in-seconds: 30
62
+  jackson:
63
+    date-format: yyyy-MM-dd HH:mm:ss
64
+    time-zone: GMT+8
65
+    serialization:
66
+      FAIL_ON_EMPTY_BEANS: false
67
+#socket地址
68
+socket-url: 58.214.246.30
69
+socket-port: 42121
89 70
 
90
-spring:
91
-  profiles: clouda
92
-  application:
93
-    name: depot-intelligent
94
-  # 数据库配置
95
-  datasource:
96
-    type: com.alibaba.druid.pool.DruidDataSource
97
-    url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
98
-    username: gbasedbt
99
-    password: cDbK2S0go8
100
-    driver-class-name: com.gbasedbt.jdbc.IfxDriver
101
-  # 缓存配置 host: redis-depot
102
-  session:
103
-    store-type: redis
104
-  redis:
105
-    database: 4
106
-    host: 172.16.0.46
107
-    port: 6679
108
-    password: 123456
109
-    timeout: 3000
110
-    jedis:
111
-      pool:
112
-        max-active: 8
113
-        max-wait: -1
114
-        max-idle: 8
115
-        min-idle: 0
116
-web:
117
-  upload-path: /home
118
----
119
-# 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
120
-eureka:
121
-  client:
122
-    service-url:
123
-      defaultZone: http://eureka-depot-tj:9001/eureka/
124
-  instance:
125
-    prefer-ip-address: true
126
-    # 每隔10s发送一次心跳(默认30s)
127
-    lease-renewal-interval-in-seconds: 10
128
-    # 告知服务端30秒还未收到心跳的话,就将该服务移除列表(默认90s)
129
-    lease-expiration-duration-in-seconds: 30
71
+#设置全局变量判断是云端还是库端;1云端,2本地
72
+localOrCloud: 2
130 73
 
131
-spring:
132
-  profiles: prop
133
-  application:
134
-    name: depot-intelligent
135
-  # 数据库配置
136
-  datasource:
137
-    type: com.alibaba.druid.pool.DruidDataSource
138
-    url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=depot;
139
-    username: gbasedbt
140
-    password: GBase123
141
-    driver-class-name: com.gbasedbt.jdbc.IfxDriver
142
-  # 缓存配置 host: redis-depot
143
-  session:
144
-    store-type: redis
145
-  redis:
146
-    database: 0
147
-    host: 127.0.0.1
148
-    port: 6379
149
-    password:
150
-    timeout: 3000
151
-    jedis:
152
-      pool:
153
-        max-active: 8
154
-        max-wait: -1
155
-        max-idle: 8
156
-        min-idle: 0
157
-web:
158
-  upload-path: /home
74
+reportUrl: http://101.36.160.140:8097
75
+
76
+
77
+## ==============================================应急端========================================================
78
+#server:
79
+#  port: 9028
80
+#  tomcat:
81
+#    uri-encoding: utf-8
82
+#  max-http-header-size: 102400
83
+#
84
+## 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
85
+#eureka:
86
+#  client:
87
+#    service-url:
88
+#      defaultZone: http://eureka-depot:9001/eureka/
89
+#    registerWithEureka: false
90
+#    fetchRegistry: false
91
+#  instance:
92
+#    prefer-ip-address: true
93
+#    ip-address: eureka-depot
94
+#    status-page-url: http://eureka-depot:${server.port}/swagger-ui.html
95
+#    instance-id: ${eureka.instance.ip-address}:${server.port}
96
+#
97
+#spring:
98
+#  # 数据库配置
99
+#  datasource:
100
+#    driver-class-name: com.mysql.jdbc.Driver
101
+#    url: jdbc:mysql://localhost:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
102
+#    username: root
103
+#    password: 123456
104
+#  # 缓存配置
105
+#  session:
106
+#    store-type: redis
107
+#  redis:
108
+#    database: 0
109
+#    host: 127.0.0.1
110
+#    port: 6379
111
+#    password:
112
+#    timeout: 3000
113
+#    jedis:
114
+#      pool:
115
+#        max-active: 8
116
+#        max-wait: -1
117
+#        max-idle: 8
118
+#        min-idle: 0
119
+#  # 静态资源配置
120
+#  resources:
121
+#    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
122
+#  jackson:
123
+#    date-format: yyyy-MM-dd HH:mm:ss
124
+#    time-zone: GMT+8
125
+#  jmx:
126
+#    default-domain: depotIntelligent
127
+#
128
+#web:
129
+#  upload-path: D:/upload
130
+#
131
+##socket地址
132
+##socket-url: 127.0.0.1
133
+##socket-port: 8999
134
+#socket-url: localhost
135
+#socket-port: 8999
136
+#
137
+##设置全局变量判断是云端还是库端;1云端,2本地
138
+#localOrCloud: 2
139
+
140
+# 多通道气体
141
+gas-org-ids: 386,177
142
+
143
+# 数量检测版本区分version3
144
+num_version3: :20013
145
+mybatis:
146
+  config-location: classpath:mybatis/mybatis-config.xml