合并分支 'dev_security' 到 'master'

Dev security

合并security 权限部分到主分支

查看合并请求 !1

@@ -3,7 +3,9 @@
 /logs/
 /logs/
 /out/
 /out/
 .mvn
 .mvn
-
+/xmlFromImf/
+kakoRevice/
+/errorLogs/
 ### STS ###
 ### STS ###
 .apt_generated
 .apt_generated
 .classpath
 .classpath
@@ -25,4 +27,4 @@
 /nbbuild/
 /nbbuild/
 /dist/
 /dist/
 /nbdist/
 /nbdist/
-/.nb-gradle/
+/.nb-gradle/

 #登录账号
 #登录账号
-loginname = NMMS
+loginname = KAKO
 #登录密码
 #登录密码
-loginpass = NMMS
+loginpass = KAKO
 #发送报文目录,相对程序目录
 #发送报文目录,相对程序目录
-readDirectory = /Users/mrz/Downloads/1.woowo
+readDirectory = /Users/mrz/Documents/java项目/test
 #接收存储报文目录
 #接收存储报文目录
-bakDirectory = xmlFromImf
+bakDirectory = kakoRevice
 #是否需要发送报文,默认N不发,Y将发送readDirectory下的XML扩展名的报文
 #是否需要发送报文,默认N不发,Y将发送readDirectory下的XML扩展名的报文
-isNeedSend = N
+isNeedSend = Y
+#本地要保存的styp类型,用英文逗号分隔，注意中英文字符
+saveStyp = DFDL,ARRE,ONRE,STLS
 
 
 #IMF MEAT报头配置
 #IMF MEAT报头配置
 
 

@@ -2,6 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<modelVersion>4.0.0</modelVersion>
+	<packaging>pom</packaging>
 	<parent>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<artifactId>spring-boot-starter-parent</artifactId>
@@ -17,6 +18,9 @@
 	<properties>
 	<properties>
 		<java.version>1.8</java.version>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>
 		<spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>
+		<fastjson_version>1.2.28</fastjson_version>
+		<lombok_sersion>1.18.6</lombok_sersion>
+		<swagger2_version>2.9.2</swagger2_version>
 	</properties>
 	</properties>
 
 
 	<dependencies>
 	<dependencies>
@@ -30,6 +34,11 @@
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<version>1.3.2</version>
 			<version>1.3.2</version>
 		</dependency>
 		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>org.springframework.boot</groupId>-->
+			<!--<artifactId>spring-boot-devtools</artifactId>-->
+			<!--<optional>true</optional>-->
+		<!--</dependency>-->
 		<!--有WEBSOCKET包 包含了spring-boot-starter-web 和spring-boot-starter包 有这个包不要引入这俩包-->
 		<!--有WEBSOCKET包 包含了spring-boot-starter-web 和spring-boot-starter包 有这个包不要引入这俩包-->
 		<dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
@@ -43,6 +52,11 @@
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
@@ -73,18 +87,95 @@
 				</exclusion>
 				</exclusion>
 			</exclusions>
 			</exclusions>
 		</dependency>
 		</dependency>
+
 		<!--spring boot-->
 		<!--spring boot-->
