diff --git a/WMS/src/main/resources/config/DBConfig.properties b/WMS/src/main/resources/config/DBConfig.properties deleted file mode 100644 index e93e3675376894cd7f221c8c8d614ecb26712825..0000000000000000000000000000000000000000 --- a/WMS/src/main/resources/config/DBConfig.properties +++ /dev/null @@ -1,10 +0,0 @@ -#改成你数据库的账号 -jdbc.user=root -#改成你数据库的密码 -jdbc.password=FsQE*D4Z^x6z@! -#数据库驱动【不用改】 -jdbc.driverClass=com.mysql.jdbc.Driver -#改成你数据库的链接方式 -jdbc.jdbcUrl=jdbc:mysql://192.168.6.3:3306/wms_db?useSSL=false&useUnicode=true&characterEncoding=UTF-8 -#验证数据库连接是否有效 -jdbc.testConnectionOnCheckout=true \ No newline at end of file diff --git a/WMS/src/main/resources/config/MyBatisConfiguration.xml b/WMS/src/main/resources/config/MyBatisConfiguration.xml deleted file mode 100644 index ba9d6945375511e25a4d3aab71f74f8d3164b758..0000000000000000000000000000000000000000 --- a/WMS/src/main/resources/config/MyBatisConfiguration.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WMS/src/main/resources/config/ShiroConfiguration.xml b/WMS/src/main/resources/config/ShiroConfiguration.xml deleted file mode 100644 index 7c2b64ac82a8baa18c05b1cbbbef32f5859e011c..0000000000000000000000000000000000000000 --- a/WMS/src/main/resources/config/ShiroConfiguration.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WMS/src/main/resources/config/SpringContextConfiguration.xml b/WMS/src/main/resources/config/SpringContextConfiguration.xml deleted file mode 100644 index 91db44166e841066c024fd8e85bf80b32ce8d76d..0000000000000000000000000000000000000000 --- a/WMS/src/main/resources/config/SpringContextConfiguration.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WMS/src/main/resources/config/SpringMVCConfiguration.xml b/WMS/src/main/resources/config/SpringMVCConfiguration.xml deleted file mode 100644 index 23e9fcdcc58e8351987e4a5d3e333c42221e9c62..0000000000000000000000000000000000000000 --- a/WMS/src/main/resources/config/SpringMVCConfiguration.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WMS/src/main/webapp/WEB-INF/web.xml b/WMS/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index efe73d2e6c0c009b5a0ada6000e18313216691d8..0000000000000000000000000000000000000000 --- a/WMS/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - WMS - - - - springDispatcherServlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - classpath:config/SpringMVCConfiguration.xml - - 1 - - - springDispatcherServlet - / - - - - - - log4jConfigLocation - classpath:config/log4j.properties - - - org.springframework.web.util.Log4jConfigListener - - - - - - shiroFilter - org.springframework.web.filter.DelegatingFilterProxy - - targetFilterLifecycle - true - - - - shiroFilter - /* - - - - - - contextConfigLocation - classpath:config/SpringContextConfiguration.xml - - - org.springframework.web.context.ContextLoaderListener - - - - - - 404 - /errorPage/404Error.html - - - 500 - /errorPage/500Error.html - - - \ No newline at end of file diff --git a/WMS/.gitignore b/WMS_BOOT/.gitignore similarity index 100% rename from WMS/.gitignore rename to WMS_BOOT/.gitignore diff --git a/WMS/pom.xml b/WMS_BOOT/pom.xml similarity index 50% rename from WMS/pom.xml rename to WMS_BOOT/pom.xml index dca5b08472a8c1193f7167dbe8548c2ff1dd1448..c39f6f9f7976bdfc14f95cc96de423547f837913 100644 --- a/WMS/pom.xml +++ b/WMS_BOOT/pom.xml @@ -1,28 +1,32 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - war - - WMS + + org.springframework.boot + spring-boot-starter-parent + 2.5.15 + com.ken - WMS + WMS_BOOT 1.0-SNAPSHOT - + WMS_BOOT + 基于java web SSM框架的仓库管理系统 + war + UTF-8 + UTF-8 + 1.8 + 3.1.1 + - 3.1.0 4.12 - 1.0 - 1.8.0 1.3.1 2.1 1.9.3 3.4 3.15-beta2 - 3.4.0 - 1.3.0 + 2.2.2 4.1.6 4.3.0.RELEASE 1.4.0 @@ -33,21 +37,29 @@ 1.7.21 2.7.0 - - 2.1 - 8080 - /WMS - 3.3 - 1.8 - + - + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-web + + + javax.servlet - javax.servlet-api - ${servlet.version} - provided + jstl @@ -57,22 +69,18 @@ ${junit.version} - - aopalliance - aopalliance - ${aopalliance.version} - - - org.aspectj - aspectjweaver - ${aspectjweaver.version} - commons-fileupload commons-fileupload ${commons.fileuoload.version} + + + commons-io + commons-io + + commons-io @@ -120,106 +128,56 @@ - org.mybatis - mybatis + org.mybatis.spring.boot + mybatis-spring-boot-starter ${mybatis.version} - - org.mybatis - mybatis-spring - ${mybatisSpring.version} - - - com.github.pagehelper - pagehelper - ${pagehelper.version} - - - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - org.springframework - spring-orm - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.6 - - - org.apache.shiro - shiro-core - ${shiro.version} - - - org.apache.shiro - shiro-web - ${shiro.version} - + org.apache.shiro shiro-spring - ${shiro.version} + 1.3.2 + + + commons-beanutils + commons-beanutils + + + org.apache.shiro shiro-ehcache - ${shiro.version} + 1.3.2 + + + org.springframework.boot + spring-boot-starter-cache + net.sf.ehcache ehcache - ${ehcache.version} + + + + org.aspectj + aspectjweaver + 1.8.7 + + + org.aspectj + aspectjrt + 1.8.13 @@ -230,46 +188,26 @@ - + - - - log4j - log4j - ${log4j.version} - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} + org.apache.tomcat.embed + tomcat-embed-jasper + provided - com.fasterxml.jackson.core - jackson-core - ${jackson.version} + javax.servlet + javax.servlet-api + 4.0.1 - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} + org.projectlombok + lombok + provided @@ -289,28 +227,57 @@ src/main/java - - org.apache.tomcat.maven - tomcat7-maven-plugin - ${plugin.tomcat.version} + org.springframework.boot + spring-boot-maven-plugin + 2.5.15 - ${plugin.tomcat.port} - ${plugin.tomcat.path} - UTF-8 - tomcat7 + true + + + + repackage + + + - org.apache.maven.plugins - maven-compiler-plugin - ${plugin.maven.varsion} + maven-war-plugin + 3.1.0 - ${plugin.maven.jdk} - ${plugin.maven.jdk} + false + ${project.artifactId} + ${project.artifactId} + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + diff --git a/WMS/sql/createtable.sql b/WMS_BOOT/sql/createtable.sql similarity index 100% rename from WMS/sql/createtable.sql rename to WMS_BOOT/sql/createtable.sql diff --git a/WMS_BOOT/src/main/java/com/ken/wms/WmsApplication.java b/WMS_BOOT/src/main/java/com/ken/wms/WmsApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..ff520b65d6f3a209bd75072dca87d4abd764bf8b --- /dev/null +++ b/WMS_BOOT/src/main/java/com/ken/wms/WmsApplication.java @@ -0,0 +1,52 @@ +package com.ken.wms; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.Environment; +import org.springframework.util.StringUtils; + +import java.net.InetAddress; +import java.net.UnknownHostException; + +/** + * Spring Boot 启动类 + */ +@SpringBootApplication +@Slf4j +public class WmsApplication { + + public static void main(String[] args) throws UnknownHostException { + ConfigurableApplicationContext application = SpringApplication.run(WmsApplication.class, args); + log.info("\n" + + "\n⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡅⠨⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⠀⢸⣿⣯⡀⠉⠻⣿⣿⣿⣿⣿⣿⣿⣿⠀⢸⣿⣿⣿⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⠛⣿⣿⣿⣿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠅⠠⣿⣿⣿⠛⠛⠛⠛⠛⠃⠀⠛⠛⠛⠛⠛⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⢸⣿⣿⣿⣦⣄⣠⣿⣿⣿⣿⣿⣿⣿⠀⢸⣿⣿⣿⣶⣶⣶⣶⣶⣶⠶⠀⠀⣀⣴⣿⣿⣿⣿⣤⣤⣤⣤⣤⣤⣤⣤⠀⠀⣤⣤⣤⣤⣤⣤⣤⣤⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣧⣤⣤⡀⢀⣠⣄⣼⣶⣶⣶⣶⣶⡆⠀⣴⣶⣶⣶⣶⣶⣿⡏⠉⠉⠉⠉⠉⠉⠉⠉⠉⠀⠈⠉⠉⠉⠉⠉⠉⠉⠉⢹⣿⣀⣀⣀⠀⢀⣀⣀⣸⣿⣿⡿⠟⠉⢀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡅⠈⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⢸⣿⣿⡿⠛⠁⠀⠰⠾⠿⠿⠿⠿⠿⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠐⠛⠋⣻⣤⡄⠀⣠⣤⣤⣤⣤⣤⡄⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⢠⡿⠀⢰⡄⠙⢿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠈⠉⠻⣧⣠⣤⠀⢀⣠⣤⡀⢀⣠⣤⡀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⡋⠁⣀⡀⠠⣶⣾⣿⣿⣿⡀⠘⣿⣿⣿⣿⡿⠁⢠⣿⣿⣿⣿⣿⣿⣿⣿⠏⠀⣰⣿⣿⠀⢸⣿⣆⠈⠻⣿⣿⣿⣿⣿⣿⡟⠀⣼⠁⢸⣷⡄⢈⣿⡏⠀⣼⣿⡿⠀⢸⣿⣿⡇⠠⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡅⠀⣿⣿⣿⣿⣿⣷⡀⠘⢿⣿⠟⠀⣠⣿⣿⣿⣿⣿⣿⣿⠟⠁⢠⣾⣿⣿⣿⠀⢸⣿⣿⣧⡀⠈⠻⣿⣿⣿⣿⠀⣰⣿⠀⢸⣿⣿⡿⠋⠀⣴⣿⣿⠃⢀⣿⣿⣿⠃⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⣿⣿⣿⣿⣿⣿⣿⣄⠀⠁⢀⣴⣿⣿⣿⣿⣿⡿⠛⠁⢀⣴⣿⣿⣿⣿⣿⠀⢸⣿⣿⣿⣿⣦⡀⠈⠙⢿⣿⣿⣿⣿⠀⢸⡿⠋⠁⣠⣾⣿⡿⠁⢠⣾⣿⣿⣿⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⢀⣿⣿⣿⣿⡿⠟⠋⢀⣠⣤⡀⠉⠛⠿⣿⣿⣿⣄⣀⣴⣿⣿⣿⣿⣿⣿⣿⠀⢸⣿⣿⣿⣿⣿⣿⣶⣄⣴⣿⣿⣿⣿⠀⢸⣷⣤⣾⣿⡿⠋⠀⣰⣿⣿⣿⣿⡟⠀⣸⣿⡿⠛⠛⠛⠛⠛⠛⠛⠛⠛⠀⠀⠛⠛⠛⠛⠛⠛⠛⠛⠛⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣇⠀⠀⢀⣸⣿⣿⠉⠀⣀⣤⣶⣿⣿⣿⣿⣷⣤⣀⠀⣈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣟⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⢸⣿⣿⣿⣏⢀⣠⣾⣿⣄⠀⠀⢀⣀⣴⣿⣿⣷⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣶⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿\n" + + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿"); + Environment env = application.getEnvironment(); + String ip = InetAddress.getLocalHost().getHostAddress(); + String port = env.getProperty("server.port"); + String path = env.getProperty("server.servlet.context-path"); + if (StringUtils.isEmpty(path)) { + path = ""; + } + log.info("\n----------------------------------------------------------\n\t" + + "Application is running! Access URLs:\n\t" + + "Local访问网址: \t\thttp://localhost:" + port + path + "\n\t" + + "External访问网址: \thttp://" + ip + ":" + port + path + "\n\t" + + "----------------------------------------------------------"); + } + +} diff --git a/WMS/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/controller/RepositoryManageHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/RepositoryManageHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/RepositoryManageHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/RepositoryManageHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/controller/StockRecordManageHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/StockRecordManageHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/StockRecordManageHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/StockRecordManageHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/controller/StorageManageHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/StorageManageHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/StorageManageHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/StorageManageHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Impl/CustomerManageServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/CustomerManageServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Impl/CustomerManageServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/CustomerManageServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Impl/GoodsManageServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/GoodsManageServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Impl/GoodsManageServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/GoodsManageServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryAdminManageServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/RepositoryAdminManageServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryAdminManageServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/RepositoryAdminManageServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryManageServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/RepositoryManageServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryManageServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/RepositoryManageServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Impl/StockRecordManageServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/StockRecordManageServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Impl/StockRecordManageServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/StockRecordManageServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Impl/StorageManageServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/StorageManageServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Impl/StorageManageServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/StorageManageServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Impl/SupplierManageServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/SupplierManageServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Impl/SupplierManageServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/SupplierManageServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Impl/SystemLogServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/SystemLogServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Impl/SystemLogServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Impl/SystemLogServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Interface/CustomerManageService.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/CustomerManageService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Interface/CustomerManageService.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/CustomerManageService.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Interface/GoodsManageService.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/GoodsManageService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Interface/GoodsManageService.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/GoodsManageService.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryAdminManageService.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/RepositoryAdminManageService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryAdminManageService.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/RepositoryAdminManageService.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryService.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/RepositoryService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryService.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/RepositoryService.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Interface/StockRecordManageService.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/StockRecordManageService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Interface/StockRecordManageService.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/StockRecordManageService.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Interface/StorageManageService.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/StorageManageService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Interface/StorageManageService.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/StorageManageService.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Interface/SupplierManageService.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/SupplierManageService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Interface/SupplierManageService.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/SupplierManageService.java diff --git a/WMS/src/main/java/com/ken/wms/common/service/Interface/SystemLogService.java b/WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/SystemLogService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/service/Interface/SystemLogService.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/service/Interface/SystemLogService.java diff --git a/WMS/src/main/java/com/ken/wms/common/util/EJConvertor.java b/WMS_BOOT/src/main/java/com/ken/wms/common/util/EJConvertor.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/util/EJConvertor.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/util/EJConvertor.java diff --git a/WMS/src/main/java/com/ken/wms/common/util/FileUtil.java b/WMS_BOOT/src/main/java/com/ken/wms/common/util/FileUtil.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/util/FileUtil.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/util/FileUtil.java diff --git a/WMS/src/main/java/com/ken/wms/common/util/Response.java b/WMS_BOOT/src/main/java/com/ken/wms/common/util/Response.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/util/Response.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/util/Response.java diff --git a/WMS/src/main/java/com/ken/wms/common/util/ResponseFactory.java b/WMS_BOOT/src/main/java/com/ken/wms/common/util/ResponseFactory.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/common/util/ResponseFactory.java rename to WMS_BOOT/src/main/java/com/ken/wms/common/util/ResponseFactory.java diff --git a/WMS_BOOT/src/main/java/com/ken/wms/config/EJConvertorConfig.java b/WMS_BOOT/src/main/java/com/ken/wms/config/EJConvertorConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..f6ec75e0212a11a04c638638ef3d35fb7a9047e9 --- /dev/null +++ b/WMS_BOOT/src/main/java/com/ken/wms/config/EJConvertorConfig.java @@ -0,0 +1,14 @@ +package com.ken.wms.config; + +import com.ken.wms.common.util.EJConvertor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class EJConvertorConfig { + + @Bean + public EJConvertor ejConvertor() { + return new EJConvertor("config/EJConvertorConfig.xml"); + } +} \ No newline at end of file diff --git a/WMS_BOOT/src/main/java/com/ken/wms/config/MyBatisConfig.java b/WMS_BOOT/src/main/java/com/ken/wms/config/MyBatisConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..a0a43f30a0cfb797bb41b3e86f0445a9d006bd12 --- /dev/null +++ b/WMS_BOOT/src/main/java/com/ken/wms/config/MyBatisConfig.java @@ -0,0 +1,10 @@ +package com.ken.wms.config; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@MapperScan(basePackages = {"com.ken.wms.dao"}) +public class MyBatisConfig { + // 可选：添加其他MyBatis配置，如DataSource、SqlSessionFactory等 +} diff --git a/WMS_BOOT/src/main/java/com/ken/wms/config/ShiroConfig.java b/WMS_BOOT/src/main/java/com/ken/wms/config/ShiroConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..9df081cca7b5110fa4e45aef5c0d597cbba90c06 --- /dev/null +++ b/WMS_BOOT/src/main/java/com/ken/wms/config/ShiroConfig.java @@ -0,0 +1,162 @@ +package com.ken.wms.config; + +import com.ken.wms.security.filter.AnyOfRolesAuthorizationFilter; +import com.ken.wms.security.filter.ExtendFormAuthenticationFilter; +import com.ken.wms.security.filter.KickoutSessionControlFilter; +import com.ken.wms.security.service.FilterChainDefinitionMapBuilder; +import org.apache.shiro.realm.Realm; +import org.apache.shiro.realm.text.TextConfigurationRealm; +import org.apache.shiro.session.mgt.SessionManager; +import org.apache.shiro.web.mgt.DefaultWebSecurityManager; +import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; +import org.apache.shiro.authc.pam.ModularRealmAuthenticator; +import org.apache.shiro.authc.pam.AtLeastOneSuccessfulStrategy; +import org.apache.shiro.cache.ehcache.EhCacheManager; +import org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO; +import org.apache.shiro.session.mgt.eis.JavaUuidSessionIdGenerator; +import org.apache.shiro.session.mgt.ExecutorServiceSessionValidationScheduler; +import org.apache.shiro.web.servlet.SimpleCookie; +import org.apache.shiro.spring.LifecycleBeanPostProcessor; +import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; +import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; +import org.apache.shiro.spring.web.ShiroFilterFactoryBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.servlet.Filter; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +@Configuration +public class ShiroConfig { + + @Bean + public Realm userAuthorizingRealm() { + return new com.ken.wms.security.realms.UserAuthorizingRealm(); + } + + @Bean + public DefaultWebSecurityManager securityManager() { + DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); + securityManager.setCacheManager(cacheManager()); + securityManager.setAuthenticator(authenticator()); + securityManager.setSessionManager(sessionManager()); + securityManager.setRealms(Arrays.asList(userAuthorizingRealm())); + return securityManager; + } + + @Bean + public DefaultWebSessionManager sessionManager() { + DefaultWebSessionManager sessionManager = new DefaultWebSessionManager(); + // Configure session manager properties here + return sessionManager; + } + + @Bean + public ModularRealmAuthenticator authenticator() { + ModularRealmAuthenticator authenticator = new ModularRealmAuthenticator(); + authenticator.setAuthenticationStrategy(new AtLeastOneSuccessfulStrategy()); + return authenticator; + } + + @Bean + public EhCacheManager cacheManager() { + EhCacheManager cacheManager = new EhCacheManager(); + cacheManager.setCacheManagerConfigFile("classpath:config/ehcache.xml"); + return cacheManager; + } + + @Bean + public EnterpriseCacheSessionDAO sessionDAO() { + EnterpriseCacheSessionDAO sessionDAO = new EnterpriseCacheSessionDAO(); + sessionDAO.setSessionIdGenerator(sessionIdGenerator()); + sessionDAO.setActiveSessionsCacheName("sessionCache"); + return sessionDAO; + } + + @Bean + public JavaUuidSessionIdGenerator sessionIdGenerator() { + return new JavaUuidSessionIdGenerator(); + } + + @Bean + public ExecutorServiceSessionValidationScheduler sessionValidationScheduler() { + ExecutorServiceSessionValidationScheduler scheduler = new ExecutorServiceSessionValidationScheduler(); + scheduler.setInterval(900000); + scheduler.setSessionManager(sessionManager()); + return scheduler; + } + + @Bean + public SimpleCookie sessionIdCookie() { + SimpleCookie cookie = new SimpleCookie("sid"); + cookie.setHttpOnly(true); + cookie.setMaxAge(-1); + return cookie; + } + + @Bean + public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() { + return new LifecycleBeanPostProcessor(); + } + + + @Bean + public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor() { + AuthorizationAttributeSourceAdvisor advisor = new AuthorizationAttributeSourceAdvisor(); + advisor.setSecurityManager(securityManager()); + return advisor; + } + + @Bean + public ShiroFilterFactoryBean shiroFilter() { + ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean(); + shiroFilterFactoryBean.setSecurityManager(securityManager()); + shiroFilterFactoryBean.setLoginUrl("/login"); + + // 定义自定义过滤器 + Map filters = new HashMap<>(); + filters.put("roles", anyOfRolesAuthorizationFilter()); + filters.put("authc", extendFormAuthenticationFilter()); + filters.put("kickOut", kickoutSessionControlFilter()); + + // 设置过滤器链 + shiroFilterFactoryBean.setFilters(filters); + shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMapBuilder().builderFilterChainDefinitionMap()); + + + return shiroFilterFactoryBean; + } + + @Bean + public ExtendFormAuthenticationFilter extendFormAuthenticationFilter() { + ExtendFormAuthenticationFilter filter = new ExtendFormAuthenticationFilter(); + filter.setUsernameParam("username"); + filter.setPasswordParam("password"); + filter.setRememberMeParam("rememberMe"); + filter.setLoginUrl("/login"); + return filter; + } + + @Bean + public AnyOfRolesAuthorizationFilter anyOfRolesAuthorizationFilter() { + return new AnyOfRolesAuthorizationFilter(); + } + + @Bean + public KickoutSessionControlFilter kickoutSessionControlFilter() { + KickoutSessionControlFilter filter = new KickoutSessionControlFilter(); + filter.setKickOutUrl("/login"); + filter.setKickOutAfter(false); + filter.setMaxSessionNum(1); + filter.setSessionManager(sessionManager()); + filter.setCacheManager(cacheManager()); + return filter; + } + + @Bean + public FilterChainDefinitionMapBuilder filterChainDefinitionMapBuilder() { + return new FilterChainDefinitionMapBuilder(); + } +} diff --git a/WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/AccessRecordMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/AccessRecordMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/AccessRecordMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/AccessRecordMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/CustomerMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/CustomerMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/CustomerMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/CustomerMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/CustomerMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/CustomerMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/CustomerMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/CustomerMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/GoodsMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/GoodsMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/GoodsMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/GoodsMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/GoodsMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/GoodsMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/GoodsMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/GoodsMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/RepositoryMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/RepositoryMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/RepositoryMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/RepositoryMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/RolePermissionMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/RolePermissionMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/RolePermissionMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/RolePermissionMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/RolesMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/RolesMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/RolesMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/RolesMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/RolesMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/RolesMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/RolesMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/RolesMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/StockInMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/StockInMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/StockInMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/StockInMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/StockInMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/StockInMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/StockInMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/StockInMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/StockOutMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/StockOutMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/StockOutMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/StockOutMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/StockOutMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/StockOutMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/StockOutMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/StockOutMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/StorageMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/StorageMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/StorageMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/StorageMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/StorageMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/StorageMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/StorageMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/StorageMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/SupplierMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/SupplierMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/SupplierMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/SupplierMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/SupplierMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/SupplierMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/SupplierMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/SupplierMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/UserInfoMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/UserInfoMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/UserInfoMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/UserInfoMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.java b/WMS_BOOT/src/main/java/com/ken/wms/dao/UserPermissionMapper.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.java rename to WMS_BOOT/src/main/java/com/ken/wms/dao/UserPermissionMapper.java diff --git a/WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.xml b/WMS_BOOT/src/main/java/com/ken/wms/dao/UserPermissionMapper.xml similarity index 100% rename from WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.xml rename to WMS_BOOT/src/main/java/com/ken/wms/dao/UserPermissionMapper.xml diff --git a/WMS/src/main/java/com/ken/wms/domain/AccessRecordDO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/AccessRecordDO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/AccessRecordDO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/AccessRecordDO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/AccessRecordDTO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/AccessRecordDTO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/AccessRecordDTO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/AccessRecordDTO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/Customer.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/Customer.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/Customer.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/Customer.java diff --git a/WMS/src/main/java/com/ken/wms/domain/Goods.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/Goods.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/Goods.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/Goods.java diff --git a/WMS/src/main/java/com/ken/wms/domain/Repository.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/Repository.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/Repository.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/Repository.java diff --git a/WMS/src/main/java/com/ken/wms/domain/RepositoryAdmin.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/RepositoryAdmin.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/RepositoryAdmin.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/RepositoryAdmin.java diff --git a/WMS/src/main/java/com/ken/wms/domain/RoleDO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/RoleDO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/RoleDO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/RoleDO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/RolePermissionDO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/RolePermissionDO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/RolePermissionDO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/RolePermissionDO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/StockInDO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/StockInDO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/StockInDO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/StockInDO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/StockOutDO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/StockOutDO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/StockOutDO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/StockOutDO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/StockRecordDTO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/StockRecordDTO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/StockRecordDTO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/StockRecordDTO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/Storage.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/Storage.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/Storage.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/Storage.java diff --git a/WMS/src/main/java/com/ken/wms/domain/Supplier.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/Supplier.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/Supplier.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/Supplier.java diff --git a/WMS/src/main/java/com/ken/wms/domain/User.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/User.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/User.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/User.java diff --git a/WMS/src/main/java/com/ken/wms/domain/UserInfoDO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/UserInfoDO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/UserInfoDO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/UserInfoDO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/UserInfoDTO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/UserInfoDTO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/UserInfoDTO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/UserInfoDTO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/UserOperationRecordDO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/UserOperationRecordDO.java diff --git a/WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDTO.java b/WMS_BOOT/src/main/java/com/ken/wms/domain/UserOperationRecordDTO.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDTO.java rename to WMS_BOOT/src/main/java/com/ken/wms/domain/UserOperationRecordDTO.java diff --git a/WMS/src/main/java/com/ken/wms/exception/BusinessException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/BusinessException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/BusinessException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/BusinessException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/CustomerManageServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/CustomerManageServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/CustomerManageServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/CustomerManageServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/GoodsManageServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/GoodsManageServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/GoodsManageServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/GoodsManageServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/RepositoryAdminManageServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/RepositoryAdminManageServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/RepositoryAdminManageServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/RepositoryAdminManageServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/RepositoryManageServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/RepositoryManageServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/RepositoryManageServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/RepositoryManageServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/StockRecordManageServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/StockRecordManageServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/StockRecordManageServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/StockRecordManageServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/StorageManageServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/StorageManageServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/StorageManageServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/StorageManageServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/SupplierManageServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/SupplierManageServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/SupplierManageServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/SupplierManageServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/SystemLogServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/SystemLogServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/SystemLogServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/SystemLogServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/UserAccountServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/UserAccountServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/UserAccountServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/UserAccountServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/exception/UserInfoServiceException.java b/WMS_BOOT/src/main/java/com/ken/wms/exception/UserInfoServiceException.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/exception/UserInfoServiceException.java rename to WMS_BOOT/src/main/java/com/ken/wms/exception/UserInfoServiceException.java diff --git a/WMS/src/main/java/com/ken/wms/security/controller/AccountHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/security/controller/AccountHandler.java similarity index 98% rename from WMS/src/main/java/com/ken/wms/security/controller/AccountHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/controller/AccountHandler.java index f96cb565d75cb0e7f87c21840e522e3e9fd19fa0..7df34af519df608a02559fc49a7e13da9691fc1e 100644 --- a/WMS/src/main/java/com/ken/wms/security/controller/AccountHandler.java +++ b/WMS_BOOT/src/main/java/com/ken/wms/security/controller/AccountHandler.java @@ -11,7 +11,6 @@ import com.ken.wms.exception.SystemLogServiceException; import com.ken.wms.exception.UserAccountServiceException; import com.ken.wms.security.service.Interface.AccountService; import com.ken.wms.security.util.CaptchaGenerator; -import org.apache.log4j.Logger; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.IncorrectCredentialsException; @@ -19,6 +18,8 @@ import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -43,7 +44,7 @@ import java.util.Map; @RequestMapping("/account") public class AccountHandler { - private static Logger log = Logger.getLogger("application"); + private static Logger log = LoggerFactory.getLogger(AccountHandler.class); @Autowired private AccountService accountService; diff --git a/WMS/src/main/java/com/ken/wms/security/controller/PageForwardHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/security/controller/PageForwardHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/controller/PageForwardHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/controller/PageForwardHandler.java diff --git a/WMS/src/main/java/com/ken/wms/security/filter/AnyOfRolesAuthorizationFilter.java b/WMS_BOOT/src/main/java/com/ken/wms/security/filter/AnyOfRolesAuthorizationFilter.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/filter/AnyOfRolesAuthorizationFilter.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/filter/AnyOfRolesAuthorizationFilter.java diff --git a/WMS/src/main/java/com/ken/wms/security/filter/ExtendFormAuthenticationFilter.java b/WMS_BOOT/src/main/java/com/ken/wms/security/filter/ExtendFormAuthenticationFilter.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/filter/ExtendFormAuthenticationFilter.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/filter/ExtendFormAuthenticationFilter.java diff --git a/WMS/src/main/java/com/ken/wms/security/filter/KickoutSessionControlFilter.java b/WMS_BOOT/src/main/java/com/ken/wms/security/filter/KickoutSessionControlFilter.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/filter/KickoutSessionControlFilter.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/filter/KickoutSessionControlFilter.java diff --git a/WMS/src/main/java/com/ken/wms/security/listener/SessionListener.java b/WMS_BOOT/src/main/java/com/ken/wms/security/listener/SessionListener.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/listener/SessionListener.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/listener/SessionListener.java diff --git a/WMS/src/main/java/com/ken/wms/security/realms/UserAuthorizingRealm.java b/WMS_BOOT/src/main/java/com/ken/wms/security/realms/UserAuthorizingRealm.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/realms/UserAuthorizingRealm.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/realms/UserAuthorizingRealm.java diff --git a/WMS/src/main/java/com/ken/wms/security/service/FilterChainDefinitionMapBuilder.java b/WMS_BOOT/src/main/java/com/ken/wms/security/service/FilterChainDefinitionMapBuilder.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/service/FilterChainDefinitionMapBuilder.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/service/FilterChainDefinitionMapBuilder.java diff --git a/WMS/src/main/java/com/ken/wms/security/service/Impl/AccountServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/security/service/Impl/AccountServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/service/Impl/AccountServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/service/Impl/AccountServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/security/service/Impl/UserInfoServiceImpl.java b/WMS_BOOT/src/main/java/com/ken/wms/security/service/Impl/UserInfoServiceImpl.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/service/Impl/UserInfoServiceImpl.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/service/Impl/UserInfoServiceImpl.java diff --git a/WMS/src/main/java/com/ken/wms/security/service/Interface/AccountService.java b/WMS_BOOT/src/main/java/com/ken/wms/security/service/Interface/AccountService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/service/Interface/AccountService.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/service/Interface/AccountService.java diff --git a/WMS/src/main/java/com/ken/wms/security/service/Interface/UserInfoService.java b/WMS_BOOT/src/main/java/com/ken/wms/security/service/Interface/UserInfoService.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/service/Interface/UserInfoService.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/service/Interface/UserInfoService.java diff --git a/WMS/src/main/java/com/ken/wms/security/util/CaptchaGenerator.java b/WMS_BOOT/src/main/java/com/ken/wms/security/util/CaptchaGenerator.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/util/CaptchaGenerator.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/util/CaptchaGenerator.java diff --git a/WMS/src/main/java/com/ken/wms/security/util/MD5Util.java b/WMS_BOOT/src/main/java/com/ken/wms/security/util/MD5Util.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/security/util/MD5Util.java rename to WMS_BOOT/src/main/java/com/ken/wms/security/util/MD5Util.java diff --git a/WMS/src/main/java/com/ken/wms/util/GlobalExceptionHandler.java b/WMS_BOOT/src/main/java/com/ken/wms/util/GlobalExceptionHandler.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/util/GlobalExceptionHandler.java rename to WMS_BOOT/src/main/java/com/ken/wms/util/GlobalExceptionHandler.java diff --git a/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java b/WMS_BOOT/src/main/java/com/ken/wms/util/aop/ServiceLogging.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java rename to WMS_BOOT/src/main/java/com/ken/wms/util/aop/ServiceLogging.java diff --git a/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java b/WMS_BOOT/src/main/java/com/ken/wms/util/aop/UserOperation.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java rename to WMS_BOOT/src/main/java/com/ken/wms/util/aop/UserOperation.java diff --git a/WMS/src/main/java/com/ken/wms/util/aop/UserOperationLogging.java b/WMS_BOOT/src/main/java/com/ken/wms/util/aop/UserOperationLogging.java similarity index 100% rename from WMS/src/main/java/com/ken/wms/util/aop/UserOperationLogging.java rename to WMS_BOOT/src/main/java/com/ken/wms/util/aop/UserOperationLogging.java diff --git a/WMS_BOOT/src/main/resources/application.properties b/WMS_BOOT/src/main/resources/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..2313424e5a6e304bfb904ba672732385660e1456 --- /dev/null +++ b/WMS_BOOT/src/main/resources/application.properties @@ -0,0 +1,42 @@ +spring.application.name=WMS_BOOT +# \u5F00\u53D1\u73AF\u5883\u914D\u7F6E + +# \u670D\u52A1\u5668\u7684HTTP\u7AEF\u53E3\uFF0C\u9ED8\u8BA4\u4E3A8080 +server.port=9090 +# \u5E94\u7528\u7684\u8BBF\u95EE\u8DEF\u5F84 +server.servlet.context-path=/WMS + +# \u6570\u636E\u6E90\u914D\u7F6E +spring.datasource.url=jdbc:mysql://192.168.6.3:3306/wms_db?useSSL=false&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.username=root +spring.datasource.password=FsQE*D4Z^x6z@! +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.mvc.view.prefix=/WEB-INF/jsp/ +spring.mvc.view.suffix=.jsp + + +# MyBatis \u914D\u7F6E +mybatis.mapper-locations=classpath:com/ken/wms/dao/*Mapper.xml +mybatis.type-aliases-package=com.ken.wms.domain + +# \u914D\u7F6E PageHelper \u5206\u9875\u63D2\u4EF6 +pagehelper.helperDialect=mysql +pagehelper.offsetAsPage=false +pagehelper.rowBoundsWithCount=true +pagehelper.pageSizeZero=true +pagehelper.reasonable=false +pagehelper.params=pageNum=pageHelperStart;pageSize=pageHelperRows; +pagehelper.supportMethodsArguments=false +pagehelper.returnPageInfo=none + +# Enable caching +spring.cache.type=ehcache + +# Ehcache configuration +spring.cache.ehcache.config=classpath:config/ehcache.xml + +# Shiro cache configuration +shiro.cacheManager = org.apache.shiro.cache.CacheManager + + diff --git a/WMS/src/main/resources/config/EJConvertor.xsd b/WMS_BOOT/src/main/resources/config/EJConvertor.xsd similarity index 100% rename from WMS/src/main/resources/config/EJConvertor.xsd rename to WMS_BOOT/src/main/resources/config/EJConvertor.xsd diff --git a/WMS/src/main/resources/config/EJConvertorConfig.xml b/WMS_BOOT/src/main/resources/config/EJConvertorConfig.xml similarity index 100% rename from WMS/src/main/resources/config/EJConvertorConfig.xml rename to WMS_BOOT/src/main/resources/config/EJConvertorConfig.xml diff --git a/WMS/src/main/resources/config/ehcache.xml b/WMS_BOOT/src/main/resources/config/ehcache.xml similarity index 100% rename from WMS/src/main/resources/config/ehcache.xml rename to WMS_BOOT/src/main/resources/config/ehcache.xml diff --git a/WMS/src/main/resources/config/log4j.properties b/WMS_BOOT/src/main/resources/log4j.properties similarity index 100% rename from WMS/src/main/resources/config/log4j.properties rename to WMS_BOOT/src/main/resources/log4j.properties diff --git a/WMS/src/main/webapp/WEB-INF/download/customerInfo.xlsx b/WMS_BOOT/src/main/webapp/WEB-INF/download/customerInfo.xlsx similarity index 100% rename from WMS/src/main/webapp/WEB-INF/download/customerInfo.xlsx rename to WMS_BOOT/src/main/webapp/WEB-INF/download/customerInfo.xlsx diff --git a/WMS/src/main/webapp/WEB-INF/download/goodsInfo.xlsx b/WMS_BOOT/src/main/webapp/WEB-INF/download/goodsInfo.xlsx similarity index 100% rename from WMS/src/main/webapp/WEB-INF/download/goodsInfo.xlsx rename to WMS_BOOT/src/main/webapp/WEB-INF/download/goodsInfo.xlsx diff --git a/WMS/src/main/webapp/WEB-INF/download/repositoryAdminInfo.xlsx b/WMS_BOOT/src/main/webapp/WEB-INF/download/repositoryAdminInfo.xlsx similarity index 100% rename from WMS/src/main/webapp/WEB-INF/download/repositoryAdminInfo.xlsx rename to WMS_BOOT/src/main/webapp/WEB-INF/download/repositoryAdminInfo.xlsx diff --git a/WMS/src/main/webapp/WEB-INF/download/repositoryInfo.xlsx b/WMS_BOOT/src/main/webapp/WEB-INF/download/repositoryInfo.xlsx similarity index 100% rename from WMS/src/main/webapp/WEB-INF/download/repositoryInfo.xlsx rename to WMS_BOOT/src/main/webapp/WEB-INF/download/repositoryInfo.xlsx diff --git a/WMS/src/main/webapp/WEB-INF/download/storageRecord.xlsx b/WMS_BOOT/src/main/webapp/WEB-INF/download/storageRecord.xlsx similarity index 100% rename from WMS/src/main/webapp/WEB-INF/download/storageRecord.xlsx rename to WMS_BOOT/src/main/webapp/WEB-INF/download/storageRecord.xlsx diff --git a/WMS/src/main/webapp/WEB-INF/download/supplierInfo.xlsx b/WMS_BOOT/src/main/webapp/WEB-INF/download/supplierInfo.xlsx similarity index 100% rename from WMS/src/main/webapp/WEB-INF/download/supplierInfo.xlsx rename to WMS_BOOT/src/main/webapp/WEB-INF/download/supplierInfo.xlsx diff --git a/WMS/src/main/webapp/WEB-INF/jsp/login.jsp b/WMS_BOOT/src/main/webapp/WEB-INF/jsp/login.jsp similarity index 100% rename from WMS/src/main/webapp/WEB-INF/jsp/login.jsp rename to WMS_BOOT/src/main/webapp/WEB-INF/jsp/login.jsp diff --git a/WMS/src/main/webapp/WEB-INF/jsp/mainPage.jsp b/WMS_BOOT/src/main/webapp/WEB-INF/jsp/mainPage.jsp similarity index 100% rename from WMS/src/main/webapp/WEB-INF/jsp/mainPage.jsp rename to WMS_BOOT/src/main/webapp/WEB-INF/jsp/mainPage.jsp diff --git a/WMS/src/main/webapp/css/bootstrap-datetimepicker.min.css b/WMS_BOOT/src/main/webapp/css/bootstrap-datetimepicker.min.css similarity index 100% rename from WMS/src/main/webapp/css/bootstrap-datetimepicker.min.css rename to WMS_BOOT/src/main/webapp/css/bootstrap-datetimepicker.min.css diff --git a/WMS/src/main/webapp/css/bootstrap-table.css b/WMS_BOOT/src/main/webapp/css/bootstrap-table.css similarity index 100% rename from WMS/src/main/webapp/css/bootstrap-table.css rename to WMS_BOOT/src/main/webapp/css/bootstrap-table.css diff --git a/WMS/src/main/webapp/css/bootstrap-theme.css b/WMS_BOOT/src/main/webapp/css/bootstrap-theme.css similarity index 100% rename from WMS/src/main/webapp/css/bootstrap-theme.css rename to WMS_BOOT/src/main/webapp/css/bootstrap-theme.css diff --git a/WMS/src/main/webapp/css/bootstrap-theme.css.map b/WMS_BOOT/src/main/webapp/css/bootstrap-theme.css.map similarity index 100% rename from WMS/src/main/webapp/css/bootstrap-theme.css.map rename to WMS_BOOT/src/main/webapp/css/bootstrap-theme.css.map diff --git a/WMS/src/main/webapp/css/bootstrap-theme.min.css b/WMS_BOOT/src/main/webapp/css/bootstrap-theme.min.css similarity index 100% rename from WMS/src/main/webapp/css/bootstrap-theme.min.css rename to WMS_BOOT/src/main/webapp/css/bootstrap-theme.min.css diff --git a/WMS/src/main/webapp/css/bootstrap.css b/WMS_BOOT/src/main/webapp/css/bootstrap.css similarity index 100% rename from WMS/src/main/webapp/css/bootstrap.css rename to WMS_BOOT/src/main/webapp/css/bootstrap.css diff --git a/WMS/src/main/webapp/css/bootstrap.css.map b/WMS_BOOT/src/main/webapp/css/bootstrap.css.map similarity index 100% rename from WMS/src/main/webapp/css/bootstrap.css.map rename to WMS_BOOT/src/main/webapp/css/bootstrap.css.map diff --git a/WMS/src/main/webapp/css/bootstrap.min.css b/WMS_BOOT/src/main/webapp/css/bootstrap.min.css similarity index 100% rename from WMS/src/main/webapp/css/bootstrap.min.css rename to WMS_BOOT/src/main/webapp/css/bootstrap.min.css diff --git a/WMS/src/main/webapp/css/bootstrapValidator.min.css b/WMS_BOOT/src/main/webapp/css/bootstrapValidator.min.css similarity index 100% rename from WMS/src/main/webapp/css/bootstrapValidator.min.css rename to WMS_BOOT/src/main/webapp/css/bootstrapValidator.min.css diff --git a/WMS/src/main/webapp/css/jquery-ui.css b/WMS_BOOT/src/main/webapp/css/jquery-ui.css similarity index 100% rename from WMS/src/main/webapp/css/jquery-ui.css rename to WMS_BOOT/src/main/webapp/css/jquery-ui.css diff --git a/WMS/src/main/webapp/css/jquery.mloading.css b/WMS_BOOT/src/main/webapp/css/jquery.mloading.css similarity index 100% rename from WMS/src/main/webapp/css/jquery.mloading.css rename to WMS_BOOT/src/main/webapp/css/jquery.mloading.css diff --git a/WMS/src/main/webapp/css/mainPage.css b/WMS_BOOT/src/main/webapp/css/mainPage.css similarity index 100% rename from WMS/src/main/webapp/css/mainPage.css rename to WMS_BOOT/src/main/webapp/css/mainPage.css diff --git a/WMS/src/main/webapp/css/model/login/login.css b/WMS_BOOT/src/main/webapp/css/model/login/login.css similarity index 100% rename from WMS/src/main/webapp/css/model/login/login.css rename to WMS_BOOT/src/main/webapp/css/model/login/login.css diff --git a/WMS/src/main/webapp/errorPage/404Error.html b/WMS_BOOT/src/main/webapp/errorPage/404Error.html similarity index 100% rename from WMS/src/main/webapp/errorPage/404Error.html rename to WMS_BOOT/src/main/webapp/errorPage/404Error.html diff --git a/WMS/src/main/webapp/errorPage/500Error.html b/WMS_BOOT/src/main/webapp/errorPage/500Error.html similarity index 100% rename from WMS/src/main/webapp/errorPage/500Error.html rename to WMS_BOOT/src/main/webapp/errorPage/500Error.html diff --git a/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.eot b/WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from WMS/src/main/webapp/fonts/glyphicons-halflings-regular.eot rename to WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.eot diff --git a/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.svg b/WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from WMS/src/main/webapp/fonts/glyphicons-halflings-regular.svg rename to WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.svg diff --git a/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.ttf b/WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from WMS/src/main/webapp/fonts/glyphicons-halflings-regular.ttf rename to WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.ttf diff --git a/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff b/WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff rename to WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.woff diff --git a/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 b/WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 rename to WMS_BOOT/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 diff --git a/WMS/src/main/webapp/js/ajaxfileupload.js b/WMS_BOOT/src/main/webapp/js/ajaxfileupload.js similarity index 100% rename from WMS/src/main/webapp/js/ajaxfileupload.js rename to WMS_BOOT/src/main/webapp/js/ajaxfileupload.js diff --git a/WMS/src/main/webapp/js/bootstrap-datetimepicker.min.js b/WMS_BOOT/src/main/webapp/js/bootstrap-datetimepicker.min.js similarity index 100% rename from WMS/src/main/webapp/js/bootstrap-datetimepicker.min.js rename to WMS_BOOT/src/main/webapp/js/bootstrap-datetimepicker.min.js diff --git a/WMS/src/main/webapp/js/bootstrap-datetimepicker.zh-CN.js b/WMS_BOOT/src/main/webapp/js/bootstrap-datetimepicker.zh-CN.js similarity index 100% rename from WMS/src/main/webapp/js/bootstrap-datetimepicker.zh-CN.js rename to WMS_BOOT/src/main/webapp/js/bootstrap-datetimepicker.zh-CN.js diff --git a/WMS/src/main/webapp/js/bootstrap-table-zh-CN.min.js b/WMS_BOOT/src/main/webapp/js/bootstrap-table-zh-CN.min.js similarity index 100% rename from WMS/src/main/webapp/js/bootstrap-table-zh-CN.min.js rename to WMS_BOOT/src/main/webapp/js/bootstrap-table-zh-CN.min.js diff --git a/WMS/src/main/webapp/js/bootstrap-table.min.js b/WMS_BOOT/src/main/webapp/js/bootstrap-table.min.js similarity index 100% rename from WMS/src/main/webapp/js/bootstrap-table.min.js rename to WMS_BOOT/src/main/webapp/js/bootstrap-table.min.js diff --git a/WMS/src/main/webapp/js/bootstrap.js b/WMS_BOOT/src/main/webapp/js/bootstrap.js similarity index 100% rename from WMS/src/main/webapp/js/bootstrap.js rename to WMS_BOOT/src/main/webapp/js/bootstrap.js diff --git a/WMS/src/main/webapp/js/bootstrap.min.js b/WMS_BOOT/src/main/webapp/js/bootstrap.min.js similarity index 100% rename from WMS/src/main/webapp/js/bootstrap.min.js rename to WMS_BOOT/src/main/webapp/js/bootstrap.min.js diff --git a/WMS/src/main/webapp/js/bootstrapValidator.min.js b/WMS_BOOT/src/main/webapp/js/bootstrapValidator.min.js similarity index 100% rename from WMS/src/main/webapp/js/bootstrapValidator.min.js rename to WMS_BOOT/src/main/webapp/js/bootstrapValidator.min.js diff --git a/WMS/src/main/webapp/js/jquery-2.2.3.min.js b/WMS_BOOT/src/main/webapp/js/jquery-2.2.3.min.js similarity index 100% rename from WMS/src/main/webapp/js/jquery-2.2.3.min.js rename to WMS_BOOT/src/main/webapp/js/jquery-2.2.3.min.js diff --git a/WMS/src/main/webapp/js/jquery-ui.min.js b/WMS_BOOT/src/main/webapp/js/jquery-ui.min.js similarity index 100% rename from WMS/src/main/webapp/js/jquery-ui.min.js rename to WMS_BOOT/src/main/webapp/js/jquery-ui.min.js diff --git a/WMS/src/main/webapp/js/jquery.md5.js b/WMS_BOOT/src/main/webapp/js/jquery.md5.js similarity index 100% rename from WMS/src/main/webapp/js/jquery.md5.js rename to WMS_BOOT/src/main/webapp/js/jquery.md5.js diff --git a/WMS/src/main/webapp/js/jquery.mloading.js b/WMS_BOOT/src/main/webapp/js/jquery.mloading.js similarity index 100% rename from WMS/src/main/webapp/js/jquery.mloading.js rename to WMS_BOOT/src/main/webapp/js/jquery.mloading.js diff --git a/WMS/src/main/webapp/js/mainPage.js b/WMS_BOOT/src/main/webapp/js/mainPage.js similarity index 100% rename from WMS/src/main/webapp/js/mainPage.js rename to WMS_BOOT/src/main/webapp/js/mainPage.js diff --git a/WMS/src/main/webapp/js/npm.js b/WMS_BOOT/src/main/webapp/js/npm.js similarity index 100% rename from WMS/src/main/webapp/js/npm.js rename to WMS_BOOT/src/main/webapp/js/npm.js diff --git a/WMS/src/main/webapp/js/zh_CN.js b/WMS_BOOT/src/main/webapp/js/zh_CN.js similarity index 100% rename from WMS/src/main/webapp/js/zh_CN.js rename to WMS_BOOT/src/main/webapp/js/zh_CN.js diff --git a/WMS/src/main/webapp/media/icons/error-icon.png b/WMS_BOOT/src/main/webapp/media/icons/error-icon.png similarity index 100% rename from WMS/src/main/webapp/media/icons/error-icon.png rename to WMS_BOOT/src/main/webapp/media/icons/error-icon.png diff --git a/WMS/src/main/webapp/media/icons/stock_in-512.png b/WMS_BOOT/src/main/webapp/media/icons/stock_in-512.png similarity index 100% rename from WMS/src/main/webapp/media/icons/stock_in-512.png rename to WMS_BOOT/src/main/webapp/media/icons/stock_in-512.png diff --git a/WMS/src/main/webapp/media/icons/stock_out-512.png b/WMS_BOOT/src/main/webapp/media/icons/stock_out-512.png similarity index 100% rename from WMS/src/main/webapp/media/icons/stock_out-512.png rename to WMS_BOOT/src/main/webapp/media/icons/stock_out-512.png diff --git a/WMS/src/main/webapp/media/icons/stock_search-512.png b/WMS_BOOT/src/main/webapp/media/icons/stock_search-512.png similarity index 100% rename from WMS/src/main/webapp/media/icons/stock_search-512.png rename to WMS_BOOT/src/main/webapp/media/icons/stock_search-512.png diff --git a/WMS/src/main/webapp/media/icons/success-icon.png b/WMS_BOOT/src/main/webapp/media/icons/success-icon.png similarity index 100% rename from WMS/src/main/webapp/media/icons/success-icon.png rename to WMS_BOOT/src/main/webapp/media/icons/success-icon.png diff --git a/WMS/src/main/webapp/media/icons/warning-icon.png b/WMS_BOOT/src/main/webapp/media/icons/warning-icon.png similarity index 100% rename from WMS/src/main/webapp/media/icons/warning-icon.png rename to WMS_BOOT/src/main/webapp/media/icons/warning-icon.png diff --git a/WMS/src/main/webapp/media/images/404.jpg b/WMS_BOOT/src/main/webapp/media/images/404.jpg similarity index 100% rename from WMS/src/main/webapp/media/images/404.jpg rename to WMS_BOOT/src/main/webapp/media/images/404.jpg diff --git a/WMS/src/main/webapp/media/images/500.jpg b/WMS_BOOT/src/main/webapp/media/images/500.jpg similarity index 100% rename from WMS/src/main/webapp/media/images/500.jpg rename to WMS_BOOT/src/main/webapp/media/images/500.jpg diff --git a/WMS/src/main/webapp/media/images/backgroundPic.png b/WMS_BOOT/src/main/webapp/media/images/backgroundPic.png similarity index 100% rename from WMS/src/main/webapp/media/images/backgroundPic.png rename to WMS_BOOT/src/main/webapp/media/images/backgroundPic.png diff --git a/WMS/src/main/webapp/pagecomponent/accessRecordManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/accessRecordManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/accessRecordManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/accessRecordManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/customerManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/customerManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/customerManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/customerManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/goodsManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/goodsManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/goodsManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/goodsManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/passwordModification.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/passwordModification.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/passwordModification.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/passwordModification.jsp diff --git a/WMS/src/main/webapp/pagecomponent/repositoryAdminManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/repositoryAdminManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/repositoryAdminManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/repositoryAdminManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/repositoryManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/repositoryManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/repositoryManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/repositoryManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/stock-inManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/stock-inManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/stock-inManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/stock-inManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/stock-inManagementCommon.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/stock-inManagementCommon.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/stock-inManagementCommon.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/stock-inManagementCommon.jsp diff --git a/WMS/src/main/webapp/pagecomponent/stock-outManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/stock-outManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/stock-outManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/stock-outManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/stock-outManagementCommon.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/stock-outManagementCommon.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/stock-outManagementCommon.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/stock-outManagementCommon.jsp diff --git a/WMS/src/main/webapp/pagecomponent/stockRecordManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/stockRecordManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/stockRecordManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/stockRecordManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/storageManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/storageManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/storageManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/storageManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/storageManagementCommon.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/storageManagementCommon.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/storageManagementCommon.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/storageManagementCommon.jsp diff --git a/WMS/src/main/webapp/pagecomponent/supplierManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/supplierManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/supplierManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/supplierManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/userOperationRecorderManagement.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/userOperationRecorderManagement.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/userOperationRecorderManagement.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/userOperationRecorderManagement.jsp diff --git a/WMS/src/main/webapp/pagecomponent/welcomePage.jsp b/WMS_BOOT/src/main/webapp/pagecomponent/welcomePage.jsp similarity index 100% rename from WMS/src/main/webapp/pagecomponent/welcomePage.jsp rename to WMS_BOOT/src/main/webapp/pagecomponent/welcomePage.jsp diff --git a/WMS/src/test/java/com/ken/wms/MapperTest.java b/WMS_BOOT/src/test/java/com/ken/wms/MapperTest.java similarity index 100% rename from WMS/src/test/java/com/ken/wms/MapperTest.java rename to WMS_BOOT/src/test/java/com/ken/wms/MapperTest.java diff --git a/WMS/src/test/java/com/ken/wms/MyTest.java b/WMS_BOOT/src/test/java/com/ken/wms/MyTest.java similarity index 100% rename from WMS/src/test/java/com/ken/wms/MyTest.java rename to WMS_BOOT/src/test/java/com/ken/wms/MyTest.java