diff --git a/warehouseManager-developer/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md similarity index 100% rename from warehouseManager-developer/.gitee/ISSUE_TEMPLATE.zh-CN.md rename to .gitee/ISSUE_TEMPLATE.zh-CN.md diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md new file mode 100644 index 0000000..286d18e --- /dev/null +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -0,0 +1,303 @@ +### 该Pull Request关联的Issue + + +### 修改描述 + + + +### 测试用例 +package com.ken.wms.common.controller; + +import com.ken.wms.common.service.Interface.RepositoryAdminManageService; +import com.ken.wms.common.util.Response; +import com.ken.wms.common.util.ResponseFactory; +import com.ken.wms.domain.RepositoryAdmin; +import com.ken.wms.exception.RepositoryAdminManageServiceException; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +/// RHY +/** +* 仓库管理员管理请求 Handler + +*/ +@Controller +@RequestMapping(value = "/**/repositoryAdminManage") +public class RepositoryAdminManageHandler { + + @Autowired + private RepositoryAdminManageService repositoryAdminManageService; + + // 查询类型 + private static final String SEARCH_BY_ID = "searchByID"; + private static final String SEARCH_BY_NAME = "searchByName"; + private static final String SEARCH_BY_REPOSITORY_ID = "searchByRepositoryID"; + private static final String SEARCH_ALL = "searchAll"; + + /** + * 通用记录查询 + * + * @param keyWord 查询关键字 + * @param searchType 查询类型 + * @param offset 分页偏移值 + * @param limit 分页大小 + * @return 返回所有符合条件的记录 + */ + private Map query(String keyWord, String searchType, int offset, int limit) throws RepositoryAdminManageServiceException { + Map queryResult = null; + + // query + switch (searchType) { + case SEARCH_ALL: + queryResult = repositoryAdminManageService.selectAll(offset, limit); + break; + case SEARCH_BY_ID: + if (StringUtils.isNumeric(keyWord)) + queryResult = repositoryAdminManageService.selectByID(Integer.valueOf(keyWord)); + break; + case SEARCH_BY_NAME: + queryResult = repositoryAdminManageService.selectByName(offset, limit, keyWord); + break; + case SEARCH_BY_REPOSITORY_ID: + if (StringUtils.isNumeric(keyWord)) + queryResult = repositoryAdminManageService.selectByRepositoryID(Integer.valueOf(keyWord)); + break; + default: + // do other things + break; + } + + return queryResult; + } + + /** + * 查询仓库管理员信息 + * + * @param searchType 查询类型 + * @param offset 分页偏移值 + * @param limit 分页大小 + * @param keyWord 查询关键字 + * @return 返回一个Map，其中key=rows，表示查询出来的记录；key=total，表示记录的总条数 + */ + @SuppressWarnings("unchecked") + @RequestMapping(value = "getRepositoryAdminList", method = RequestMethod.GET) + public + @ResponseBody + Map getRepositoryAdmin(@RequestParam("searchType") String searchType, + @RequestParam("keyWord") String keyWord, @RequestParam("offset") int offset, + @RequestParam("limit") int limit) throws RepositoryAdminManageServiceException { + // 初始化 Response + Response responseContent = ResponseFactory.newInstance(); + + List rows = null; + long total = 0; + + // 查询 + Map queryResult = query(keyWord, searchType, offset, limit); + + if (queryResult != null) { + rows = (List) queryResult.get("data"); + total = (long) queryResult.get("total"); + } + + // 设置 Response + responseContent.setCustomerInfo("rows", rows); + responseContent.setResponseTotal(total); + return responseContent.generateResponse(); + } + + /** + * 添加一条仓库管理员信息 + * + * @param repositoryAdmin 仓库管理员信息 + * @return 返回一个map，其中：key 为 result表示操作的结果，包括：success 与 error + */ + @RequestMapping(value = "addRepositoryAdmin", method = RequestMethod.POST) + public + @ResponseBody + Map addRepositoryAdmin(@RequestBody RepositoryAdmin repositoryAdmin) throws RepositoryAdminManageServiceException { + // 初始化 Response + Response responseContent = ResponseFactory.newInstance(); + + // 添加结果 + String result = repositoryAdminManageService.addRepositoryAdmin(repositoryAdmin) + ? Response.RESPONSE_RESULT_SUCCESS : Response.RESPONSE_RESULT_ERROR; + + // 设置 Response + responseContent.setResponseResult(result); + return responseContent.generateResponse(); + } + + /** + * 查询指定 ID 的仓库管理员信息 + * + * @param repositoryAdminID 仓库管理员ID + * @return 返回一个map，其中：key 为 result 的值为操作的结果，包括：success 与 error；key 为 data + * 的值为仓库管理员信息 + */ + @RequestMapping(value = "getRepositoryAdminInfo", method = RequestMethod.GET) + public + @ResponseBody + Map getRepositoryAdminInfo(Integer repositoryAdminID) throws RepositoryAdminManageServiceException { + // 初始化 Response + Response responseContent = ResponseFactory.newInstance(); + String result = Response.RESPONSE_RESULT_ERROR; + + // 查询 + RepositoryAdmin repositoryAdmin = null; + Map queryResult = repositoryAdminManageService.selectByID(repositoryAdminID); + if (queryResult != null) { + if ((repositoryAdmin = (RepositoryAdmin) queryResult.get("data")) != null) + result = Response.RESPONSE_RESULT_SUCCESS; + } + + // 设置 Response + responseContent.setResponseResult(result); + responseContent.setResponseData(repositoryAdmin); + return responseContent.generateResponse(); + } + + /** + * 更新仓库管理员信息 + * + * @param repositoryAdmin 仓库管理员信息 + * @return 返回一个map，其中：key 为 result 的值为操作的结果，包括：success 与 error；key 为 data + * 的值为仓库管理员信息 + */ + @RequestMapping(value = "updateRepositoryAdmin", method = RequestMethod.POST) + public + @ResponseBody + Map updateRepositoryAdmin(@RequestBody RepositoryAdmin repositoryAdmin) throws RepositoryAdminManageServiceException { + // 初始化 Response + Response responseContent = ResponseFactory.newInstance(); + + // 更新 + String result = repositoryAdminManageService.updateRepositoryAdmin(repositoryAdmin) + ? Response.RESPONSE_RESULT_SUCCESS : Response.RESPONSE_RESULT_ERROR; + + // 设置 Response + responseContent.setResponseResult(result); + return responseContent.generateResponse(); + } + + /** + * 删除指定 ID 的仓库管理员信息 + * + * @param repositoryAdminID 仓库ID + * @return 返回一个map，其中：key 为 result 的值为操作的结果，包括：success 与 error；key 为 data + * 的值为仓库管理员信息 + */ + @RequestMapping(value = "deleteRepositoryAdmin", method = RequestMethod.GET) + public + @ResponseBody + Map deleteRepositoryAdmin(Integer repositoryAdminID) throws RepositoryAdminManageServiceException { + // 初始化 Response + Response responseContent = ResponseFactory.newInstance(); + + // 删除记录 + String result = repositoryAdminManageService.deleteRepositoryAdmin(repositoryAdminID) + ? Response.RESPONSE_RESULT_SUCCESS : Response.RESPONSE_RESULT_ERROR; + + // 设置 Response + responseContent.setResponseResult(result); + return responseContent.generateResponse(); + } + + /** + * 从文件中导入仓库管理员信息 + * + * @param file 保存有仓库管理员信息的文件 + * @return 返回一个map，其中：key 为 result表示操作的结果，包括：success 与 + * error；key为total表示导入的总条数；key为available表示有效的条数 + */ + @RequestMapping(value = "importRepositoryAdmin", method = RequestMethod.POST) + public + @ResponseBody + Map importRepositoryAdmin(MultipartFile file) throws RepositoryAdminManageServiceException { + // 初始化 Response + Response responseContent = ResponseFactory.newInstance(); + String result = Response.RESPONSE_RESULT_ERROR; + + // 读取文件 + long total = 0; + long available = 0; + if (file != null) { + Map importInfo = repositoryAdminManageService.importRepositoryAdmin(file); + if (importInfo != null) { + total = (long) importInfo.get("total"); + available = (long) importInfo.get("available"); + result = Response.RESPONSE_RESULT_SUCCESS; + } + } + + // 设置 Response + responseContent.setResponseResult(result); + responseContent.setResponseTotal(total); + responseContent.setCustomerInfo("available", available); + return responseContent.generateResponse(); + } + + /** + * 导出仓库管理员信息到文件中 + * + * @param searchType 查询类型 + * @param keyWord 查询关键字 + * @param response HttpServletResponse + */ + @SuppressWarnings("unchecked") + @RequestMapping(value = "exportRepositoryAdmin", method = RequestMethod.GET) + public void exportRepositoryAdmin(@RequestParam("searchType") String searchType, + @RequestParam("keyWord") String keyWord, HttpServletResponse response) throws RepositoryAdminManageServiceException, IOException { + + // 导出文件名 + String fileName = "repositoryAdminInfo.xlsx"; + + // 查询 + List repositoryAdmins; + Map queryResult = query(keyWord, searchType, -1, -1); + + if (queryResult != null) + repositoryAdmins = (List) queryResult.get("data"); + else + repositoryAdmins = new ArrayList<>(); + + // 生成文件 + File file = repositoryAdminManageService.exportRepositoryAdmin(repositoryAdmins); + + // 输出文件 + if (file != null) { + // 设置响应头 + response.addHeader("Content-Disposition", "attachment;filename=" + fileName); + FileInputStream inputStream = new FileInputStream(file); + OutputStream outputStream = response.getOutputStream(); + byte[] buffer = new byte[8192]; + + int len; + while ((len = inputStream.read(buffer, 0, buffer.length)) > 0) { + outputStream.write(buffer, 0, len); + outputStream.flush(); + } + + inputStream.close(); + outputStream.close(); + } + } +} + + + +### 修复效果的截屏 + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..0f54cb7 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + { + "associatedIndex": 1 +} + + + + + { + "keyToString": { + "RunOnceActivity.ShowReadmeOnStart": "true", + "git-widget-placeholder": "master", + "kotlin-language-version-configured": "true", + "last_opened_file_path": "D:/Git/rjgc/cangku/warehouseManager-developer", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "settings.editor.selected.configurable": "vcs.Git", + "vue.rearranger.settings.migration": "true" + }, + "keyToStringList": { + "ChangesTree.GroupingKeys": [ + "directory" + ] + } +} + + + + + + + + + C:\Users\任海洋\AppData\Roaming\Subversion + + + + + 1745473836915 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/warehouseManager-developer/LICENSE b/LICENSE similarity index 100% rename from warehouseManager-developer/LICENSE rename to LICENSE diff --git a/README.md b/README.md index 597f736..12eaf07 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,112 @@ -# cangku +star +fork +# 基于SSM框架的仓库管理系统 + + +## ✅ 分支说明 + +| 分支 | spring框架 | MySQL8.0 | MySQL5.7 | 登录验证码 | +|----|----------|----------|----------|----------| +| dev-springboot | springboot | ✅ | ✅ | ✅ | +| developer | springmvc | ✅ | ✅ | ✅ | +| 去登录验证码 | springmvc | ✅ | ✅ | ❎ | +| MySQL5.7 | springmvc | ❎ | ✅ | ✅ | + + +## ✅ 非常紧急的问题或功能定制可以关注公众号->发消息：仓库管理 + +> ![输入图片说明](qrcode_for_gh_cf005810de67_258.jpg) + +## 计划 +- [x] 录制idea启动系统演示视频（价值：很多初学者需要） +- [x] 数据库驱动兼容8.0，兼容MySQL5.7的旧代码放在分支mysql5.7（价值：应届毕业生80%以上默认用的MySQL8.0+） +- [x] springmvc迁移到springboot（价值：应届毕业生80%以上默认用的springboot框架），见【dev-springboot】分支 + +![输入图片说明](video/image.png) + + +## ⭕ 视频-IDEA导入+运行项目演示 + +> [基于SSM框架的仓库管理系统演示.mp4](/video/基于SSM框架的仓库管理系统演示.mp4) + +## 📋 功能 + +* 系统操作权限管理。系统提供基本的登入登出功能，同时系统包含两个角色：系统超级管理员和普通管理员，超级管理员具有最高的操作权限，而普通管理员仅具有最基本的操作权限，而且仅能操作自己被指派的仓库。 +* 请求URL鉴权。对于系统使用者登陆后进行操作发送请求的URL，后台会根据当前用户的角色判断是否拥有请求该URL的权限。 +* 基础数据信息管理。对包括：货物信息、供应商信息、客户信息、仓库信息在内的基础数据信息进行管理，提供的操作有：添加、删除、修改、条件查询、导出为Excel和到从Excel导入。 +* 仓库管理员管理。对仓库管理员信息CRUD操作，或者为指定的仓库管理员指派所管理的仓库。上述中的仓库管理员可以以普通管理员身份登陆到系统。 +* 库存信息管理。对库存信息的CRUD操作，导入导出操作，同时查询的时候可以根据仓库以及商品ID等信息进行多条件查询。 +* 基本仓库事务操作。执行货物的入库与出库操作。 +* 系统登陆日志查询。超级管理员可以查询某一用户在特定时间段内的系统登陆日志。 +* 系统操作日志查询。超级管理员可以查询某一用户在特定时间段内对系统进行操作的操作记录。、 +* 密码修改。 + + + +## ✳️ 使用到的框架和库 + +* Apache POI +* MyBatis +* Spring Framework +* Spring MVC +* Apache Shiro +* Ehcache +* Apache Commons +* Log4j +* Slf4j +* Jackson +* C3P0 +* Junit +* MySQL-Connector +* jQuery +* Bootstrap +## ✴️ 登陆系统方式 +用户ID : 1001 +密码 ：123456 +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/172938_7e1c90d9_736072.png "屏幕截图.png") +加密代码 +``` +// 用户密码（wms_user.USER_PASSWORD）加密规则 +String tempStr = MD5Util.MD5("123456");// 第一次对密码进行加密 +String encryptPassword = MD5Util.MD5(tempStr + "1001");// 第二次对密码进行加密 +//存入数据库的加密密码 +System.out.println(encryptPassword); +``` +新增用户默认密码为用户ID（比如新增一个用户ID为1012，密码也为1012） +## 📚 JDK版本 + +### jdk 1.8 + +## 📚 数据库版本 +### MySQL 8.0+ +查看版本号命令如下： +> MySQL> select version(); + +## ⭐ 数据库关系图 +![输入图片说明](https://gitee.com/uploads/images/2018/0412/194935_92258b3b_736072.png "Diagram 1.png") + +## 📚 部分截图 +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173158_70c3cba9_736072.png "WMS-截图1.PNG") +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173225_8869b802_736072.png "MWS-截图2.PNG") +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173239_39be69c7_736072.png "WMS-截图3.PNG") +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173247_db6a6bdf_736072.png "WMS-截图4.PNG") +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173256_8b7d7df4_736072.png "WMS-截图5.PNG") +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173311_53b058f8_736072.png "WMS-截图7.PNG") +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173321_f828f801_736072.png "WMS-截图8.PNG") +![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173328_41f84519_736072.png "WMS-截图9.PNG") + +## 📚 常见问题 +#### ①中文乱码 +![输入图片说明](image.png) +解决方式：数据库连接后面加上编码方式jdbc.url = jdbc:mysql:///192.168.X.X:3306\WMS_DB?useUnicode=true&characterEncoding=utf8 + + +## 👍 支持 + +- If the project is very helpful to you, you can buy the author a cup of coffee☕. +- 如果这个项目对您有帮助，可以请作者喝杯咖啡哟☕ + +|支付宝 | 微信| +| :--------: | :--------:| +| ![输入图片说明](%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20230225215404.jpg)|![输入图片说明](%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20230225215651.jpg) | \ No newline at end of file diff --git a/warehouseManager-developer/WMS/.gitignore b/WMS/.gitignore similarity index 100% rename from warehouseManager-developer/WMS/.gitignore rename to WMS/.gitignore diff --git a/warehouseManager-developer/WMS/pom.xml b/WMS/pom.xml similarity index 100% rename from warehouseManager-developer/WMS/pom.xml rename to WMS/pom.xml diff --git a/warehouseManager-developer/WMS/sql/createtable.sql b/WMS/sql/createtable.sql similarity index 100% rename from warehouseManager-developer/WMS/sql/createtable.sql rename to WMS/sql/createtable.sql diff --git a/WMS/src/main/java/com/ken/wms/common/cheshi/cs1.js b/WMS/src/main/java/com/ken/wms/common/cheshi/cs1.js new file mode 100644 index 0000000..e69de29 diff --git a/WMS/src/main/java/com/ken/wms/common/cheshi/cs4 b/WMS/src/main/java/com/ken/wms/common/cheshi/cs4 new file mode 100644 index 0000000..e69de29 diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java similarity index 99% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java index 5a23ddc..925bb79 100644 --- a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java +++ b/WMS/src/main/java/com/ken/wms/common/controller/CustomerManageHandler.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.List; import java.util.Map; - +/// RHY /** * 客户信息管理请求 Handler */ diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java similarity index 99% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java index b3c37a2..4aaabf4 100644 --- a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java +++ b/WMS/src/main/java/com/ken/wms/common/controller/FileSourceHandler.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; - +/// RHY /** * 处理文件下载请求 Spring MVC控制器类，用于处理文件下载请求 diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java similarity index 99% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java index eb86627..10cd0fa 100644 --- a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java +++ b/WMS/src/main/java/com/ken/wms/common/controller/GoodsManageHandler.java @@ -1,5 +1,5 @@ package com.ken.wms.common.controller; - +/// RHY import com.ken.wms.common.service.Interface.GoodsManageService; import com.ken.wms.common.util.Response; import com.ken.wms.common.util.ResponseFactory; diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java similarity index 99% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java index 8d70d73..ce91e63 100644 --- a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java +++ b/WMS/src/main/java/com/ken/wms/common/controller/RepositoryAdminManageHandler.java @@ -19,7 +19,7 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; - +/// RHY /** * 仓库管理员管理请求 Handler diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/RepositoryManageHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/RepositoryManageHandler.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/RepositoryManageHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/RepositoryManageHandler.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/StockRecordManageHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/StockRecordManageHandler.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/StockRecordManageHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/StockRecordManageHandler.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/StorageManageHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/StorageManageHandler.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/StorageManageHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/StorageManageHandler.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java similarity index 99% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java index 4d1b6fe..5eea2d0 100644 --- a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java +++ b/WMS/src/main/java/com/ken/wms/common/controller/SupplierManageHandler.java @@ -18,7 +18,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.List; import java.util.Map; - +/// RHY /** * 供应商信息管理请求 Handler diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java b/WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java similarity index 99% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java rename to WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java index 906dada..1d019cb 100644 --- a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java +++ b/WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java @@ -18,6 +18,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +//系统操作日志请求 H +/// RHY /** * 系统操作日志请求 Handler * diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/CustomerManageServiceImpl.java b/WMS/src/main/java/com/ken/wms/common/service/Impl/CustomerManageServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/CustomerManageServiceImpl.java rename to WMS/src/main/java/com/ken/wms/common/service/Impl/CustomerManageServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/GoodsManageServiceImpl.java b/WMS/src/main/java/com/ken/wms/common/service/Impl/GoodsManageServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/GoodsManageServiceImpl.java rename to WMS/src/main/java/com/ken/wms/common/service/Impl/GoodsManageServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryAdminManageServiceImpl.java b/WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryAdminManageServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryAdminManageServiceImpl.java rename to WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryAdminManageServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryManageServiceImpl.java b/WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryManageServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryManageServiceImpl.java rename to WMS/src/main/java/com/ken/wms/common/service/Impl/RepositoryManageServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/StockRecordManageServiceImpl.java b/WMS/src/main/java/com/ken/wms/common/service/Impl/StockRecordManageServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/StockRecordManageServiceImpl.java rename to WMS/src/main/java/com/ken/wms/common/service/Impl/StockRecordManageServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/StorageManageServiceImpl.java b/WMS/src/main/java/com/ken/wms/common/service/Impl/StorageManageServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/StorageManageServiceImpl.java rename to WMS/src/main/java/com/ken/wms/common/service/Impl/StorageManageServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/SupplierManageServiceImpl.java b/WMS/src/main/java/com/ken/wms/common/service/Impl/SupplierManageServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/SupplierManageServiceImpl.java rename to WMS/src/main/java/com/ken/wms/common/service/Impl/SupplierManageServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/SystemLogServiceImpl.java b/WMS/src/main/java/com/ken/wms/common/service/Impl/SystemLogServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Impl/SystemLogServiceImpl.java rename to WMS/src/main/java/com/ken/wms/common/service/Impl/SystemLogServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/CustomerManageService.java b/WMS/src/main/java/com/ken/wms/common/service/Interface/CustomerManageService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/CustomerManageService.java rename to WMS/src/main/java/com/ken/wms/common/service/Interface/CustomerManageService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/GoodsManageService.java b/WMS/src/main/java/com/ken/wms/common/service/Interface/GoodsManageService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/GoodsManageService.java rename to WMS/src/main/java/com/ken/wms/common/service/Interface/GoodsManageService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryAdminManageService.java b/WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryAdminManageService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryAdminManageService.java rename to WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryAdminManageService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryService.java b/WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryService.java rename to WMS/src/main/java/com/ken/wms/common/service/Interface/RepositoryService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/StockRecordManageService.java b/WMS/src/main/java/com/ken/wms/common/service/Interface/StockRecordManageService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/StockRecordManageService.java rename to WMS/src/main/java/com/ken/wms/common/service/Interface/StockRecordManageService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/StorageManageService.java b/WMS/src/main/java/com/ken/wms/common/service/Interface/StorageManageService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/StorageManageService.java rename to WMS/src/main/java/com/ken/wms/common/service/Interface/StorageManageService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/SupplierManageService.java b/WMS/src/main/java/com/ken/wms/common/service/Interface/SupplierManageService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/SupplierManageService.java rename to WMS/src/main/java/com/ken/wms/common/service/Interface/SupplierManageService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/SystemLogService.java b/WMS/src/main/java/com/ken/wms/common/service/Interface/SystemLogService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/service/Interface/SystemLogService.java rename to WMS/src/main/java/com/ken/wms/common/service/Interface/SystemLogService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/util/EJConvertor.java b/WMS/src/main/java/com/ken/wms/common/util/EJConvertor.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/util/EJConvertor.java rename to WMS/src/main/java/com/ken/wms/common/util/EJConvertor.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/util/FileUtil.java b/WMS/src/main/java/com/ken/wms/common/util/FileUtil.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/util/FileUtil.java rename to WMS/src/main/java/com/ken/wms/common/util/FileUtil.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/util/Response.java b/WMS/src/main/java/com/ken/wms/common/util/Response.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/util/Response.java rename to WMS/src/main/java/com/ken/wms/common/util/Response.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/util/ResponseFactory.java b/WMS/src/main/java/com/ken/wms/common/util/ResponseFactory.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/common/util/ResponseFactory.java rename to WMS/src/main/java/com/ken/wms/common/util/ResponseFactory.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.java b/WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.java rename to WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.xml b/WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/AccessRecordMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/CustomerMapper.java b/WMS/src/main/java/com/ken/wms/dao/CustomerMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/CustomerMapper.java rename to WMS/src/main/java/com/ken/wms/dao/CustomerMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/CustomerMapper.xml b/WMS/src/main/java/com/ken/wms/dao/CustomerMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/CustomerMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/CustomerMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/GoodsMapper.java b/WMS/src/main/java/com/ken/wms/dao/GoodsMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/GoodsMapper.java rename to WMS/src/main/java/com/ken/wms/dao/GoodsMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/GoodsMapper.xml b/WMS/src/main/java/com/ken/wms/dao/GoodsMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/GoodsMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/GoodsMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.java b/WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.java rename to WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.xml b/WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/RepositoryAdminMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.java b/WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.java rename to WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.xml b/WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/RepositoryMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.java b/WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.java rename to WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.xml b/WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/RolePermissionMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RolesMapper.java b/WMS/src/main/java/com/ken/wms/dao/RolesMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RolesMapper.java rename to WMS/src/main/java/com/ken/wms/dao/RolesMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RolesMapper.xml b/WMS/src/main/java/com/ken/wms/dao/RolesMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/RolesMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/RolesMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StockInMapper.java b/WMS/src/main/java/com/ken/wms/dao/StockInMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StockInMapper.java rename to WMS/src/main/java/com/ken/wms/dao/StockInMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StockInMapper.xml b/WMS/src/main/java/com/ken/wms/dao/StockInMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StockInMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/StockInMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StockOutMapper.java b/WMS/src/main/java/com/ken/wms/dao/StockOutMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StockOutMapper.java rename to WMS/src/main/java/com/ken/wms/dao/StockOutMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StockOutMapper.xml b/WMS/src/main/java/com/ken/wms/dao/StockOutMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StockOutMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/StockOutMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StorageMapper.java b/WMS/src/main/java/com/ken/wms/dao/StorageMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StorageMapper.java rename to WMS/src/main/java/com/ken/wms/dao/StorageMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StorageMapper.xml b/WMS/src/main/java/com/ken/wms/dao/StorageMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/StorageMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/StorageMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/SupplierMapper.java b/WMS/src/main/java/com/ken/wms/dao/SupplierMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/SupplierMapper.java rename to WMS/src/main/java/com/ken/wms/dao/SupplierMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/SupplierMapper.xml b/WMS/src/main/java/com/ken/wms/dao/SupplierMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/SupplierMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/SupplierMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.java b/WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.java rename to WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.xml b/WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/UserInfoMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.java b/WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.java rename to WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.xml b/WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/UserOperationRecordMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.java b/WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.java rename to WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.xml b/WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.xml rename to WMS/src/main/java/com/ken/wms/dao/UserPermissionMapper.xml diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/AccessRecordDO.java b/WMS/src/main/java/com/ken/wms/domain/AccessRecordDO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/AccessRecordDO.java rename to WMS/src/main/java/com/ken/wms/domain/AccessRecordDO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/AccessRecordDTO.java b/WMS/src/main/java/com/ken/wms/domain/AccessRecordDTO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/AccessRecordDTO.java rename to WMS/src/main/java/com/ken/wms/domain/AccessRecordDTO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Customer.java b/WMS/src/main/java/com/ken/wms/domain/Customer.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Customer.java rename to WMS/src/main/java/com/ken/wms/domain/Customer.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Goods.java b/WMS/src/main/java/com/ken/wms/domain/Goods.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Goods.java rename to WMS/src/main/java/com/ken/wms/domain/Goods.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Repository.java b/WMS/src/main/java/com/ken/wms/domain/Repository.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Repository.java rename to WMS/src/main/java/com/ken/wms/domain/Repository.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/RepositoryAdmin.java b/WMS/src/main/java/com/ken/wms/domain/RepositoryAdmin.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/RepositoryAdmin.java rename to WMS/src/main/java/com/ken/wms/domain/RepositoryAdmin.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/RoleDO.java b/WMS/src/main/java/com/ken/wms/domain/RoleDO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/RoleDO.java rename to WMS/src/main/java/com/ken/wms/domain/RoleDO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/RolePermissionDO.java b/WMS/src/main/java/com/ken/wms/domain/RolePermissionDO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/RolePermissionDO.java rename to WMS/src/main/java/com/ken/wms/domain/RolePermissionDO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/StockInDO.java b/WMS/src/main/java/com/ken/wms/domain/StockInDO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/StockInDO.java rename to WMS/src/main/java/com/ken/wms/domain/StockInDO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/StockOutDO.java b/WMS/src/main/java/com/ken/wms/domain/StockOutDO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/StockOutDO.java rename to WMS/src/main/java/com/ken/wms/domain/StockOutDO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/StockRecordDTO.java b/WMS/src/main/java/com/ken/wms/domain/StockRecordDTO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/StockRecordDTO.java rename to WMS/src/main/java/com/ken/wms/domain/StockRecordDTO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Storage.java b/WMS/src/main/java/com/ken/wms/domain/Storage.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Storage.java rename to WMS/src/main/java/com/ken/wms/domain/Storage.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Supplier.java b/WMS/src/main/java/com/ken/wms/domain/Supplier.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/Supplier.java rename to WMS/src/main/java/com/ken/wms/domain/Supplier.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/User.java b/WMS/src/main/java/com/ken/wms/domain/User.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/User.java rename to WMS/src/main/java/com/ken/wms/domain/User.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/UserInfoDO.java b/WMS/src/main/java/com/ken/wms/domain/UserInfoDO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/UserInfoDO.java rename to WMS/src/main/java/com/ken/wms/domain/UserInfoDO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/UserInfoDTO.java b/WMS/src/main/java/com/ken/wms/domain/UserInfoDTO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/UserInfoDTO.java rename to WMS/src/main/java/com/ken/wms/domain/UserInfoDTO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDO.java b/WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDO.java rename to WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDTO.java b/WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDTO.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDTO.java rename to WMS/src/main/java/com/ken/wms/domain/UserOperationRecordDTO.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/BusinessException.java b/WMS/src/main/java/com/ken/wms/exception/BusinessException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/BusinessException.java rename to WMS/src/main/java/com/ken/wms/exception/BusinessException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/CustomerManageServiceException.java b/WMS/src/main/java/com/ken/wms/exception/CustomerManageServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/CustomerManageServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/CustomerManageServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/GoodsManageServiceException.java b/WMS/src/main/java/com/ken/wms/exception/GoodsManageServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/GoodsManageServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/GoodsManageServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/RepositoryAdminManageServiceException.java b/WMS/src/main/java/com/ken/wms/exception/RepositoryAdminManageServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/RepositoryAdminManageServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/RepositoryAdminManageServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/RepositoryManageServiceException.java b/WMS/src/main/java/com/ken/wms/exception/RepositoryManageServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/RepositoryManageServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/RepositoryManageServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/StockRecordManageServiceException.java b/WMS/src/main/java/com/ken/wms/exception/StockRecordManageServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/StockRecordManageServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/StockRecordManageServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/StorageManageServiceException.java b/WMS/src/main/java/com/ken/wms/exception/StorageManageServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/StorageManageServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/StorageManageServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/SupplierManageServiceException.java b/WMS/src/main/java/com/ken/wms/exception/SupplierManageServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/SupplierManageServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/SupplierManageServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/SystemLogServiceException.java b/WMS/src/main/java/com/ken/wms/exception/SystemLogServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/SystemLogServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/SystemLogServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/UserAccountServiceException.java b/WMS/src/main/java/com/ken/wms/exception/UserAccountServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/UserAccountServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/UserAccountServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/UserInfoServiceException.java b/WMS/src/main/java/com/ken/wms/exception/UserInfoServiceException.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/exception/UserInfoServiceException.java rename to WMS/src/main/java/com/ken/wms/exception/UserInfoServiceException.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/controller/AccountHandler.java b/WMS/src/main/java/com/ken/wms/security/controller/AccountHandler.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/controller/AccountHandler.java rename to WMS/src/main/java/com/ken/wms/security/controller/AccountHandler.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/controller/PageForwardHandler.java b/WMS/src/main/java/com/ken/wms/security/controller/PageForwardHandler.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/controller/PageForwardHandler.java rename to WMS/src/main/java/com/ken/wms/security/controller/PageForwardHandler.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/filter/AnyOfRolesAuthorizationFilter.java b/WMS/src/main/java/com/ken/wms/security/filter/AnyOfRolesAuthorizationFilter.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/filter/AnyOfRolesAuthorizationFilter.java rename to WMS/src/main/java/com/ken/wms/security/filter/AnyOfRolesAuthorizationFilter.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/filter/ExtendFormAuthenticationFilter.java b/WMS/src/main/java/com/ken/wms/security/filter/ExtendFormAuthenticationFilter.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/filter/ExtendFormAuthenticationFilter.java rename to WMS/src/main/java/com/ken/wms/security/filter/ExtendFormAuthenticationFilter.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/filter/KickoutSessionControlFilter.java b/WMS/src/main/java/com/ken/wms/security/filter/KickoutSessionControlFilter.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/filter/KickoutSessionControlFilter.java rename to WMS/src/main/java/com/ken/wms/security/filter/KickoutSessionControlFilter.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/listener/SessionListener.java b/WMS/src/main/java/com/ken/wms/security/listener/SessionListener.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/listener/SessionListener.java rename to WMS/src/main/java/com/ken/wms/security/listener/SessionListener.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/realms/UserAuthorizingRealm.java b/WMS/src/main/java/com/ken/wms/security/realms/UserAuthorizingRealm.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/realms/UserAuthorizingRealm.java rename to WMS/src/main/java/com/ken/wms/security/realms/UserAuthorizingRealm.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/FilterChainDefinitionMapBuilder.java b/WMS/src/main/java/com/ken/wms/security/service/FilterChainDefinitionMapBuilder.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/FilterChainDefinitionMapBuilder.java rename to WMS/src/main/java/com/ken/wms/security/service/FilterChainDefinitionMapBuilder.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/Impl/AccountServiceImpl.java b/WMS/src/main/java/com/ken/wms/security/service/Impl/AccountServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/Impl/AccountServiceImpl.java rename to WMS/src/main/java/com/ken/wms/security/service/Impl/AccountServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/Impl/UserInfoServiceImpl.java b/WMS/src/main/java/com/ken/wms/security/service/Impl/UserInfoServiceImpl.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/Impl/UserInfoServiceImpl.java rename to WMS/src/main/java/com/ken/wms/security/service/Impl/UserInfoServiceImpl.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/Interface/AccountService.java b/WMS/src/main/java/com/ken/wms/security/service/Interface/AccountService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/Interface/AccountService.java rename to WMS/src/main/java/com/ken/wms/security/service/Interface/AccountService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/Interface/UserInfoService.java b/WMS/src/main/java/com/ken/wms/security/service/Interface/UserInfoService.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/service/Interface/UserInfoService.java rename to WMS/src/main/java/com/ken/wms/security/service/Interface/UserInfoService.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/util/CaptchaGenerator.java b/WMS/src/main/java/com/ken/wms/security/util/CaptchaGenerator.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/util/CaptchaGenerator.java rename to WMS/src/main/java/com/ken/wms/security/util/CaptchaGenerator.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/util/MD5Util.java b/WMS/src/main/java/com/ken/wms/security/util/MD5Util.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/security/util/MD5Util.java rename to WMS/src/main/java/com/ken/wms/security/util/MD5Util.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/GlobalExceptionHandler.java b/WMS/src/main/java/com/ken/wms/util/GlobalExceptionHandler.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/GlobalExceptionHandler.java rename to WMS/src/main/java/com/ken/wms/util/GlobalExceptionHandler.java diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java b/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java similarity index 99% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java rename to WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java index f658e6c..f10648c 100644 --- a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java +++ b/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java @@ -3,7 +3,7 @@ package com.ken.wms.util.aop; import org.aspectj.lang.JoinPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +///RHY /** * Service层日志处理 diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java b/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java similarity index 98% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java rename to WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java index 682f1c5..3c57031 100644 --- a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java +++ b/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java @@ -1,7 +1,7 @@ package com.ken.wms.util.aop; import java.lang.annotation.*; - +//RHY /** * 用户操作注解 * 用于标注用户操作的方法名称 diff --git a/warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/aop/UserOperationLogging.java b/WMS/src/main/java/com/ken/wms/util/aop/UserOperationLogging.java similarity index 100% rename from warehouseManager-developer/WMS/src/main/java/com/ken/wms/util/aop/UserOperationLogging.java rename to WMS/src/main/java/com/ken/wms/util/aop/UserOperationLogging.java diff --git a/warehouseManager-developer/WMS/src/main/resources/config/DBConfig.properties b/WMS/src/main/resources/config/DBConfig.properties similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/DBConfig.properties rename to WMS/src/main/resources/config/DBConfig.properties diff --git a/warehouseManager-developer/WMS/src/main/resources/config/EJConvertor.xsd b/WMS/src/main/resources/config/EJConvertor.xsd similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/EJConvertor.xsd rename to WMS/src/main/resources/config/EJConvertor.xsd diff --git a/warehouseManager-developer/WMS/src/main/resources/config/EJConvertorConfig.xml b/WMS/src/main/resources/config/EJConvertorConfig.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/EJConvertorConfig.xml rename to WMS/src/main/resources/config/EJConvertorConfig.xml diff --git a/warehouseManager-developer/WMS/src/main/resources/config/MyBatisConfiguration.xml b/WMS/src/main/resources/config/MyBatisConfiguration.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/MyBatisConfiguration.xml rename to WMS/src/main/resources/config/MyBatisConfiguration.xml diff --git a/warehouseManager-developer/WMS/src/main/resources/config/ShiroConfiguration.xml b/WMS/src/main/resources/config/ShiroConfiguration.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/ShiroConfiguration.xml rename to WMS/src/main/resources/config/ShiroConfiguration.xml diff --git a/warehouseManager-developer/WMS/src/main/resources/config/SpringContextConfiguration.xml b/WMS/src/main/resources/config/SpringContextConfiguration.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/SpringContextConfiguration.xml rename to WMS/src/main/resources/config/SpringContextConfiguration.xml diff --git a/warehouseManager-developer/WMS/src/main/resources/config/SpringMVCConfiguration.xml b/WMS/src/main/resources/config/SpringMVCConfiguration.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/SpringMVCConfiguration.xml rename to WMS/src/main/resources/config/SpringMVCConfiguration.xml diff --git a/warehouseManager-developer/WMS/src/main/resources/config/ehcache.xml b/WMS/src/main/resources/config/ehcache.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/ehcache.xml rename to WMS/src/main/resources/config/ehcache.xml diff --git a/warehouseManager-developer/WMS/src/main/resources/config/log4j.properties b/WMS/src/main/resources/config/log4j.properties similarity index 100% rename from warehouseManager-developer/WMS/src/main/resources/config/log4j.properties rename to WMS/src/main/resources/config/log4j.properties diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/customerInfo.xlsx b/WMS/src/main/webapp/WEB-INF/download/customerInfo.xlsx similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/customerInfo.xlsx rename to WMS/src/main/webapp/WEB-INF/download/customerInfo.xlsx diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/goodsInfo.xlsx b/WMS/src/main/webapp/WEB-INF/download/goodsInfo.xlsx similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/goodsInfo.xlsx rename to WMS/src/main/webapp/WEB-INF/download/goodsInfo.xlsx diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/repositoryAdminInfo.xlsx b/WMS/src/main/webapp/WEB-INF/download/repositoryAdminInfo.xlsx similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/repositoryAdminInfo.xlsx rename to WMS/src/main/webapp/WEB-INF/download/repositoryAdminInfo.xlsx diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/repositoryInfo.xlsx b/WMS/src/main/webapp/WEB-INF/download/repositoryInfo.xlsx similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/repositoryInfo.xlsx rename to WMS/src/main/webapp/WEB-INF/download/repositoryInfo.xlsx diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/storageRecord.xlsx b/WMS/src/main/webapp/WEB-INF/download/storageRecord.xlsx similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/storageRecord.xlsx rename to WMS/src/main/webapp/WEB-INF/download/storageRecord.xlsx diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/supplierInfo.xlsx b/WMS/src/main/webapp/WEB-INF/download/supplierInfo.xlsx similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/download/supplierInfo.xlsx rename to WMS/src/main/webapp/WEB-INF/download/supplierInfo.xlsx diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/jsp/login.jsp b/WMS/src/main/webapp/WEB-INF/jsp/login.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/jsp/login.jsp rename to WMS/src/main/webapp/WEB-INF/jsp/login.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/jsp/mainPage.jsp b/WMS/src/main/webapp/WEB-INF/jsp/mainPage.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/jsp/mainPage.jsp rename to WMS/src/main/webapp/WEB-INF/jsp/mainPage.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/WEB-INF/web.xml b/WMS/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/WEB-INF/web.xml rename to WMS/src/main/webapp/WEB-INF/web.xml diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-datetimepicker.min.css b/WMS/src/main/webapp/css/bootstrap-datetimepicker.min.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-datetimepicker.min.css rename to WMS/src/main/webapp/css/bootstrap-datetimepicker.min.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-table.css b/WMS/src/main/webapp/css/bootstrap-table.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-table.css rename to WMS/src/main/webapp/css/bootstrap-table.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-theme.css b/WMS/src/main/webapp/css/bootstrap-theme.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-theme.css rename to WMS/src/main/webapp/css/bootstrap-theme.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-theme.css.map b/WMS/src/main/webapp/css/bootstrap-theme.css.map similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-theme.css.map rename to WMS/src/main/webapp/css/bootstrap-theme.css.map diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-theme.min.css b/WMS/src/main/webapp/css/bootstrap-theme.min.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrap-theme.min.css rename to WMS/src/main/webapp/css/bootstrap-theme.min.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrap.css b/WMS/src/main/webapp/css/bootstrap.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrap.css rename to WMS/src/main/webapp/css/bootstrap.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrap.css.map b/WMS/src/main/webapp/css/bootstrap.css.map similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrap.css.map rename to WMS/src/main/webapp/css/bootstrap.css.map diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrap.min.css b/WMS/src/main/webapp/css/bootstrap.min.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrap.min.css rename to WMS/src/main/webapp/css/bootstrap.min.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/bootstrapValidator.min.css b/WMS/src/main/webapp/css/bootstrapValidator.min.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/bootstrapValidator.min.css rename to WMS/src/main/webapp/css/bootstrapValidator.min.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/jquery-ui.css b/WMS/src/main/webapp/css/jquery-ui.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/jquery-ui.css rename to WMS/src/main/webapp/css/jquery-ui.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/jquery.mloading.css b/WMS/src/main/webapp/css/jquery.mloading.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/jquery.mloading.css rename to WMS/src/main/webapp/css/jquery.mloading.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/mainPage.css b/WMS/src/main/webapp/css/mainPage.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/mainPage.css rename to WMS/src/main/webapp/css/mainPage.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/css/model/login/login.css b/WMS/src/main/webapp/css/model/login/login.css similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/css/model/login/login.css rename to WMS/src/main/webapp/css/model/login/login.css diff --git a/warehouseManager-developer/WMS/src/main/webapp/errorPage/404Error.html b/WMS/src/main/webapp/errorPage/404Error.html similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/errorPage/404Error.html rename to WMS/src/main/webapp/errorPage/404Error.html diff --git a/warehouseManager-developer/WMS/src/main/webapp/errorPage/500Error.html b/WMS/src/main/webapp/errorPage/500Error.html similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/errorPage/500Error.html rename to WMS/src/main/webapp/errorPage/500Error.html diff --git a/warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.eot b/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.eot rename to WMS/src/main/webapp/fonts/glyphicons-halflings-regular.eot diff --git a/warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.svg b/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.svg rename to WMS/src/main/webapp/fonts/glyphicons-halflings-regular.svg diff --git a/warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.ttf b/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.ttf rename to WMS/src/main/webapp/fonts/glyphicons-halflings-regular.ttf diff --git a/warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff b/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff rename to WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff diff --git a/warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 b/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 rename to WMS/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/ajaxfileupload.js b/WMS/src/main/webapp/js/ajaxfileupload.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/ajaxfileupload.js rename to WMS/src/main/webapp/js/ajaxfileupload.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/bootstrap-datetimepicker.min.js b/WMS/src/main/webapp/js/bootstrap-datetimepicker.min.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/bootstrap-datetimepicker.min.js rename to WMS/src/main/webapp/js/bootstrap-datetimepicker.min.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/bootstrap-datetimepicker.zh-CN.js b/WMS/src/main/webapp/js/bootstrap-datetimepicker.zh-CN.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/bootstrap-datetimepicker.zh-CN.js rename to WMS/src/main/webapp/js/bootstrap-datetimepicker.zh-CN.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/bootstrap-table-zh-CN.min.js b/WMS/src/main/webapp/js/bootstrap-table-zh-CN.min.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/bootstrap-table-zh-CN.min.js rename to WMS/src/main/webapp/js/bootstrap-table-zh-CN.min.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/bootstrap-table.min.js b/WMS/src/main/webapp/js/bootstrap-table.min.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/bootstrap-table.min.js rename to WMS/src/main/webapp/js/bootstrap-table.min.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/bootstrap.js b/WMS/src/main/webapp/js/bootstrap.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/bootstrap.js rename to WMS/src/main/webapp/js/bootstrap.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/bootstrap.min.js b/WMS/src/main/webapp/js/bootstrap.min.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/bootstrap.min.js rename to WMS/src/main/webapp/js/bootstrap.min.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/bootstrapValidator.min.js b/WMS/src/main/webapp/js/bootstrapValidator.min.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/bootstrapValidator.min.js rename to WMS/src/main/webapp/js/bootstrapValidator.min.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/jquery-2.2.3.min.js b/WMS/src/main/webapp/js/jquery-2.2.3.min.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/jquery-2.2.3.min.js rename to WMS/src/main/webapp/js/jquery-2.2.3.min.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/jquery-ui.min.js b/WMS/src/main/webapp/js/jquery-ui.min.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/jquery-ui.min.js rename to WMS/src/main/webapp/js/jquery-ui.min.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/jquery.md5.js b/WMS/src/main/webapp/js/jquery.md5.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/jquery.md5.js rename to WMS/src/main/webapp/js/jquery.md5.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/jquery.mloading.js b/WMS/src/main/webapp/js/jquery.mloading.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/jquery.mloading.js rename to WMS/src/main/webapp/js/jquery.mloading.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/mainPage.js b/WMS/src/main/webapp/js/mainPage.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/mainPage.js rename to WMS/src/main/webapp/js/mainPage.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/npm.js b/WMS/src/main/webapp/js/npm.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/npm.js rename to WMS/src/main/webapp/js/npm.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/js/zh_CN.js b/WMS/src/main/webapp/js/zh_CN.js similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/js/zh_CN.js rename to WMS/src/main/webapp/js/zh_CN.js diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/icons/error-icon.png b/WMS/src/main/webapp/media/icons/error-icon.png similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/icons/error-icon.png rename to WMS/src/main/webapp/media/icons/error-icon.png diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/icons/stock_in-512.png b/WMS/src/main/webapp/media/icons/stock_in-512.png similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/icons/stock_in-512.png rename to WMS/src/main/webapp/media/icons/stock_in-512.png diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/icons/stock_out-512.png b/WMS/src/main/webapp/media/icons/stock_out-512.png similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/icons/stock_out-512.png rename to WMS/src/main/webapp/media/icons/stock_out-512.png diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/icons/stock_search-512.png b/WMS/src/main/webapp/media/icons/stock_search-512.png similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/icons/stock_search-512.png rename to WMS/src/main/webapp/media/icons/stock_search-512.png diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/icons/success-icon.png b/WMS/src/main/webapp/media/icons/success-icon.png similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/icons/success-icon.png rename to WMS/src/main/webapp/media/icons/success-icon.png diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/icons/warning-icon.png b/WMS/src/main/webapp/media/icons/warning-icon.png similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/icons/warning-icon.png rename to WMS/src/main/webapp/media/icons/warning-icon.png diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/images/404.jpg b/WMS/src/main/webapp/media/images/404.jpg similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/images/404.jpg rename to WMS/src/main/webapp/media/images/404.jpg diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/images/500.jpg b/WMS/src/main/webapp/media/images/500.jpg similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/images/500.jpg rename to WMS/src/main/webapp/media/images/500.jpg diff --git a/warehouseManager-developer/WMS/src/main/webapp/media/images/backgroundPic.png b/WMS/src/main/webapp/media/images/backgroundPic.png similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/media/images/backgroundPic.png rename to WMS/src/main/webapp/media/images/backgroundPic.png diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/accessRecordManagement.jsp b/WMS/src/main/webapp/pagecomponent/accessRecordManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/accessRecordManagement.jsp rename to WMS/src/main/webapp/pagecomponent/accessRecordManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/customerManagement.jsp b/WMS/src/main/webapp/pagecomponent/customerManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/customerManagement.jsp rename to WMS/src/main/webapp/pagecomponent/customerManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/goodsManagement.jsp b/WMS/src/main/webapp/pagecomponent/goodsManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/goodsManagement.jsp rename to WMS/src/main/webapp/pagecomponent/goodsManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/passwordModification.jsp b/WMS/src/main/webapp/pagecomponent/passwordModification.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/passwordModification.jsp rename to WMS/src/main/webapp/pagecomponent/passwordModification.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/repositoryAdminManagement.jsp b/WMS/src/main/webapp/pagecomponent/repositoryAdminManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/repositoryAdminManagement.jsp rename to WMS/src/main/webapp/pagecomponent/repositoryAdminManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/repositoryManagement.jsp b/WMS/src/main/webapp/pagecomponent/repositoryManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/repositoryManagement.jsp rename to WMS/src/main/webapp/pagecomponent/repositoryManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stock-inManagement.jsp b/WMS/src/main/webapp/pagecomponent/stock-inManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stock-inManagement.jsp rename to WMS/src/main/webapp/pagecomponent/stock-inManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stock-inManagementCommon.jsp b/WMS/src/main/webapp/pagecomponent/stock-inManagementCommon.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stock-inManagementCommon.jsp rename to WMS/src/main/webapp/pagecomponent/stock-inManagementCommon.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stock-outManagement.jsp b/WMS/src/main/webapp/pagecomponent/stock-outManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stock-outManagement.jsp rename to WMS/src/main/webapp/pagecomponent/stock-outManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stock-outManagementCommon.jsp b/WMS/src/main/webapp/pagecomponent/stock-outManagementCommon.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stock-outManagementCommon.jsp rename to WMS/src/main/webapp/pagecomponent/stock-outManagementCommon.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stockRecordManagement.jsp b/WMS/src/main/webapp/pagecomponent/stockRecordManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/stockRecordManagement.jsp rename to WMS/src/main/webapp/pagecomponent/stockRecordManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/storageManagement.jsp b/WMS/src/main/webapp/pagecomponent/storageManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/storageManagement.jsp rename to WMS/src/main/webapp/pagecomponent/storageManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/storageManagementCommon.jsp b/WMS/src/main/webapp/pagecomponent/storageManagementCommon.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/storageManagementCommon.jsp rename to WMS/src/main/webapp/pagecomponent/storageManagementCommon.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/supplierManagement.jsp b/WMS/src/main/webapp/pagecomponent/supplierManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/supplierManagement.jsp rename to WMS/src/main/webapp/pagecomponent/supplierManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/userOperationRecorderManagement.jsp b/WMS/src/main/webapp/pagecomponent/userOperationRecorderManagement.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/userOperationRecorderManagement.jsp rename to WMS/src/main/webapp/pagecomponent/userOperationRecorderManagement.jsp diff --git a/warehouseManager-developer/WMS/src/main/webapp/pagecomponent/welcomePage.jsp b/WMS/src/main/webapp/pagecomponent/welcomePage.jsp similarity index 100% rename from warehouseManager-developer/WMS/src/main/webapp/pagecomponent/welcomePage.jsp rename to WMS/src/main/webapp/pagecomponent/welcomePage.jsp diff --git a/warehouseManager-developer/WMS/src/test/java/com/ken/wms/MapperTest.java b/WMS/src/test/java/com/ken/wms/MapperTest.java similarity index 99% rename from warehouseManager-developer/WMS/src/test/java/com/ken/wms/MapperTest.java rename to WMS/src/test/java/com/ken/wms/MapperTest.java index 1c4f2bf..7937949 100644 --- a/warehouseManager-developer/WMS/src/test/java/com/ken/wms/MapperTest.java +++ b/WMS/src/test/java/com/ken/wms/MapperTest.java @@ -1,5 +1,5 @@ package com.ken.wms; - +//RHY import com.ken.wms.common.service.Interface.StockRecordManageService; import com.ken.wms.common.service.Interface.SystemLogService; import com.ken.wms.dao.AccessRecordMapper; diff --git a/warehouseManager-developer/WMS/src/test/java/com/ken/wms/MyTest.java b/WMS/src/test/java/com/ken/wms/MyTest.java similarity index 98% rename from warehouseManager-developer/WMS/src/test/java/com/ken/wms/MyTest.java rename to WMS/src/test/java/com/ken/wms/MyTest.java index 68eaa73..2df0c08 100644 --- a/warehouseManager-developer/WMS/src/test/java/com/ken/wms/MyTest.java +++ b/WMS/src/test/java/com/ken/wms/MyTest.java @@ -1,5 +1,5 @@ package com.ken.wms; - +///RHY import com.ken.wms.security.util.MD5Util; public class MyTest { diff --git a/cheshi/chehsi1.txt b/cheshi/chehsi1.txt new file mode 100644 index 0000000..e69de29 diff --git a/cheshi/chehsi2.txt b/cheshi/chehsi2.txt new file mode 100644 index 0000000..e69de29 diff --git a/ck.md b/ck.md new file mode 100644 index 0000000..84f3895 --- /dev/null +++ b/ck.md @@ -0,0 +1,44 @@ +package com.ken.wms.common.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +/// RHY +/** +* 处理文件下载请求 + Spring MVC控制器类，用于处理文件下载请求 + @PathVariable获取路径中的文件名 + HttpServletRequest和HttpServletResponse用于处理请求和响应 + */ + @Controller + @RequestMapping("/commons/fileSource")//指定了基础路径 + public class FileSourceHandler { + + @RequestMapping(value = "download/{fileName:.+}", method = RequestMethod.GET)//处理GET请求路径中包含文件名参数，使用正则表达式.+匹配带扩展名的文件名 + public void fileDownload(@PathVariable("fileName") String fileName, HttpServletRequest request, + HttpServletResponse response) throws IOException { + + if (fileName == null) + return; + + // 获取文件 + ServletContext context = request.getServletContext(); + String directory = context.getRealPath("/WEB-INF/download"); + Path file = Paths.get(directory, fileName); + if (Files.exists(file)) { + // 设置响应头 + response.addHeader("Content-Disposition", "attachment;filename=" + file.getFileName()); + Files.copy(file, response.getOutputStream()); + response.getOutputStream().flush(); + } + } + } diff --git a/warehouseManager-developer/untitled1/.gitignore b/untitled1/.gitignore similarity index 100% rename from warehouseManager-developer/untitled1/.gitignore rename to untitled1/.gitignore diff --git a/warehouseManager-developer/.idea/.gitignore b/untitled1/.idea/.gitignore similarity index 100% rename from warehouseManager-developer/.idea/.gitignore rename to untitled1/.idea/.gitignore diff --git a/warehouseManager-developer/untitled1/.idea/misc.xml b/untitled1/.idea/misc.xml similarity index 100% rename from warehouseManager-developer/untitled1/.idea/misc.xml rename to untitled1/.idea/misc.xml diff --git a/warehouseManager-developer/untitled1/pom.xml b/untitled1/pom.xml similarity index 100% rename from warehouseManager-developer/untitled1/pom.xml rename to untitled1/pom.xml diff --git a/warehouseManager-developer/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/warehouseManager-developer/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md deleted file mode 100644 index 534be43..0000000 --- a/warehouseManager-developer/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md +++ /dev/null @@ -1,15 +0,0 @@ -### 该Pull Request关联的Issue - - -### 修改描述 - - - -### 测试用例 - - - -### 修复效果的截屏 - - - diff --git a/warehouseManager-developer/.idea/dataSources.xml b/warehouseManager-developer/.idea/dataSources.xml deleted file mode 100644 index 5983d33..0000000 --- a/warehouseManager-developer/.idea/dataSources.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://localhost:3306 - - - - - - - $ProjectFileDir$ - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://localhost:3306/wms_db - - - - - - - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/warehouseManager-developer/.idea/libraries/WMS.xml b/warehouseManager-developer/.idea/libraries/WMS.xml deleted file mode 100644 index 0e14349..0000000 --- a/warehouseManager-developer/.idea/libraries/WMS.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/warehouseManager-developer/.idea/misc.xml b/warehouseManager-developer/.idea/misc.xml deleted file mode 100644 index a289170..0000000 --- a/warehouseManager-developer/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/warehouseManager-developer/.idea/modules.xml b/warehouseManager-developer/.idea/modules.xml deleted file mode 100644 index fd14004..0000000 --- a/warehouseManager-developer/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/warehouseManager-developer/.idea/sqldialects.xml b/warehouseManager-developer/.idea/sqldialects.xml deleted file mode 100644 index 3404959..0000000 --- a/warehouseManager-developer/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/warehouseManager-developer/.idea/warehouseManager-developer.iml b/warehouseManager-developer/.idea/warehouseManager-developer.iml deleted file mode 100644 index 78fa7a4..0000000 --- a/warehouseManager-developer/.idea/warehouseManager-developer.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/warehouseManager-developer/.idea/webContexts.xml b/warehouseManager-developer/.idea/webContexts.xml deleted file mode 100644 index 5ce618f..0000000 --- a/warehouseManager-developer/.idea/webContexts.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/warehouseManager-developer/README.md b/warehouseManager-developer/README.md deleted file mode 100644 index 12eaf07..0000000 --- a/warehouseManager-developer/README.md +++ /dev/null @@ -1,112 +0,0 @@ -star -fork - -# 基于SSM框架的仓库管理系统 - - -## ✅ 分支说明 - -| 分支 | spring框架 | MySQL8.0 | MySQL5.7 | 登录验证码 | -|----|----------|----------|----------|----------| -| dev-springboot | springboot | ✅ | ✅ | ✅ | -| developer | springmvc | ✅ | ✅ | ✅ | -| 去登录验证码 | springmvc | ✅ | ✅ | ❎ | -| MySQL5.7 | springmvc | ❎ | ✅ | ✅ | - - -## ✅ 非常紧急的问题或功能定制可以关注公众号->发消息：仓库管理 - -> ![输入图片说明](qrcode_for_gh_cf005810de67_258.jpg) - -## 计划 -- [x] 录制idea启动系统演示视频（价值：很多初学者需要） -- [x] 数据库驱动兼容8.0，兼容MySQL5.7的旧代码放在分支mysql5.7（价值：应届毕业生80%以上默认用的MySQL8.0+） -- [x] springmvc迁移到springboot（价值：应届毕业生80%以上默认用的springboot框架），见【dev-springboot】分支 - -![输入图片说明](video/image.png) - - -## ⭕ 视频-IDEA导入+运行项目演示 - -> [基于SSM框架的仓库管理系统演示.mp4](/video/基于SSM框架的仓库管理系统演示.mp4) - -## 📋 功能 - -* 系统操作权限管理。系统提供基本的登入登出功能，同时系统包含两个角色：系统超级管理员和普通管理员，超级管理员具有最高的操作权限，而普通管理员仅具有最基本的操作权限，而且仅能操作自己被指派的仓库。 -* 请求URL鉴权。对于系统使用者登陆后进行操作发送请求的URL，后台会根据当前用户的角色判断是否拥有请求该URL的权限。 -* 基础数据信息管理。对包括：货物信息、供应商信息、客户信息、仓库信息在内的基础数据信息进行管理，提供的操作有：添加、删除、修改、条件查询、导出为Excel和到从Excel导入。 -* 仓库管理员管理。对仓库管理员信息CRUD操作，或者为指定的仓库管理员指派所管理的仓库。上述中的仓库管理员可以以普通管理员身份登陆到系统。 -* 库存信息管理。对库存信息的CRUD操作，导入导出操作，同时查询的时候可以根据仓库以及商品ID等信息进行多条件查询。 -* 基本仓库事务操作。执行货物的入库与出库操作。 -* 系统登陆日志查询。超级管理员可以查询某一用户在特定时间段内的系统登陆日志。 -* 系统操作日志查询。超级管理员可以查询某一用户在特定时间段内对系统进行操作的操作记录。、 -* 密码修改。 - - - -## ✳️ 使用到的框架和库 - -* Apache POI -* MyBatis -* Spring Framework -* Spring MVC -* Apache Shiro -* Ehcache -* Apache Commons -* Log4j -* Slf4j -* Jackson -* C3P0 -* Junit -* MySQL-Connector -* jQuery -* Bootstrap -## ✴️ 登陆系统方式 -用户ID : 1001 -密码 ：123456 -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/172938_7e1c90d9_736072.png "屏幕截图.png") -加密代码 -``` -// 用户密码（wms_user.USER_PASSWORD）加密规则 -String tempStr = MD5Util.MD5("123456");// 第一次对密码进行加密 -String encryptPassword = MD5Util.MD5(tempStr + "1001");// 第二次对密码进行加密 -//存入数据库的加密密码 -System.out.println(encryptPassword); -``` -新增用户默认密码为用户ID（比如新增一个用户ID为1012，密码也为1012） -## 📚 JDK版本 - -### jdk 1.8 - -## 📚 数据库版本 -### MySQL 8.0+ -查看版本号命令如下： -> MySQL> select version(); - -## ⭐ 数据库关系图 -![输入图片说明](https://gitee.com/uploads/images/2018/0412/194935_92258b3b_736072.png "Diagram 1.png") - -## 📚 部分截图 -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173158_70c3cba9_736072.png "WMS-截图1.PNG") -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173225_8869b802_736072.png "MWS-截图2.PNG") -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173239_39be69c7_736072.png "WMS-截图3.PNG") -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173247_db6a6bdf_736072.png "WMS-截图4.PNG") -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173256_8b7d7df4_736072.png "WMS-截图5.PNG") -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173311_53b058f8_736072.png "WMS-截图7.PNG") -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173321_f828f801_736072.png "WMS-截图8.PNG") -![输入图片说明](https://images.gitee.com/uploads/images/2020/0106/173328_41f84519_736072.png "WMS-截图9.PNG") - -## 📚 常见问题 -#### ①中文乱码 -![输入图片说明](image.png) -解决方式：数据库连接后面加上编码方式jdbc.url = jdbc:mysql:///192.168.X.X:3306\WMS_DB?useUnicode=true&characterEncoding=utf8 - - -## 👍 支持 - -- If the project is very helpful to you, you can buy the author a cup of coffee☕. -- 如果这个项目对您有帮助，可以请作者喝杯咖啡哟☕ - -|支付宝 | 微信| -| :--------: | :--------:| -| ![输入图片说明](%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20230225215404.jpg)|![输入图片说明](%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20230225215651.jpg) | \ No newline at end of file diff --git a/warehouseManager-developer/untitled1/.idea/.gitignore b/warehouseManager-developer/untitled1/.idea/.gitignore deleted file mode 100644 index 35410ca..0000000 --- a/warehouseManager-developer/untitled1/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml