1

pom.xml

@@ -35,6 +35,10 @@
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<version>1.3.1</version>
 		</dependency>
+		<dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
 		<!-- gbase依赖包 -->
 		<dependency>
 	      	<groupId>com.gbase8s</groupId>

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

@@ -0,0 +1,24 @@
+package com.chinaitop.agile;
+
+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/agile/mapper/BgmxzMapper.xml

@@ -85,7 +85,7 @@
         d.y_dataid ydataid
         from lsreport_ts:data_kcgl_fcbgz_default a
         left join lsreport_ts:data_kcgl_xckc_default b on b.dataid=a.dataid
-        left join depot:business_delivery_storage_notice c on c.bill_number=b.tzdh and c.org_id=b.unitid
+        left join (select org_id,bill_number,lqss from depot:business_delivery_storage_notice where changing=0) c on c.bill_number=b.tzdh and c.org_id=b.unitid
         left join depot:storage_keep_voucher d on d.y_dataid=a.DataID
         where 1=1 and (a.srsl > 0.0  or a.zcsl > 0.0) AND a.Direction = 1
         <if test="ch != null">

src/main/java/com/chinaitop/agile/mapper/CrkRecordMapper.xml

@@ -14,6 +14,7 @@
 			a.lspz AS lspzid,
 			e1.enumname as lspz,
 			e2.gbcode as mxpz,
+			e2.enumname as mxpzmc,
 			e3.gbcode as lsxz,
 			e4.enumname as scnf,
 			'入仓' as ywlx,
@@ -23,7 +24,7 @@
 			b.sjhwID as wareid,
 			b.sjhwbh as warename,
 			b.BuildDate as rq,
-			d.lsdj as lsdj
+			a.lydj as lsdj
 		FROM lsreport_ts:data_crkyw_rmdj_default a
 		inner JOIN lsreport_ts:data_crkyw_cpz_default b ON a.BizNo = b.BizNo
 		LEFT JOIN depot:basic_enum e1 on a.lspz = e1.enumid
@@ -50,6 +51,7 @@
 			a.lspz AS lspzid,
 			e1.enumname as lspz,
 			e2.gbcode as mxpz,
+			e2.enumname as mxpzmc,
 			e3.gbcode as lsxz,
 			'' as scnf,
 			'出仓' as ywlx,

src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ server:
 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
     #prefer-ip-address: true
@@ -20,6 +20,10 @@ eureka:
 mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
 
+management:
+  server:
+    port: -1
+
 spring:
   #profiles: local
   application:
@@ -33,9 +37,9 @@ spring:
     username: gbasedbt
     password: cDbK2S0go8
     #政务云数据库
-    #url: jdbc:gbasedbt-sqli://111.164.113.172:666/lsreport_ts:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    #url: jdbc:gbasedbt-sqli://10.223.3.63:9088/lsreport_ts:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
     #username: gbasedbt
-    #password: GBase123
+    #password: 4E7#8x8Yut
 
   # 缓存配置
   session:
@@ -64,4 +68,4 @@ spring:
     static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
 
 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