+		<!-- tools-->
+		<!--集成swagger2，下面两个spring的配置解决springboot包 与swagger2的包冲突问题，生产部署的时候记得要去掉此swagger2的配置，开发环境开启-->
+		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
+		<dependency>
+			<groupId>org.springframework.plugin</groupId>
+			<artifactId>spring-plugin-core</artifactId>
+			<version>1.2.0.RELEASE</version><!--$NO-MVN-MAN-VER$-->
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.plugin</groupId>
+			<artifactId>spring-plugin-metadata</artifactId>
+			<version>1.2.0.RELEASE</version><!--$NO-MVN-MAN-VER$-->
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${swagger2_version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.plugin</groupId>
+					<artifactId>spring-plugin-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.plugin</groupId>
+					<artifactId>spring-plugin-metadata</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>${swagger2_version}</version>
+			<!--2.9.2集成的是M1的这两个包，跟现在用的Greenwich.BUILD-SNAPSHOT的版本的SPRING boot2的版本包有冲突。去掉-->
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.plugin</groupId>
+					<artifactId>spring-plugin-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.plugin</groupId>
+					<artifactId>spring-plugin-metadata</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!--集成swagger2-->
+		<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>${lombok_sersion}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>${fastjson_version}</version>
+		</dependency>
+		<!-- tools-->
 		<!-- alibaba的druid数据库连接池 -->
 		<!-- alibaba的druid数据库连接池 -->
 		<dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid-spring-boot-starter</artifactId>
 			<artifactId>druid-spring-boot-starter</artifactId>
 			<version>1.1.9</version>
 			<version>1.1.9</version>
 		</dependency>
 		</dependency>
+		<!-- mysql-->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		<!-- oracle-->
 		<dependency>
 		<dependency>
 			<groupId>com.oracle</groupId>
 			<groupId>com.oracle</groupId>
 			<artifactId>ojdbc6</artifactId>
 			<artifactId>ojdbc6</artifactId>
 			<version>11.2.0.4.0-atlassian-hosted</version>
 			<version>11.2.0.4.0-atlassian-hosted</version>
 		</dependency>
 		</dependency>
+		<!--分页插件-->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.5</version>
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
 		<!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
 		<dependency>
 		<dependency>
 			<groupId>org.dom4j</groupId>
 			<groupId>org.dom4j</groupId>

+**gitlab**: [http://118.31.66.166:zp260/imf_cloud_wearhouse.git](git@118.31.66.166:zp260/imf_cloud_wearhouse.git)
+
+# 项目描述
+国际货运物流平台开发脚手架
+#集成
+* 已集成IMF，基于IMF的xml报文格式。在master的git主分支上
+    * POM文件包含本地包
+    * 接收IMF的消息
+    * 报文类型识别
+    * 报文分类本地存储
+    * 报文发送
+* 已集成spring SECURITY
+    * 支持前后端分离
+    * 自定义权限角色管理
+    * url角色权限识别
+    * menu与权限关联
+    * 参数校验
+* 已集成mybatis、mybatisGenerator、pageHelper
+* 集成定时任务框架
+    * 目前在IMF框架中使用，打开IMF_Task里面的定时任务注释就可以启动IMF客户端功能
+* 集成Spring Cloud
+* 集成websocket
+* 集成lombok，简化部分代码录入，比如实体类,方便实体及表结构修改,敏捷开发必用,使用方法见[lombok集成使用说明](https://jingyan.baidu.com/article/0a52e3f4e53ca1bf63ed725c.html)
+)
+* 集成了单文件、多文件上传接口   
+* 集成了swagger2，开发环境开启此POM配置，生产环境记得去掉。包冲突问题看POM配置文件注释。[接口访问测试地址](http://localhost:7003/swagger-ui.html)

+package com.tianbo.warehouse;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class Swagger2 {
+    //swagger2的配置文件，这里可以配置swagger2的一些基本的内容，比如扫描的包等等
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                //为当前包路径
+                .apis(RequestHandlerSelectors.basePackage("com.tianbo.warehouse.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+    //构建 api文档的详细信息函数,注意这里的注解引用的是哪个
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                //页面标题
+                .title("Spring Boot 测试使用 Swagger2 构建RESTful API")
+                //创建人
+                .contact(new Contact("MarryFeng", "http://www.baidu.com", ""))
+                //版本号
+                .version("1.0")
+                //描述
+                .description("API 描述")
+                .build();
+    }
+
+
+}

@@ -6,13 +6,17 @@ package com.tianbo.warehouse;
 
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 
 @SpringBootApplication
 @SpringBootApplication
 @EnableScheduling
 @EnableScheduling
-@EnableEurekaClient
+//@EnableEurekaClient
+@EnableTransactionManagement
 @MapperScan("com.tianbo.warehouse.dao")
 @MapperScan("com.tianbo.warehouse.dao")
 public class WarehouseApplication {
 public class WarehouseApplication {
 
 

+package com.tianbo.warehouse.annotation;
+
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+@Documented
+/**
+ * 自定义日志注解
+ */
+public @interface LogAnnotation {
+
+    /**模块名称*/
+    String moduleName() default "";
+
+    /**操作内容*/
+    String operate() default "";
+}

+package com.tianbo.warehouse.annotation;
+
+import com.alibaba.fastjson.JSON;
+import com.tianbo.warehouse.model.LOGWithBLOBs;
+import com.tianbo.warehouse.service.LogService;
+import com.tianbo.warehouse.util.IO.StreamUtil;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+
+@Aspect
+@Component
+public class LogAnnotationAOP {
+
+    @Autowired
+    private LogService logService;
+
+    private LOGWithBLOBs log;
+
+    @Pointcut("@annotation(com.tianbo.warehouse.annotation.LogAnnotation)")
+    public void annotationPointCut(){
+
+    }
+
+    @Before("annotationPointCut()")
+    public void before(JoinPoint point){
+        //获取当前登录用户信息
+        try{
+            UserDetails userDetails =(UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            HttpServletRequest request = attributes.getRequest();
+            String requestRemoteAddr = request.getRemoteAddr();
+
+            log.setIp(requestRemoteAddr);
+            log.setUsername(userDetails.getUsername());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        try{
+            String targetName = point.getTarget().getClass().getName();
+            Class targetClass = Class.forName(targetName);
+
+            MethodSignature signature = (MethodSignature) point.getSignature();
+            Method method= signature.getMethod();
+            LogAnnotation annotation = method.getAnnotation(LogAnnotation.class);
+            System.out.print("打印："+annotation.moduleName()+" 开始前");
+            String methodName = point.getSignature().getName();
+//            Method[] methods = targetClass.getMethods();
+
+
+            if(annotation != null){
+                log.setModelnamecn(annotation.moduleName());
+                log.setOperatenamecn(annotation.operate());
+            }
+            log.setClassname(targetName);
+            log.setMethodname(methodName);
+
+            // 获得参数列表
+            Object[] params = point.getArgs();
+            if(params.length>0){
+                //序列化时过滤掉request和response,参考资料为:https://blog.csdn.net/hbn1326317071/article/details/83818059
+                List<Object> logArgs = StreamUtil.streamOf(params)
+                        .filter(arg -> (!(arg instanceof HttpServletRequest) && !(arg instanceof HttpServletResponse) && !(arg instanceof BindingResult)))
+                        .collect(Collectors.toList());
+
+                //将参数列表转成JSON存储
+                log.setParameters(JSON.toJSONString(logArgs));
+            }
+
+        }catch (ClassNotFoundException e){
+            e.printStackTrace();
+            log.setResult(JSON.toJSONString(e));
+            logService.insertSelective(log);
+        }
+
+
+
+
+    }
+
+    @Around("annotationPointCut()")
+    public Object advice(ProceedingJoinPoint joinPoint){
+        System.out.println("通知之开始");
+        log = new LOGWithBLOBs();
+
+        Object retmsg=null;
+        try {
+            retmsg=joinPoint.proceed();
+            System.err.println("++++++++"+retmsg);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        System.out.println("通知之结束");
+        return retmsg;
+    }
+
+    @After("annotationPointCut()")
+    public void after(){
+        System.out.println("after方法执行后");
+    }
+
+    /**
+     * 方法正常完成后执行方法
+     * @param retmsg 这里的retmsg= advice中的Object retmsg
+     */
+    @AfterReturning(returning = "retmsg",pointcut="annotationPointCut()")
+    public void afterReturn(Object retmsg) throws Throwable{
+
+        // 处理完请求，返回内容
+        log.setResult(JSON.toJSONString(retmsg));
+
+        logService.insertSelective(log);
+    }
+}

+package com.tianbo.warehouse.annotation;
+
+
+import com.tianbo.warehouse.model.USERS;
+
+import java.lang.annotation.*;
+
+/**
+ * 将前端注册、新增、编辑后提交的明文密码MD5加密
+ * 使用该注解不用再MD5转换了
+ *
+ * @author adonis
+ *
+ */
+@Target({ElementType.PARAMETER,ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface UserPasswordMd5 {
+    String value() default "password";
+
+}

+package com.tianbo.warehouse.annotation;
+
+import com.tianbo.warehouse.model.USERS;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+@Aspect
+@Component
+public class UserPasswordMd5AOP {
+
+    @Pointcut("@annotation(com.tianbo.warehouse.annotation.UserPasswordMd5)")
+    public void annotationPointCut(){
+
+    }
+
+    @Before("annotationPointCut()")
+    public void before(JoinPoint joinPoint){
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Method method= signature.getMethod();
+        UserPasswordMd5 annotation = method.getAnnotation(UserPasswordMd5.class);
+        System.out.print("打印："+annotation.value()+" 开始前");
+    }
+
+    @Around("annotationPointCut()")
+    public Object advice(ProceedingJoinPoint joinPoint){
+        System.out.println("通知之开始");
+        Object[] args = joinPoint.getArgs();
+        if (args != null && args.length > 0 && args[0].getClass() == USERS.class) {
+            USERS user = (USERS)args[0];
+            user.setPassword(DigestUtils.md5Hex(user.getPassword()));
+            args[0] = user;
+
+        }
+        Object retmsg=null;
+        try {
+            retmsg=joinPoint.proceed(args);
+            System.err.println("++++++++"+retmsg);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        System.out.println("通知之结束");
+        return retmsg;
+    }
+
+    @After("annotationPointCut()")
+    public void after(){
+        System.out.println("after方法执行后");
+    }
+
+}

+package com.tianbo.warehouse.bean;
+
+import org.springframework.security.core.Authentication;
+
+import java.io.Serializable;
+import java.util.Map;
+
+public class AuthSuccessResponse implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    private Authentication authentication;
+
+    private Map<String,Object> loginUserMenus;
+
+    public AuthSuccessResponse (Authentication authentication,Map<String,Object> loginUserMenus){
+        this.authentication= authentication;
+        this.loginUserMenus = loginUserMenus;
+    }
+
+    public Authentication getAuthentication() {
+        return authentication;
+    }
+
+    public void setAuthentication(Authentication authentication) {
+        this.authentication = authentication;
+    }
+
+    public Map<String, Object> getLoginUserMenus() {
+        return loginUserMenus;
+    }
+
+    public void setLoginUserMenus(Map<String, Object> loginUserMenus) {
+        this.loginUserMenus = loginUserMenus;
+    }
+}

+package com.tianbo.warehouse.controller;
+
+import com.tianbo.warehouse.model.USERS;
+import com.tianbo.warehouse.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.context.SecurityContextImpl;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class AdminController {
+
+    @Autowired
+    UserService userService;
+
+    @GetMapping("/admin")
+    public String admin(){
+        return "admin";
+    }
+
+
+}

 package com.tianbo.warehouse.controller;
 package com.tianbo.warehouse.controller;
 
 
-import com.tianbo.warehouse.model.PERMISSION;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
 @Controller
 @Controller
-public class ImfLog {
+public class ImfLogController {
+
 
 
     @RequestMapping("/log/imf")
     @RequestMapping("/log/imf")
     public String IMFlog(){
     public String IMFlog(){
         return "log/imf";
         return "log/imf";
     }
     }
 
 
-    @RequestMapping("/home")
-    public String Home(Model model){
-        PERMISSION msg =  new PERMISSION();
-        msg.setDescription("权限描述");
-        msg.setPermissionName("权限名称");
-        msg.setPermissionSign("权限路径");
-        model.addAttribute("msg", msg);
-        return  "home";
-    }
 
 
-    @RequestMapping("/admin")
+    @RequestMapping("/logs")
     @ResponseBody
     @ResponseBody
-    public String Admin(){
-        return "hello admin";
-    }
-
-    @RequestMapping("/login")
-    public String login(){
-        return "login";
+    public String logs(){
+        return "logs";
     }
     }
 }
 }
 
 

@@ -11,7 +11,8 @@ public class IndexController {
 
 
     @GetMapping("index")
     @GetMapping("index")
     public String index(){
     public String index(){
-        return "数据仓库接收，落地报文给新舱单";
+        return "forward:/login";
+//        return "数据仓库接收，落地报文给新舱单";
     }
     }
 
 
 
 

+package com.tianbo.warehouse.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.LOGWithBLOBs;
+import com.tianbo.warehouse.service.LogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class LogController {
+
+    @Autowired
+    private LogService logService;
+
+    @GetMapping("/system/log/list")
+    public PageInfo<LOGWithBLOBs> systemLog(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                               int pageNum,
+                                            @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                               int pageSize){
+        return logService.selectAll(pageNum,pageSize);
+    }
+}

@@ -15,7 +15,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
 
 
 @ServerEndpoint(value = "/log")
 @ServerEndpoint(value = "/log")
 @Component
 @Component
-public class Log {
+public class LogWebsockController {
     private Process process;
     private Process process;
     private InputStream inputStream;
     private InputStream inputStream;
     //与某个客户端的连接会话，需要通过它来给客户端发送数据
     //与某个客户端的连接会话，需要通过它来给客户端发送数据
@@ -24,7 +24,7 @@ public class Log {
     //静态变量，用来记录当前在线连接数。应该把它设计成线程安全的。
     //静态变量，用来记录当前在线连接数。应该把它设计成线程安全的。
     private static int onlineCount = 0;
     private static int onlineCount = 0;
     //concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。
     //concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。
-    private static CopyOnWriteArraySet<Log> webSocketSet = new CopyOnWriteArraySet<Log>();
+    private static CopyOnWriteArraySet<LogWebsockController> webSocketSet = new CopyOnWriteArraySet<LogWebsockController>();
 
 
 
 
     @OnOpen
     @OnOpen
@@ -67,7 +67,7 @@ public class Log {
     }
     }
 
 
     public static synchronized void addOnlineCount() {
     public static synchronized void addOnlineCount() {
-        Log.onlineCount++;
+        LogWebsockController.onlineCount++;
     }
     }
     public static synchronized int getOnlineCount() {
     public static synchronized int getOnlineCount() {
         return onlineCount;
         return onlineCount;

+package com.tianbo.warehouse.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class LoginController {
+
+    @RequestMapping("/login")
+    public String login(){
+        return "login";
+    }
+}

+package com.tianbo.warehouse.controller;
+
+import com.tianbo.warehouse.model.USERS;
+import com.tianbo.warehouse.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class MainController {
+
+    @Autowired
+    UserService userService;
+
+    @GetMapping("/error")
+    public String  error(){
+            return "error";
+    }
+
+    @GetMapping("/main")
+    public String main(){
+        return "main";
+    }
+}

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.dao.PERMISSIONMapper;
+import com.tianbo.warehouse.model.PERMISSION;
+import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.service.PermissionService;
+import org.apache.cxf.annotations.Logging;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Logging
+@RestController()
+public class PermssionController {
+
+    @Autowired
+    PermissionService permissionService;
+
+    @GetMapping("/perm/list")
+    public PageInfo<PERMISSION> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                             int pageNum,
+                                     @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                             int pageSize){
+        return permissionService.findAll(pageNum,pageSize);
+
+    }
+
+    @LogAnnotation(moduleName = "权限管理",operate = "权限添加")
+    @PostMapping("/perm/add")
+    public ResultJson add(@RequestBody PERMISSION permission){
+        int i =permissionService.insertSelective(permission);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加账户成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+}

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.model.RolePermission;
+import com.tianbo.warehouse.service.RoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController()
+public class RoleController {
+
+    @Autowired
+    RoleService roleService;
+
+    @GetMapping("/role/list")
+    public PageInfo<ROLE> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                        int pageNum,
+                               @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                        int pageSize){
+        return roleService.findAll(pageNum,pageSize);
+    }
+
+    @LogAnnotation(moduleName = "角色管理",operate = "角色添加")
+    @PostMapping("/role/add")
+    public ResultJson add(@RequestBody ROLE role){
+        int i =roleService.insertSelective(role);
+        return i==1 ? new ResultJson("200","添加权限成功") :new ResultJson("500","insert faild");
+
+    }
+
+    /**
+     * 设置角色的权限
+     * @return
+     */
+    @LogAnnotation(moduleName = "角色管理",operate = "权限设置")
+    @PutMapping("/role/permSet")
+    public ResultJson permissionSet(@RequestBody RolePermission rolePermission){
+        int i = roleService.setRolePermissoin(rolePermission);
+        return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败");
+    }
+}

+package com.tianbo.warehouse.controller;
+
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.Attachment;
+import com.tianbo.warehouse.service.AttachmentService;
+import com.tianbo.warehouse.util.Date.DateUtil;
+import com.tianbo.warehouse.util.Helper;
+import org.apache.commons.io.FileUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+
+import static com.tianbo.warehouse.util.IO.FileTool.readProperties;
+
+@RestController
+public class UploadController {
+
+    @Autowired
+    private AttachmentService attachmentService;
+
+    @Value("${web.upload-path}")
+    private String uploadPath; // =./upload/
+    /**
+     * 单个文件上传
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/upload")
+    public ResultJson upload(@RequestParam MultipartFile file) throws Exception {
+       ResultJson resultJson =  new ResultJson();
+                if (null!=file && !file.isEmpty() && file.getSize()>0){
+                    byte[] filebyte = file.getBytes();
+                    String fileLitleName = file.getName();
+                    String fileName = file.getOriginalFilename();
+                    String fileType =  fileName.substring((fileName.lastIndexOf(".")));
+                    StringBuffer stringBuffer = new StringBuffer();
+                    String saveFileName =  stringBuffer.append(uploadPath).append(DateUtil.getToday()).append("/").append(Helper.getUUID()).append(fileType).toString();
+                    File saveFile = new File(saveFileName);
+                    if(!saveFile.getParentFile().exists()){
+                        saveFile.mkdirs();
+                    }
+
+                    try{
+                        FileUtils.writeByteArrayToFile(saveFile,filebyte);
+                        Attachment attachment = new Attachment(saveFileName);
+                        int i =attachmentService.insertSelective(attachment);
+                        resultJson = (i==1 ? new ResultJson("200","附件入库成功",saveFileName) :new ResultJson("500","附件入库失败"));
+                    }catch (IOException e){
+                        resultJson = new ResultJson("400","附件存储失败",e);
+                        e.printStackTrace();
+                    }catch (IllegalStateException e){
+                        resultJson = new ResultJson("400","附件存储失败",e);
+                        e.printStackTrace();
+                    }
+                }
+                return resultJson;
+    }
+
+    /**
+     * 批量上传
+     * @param files
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/uploads")
+    public ResultJson upload(MultipartFile[] files) throws Exception {
+        if (files!=null && files.length>0){
+            // ... 处理文件储存逻辑
+            for (MultipartFile file : files) {
+                if (!file.isEmpty() && file.getSize()>0){
+                    String fileName = file.getName();
+                    String fileType = file.getContentType();
+                    String saveDir = readProperties("uploadDirectory");
+                    StringBuffer stringBuffer = new StringBuffer();
+                    stringBuffer.append(saveDir).append("/").append(DateUtil.getToday()).append("/").append(fileType).append(Helper.getUUID()).append(fileName);
+                    File saveFile = new File(stringBuffer.toString());
+                    try{
+                        file.transferTo(saveFile);
+                    }catch (IOException e){
+                        e.printStackTrace();
+                    }catch (IllegalStateException e){
+                        e.printStackTrace();
+                    }
+
+                }
+
+            }
+        }
+        return new ResultJson();
+    }
+}

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.annotation.UserPasswordMd5;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.USERS;
+import com.tianbo.warehouse.model.UserRole;
+import com.tianbo.warehouse.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/user")
+@Api("swaggerDemoController相关的api")
+public class UserController {
+
+    @Autowired
+    UserService userService;
+
+    @ApiOperation(value = "查询用户列表及信息", notes = "查询用户列表及单个用户信息")
+    @ApiImplicitParams({@ApiImplicitParam(name = "pageNum", value = "分页-当前页", required = false, dataType = "int",defaultValue = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "分页-每页显示多少条", required = false, dataType = "int",defaultValue = "5")})
+    @GetMapping("/user/list")
+    public PageInfo<USERS> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                        int pageNum,
+                                @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                        int pageSize){
+        return userService.selectAllUser(pageNum,pageSize);
+    }
+
+    public String getusername(){
+
+        //通过session获取当前登录的用户信息
+        UserDetails userDetails =(UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        return "欢迎回来:"+userDetails.getUsername();
+    }
+
+    @LogAnnotation(moduleName = "用户管理",operate = "用户编辑")
+    @UserPasswordMd5
+    @PutMapping("/user/edit")
+    public ResultJson updateUserById(@RequestBody @Valid USERS user){
+       int i = userService.updateByPrimaryKeySelective(user);
+        ResultJson resultJson = new ResultJson();
+        return i==1 ? new ResultJson("200","success") :new ResultJson("500","update faild");
+
+    }
+
+    @UserPasswordMd5
+    @LogAnnotation(moduleName = "用户管理",operate = "用户添加")
+    @PostMapping("/user/add")
+    public ResultJson addUser(@RequestBody @Valid USERS user, HttpServletRequest request, HttpServletResponse response, BindingResult bindingResult){
+
+        if (bindingResult.hasErrors()){
+           String s =  bindingResult.toString();
+        }
+
+        int i = userService.insertSelective(user);
+        ResultJson resultJson = new ResultJson();
+        return i==1 ? new ResultJson("200","新建账户成功") :new ResultJson("500","insert faild");
+
+    }
+
+    @LogAnnotation(moduleName = "用户管理",operate = "用户删除")
+    @DeleteMapping("/user/del")
+    public ResultJson delUser(@RequestBody USERS user,HttpServletRequest request,HttpServletResponse response){
+        //String username = getusername();
+        int i = userService.deleteByPrimaryKey(user.getUserId());
+        ResultJson resultJson = new ResultJson();
+        return i==1 ? new ResultJson("200","删除账户成功") :new ResultJson("500","delete faild");
+
+    }
+
+    @PutMapping("/user/roleset")
+    public ResultJson roleSet(@RequestBody UserRole userRole){
+
+       int i =  userService.setUserRole(userRole);
+
+       return i==1 ? new ResultJson("200","设置角色成功") :new ResultJson("500","设置角色失败");
+
+    }
+
+}

+package com.tianbo.warehouse.controller.response;
+
+import com.alibaba.fastjson.JSON;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+/**
+ * 统一拦截response接口返回数据
+ */
+//@ControllerAdvice
+public class RestControllerResponseAdvice  implements ResponseBodyAdvice<Object>{
+
+    /**
+     * //判断支持的类型，因为我们定义的BaseResponseVo 里面的data可能是任何类型，这里就不判断统一放过
+     * 如果你想对执行的返回体进行操作，可将上方的Object换成你自己的类型
+     * @param returnType
+     * @param converterType
+     * @return
+     */
+    @Override
+    public boolean supports(MethodParameter returnType, Class<? extends HttpMessageConverter<?>> converterType){
+        return true;
+    }
+
+    @Override
+    public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class<? extends HttpMessageConverter<?>> selectedConverterType, ServerHttpRequest request, ServerHttpResponse response){
+        // 对body进行封装处理
+        if (body instanceof String) {
+            String msg = (String) body;
+            ResultJson resultJson = new ResultJson("-1", msg);
+            // 因为在controller层中返回的是String类型，这边如果换成ResultJson的话，会导致StringMessageConverter方法类型转换异常，所以这边将对象转成字符串
+            return JSON.toJSONString(resultJson);
+        } else if (body instanceof Object) {
+            Object data = (Object) body;
+            ResultJson resultJson = new ResultJson(data);
+            return resultJson;
+        }
+
+        return body;
+    }
+}

+package com.tianbo.warehouse.controller.response;
+
+import java.io.Serializable;
+
+public class ResultJson implements Serializable{
+    private static final long serialVersionUID = 1L;
+
+    // 状态码 正确为0
+    private String code = "0";
+    // 错误描述
+    private String msg = "";
+    // 返回对象
+    private Object data = "";
+
+    public ResultJson() {
+    }
+
+    public ResultJson(String code) {
+        this.code = code;
+    }
+
+    public ResultJson(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public ResultJson(Object data) {
+        this.data = data;
+    }
+
+    public ResultJson(String code, String msg, Object data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.Attachment;
+
+public interface AttachmentMapper {
+    int deleteByPrimaryKey(Integer aid);
+
+    int insert(Attachment record);
+
+    int insertSelective(Attachment record);
+
+    Attachment selectByPrimaryKey(Integer aid);
+
+    int updateByPrimaryKeySelective(Attachment record);
+
+    int updateByPrimaryKey(Attachment record);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.LOG;
+import com.tianbo.warehouse.model.LOGWithBLOBs;
+
+import java.util.List;
+
+public interface LOGMapper {
+    int deleteByPrimaryKey(Integer logid);
+
+    int insert(LOGWithBLOBs record);
+
+    int insertSelective(LOGWithBLOBs record);
+
+    LOGWithBLOBs selectByPrimaryKey(Integer logid);
+
+    List<LOGWithBLOBs> selectAll();
+
+    int updateByPrimaryKeySelective(LOGWithBLOBs record);
+
+    int updateByPrimaryKeyWithBLOBs(LOGWithBLOBs record);
+
+    int updateByPrimaryKey(LOG record);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.PERMISSION;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface PERMISSIONMapper {
+    int deleteByPrimaryKey(Integer permissionId);
+
+    int insert(PERMISSION record);
+
+    int insertSelective(PERMISSION record);
+
+    PERMISSION selectByPrimaryKey(Integer permissionId);
+
+    int updateByPrimaryKeySelective(PERMISSION record);
+
+    int updateByPrimaryKey(PERMISSION record);
+
+    List<PERMISSION> findAll();
+
+    List<PERMISSION> getAllMenus();
+
+    List<PERMISSION> findByUserId(Integer userId);
+
+    List<String> findRoleListByUrl(String permissionUrl);
+
+    List<PERMISSION> getRolePermisson(Integer roleId);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.PERMISSION;
+import com.tianbo.warehouse.model.ROLE;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface ROLEMapper {
+    int deleteByPrimaryKey(Integer roleId);
+
+    int insert(ROLE record);
+
+    int insertSelective(ROLE record);
+
+    ROLE selectByPrimaryKey(Integer roleId);
+
+    int updateByPrimaryKeySelective(ROLE record);
+
+    int updateByPrimaryKey(ROLE record);
+
+    List<ROLE> findRolesByUserId(Integer userId);
+
+    List<ROLE> findAll();
+
+
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.RolePermission;
+
+import java.util.Map;
+
+public interface RolePermissionMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(RolePermission record);
+
+    int insertSelective(RolePermission record);
+
+    RolePermission selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(RolePermission record);
+
+    int updateByPrimaryKey(RolePermission record);
+
+    int insertRolePerm(RolePermission record);
+
+    int delPermByRoleId(Integer roleId);
+
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.USERS;
+
+import java.util.List;
+
+public interface USERSMapper {
+    int deleteByPrimaryKey(Integer userId);
+
+    int insert(USERS record);
+
+    int insertSelective(USERS record);
+
+    USERS selectByPrimaryKey(Integer userId);
+
+    int updateByPrimaryKeySelective(USERS record);
+
+    int updateByPrimaryKey(USERS record);
+
+    List<USERS> selectByUsername(String userName);
+
+    List<USERS> selectAllUser();
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.UserRole;
+
+public interface UserRoleMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int deleteByUserId(Integer userId);
+
+    int insert(UserRole record);
+
+    int insertSelective(UserRole record);
+
+    UserRole selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(UserRole record);
+
+    int updateByPrimaryKey(UserRole record);
+}

 package com.tianbo.warehouse.imf;
 package com.tianbo.warehouse.imf;
 
 
 import com.caac.imf.api.IMFClient;
 import com.caac.imf.api.IMFClient;
-import com.tianbo.warehouse.handle.IMFSaveHandle;
-import com.tianbo.warehouse.schedul.IMF_Task;
-import com.tianbo.warehouse.util.IO.FileTool;
+import com.tianbo.warehouse.imf.handle.IMFSaveHandle;
+import com.tianbo.warehouse.imf.schedul.IMF_Task;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 
 
 public class IMF_Reader extends Thread{
 public class IMF_Reader extends Thread{

 package com.tianbo.warehouse.imf;
 package com.tianbo.warehouse.imf;
 
 
 import com.caac.imf.api.IMFClient;
 import com.caac.imf.api.IMFClient;
-import com.tianbo.warehouse.schedul.IMF_Task;
+import com.tianbo.warehouse.imf.schedul.IMF_Task;
 import com.tianbo.warehouse.util.Date.DateUtil;
 import com.tianbo.warehouse.util.Date.DateUtil;
 import com.tianbo.warehouse.util.IO.FileTool;
 import com.tianbo.warehouse.util.IO.FileTool;
 import com.tianbo.warehouse.util.XML.MakeImfMeta;
 import com.tianbo.warehouse.util.XML.MakeImfMeta;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
-import org.xml.sax.SAXParseException;
 
 
-import java.io.File;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.List;
 
 

-package com.tianbo.warehouse.handle;
+package com.tianbo.warehouse.imf.handle;
 
 
 import com.tianbo.warehouse.model.T_ETL_MESSAGE;
 import com.tianbo.warehouse.model.T_ETL_MESSAGE;
 import com.tianbo.warehouse.service.T_ETL_MESSAGEService;
 import com.tianbo.warehouse.service.T_ETL_MESSAGEService;
@@ -55,19 +55,17 @@ public class IMFSaveHandle {
             String sndrm = meta.get("SNDR").toString();
             String sndrm = meta.get("SNDR").toString();
             String stypm = meta.get("STYP").toString();
             String stypm = meta.get("STYP").toString();
 
 
+
+
             if ("TXD".equals(sndrm)){
             if ("TXD".equals(sndrm)){
-                if("EDEP".equals(stypm)
-                        || "EFOH".equals(stypm)
-                        || "ERCF".equals(stypm)
-                        || "PFFM".equals(stypm)
-                        || "UDEP".equals(stypm)
-                        || "UFOH".equals(stypm)
-                        || "URCF".equals(stypm)
-                        || "FFM".equals(stypm)
-                        || "IFWB".equals(stypm)
-                        || "IFHL".equals(stypm)){
-                    //存储至备份目录
-                    FileTool.writeFileToBak(xmlmessage);
+                //读取配置文件的需要本地存储报文的节点
+                String saveStyp= FileTool.readProperties("saveStyp");
+                String[]  styps = saveStyp.split(",");
+                for (String item: styps) {
+                    if (item.equals(stypm)){
+                        //存储至备份目录
+                        FileTool.writeFileToBak(xmlmessage);
+                    }
                 }
                 }
             }
             }
 
 

-package com.tianbo.warehouse.schedul;
+package com.tianbo.warehouse.imf.schedul;
 
 
 import com.caac.imf.api.IMFClient;
 import com.caac.imf.api.IMFClient;
 import com.caac.imf.api.IMFClientFactory;
 import com.caac.imf.api.IMFClientFactory;
@@ -7,7 +7,6 @@ import com.tianbo.warehouse.imf.IMF_Sender;
 import com.tianbo.warehouse.util.IO.FileTool;
 import com.tianbo.warehouse.util.IO.FileTool;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.PropertyConfigurator;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
@@ -24,7 +23,7 @@ public class IMF_Task {
     public static String isNeedSend = "N";
     public static String isNeedSend = "N";
 
 
 
 
-    @Scheduled(fixedRate = 5000)
+//    @Scheduled(fixedRate = 5000)
     private static void start() throws Exception {
     private static void start() throws Exception {
         PropertyConfigurator.configure("config/log4j.properties");
         PropertyConfigurator.configure("config/log4j.properties");
         client = IMFClientFactory.createInstance();
         client = IMFClientFactory.createInstance();
@@ -41,6 +40,7 @@ public class IMF_Task {
         //启动读取线程
         //启动读取线程
         if (client != null) {
         if (client != null) {
             IMF_Reader reader = new IMF_Reader(client);
             IMF_Reader reader = new IMF_Reader(client);
+
             if (!IMF_Reader.isrunning) {
             if (!IMF_Reader.isrunning) {
                 reader.start();
                 reader.start();
                 logger.info("*********读取线程已开启***********");
                 logger.info("*********读取线程已开启***********");

+package com.tianbo.warehouse.model;
+
+import lombok.Data;
+
+@Data
+public class Attachment {
+    private Integer aid;
+
+    private String path;
+
+    public Attachment(String path){
+        this.path = path;
+    }
+}

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class LOG {
+    private Integer logid;
+
+    private String username;
+
+    private String ip;
+
+    private Date logcreattime;
+
+    private String methodname;
+
+    private String modelnamecn;
+
+    private String operatenamecn;
+
+    private String classname;
+
+    public Integer getLogid() {
+        return logid;
+    }
+
+    public void setLogid(Integer logid) {
+        this.logid = logid;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username == null ? null : username.trim();
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip == null ? null : ip.trim();
+    }
+
+    public Date getLogcreattime() {
+        return logcreattime;
+    }
+
+    public void setLogcreattime(Date logcreattime) {
+        this.logcreattime = logcreattime;
+    }
+
+    public String getMethodname() {
+        return methodname;
+    }
+
+    public void setMethodname(String methodname) {
+        this.methodname = methodname == null ? null : methodname.trim();
+    }
+
+    public String getModelnamecn() {
+        return modelnamecn;
+    }
+
+    public void setModelnamecn(String modelnamecn) {
+        this.modelnamecn = modelnamecn == null ? null : modelnamecn.trim();
+    }
+
+    public String getOperatenamecn() {
+        return operatenamecn;
+    }
+
+    public void setOperatenamecn(String operatenamecn) {
+        this.operatenamecn = operatenamecn == null ? null : operatenamecn.trim();
+    }
+
+    public String getClassname() {
+        return classname;
+    }
+
+    public void setClassname(String classname) {
+        this.classname = classname == null ? null : classname.trim();
+    }
+}

+package com.tianbo.warehouse.model;
+
+public class LOGWithBLOBs extends LOG {
+    private String parameters;
+
+    private String result;
+
+    public String getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(String parameters) {
+        this.parameters = parameters == null ? null : parameters.trim();
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result == null ? null : result.trim();
+    }
+}

+package com.tianbo.warehouse.model;
+
+import java.util.List;
+
+public class PERMISSION {
+    private Integer permissionId;
+
+    private String name;
+
+    private String permissionOrder;
+
+    private String description;
+
+    private Boolean ismenu;
+
+    private Boolean hidden;
+
+    private Integer parentId;
+
+    private String path;
+
+    private String url;
+
+    private String method;
+
+    private String iconCls;
+
+    private String component;
+
+    private List<PERMISSION> children;
+
+    public Integer getPermissionId() {
+        return permissionId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPermissionOrder() {
+        return permissionOrder;
+    }
+
+    public void setPermissionOrder(String permissionOrder) {
+        this.permissionOrder = permissionOrder;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public Boolean getIsmenu() {
+        return ismenu;
+    }
+
+    public void setIsmenu(Boolean ismenu) {
+        this.ismenu = ismenu;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path == null ? null : path.trim();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
+    public String getIconCls() {
+        return iconCls;
+    }
+
+    public void setIconCls(String iconCls) {
+        this.iconCls = iconCls;
+    }
+
+    public String getComponent() {
+        return component;
+    }
+
+    public void setComponent(String component) {
+        this.component = component;
+    }
+
+    public List<PERMISSION> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<PERMISSION> children) {
+        this.children = children;
+    }
+}

+package com.tianbo.warehouse.model;
+
+import org.springframework.security.core.GrantedAuthority;
+
+import java.util.List;
+
+public class ROLE implements GrantedAuthority {
+    private static final long serialVersionUID = 1L;
+
+    private Integer roleId;
+
+    private String roleName;
+
+    private String roleSign;
+
+    private String description;
+
+    private List<PERMISSION> permissions;
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName == null ? null : roleName.trim();
+    }
+
+    public String getRoleSign() {
+        return roleSign;
+    }
+
+    public void setRoleSign(String roleSign) {
+        this.roleSign = roleSign == null ? null : roleSign.trim();
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public List<PERMISSION> getPermissions() {
+        return permissions;
+    }
+
+    public void setPermissions(List<PERMISSION> permissions) {
+        this.permissions = permissions;
+    }
+
+    @Override
+    public String getAuthority(){
+        return this.getRoleName();
+    }
+}

+package com.tianbo.warehouse.model;
+
+import java.util.List;
+
+public class RolePermission {
+    private Integer id;
+
+    private Integer roleId;
+
+    private Integer permissionId;
+
+    //处理前端提交过来的权限ID列表
+    private List<Integer> permissionIds;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getPermissionId() {
+        return permissionId;
+    }
+
+    public void setPermissionId(Integer permissionId) {
+        this.permissionId = permissionId;
+    }
+
+    public List<Integer> getPermissionIds() {
+        return permissionIds;
+    }
+
+    public void setPermissionIds(List<Integer> permissionIds) {
+        this.permissionIds = permissionIds;
+    }
+}

+package com.tianbo.warehouse.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.tianbo.warehouse.validate.CheckUserExist;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.validation.constraints.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+public class USERS implements UserDetails {
+
+    private static final long serialVersionUID = 1L;
+
+    @DecimalMin("1")
+    private Integer userId;
+
+    @NotBlank(message="用户名不能为空")
+    @Length(min = 5, max = 11, message = "username 长度必须在 {min} - {max} 之间")
+    @CheckUserExist(message = "用户已存在")
+    private String username;
+
+    @NotNull
+    @NotBlank(message="密码不能为空")
+    @Length(min = 6, max = 22, message = "密码 长度必须在 {min} - {max} 之间")
+    private String password;
+
+    private Date birthday;
+
+    private String sex;
+
+    private String address;
+
+    private Boolean state;
+
+    @Length(min = 11, max = 11, message = "mobilephone 长度必须为11位")
+    private String mobilephone;
+
+    private Date creattime;
+
+    private Date updatetime;
+
+    private String userface;
+
+    private String realname;
+    @Pattern(regexp="[a-za-z0-9._%+-]+@[a-za-z0-9.-]+\\.[a-za-z]{2,4}", message="邮件格式错误")
+    private String email;
+
+    private Integer age;
+
+    @JSONField(serialzeFeatures= {SerializerFeature.WriteMapNullValue,SerializerFeature.WriteNullStringAsEmpty})
+    private List<ROLE> roles;
+
+    @JSONField(serialzeFeatures= {SerializerFeature.WriteMapNullValue,SerializerFeature.WriteNullStringAsEmpty})
+    private List<PERMISSION> permissions;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username == null ? null : username.trim();
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password == null ? null : password.trim();
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex == null ? null : sex.trim();
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+    public Boolean getState() {
+        return state;
+    }
+
+    public void setState(Boolean state) {
+        this.state = state;
+    }
+
+    public String getMobilephone() {
+        return mobilephone;
+    }
+
+    public void setMobilephone(String mobilephone) {
+        this.mobilephone = mobilephone == null ? null : mobilephone.trim();
+    }
+
+    public Date getCreattime() {
+        return creattime;
+    }
+
+    public void setCreattime(Date creattime) {
+        this.creattime = creattime;
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    public String getUserface() {
+        return userface;
+    }
+
+    public void setUserface(String userface) {
+        this.userface = userface == null ? null : userface.trim();
+    }
+
+    public String getRealname() {
+        return realname;
+    }
+
+    public void setRealname(String realname) {
+        this.realname = realname;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public List<ROLE> getRoles() {
+        return roles;
+    }
+
+    public void setRoles(List<ROLE> roles) {
+        this.roles = roles;
+    }
+
+    public List<PERMISSION> getPermissions() {
+        return permissions;
+    }
+
+    public void setPermissions(List<PERMISSION> permissions) {
+        this.permissions = permissions;
+    }
+
+    /**
+     *
+     * @return 账户未过期
+     */
+    @Override
+    public boolean isAccountNonExpired(){
+        return true;
+    }
+
+    /**
+     *
+     * @return 账户未锁定
+     */
+    @Override
+    public boolean isAccountNonLocked(){
+        return true;
+    }
+
+    /**
+     *
+     * @return 密码未过期
+     */
+    @Override
+    public boolean isCredentialsNonExpired(){
+        return true;
+    }
+
+    /**
+     *
+     * @return 账户可用
+     */
+    @Override
+    public boolean isEnabled(){
+        return true;
+    }
+
+    /**
+     *
+     * @return user的权限列表
+     */
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities(){
+        List<GrantedAuthority> auths = new ArrayList<>();
+        if(roles!=null && !roles.isEmpty()){
+            for (ROLE role : roles) {
+                if (null != role){
+                    auths.add(new SimpleGrantedAuthority(role.getAuthority()));
+                }
+            }
+        }
+        return auths;
+    }
+}

+package com.tianbo.warehouse.model;
+
+import lombok.Data;
+
+import javax.validation.constraints.DecimalMin;
+import java.util.List;
+
+@Data
+public class UserRole {
+
+    @DecimalMin("1")
+    private Integer id;
+
+    @DecimalMin("1")
+    private Integer userId;
+
+    @DecimalMin("1")
+    private Integer roleId;
+
+    private List<Integer> roleIds;
+
+    public UserRole(){
+    }
+    public UserRole(Integer userId,Integer roleId){
+        this.roleId=roleId;
+        this.userId = userId;
+    }
+}

+package com.tianbo.warehouse.security;
+
+import com.tianbo.warehouse.model.USERS;
+import com.tianbo.warehouse.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("customuserservice")
+public class CustomUserDetailService implements UserDetailsService {
+
+    @Autowired
+    UserService userService;
+
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+
+
+        USERS user = userService.loadByUsername(username);
+        if (user == null) {
+            throw new UsernameNotFoundException("用户名不存在");
+//            throw new BadCredentialsException("用户名不存在");
+        }
+        return user;
+
+    }
+}

+package com.tianbo.warehouse.security;
+
+import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+@Service
+public class MyAccessDecisionManager implements AccessDecisionManager{
+     /**这里没用AccessDecisionVoter访问投票管理，自定义用户的role_name与URL需要的ROLE_NAME对碰决定，参考资料：https://blog.csdn.net/kaikai8552/article/details/3965841
+     * decide方法接收三个参数，decide 方法是判定是否拥有权限的决策方法
+     * 其中第一个参数中保存了当前登录用户的角色信息，authentication 是释CustomUserService中循环添加到 GrantedAuthority 对象中的权限信息集合.
+     * object 包含客户端发起的请求的requset信息，可转换为 HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
+     * 第三个参数则是MyInvocationSecurityMetadataSourceService中的getAttributes方法传来的，表示当前请求需要的角色（可能有多个）,此方法是为了判定用户请求的url 是否在权限表中，如果在权限表中，则返回给 decide 方法，用来判定用户是否有此权限。如果不在权限表中则放行。
+     * @param authentication
+     * @param object
+     * @param configAttributes
+     * @throws AccessDeniedException
+     * @throws InsufficientAuthenticationException
+     */
+    @Override
+    public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes) throws AccessDeniedException, InsufficientAuthenticationException{
+
+        if(null== configAttributes || configAttributes.size() <=0) {
+            return;
+        }
+        ConfigAttribute c;
+        String needRole;
+        for(Iterator<ConfigAttribute> iter = configAttributes.iterator(); iter.hasNext(); ) {
+            c = iter.next();
+            needRole = c.getAttribute();
+
+
+
+            //authentication 为在注释1 中循环添加到 GrantedAuthority 对象中的权限信息集合
+            for(GrantedAuthority ga : authentication.getAuthorities()) {
+
+                //如果URL需要的权限为匿名访问，返回
+                if(("ROLE_admin").equals(ga.getAuthority())){
+                    return;
+                }
+
+                if(needRole.trim().equals(ga.getAuthority())) {
+                    return;
+                }
+            }
+        }
+        throw new AccessDeniedException("权限不足!");
+
+        /**
+         * ExceptionTranslationFilter
+
+         ExceptionTranslationFilter 是Spring Security的核心filter之一，用来处理AuthenticationException和AccessDeniedException两种异常。
+
+         在我们的例子中，AuthenticationException指的是未登录状态下访问受保护资源，AccessDeniedException指的是登陆了但是由于权限不足(比如普通用户访问管理员界面）。
+
+         ExceptionTranslationFilter 持有两个处理类，分别是AuthenticationEntryPoint和AccessDeniedHandler。
+
+         ExceptionTranslationFilter 对异常的处理是通过这两个处理类实现的，处理规则很简单：
+
+         规则1. 如果异常是 AuthenticationException，使用 AuthenticationEntryPoint 处理
+         规则2. 如果异常是 AccessDeniedException 且用户是匿名用户，使用 AuthenticationEntryPoint 处理
+         规则3. 如果异常是 AccessDeniedException 且用户不是匿名用户，如果否则交给 AccessDeniedHandler 处理。
+         */
+    }
+
+    @Override
+    public boolean supports(ConfigAttribute var1){
+        return true;
+    }
+
+    @Override
+    public boolean supports(Class<?> var1){
+        return true;
+    }
+}

+package com.tianbo.warehouse.security;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.SecurityMetadataSource;
+import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
+import org.springframework.security.access.intercept.InterceptorStatusToken;
+import org.springframework.security.web.FilterInvocation;
+import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+@Service
+public class MyFilterSecurityInterceptor extends AbstractSecurityInterceptor implements Filter {
+
+    @Autowired
+    private MyInvocationSecurityMetadataSourceService securityMetadataSource;
+
+
+    @Autowired
+    public void setMyAccessDecisionManager(MyAccessDecisionManager myAccessDecisionManager) {
+        super.setAccessDecisionManager(myAccessDecisionManager);
+    }
+
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+
+        FilterInvocation fi = new FilterInvocation(request, response, chain);
+        invoke(fi);
+    }
+
+
+    public void invoke(FilterInvocation fi) throws IOException, ServletException {
+        /**
+         *fi里面有一个被拦截的url里面调用MyInvocationSecurityMetadataSource的getAttributes(Object object)这个方法获取fi对应的所有权限
+         再调用MyAccessDecisionManager的decide方法来校验用户的权限是否足够
+         */
+        InterceptorStatusToken token = super.beforeInvocation(fi);
+        try {
+//执行下一个拦截器
+            fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
+        } finally {
+            super.afterInvocation(token, null);
+        }
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+
+    @Override
+    public Class<?> getSecureObjectClass() {
+        return FilterInvocation.class;
+    }
+
+    @Override
+    public SecurityMetadataSource obtainSecurityMetadataSource() {
+        return this.securityMetadataSource;
+    }
+
+}

+package com.tianbo.warehouse.security;
+
+import com.tianbo.warehouse.dao.PERMISSIONMapper;
+import com.tianbo.warehouse.model.PERMISSION;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.web.FilterInvocation;
+import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.stereotype.Service;
+import org.springframework.util.AntPathMatcher;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+/**
+ * 本类的主要功能就是通过当前的请求地址，获取该地址需要的用户角色
+ * 如果getAttributes(Object o)方法返回null的话，意味着当前这个请求不需要任何角色就能访问，甚至不需要登录。
+ */
+@Service
+public class MyInvocationSecurityMetadataSourceService implements FilterInvocationSecurityMetadataSource{
+
+    @Autowired
+    PERMISSIONMapper permissionMapper;
+    AntPathMatcher pathMatcher = new AntPathMatcher();
+
+    private HashMap<String, Collection<ConfigAttribute>> map =null;
+
+    /**
+     * 加载权限表中所有权限,还是加载URL所需要的权限
+     */
+    public void loadResourceDefine(String requestUrl){
+        map = new HashMap<>();
+        Collection<ConfigAttribute> array;
+        ConfigAttribute cfg;
+        List<PERMISSION> permissions = permissionMapper.findAll();
+        for(PERMISSION permission : permissions) {
+            array = new ArrayList<>();
+
+            //此处只添加了用户的名字，其实还可以添加更多权限的信息，
+            // 例如请求方法到ConfigAttribute的集合中去。
+            // 此处添加的信息将会作为MyAccessDecisionManager类的decide的第三个参数。
+
+            //CFG存储访问的URL需要的权限"ROLE_？？"LIST
+            String pUrl = permission.getUrl();
+            List<String> urlOfRoles = permissionMapper.findRoleListByUrl(pUrl);
+
+            //路径适配，这个很重要，是配上后会包含其他适配的所有权限,比如/**与/user/List是可以适配上的，
+            // 那么/**这个通用适配是要有/user/list这个路径所对应的角色信息的
+            if(pathMatcher.match(pUrl,requestUrl)){
+
+            }
+
+            for (String roleName:urlOfRoles) {
+
+                if(null!=roleName) {
+                    cfg = new SecurityConfig(roleName);
+                    array.add(cfg);
+                }
+            }
+            //用权限的getUrl() 作为map的key，用ConfigAttribute的集合作为 value，
+            map.put(pUrl, array);
+
+
+        }
+
+    }
+
+    /**
+     * 所有的权限表中的url所对应的角色信息
+     * @return 有就返回集合 没有就返回null
+     */
+    public Collection<ConfigAttribute> loadResourceDefine(){
+        Collection<ConfigAttribute> array;
+        ConfigAttribute cfg;
+        List<PERMISSION> permissions = permissionMapper.findAll();
+        for(PERMISSION permission : permissions) {
+            array = new ArrayList<>();
+
+            //此处只添加了用户的名字，其实还可以添加更多权限的信息，
+            // 例如请求方法到ConfigAttribute的集合中去。
+            // 此处添加的信息将会作为MyAccessDecisionManager类的decide的第三个参数。
+
+            //CFG存储访问的URL需要的权限"ROLE_？？"LIST
+            String pUrl = permission.getUrl();
+            List<String> urlOfRoles = permissionMapper.findRoleListByUrl(pUrl);
+
+            for (String roleName:urlOfRoles) {
+                if(null!=roleName) {
+                    cfg = new SecurityConfig(roleName);
+                    array.add(cfg);
+                }
+            }
+            return array;
+
+        }
+        return null;
+    }
+
+    /**
+     * 此方法是为了判定用户请求的url权限 是否有对应的角色，
+     * 如果有对应角色信息，则返回给 decide 方法，
+     * 用来判定用户是否有此权限。如果不在权限表中则放行。
+     * 如果getAttributes(Object o)方法返回null的话，意味着当前这个请求不需要任何角色就能访问
+     * getAttributes(Object o)方法返回的集合最终会来到AccessDecisionManager类中
+     * @param object
+     * @return
+     * @throws IllegalArgumentException
+     */
+    @Override
+    public Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException {
+        //清楚地址
+        String requestUrl = ((FilterInvocation)object).getRequest().getRequestURI();
+
+        //每次判定的时候都加载权限对应URL表
+//        if(map ==null) {
+            loadResourceDefine(requestUrl);
+//        }
+        //object 中包含用户请求的request 信息
+        HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
+        String resUrl;
+        for(Iterator<String> iter = map.keySet().iterator(); iter.hasNext(); ) {
+            resUrl = iter.next();
+            AntPathRequestMatcher matcher = new AntPathRequestMatcher(resUrl);
+            if(matcher.matches(request)) {
+                return map.get(resUrl);
+            }
+        }
+        return null;
+    }
+
+    /**
+     *
+     * @return 所有URL对应的所有权限
+     */
+    @Override
+    public Collection<ConfigAttribute> getAllConfigAttributes() {
+//        return loadResourceDefine();
+        return null;
+    }
+
+    @Override
+    public boolean supports(Class<?> clazz) {
+        return true;
+    }
+}

+package com.tianbo.warehouse.security.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+/**
+ * 解决前后端分离跨域问题
+ */
+@Configuration
+public class CorsConfig implements WebMvcConfigurer{
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")//设置允许跨域的路径
+                .allowedOrigins("*")//设置允许跨域请求的域名
+                .allowCredentials(true)//是否允许证书 不再默认开启
+                .allowedMethods("GET", "POST", "PUT", "DELETE")//设置允许的方法
+                .maxAge(3600);//跨域允许时间
+    }
+}

+package com.tianbo.warehouse.security.config;
+
+import org.springframework.core.convert.converter.Converter;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateConverter implements Converter<String,Date>{
+    private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+    @Override
+    public Date convert(String s) {
+        if ("".equals(s) || s == null) {
+            return null;
+        }
+        try {
+            return simpleDateFormat.parse(s);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+}

+package com.tianbo.warehouse.security.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+//@Configuration
+public class MyWebMvcConfig {
+
+
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new DateConverter());
+    }
+}

+package com.tianbo.warehouse.security.config;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+/**
+ * PasswordEncoder 是个接口，该接口下有两个方法，一个是encoder 一个是matches，前者用于加密，后者用于匹配校验.
+ */
+@Service(value = "passwordEncodeService")
+public class PasswordEncoderImp implements PasswordEncoder{
+
+    @Override
+    public String encode(CharSequence charSequence) {
+        String enncodePassword = DigestUtils.md5Hex(charSequence.toString());
+        return enncodePassword;
+    }
+
+    @Override
+    public boolean matches(CharSequence rawPassword, String encodedPassword) {
+        //用户输入的登录密码
+        String endcodeInputPass = DigestUtils.md5Hex(rawPassword.toString());
+        return encodedPassword.equals(endcodeInputPass);
+    }
+}

+package com.tianbo.warehouse.security.config;
+
+import com.tianbo.warehouse.security.model.BrowserProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "tianbo.security")
+@Component
+public class SecurityProperties {
+
+    /**
+     * 浏览器 属性类
+     */
+    private BrowserProperties browser = new BrowserProperties();
+
+    public BrowserProperties getBrowser() {
+        return browser;
+    }
+
+    public void setBrowser(BrowserProperties browser) {
+        this.browser = browser;
+    }
+}

+package com.tianbo.warehouse.security.config;
+
+import com.netflix.discovery.converters.Auto;
+import com.tianbo.warehouse.security.CustomUserDetailService;
+import com.tianbo.warehouse.security.handel.MyAuthenticationAccessDeniedHandler;
+import com.tianbo.warehouse.security.handel.MyAuthenticationFailHandler;
+import com.tianbo.warehouse.security.handel.MyAuthenticationSuccessHandler;
+import com.tianbo.warehouse.security.MyFilterSecurityInterceptor;
+import com.tianbo.warehouse.security.handel.MyLogoutSuccessHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.authentication.configuration.EnableGlobalAuthentication;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+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;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
+import org.springframework.web.cors.CorsUtils;
+
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+@Order(1)
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Autowired
+    private MyFilterSecurityInterceptor myFilterSecurityInterceptor;
+
+    @Autowired
+    private  PasswordEncoder passwordEncoder;
+
+    @Autowired
+    private MyAuthenticationSuccessHandler successHandler;
+
+    @Autowired
+    private MyAuthenticationFailHandler failHandler;
+
+    @Qualifier("customuserservice")
+    @Autowired
+    private CustomUserDetailService userDetailsService;
+
+    @Autowired
+    private MyAuthenticationAccessDeniedHandler myAuthenticationAccessDeniedHandler;
+
+    @Autowired
+    private MyLogoutSuccessHandler myLogoutSuccessHandler;
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder  auth) throws Exception {
+        //user Details Service验证
+        auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder);
+        //不删除凭据，以便记住用户
+        auth.eraseCredentials(false);
+    }
+
+    /**
+     * 在configure(HttpSecurity http)方法中，
+     * 通过withObjectPostProcessor将刚刚创建的UrlFilterInvocationSecurityMetadataSource和UrlAccessDecisionManager注入进来。
+     * 到时候，请求都会经过刚才的过滤器（除了configure(WebSecurity web)方法忽略的请求）。
+     * 通过myFilterSecurityInterceptor关联他俩
+     * @param http
+     * @throws Exception
+     */
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests()
+                //跨域配置
+                .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
+                //管理页面只允许管理员角色访问
+                .antMatchers("/admin/**","/role/**","/user/**").authenticated()
+                //任何请求,登录后可以访问
+                //其余的不需要验证
+                .anyRequest().permitAll()
+                .and()
+                .formLogin()
+                .passwordParameter("password")
+                .usernameParameter("username")
+                //登陆提交的处理url
+                //.loginProcessingUrl("/home")
+                .loginPage("/login")
+                .successHandler(successHandler)
+                .failureHandler(failHandler)
+//                .failureUrl("/error")
+                //登录页面用户任意访问
+                .permitAll()
+//                .successForwardUrl("/main")
+                .and()
+                .exceptionHandling().accessDeniedHandler(myAuthenticationAccessDeniedHandler)
+                .and()
+                .logout()
+                .logoutSuccessUrl("/?logout=true")
+                .logoutSuccessHandler(myLogoutSuccessHandler)
+                .permitAll()
+                .and()
+                .rememberMe()
+                .tokenValiditySeconds(604800)
+                //记住我功能，cookies有限期是一周
+                .rememberMeParameter("remeberme")
+                //登陆时是否激活记住我功能的参数名字，在登陆页面有展示
+                .rememberMeCookieName("workspace")
+                //cookies的名字，登陆后可以通过浏览器查看cookies名字
+                .and()
+                .cors()
+                .and()
+                .csrf().disable();
+
+        http.addFilterBefore(myFilterSecurityInterceptor, FilterSecurityInterceptor.class);
+
+        //session管理
+        //session失效后跳转
+//        http.sessionManagement().invalidSessionUrl("/login");
+//        //只允许一个用户登录,如果同一个账户两次登录,那么第一个账户将被踢下线,跳转到登录页面
+//        http.sessionManagement().maximumSessions(1).expiredUrl("/login");
+    }
+}

+package com.tianbo.warehouse.security.handel;
+
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * AuthenticationEntryPoint 用来解决匿名用户访问无权限资源时的异常
+ * AccessDeineHandler 用来解决认证过的用户访问无权限资源时的异常
+ */
+@Component
+public class MyAuthenticationAccessDeniedHandler implements AccessDeniedHandler{
+
+    @Override
+    public void handle(HttpServletRequest httpServletRequest, HttpServletResponse resp, AccessDeniedException e) throws IOException, ServletException{
+
+        resp.setStatus(HttpServletResponse.SC_FORBIDDEN);
+        resp.setCharacterEncoding("UTF-8");
+        PrintWriter out = resp.getWriter();
+        out.write("{\"status\":\"error\",\"msg\":\"权限不足，请联系管理员!\"}");
+        out.flush();
+        out.close();
+    }
+
+}

+package com.tianbo.warehouse.security.handel;
+
+import org.springframework.security.web.AuthenticationEntryPoint;
+
+/**实现AuthenticationEntryPoint接口
+ * AuthenticationEntryPoint 用来解决匿名用户访问无权限资源时的异常
+ * AccessDeineHandler 用来解决认证过的用户访问无权限资源时的异常
+ */
+public class MyAuthenticationEntryPoint {
+//    response.setCharacterEncoding("utf-8");
+//        response.setContentType("text/javascript;charset=utf-8");
+//        response.getWriter().print(JSONObject.toJSONString(RestMsg.error("没有访问权限!")));
+
+}

+package com.tianbo.warehouse.security.handel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.tianbo.warehouse.security.config.SecurityProperties;
+import com.tianbo.warehouse.security.model.LoginType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.web.DefaultRedirectStrategy;
+import org.springframework.security.web.RedirectStrategy;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * 自定义登录失败处理器
+ * Created by mrz.
+ */
+@Component
+public class MyAuthenticationFailHandler extends SimpleUrlAuthenticationFailureHandler {
+    protected final Log logger = LogFactory.getLog(this.getClass());
+    /**
+     * json 转换工具类
+     */
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    private String defaultFailureUrl;
+    private boolean forwardToDestination = false;
+    private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+
+    @Autowired
+    private SecurityProperties securityProperties;
+
+    @Override
+    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
+
+        //返回前端原因
+        PrintWriter out = response.getWriter();
+        StringBuffer sb = new StringBuffer();
+        sb.append("{\"status\":\"error\",\"msg\":\"");
+        if (exception instanceof UsernameNotFoundException || exception instanceof BadCredentialsException) {
+            sb.append("用户名或密码输入错误，登录失败!");
+        } else if (exception instanceof DisabledException) {
+            sb.append("账户被禁用，登录失败，请联系管理员!");
+        } else {
+            sb.append("登录失败!");
+        }
+        sb.append("\"}");
+//        out.write(sb.toString());
+//        out.flush();
+//        out.close();
+
+        logger.info("登录失败");
+
+        //不返回具体原因 只返回异常
+        //如果securityProperties中配置的是JSON就返回JSON
+        if (LoginType.JSON.equals(securityProperties.getBrowser().getLoginType())){
+            //设置状态码
+            response.setStatus(HttpStatus.UNAUTHORIZED.value());
+            //将 登录失败 信息打包成json格式返回
+            response.setContentType("application/json;charset=UTF-8");
+            response.getWriter().write(objectMapper.writeValueAsString(exception));
+        }
+
+        if (this.defaultFailureUrl == null) {
+            this.logger.debug("No failure URL set, sending 401 Unauthorized error");
+            response.sendError(HttpStatus.UNAUTHORIZED.value(), HttpStatus.UNAUTHORIZED.getReasonPhrase());
+        } else {
+            this.saveException(request, exception);
+            if (this.forwardToDestination) {
+                this.logger.debug("Forwarding to " + this.defaultFailureUrl);
+                request.getRequestDispatcher(this.defaultFailureUrl).forward(request, response);
+            } else {
+                this.logger.debug("Redirecting to " + this.defaultFailureUrl);
+                this.redirectStrategy.sendRedirect(request, response, this.defaultFailureUrl);
+            }
+        }
+
+    }
+}

+package com.tianbo.warehouse.security.handel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.tianbo.warehouse.bean.AuthSuccessResponse;
+import com.tianbo.warehouse.controller.PermssionController;
+import com.tianbo.warehouse.model.PERMISSION;
+import com.tianbo.warehouse.model.USERS;
+import com.tianbo.warehouse.security.model.LoginType;
+import com.tianbo.warehouse.service.PermissionService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.tianbo.warehouse.security.config.SecurityProperties;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
+import org.springframework.security.web.savedrequest.RequestCache;
+import org.springframework.security.web.savedrequest.SavedRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * 登录成功后的返回处理
+ */
+@Component
+public class MyAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler{
+    protected final Log logger = LogFactory.getLog(this.getClass());
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
+    private PermissionService permissionService;
+    private RequestCache requestCache = new HttpSessionRequestCache();
+
+    @Autowired
+    private SecurityProperties securityProperties;
+
+    @Override
+    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws ServletException, IOException {
+        logger.info("登录成功");
+        if (LoginType.JSON.equals(securityProperties.getBrowser().getLoginType())){
+            //将 authention 信息打包成json格式返回
+            response.setContentType("application/json;charset=UTF-8");
+            response.setHeader("Access-Control-Allow-Origin","*");
+            USERS loginedUser = (USERS) authentication.getPrincipal();
+            Map<String,Object> menuMap =  permissionService.getUserMenus(loginedUser.getUserId());
+            response.getWriter().write(objectMapper.writeValueAsString(new AuthSuccessResponse(authentication,menuMap)));
+        }else {
+            //走原来的处理流程
+            SavedRequest savedRequest = this.requestCache.getRequest(request, response);
+            if (savedRequest == null) {
+                super.onAuthenticationSuccess(request, response, authentication);
+            } else {
+                String targetUrlParameter = this.getTargetUrlParameter();
+                if (!this.isAlwaysUseDefaultTargetUrl() && (targetUrlParameter == null || !StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
+                    this.clearAuthenticationAttributes(request);
+                    String targetUrl = savedRequest.getRedirectUrl();
+                    this.logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl);
+                    this.getRedirectStrategy().sendRedirect(request, response, targetUrl);
+                } else {
+                    this.requestCache.removeRequest(request, response);
+                    super.onAuthenticationSuccess(request, response, authentication);
+                }
+            }
+        }
+
+    }
+
+
+}

+package com.tianbo.warehouse.security.handel;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+@Component
+public class MyLogoutSuccessHandler implements LogoutSuccessHandler {
+
+    @Override
+    public void onLogoutSuccess(HttpServletRequest req, HttpServletResponse resp, Authentication authentication) throws IOException, ServletException{
+        resp.setContentType("application/json;charset=utf-8");
+//        RespBean respBean = RespBean.ok("注销成功!");
+        ObjectMapper om = new ObjectMapper();
+        PrintWriter out = resp.getWriter();
+        out.write(om.writeValueAsString(authentication));
+        out.flush();
+        out.close();
+    }
+
+}

+package com.tianbo.warehouse.security.model;
+
+/**
+ * browser(浏览器)配置文件里的： fantJ.security.browser.loginPage 属性类
+ *
+ */
+public class BrowserProperties {
+    /**
+     *  loginPage 默认值  是login.html
+     *  如果 application.properties 里有对 fantJ.security.browser.loginPage 的声明，则获取该值
+     */
+    private String loginPage = "/browser-login.html";
+
+    /**
+     * 默认 返回 json 类型,声明登录返回格式
+     */
+    private LoginType loginType = LoginType.JSON;
+
+    public String getLoginPage() {
+        return loginPage;
+    }
+
+    public void setLoginPage(String loginPage) {
+        this.loginPage = loginPage;
+    }
+
+    public LoginType getLoginType() {
+        return loginType;
+    }
+
+    public void setLoginType(LoginType loginType) {
+        this.loginType = loginType;
+    }
+}

+package com.tianbo.warehouse.security.model;
+
+public enum LoginType {
+    REDIRECT,
+    JSON
+}

+package com.tianbo.warehouse.service;
+
+import com.tianbo.warehouse.model.Attachment;
+
+public interface AttachmentService {
+
+    int insertSelective(Attachment record);
+}

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.LOG;
+import com.tianbo.warehouse.model.LOGWithBLOBs;
+
+public interface LogService {
+
+    int insertSelective(LOGWithBLOBs record);
+
+    PageInfo<LOGWithBLOBs> selectAll(int pageNum, int pageSize);
+}

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.PERMISSION;
+
+import java.util.List;
+import java.util.Map;
+
+public interface PermissionService {
+
+    PageInfo<PERMISSION> findAll(int pageNum, int pageSize);
+
+    int insertSelective(PERMISSION record);
+
+    /**
+     * 获取登录用户可访问的权限menus列表
+     * @param userId
+     * @return
+     */
+    Map<String,Object> getUserMenus(Integer userId);
+}

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.model.RolePermission;
+
+public interface RoleService {
+    PageInfo<ROLE> findAll(int pageNum, int pageSize);
+
+    int insertSelective(ROLE record);
+
+    int setRolePermissoin(RolePermission record);
+}

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.USERS;
+import com.tianbo.warehouse.model.UserRole;
+
+import java.util.List;
+
+public interface UserService {
+    USERS loadByUsername(String username);
+
+    PageInfo<USERS> selectAllUser(int pageNum, int pageSize);
+
+    int updateByPrimaryKeySelective(USERS record);
+
+    int insertSelective(USERS record);
+
+    int deleteByPrimaryKey(Integer userId);
+
+    int setUserRole(UserRole userRole);
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.tianbo.warehouse.dao.AttachmentMapper;
+import com.tianbo.warehouse.model.Attachment;
+import com.tianbo.warehouse.service.AttachmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AttachmentServiceImp implements AttachmentService {
+
+    @Autowired
+    private AttachmentMapper attachmentMapper;
+
+    @Override
+    public int insertSelective(Attachment record){
+        return attachmentMapper.insertSelective(record);
+    }
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.LOGMapper;
+import com.tianbo.warehouse.model.LOGWithBLOBs;
+import com.tianbo.warehouse.service.LogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service("webLog")
+public class LogServiceImp  implements LogService{
+
+    @Autowired
+    private LOGMapper logMapper;
+
+    @Override
+   public int insertSelective(LOGWithBLOBs record){
+       return logMapper.insertSelective(record);
+   }
+
+   @Override
+    public PageInfo<LOGWithBLOBs> selectAll(int pageNum,int pageSize){
+       Page<LOGWithBLOBs> page =  PageHelper.startPage(pageNum,pageSize);
+       List<LOGWithBLOBs> list = logMapper.selectAll();
+       PageInfo<LOGWithBLOBs> result = new PageInfo<LOGWithBLOBs>(list);
+       return result;
+    }
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.PERMISSIONMapper;
+import com.tianbo.warehouse.model.PERMISSION;
+import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.service.PermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service("PermissionService")
+public class PermissionServiceImp implements PermissionService{
+
+    @Autowired
+    PERMISSIONMapper permissionMapper;
+
+    @Override
+    public PageInfo<PERMISSION> findAll(int pageNum, int pageSize){
+        Page<PERMISSION> page =  PageHelper.startPage(pageNum,pageSize);
+        List<PERMISSION> list = permissionMapper.findAll();
+        PageInfo<PERMISSION> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(PERMISSION record){
+        return permissionMapper.insertSelective(record);
+    }
+
+    @Override
+    public Map<String,Object> getUserMenus(Integer userId){
+        Map<String,Object> data = new HashMap<String,Object>();
+        try {
+            //查询所有菜单
+            List<PERMISSION> allMenu = permissionMapper.findByUserId(userId);
+            //根节点
+            List<PERMISSION> rootMenu = new ArrayList<PERMISSION>();
+            for (PERMISSION nav : allMenu) {
+                if(nav.getParentId()==0){//父节点是0的，为根节点。
+                    rootMenu.add(nav);
+                }
+            }
+
+      /* 根据Menu类的order排序 */
+//            Collections.sort(rootMenu, order());
+            //为根菜单设置子菜单，getClild是递归调用的
+            for (PERMISSION nav : rootMenu) {
+        /* 获取根节点下的所有子节点 使用getChild方法*/
+                List<PERMISSION> childList = getChild(nav.getPermissionId(), allMenu);
+                nav.setChildren(childList);//给根节点设置子节点
+            }
+            /**
+             * 输出构建好的菜单数据。
+             *
+             */
+            data.put("success", "true");
+            data.put("list", rootMenu);
+            return data;
+        } catch (Exception e) {
+            data.put("success", "false");
+            data.put("list", new ArrayList());
+            return data;
+        }
+    }
+
+    /**
+     * 获取子节点
+     * @param id 父节点id
+     * @param allMenu 所有菜单列表
+     * @return 每个根节点下，所有子菜单列表
+     */
+    public List<PERMISSION> getChild(Integer id,List<PERMISSION> allMenu){
+        //子菜单
+        List<PERMISSION> childList = new ArrayList<PERMISSION>();
+        for (PERMISSION nav : allMenu) {
+            // 遍历所有节点，将所有菜单的父id与传过来的根节点的id比较
+            //相等说明：为该根节点的子节点。
+            if(nav.getParentId().equals(id)){
+                childList.add(nav);
+            }
+        }
+        //递归
+        for (PERMISSION nav : childList) {
+            nav.setChildren(getChild(nav.getPermissionId(), allMenu));
+        }
+//        Collections.sort(childList,order());//排序
+        //如果节点下没有子节点，返回一个空List（递归退出）
+        if(childList.size() == 0){
+            return new ArrayList<PERMISSION>();
+        }
+        return childList;
+    }
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.ROLEMapper;
+import com.tianbo.warehouse.dao.RolePermissionMapper;
+import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.model.RolePermission;
+import com.tianbo.warehouse.service.RoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service(value = "roleService")
+public class RoleServiceImp implements RoleService{
+
+    @Autowired
+    private ROLEMapper roleMapper;
+
+    @Autowired
+    private RolePermissionMapper rolePermissionMapper;
+
+    @Override
+    public PageInfo<ROLE> findAll(int pageNum, int pageSize){
+        Page<ROLE> page =  PageHelper.startPage(pageNum,pageSize);
+        List<ROLE> list = roleMapper.findAll();
+        PageInfo<ROLE> result = new PageInfo<ROLE>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(ROLE record){
+        return roleMapper.insertSelective(record);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int setRolePermissoin(RolePermission record){
+        try{
+            Integer roleId = record.getRoleId();
+            List<Integer> permissions = record.getPermissionIds();
+            //这里加个判定，如果前端提交的权限列表是空的，代表清空这个角色的所有权限,防止SQL出错
+            if (null!=permissions && !permissions.isEmpty()){
+                rolePermissionMapper.delPermByRoleId(roleId);
+                rolePermissionMapper.insertRolePerm(record);
+            }
+            return 1;
+        }catch (Exception e){
+            e.printStackTrace();
+            return 0;
+        }
+    }
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.PERMISSIONMapper;
+import com.tianbo.warehouse.dao.ROLEMapper;
+import com.tianbo.warehouse.dao.USERSMapper;
+import com.tianbo.warehouse.dao.UserRoleMapper;
+import com.tianbo.warehouse.model.PERMISSION;
+import com.tianbo.warehouse.model.ROLE;
+import com.tianbo.warehouse.model.USERS;
+import com.tianbo.warehouse.model.UserRole;
+import com.tianbo.warehouse.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service(value = "userService")
+public class UserServiceImpl implements UserService{
+
+    @Autowired
+    private USERSMapper usersMapper;
+
+    @Autowired
+    private ROLEMapper roleMapper;
+
+    @Autowired
+    private PERMISSIONMapper permissionMapper;
+
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+
+    @Override
+    public USERS loadByUsername(String username){
+        List<USERS> userList = usersMapper.selectByUsername(username);
+
+        if (userList != null && userList.size() > 0) {
+            USERS user = userList.get(0);
+
+            List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());
+            if (permissionList!=null && permissionList.size()>0){
+                user.setPermissions(permissionList);
+            }
+
+            List<ROLE> roleList = roleMapper.findRolesByUserId(user.getUserId());
+            if (roleList!=null && roleList.size()>0){
+                user.setRoles(roleList);
+            }
+            return user;
+        }
+        return null;
+
+    }
+
+    @Override
+    public PageInfo<USERS> selectAllUser(int pageNum, int pageSize){
+        Page<USERS> page =  PageHelper.startPage(pageNum,pageSize);
+        List<USERS> list = usersMapper.selectAllUser();
+        for (USERS user: list) {
+            List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());
+            user.setPermissions(permissionList);
+            List<ROLE> roleList = roleMapper.findRolesByUserId(user.getUserId());
+            user.setRoles(roleList);
+        }
+        PageInfo<USERS> result = new PageInfo<USERS>(list);
+        return result;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(USERS record){
+        int i = 0;
+        if (record!=null){
+          i = usersMapper.updateByPrimaryKeySelective(record);
+        }
+        return i;
+
+    }
+
+    @Override
+    public int insertSelective(USERS record){
+        if (null!=record){
+            return usersMapper.insertSelective(record);
+        }else {
+            return 0;
+        }
+    }
+
+    @Override
+    public int deleteByPrimaryKey(Integer userId){
+        if (null!=userId && userId>0){
+            return usersMapper.deleteByPrimaryKey(userId);
+        }else {
+            return 0;
+        }
+    }
+
+    /**重置用户的权限，每次设置用户权限关系前，先删除用户所有权限，再重新分配用户权限
+     *这里需要开启事务,删除 或者插入不生效就回滚
+     * @param userRole
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int setUserRole(UserRole userRole){
+        try{
+            Integer userId = userRole.getUserId();
+            List<Integer> ids = userRole.getRoleIds();
+
+            userRoleMapper.deleteByUserId(userId);
+            if (null!=ids && !ids.isEmpty()){
+                for (Integer id:ids) {
+                    UserRole ur = new UserRole(userId,id);
+                    userRoleMapper.insertSelective(ur);
+                }
+            }
+            return 1;
+        }catch (Exception e){
+            e.printStackTrace();
+            return 0;
+        }
+
+    }
+
+}

+package com.tianbo.warehouse.util.IO;
+
+import org.apache.commons.lang.ArrayUtils;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+public abstract class StreamUtil implements Stream{
+
+    public static <T> Stream<T> streamOf(T[] array) {
+        return ArrayUtils.isEmpty(array) ? Stream.empty() : Arrays.asList(array).stream();
+    }
+}

@@ -25,6 +25,7 @@ public class MakeImfMeta {
         meta.addElement("STYP").addText(STYP);
         meta.addElement("STYP").addText(STYP);
 
 
         SAXReader saxReader = new SAXReader();
         SAXReader saxReader = new SAXReader();
+//        saxReader.setEncoding("gb2312");
         Document doc = saxReader.read(Content);
         Document doc = saxReader.read(Content);
         Element contentRoot = doc.getRootElement();
         Element contentRoot = doc.getRootElement();
         root.add(contentRoot);
         root.add(contentRoot);

+package com.tianbo.warehouse.validate;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+@Target({ElementType.METHOD,ElementType.FIELD,ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = CheckUserExistValidator.class )
+@Documented
+/**
+ * 检查用户重复注解
+ * @author mrz
+ *
+ */
+public @interface CheckUserExist {
+
+    String message() default "";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+
+
+}

+package com.tianbo.warehouse.validate;
+
+import com.tianbo.warehouse.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class CheckUserExistValidator implements ConstraintValidator<CheckUserExist,String> {
+
+    private CheckUserExist checkUserExist;
+
+    @Autowired
+    UserService userService;
+
+    @Override
+    public void initialize(CheckUserExist checkUserExist) {
+        this.checkUserExist = checkUserExist;
+    }
+
+    @Override
+    public boolean isValid(String username, ConstraintValidatorContext var2){
+        if (username == null){
+            return true;
+        }
+
+        //根据用户名查询出来有数据，则返回失败存在用户
+        if (userService.loadByUsername(username)!=null){
+            return false;
+        }else {
+            return true;
+        }
+
+
+    }
+}

@@ -2,29 +2,63 @@
 #服务端口
 #服务端口
 server.port=7003
 server.port=7003
 server.servlet.context-path=${SERVER_CONTEXTPATH:}
 server.servlet.context-path=${SERVER_CONTEXTPATH:}
-#eureka主机名，会在控制页面中显示
-eureka.instance.hostname=${spring.cloud.client.ip-address}
-#eureka服务器页面中status的请求路径
-eureka.instance.status-page-url=http://${eureka.instance.hostname}:${server.port}/index
-#eureka注册中心服务器地址
-eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/
+
+#静态资源，设置上传文件的访问，上传文件的路径，要带斜杠
+web.upload-path=upload/
+#表示所有的访问经过静态资源路径
+springboot.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}
+
+
+
 #服务名
 #服务名
-spring.application.name=imf-warehouse-reader
-eureka.instance.prefer-ip-address=true
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
-eureka.client.registry-fetch-interval-seconds=30
-eureka.instance.lease-renewal-interval-in-seconds=15
-eureka.instance.lease-expiration-duration-in-seconds=45
+spring.application.name=tianbo.base.dev.devkit
+
+spring.jackson.serialization.fail-on-empty-beans=false
+
+#springboot2.0之后会把Date类型字段自动给转成UTC字符串 如：1990-11-26T16:00:00.000+0000，如果想转成时间戳在application.properties配置文件增加以下配置
+#jackson相关配置
+spring.jackson.date-format = yyyy-MM-dd HH:mm:ss
+spring.jackson.serialization.write-dates-as-timestamps=false
+#时区必须要设置
+spring.jackson.time-zone=GMT+8
+#ALWAYS的意思是即时属性为null，仍然也会输出这个key
+spring.jackson.default-property-inclusion=always
 
 
 #springcloud 基本配置
 #springcloud 基本配置
 
 
+#eureka主机名，会在控制页面中显示
+spring.cloud.features.enabled=false
+spring.cloud.discovery.enabled=false
+spring.cloud.service-registry.auto-registration.enabled=false
+#eureka.instance.hostname=${spring.cloud.client.ip-address}
+#eureka服务器页面中status的请求路径
+#eureka.instance.status-page-url=http://${eureka.instance.hostname}:${server.port}/index
+#eureka注册中心服务器地址
+#eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
+#eureka.client.registry-fetch-interval-seconds=30
+#eureka.instance.lease-renewal-interval-in-seconds=15
+#eureka.instance.lease-expiration-duration-in-seconds=45
 
 
-#spring.datasource.name=CGOETL
+#spring.datasource oracle
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
-spring.datasource.url=jdbc:oracle:thin:@10.50.3.68:1521:CGODW
-spring.datasource.username=CGOETL
-spring.datasource.password=1q2w3e4r
+#spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
+#spring.datasource.url=jdbc:oracle:thin:@10.50.3.68:1521:CGODW
+#spring.datasource.username=CGOETL
+#spring.datasource.password=1q2w3e4r
+
+#spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
+spring.datasource.url=jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8
+spring.datasource.username=root
+spring.datasource.password=
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.max-idle=10
+spring.datasource.max-wait=10000
+spring.datasource.min-idle=5
+spring.datasource.initial-size=5
+
 #配置初始化大小/最小/最大
 #配置初始化大小/最小/最大
 spring.datasource.druid.initial-size=1
 spring.datasource.druid.initial-size=1
 spring.datasource.druid.min-idle=1
 spring.datasource.druid.min-idle=1
@@ -35,21 +69,33 @@ spring.datasource.druid.max-wait=60000
 spring.datasource.druid.min-evictable-idle-time-millis=300000
 spring.datasource.druid.min-evictable-idle-time-millis=300000
 #间隔多久进行一次检测，检测需要关闭的空闲连接
 #间隔多久进行一次检测，检测需要关闭的空闲连接
 spring.datasource.druid.time-between-eviction-runs-millis=60000
 spring.datasource.druid.time-between-eviction-runs-millis=60000
-spring.datasource.druid.validation-query=SELECT 'x' FROM DUAL
+#oracle
+#spring.datasource.druid.validation-query=SELECT 'x' FROM DUAL
+#mysql
+spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
 spring.datasource.druid.test-on-return=false
 spring.datasource.druid.default-auto-commit=true
 spring.datasource.druid.default-auto-commit=true
 
 
+
+
 mybatis.mapper-locations=classpath:mapping/*.xml
 mybatis.mapper-locations=classpath:mapping/*.xml
-mybatis.type-aliases-package=com.example.demo.model
-logging.level.com.example.demo.mapper=DEBUG
+mybatis.type-aliases-package=com.tianbo.warehouse.model
+
+
 
 
-pagehelper.helper-dialect=oracle
+pagehelper.helper-dialect=mysql
 #pagehelper.auto-dialect=true
 #pagehelper.auto-dialect=true
 #pagehelper.auto-runtime-dialect=true
 #pagehelper.auto-runtime-dialect=true
 pagehelper.reasonable=true
 pagehelper.reasonable=true
 pagehelper.support-methods-arguments=true
 pagehelper.support-methods-arguments=true
 pagehelper.params=count=countSql
 pagehelper.params=count=countSql
 
 
+#debug配置
+trace=true
+debug=true
+logging.level.org.apache.tomcat=info
+logging.level.com.tianbo.warehouse.dao=DEBUG
+logging.level.org.springframework.security =trace
 
 

@@ -4,8 +4,8 @@
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
 <generatorConfiguration>
     <!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包-->
     <!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包-->
-    <!--<classPathEntry  location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>-->
-    <classPathEntry  location="/Users/mrz/Documents/maven/ojdbc6.jar"/>
+    <classPathEntry  location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>
+    <!--<classPathEntry  location="/Users/mrz/Documents/maven/ojdbc6.jar"/>-->
     <context id="DB2Tables"  targetRuntime="MyBatis3">
     <context id="DB2Tables"  targetRuntime="MyBatis3">
         <commentGenerator>
         <commentGenerator>
             <property name="suppressDate" value="true"/>
             <property name="suppressDate" value="true"/>
@@ -13,13 +13,16 @@
             <property name="suppressAllComments" value="true"/>
             <property name="suppressAllComments" value="true"/>
         </commentGenerator>
         </commentGenerator>
         <!--数据库链接URL，用户名、密码 -->
         <!--数据库链接URL，用户名、密码 -->
-        <!--<jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="jdbc:mysql://127.0.0.1:3307/statistics" userId="root" password="">-->
-        <!--</jdbcConnection>-->
-        <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"
-                        connectionURL="jdbc:oracle:thin:@10.50.3.68:1521:CGODW"
-                        userId="CGOETL"
-                        password="1q2w3e4r">
+        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
+                            connectionURL="jdbc:mysql://127.0.0.1:3307/statistics"
+                            userId="root"
+                            password="">
         </jdbcConnection>
         </jdbcConnection>
+        <!--<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"-->
+                        <!--connectionURL="jdbc:oracle:thin:@10.50.3.68:1521:CGODW"-->
+                        <!--userId="CGOETL"-->
+                        <!--password="1q2w3e4r">-->
+        <!--</jdbcConnection>-->
         <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
         <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
             NUMERIC 类型解析为java.math.BigDecimal -->
             NUMERIC 类型解析为java.math.BigDecimal -->
         <!--<javaTypeResolver>-->
         <!--<javaTypeResolver>-->
@@ -42,6 +45,6 @@
             <property name="enableSubPackages" value="true"/>
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
         </javaClientGenerator>
         <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
         <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
-        <table tableName="PERMISSION" domainObjectName="PERMISSION" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
+        <table tableName="attachment" domainObjectName="Attachment" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
     </context>
     </context>
 </generatorConfiguration>
 </generatorConfiguration>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.AttachmentMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.Attachment" >
+    <id column="aid" property="aid" jdbcType="INTEGER" />
+    <result column="path" property="path" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    aid, path
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from attachment
+    where aid = #{aid,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from attachment
+    where aid = #{aid,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.Attachment" >
+    insert into attachment (aid, path)
+    values (#{aid,jdbcType=INTEGER}, #{path,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.Attachment" >
+    insert into attachment
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="aid != null" >
+        aid,
+      </if>
+      <if test="path != null" >
+        path,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="aid != null" >
+        #{aid,jdbcType=INTEGER},
+      </if>
+      <if test="path != null" >
+        #{path,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.Attachment" >
+    update attachment
+    <set >
+      <if test="path != null" >
+        path = #{path,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where aid = #{aid,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.Attachment" >
+    update attachment
+    set path = #{path,jdbcType=VARCHAR}
+    where aid = #{aid,jdbcType=INTEGER}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tianbo.warehouse.dao.LOGMapper">
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.LOG">
+    <id column="logId" jdbcType="INTEGER" property="logid" />
+    <result column="userName" jdbcType="VARCHAR" property="username" />
+    <result column="ip" jdbcType="VARCHAR" property="ip" />
+    <result column="logCreatTime" jdbcType="TIMESTAMP" property="logcreattime" />
+    <result column="methodName" jdbcType="VARCHAR" property="methodname" />
+    <result column="modelNameCN" jdbcType="VARCHAR" property="modelnamecn" />
+    <result column="operateNameCN" jdbcType="VARCHAR" property="operatenamecn" />
+    <result column="className" jdbcType="VARCHAR" property="classname" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tianbo.warehouse.model.LOGWithBLOBs">
+    <result column="parameters" jdbcType="LONGVARCHAR" property="parameters" />
+    <result column="result" jdbcType="LONGVARCHAR" property="result" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    logId, userName, ip, logCreatTime, methodName, modelNameCN, operateNameCN, className
+  </sql>
+  <sql id="Blob_Column_List">
+    parameters, result
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from log
+    where logId = #{logid,jdbcType=INTEGER}
+  </select>
+  <select id="selectAll"  resultMap="ResultMapWithBLOBs">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from log
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from log
+    where logId = #{logid,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.LOGWithBLOBs">
+    insert into log (logId, userName, ip, 
+      logCreatTime, methodName, modelNameCN, 
+      operateNameCN, className, parameters, 
+      result)
+    values (#{logid,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, 
+      #{logcreattime,jdbcType=TIMESTAMP}, #{methodname,jdbcType=VARCHAR}, #{modelnamecn,jdbcType=VARCHAR}, 
+      #{operatenamecn,jdbcType=VARCHAR}, #{classname,jdbcType=VARCHAR}, #{parameters,jdbcType=LONGVARCHAR}, 
+      #{result,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.LOGWithBLOBs">
+    insert into log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="logid != null">
+        logId,
+      </if>
+      <if test="username != null">
+        userName,
+      </if>
+      <if test="ip != null">
+        ip,
+      </if>
+      <if test="logcreattime != null">
+        logCreatTime,
+      </if>
+      <if test="methodname != null">
+        methodName,
+      </if>
+      <if test="modelnamecn != null">
+        modelNameCN,
+      </if>
+      <if test="operatenamecn != null">
+        operateNameCN,
+      </if>
+      <if test="classname != null">
+        className,
+      </if>
+      <if test="parameters != null">
+        parameters,
+      </if>
+      <if test="result != null">
+        result,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="logid != null">
+        #{logid,jdbcType=INTEGER},
+      </if>
+      <if test="username != null">
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="ip != null">
+        #{ip,jdbcType=VARCHAR},
+      </if>
+      <if test="logcreattime != null">
+        #{logcreattime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="methodname != null">
+        #{methodname,jdbcType=VARCHAR},
+      </if>
+      <if test="modelnamecn != null">
+        #{modelnamecn,jdbcType=VARCHAR},
+      </if>
+      <if test="operatenamecn != null">
+        #{operatenamecn,jdbcType=VARCHAR},
+      </if>
+      <if test="classname != null">
+        #{classname,jdbcType=VARCHAR},
+      </if>
+      <if test="parameters != null">
+        #{parameters,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="result != null">
+        #{result,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.LOGWithBLOBs">
+    update log
+    <set>
+      <if test="username != null">
+        userName = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="ip != null">
+        ip = #{ip,jdbcType=VARCHAR},
+      </if>
+      <if test="logcreattime != null">
+        logCreatTime = #{logcreattime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="methodname != null">
+        methodName = #{methodname,jdbcType=VARCHAR},
+      </if>
+      <if test="modelnamecn != null">
+        modelNameCN = #{modelnamecn,jdbcType=VARCHAR},
+      </if>
+      <if test="operatenamecn != null">
+        operateNameCN = #{operatenamecn,jdbcType=VARCHAR},
+      </if>
+      <if test="classname != null">
+        className = #{classname,jdbcType=VARCHAR},
+      </if>
+      <if test="parameters != null">
+        parameters = #{parameters,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="result != null">
+        result = #{result,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where logId = #{logid,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tianbo.warehouse.model.LOGWithBLOBs">
+    update log
+    set userName = #{username,jdbcType=VARCHAR},
+      ip = #{ip,jdbcType=VARCHAR},
+      logCreatTime = #{logcreattime,jdbcType=TIMESTAMP},
+      methodName = #{methodname,jdbcType=VARCHAR},
+      modelNameCN = #{modelnamecn,jdbcType=VARCHAR},
+      operateNameCN = #{operatenamecn,jdbcType=VARCHAR},
+      className = #{classname,jdbcType=VARCHAR},
+      parameters = #{parameters,jdbcType=LONGVARCHAR},
+      result = #{result,jdbcType=LONGVARCHAR}
+    where logId = #{logid,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.LOG">
+    update log
+    set userName = #{username,jdbcType=VARCHAR},
+      ip = #{ip,jdbcType=VARCHAR},
+      logCreatTime = #{logcreattime,jdbcType=TIMESTAMP},
+      methodName = #{methodname,jdbcType=VARCHAR},
+      modelNameCN = #{modelnamecn,jdbcType=VARCHAR},
+      operateNameCN = #{operatenamecn,jdbcType=VARCHAR},
+      className = #{classname,jdbcType=VARCHAR}
+    where logId = #{logid,jdbcType=INTEGER}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.PERMISSIONMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.PERMISSION" >
+    <id column="permission_id" property="permissionId" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="permission_order" property="permissionOrder" jdbcType="VARCHAR" />
+    <result column="description" property="description" jdbcType="VARCHAR" />
+    <result column="ismenu" property="ismenu" jdbcType="BOOLEAN" />
+    <result column="hidden" property="hidden" jdbcType="BOOLEAN" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="path" property="path" jdbcType="VARCHAR" />
+    <result column="url" property="url" jdbcType="VARCHAR" />
+    <result column="method" property="method" jdbcType="VARCHAR" />
+    <result column="iconCls" property="iconCls" jdbcType="VARCHAR" />
+    <result column="component" property="component" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    permission_id, name, permission_order, description, ismenu,hidden,parent_id,
+    path, url, method, iconCls, component
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from permission
+    where permission_id = #{permissionId,jdbcType=INTEGER} ORDER BY permission_order
+  </select>
+  <select id="findAll" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from permission ORDER BY ismenu,parent_id,permission_order
+  </select>
+  <select id="getRolePermisson" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+    SELECT P.*
+    FROM role R
+    LEFT JOIN role_permission RP ON R.role_id = RP.role_id
+    LEFT JOIN permission P ON RP.permission_id = P.permission_id
+    WHERE r.role_id=#{roleId,jdbcType=INTEGER}
+    ORDER BY P.ismenu,P.name,p.permission_order DESC
+  </select>
+  <select id="getAllMenus" resultMap="BaseResultMap" >
+    SELECT
+    P .*
+    FROM
+    permission P
+    WHERE
+    P .PERMISSION_ID IN (
+    SELECT
+    RP.permission_id
+    FROM
+    ROLE_PERMISSION RP
+    WHERE
+    RP.role_id IN (
+    SELECT
+    R.ROLE_ID
+    FROM
+    role R
+    WHERE
+    R.ROLE_ID IN (
+    SELECT
+    UR.ROLE_ID
+    FROM
+    USER_ROLE UR
+    WHERE
+    UR.USER_ID = #{userId,jdbcType=INTEGER} AND P.ismenu is TRUE
+    )
+    )
+    ) ORDER BY P.permission_order
+    <!--select-->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from permission where ismenu is TRUE ORDER BY permission_order-->
+  </select>
+  <select id="findRoleListByUrl" resultType="java.lang.String" parameterType="java.lang.String">
+    SELECT
+  R.role_name
+FROM
+  permission P
+  LEFT JOIN role_permission RP ON P.permission_id = RP.permission_id
+  LEFT JOIN ROLE R ON  R.ROLE_ID= RP.ROLE_ID
+where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order
+  </select>
+  <select id="findByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    SELECT
+    P .*
+    FROM
+    permission P
+    WHERE
+    P .PERMISSION_ID IN (
+    SELECT
+    RP.permission_id
+    FROM
+    ROLE_PERMISSION RP
+    WHERE
+    RP.role_id IN (
+    SELECT
+    R.ROLE_ID
+    FROM
+    role R
+    WHERE
+    R.ROLE_ID IN (
+    SELECT
+    UR.ROLE_ID
+    FROM
+    USER_ROLE UR
+    WHERE
+    UR.USER_ID = #{userId,jdbcType=INTEGER}
+    )
+    )
+    ) ORDER BY permission_order
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from permission
+    where permission_id = #{permissionId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.PERMISSION" >
+    insert into permission (permission_id, name, permission_order,
+      description, ismenu,hidden, parent_id,
+      path, url, method, iconCls,
+      component)
+    values (#{permissionId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{permissionOrder,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR}, #{ismenu,jdbcType=BOOLEAN},#{hidden,jdbcType=BOOLEAN},#{parentId,jdbcType=INTEGER},
+      #{path,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{iconCls,jdbcType=VARCHAR},
+      #{component,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.PERMISSION" >
+    insert into permission
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="permissionId != null" >
+        permission_id,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="permissionOrder != null" >
+        permission_order,
+      </if>
+      <if test="description != null" >
+        description,
+      </if>
+      <if test="ismenu != null" >
+        ismenu,
+      </if>
+      <if test="hidden != null" >
+        hidden,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="path != null" >
+        path,
+      </if>
+      <if test="url != null" >
+        url,
+      </if>
+      <if test="method != null" >
+        method,
+      </if>
+      <if test="iconCls != null" >
+        iconCls,
+      </if>
+      <if test="component != null" >
+        component,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="permissionId != null" >
+        #{permissionId,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="permissionOrder != null" >
+        #{permissionOrder,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null" >
+        #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="ismenu != null" >
+        #{ismenu,jdbcType=BOOLEAN},
+      </if>
+      <if test="hidden != null" >
+        #{hidden,jdbcType=BOOLEAN},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="path != null" >
+        #{path,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null" >
+        #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="method != null" >
+        #{method,jdbcType=VARCHAR},
+      </if>
+      <if test="iconCls != null" >
+        #{iconCls,jdbcType=VARCHAR},
+      </if>
+      <if test="component != null" >
+        #{component,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.PERMISSION" >
+    update permission
+    <set >
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="permissionOrder != null" >
+        permission_order = #{permissionOrder,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null" >
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="ismenu != null" >
+        ismenu = #{ismenu,jdbcType=BOOLEAN},
+      </if>
+      <if test="hidden != null" >
+        hidden = #{hidden,jdbcType=BOOLEAN},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="path != null" >
+        path = #{path,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null" >
+        url = #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="method != null" >
+        method = #{method,jdbcType=VARCHAR},
+      </if>
+      <if test="iconCls != null" >
+        iconCls = #{iconCls,jdbcType=VARCHAR},
+      </if>
+      <if test="component != null" >
+        component = #{component,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where permission_id = #{permissionId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.PERMISSION" >
+    update permission
+    set name = #{name,jdbcType=VARCHAR},
+      permission_order = #{permissionOrder,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR},
+      ismenu = #{ismenu,jdbcType=BOOLEAN},
+      hidden = #{hidden,jdbcType=BOOLEAN},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      path = #{path,jdbcType=VARCHAR},
+      url = #{url,jdbcType=VARCHAR},
+      method = #{method,jdbcType=VARCHAR},
+      iconCls = #{iconCls,jdbcType=VARCHAR},
+      component = #{component,jdbcType=VARCHAR}
+    where permission_id = #{permissionId,jdbcType=INTEGER}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tianbo.warehouse.dao.ROLEMapper">
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.ROLE">
+    <id column="role_id" jdbcType="INTEGER" property="roleId" />
+    <result column="role_name" jdbcType="VARCHAR" property="roleName" />
+    <result column="role_sign" jdbcType="VARCHAR" property="roleSign" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <collection property="permissions" ofType="PERMISSION" javaType="java.util.ArrayList" select="com.tianbo.warehouse.dao.PERMISSIONMapper.getRolePermisson" column="role_id"></collection>
+  </resultMap>
+  <sql id="Base_Column_List">
+    role_id, role_name, role_sign, description
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from role
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </select>
+  <select id="findAll" resultMap="BaseResultMap" >
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM role
+  </select>
+  <select id="findRolesByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    SELECT
+    R.*
+    FROM
+    USERS U
+    LEFT JOIN USER_ROLE UR ON U .USER_ID = UR.USER_ID
+    LEFT JOIN ROLE R ON  R.ROLE_ID= UR.ROLE_ID
+    where U.USER_ID = #{userId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from role
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.ROLE">
+    insert into role (role_id, role_name, role_sign, 
+      description)
+    values (#{roleId,jdbcType=INTEGER}, #{roleName,jdbcType=VARCHAR}, #{roleSign,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR})
+  </insert>
+
+  <insert id="insertSelective" parameterType="Integer">
+    insert into role
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="roleId != null">
+        role_id,
+      </if>
+      <if test="roleName != null">
+        role_name,
+      </if>
+      <if test="roleSign != null">
+        role_sign,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="roleId != null">
+        #{roleId,jdbcType=INTEGER},
+      </if>
+      <if test="roleName != null">
+        #{roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="roleSign != null">
+        #{roleSign,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.ROLE">
+    update role
+    <set>
+      <if test="roleName != null">
+        role_name = #{roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="roleSign != null">
+        role_sign = #{roleSign,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.ROLE">
+    update role
+    set role_name = #{roleName,jdbcType=VARCHAR},
+      role_sign = #{roleSign,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR}
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.RolePermissionMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.RolePermission" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="role_id" property="roleId" jdbcType="INTEGER" />
+    <result column="permission_id" property="permissionId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, role_id, permission_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from role_permission
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from role_permission
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="delPermByRoleId" parameterType="java.lang.Integer">
+    delete from role_permission
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.RolePermission" >
+    insert into role_permission (id, role_id, permission_id
+      )
+    values (#{id,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}, #{permissionId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertRolePerm" parameterType="RolePermission">
+    insert into role_permission(role_id, permission_id)
+    values
+    <foreach collection="permissionIds" item="rolePem" index="index"  separator=",">
+      (#{roleId,jdbcType=INTEGER},#{rolePem,jdbcType=INTEGER})
+    </foreach>
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.RolePermission" >
+    insert into role_permission
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="roleId != null" >
+        role_id,
+      </if>
+      <if test="permissionId != null" >
+        permission_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        #{roleId,jdbcType=INTEGER},
+      </if>
+      <if test="permissionId != null" >
+        #{permissionId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.RolePermission" >
+    update role_permission
+    <set >
+      <if test="roleId != null" >
+        role_id = #{roleId,jdbcType=INTEGER},
+      </if>
+      <if test="permissionId != null" >
+        permission_id = #{permissionId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.RolePermission" >
+    update role_permission
+    set role_id = #{roleId,jdbcType=INTEGER},
+      permission_id = #{permissionId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.USERSMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.USERS" >
+    <id column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="username" property="username" jdbcType="VARCHAR" />
+    <result column="password" property="password" jdbcType="VARCHAR" />
+    <result column="birthday" property="birthday" jdbcType="TIMESTAMP" />
+    <result column="sex" property="sex" jdbcType="CHAR" />
+    <result column="address" property="address" jdbcType="VARCHAR" />
+    <result column="state" property="state" jdbcType="BIT" />
+    <result column="mobilePhone" property="mobilephone" jdbcType="VARCHAR" />
+    <result column="creatTime" property="creattime" jdbcType="TIMESTAMP" />
+    <result column="updateTime" property="updatetime" jdbcType="TIMESTAMP" />
+    <result column="userFace" property="userface" jdbcType="VARCHAR" />
+    <result column="realName" property="realname" jdbcType="VARCHAR" />
+    <result column="email" property="email" jdbcType="VARCHAR" />
+    <result column="age" property="age" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    user_id, username, password, birthday, sex, address, state, mobilePhone, creatTime,
+    updateTime, userFace, realName, email, age
+  </sql>
+  <sql id="user_List" >
+    user_id, username, birthday, sex, address, state, mobilePhone,userFace, realName, email, age
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from users
+    where user_id = #{userId,jdbcType=INTEGER}
+  </select>
+  <select id="selectByUsername" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from USERS
+    where USERNAME = #{username,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAllUser" resultMap="BaseResultMap" >
+    select
+    <include refid="user_List" />
+    from USERS
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from users
+    where user_id = #{userId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.USERS" >
+    insert into users (user_id, username, password, 
+      birthday, sex, address, 
+      state, mobilePhone, creatTime, 
+      updateTime, userFace, realName,
+      email, age)
+    values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
+      #{birthday,jdbcType=TIMESTAMP}, #{sex,jdbcType=CHAR}, #{address,jdbcType=VARCHAR}, 
+      #{state,jdbcType=BIT}, #{mobilephone,jdbcType=VARCHAR}, #{creattime,jdbcType=TIMESTAMP}, 
+      #{updatetime,jdbcType=TIMESTAMP}, #{userface,jdbcType=VARCHAR}, #{realname,jdbcType=VARCHAR},
+      #{email,jdbcType=VARCHAR}, #{age,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.USERS" >
+    insert into users
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="username != null" >
+        username,
+      </if>
+      <if test="password != null" >
+        password,
+      </if>
+      <if test="birthday != null" >
+        birthday,
+      </if>
+      <if test="sex != null" >
+        sex,
+      </if>
+      <if test="address != null" >
+        address,
+      </if>
+      <if test="state != null" >
+        state,
+      </if>
+      <if test="mobilephone != null" >
+        mobilePhone,
+      </if>
+      <if test="creattime != null" >
+        creatTime,
+      </if>
+      <if test="updatetime != null" >
+        updateTime,
+      </if>
+      <if test="userface != null" >
+        userFace,
+      </if>
+      <if test="realname != null" >
+        realname,
+      </if>
+      <if test="email != null" >
+        email,
+      </if>
+      <if test="age != null" >
+        age,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="username != null" >
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null" >
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="birthday != null" >
+        #{birthday,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sex != null" >
+        #{sex,jdbcType=CHAR},
+      </if>
+      <if test="address != null" >
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=BIT},
+      </if>
+      <if test="mobilephone != null" >
+        #{mobilephone,jdbcType=VARCHAR},
+      </if>
+      <if test="creattime != null" >
+        #{creattime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userface != null" >
+        #{userface,jdbcType=VARCHAR},
+      </if>
+      <if test="realname != null" >
+        #{realname,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="age != null" >
+        #{age,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.USERS" >
+    update users
+    <set >
+      <if test="password != null" >
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="birthday != null" >
+        birthday = #{birthday,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sex != null" >
+        sex = #{sex,jdbcType=CHAR},
+      </if>
+      <if test="address != null" >
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        state = #{state,jdbcType=BIT},
+      </if>
+      <if test="mobilephone != null" >
+        mobilePhone = #{mobilephone,jdbcType=VARCHAR},
+      </if>
+      <if test="creattime != null" >
+        creatTime = #{creattime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userface != null" >
+        userFace = #{userface,jdbcType=VARCHAR},
+      </if>
+      <if test="realname != null" >
+        realname = #{realname,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="age != null" >
+        age = #{age,jdbcType=INTEGER},
+      </if>
+    </set>
+    where user_id = #{userId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.USERS" >
+    update users
+    set password = #{password,jdbcType=VARCHAR},
+      birthday = #{birthday,jdbcType=TIMESTAMP},
+      sex = #{sex,jdbcType=CHAR},
+      address = #{address,jdbcType=VARCHAR},
+      state = #{state,jdbcType=BIT},
+      mobilePhone = #{mobilephone,jdbcType=VARCHAR},
+      creatTime = #{creattime,jdbcType=TIMESTAMP},
+      updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      userFace = #{userface,jdbcType=VARCHAR},
+      realName = #{realname,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      age = #{age,jdbcType=INTEGER}
+    where user_id = #{userId,jdbcType=INTEGER}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.UserRoleMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.UserRole" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="role_id" property="roleId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, user_id, role_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from user_role
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from user_role
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByUserId" parameterType="java.lang.Integer" >
+    delete from user_role
+    where user_id = #{userId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.UserRole" >
+    insert into user_role (user_id, role_id
+      )
+    values (#{userId,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.UserRole" >
+    insert into user_role
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="roleId != null" >
+        role_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        #{roleId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.UserRole" >
+    update user_role
+    <set >
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        role_id = #{roleId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.UserRole" >
+    update user_role
+    set user_id = #{userId,jdbcType=INTEGER},
+      role_id = #{roleId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta content="text/html;charset=UTF-8"/>
+    <title>登录页面</title>
+    <link rel="stylesheet" th:href="@{css/bootstrap.min.css}"/>
+    <style type="text/css">
+        body {
+            padding-top: 50px;
+        }
+        .starter-template {
+            padding: 40px 15px;
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+
+<nav class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="#">Spring Security演示</a>
+        </div>
+        <div id="navbar" class="collapse navbar-collapse">
+            <ul class="nav navbar-nav">
+                <li><a th:href="@{/}"> 首页 </a></li>
+
+            </ul>
+        </div><!--/.nav-collapse -->
+    </div>
+</nav>
+<div class="container">
+    welcom
+</div>
+</body>
+</html>

+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta content="text/html;charset=UTF-8"/>
+    <title>错误页面</title>
+    <link rel="stylesheet" th:href="@{css/bootstrap.min.css}"/>
+    <style type="text/css">
+        body {
+            padding-top: 50px;
+        }
+        .starter-template {
+            padding: 40px 15px;
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+
+<nav class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="#">Spring Security演示</a>
+        </div>
+        <div id="navbar" class="collapse navbar-collapse">
+            <ul class="nav navbar-nav">
+                <li><a th:href="@{/}"> 首页 </a></li>
+
+            </ul>
+        </div><!--/.nav-collapse -->
+    </div>
+</nav>
+<div class="container">
+
+</div>
+</body>
+</html>

@@ -36,10 +36,10 @@
     <div class="starter-template">
     <div class="starter-template">
         <h1 th:text="${msg.description}"></h1>
         <h1 th:text="${msg.description}"></h1>
 
 
-        <p class="bg-primary" th:text="${msg.content}"></p>
+        <p class="bg-primary" th:text="${msg.description}"></p>
 
 
         <div sec:authorize="hasRole('ROLE_HOME')"> <!-- 用户类型为ROLE_ADMIN 显示 -->
         <div sec:authorize="hasRole('ROLE_HOME')"> <!-- 用户类型为ROLE_ADMIN 显示 -->
-            <p class="bg-info" th:text="${msg.etraInfo}"></p>
+            <p class="bg-info" th:text="${msg.description}"></p>
         </div>
         </div>
         <div sec:authorize="hasRole('ROLE_ADMIN')"> <!-- 用户类型为ROLE_ADMIN 显示 -->
         <div sec:authorize="hasRole('ROLE_ADMIN')"> <!-- 用户类型为ROLE_ADMIN 显示 -->
             <p class="bg-info">恭喜您,您有 ROLE_ADMIN 权限 </p>
             <p class="bg-info">恭喜您,您有 ROLE_ADMIN 权限 </p>

@@ -44,6 +44,10 @@
                 <label for="password">密码</label>
                 <label for="password">密码</label>
                 <input type="password" class="form-control" name="password" placeholder="密码" />
                 <input type="password" class="form-control" name="password" placeholder="密码" />
             </div>
             </div>
+            <div class="form-group">
+                <label for="remeberme">记住我</label>
+                <input type="checkbox" name="remember-me" />
+            </div>
             <input type="submit" id="login" value="Login" class="btn btn-primary" />
             <input type="submit" id="login" value="Login" class="btn btn-primary" />
         </form>
         </form>
     </div>
     </div>

@@ -4,9 +4,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 
 
 @RunWith(SpringRunner.class)
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@WebAppConfiguration
+//解决mvn clean package打包项目websocketjavax.websocket.server.ServerContainer not available报错的问题
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class WarehouseApplicationTests {
 public class WarehouseApplicationTests {
 
 
 	@Test
 	@Test

 package com.tianbo.warehouse;
 package com.tianbo.warehouse;
 
 
-import com.tianbo.warehouse.handle.IMFSaveHandle;
+import com.tianbo.warehouse.imf.handle.IMFSaveHandle;
 
 
 public class handleTest {
 public class handleTest {
     private static String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Msg>    <META>        <SNDR>NDLR</SNDR>        <RCVR></RCVR>        <SEQN>172-33519102</SEQN>        <DDTM>20181229124530224</DDTM>        <TYPE>HYXX</TYPE>        <STYP>NDLR</STYP>    </META>    <DECLAREPREPAREMASTERXMLBODY>        <Head>            <MessageID>CN_MT2201_1P0_460470678920X_20181229124530224</MessageID>            <FunctionCode>9</FunctionCode>            <MessageType>MT2201MASTER</MessageType>            <SenderID>460470678920X_DXPENT0000460002_20181229124530224</SenderID>            <ReceiverID>4604_20181229124530224</ReceiverID>            <SendTime>20181229124530224</SendTime>            <Version>1.0</Version>        </Head>        <Declaration>            <Carrier>                <ID>CV</ID>            </Carrier>            <ORG>                <ID>CGO</ID>            </ORG>            <DES>                <ID>CDG</ID>            </DES>            <BorderTransportMeans>                <JourneyID>9732/2019-01-01</JourneyID>            </BorderTransportMeans>            <Consignment>                <TransportContractDocument>                    <ID>172-33519102</ID>                </TransportContractDocument>                <LoadingLocation>                    <ID>CGO/4604</ID>                    <LoadingDate>2018-12-29 12:45</LoadingDate>                </LoadingLocation>                <UnloadingLocation>                    <ID>CGO/4604</ID>                </UnloadingLocation>                <TransportSplitIndicator>0</TransportSplitIndicator>                <ConsignmentPackaging>                    <QuantityQuantity>337</QuantityQuantity>                </ConsignmentPackaging>                <TotalGrossMassMeasure>3192</TotalGrossMassMeasure>                <PreQuantityQuantity>337</PreQuantityQuantity>                <PreTotalGrossMassMeasure>3192</PreTotalGrossMassMeasure>                <CustomsStatus>001</CustomsStatus>                <FreightPayment>                    <MethodCode>PP</MethodCode>                </FreightPayment>                <ProductName>IMITATION JEWELRY</ProductName>                <PrepareTime>2018-12-29 12:45</PrepareTime>                <CustomsCode>4604</CustomsCode>                <AgentName>ZRP</AgentName>                <AgentCompany>郑州睿鹏物流有限公司</AgentCompany>                <NameOfgoods>IMITATION JEWELRY</NameOfgoods>                <DeliveryStation>001</DeliveryStation>                <UNnumber></UNnumber>                <Category></Category>                <Consignee>                    <Name>QUALITAIR  SEA INTERNATIONAL</Name>                    <Address>                        <Line>4  RUE DU MEUNIER BP  19622 95724   ROISSY  CDG</Line>                        <CityName>CDG</CityName>                        <CountryCode>FR</CountryCode>                        <ZipCode></ZipCode>                        <PROVINCECODE></PROVINCECODE>                        <PROVINCENAME></PROVINCENAME>                        <Deltaname></Deltaname>                        <TelePhone>33 1 34 38 58 13</TelePhone>                        <Fax></Fax>                        <CNECUSID>EUROPEAN VAT NUMBER+FR93392293635</CNECUSID>                        <CNEAEO></CNEAEO>                        <Unlodingcode>CDG</Unlodingcode>                    </Address>                </Consignee>                <Consignor>                    <name>ON TIME EXPRESS LIMITED</name>                    <Address>                        <Line>ROOM 1102 FINANCIAL STREET HAI LUN CENTER NO 440 HAI LUN ROAD</Line>                        <CountryCode>CN</CountryCode>                        <ZipCode></ZipCode>                        <Deltaname></Deltaname>                        <TelePhone>862163642582</TelePhone>                        <Fax></Fax>                        <SHPAEO></SHPAEO>                        <SHPCUSID>USCI+91310000717852489D</SHPCUSID>                    </Address>                </Consignor>            </Consignment>        </Declaration>    </DECLAREPREPAREMASTERXMLBODY></Msg>";
     private static String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Msg>    <META>        <SNDR>NDLR</SNDR>        <RCVR></RCVR>        <SEQN>172-33519102</SEQN>        <DDTM>20181229124530224</DDTM>        <TYPE>HYXX</TYPE>        <STYP>NDLR</STYP>    </META>    <DECLAREPREPAREMASTERXMLBODY>        <Head>            <MessageID>CN_MT2201_1P0_460470678920X_20181229124530224</MessageID>            <FunctionCode>9</FunctionCode>            <MessageType>MT2201MASTER</MessageType>            <SenderID>460470678920X_DXPENT0000460002_20181229124530224</SenderID>            <ReceiverID>4604_20181229124530224</ReceiverID>            <SendTime>20181229124530224</SendTime>            <Version>1.0</Version>        </Head>        <Declaration>            <Carrier>                <ID>CV</ID>            </Carrier>            <ORG>                <ID>CGO</ID>            </ORG>            <DES>                <ID>CDG</ID>            </DES>            <BorderTransportMeans>                <JourneyID>9732/2019-01-01</JourneyID>            </BorderTransportMeans>            <Consignment>                <TransportContractDocument>                    <ID>172-33519102</ID>                </TransportContractDocument>                <LoadingLocation>                    <ID>CGO/4604</ID>                    <LoadingDate>2018-12-29 12:45</LoadingDate>                </LoadingLocation>                <UnloadingLocation>                    <ID>CGO/4604</ID>                </UnloadingLocation>                <TransportSplitIndicator>0</TransportSplitIndicator>                <ConsignmentPackaging>                    <QuantityQuantity>337</QuantityQuantity>                </ConsignmentPackaging>                <TotalGrossMassMeasure>3192</TotalGrossMassMeasure>                <PreQuantityQuantity>337</PreQuantityQuantity>                <PreTotalGrossMassMeasure>3192</PreTotalGrossMassMeasure>                <CustomsStatus>001</CustomsStatus>                <FreightPayment>                    <MethodCode>PP</MethodCode>                </FreightPayment>                <ProductName>IMITATION JEWELRY</ProductName>                <PrepareTime>2018-12-29 12:45</PrepareTime>                <CustomsCode>4604</CustomsCode>                <AgentName>ZRP</AgentName>                <AgentCompany>郑州睿鹏物流有限公司</AgentCompany>                <NameOfgoods>IMITATION JEWELRY</NameOfgoods>                <DeliveryStation>001</DeliveryStation>                <UNnumber></UNnumber>                <Category></Category>                <Consignee>                    <Name>QUALITAIR  SEA INTERNATIONAL</Name>                    <Address>                        <Line>4  RUE DU MEUNIER BP  19622 95724   ROISSY  CDG</Line>                        <CityName>CDG</CityName>                        <CountryCode>FR</CountryCode>                        <ZipCode></ZipCode>                        <PROVINCECODE></PROVINCECODE>                        <PROVINCENAME></PROVINCENAME>                        <Deltaname></Deltaname>                        <TelePhone>33 1 34 38 58 13</TelePhone>                        <Fax></Fax>                        <CNECUSID>EUROPEAN VAT NUMBER+FR93392293635</CNECUSID>                        <CNEAEO></CNEAEO>                        <Unlodingcode>CDG</Unlodingcode>                    </Address>                </Consignee>                <Consignor>                    <name>ON TIME EXPRESS LIMITED</name>                    <Address>                        <Line>ROOM 1102 FINANCIAL STREET HAI LUN CENTER NO 440 HAI LUN ROAD</Line>                        <CountryCode>CN</CountryCode>                        <ZipCode></ZipCode>                        <Deltaname></Deltaname>                        <TelePhone>862163642582</TelePhone>                        <Fax></Fax>                        <SHPAEO></SHPAEO>                        <SHPCUSID>USCI+91310000717852489D</SHPCUSID>                    </Address>                </Consignor>            </Consignment>        </Declaration>    </DECLAREPREPAREMASTERXMLBODY></Msg>";