1

pom.xml

@@ -54,17 +54,17 @@
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<version>1.2.3</version>
 		</dependency>
-		<!-- gbase依赖包 -->  
-		<dependency>
-	      	<groupId>com.gbase8s</groupId>
-	      	<artifactId>ifxjdbc</artifactId>
-	      	<version>1.0</version>
-	    </dependency>
-    	<dependency>
-      		<groupId>com.gbase</groupId>
-      		<artifactId>druid</artifactId>
-      		<version>1.0.28</version>
-    	</dependency>
+		<!-- gbase依赖包 -->
+        <dependency>
+            <groupId>com.gbase8s</groupId>
+            <artifactId>ifxjdbc</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gbase</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.0.28</version>
+        </dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>

src/main/java/com/chinaitop/WebSecurityConfig.java

@@ -11,27 +11,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Override
     protected void configure(HttpSecurity http) throws Exception {
-		String[] urls = {
-                "*",
-                "/*",
-                "/*/*",
-                "/*/*/*",
-                "/*/*/*/*",
-                "/*/*/*/*/*/*",
-                "/login"
-        };
 
 		http.authorizeRequests().anyRequest().permitAll() //允许所有用户访问所有资源
         .and()
         .csrf().disable(); // 禁用CSRF（防止伪造的跨域攻击）
 
-//        super.configure(http);
-//        
-//        http.authorizeRequests() // 对请求执行认证与授权
-//                .antMatchers(urls) // 匹配某些请求路径
-//                .permitAll() // （对此前匹配的请求路径）不需要通过认证即允许访问
-//                .anyRequest() // 除以上配置过的请求路径以外的所有请求路径
-//                .authenticated(); // 要求是已经通过认证的
-//        super.configure(http);
     }
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicKeeperHouseServiceImpl.java

@@ -65,7 +65,7 @@ public class BasicKeeperHouseServiceImpl implements BasicKeeperHouseService {
 		}
 		List<BasicKeeperHouse> keepHouse_list = mapper.selectByExample(keepHouseExample);
 
-		/* 获取保管这个仓房的多有人的用户ID */
+		/* 获取保管这个仓房的所有人的用户ID */
 		List<Integer> keep_list = null;
 		if (null != keepHouse_list && keepHouse_list.size() > 0) {
 			keep_list = new ArrayList<Integer>();

src/main/resources/bootstrap.yml

@@ -13,10 +13,8 @@ eureka:
   instance:
     hostname: 172.16.0.16
     #hostname: localhost
-    #prefer-ip-address: true
-    # 每隔10s发送一次心跳(默认30s)
+    prefer-ip-address: true
     lease-renewal-interval-in-seconds: 10
-    # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     lease-expiration-duration-in-seconds: 30
     status-page-url: http://${eureka.instance.hostname}:${server.port}/swagger-ui.html
 
@@ -38,10 +36,10 @@ spring:
   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=gbaseserver;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    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
-    #url: jdbc:gbasedbt-sqli://10.223.3.63:9088/depot:GBASEDBTSERVER=gbaseserver2;DB_LOCALE=zh_CN.utf8;CLIENT_LOCALE=zh_CN.utf8;NEWCODESET=UTF8,utf8,57372;GL_USEGLU=1;
+    #url: jdbc:gbasedbt-sqli://200.2.68.230:9088/depot:GBASEDBTSERVER=gbaseserver2;DB_LOCALE=zh_CN.utf8;CLIENT_LOCALE=zh_CN.utf8;NEWCODESET=UTF8,utf8,57372;GL_USEGLU=1;
     #username: gbasedbt
     #password: 4E7#8x8Yut
   # 缓存配置