Merge remote-tracking branch 'origin/master'

.gitignore

@@ -0,0 +1,14 @@
+# ---> Java
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+

LICENSE

@@ -0,0 +1,8 @@
+MIT License
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -0,0 +1,3 @@
+# depot-storage-tianjin
+
+仓储业务初始化

pom.xml

@@ -5,8 +5,8 @@
     <!--model-->
     <groupId>com.chinaitop</groupId>
     <artifactId>depot-storage</artifactId>
-    <version>1.0.1</version><!--上传正式版(GBase:1开头)-->
-    <!--<version>1.0.1-SNAPSHOT</version>-->
+    <!--<version>1.0.1</version>--><!--上传正式版(GBase:1开头)-->
+    <version>0.0.1-SNAPSHOT</version>
     <name>depot-storage</name>
     <packaging>jar</packaging>
     <!--model description-->

src/main/resources/bootstrap.yml

@@ -1,20 +1,35 @@
-#本地开发环境
+spring:
+  profiles:
+    active: clouda
+  servlet:
+    multipart:
+      max-file-size: 20MB
+      max-request-size: 20MB
+  # 静态资源配置
+  resources:
+    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
 server:
   port: 9012
   tomcat:
     uri-encoding: utf-8
-
+reportUrl: http://101.36.160.140:8097
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+---
 # 注册中心配置
 eureka:
   client:
     service-url:
       defaultZone: http://localhost:9001/eureka/
+    register-with-eureka: false
+    fetchRegistry: false
   instance:
     prefer-ip-address: true
     lease-renewal-interval-in-seconds: 10
     lease-expiration-duration-in-seconds: 30
-
+    status-page-url-path: /swagger-ui.html
 spring:
+  profiles: locala
   application:
     name: depot-storage
   # 数据库配置
@@ -29,7 +44,7 @@ spring:
     store-type: redis
   redis:
     database: 2
-    host: localhost
+    host: 127.0.0.1
     port: 6379
     password:
     timeout: 3000
@@ -39,19 +54,87 @@ spring:
         max-wait: -1
         max-idle: 8
         min-idle: 0
-  jackson:
-    date-format: yyyy-MM-dd
-    time-zone: GMT+8
-  # 静态资源配置
-  resources:
-    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
-  servlet:
-    multipart:
-      max-file-size: 20MB
-      max-request-size: 20MB
-mybatis:
-  config-location: classpath:mybatis/mybatis-config.xml
+web:
+  upload-path: D:/upload
+logging:
+  level:
+    com.chinaitop.depot.storage.mapper: debug
+---
+# 注册中心配置
+eureka:
+  client:
+    service-url:
+      defaultZone: http://172.16.0.4:9711/eureka/
+  instance:
+    prefer-ip-address: true
+    lease-renewal-interval-in-seconds: 10
+    lease-expiration-duration-in-seconds: 30
+    status-page-url-path: /swagger-ui.html
+
+spring:
+  profiles: clouda
+  application:
+    name: depot-storage
+  # 数据库配置
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.gbasedbt.jdbc.IfxDriver
+    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;
+    username: gbasedbt
+    password: cDbK2S0go8
+  # 缓存配置 host: redis-depot
+  session:
+    store-type: redis
+  redis:
+    database: 4
+    host: 172.16.0.46
+    port: 6679
+    password: 123456
+    timeout: 3000
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
 web:
   upload-path: /home
+---
+# 注册中心配置
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:9001/eureka/
+  instance:
+    prefer-ip-address: true
+    lease-renewal-interval-in-seconds: 10
+    lease-expiration-duration-in-seconds: 30
 
-reportUrl: http://101.36.160.140:8097
+spring:
+  profiles: prop
+  application:
+    name: depot-storage
+  # 数据库配置
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.gbasedbt.jdbc.IfxDriver
+    url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=depot;
+    username: gbasedbt
+    password: GBase123
+  # 缓存配置 host: redis-depot
+  session:
+    store-type: redis
+  redis:
+    database: 0
+    host: 127.0.0.1
+    port: 6379
+    password:
+    timeout: 3000
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+web:
+  upload-path: /home