1

pom.xml

@@ -49,6 +49,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
+        <dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>

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

@@ -0,0 +1,24 @@
+package com.chinaitop.depot;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfig 
+extends WebSecurityConfigurerAdapter 
+{
+
+	@Override
+    protected void configure(HttpSecurity http) throws Exception {
+		http.authorizeRequests()
+		.antMatchers("/**")
+		.permitAll() //允许所有用户访问所有资源
+        .and()
+        .csrf().disable(); // 禁用CSRF（防止伪造的跨域攻击）
+
+        super.configure(http);
+    }
+}

src/main/java/com/chinaitop/depot/supervise/mapper/CcZyMapper.xml

@@ -6,8 +6,8 @@
       tf.id id,
       sh.storehouse_name house_name,
       tf.pz kinds,
-      to_date(to_char(tf.tfkssj,'yyyy-mm-dd hh24:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') start_time,
-      to_date(to_char(tf.tfjssj,'yyyy-mm-dd hh24:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') end_time,
+      to_char(tf.tfkssj,'yyyy-mm-dd hh24:mi:ss') start_time,
+      to_char(tf.tfjssj,'yyyy-mm-dd hh24:mi:ss') end_time,
       '通风' type,
       tf.tfzyfzr operator
       FROM
@@ -31,8 +31,8 @@
       forrecord.id,
       forrecord.cfmc house_name,
       forrecord.lspz kinds,
-      forrecord.fumigation_start start_time,
-      forrecord.fumigation_end end_time,
+      to_char(forrecord.fumigation_start,'yyyy-mm-dd hh24:mi:ss') start_time,
+      to_char(forrecord.fumigation_end,'yyyy-mm-dd hh24:mi:ss') end_time,
       '熏蒸' type,
       forrecord.operation_supervisor operator
       FROM t_fumigation_forrecord forrecord

src/main/java/com/chinaitop/depot/supervise/mapper/TestDatasMapper.xml

@@ -103,7 +103,7 @@
                 t2.storehouse
             FROM t_testdata t2, basic_storehouse bs
             WHERE bs.storehouse_id = #{houseid,jdbcType=VARCHAR}
-            AND bs.storeh ouse_code = t2.storehouse
+            AND bs.storehouse_code = t2.storehouse
             AND bs.del_flag = 1
             AND t2.iLq_yq = 0
             AND t2.org_id = #{orgid,jdbcType=VARCHAR}

src/main/resources/bootstrap.yml

@@ -3,11 +3,15 @@ server:
   tomcat:
     uri-encoding: utf-8
 
+management:
+  server:
+    port: -1
+
 # 注册中心配置
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:9001/eureka/
+      defaultZone: http://tj_admin:Admin_1234@${eureka.instance.hostname}:9001/eureka/
   instance:
     hostname: 172.16.0.16
     #hostname: localhost
@@ -56,7 +60,7 @@ spring:
       max-request-size: 50MB
 
 web:
-  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+  upload-path: /home/depot/depot-web/depot-file
 
   # 视频监测记录保存位置
 monitor: