diff --git a/.flattened-pom.xml b/.flattened-pom.xml index 190d617..1e7cd9b 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -7,12 +7,12 @@ continew-starter 2.9.0 - top.ysoft - ysoft-admin + top.wms + wms-admin 3.6.0-SNAPSHOT pom 园区管理系统 - https://github.com/ysoft-org/ysoft-admin + https://github.com/wms-org/wms-admin GNU LESSER GENERAL PUBLIC LICENSE @@ -20,11 +20,11 @@ - ysoft-webapi - ysoft-module-system - ysoft-plugin - ysoft-common - ysoft-extension + wms-webapi + wms-module-system + wms-plugin + wms-common + wms-extension 3.6.0-SNAPSHOT @@ -32,33 +32,33 @@ - top.ysoft - ysoft-webapi + top.wms + wms-webapi 3.6.0-SNAPSHOT - top.ysoft - ysoft-module-system + top.wms + wms-module-system 3.6.0-SNAPSHOT - top.ysoft - ysoft-common + top.wms + wms-common 3.6.0-SNAPSHOT - top.ysoft - ysoft-plugin-schedule + top.wms + wms-plugin-schedule 3.6.0-SNAPSHOT - top.ysoft - ysoft-plugin-open + top.wms + wms-plugin-open 3.6.0-SNAPSHOT - top.ysoft - ysoft-plugin-generator + top.wms + wms-plugin-generator 3.6.0-SNAPSHOT @@ -207,7 +207,7 @@ - Charles7c_ysoft-admin + Charles7c_wms-admin ${project.groupId}:${project.artifactId} https://sonarcloud.io charles7c diff --git a/CHANGELOG.md b/CHANGELOG.md index 131bd0a..e2ef40e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,545 +1,545 @@ -## [v3.5.0](https://github.com/ysoft-org/ysoft-admin/compare/v3.4.1...v3.5.0) (2025-03-05) +## [v3.5.0](https://github.com/wms-org/wms-admin/compare/v3.4.1...v3.5.0) (2025-03-05) ### ✨ 新特性 -* 【generator】生成预览支持批量 ([a7296a3](https://github.com/ysoft-org/ysoft-admin/commit/a7296a36278f68108a0513fe26b3cccd9af5244c)) -* 【generator】代码生成新增 Mapper.xml 模板 ([b519364](https://github.com/ysoft-org/ysoft-admin/commit/b51936445d36a76650d94225b3ecfa81b86e066c)) ([98569ae](https://github.com/ysoft-org/ysoft-admin/commit/98569ae20530a3c94cd1a071a29fae3c904761e3)) -* 🔥新增终端管理,重构认证体系,多端认证鉴权控制 ([Gitee#40](https://gitee.com/ysoft/ysoft-admin/pulls/40)) ([95f2617](https://github.com/ysoft-org/ysoft-admin/commit/95f2617a4c086e3e5113799fe213c24c42bfbd17)) ([c90e80e](https://github.com/ysoft-org/ysoft-admin/commit/c90e80e9d72eba173df586e7f12a0c9378c82ec9)) ([438615f](https://github.com/ysoft-org/ysoft-admin/commit/438615f87c5583890703c78c4e61aae36e3dab80)) ([229bd9b](https://github.com/ysoft-org/ysoft-admin/commit/229bd9becfda15cbcb049fd1e0842dbe04d7b135)) ([a305eac](https://github.com/ysoft-org/ysoft-admin/commit/a305eac96f766ad3a72051fe19f533f4fd64d304)) ([82cf439](https://github.com/ysoft-org/ysoft-admin/commit/82cf4390e8fdc73da1818dcc9a5dd0c7ff87db02)) ([5f68e84](https://github.com/ysoft-org/ysoft-admin/commit/5f68e84e7dbb5c2d0f793c72df76d69d326e574e)) -* 【generator】支持源项目内生成代码文件 ([GitHub#125](https://github.com/ysoft-org/ysoft-admin/pull/125)) ([653802e](https://github.com/ysoft-org/ysoft-admin/commit/653802efbe2debdbfd1fe5097dae7280e80f1e43)) -* 新增接口文档配置,支持显示 SaToken 权限码 ([Gitee#44](https://gitee.com/ysoft/ysoft-admin/pulls/44)) ([19c5dbd](https://github.com/ysoft-org/ysoft-admin/commit/19c5dbd2659264cfba59e2b1316420c39f82f731)) -* 新增NoHandlerFoundException、HttpRequestMethodNotSupportedException异常处理 ([Gitee#44](https://gitee.com/ysoft/ysoft-admin/pulls/44)) ([4efe025](https://github.com/ysoft-org/ysoft-admin/commit/4efe025b2e36c56162dc8fcbd05482b7ecc21e5f)) +* 【generator】生成预览支持批量 ([a7296a3](https://github.com/wms-org/wms-admin/commit/a7296a36278f68108a0513fe26b3cccd9af5244c)) +* 【generator】代码生成新增 Mapper.xml 模板 ([b519364](https://github.com/wms-org/wms-admin/commit/b51936445d36a76650d94225b3ecfa81b86e066c)) ([98569ae](https://github.com/wms-org/wms-admin/commit/98569ae20530a3c94cd1a071a29fae3c904761e3)) +* 🔥新增终端管理,重构认证体系,多端认证鉴权控制 ([Gitee#40](https://gitee.com/wms/wms-admin/pulls/40)) ([95f2617](https://github.com/wms-org/wms-admin/commit/95f2617a4c086e3e5113799fe213c24c42bfbd17)) ([c90e80e](https://github.com/wms-org/wms-admin/commit/c90e80e9d72eba173df586e7f12a0c9378c82ec9)) ([438615f](https://github.com/wms-org/wms-admin/commit/438615f87c5583890703c78c4e61aae36e3dab80)) ([229bd9b](https://github.com/wms-org/wms-admin/commit/229bd9becfda15cbcb049fd1e0842dbe04d7b135)) ([a305eac](https://github.com/wms-org/wms-admin/commit/a305eac96f766ad3a72051fe19f533f4fd64d304)) ([82cf439](https://github.com/wms-org/wms-admin/commit/82cf4390e8fdc73da1818dcc9a5dd0c7ff87db02)) ([5f68e84](https://github.com/wms-org/wms-admin/commit/5f68e84e7dbb5c2d0f793c72df76d69d326e574e)) +* 【generator】支持源项目内生成代码文件 ([GitHub#125](https://github.com/wms-org/wms-admin/pull/125)) ([653802e](https://github.com/wms-org/wms-admin/commit/653802efbe2debdbfd1fe5097dae7280e80f1e43)) +* 新增接口文档配置,支持显示 SaToken 权限码 ([Gitee#44](https://gitee.com/wms/wms-admin/pulls/44)) ([19c5dbd](https://github.com/wms-org/wms-admin/commit/19c5dbd2659264cfba59e2b1316420c39f82f731)) +* 新增NoHandlerFoundException、HttpRequestMethodNotSupportedException异常处理 ([Gitee#44](https://gitee.com/wms/wms-admin/pulls/44)) ([4efe025](https://github.com/wms-org/wms-admin/commit/4efe025b2e36c56162dc8fcbd05482b7ecc21e5f)) ### 💎 功能优化 -- 菜单路由为空时默认返回空列表而非 null ([43cc429](https://github.com/ysoft-org/ysoft-admin/commit/43cc429234150e185a697b6dbc340bd966bf6133)) -- 移除初始数据脚本 update_user、update_time 字段赋值(此优化无需跟进升级) ([9d0e1fc](https://github.com/ysoft-org/ysoft-admin/commit/9d0e1fc8e642c5be46d20173fd573582ad54d5e6)) -- 【generator】消除前端红色报警、更新表格创建者和更新者字段索引,自定义单选框数据 ([GitHub#108](https://github.com/ysoft-org/ysoft-admin/pull/108)) ([4c8ebf2](https://github.com/ysoft-org/ysoft-admin/commit/4c8ebf2d0f3e65737f6a55c06eb1ff2d31273505)) -- 更新 nginx.conf 部署配置文件 ([4920d7b](https://github.com/ysoft-org/ysoft-admin/commit/4920d7b730c2e975c4a50a5b8b8172f5365509c5)) -- 调整 starter 内的 BaseResp、BaseDetailResp 到 admin 项目 ([144251b](https://github.com/ysoft-org/ysoft-admin/commit/144251b21ec0d79927164a705f3c846aace53ca1)) -- 调整 starter 内的 CommonUserService、ContainerPool 到 admin 项目 ([f1d0b49](https://github.com/ysoft-org/ysoft-admin/commit/f1d0b491b14d806fbe1d0011cdadea64336fe3b0)) -- 优化登录日志描述 ([a24136d](https://github.com/ysoft-org/ysoft-admin/commit/a24136d6fe92bcb055c965600caef399df563361)) -- 丰富部门、角色、用户初始测试数据,方便开发场景 ([b5bbdb2](https://github.com/ysoft-org/ysoft-admin/commit/b5bbdb27e6e002d52b5a1894e2bf8e24e6f963e8)) -- 调整 starter 内的 BaseDO、BaseCreateDO、BaseUpdateDO 到 admin 项目 ([498e680](https://github.com/ysoft-org/ysoft-admin/commit/498e680672df00be9e8f9546f2010fcc54faab23)) -- 🔥重构角色管理,更新权限扁平化 ([f6535ef](https://github.com/ysoft-org/ysoft-admin/commit/f6535ef7a35794147d8094eed71a4789c06f3db8)) ([0a62f81](https://github.com/ysoft-org/ysoft-admin/commit/0a62f81ad7c1f7b086379059fe780a609e5d575b)) ([144cfa2](https://github.com/ysoft-org/ysoft-admin/commit/144cfa27ce944dc5b78d2d26466cd149b8ca7959)) -- 优化任务调度服务配置,允许用户名密码使用环境变量 ([GitHub#129](https://github.com/ysoft-org/ysoft-admin/pull/129)) ([0e65190](https://github.com/ysoft-org/ysoft-admin/commit/0e651902f267feb8b4997d066285d979429bd56f)) -- 优化系统配置 SQL 数据脚本 ([d336911](https://github.com/ysoft-org/ysoft-admin/commit/d3369119e090b62468fda38e1dfb52ddb5dc7df3)) -- 调整日志 module 字段长度 50 => 100 ([65941c1](https://github.com/ysoft-org/ysoft-admin/commit/65941c1ee4020e2f9b4fc07f15c249b9d0d7e851)) -- 🔥重构存储管理,新增设置默认存储、修改状态接口 ([37d6efb](https://github.com/ysoft-org/ysoft-admin/commit/37d6efb70e5bcfddc8a4ca6becaf440ab05785fb)) +- 菜单路由为空时默认返回空列表而非 null ([43cc429](https://github.com/wms-org/wms-admin/commit/43cc429234150e185a697b6dbc340bd966bf6133)) +- 移除初始数据脚本 update_user、update_time 字段赋值(此优化无需跟进升级) ([9d0e1fc](https://github.com/wms-org/wms-admin/commit/9d0e1fc8e642c5be46d20173fd573582ad54d5e6)) +- 【generator】消除前端红色报警、更新表格创建者和更新者字段索引,自定义单选框数据 ([GitHub#108](https://github.com/wms-org/wms-admin/pull/108)) ([4c8ebf2](https://github.com/wms-org/wms-admin/commit/4c8ebf2d0f3e65737f6a55c06eb1ff2d31273505)) +- 更新 nginx.conf 部署配置文件 ([4920d7b](https://github.com/wms-org/wms-admin/commit/4920d7b730c2e975c4a50a5b8b8172f5365509c5)) +- 调整 starter 内的 BaseResp、BaseDetailResp 到 admin 项目 ([144251b](https://github.com/wms-org/wms-admin/commit/144251b21ec0d79927164a705f3c846aace53ca1)) +- 调整 starter 内的 CommonUserService、ContainerPool 到 admin 项目 ([f1d0b49](https://github.com/wms-org/wms-admin/commit/f1d0b491b14d806fbe1d0011cdadea64336fe3b0)) +- 优化登录日志描述 ([a24136d](https://github.com/wms-org/wms-admin/commit/a24136d6fe92bcb055c965600caef399df563361)) +- 丰富部门、角色、用户初始测试数据,方便开发场景 ([b5bbdb2](https://github.com/wms-org/wms-admin/commit/b5bbdb27e6e002d52b5a1894e2bf8e24e6f963e8)) +- 调整 starter 内的 BaseDO、BaseCreateDO、BaseUpdateDO 到 admin 项目 ([498e680](https://github.com/wms-org/wms-admin/commit/498e680672df00be9e8f9546f2010fcc54faab23)) +- 🔥重构角色管理,更新权限扁平化 ([f6535ef](https://github.com/wms-org/wms-admin/commit/f6535ef7a35794147d8094eed71a4789c06f3db8)) ([0a62f81](https://github.com/wms-org/wms-admin/commit/0a62f81ad7c1f7b086379059fe780a609e5d575b)) ([144cfa2](https://github.com/wms-org/wms-admin/commit/144cfa27ce944dc5b78d2d26466cd149b8ca7959)) +- 优化任务调度服务配置,允许用户名密码使用环境变量 ([GitHub#129](https://github.com/wms-org/wms-admin/pull/129)) ([0e65190](https://github.com/wms-org/wms-admin/commit/0e651902f267feb8b4997d066285d979429bd56f)) +- 优化系统配置 SQL 数据脚本 ([d336911](https://github.com/wms-org/wms-admin/commit/d3369119e090b62468fda38e1dfb52ddb5dc7df3)) +- 调整日志 module 字段长度 50 => 100 ([65941c1](https://github.com/wms-org/wms-admin/commit/65941c1ee4020e2f9b4fc07f15c249b9d0d7e851)) +- 🔥重构存储管理,新增设置默认存储、修改状态接口 ([37d6efb](https://github.com/wms-org/wms-admin/commit/37d6efb70e5bcfddc8a4ca6becaf440ab05785fb)) ### 🐛 问题修复 -- 【generator】修复 PostgreSQL 菜单 SQL 脚本模板错误 ([GitHub#107](https://github.com/ysoft-org/ysoft-admin/pull/107)) ([af403d0](https://github.com/ysoft-org/ysoft-admin/commit/af403d055af1c186d7b5976cff894e9dd2afcc01)) -- 【generator】生成菜单脚本添加ID ([GitHub#109](https://github.com/ysoft-org/ysoft-admin/pull/109)) ([9ebecdc](https://github.com/ysoft-org/ysoft-admin/commit/9ebecdc1935a99f15ece4e2c933175d9919e9825)) -- 【generator】前端页面生成表单类型 ([GitHub#110](https://github.com/ysoft-org/ysoft-admin/pull/110)) ([75d2662](https://github.com/ysoft-org/ysoft-admin/commit/75d26623652d4813643cea9a7c3f821e44edc885)) -- 完善部分 in 查询前的空集合处理 ([899354a](https://github.com/ysoft-org/ysoft-admin/commit/899354a6e7239ed00f81155e8ed5f2760b191480)) -- 修复公告通知范围字段类型错误 ([fdd0617](https://github.com/ysoft-org/ysoft-admin/commit/fdd0617a2832221bb017d2e17dc5fb82af862707)) -- 修复通知公告分页 通知范围字段类型回显错误 ([160ab8d](https://github.com/ysoft-org/ysoft-admin/commit/160ab8d38bb68801ed6efe0ceeb4ccb4c3f4fba3)) -- 🔥修复 PageResp 手动分页计算错误 ([6bcff72](https://github.com/ysoft-org/ysoft-admin/commit/6bcff7244f0a37474c39509dfed44d3cf630d898)) -- 修复导入用户部门名称校验注解使用错误 ([Gitee#41](https://gitee.com/ysoft/ysoft-admin/pulls/41)) ([c870014](https://github.com/ysoft-org/ysoft-admin/commit/c870014730a47d9a9b567416b2f6736049a25125)) -- 修复 PostgreSQL Liquibase 数据脚本缺失 ([8c53700](https://github.com/ysoft-org/ysoft-admin/commit/8c53700cfd8ea20ccece1867161d2315d5346d9b)) -- 修复新增用户时日志记录获取 description 为空的问题 ([91924ac](https://github.com/ysoft-org/ysoft-admin/commit/91924acaa15658db88c387f81ff723ca043cd1f1)) -- 调整 PostgreSQL 连接配置以消除部分类型使用报错 ([7e3257b](https://github.com/ysoft-org/ysoft-admin/commit/7e3257bd6d3965622ba53a906fd8b27e5209e67f)) -- 修复部分过期配置信息 ([3fb9922](https://github.com/ysoft-org/ysoft-admin/commit/3fb9922b524a5c1a40de5bd011c99c9863032f7a)) -- 修复邮箱登录,手机号登录对应日志没有记录操作人问题 ([Gitee#42](https://gitee.com/ysoft/ysoft-admin/pulls/42)) ([aab3931](https://github.com/ysoft-org/ysoft-admin/commit/aab3931f3078c1b3468c5f06e1f133862f947d7e)) -- mysql 8.x failing to connect to the database correctly issue ([GitHub#128](https://github.com/ysoft-org/ysoft-admin/pull/128)) ([4caada8](https://github.com/ysoft-org/ysoft-admin/commit/4caada8c64c1f6646f312a0038338396ae860305)) +- 【generator】修复 PostgreSQL 菜单 SQL 脚本模板错误 ([GitHub#107](https://github.com/wms-org/wms-admin/pull/107)) ([af403d0](https://github.com/wms-org/wms-admin/commit/af403d055af1c186d7b5976cff894e9dd2afcc01)) +- 【generator】生成菜单脚本添加ID ([GitHub#109](https://github.com/wms-org/wms-admin/pull/109)) ([9ebecdc](https://github.com/wms-org/wms-admin/commit/9ebecdc1935a99f15ece4e2c933175d9919e9825)) +- 【generator】前端页面生成表单类型 ([GitHub#110](https://github.com/wms-org/wms-admin/pull/110)) ([75d2662](https://github.com/wms-org/wms-admin/commit/75d26623652d4813643cea9a7c3f821e44edc885)) +- 完善部分 in 查询前的空集合处理 ([899354a](https://github.com/wms-org/wms-admin/commit/899354a6e7239ed00f81155e8ed5f2760b191480)) +- 修复公告通知范围字段类型错误 ([fdd0617](https://github.com/wms-org/wms-admin/commit/fdd0617a2832221bb017d2e17dc5fb82af862707)) +- 修复通知公告分页 通知范围字段类型回显错误 ([160ab8d](https://github.com/wms-org/wms-admin/commit/160ab8d38bb68801ed6efe0ceeb4ccb4c3f4fba3)) +- 🔥修复 PageResp 手动分页计算错误 ([6bcff72](https://github.com/wms-org/wms-admin/commit/6bcff7244f0a37474c39509dfed44d3cf630d898)) +- 修复导入用户部门名称校验注解使用错误 ([Gitee#41](https://gitee.com/wms/wms-admin/pulls/41)) ([c870014](https://github.com/wms-org/wms-admin/commit/c870014730a47d9a9b567416b2f6736049a25125)) +- 修复 PostgreSQL Liquibase 数据脚本缺失 ([8c53700](https://github.com/wms-org/wms-admin/commit/8c53700cfd8ea20ccece1867161d2315d5346d9b)) +- 修复新增用户时日志记录获取 description 为空的问题 ([91924ac](https://github.com/wms-org/wms-admin/commit/91924acaa15658db88c387f81ff723ca043cd1f1)) +- 调整 PostgreSQL 连接配置以消除部分类型使用报错 ([7e3257b](https://github.com/wms-org/wms-admin/commit/7e3257bd6d3965622ba53a906fd8b27e5209e67f)) +- 修复部分过期配置信息 ([3fb9922](https://github.com/wms-org/wms-admin/commit/3fb9922b524a5c1a40de5bd011c99c9863032f7a)) +- 修复邮箱登录,手机号登录对应日志没有记录操作人问题 ([Gitee#42](https://gitee.com/wms/wms-admin/pulls/42)) ([aab3931](https://github.com/wms-org/wms-admin/commit/aab3931f3078c1b3468c5f06e1f133862f947d7e)) +- mysql 8.x failing to connect to the database correctly issue ([GitHub#128](https://github.com/wms-org/wms-admin/pull/128)) ([4caada8](https://github.com/wms-org/wms-admin/commit/4caada8c64c1f6646f312a0038338396ae860305)) ### 📦 依赖升级 -- 🔥ContiNew Starter 2.7.5 => 2.9.0 (更多特性及依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- 🔥ContiNew Starter 2.7.5 => 2.9.0 (更多特性及依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v3.4.1](https://github.com/ysoft-org/ysoft-admin/compare/v3.4.0...v3.4.1) (2024-12-08) +## [v3.4.1](https://github.com/wms-org/wms-admin/compare/v3.4.0...v3.4.1) (2024-12-08) ### ✨ 新特性 -* 新增验证码配置开关 ([e314346](https://github.com/ysoft-org/ysoft-admin/commit/e31434617e751f08d12ace7773bb3ba7bf132370)) ([61fe39d](https://github.com/ysoft-org/ysoft-admin/commit/61fe39d439b73c90cfeb989f8f4727ade6b5b3b2)) (Gitee#37@aiming317) +* 新增验证码配置开关 ([e314346](https://github.com/wms-org/wms-admin/commit/e31434617e751f08d12ace7773bb3ba7bf132370)) ([61fe39d](https://github.com/wms-org/wms-admin/commit/61fe39d439b73c90cfeb989f8f4727ade6b5b3b2)) (Gitee#37@aiming317) ### 💎 功能优化 -- 【open】优化 API 参数签名处理 ([22b3564](https://github.com/ysoft-org/ysoft-admin/commit/22b3564a2217dee739fc2172453b23600d82d6de)) -- 移除关于项目菜单初始数据(该菜单从动态路由调整为前端静态,且不再需要鉴权) ([88313c8](https://github.com/ysoft-org/ysoft-admin/commit/88313c8b2017e7ec620e5372f34bf5e431ce3e7f)) -- 优化代码生成菜单图标 ([9296985](https://github.com/ysoft-org/ysoft-admin/commit/9296985be0ab63ba54c63c71c011681f91aef7fb)) -- BaseServiceImpl 所在包调整 ([d7ae7b4](https://github.com/ysoft-org/ysoft-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) -- BaseController 改为在 Admin common 模块编写(重构权限校验 checkPermission 处理) ([d7ae7b4](https://github.com/ysoft-org/ysoft-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) -- CRUD ValidateGroup => CrudValidationGroup ([d7ae7b4](https://github.com/ysoft-org/ysoft-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) -- ValidateGroup => ValidationGroup ([d7ae7b4](https://github.com/ysoft-org/ysoft-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) +- 【open】优化 API 参数签名处理 ([22b3564](https://github.com/wms-org/wms-admin/commit/22b3564a2217dee739fc2172453b23600d82d6de)) +- 移除关于项目菜单初始数据(该菜单从动态路由调整为前端静态,且不再需要鉴权) ([88313c8](https://github.com/wms-org/wms-admin/commit/88313c8b2017e7ec620e5372f34bf5e431ce3e7f)) +- 优化代码生成菜单图标 ([9296985](https://github.com/wms-org/wms-admin/commit/9296985be0ab63ba54c63c71c011681f91aef7fb)) +- BaseServiceImpl 所在包调整 ([d7ae7b4](https://github.com/wms-org/wms-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) +- BaseController 改为在 Admin common 模块编写(重构权限校验 checkPermission 处理) ([d7ae7b4](https://github.com/wms-org/wms-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) +- CRUD ValidateGroup => CrudValidationGroup ([d7ae7b4](https://github.com/wms-org/wms-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) +- ValidateGroup => ValidationGroup ([d7ae7b4](https://github.com/wms-org/wms-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) ### 🐛 问题修复 -- 【generator】修复 columnSize 类型错误,兼容无注释字段配置 ([6b64ae3](https://github.com/ysoft-org/ysoft-admin/commit/6b64ae3e07a76d844eec4bd05302126cbcaca31b)) -- 补充能力开放模块接口文档配置 ([270fbf1](https://github.com/ysoft-org/ysoft-admin/commit/270fbf15af338a6ac3e6a686409eea8e9a32b6bf)) -- 修复文件管理删除文件异常或不成功的情况 ([361a412](https://github.com/ysoft-org/ysoft-admin/commit/361a41258e9fdece5ba681298f2839b013d6cfab)) (Gitee#35@kiki1373639299) -- 修复本地文件管理删除文件异常或不成功的情况 ([c7b58a0](https://github.com/ysoft-org/ysoft-admin/commit/c7b58a0fd167c566f6680c87cc455b71c42b8eda)) (Gitee#36@kiki1373639299) -- 修复 Query 查询数组范围报错 ([d7ae7b4](https://github.com/ysoft-org/ysoft-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) +- 【generator】修复 columnSize 类型错误,兼容无注释字段配置 ([6b64ae3](https://github.com/wms-org/wms-admin/commit/6b64ae3e07a76d844eec4bd05302126cbcaca31b)) +- 补充能力开放模块接口文档配置 ([270fbf1](https://github.com/wms-org/wms-admin/commit/270fbf15af338a6ac3e6a686409eea8e9a32b6bf)) +- 修复文件管理删除文件异常或不成功的情况 ([361a412](https://github.com/wms-org/wms-admin/commit/361a41258e9fdece5ba681298f2839b013d6cfab)) (Gitee#35@kiki1373639299) +- 修复本地文件管理删除文件异常或不成功的情况 ([c7b58a0](https://github.com/wms-org/wms-admin/commit/c7b58a0fd167c566f6680c87cc455b71c42b8eda)) (Gitee#36@kiki1373639299) +- 修复 Query 查询数组范围报错 ([d7ae7b4](https://github.com/wms-org/wms-admin/commit/d7ae7b4e42c424a3db51c72a0ed79572c9fd7601)) ### 📦 依赖升级 -- ContiNew Starter 2.7.4 => 2.7.5 (更多特性及依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 2.7.4 => 2.7.5 (更多特性及依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v3.4.0](https://github.com/ysoft-org/ysoft-admin/compare/v3.3.0...v3.4.0) (2024-11-18) +## [v3.4.0](https://github.com/wms-org/wms-admin/compare/v3.3.0...v3.4.0) (2024-11-18) ### ✨ 新特性 -* 新增仪表盘分析接口,查询访问时段分析、查询模块分析、查询终端分析、查询浏览器分析 ([dea8dbe](https://github.com/ysoft-org/ysoft-admin/commit/dea8dbe131867a564f7e151a6484db5be6effaa3)) -* 新增查询仪表盘数据总览相关接口, 重构仪表盘相关代码 ([e01df09](https://github.com/ysoft-org/ysoft-admin/commit/e01df09127e6efc33971d64e2fe49a2a42282425)) -* 公告支持设置通知范围 ([29202ae](https://github.com/ysoft-org/ysoft-admin/commit/29202aea307a7257c9d1e9649dee00140164c59c)) (GitCode#1) -* 角色管理增加分配角色功能 ([73f880e](https://github.com/ysoft-org/ysoft-admin/commit/73f880ec57cfdccfc297aac228410f5bb7fed448)) ([ad3f832](https://github.com/ysoft-org/ysoft-admin/commit/ad3f8329dd07858b0982020db3605200112f09b5)) (GitHub#93) -* 新增能力开放模块应用管理功能 ([f774183](https://github.com/ysoft-org/ysoft-admin/commit/f7741832bdd315039cc5f1aa062d8ffac32ddf0f)) ([d1b3824](https://github.com/ysoft-org/ysoft-admin/commit/d1b38242b9f291c897a8eb82bd330bd775e656cf)) ([4454daa](https://github.com/ysoft-org/ysoft-admin/commit/4454daa9e07af7c7202c386e533ea055bb79f0df)) (Gitee#31) -* 新增查询用户字典接口 ([d4b02ba](https://github.com/ysoft-org/ysoft-admin/commit/d4b02ba9180f82084e5ca844eaa9b4a0966a0164)) -* 代码生成新增菜单SQL模板 ([fb947c9](https://github.com/ysoft-org/ysoft-admin/commit/fb947c98fdd075a19c55e1e9e5c137a8482db618)) (GitHub#95) +* 新增仪表盘分析接口,查询访问时段分析、查询模块分析、查询终端分析、查询浏览器分析 ([dea8dbe](https://github.com/wms-org/wms-admin/commit/dea8dbe131867a564f7e151a6484db5be6effaa3)) +* 新增查询仪表盘数据总览相关接口, 重构仪表盘相关代码 ([e01df09](https://github.com/wms-org/wms-admin/commit/e01df09127e6efc33971d64e2fe49a2a42282425)) +* 公告支持设置通知范围 ([29202ae](https://github.com/wms-org/wms-admin/commit/29202aea307a7257c9d1e9649dee00140164c59c)) (GitCode#1) +* 角色管理增加分配角色功能 ([73f880e](https://github.com/wms-org/wms-admin/commit/73f880ec57cfdccfc297aac228410f5bb7fed448)) ([ad3f832](https://github.com/wms-org/wms-admin/commit/ad3f8329dd07858b0982020db3605200112f09b5)) (GitHub#93) +* 新增能力开放模块应用管理功能 ([f774183](https://github.com/wms-org/wms-admin/commit/f7741832bdd315039cc5f1aa062d8ffac32ddf0f)) ([d1b3824](https://github.com/wms-org/wms-admin/commit/d1b38242b9f291c897a8eb82bd330bd775e656cf)) ([4454daa](https://github.com/wms-org/wms-admin/commit/4454daa9e07af7c7202c386e533ea055bb79f0df)) (Gitee#31) +* 新增查询用户字典接口 ([d4b02ba](https://github.com/wms-org/wms-admin/commit/d4b02ba9180f82084e5ca844eaa9b4a0966a0164)) +* 代码生成新增菜单SQL模板 ([fb947c9](https://github.com/wms-org/wms-admin/commit/fb947c98fdd075a19c55e1e9e5c137a8482db618)) (GitHub#95) ### 💎 功能优化 -- 优化部分 Mapper 方法使用 (替换为 MP 新增方法) ([ad69d44](https://github.com/ysoft-org/ysoft-admin/commit/ad69d44ebda72dbdb639ba4ff48cde9aa7f6e400)) -- 优化查询代码生成表性能 ([781d291](https://github.com/ysoft-org/ysoft-admin/commit/781d29142fbcc1f981d3760565f2f96b49570438)) -- 移除上传文件时的多余校验 ([8466105](https://github.com/ysoft-org/ysoft-admin/commit/8466105a9b8b2fd807ac9d3029e4da7bc609d551)) -- 重构获取登录用户信息方式(线程级存储) ([79ea39d](https://github.com/ysoft-org/ysoft-admin/commit/79ea39dd078639b4e137d576f3d7820bb6c24d0a)) -- 完善及优化代码生成模板 ([ffdc971](https://github.com/ysoft-org/ysoft-admin/commit/ffdc9712d4cd1fd3093cec0780f630d672339cdf)) ([2b47ed7](https://github.com/ysoft-org/ysoft-admin/commit/2b47ed711074ad64d98fa0d9d68ccd2777b70bf2)) ([90e3bc0](https://github.com/ysoft-org/ysoft-admin/commit/90e3bc0595fdb692644ed7fd9b1a3735962cb68b)) ([985bc25](https://github.com/ysoft-org/ysoft-admin/commit/985bc25716daae6fb018a856af889919436f26e6)) -- 字典项管理日志模块调整为字典管理 ([60cb2e3](https://github.com/ysoft-org/ysoft-admin/commit/60cb2e3b5cae56d9a3117aeea6c57ec02cb9abe4)) -- 解决查询日志数据时索引失效的问题 ([4525cb3](https://github.com/ysoft-org/ysoft-admin/commit/4525cb3531c06354e3dc57147c93dd5f7f8a4e8a)) -- 重构拆分 liquibase 脚本结构 ([aadaa5b](https://github.com/ysoft-org/ysoft-admin/commit/aadaa5b4a70caaa775a38fd542890aa8d7f951c6)) -- 调整系统配置菜单图标 ([872bc1c](https://github.com/ysoft-org/ysoft-admin/commit/872bc1ca8143632ea0ca00eb320e57f61729937c)) -- 优化系统管理、代码生成相关代码及初始数据脚本 ([9ecdeb5](https://github.com/ysoft-org/ysoft-admin/commit/9ecdeb52f601b93116f6e89d8db32d8db95cb0c5)) ([5717d03](https://github.com/ysoft-org/ysoft-admin/commit/5717d03d01f8f052688bef873def83a3b8defc21)) ([7870de2](https://github.com/ysoft-org/ysoft-admin/commit/7870de28926cde86a8732ad5d6950616e1078d57)) -- 优化项目模块命名(简化、分类、统一) ([c276e53](https://github.com/ysoft-org/ysoft-admin/commit/c276e53a8e02e64f9e5d8270171e20424804382d)) -- 优化任务调度配置及 docker 部署脚本 ([b927470](https://github.com/ysoft-org/ysoft-admin/commit/b927470e33bb75594f1546a4f06d48bc2281f5ab)) ([c5cd4e2](https://github.com/ysoft-org/ysoft-admin/commit/c5cd4e2c284fa195411f704e41ca50a70271c6b7)) -- 重构仪表盘查询地域分析接口 ([e0e157f](https://github.com/ysoft-org/ysoft-admin/commit/e0e157f0e5b23ff6e27ec7ae0ee028af6f2facd1)) -- 完善 PostgreSQL 代码生成类型映射配置 ([4c36f23](https://github.com/ysoft-org/ysoft-admin/commit/4c36f2339830272aa047e46d02f34485b9051ec3)) -- 优化通知公告部分代码 ([e1941ec](https://github.com/ysoft-org/ysoft-admin/commit/e1941eca455a066dae631b1533d63f8d9a193161)) -- 优化初始数据脚本 ([6abb444](https://github.com/ysoft-org/ysoft-admin/commit/6abb444f9dce7ed1ea4aa90502c21d2ab6c8e247)) -- 忽略获取在线用户信息异常 ([4856366](https://github.com/ysoft-org/ysoft-admin/commit/48563663e1fed93154f63f6c9a6c07ea79d741da)) -- 优化部分注释 ([3116836](https://github.com/ysoft-org/ysoft-admin/commit/3116836b0139232769797da271a400fa4d9d52fa)) +- 优化部分 Mapper 方法使用 (替换为 MP 新增方法) ([ad69d44](https://github.com/wms-org/wms-admin/commit/ad69d44ebda72dbdb639ba4ff48cde9aa7f6e400)) +- 优化查询代码生成表性能 ([781d291](https://github.com/wms-org/wms-admin/commit/781d29142fbcc1f981d3760565f2f96b49570438)) +- 移除上传文件时的多余校验 ([8466105](https://github.com/wms-org/wms-admin/commit/8466105a9b8b2fd807ac9d3029e4da7bc609d551)) +- 重构获取登录用户信息方式(线程级存储) ([79ea39d](https://github.com/wms-org/wms-admin/commit/79ea39dd078639b4e137d576f3d7820bb6c24d0a)) +- 完善及优化代码生成模板 ([ffdc971](https://github.com/wms-org/wms-admin/commit/ffdc9712d4cd1fd3093cec0780f630d672339cdf)) ([2b47ed7](https://github.com/wms-org/wms-admin/commit/2b47ed711074ad64d98fa0d9d68ccd2777b70bf2)) ([90e3bc0](https://github.com/wms-org/wms-admin/commit/90e3bc0595fdb692644ed7fd9b1a3735962cb68b)) ([985bc25](https://github.com/wms-org/wms-admin/commit/985bc25716daae6fb018a856af889919436f26e6)) +- 字典项管理日志模块调整为字典管理 ([60cb2e3](https://github.com/wms-org/wms-admin/commit/60cb2e3b5cae56d9a3117aeea6c57ec02cb9abe4)) +- 解决查询日志数据时索引失效的问题 ([4525cb3](https://github.com/wms-org/wms-admin/commit/4525cb3531c06354e3dc57147c93dd5f7f8a4e8a)) +- 重构拆分 liquibase 脚本结构 ([aadaa5b](https://github.com/wms-org/wms-admin/commit/aadaa5b4a70caaa775a38fd542890aa8d7f951c6)) +- 调整系统配置菜单图标 ([872bc1c](https://github.com/wms-org/wms-admin/commit/872bc1ca8143632ea0ca00eb320e57f61729937c)) +- 优化系统管理、代码生成相关代码及初始数据脚本 ([9ecdeb5](https://github.com/wms-org/wms-admin/commit/9ecdeb52f601b93116f6e89d8db32d8db95cb0c5)) ([5717d03](https://github.com/wms-org/wms-admin/commit/5717d03d01f8f052688bef873def83a3b8defc21)) ([7870de2](https://github.com/wms-org/wms-admin/commit/7870de28926cde86a8732ad5d6950616e1078d57)) +- 优化项目模块命名(简化、分类、统一) ([c276e53](https://github.com/wms-org/wms-admin/commit/c276e53a8e02e64f9e5d8270171e20424804382d)) +- 优化任务调度配置及 docker 部署脚本 ([b927470](https://github.com/wms-org/wms-admin/commit/b927470e33bb75594f1546a4f06d48bc2281f5ab)) ([c5cd4e2](https://github.com/wms-org/wms-admin/commit/c5cd4e2c284fa195411f704e41ca50a70271c6b7)) +- 重构仪表盘查询地域分析接口 ([e0e157f](https://github.com/wms-org/wms-admin/commit/e0e157f0e5b23ff6e27ec7ae0ee028af6f2facd1)) +- 完善 PostgreSQL 代码生成类型映射配置 ([4c36f23](https://github.com/wms-org/wms-admin/commit/4c36f2339830272aa047e46d02f34485b9051ec3)) +- 优化通知公告部分代码 ([e1941ec](https://github.com/wms-org/wms-admin/commit/e1941eca455a066dae631b1533d63f8d9a193161)) +- 优化初始数据脚本 ([6abb444](https://github.com/wms-org/wms-admin/commit/6abb444f9dce7ed1ea4aa90502c21d2ab6c8e247)) +- 忽略获取在线用户信息异常 ([4856366](https://github.com/wms-org/wms-admin/commit/48563663e1fed93154f63f6c9a6c07ea79d741da)) +- 优化部分注释 ([3116836](https://github.com/wms-org/wms-admin/commit/3116836b0139232769797da271a400fa4d9d52fa)) ### 🐛 问题修复 -- 参数配置支持设值为空 ([d7e8fc9](https://github.com/ysoft-org/ysoft-admin/commit/d7e8fc9bc31409b3652b5ad03a79248726547088)) -- 修复修改存储时同时设置默认存储及启用判断顺序错误 ([d9602e8](https://github.com/ysoft-org/ysoft-admin/commit/d9602e8639bcd125b15faea5ca7f618429bcc50e)) -- 修复任务日志缺失异常堆栈的问题 ([5cbeddb](https://github.com/ysoft-org/ysoft-admin/commit/5cbeddb97bd38274641ac5d63226a937975d69ba)) (Gitee#29) -- 修复更新在线用户权限信息报错的问题 ([8278032](https://github.com/ysoft-org/ysoft-admin/commit/82780324b7c2faeba22f2dbde440d1cf0e42c3c9)) -- 修复查询日志排序错误 ([8b403f4](https://github.com/ysoft-org/ysoft-admin/commit/8b403f4357caeac0c0a4cc9ac67c73043a1f4465)) -- 修复部分错误规范代码 ([a83b45f](https://github.com/ysoft-org/ysoft-admin/commit/a83b45f776234274a844337a2f2b541705ba5aff)) -- 调整部分实体包 ([3f4331e](https://github.com/ysoft-org/ysoft-admin/commit/3f4331e92b86e73303c4d675f0f1d4bc91a2a71b)) -- 修复获取邮箱验证码未进行行为验证码校验错误 ([731bfa0](https://github.com/ysoft-org/ysoft-admin/commit/731bfa065ab3a10ab933aaffd2e9ceebf0a4d16d)) -- 完善用户角色变更校验及在线用户权限处理 ([c28d3cf](https://github.com/ysoft-org/ysoft-admin/commit/c28d3cf1c45212e670b90fc0077b5e176a894bd2)) -- 修复查询系统配置参数漏洞 :boom: ([8c3fe35](https://github.com/ysoft-org/ysoft-admin/commit/8c3fe353be5d68f1ed252eef12f5fcdc0a1e3c83)) +- 参数配置支持设值为空 ([d7e8fc9](https://github.com/wms-org/wms-admin/commit/d7e8fc9bc31409b3652b5ad03a79248726547088)) +- 修复修改存储时同时设置默认存储及启用判断顺序错误 ([d9602e8](https://github.com/wms-org/wms-admin/commit/d9602e8639bcd125b15faea5ca7f618429bcc50e)) +- 修复任务日志缺失异常堆栈的问题 ([5cbeddb](https://github.com/wms-org/wms-admin/commit/5cbeddb97bd38274641ac5d63226a937975d69ba)) (Gitee#29) +- 修复更新在线用户权限信息报错的问题 ([8278032](https://github.com/wms-org/wms-admin/commit/82780324b7c2faeba22f2dbde440d1cf0e42c3c9)) +- 修复查询日志排序错误 ([8b403f4](https://github.com/wms-org/wms-admin/commit/8b403f4357caeac0c0a4cc9ac67c73043a1f4465)) +- 修复部分错误规范代码 ([a83b45f](https://github.com/wms-org/wms-admin/commit/a83b45f776234274a844337a2f2b541705ba5aff)) +- 调整部分实体包 ([3f4331e](https://github.com/wms-org/wms-admin/commit/3f4331e92b86e73303c4d675f0f1d4bc91a2a71b)) +- 修复获取邮箱验证码未进行行为验证码校验错误 ([731bfa0](https://github.com/wms-org/wms-admin/commit/731bfa065ab3a10ab933aaffd2e9ceebf0a4d16d)) +- 完善用户角色变更校验及在线用户权限处理 ([c28d3cf](https://github.com/wms-org/wms-admin/commit/c28d3cf1c45212e670b90fc0077b5e176a894bd2)) +- 修复查询系统配置参数漏洞 :boom: ([8c3fe35](https://github.com/wms-org/wms-admin/commit/8c3fe353be5d68f1ed252eef12f5fcdc0a1e3c83)) ### 📦 依赖升级 -- ContiNew Starter 2.6.0 => 2.7.4 (更多特性及依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 2.6.0 => 2.7.4 (更多特性及依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v3.3.0](https://github.com/ysoft-org/ysoft-admin/compare/v3.2.0...v3.3.0) (2024-09-09) +## [v3.3.0](https://github.com/wms-org/wms-admin/compare/v3.2.0...v3.3.0) (2024-09-09) ### ✨ 新特性 -* 重构全局响应处理及异常拦截,自定义异常拦截从 Starter 调整到 Admin 项目 ([d7621c6](https://github.com/ysoft-org/ysoft-admin/commit/d7621c6b26bfd253d9295444ea144f5dabf67f44)) -* 重构 Controller 接口方法返回值写法,接口文档也已适配处理 ([d7621c6](https://github.com/ysoft-org/ysoft-admin/commit/d7621c6b26bfd253d9295444ea144f5dabf67f44)) ([0f1479f](https://github.com/ysoft-org/ysoft-admin/commit/0f1479f40deef83a5f5d64cbc24a7691b274b112)) -* 代码生成字段配置时支持指定排序 ([d56b9aa](https://github.com/ysoft-org/ysoft-admin/commit/d56b9aa35ee2502804f487487d7bac02f4edc9b0)) -* 代码生成字段配置时支持选择关联字典 ([fdd21a0](https://github.com/ysoft-org/ysoft-admin/commit/fdd21a01c106e12321d0d1886ff643c72a09943b)) ([ecc98b1](https://github.com/ysoft-org/ysoft-admin/commit/ecc98b1999d90c1a7a29af94dc8705283f34dada)) -* 修改角色功能权限、数据权限支持衔接新增角色时的父子联动选项 ([387fb19](https://github.com/ysoft-org/ysoft-admin/commit/387fb194640d4a288f053c3eba1bf5b314d64da7)) +* 重构全局响应处理及异常拦截,自定义异常拦截从 Starter 调整到 Admin 项目 ([d7621c6](https://github.com/wms-org/wms-admin/commit/d7621c6b26bfd253d9295444ea144f5dabf67f44)) +* 重构 Controller 接口方法返回值写法,接口文档也已适配处理 ([d7621c6](https://github.com/wms-org/wms-admin/commit/d7621c6b26bfd253d9295444ea144f5dabf67f44)) ([0f1479f](https://github.com/wms-org/wms-admin/commit/0f1479f40deef83a5f5d64cbc24a7691b274b112)) +* 代码生成字段配置时支持指定排序 ([d56b9aa](https://github.com/wms-org/wms-admin/commit/d56b9aa35ee2502804f487487d7bac02f4edc9b0)) +* 代码生成字段配置时支持选择关联字典 ([fdd21a0](https://github.com/wms-org/wms-admin/commit/fdd21a01c106e12321d0d1886ff643c72a09943b)) ([ecc98b1](https://github.com/wms-org/wms-admin/commit/ecc98b1999d90c1a7a29af94dc8705283f34dada)) +* 修改角色功能权限、数据权限支持衔接新增角色时的父子联动选项 ([387fb19](https://github.com/wms-org/wms-admin/commit/387fb194640d4a288f053c3eba1bf5b314d64da7)) ### 💎 功能优化 -- 移除 WebMvcConfiguration 配置(已迁移到 Starter 项目)([d7621c6](https://github.com/ysoft-org/ysoft-admin/commit/d7621c6b26bfd253d9295444ea144f5dabf67f44)) -- 重构日志持久层接口本地实现类 ([2c1eb56](https://github.com/ysoft-org/ysoft-admin/commit/2c1eb5660f69a9ab702d503944a11e47edac1142)) -- 优化打包配置,模板等配置文件提取到 jar 包外部 ([75cef77](https://github.com/ysoft-org/ysoft-admin/commit/75cef773187e5b5060a10a12e7c9912002376d7a)) -- 优化健康监测接口响应信息 ([bb5a92e](https://github.com/ysoft-org/ysoft-admin/commit/bb5a92e5ca238ed677d9ac3589fdf8009d2ac232)) -- 优化代码生成列配置代码,取消后端部分默认值 ([f5ee2b5](https://github.com/ysoft-org/ysoft-admin/commit/f5ee2b5beb9572d3fcd5b7c2f6db0627dedb31aa)) ([ca9f34d](https://github.com/ysoft-org/ysoft-admin/commit/ca9f34d3d5a3f96c6df537036a5fd876cae2e89a)) -- 重构权限变更逻辑,修改角色、变更用户角色不再下线用户 ([ad9a600](https://github.com/ysoft-org/ysoft-admin/commit/ad9a6000fcb5d64b04cf230caa3cbacc8c3ac8d7)) +- 移除 WebMvcConfiguration 配置(已迁移到 Starter 项目)([d7621c6](https://github.com/wms-org/wms-admin/commit/d7621c6b26bfd253d9295444ea144f5dabf67f44)) +- 重构日志持久层接口本地实现类 ([2c1eb56](https://github.com/wms-org/wms-admin/commit/2c1eb5660f69a9ab702d503944a11e47edac1142)) +- 优化打包配置,模板等配置文件提取到 jar 包外部 ([75cef77](https://github.com/wms-org/wms-admin/commit/75cef773187e5b5060a10a12e7c9912002376d7a)) +- 优化健康监测接口响应信息 ([bb5a92e](https://github.com/wms-org/wms-admin/commit/bb5a92e5ca238ed677d9ac3589fdf8009d2ac232)) +- 优化代码生成列配置代码,取消后端部分默认值 ([f5ee2b5](https://github.com/wms-org/wms-admin/commit/f5ee2b5beb9572d3fcd5b7c2f6db0627dedb31aa)) ([ca9f34d](https://github.com/wms-org/wms-admin/commit/ca9f34d3d5a3f96c6df537036a5fd876cae2e89a)) +- 重构权限变更逻辑,修改角色、变更用户角色不再下线用户 ([ad9a600](https://github.com/wms-org/wms-admin/commit/ad9a6000fcb5d64b04cf230caa3cbacc8c3ac8d7)) ### 🐛 问题修复 -- 修复打包部署后,下载用户导入模板异常问题 (Gitee#25) ([c7ffc67](https://github.com/ysoft-org/ysoft-admin/commit/c7ffc67cdc9139a4398c7dc819ca453880bd100a)) -- 修复日志记录仅支持获取 JSON 结构响应体的问题 ([d7621c6](https://github.com/ysoft-org/ysoft-admin/commit/d7621c6b26bfd253d9295444ea144f5dabf67f44)) -- 修复并增强 SQL 注入防御 ([0f1479f](https://github.com/ysoft-org/ysoft-admin/commit/0f1479f40deef83a5f5d64cbc24a7691b274b112)) -- 修复目录、菜单的组件名称重复的错误问题 ([9e91f56](https://github.com/ysoft-org/ysoft-admin/commit/9e91f563e2a263ce302dc3bf17c89e37c2b56285)) -- 修复 DataPermission 注解表别名配置无效的问题 ([6c4e252](https://github.com/ysoft-org/ysoft-admin/commit/6c4e2522df3f44ba0f5a21228e805b8ac98f8e6b)) -- 临时移除 MyBatis Plus saveBatch 不兼容的 rewriteBatchedStatements 配置 ([25240fa](https://github.com/ysoft-org/ysoft-admin/commit/25240fa81957a1677deda294ce8f2b0af5413315)) -- 修复更新会导致原加密失效的问题 ([8903195](https://github.com/ysoft-org/ysoft-admin/commit/89031954c0b7daee1c08e1a10fd50139301cd6ab)) ([c87317d](https://github.com/ysoft-org/ysoft-admin/commit/c87317d19946989e86dfbc5f24b155b2ea5abdc9)) -- 修复角色查询参数与前端不一致的问题 ([098571f](https://github.com/ysoft-org/ysoft-admin/commit/098571ffb2febc6163d2b9e5b18c4796ea80cbfa)) -- 修复特殊校验异常不打印堆栈 ([c87317d](https://github.com/ysoft-org/ysoft-admin/commit/c87317d19946989e86dfbc5f24b155b2ea5abdc9)) -- 修复日志全局 includes 配置会被局部修改的问题 ([c87317d](https://github.com/ysoft-org/ysoft-admin/commit/c87317d19946989e86dfbc5f24b155b2ea5abdc9)) -- 修复初始数据错误 ([403c72a](https://github.com/ysoft-org/ysoft-admin/commit/403c72aa52a0f0852208f15fa1c7117ee26414f0)) +- 修复打包部署后,下载用户导入模板异常问题 (Gitee#25) ([c7ffc67](https://github.com/wms-org/wms-admin/commit/c7ffc67cdc9139a4398c7dc819ca453880bd100a)) +- 修复日志记录仅支持获取 JSON 结构响应体的问题 ([d7621c6](https://github.com/wms-org/wms-admin/commit/d7621c6b26bfd253d9295444ea144f5dabf67f44)) +- 修复并增强 SQL 注入防御 ([0f1479f](https://github.com/wms-org/wms-admin/commit/0f1479f40deef83a5f5d64cbc24a7691b274b112)) +- 修复目录、菜单的组件名称重复的错误问题 ([9e91f56](https://github.com/wms-org/wms-admin/commit/9e91f563e2a263ce302dc3bf17c89e37c2b56285)) +- 修复 DataPermission 注解表别名配置无效的问题 ([6c4e252](https://github.com/wms-org/wms-admin/commit/6c4e2522df3f44ba0f5a21228e805b8ac98f8e6b)) +- 临时移除 MyBatis Plus saveBatch 不兼容的 rewriteBatchedStatements 配置 ([25240fa](https://github.com/wms-org/wms-admin/commit/25240fa81957a1677deda294ce8f2b0af5413315)) +- 修复更新会导致原加密失效的问题 ([8903195](https://github.com/wms-org/wms-admin/commit/89031954c0b7daee1c08e1a10fd50139301cd6ab)) ([c87317d](https://github.com/wms-org/wms-admin/commit/c87317d19946989e86dfbc5f24b155b2ea5abdc9)) +- 修复角色查询参数与前端不一致的问题 ([098571f](https://github.com/wms-org/wms-admin/commit/098571ffb2febc6163d2b9e5b18c4796ea80cbfa)) +- 修复特殊校验异常不打印堆栈 ([c87317d](https://github.com/wms-org/wms-admin/commit/c87317d19946989e86dfbc5f24b155b2ea5abdc9)) +- 修复日志全局 includes 配置会被局部修改的问题 ([c87317d](https://github.com/wms-org/wms-admin/commit/c87317d19946989e86dfbc5f24b155b2ea5abdc9)) +- 修复初始数据错误 ([403c72a](https://github.com/wms-org/wms-admin/commit/403c72aa52a0f0852208f15fa1c7117ee26414f0)) ### 📦 依赖升级 -- ContiNew Starter 2.4.0 => 2.6.0 (更多特性及依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 2.4.0 => 2.6.0 (更多特性及依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v3.2.0](https://github.com/ysoft-org/ysoft-admin/compare/v3.1.0...v3.2.0) (2024-08-05) +## [v3.2.0](https://github.com/wms-org/wms-admin/compare/v3.1.0...v3.2.0) (2024-08-05) ### ✨ 新特性 -* 新增用户批量导入功能 (GitHub#78) ([c2ad055](https://github.com/ysoft-org/ysoft-admin/commit/c2ad055cf82187e132e4cde9e15251e554deadff)) -* 新增任务调度模块 SnailJob(灵活,可靠和快速的分布式任务重试和分布式任务调度平台) (Gitee#22) ([ce1acea](https://github.com/ysoft-org/ysoft-admin/commit/ce1acea1535083345c33bcc427054831faf5d2e3)) ([ed5594b](https://github.com/ysoft-org/ysoft-admin/commit/ed5594b31e1d31b2a9210b65838d545067ca812f)) ([797221b](https://github.com/ysoft-org/ysoft-admin/commit/797221b4dc66c582b95b872b3cb60429247b14e9)) ([7b381b3](https://github.com/ysoft-org/ysoft-admin/commit/7b381b36de4ed4ef657249028188abc2f274b036)) ([ffe75e1](https://github.com/ysoft-org/ysoft-admin/commit/ffe75e111eb333236e923a1ed14dae5257b09357)) ([cef5cb4](https://github.com/ysoft-org/ysoft-admin/commit/cef5cb4fa5e6ee2325fd3738e1c8601a75277dd8)) ([513d8d9](https://github.com/ysoft-org/ysoft-admin/commit/513d8d9324b952438ec5513e9e3c7dfb092d5b83)) -* 修改 sys_option sql 脚本以适配 base64 图片 (Gitee#25) ([6848559](https://github.com/ysoft-org/ysoft-admin/commit/68485596c47a884b453e4632b59b525527293e17)) +* 新增用户批量导入功能 (GitHub#78) ([c2ad055](https://github.com/wms-org/wms-admin/commit/c2ad055cf82187e132e4cde9e15251e554deadff)) +* 新增任务调度模块 SnailJob(灵活,可靠和快速的分布式任务重试和分布式任务调度平台) (Gitee#22) ([ce1acea](https://github.com/wms-org/wms-admin/commit/ce1acea1535083345c33bcc427054831faf5d2e3)) ([ed5594b](https://github.com/wms-org/wms-admin/commit/ed5594b31e1d31b2a9210b65838d545067ca812f)) ([797221b](https://github.com/wms-org/wms-admin/commit/797221b4dc66c582b95b872b3cb60429247b14e9)) ([7b381b3](https://github.com/wms-org/wms-admin/commit/7b381b36de4ed4ef657249028188abc2f274b036)) ([ffe75e1](https://github.com/wms-org/wms-admin/commit/ffe75e111eb333236e923a1ed14dae5257b09357)) ([cef5cb4](https://github.com/wms-org/wms-admin/commit/cef5cb4fa5e6ee2325fd3738e1c8601a75277dd8)) ([513d8d9](https://github.com/wms-org/wms-admin/commit/513d8d9324b952438ec5513e9e3c7dfb092d5b83)) +* 修改 sys_option sql 脚本以适配 base64 图片 (Gitee#25) ([6848559](https://github.com/wms-org/wms-admin/commit/68485596c47a884b453e4632b59b525527293e17)) ### 💎 功能优化 -- 优化更新手机号、邮箱语句 ([9995bf0](https://github.com/ysoft-org/ysoft-admin/commit/9995bf0200e6256ccc4a26d8847e37fb85b4a226)) -- 重构适配 ContiNew Starter 最新线程池配置 ([5604fe9](https://github.com/ysoft-org/ysoft-admin/commit/5604fe95784b2627f1c8144144546de05434577e)) -- 获取短信、邮箱验证码接口适配 ContiNew Starter 限流器 ([44811fc](https://github.com/ysoft-org/ysoft-admin/commit/44811fc93283f508953f5fc9193c0b03305da5b2)) -- 移动 SaToken 配置到 webapi 模块 ([d733b7f](https://github.com/ysoft-org/ysoft-admin/commit/d733b7f1661a5f0df2b6f12b33ba69da8810e0aa)) -- 新增 ysoft-admin-plugins 插件模块,代码生成迁移到插件模块,为后续插件化改造铺垫 ([52f3be8](https://github.com/ysoft-org/ysoft-admin/commit/52f3be8ee3a07334c76cdfc06d15698b7ccd65ea)) -- 使用分组校验优化存储管理 ([3a23db1](https://github.com/ysoft-org/ysoft-admin/commit/3a23db1a4bdfefc26de67ed9e0317097699d5db6)) -- 移动日志配置和依赖至 webapi 模块 ([48aae87](https://github.com/ysoft-org/ysoft-admin/commit/48aae877646e93f20a43fe4002d7f19fa98897c3)) -- 调整部分 Query 查询参数类型为对应枚举(目前已支持非 JSON 格式枚举参数转换) ([f80316e](https://github.com/ysoft-org/ysoft-admin/commit/f80316e34d9757225a1a7b6002061e8626018e47)) -- 调整部分枚举类的包位置 ([6b69dd4](https://github.com/ysoft-org/ysoft-admin/commit/6b69dd43e1544bd955901d6110fa7d7f65aaa80c)) -- 更新通知公告新增、查看菜单数据 ([4554526](https://github.com/ysoft-org/ysoft-admin/commit/45545260a36b57b594eb8329e95b7552cf6893f5)) +- 优化更新手机号、邮箱语句 ([9995bf0](https://github.com/wms-org/wms-admin/commit/9995bf0200e6256ccc4a26d8847e37fb85b4a226)) +- 重构适配 ContiNew Starter 最新线程池配置 ([5604fe9](https://github.com/wms-org/wms-admin/commit/5604fe95784b2627f1c8144144546de05434577e)) +- 获取短信、邮箱验证码接口适配 ContiNew Starter 限流器 ([44811fc](https://github.com/wms-org/wms-admin/commit/44811fc93283f508953f5fc9193c0b03305da5b2)) +- 移动 SaToken 配置到 webapi 模块 ([d733b7f](https://github.com/wms-org/wms-admin/commit/d733b7f1661a5f0df2b6f12b33ba69da8810e0aa)) +- 新增 wms-admin-plugins 插件模块,代码生成迁移到插件模块,为后续插件化改造铺垫 ([52f3be8](https://github.com/wms-org/wms-admin/commit/52f3be8ee3a07334c76cdfc06d15698b7ccd65ea)) +- 使用分组校验优化存储管理 ([3a23db1](https://github.com/wms-org/wms-admin/commit/3a23db1a4bdfefc26de67ed9e0317097699d5db6)) +- 移动日志配置和依赖至 webapi 模块 ([48aae87](https://github.com/wms-org/wms-admin/commit/48aae877646e93f20a43fe4002d7f19fa98897c3)) +- 调整部分 Query 查询参数类型为对应枚举(目前已支持非 JSON 格式枚举参数转换) ([f80316e](https://github.com/wms-org/wms-admin/commit/f80316e34d9757225a1a7b6002061e8626018e47)) +- 调整部分枚举类的包位置 ([6b69dd4](https://github.com/wms-org/wms-admin/commit/6b69dd43e1544bd955901d6110fa7d7f65aaa80c)) +- 更新通知公告新增、查看菜单数据 ([4554526](https://github.com/wms-org/wms-admin/commit/45545260a36b57b594eb8329e95b7552cf6893f5)) ### 🐛 问题修复 -- 修复代码生成前端模板部分错误 (Gitee#20) ([b512ea9](https://github.com/ysoft-org/ysoft-admin/commit/b512ea99f39aaac04bd4db4a9d73e29ddb340d9e)) -- 修复文件管理删除图片时未删除缩略图的问题 ([bc523eb](https://github.com/ysoft-org/ysoft-admin/commit/bc523eba30a500a4af62adbd590446c48a5cb0be)) -- 修复存储管理私有密钥校验错误 ([eb65cff](https://github.com/ysoft-org/ysoft-admin/commit/eb65cff4c776a8d3e259f8c96d2918acfe038b6a)) -- 删除用户未删除用户历史密码 ([f53d6b6](https://github.com/ysoft-org/ysoft-admin/commit/f53d6b6504d5d504581e2697589dcb9b8fbe82ef)) -- 修复菜单缓存更新错误 ([10ff4ce](https://github.com/ysoft-org/ysoft-admin/commit/10ff4ce838b950df42994de4dbd2af20ff254949)) -- 修复偶发性报错 zip file closed ([b587cb8](https://github.com/ysoft-org/ysoft-admin/commit/b587cb82aa5d48548b5ce75dd4863af037ae8274)) -- 修复代码生成器前端新增数据模板错误 ([81de8d0](https://github.com/ysoft-org/ysoft-admin/commit/81de8d060ba081d14873d14d6e4083302a718bef)) +- 修复代码生成前端模板部分错误 (Gitee#20) ([b512ea9](https://github.com/wms-org/wms-admin/commit/b512ea99f39aaac04bd4db4a9d73e29ddb340d9e)) +- 修复文件管理删除图片时未删除缩略图的问题 ([bc523eb](https://github.com/wms-org/wms-admin/commit/bc523eba30a500a4af62adbd590446c48a5cb0be)) +- 修复存储管理私有密钥校验错误 ([eb65cff](https://github.com/wms-org/wms-admin/commit/eb65cff4c776a8d3e259f8c96d2918acfe038b6a)) +- 删除用户未删除用户历史密码 ([f53d6b6](https://github.com/wms-org/wms-admin/commit/f53d6b6504d5d504581e2697589dcb9b8fbe82ef)) +- 修复菜单缓存更新错误 ([10ff4ce](https://github.com/wms-org/wms-admin/commit/10ff4ce838b950df42994de4dbd2af20ff254949)) +- 修复偶发性报错 zip file closed ([b587cb8](https://github.com/wms-org/wms-admin/commit/b587cb82aa5d48548b5ce75dd4863af037ae8274)) +- 修复代码生成器前端新增数据模板错误 ([81de8d0](https://github.com/wms-org/wms-admin/commit/81de8d060ba081d14873d14d6e4083302a718bef)) ### 📦 依赖升级 -- ContiNew Starter 2.1.0 => 2.4.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 2.1.0 => 2.4.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v3.1.0](https://github.com/ysoft-org/ysoft-admin/compare/v3.0.1...v3.1.0) (2024-06-16) +## [v3.1.0](https://github.com/wms-org/wms-admin/compare/v3.0.1...v3.1.0) (2024-06-16) ### ✨ 新特性 -* 系统配置新增安全设置功能,支持多种密码策略配置,例如:有效期、密码重复使用次数、密码错误锁定等 (GitHub#61) ([1de2a8f](https://github.com/ysoft-org/ysoft-admin/commit/1de2a8f2dcf01ef8eeb7e2d662c09af00b38ffb1)) ([90ecaab](https://github.com/ysoft-org/ysoft-admin/commit/90ecaab63241b8d351ebaffa4faece8c609882b1)) ([3994142](https://github.com/ysoft-org/ysoft-admin/commit/3994142ace6cd6ce9d094b8a4ceed080a2b2ec33)) ([1427c13](https://github.com/ysoft-org/ysoft-admin/commit/1427c13b7a0b4e0f569ccc20a3172ad748c98e14)) ([5f5fee6](https://github.com/ysoft-org/ysoft-admin/commit/5f5fee63f8e584ffd9542bf132ee724762187d83)) ([c1e9d31](https://github.com/ysoft-org/ysoft-admin/commit/c1e9d318e0643c0854a848425955948d05b158d3)) ([48d0f47](https://github.com/ysoft-org/ysoft-admin/commit/48d0f476149ff7bc30fe05fe3dec84e5a947cf19)) -* 图片文件支持缩略图 (GitHub#63) ([d320c95](https://github.com/ysoft-org/ysoft-admin/commit/d320c9596a321dce1028ac36d23bcd04535e87a6)) ([d44fb3a](https://github.com/ysoft-org/ysoft-admin/commit/d44fb3a681370b5763f028cc761fbb5fc94a104c)) -* 在线用户增加最后活跃时间显示 ([926497a](https://github.com/ysoft-org/ysoft-admin/commit/926497a18acbb6ef170de9f68bd97e025e212f3e)) -* 新增 WebSocket 消息通知,站内信重新上线 (GitHub#67) ([9970c46](https://github.com/ysoft-org/ysoft-admin/commit/9970c461cce5c710f1f8479d4bdd258e65558256)) ([94168e2](https://github.com/ysoft-org/ysoft-admin/commit/94168e246f75364605b6fbdb82c9438e2b959c61)) ([5abdb8d](https://github.com/ysoft-org/ysoft-admin/commit/5abdb8d86161e7bd03ace14b3c899f6ad13020e2)) -* 文件上传按日期拆分目录 (GitHub#68) ([08aa085](https://github.com/ysoft-org/ysoft-admin/commit/08aa08550589876a821a37d56a5fae8867292978)) -* 代码生成增加了 TREE_SELECT/CHECK_GROUP/INPUT_NUMBER/INPUT_PASSWORD控件 (Gitee#17) ([8632b22](https://github.com/ysoft-org/ysoft-admin/commit/8632b22bd5b6d43e31b6aeac930836464849441b)) ([cf18c10](https://github.com/ysoft-org/ysoft-admin/commit/cf18c1046b77c9f38d28b0e6608d345df3bbd5a9)) -* 系统参数新增根据类别查询方法 ([694cbb2](https://github.com/ysoft-org/ysoft-admin/commit/694cbb2850c05f7eb35fb982530a6c204f1f64b0)) -* 支持动态邮件 ([1dbb339](https://github.com/ysoft-org/ysoft-admin/commit/1dbb33935a05e9fde749191e34682e632c8e1e63)) +* 系统配置新增安全设置功能,支持多种密码策略配置,例如:有效期、密码重复使用次数、密码错误锁定等 (GitHub#61) ([1de2a8f](https://github.com/wms-org/wms-admin/commit/1de2a8f2dcf01ef8eeb7e2d662c09af00b38ffb1)) ([90ecaab](https://github.com/wms-org/wms-admin/commit/90ecaab63241b8d351ebaffa4faece8c609882b1)) ([3994142](https://github.com/wms-org/wms-admin/commit/3994142ace6cd6ce9d094b8a4ceed080a2b2ec33)) ([1427c13](https://github.com/wms-org/wms-admin/commit/1427c13b7a0b4e0f569ccc20a3172ad748c98e14)) ([5f5fee6](https://github.com/wms-org/wms-admin/commit/5f5fee63f8e584ffd9542bf132ee724762187d83)) ([c1e9d31](https://github.com/wms-org/wms-admin/commit/c1e9d318e0643c0854a848425955948d05b158d3)) ([48d0f47](https://github.com/wms-org/wms-admin/commit/48d0f476149ff7bc30fe05fe3dec84e5a947cf19)) +* 图片文件支持缩略图 (GitHub#63) ([d320c95](https://github.com/wms-org/wms-admin/commit/d320c9596a321dce1028ac36d23bcd04535e87a6)) ([d44fb3a](https://github.com/wms-org/wms-admin/commit/d44fb3a681370b5763f028cc761fbb5fc94a104c)) +* 在线用户增加最后活跃时间显示 ([926497a](https://github.com/wms-org/wms-admin/commit/926497a18acbb6ef170de9f68bd97e025e212f3e)) +* 新增 WebSocket 消息通知,站内信重新上线 (GitHub#67) ([9970c46](https://github.com/wms-org/wms-admin/commit/9970c461cce5c710f1f8479d4bdd258e65558256)) ([94168e2](https://github.com/wms-org/wms-admin/commit/94168e246f75364605b6fbdb82c9438e2b959c61)) ([5abdb8d](https://github.com/wms-org/wms-admin/commit/5abdb8d86161e7bd03ace14b3c899f6ad13020e2)) +* 文件上传按日期拆分目录 (GitHub#68) ([08aa085](https://github.com/wms-org/wms-admin/commit/08aa08550589876a821a37d56a5fae8867292978)) +* 代码生成增加了 TREE_SELECT/CHECK_GROUP/INPUT_NUMBER/INPUT_PASSWORD控件 (Gitee#17) ([8632b22](https://github.com/wms-org/wms-admin/commit/8632b22bd5b6d43e31b6aeac930836464849441b)) ([cf18c10](https://github.com/wms-org/wms-admin/commit/cf18c1046b77c9f38d28b0e6608d345df3bbd5a9)) +* 系统参数新增根据类别查询方法 ([694cbb2](https://github.com/wms-org/wms-admin/commit/694cbb2850c05f7eb35fb982530a6c204f1f64b0)) +* 支持动态邮件 ([1dbb339](https://github.com/wms-org/wms-admin/commit/1dbb33935a05e9fde749191e34682e632c8e1e63)) ### 💎 功能优化 -- 优化部分命名 ([a3cf39f](https://github.com/ysoft-org/ysoft-admin/commit/a3cf39f9f8611f7f34dd9f55166d0fe75b72145b)) -- 优化代码生成预览 (Gitee#14) ([ad7412f](https://github.com/ysoft-org/ysoft-admin/commit/ad7412f9cbee5d851d060d8e9d717b2553d3d4cb)) -- 优化个人中心部分参数命名 ([61dd3a4](https://github.com/ysoft-org/ysoft-admin/commit/61dd3a4c3aef2d4a873a1d4de13bc1962179eeb1)) -- 根据前端最新 ESLint 配置优化代码生成模板 ([044b4b6](https://github.com/ysoft-org/ysoft-admin/commit/044b4b669aa2b77b3f5ac27095202e57045fd10d)) -- 优化代码生成模板 ([3ddcdf0](https://github.com/ysoft-org/ysoft-admin/commit/3ddcdf0f67d12250da4b7f6f6ff3d63a880e6d4c)) ([6396e9a](https://github.com/ysoft-org/ysoft-admin/commit/6396e9a7364bf899023c2399083b43c67efb30cf)) ([2fb4001](https://github.com/ysoft-org/ysoft-admin/commit/2fb40015c1ca2bc58b66891e2cfbfac70b029016)) -- 使用 Crane4j 优化在线用户数据填充 ([cb81135](https://github.com/ysoft-org/ysoft-admin/commit/cb811350f36364fcc85355c081b8b60c7d5bfb2a)) -- 用户角色名称调整为角色名称列表返回,并全局优化 Crane4j 组件的使用方式 ([857a1c9](https://github.com/ysoft-org/ysoft-admin/commit/857a1c90838c8305f916af9dccfd4ca847ca8c66)) ([0b76d5c](https://github.com/ysoft-org/ysoft-admin/commit/0b76d5ca33f5900862d48321e8384ee8ded6ae4e)) -- 优化部分方法排序 ([651cc8a](https://github.com/ysoft-org/ysoft-admin/commit/651cc8ae71bd3f544bd41adac0ef7044011300a7)) -- 字典管理分页查询接口 => 查询列表接口 ([b13d0e9](https://github.com/ysoft-org/ysoft-admin/commit/b13d0e9ee530fc1a8b382e08ead065989f2b0e7f)) -- 移除部门响应信息中的 getDisabled 方法 ([659144a](https://github.com/ysoft-org/ysoft-admin/commit/659144afdaf5d1b4667437053a770cf39681cdd7)) -- 文件管理存储路径改为相对路径 (GitHub#69) ([8854f20](https://github.com/ysoft-org/ysoft-admin/commit/8854f20ce90f6a1c379ac81a27bb40784a838095)) -- 查询文件列表增加存储名称信息返回 ([69bc1e5](https://github.com/ysoft-org/ysoft-admin/commit/69bc1e52e122c14a695d2e37589d36cbb64de8a4)) -- 系统参数表结构新增ID、类别字段 ([45396f2](https://github.com/ysoft-org/ysoft-admin/commit/45396f2dc23b4de47912c1d77b05711c839672ce)) -- 优化公告状态判断 ([a07aedb](https://github.com/ysoft-org/ysoft-admin/commit/a07aedbf35e32f3d09d2e9ed8857b9a9d2e2e13a)) -- 重构系统参数相关接口 ([6d0060b](https://github.com/ysoft-org/ysoft-admin/commit/6d0060b21c374afd9880e57490345a140187a7cd)) -- 优化用户及部门查询 ([448f9a0](https://github.com/ysoft-org/ysoft-admin/commit/448f9a0a819d6816a5ae3ada2e07690a5f70f7df)) -- 用户头像改为Base64存储 ([969216d](https://github.com/ysoft-org/ysoft-admin/commit/969216d7c67332eae826c11233c8745d9d3ad81c)) ([513ea83](https://github.com/ysoft-org/ysoft-admin/commit/513ea83152708194348afeb93d31aed1a9914e57)) ([7a6cafc](https://github.com/ysoft-org/ysoft-admin/commit/7a6cafc6e4ff6914fa62a870538b51759af866a8)) -- 优化配置文件 ([5b3d4f5](https://github.com/ysoft-org/ysoft-admin/commit/5b3d4f57788e30b62a1e1af9c2620a4cc8659bfe)) -- 优化登录 Helper ([afbd619](https://github.com/ysoft-org/ysoft-admin/commit/afbd619d098ff3d70fc786db9594cebf03c07e10)) -- 重构查询参数及字典接口 ([1d60213](https://github.com/ysoft-org/ysoft-admin/commit/1d602134377fc13b062981476b8c17947b36006d)) -- 重构查询角色字典接口 ([1e73d06](https://github.com/ysoft-org/ysoft-admin/commit/1e73d06a972d380bbed253eaffd806d8e0698525)) -- 使用 CompletableFuture 实现异步加载用户权限、角色代码和角色信息,以提高登录时的性能和响应速度 ([d5f3c74](https://github.com/charles7c/ysoft-admin/commit/d5f3c7417ad7b1178b5a53da3fd6f3cb7cd3b19a)) +- 优化部分命名 ([a3cf39f](https://github.com/wms-org/wms-admin/commit/a3cf39f9f8611f7f34dd9f55166d0fe75b72145b)) +- 优化代码生成预览 (Gitee#14) ([ad7412f](https://github.com/wms-org/wms-admin/commit/ad7412f9cbee5d851d060d8e9d717b2553d3d4cb)) +- 优化个人中心部分参数命名 ([61dd3a4](https://github.com/wms-org/wms-admin/commit/61dd3a4c3aef2d4a873a1d4de13bc1962179eeb1)) +- 根据前端最新 ESLint 配置优化代码生成模板 ([044b4b6](https://github.com/wms-org/wms-admin/commit/044b4b669aa2b77b3f5ac27095202e57045fd10d)) +- 优化代码生成模板 ([3ddcdf0](https://github.com/wms-org/wms-admin/commit/3ddcdf0f67d12250da4b7f6f6ff3d63a880e6d4c)) ([6396e9a](https://github.com/wms-org/wms-admin/commit/6396e9a7364bf899023c2399083b43c67efb30cf)) ([2fb4001](https://github.com/wms-org/wms-admin/commit/2fb40015c1ca2bc58b66891e2cfbfac70b029016)) +- 使用 Crane4j 优化在线用户数据填充 ([cb81135](https://github.com/wms-org/wms-admin/commit/cb811350f36364fcc85355c081b8b60c7d5bfb2a)) +- 用户角色名称调整为角色名称列表返回,并全局优化 Crane4j 组件的使用方式 ([857a1c9](https://github.com/wms-org/wms-admin/commit/857a1c90838c8305f916af9dccfd4ca847ca8c66)) ([0b76d5c](https://github.com/wms-org/wms-admin/commit/0b76d5ca33f5900862d48321e8384ee8ded6ae4e)) +- 优化部分方法排序 ([651cc8a](https://github.com/wms-org/wms-admin/commit/651cc8ae71bd3f544bd41adac0ef7044011300a7)) +- 字典管理分页查询接口 => 查询列表接口 ([b13d0e9](https://github.com/wms-org/wms-admin/commit/b13d0e9ee530fc1a8b382e08ead065989f2b0e7f)) +- 移除部门响应信息中的 getDisabled 方法 ([659144a](https://github.com/wms-org/wms-admin/commit/659144afdaf5d1b4667437053a770cf39681cdd7)) +- 文件管理存储路径改为相对路径 (GitHub#69) ([8854f20](https://github.com/wms-org/wms-admin/commit/8854f20ce90f6a1c379ac81a27bb40784a838095)) +- 查询文件列表增加存储名称信息返回 ([69bc1e5](https://github.com/wms-org/wms-admin/commit/69bc1e52e122c14a695d2e37589d36cbb64de8a4)) +- 系统参数表结构新增ID、类别字段 ([45396f2](https://github.com/wms-org/wms-admin/commit/45396f2dc23b4de47912c1d77b05711c839672ce)) +- 优化公告状态判断 ([a07aedb](https://github.com/wms-org/wms-admin/commit/a07aedbf35e32f3d09d2e9ed8857b9a9d2e2e13a)) +- 重构系统参数相关接口 ([6d0060b](https://github.com/wms-org/wms-admin/commit/6d0060b21c374afd9880e57490345a140187a7cd)) +- 优化用户及部门查询 ([448f9a0](https://github.com/wms-org/wms-admin/commit/448f9a0a819d6816a5ae3ada2e07690a5f70f7df)) +- 用户头像改为Base64存储 ([969216d](https://github.com/wms-org/wms-admin/commit/969216d7c67332eae826c11233c8745d9d3ad81c)) ([513ea83](https://github.com/wms-org/wms-admin/commit/513ea83152708194348afeb93d31aed1a9914e57)) ([7a6cafc](https://github.com/wms-org/wms-admin/commit/7a6cafc6e4ff6914fa62a870538b51759af866a8)) +- 优化配置文件 ([5b3d4f5](https://github.com/wms-org/wms-admin/commit/5b3d4f57788e30b62a1e1af9c2620a4cc8659bfe)) +- 优化登录 Helper ([afbd619](https://github.com/wms-org/wms-admin/commit/afbd619d098ff3d70fc786db9594cebf03c07e10)) +- 重构查询参数及字典接口 ([1d60213](https://github.com/wms-org/wms-admin/commit/1d602134377fc13b062981476b8c17947b36006d)) +- 重构查询角色字典接口 ([1e73d06](https://github.com/wms-org/wms-admin/commit/1e73d06a972d380bbed253eaffd806d8e0698525)) +- 使用 CompletableFuture 实现异步加载用户权限、角色代码和角色信息,以提高登录时的性能和响应速度 ([d5f3c74](https://github.com/charles7c/wms-admin/commit/d5f3c7417ad7b1178b5a53da3fd6f3cb7cd3b19a)) ### 🐛 问题修复 -- 补充查询文件资源统计权限校验注解 ([60cbf04](https://github.com/ysoft-org/ysoft-admin/commit/60cbf0402a350d05a09abec57ba94c7758b46499)) -- Postgresql startup script fixes (GitHub#60) ([8caad16](https://github.com/ysoft-org/ysoft-admin/commit/8caad16ef226e473a81f79b82485c3d03ded7a42)) -- 修复初始菜单数据错误 ([f062797](https://github.com/ysoft-org/ysoft-admin/commit/f062797629bd7fc220ceae1e44859146ef4a14ff)) -- 字典编码、存储编码及类型、菜单类型不允许修改 ([79d0101](https://github.com/ysoft-org/ysoft-admin/commit/79d0101e5eb1baa86979b6a6d3c584a2a483320f)) -- 修复行为验证码接口请求次数限制 ([573e634](https://github.com/ysoft-org/ysoft-admin/commit/573e634b433c473551244418e695a34bbd3fa675)) -- 修复导出用户报错 ([655a695](https://github.com/ysoft-org/ysoft-admin/commit/655a695753d12db624fbf2afaf10d38f67241e31)) -- 移除部门名称错误正则 ([0285874](https://github.com/ysoft-org/ysoft-admin/commit/0285874540c0cadc8aae74077f6368b6e7977c35)) -- 修复插入第三方登录用户时报错 ([0cfc7a5](https://github.com/ysoft-org/ysoft-admin/commit/0cfc7a5c80c3558028c7225fc459ecb07149ab0d)) -- 修复更新手机号、邮箱未加密的问题 ([485d708](https://github.com/ysoft-org/ysoft-admin/commit/485d708cd45df922ec8e601b7bd7344e9ebd9299)) ([e6d7205](https://github.com/ysoft-org/ysoft-admin/commit/e6d720571d3273f27351e81a19fdd97b9b4336f6)) +- 补充查询文件资源统计权限校验注解 ([60cbf04](https://github.com/wms-org/wms-admin/commit/60cbf0402a350d05a09abec57ba94c7758b46499)) +- Postgresql startup script fixes (GitHub#60) ([8caad16](https://github.com/wms-org/wms-admin/commit/8caad16ef226e473a81f79b82485c3d03ded7a42)) +- 修复初始菜单数据错误 ([f062797](https://github.com/wms-org/wms-admin/commit/f062797629bd7fc220ceae1e44859146ef4a14ff)) +- 字典编码、存储编码及类型、菜单类型不允许修改 ([79d0101](https://github.com/wms-org/wms-admin/commit/79d0101e5eb1baa86979b6a6d3c584a2a483320f)) +- 修复行为验证码接口请求次数限制 ([573e634](https://github.com/wms-org/wms-admin/commit/573e634b433c473551244418e695a34bbd3fa675)) +- 修复导出用户报错 ([655a695](https://github.com/wms-org/wms-admin/commit/655a695753d12db624fbf2afaf10d38f67241e31)) +- 移除部门名称错误正则 ([0285874](https://github.com/wms-org/wms-admin/commit/0285874540c0cadc8aae74077f6368b6e7977c35)) +- 修复插入第三方登录用户时报错 ([0cfc7a5](https://github.com/wms-org/wms-admin/commit/0cfc7a5c80c3558028c7225fc459ecb07149ab0d)) +- 修复更新手机号、邮箱未加密的问题 ([485d708](https://github.com/wms-org/wms-admin/commit/485d708cd45df922ec8e601b7bd7344e9ebd9299)) ([e6d7205](https://github.com/wms-org/wms-admin/commit/e6d720571d3273f27351e81a19fdd97b9b4336f6)) ### 📦 依赖升级 -- ContiNew Starter 2.0.0 => 2.1.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 2.0.0 => 2.1.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v3.0.1](https://github.com/ysoft-org/ysoft-admin/compare/v3.0.0...v3.0.1) (2024-05-03) +## [v3.0.1](https://github.com/wms-org/wms-admin/compare/v3.0.0...v3.0.1) (2024-05-03) ### ✨ 新特性 -* 新增验证码超时显示效果,超时后显示已过期请刷新 (GitHub#56) ([4c6a7fb](https://github.com/ysoft-org/ysoft-admin/commit/4c6a7fb91ad195b86d776f8aef6aef81d07b2eb1)) -* 文件管理增加资源统计,统计总存储量、各类型文件存储占用 (GitHub#58) ([15c966f](https://github.com/ysoft-org/ysoft-admin/commit/15c966f7bb255db3edea249f8d3354324cbdbf5b)) +* 新增验证码超时显示效果,超时后显示已过期请刷新 (GitHub#56) ([4c6a7fb](https://github.com/wms-org/wms-admin/commit/4c6a7fb91ad195b86d776f8aef6aef81d07b2eb1)) +* 文件管理增加资源统计,统计总存储量、各类型文件存储占用 (GitHub#58) ([15c966f](https://github.com/wms-org/wms-admin/commit/15c966f7bb255db3edea249f8d3354324cbdbf5b)) ### 💎 功能优化 -- 获取图片验证码 URL /img => /image ([9a1a472](https://github.com/ysoft-org/ysoft-admin/commit/9a1a472ec996362cb918e79b9ce37bfa2639a10b)) -- 移除对部分 API 重复的权限校验 ([53eaef9](https://github.com/ysoft-org/ysoft-admin/commit/53eaef9fbdfd6d0866a3d5e424d783e2e7bc0e17)) -- 优化代码生成模板 ([dc92731](https://github.com/ysoft-org/ysoft-admin/commit/dc9273132dc8e266f2d44c834b9c2733256afdfe)) ([def831f](https://github.com/ysoft-org/ysoft-admin/commit/def831f2dca0703f5ef8b84b0e695a32b171461d)) +- 获取图片验证码 URL /img => /image ([9a1a472](https://github.com/wms-org/wms-admin/commit/9a1a472ec996362cb918e79b9ce37bfa2639a10b)) +- 移除对部分 API 重复的权限校验 ([53eaef9](https://github.com/wms-org/wms-admin/commit/53eaef9fbdfd6d0866a3d5e424d783e2e7bc0e17)) +- 优化代码生成模板 ([dc92731](https://github.com/wms-org/wms-admin/commit/dc9273132dc8e266f2d44c834b9c2733256afdfe)) ([def831f](https://github.com/wms-org/wms-admin/commit/def831f2dca0703f5ef8b84b0e695a32b171461d)) ### 🐛 问题修复 -- 修复查询用户邮箱、手机号时未自动加密导致的错误 ([faa56d1](https://github.com/ysoft-org/ysoft-admin/commit/faa56d16b92cbdb8f7e16c8b43c2916ae692d881)) -- 修复根据部门查询用户列表数据错误 ([42ac82e](https://github.com/ysoft-org/ysoft-admin/commit/42ac82e7ceef9336741c2514470c0db36ab7075e)) -- 修复文件类型处理错误 ([9b60e24](https://github.com/ysoft-org/ysoft-admin/commit/9b60e24364bfb4cc7cd9996a43579a062197cdf3)) +- 修复查询用户邮箱、手机号时未自动加密导致的错误 ([faa56d1](https://github.com/wms-org/wms-admin/commit/faa56d16b92cbdb8f7e16c8b43c2916ae692d881)) +- 修复根据部门查询用户列表数据错误 ([42ac82e](https://github.com/wms-org/wms-admin/commit/42ac82e7ceef9336741c2514470c0db36ab7075e)) +- 修复文件类型处理错误 ([9b60e24](https://github.com/wms-org/wms-admin/commit/9b60e24364bfb4cc7cd9996a43579a062197cdf3)) -## [v3.0.0](https://github.com/ysoft-org/ysoft-admin/compare/v2.5.0...v3.0.0) (2024-04-27) +## [v3.0.0](https://github.com/wms-org/wms-admin/compare/v2.5.0...v3.0.0) (2024-04-27) ### ✨ 新特性 -* 系统日志新增导出 API ([bd0f40c](https://github.com/ysoft-org/ysoft-admin/commit/bd0f40c6ad397174baf80b04923ef1e94ff28e3c)) +* 系统日志新增导出 API ([bd0f40c](https://github.com/wms-org/wms-admin/commit/bd0f40c6ad397174baf80b04923ef1e94ff28e3c)) * 适配 3.0 前端菜单,并梳理菜单数据 -* 适配 3.0 前端代码生成模板,代码预览及生成 ([3dbe72f](https://github.com/ysoft-org/ysoft-admin/commit/3dbe72fd570c44b32599d869abd30331137a6c7d)) +* 适配 3.0 前端代码生成模板,代码预览及生成 ([3dbe72f](https://github.com/wms-org/wms-admin/commit/3dbe72fd570c44b32599d869abd30331137a6c7d)) ### 💎 功能优化 -- 重构日志管理相关接口 ([7793f82](https://github.com/ysoft-org/ysoft-admin/commit/7793f82009bcdb5fcdfe5e91daab211ab1705bf7)) -- 优化部门管理相关 API,合并 DeptResp 及 DeptDetailResp ([a2cf072](https://github.com/ysoft-org/ysoft-admin/commit/a2cf072609ac33543605ecbb5f8e498237bc3d91)) -- 优化存储管理相关 API,合并 StorageResp 及 StorageDetailResp ([f7b5a4f](https://github.com/ysoft-org/ysoft-admin/commit/f7b5a4ff8dd93f444c00d103b0609ae81e0dd70c)) -- 优化字典管理相关 API ([9ec5945](https://github.com/ysoft-org/ysoft-admin/commit/9ec594509f2d4b31f46e3aca66d65d139dc8b94f)) -- 移除部门、角色、菜单、用户、存储的状态默认值 ([bd5ede2](https://github.com/ysoft-org/ysoft-admin/commit/bd5ede2e2956057376b930ecfed88ca44437cbc1)) -- 代码生成新增 MySQL json 数据类型映射 ([fe57350](https://github.com/ysoft-org/ysoft-admin/commit/fe5735090d94f5d900d79142e5e42ba2db9c0249)) -- 优化角色管理相关 API,角色编码不允许修改 ([df59cee](https://github.com/ysoft-org/ysoft-admin/commit/df59cee98565f9f45b04d16533888be39c3d7a6f)) -- 优化用户管理相关 API ([5269608](https://github.com/ysoft-org/ysoft-admin/commit/5269608c61b1f5a6a9f61cd45b349f28db714232)) -- 文件管理查询 API 调整为分页查询 ([f8bea90](https://github.com/ysoft-org/ysoft-admin/commit/f8bea901938aec0f0ac21c63179c5bde2a0965a7)) -- 移除 Qodana 扫描 ([d88581f](https://github.com/ysoft-org/ysoft-admin/commit/d88581f939afb0caa3589c8ee76c9b296bb9997e)) -- 移除菜单导出接口 ([4363c91](https://github.com/ysoft-org/ysoft-admin/commit/4363c91872e6d83e139b22c95a0d7e83183d8f69)) -- 优化系统日志、在线用户、存储管理、部门管理相关代码 ([a2e4f9a](https://github.com/ysoft-org/ysoft-admin/commit/a2e4f9a28b744e269c46dc66c60311bb939021a7)) -- 优化查询参数字典 API 地址 ([79a3de8](https://github.com/ysoft-org/ysoft-admin/commit/79a3de8971c613277bdcea79463b6f06959e7b85)) -- 移除角色状态字段 ([e89ba7d](https://github.com/ysoft-org/ysoft-admin/commit/e89ba7d5cd793e20c3562c7bd1e4655ed1e5a2a3)) +- 重构日志管理相关接口 ([7793f82](https://github.com/wms-org/wms-admin/commit/7793f82009bcdb5fcdfe5e91daab211ab1705bf7)) +- 优化部门管理相关 API,合并 DeptResp 及 DeptDetailResp ([a2cf072](https://github.com/wms-org/wms-admin/commit/a2cf072609ac33543605ecbb5f8e498237bc3d91)) +- 优化存储管理相关 API,合并 StorageResp 及 StorageDetailResp ([f7b5a4f](https://github.com/wms-org/wms-admin/commit/f7b5a4ff8dd93f444c00d103b0609ae81e0dd70c)) +- 优化字典管理相关 API ([9ec5945](https://github.com/wms-org/wms-admin/commit/9ec594509f2d4b31f46e3aca66d65d139dc8b94f)) +- 移除部门、角色、菜单、用户、存储的状态默认值 ([bd5ede2](https://github.com/wms-org/wms-admin/commit/bd5ede2e2956057376b930ecfed88ca44437cbc1)) +- 代码生成新增 MySQL json 数据类型映射 ([fe57350](https://github.com/wms-org/wms-admin/commit/fe5735090d94f5d900d79142e5e42ba2db9c0249)) +- 优化角色管理相关 API,角色编码不允许修改 ([df59cee](https://github.com/wms-org/wms-admin/commit/df59cee98565f9f45b04d16533888be39c3d7a6f)) +- 优化用户管理相关 API ([5269608](https://github.com/wms-org/wms-admin/commit/5269608c61b1f5a6a9f61cd45b349f28db714232)) +- 文件管理查询 API 调整为分页查询 ([f8bea90](https://github.com/wms-org/wms-admin/commit/f8bea901938aec0f0ac21c63179c5bde2a0965a7)) +- 移除 Qodana 扫描 ([d88581f](https://github.com/wms-org/wms-admin/commit/d88581f939afb0caa3589c8ee76c9b296bb9997e)) +- 移除菜单导出接口 ([4363c91](https://github.com/wms-org/wms-admin/commit/4363c91872e6d83e139b22c95a0d7e83183d8f69)) +- 优化系统日志、在线用户、存储管理、部门管理相关代码 ([a2e4f9a](https://github.com/wms-org/wms-admin/commit/a2e4f9a28b744e269c46dc66c60311bb939021a7)) +- 优化查询参数字典 API 地址 ([79a3de8](https://github.com/wms-org/wms-admin/commit/79a3de8971c613277bdcea79463b6f06959e7b85)) +- 移除角色状态字段 ([e89ba7d](https://github.com/wms-org/wms-admin/commit/e89ba7d5cd793e20c3562c7bd1e4655ed1e5a2a3)) ### 🐛 问题修复 -- 使用字典时,仅查询启用状态字典 ([17c795f](https://github.com/ysoft-org/ysoft-admin/commit/17c795fedef5b6801f2053d97b9d78d067775ca1)) -- 获取 Authorization 请求头内容兼容小写请求头场景 ([e68c445](https://github.com/ysoft-org/ysoft-admin/commit/e68c4455a8af1b4d7a25cd63f9fc9e5aabb441ab)) -- 修复查询用户权限存在空值的问题 ([fce4a56](https://github.com/ysoft-org/ysoft-admin/commit/fce4a566d7204791650153f0a5507a5d05d2d6c3)) -- 存储管理 S3 存储功能修复 (GitHub#51) ([f71c4c2](https://github.com/ysoft-org/ysoft-admin/commit/f71c4c226ffd7c27f6726873be6af125affaf148)) -- 修复 sys_role_menu 表初始数据错误 ([70ed667](https://github.com/ysoft-org/ysoft-admin/commit/70ed667c16388093204eecd97e4914076c62d1ff)) -- 修复用户管理/角色管理编辑及状态变更问题 (GitHub#53) ([abf1e65](https://github.com/ysoft-org/ysoft-admin/commit/abf1e651e9782a6f7bf2a896018de17130038c57)) -- 修复Failed to submit a listener notification task. Event loop shut down? 问题,开发时表现为需要点击两次才能关闭程序 ([f5ab22e](https://github.com/ysoft-org/ysoft-admin/commit/f5ab22eedf594cee43592a2f29409ee9c33a88d3)) +- 使用字典时,仅查询启用状态字典 ([17c795f](https://github.com/wms-org/wms-admin/commit/17c795fedef5b6801f2053d97b9d78d067775ca1)) +- 获取 Authorization 请求头内容兼容小写请求头场景 ([e68c445](https://github.com/wms-org/wms-admin/commit/e68c4455a8af1b4d7a25cd63f9fc9e5aabb441ab)) +- 修复查询用户权限存在空值的问题 ([fce4a56](https://github.com/wms-org/wms-admin/commit/fce4a566d7204791650153f0a5507a5d05d2d6c3)) +- 存储管理 S3 存储功能修复 (GitHub#51) ([f71c4c2](https://github.com/wms-org/wms-admin/commit/f71c4c226ffd7c27f6726873be6af125affaf148)) +- 修复 sys_role_menu 表初始数据错误 ([70ed667](https://github.com/wms-org/wms-admin/commit/70ed667c16388093204eecd97e4914076c62d1ff)) +- 修复用户管理/角色管理编辑及状态变更问题 (GitHub#53) ([abf1e65](https://github.com/wms-org/wms-admin/commit/abf1e651e9782a6f7bf2a896018de17130038c57)) +- 修复Failed to submit a listener notification task. Event loop shut down? 问题,开发时表现为需要点击两次才能关闭程序 ([f5ab22e](https://github.com/wms-org/wms-admin/commit/f5ab22eedf594cee43592a2f29409ee9c33a88d3)) ### 💥 破坏性变更 -- 适配 ysoft-starter 2.0.0,top.charles7c.ysoft.starter => top.ysoft.starter ([f5ab22e](https://github.com/ysoft-org/ysoft-admin/commit/f5ab22eedf594cee43592a2f29409ee9c33a88d3)) -- 移除 monitor 模块 ([b6206a3](https://github.com/ysoft-org/ysoft-admin/commit/b6206a334671894306043f86ec07d7c045cd757d)) -- top.charles7c.ysoft.admin => top.ysoft.admin ([08eeabc](https://github.com/ysoft-org/ysoft-admin/commit/08eeabc47d58db3cfc861a3a527e52bf89f6183b)) -- 公告管理 Announcement => Notice ([dbe93df](https://github.com/ysoft-org/ysoft-admin/commit/dbe93df8bcec0b7dfb24fbd92f35928a3156f4e5)) +- 适配 wms-starter 2.0.0,top.charles7c.wms.starter => top.wms.starter ([f5ab22e](https://github.com/wms-org/wms-admin/commit/f5ab22eedf594cee43592a2f29409ee9c33a88d3)) +- 移除 monitor 模块 ([b6206a3](https://github.com/wms-org/wms-admin/commit/b6206a334671894306043f86ec07d7c045cd757d)) +- top.charles7c.wms.admin => top.wms.admin ([08eeabc](https://github.com/wms-org/wms-admin/commit/08eeabc47d58db3cfc861a3a527e52bf89f6183b)) +- 公告管理 Announcement => Notice ([dbe93df](https://github.com/wms-org/wms-admin/commit/dbe93df8bcec0b7dfb24fbd92f35928a3156f4e5)) ### 📦 依赖升级 -- ContiNew Starter 1.5.1 => 2.0.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 1.5.1 => 2.0.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v2.5.0](https://github.com/ysoft-org/ysoft-admin/compare/v2.4.0...v2.5.0) (2024-03-23) +## [v2.5.0](https://github.com/wms-org/wms-admin/compare/v2.4.0...v2.5.0) (2024-03-23) ### ✨ 新特性 -* 新增 PostgreSQL 数据源配置示例 ([ee48c80](https://github.com/ysoft-org/ysoft-admin/commit/ee48c80cd10a4c4546d1cb24f1f4716bb2ac08ea)) -* 新增 PostgreSQL 部署脚本 ([3129e0a](https://github.com/ysoft-org/ysoft-admin/commit/3129e0a6dcbd809f0013fbf6c53ad029ae9f7a0e)) -* 新增 PostgreSQL 初始 SQL 脚本 ([33b8102](https://github.com/ysoft-org/ysoft-admin/commit/33b81029df0b51058b3525b4317b51a2351319dc)) -* 新增代码生成器插件模块(后续会改造为独立插件) ([87829d3](https://github.com/ysoft-org/ysoft-admin/commit/87829d3ce8ab5a35091800900f7d7708f15ed9c2)) -* 代码生成同步最新数据表结构支持同步排序 ([89546de](https://github.com/ysoft-org/ysoft-admin/commit/89546deced78f83daca7ac0ba2e7d3d8cd101d0c)) -* 新增代码批量生成功能 ([Gitee PR#12](https://gitee.com/ysoft/ysoft-admin/pulls/12)) ([040f137](https://github.com/ysoft-org/ysoft-admin/commit/040f137934130451700bc28aeabbced30970c5f6)) +* 新增 PostgreSQL 数据源配置示例 ([ee48c80](https://github.com/wms-org/wms-admin/commit/ee48c80cd10a4c4546d1cb24f1f4716bb2ac08ea)) +* 新增 PostgreSQL 部署脚本 ([3129e0a](https://github.com/wms-org/wms-admin/commit/3129e0a6dcbd809f0013fbf6c53ad029ae9f7a0e)) +* 新增 PostgreSQL 初始 SQL 脚本 ([33b8102](https://github.com/wms-org/wms-admin/commit/33b81029df0b51058b3525b4317b51a2351319dc)) +* 新增代码生成器插件模块(后续会改造为独立插件) ([87829d3](https://github.com/wms-org/wms-admin/commit/87829d3ce8ab5a35091800900f7d7708f15ed9c2)) +* 代码生成同步最新数据表结构支持同步排序 ([89546de](https://github.com/wms-org/wms-admin/commit/89546deced78f83daca7ac0ba2e7d3d8cd101d0c)) +* 新增代码批量生成功能 ([Gitee PR#12](https://gitee.com/wms/wms-admin/pulls/12)) ([040f137](https://github.com/wms-org/wms-admin/commit/040f137934130451700bc28aeabbced30970c5f6)) ### 💎 功能优化 -- 移除 ` 符号的使用,保持数据库无关性 ([d6b07bd](https://github.com/ysoft-org/ysoft-admin/commit/d6b07bd6d1b1f9077a7571702b58c5e9c782b446)) -- 优化字符串模板方法 API 使用 ([0f39384](https://github.com/ysoft-org/ysoft-admin/commit/0f393845a19432e7c965e811c96774694f4d2372)) -- 调整部分 SQL 语句,以兼容 PostgreSQL 数据库 ([9f5049b](https://github.com/ysoft-org/ysoft-admin/commit/9f5049bf26c557738867dfe833261d60d071d4a8)) ([bf60d48](https://github.com/ysoft-org/ysoft-admin/commit/bf60d48d3a53dd5d73a78e73b6b230e3271ec3de)) -- 新增插件仓库配置 ([0439252](https://github.com/ysoft-org/ysoft-admin/commit/04392524ac13c2096b549f99d0391fa1d375ca31)) -- 优化部分接口响应格式为 kv 格式 ([b40d872](https://github.com/ysoft-org/ysoft-admin/commit/b40d872bc4b8dd30ad952d639158619b43cef999)) -- 适配 Crane4j 条件注解 ([bf00747](https://github.com/ysoft-org/ysoft-admin/commit/bf007470b2362159309ff8231a2f0ad180cfc947)) -- 重构代码生成配置 ([7031a51](https://github.com/ysoft-org/ysoft-admin/commit/7031a51cd4d7072d4da841736678bb81b2123e9d)) -- 重构代码生成功能,由指定路径生成模式调整为下载模式,更方便复杂场景 ([df0c0dd](https://github.com/ysoft-org/ysoft-admin/commit/df0c0dd7dcf39620abaf21bd450620ec3fffcf37)) +- 移除 ` 符号的使用,保持数据库无关性 ([d6b07bd](https://github.com/wms-org/wms-admin/commit/d6b07bd6d1b1f9077a7571702b58c5e9c782b446)) +- 优化字符串模板方法 API 使用 ([0f39384](https://github.com/wms-org/wms-admin/commit/0f393845a19432e7c965e811c96774694f4d2372)) +- 调整部分 SQL 语句,以兼容 PostgreSQL 数据库 ([9f5049b](https://github.com/wms-org/wms-admin/commit/9f5049bf26c557738867dfe833261d60d071d4a8)) ([bf60d48](https://github.com/wms-org/wms-admin/commit/bf60d48d3a53dd5d73a78e73b6b230e3271ec3de)) +- 新增插件仓库配置 ([0439252](https://github.com/wms-org/wms-admin/commit/04392524ac13c2096b549f99d0391fa1d375ca31)) +- 优化部分接口响应格式为 kv 格式 ([b40d872](https://github.com/wms-org/wms-admin/commit/b40d872bc4b8dd30ad952d639158619b43cef999)) +- 适配 Crane4j 条件注解 ([bf00747](https://github.com/wms-org/wms-admin/commit/bf007470b2362159309ff8231a2f0ad180cfc947)) +- 重构代码生成配置 ([7031a51](https://github.com/wms-org/wms-admin/commit/7031a51cd4d7072d4da841736678bb81b2123e9d)) +- 重构代码生成功能,由指定路径生成模式调整为下载模式,更方便复杂场景 ([df0c0dd](https://github.com/wms-org/wms-admin/commit/df0c0dd7dcf39620abaf21bd450620ec3fffcf37)) ### 🐛 问题修复 -- 修复 MySQL 初始 SQL 脚本数据错误 ([49d6bd6](https://github.com/ysoft-org/ysoft-admin/commit/49d6bd6874b3df66fd2e2051ea273cb43cb7b4f6)) -- 修复参数缓存未及时过期的问题 ([976e9c4](https://github.com/ysoft-org/ysoft-admin/commit/976e9c43df5926c533723a75222c59fde05e122e)) -- 修复代码生成 text 类型数据的长度校验时,数值显示为 65,535 的问题 ([8026f66](https://github.com/ysoft-org/ysoft-admin/commit/8026f660c7af7bba6d4caaf31535a890e5b40a96)) +- 修复 MySQL 初始 SQL 脚本数据错误 ([49d6bd6](https://github.com/wms-org/wms-admin/commit/49d6bd6874b3df66fd2e2051ea273cb43cb7b4f6)) +- 修复参数缓存未及时过期的问题 ([976e9c4](https://github.com/wms-org/wms-admin/commit/976e9c43df5926c533723a75222c59fde05e122e)) +- 修复代码生成 text 类型数据的长度校验时,数值显示为 65,535 的问题 ([8026f66](https://github.com/wms-org/wms-admin/commit/8026f660c7af7bba6d4caaf31535a890e5b40a96)) ### 💥 破坏性变更 -- 调整 liquibase 目录结构,更适合开源类项目适配多种数据库脚本场景 ([1ca48a6](https://github.com/ysoft-org/ysoft-admin/commit/1ca48a6620cff62f3648cc28042843163589e150)) -- 适配 ContiNew Starter 日志及数据库工具的包结构优化 ([3405868](https://github.com/ysoft-org/ysoft-admin/commit/3405868c7f042beafb77a7407a388a40b9a75466)) -- 适配 ContiNew Starter Query 组件的包结构优化 ([6be1b6c](https://github.com/ysoft-org/ysoft-admin/commit/6be1b6cfb1e7fef4422b8c38e6073a435ebae5c2)) +- 调整 liquibase 目录结构,更适合开源类项目适配多种数据库脚本场景 ([1ca48a6](https://github.com/wms-org/wms-admin/commit/1ca48a6620cff62f3648cc28042843163589e150)) +- 适配 ContiNew Starter 日志及数据库工具的包结构优化 ([3405868](https://github.com/wms-org/wms-admin/commit/3405868c7f042beafb77a7407a388a40b9a75466)) +- 适配 ContiNew Starter Query 组件的包结构优化 ([6be1b6c](https://github.com/wms-org/wms-admin/commit/6be1b6cfb1e7fef4422b8c38e6073a435ebae5c2)) ### 📦 依赖升级 -- ContiNew Starter 1.4.0 => 1.5.1 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 1.4.0 => 1.5.1 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v2.4.0](https://github.com/ysoft-org/ysoft-admin/compare/v2.3.0...v2.4.0) (2024-02-16) +## [v2.4.0](https://github.com/wms-org/wms-admin/compare/v2.3.0...v2.4.0) (2024-02-16) ### ✨ 新特性 -* 集成 TLog(轻量级的分布式日志标记追踪神器) ([Gitee PR#10](https://gitee.com/ysoft/ysoft-admin/pulls/10)) -* 系统日志新增 traceId 链路号记录,方便查看完整日志链路 ([860ca40](https://github.com/ysoft-org/ysoft-admin/commit/860ca403c2c32cc6395c1608217bc9b6e7c18bd8)) -* 取消用户默认密码,改为表单填写密码 ([3d77aa9](https://github.com/ysoft-org/ysoft-admin/commit/3d77aa91ee32065b53d9c47a57c33d6d7e4efb0e)) -* 适配 ContiNew Starter 加密模块(安全模块) ([6435175](https://github.com/ysoft-org/ysoft-admin/commit/6435175dc3d853cb170270e39e8f1505adffeae5)) ([43da462](https://github.com/ysoft-org/ysoft-admin/commit/43da462560e224ed92f239cb5af4db64dea51d18)) -* 适配 ContiNew Starter 脱敏模块(安全模块) ([2109789](https://github.com/ysoft-org/ysoft-admin/commit/2109789116d9ff18773d8afeb854d1dfc70b935a)) +* 集成 TLog(轻量级的分布式日志标记追踪神器) ([Gitee PR#10](https://gitee.com/wms/wms-admin/pulls/10)) +* 系统日志新增 traceId 链路号记录,方便查看完整日志链路 ([860ca40](https://github.com/wms-org/wms-admin/commit/860ca403c2c32cc6395c1608217bc9b6e7c18bd8)) +* 取消用户默认密码,改为表单填写密码 ([3d77aa9](https://github.com/wms-org/wms-admin/commit/3d77aa91ee32065b53d9c47a57c33d6d7e4efb0e)) +* 适配 ContiNew Starter 加密模块(安全模块) ([6435175](https://github.com/wms-org/wms-admin/commit/6435175dc3d853cb170270e39e8f1505adffeae5)) ([43da462](https://github.com/wms-org/wms-admin/commit/43da462560e224ed92f239cb5af4db64dea51d18)) +* 适配 ContiNew Starter 脱敏模块(安全模块) ([2109789](https://github.com/wms-org/wms-admin/commit/2109789116d9ff18773d8afeb854d1dfc70b935a)) ### 💎 功能优化 -- 优化 API 文档分组配置 ([2df4cce](https://github.com/ysoft-org/ysoft-admin/commit/2df4cceedd35b1c2c07bcbf38b5a157604a752c2)) -- 优化 QueryTypeEnum 枚举值命名 ([9648cf6](https://github.com/ysoft-org/ysoft-admin/commit/9648cf64a4679657f0e609f980805d274563aa53)) -- 优化 Query 相关注解使用方式 ([15b1520](https://github.com/ysoft-org/ysoft-admin/commit/15b152008c6ae8ab89704d83a969dcfbbb8b5b88)) -- 新增 Qodana 扫描 ([f6a9581](https://github.com/ysoft-org/ysoft-admin/commit/f6a9581adef87a8915639e6cb2d7c4d02315ebd0)) -- 新增 SonarCloud 扫描 ([a154abd](https://github.com/ysoft-org/ysoft-admin/commit/a154abde8a39cfecc421c79e01998274b944d2c1)) ([c03c082](https://github.com/ysoft-org/ysoft-admin/commit/c03c082d2e2884962547633f5e98663088bd2c3b)) -- 移除 Lombok 私有构造注解使用 ([a2420d3](https://github.com/ysoft-org/ysoft-admin/commit/a2420d3f4b4652a1d9711f513b8fb22a56105141)) -- 获取不到当前登录用户信息则抛出未登录异常 ([d972a44](https://github.com/ysoft-org/ysoft-admin/commit/d972a4466a9e8a1a6e6375e4171a4790c2ba156e)) -- 优化代码,解决 [Sonar](https://sonarcloud.io/organizations/charles7c/projects)、[Codacy](https://app.codacy.com/gh/ysoft-org/ysoft-admin/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)、[Qodana](https://qodana.cloud/organizations/pQDPD/teams/p5jqd/) 扫描问题,点击各链接查看对应实时质量分析报告(Codacy 已达到 A) -- 优化部署配置 ([b5d668e](https://github.com/ysoft-org/ysoft-admin/commit/b5d668e014690d3f1a8a2bab0d0ad0039083e7bb)) -- 使用密码编码器重构密码加密、密码判断等相关处理 ([594f7fd](https://github.com/ysoft-org/ysoft-admin/commit/594f7fd042f1ff96a298f2e59ffdda112113cb51)) -- 优化 SaToken 及图形验证码配置 ([70973db](https://github.com/ysoft-org/ysoft-admin/commit/70973db71f2eed49c5878d69d8b93ff04b13a8b9)) -- 优化图形验证码使用及部分配置 ([a50d857](https://github.com/ysoft-org/ysoft-admin/commit/a50d857c41d164355d36ae5dfd14c6badbe06202)) +- 优化 API 文档分组配置 ([2df4cce](https://github.com/wms-org/wms-admin/commit/2df4cceedd35b1c2c07bcbf38b5a157604a752c2)) +- 优化 QueryTypeEnum 枚举值命名 ([9648cf6](https://github.com/wms-org/wms-admin/commit/9648cf64a4679657f0e609f980805d274563aa53)) +- 优化 Query 相关注解使用方式 ([15b1520](https://github.com/wms-org/wms-admin/commit/15b152008c6ae8ab89704d83a969dcfbbb8b5b88)) +- 新增 Qodana 扫描 ([f6a9581](https://github.com/wms-org/wms-admin/commit/f6a9581adef87a8915639e6cb2d7c4d02315ebd0)) +- 新增 SonarCloud 扫描 ([a154abd](https://github.com/wms-org/wms-admin/commit/a154abde8a39cfecc421c79e01998274b944d2c1)) ([c03c082](https://github.com/wms-org/wms-admin/commit/c03c082d2e2884962547633f5e98663088bd2c3b)) +- 移除 Lombok 私有构造注解使用 ([a2420d3](https://github.com/wms-org/wms-admin/commit/a2420d3f4b4652a1d9711f513b8fb22a56105141)) +- 获取不到当前登录用户信息则抛出未登录异常 ([d972a44](https://github.com/wms-org/wms-admin/commit/d972a4466a9e8a1a6e6375e4171a4790c2ba156e)) +- 优化代码,解决 [Sonar](https://sonarcloud.io/organizations/charles7c/projects)、[Codacy](https://app.codacy.com/gh/wms-org/wms-admin/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)、[Qodana](https://qodana.cloud/organizations/pQDPD/teams/p5jqd/) 扫描问题,点击各链接查看对应实时质量分析报告(Codacy 已达到 A) +- 优化部署配置 ([b5d668e](https://github.com/wms-org/wms-admin/commit/b5d668e014690d3f1a8a2bab0d0ad0039083e7bb)) +- 使用密码编码器重构密码加密、密码判断等相关处理 ([594f7fd](https://github.com/wms-org/wms-admin/commit/594f7fd042f1ff96a298f2e59ffdda112113cb51)) +- 优化 SaToken 及图形验证码配置 ([70973db](https://github.com/wms-org/wms-admin/commit/70973db71f2eed49c5878d69d8b93ff04b13a8b9)) +- 优化图形验证码使用及部分配置 ([a50d857](https://github.com/wms-org/wms-admin/commit/a50d857c41d164355d36ae5dfd14c6badbe06202)) ### 🐛 问题修复 -- 修复 API 响应内容类型错误 ([439f7c7](https://github.com/ysoft-org/ysoft-admin/commit/439f7c7c58ee27ff56b5093df71bc902c46f48fa)) +- 修复 API 响应内容类型错误 ([439f7c7](https://github.com/wms-org/wms-admin/commit/439f7c7c58ee27ff56b5093df71bc902c46f48fa)) ### 💥 破坏性变更 -- 调整自增 ID 为分布式 ID ([4779887](https://github.com/ysoft-org/ysoft-admin/commit/4779887751bd3a696e4d31294057e8c03d66eaf3)) +- 调整自增 ID 为分布式 ID ([4779887](https://github.com/wms-org/wms-admin/commit/4779887751bd3a696e4d31294057e8c03d66eaf3)) ### 📦 依赖升级 -- ContiNew Starter 1.2.0 => 1.4.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 1.2.0 => 1.4.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v2.3.0](https://github.com/ysoft-org/ysoft-admin/compare/v2.2.0...v2.3.0) (2024-01-21) +## [v2.3.0](https://github.com/wms-org/wms-admin/compare/v2.2.0...v2.3.0) (2024-01-21) ### ✨ 新特性 -* 代码生成 Request 实体时,针对字符串类型增加数据长度校验注解 ([ee82558](https://github.com/ysoft-org/ysoft-admin/commit/ee8255876f618137f811e14ee305509e4e6466d0)) -* 适配 Crane4j 数据填充组件,优化部分数据填充处理 ([d598408](https://github.com/ysoft-org/ysoft-admin/commit/d5984087a306de31690e9a81d951bd831434a0c9)) ([a2411f7](https://github.com/ysoft-org/ysoft-admin/commit/a2411f728a811910a0918668c0811e7df0345640)) ([7a3ccc2](https://github.com/ysoft-org/ysoft-admin/commit/7a3ccc2dee8f7b938a91df52fd4903ce09e662e5)) -* 移除 Spring Cache,适配 JetCache ([d4bb39d](https://github.com/ysoft-org/ysoft-admin/commit/d4bb39d9b4483b7d7fed76b5f2b997538d86d719)) ([1b7aa9d](https://github.com/ysoft-org/ysoft-admin/commit/1b7aa9db0c56af733f63f602988dba9e225fe445)) ([8596e47](https://github.com/ysoft-org/ysoft-admin/commit/8596e47ed62e19083d6007448c5369d72fa4f2b6)) +* 代码生成 Request 实体时,针对字符串类型增加数据长度校验注解 ([ee82558](https://github.com/wms-org/wms-admin/commit/ee8255876f618137f811e14ee305509e4e6466d0)) +* 适配 Crane4j 数据填充组件,优化部分数据填充处理 ([d598408](https://github.com/wms-org/wms-admin/commit/d5984087a306de31690e9a81d951bd831434a0c9)) ([a2411f7](https://github.com/wms-org/wms-admin/commit/a2411f728a811910a0918668c0811e7df0345640)) ([7a3ccc2](https://github.com/wms-org/wms-admin/commit/7a3ccc2dee8f7b938a91df52fd4903ce09e662e5)) +* 移除 Spring Cache,适配 JetCache ([d4bb39d](https://github.com/wms-org/wms-admin/commit/d4bb39d9b4483b7d7fed76b5f2b997538d86d719)) ([1b7aa9d](https://github.com/wms-org/wms-admin/commit/1b7aa9db0c56af733f63f602988dba9e225fe445)) ([8596e47](https://github.com/wms-org/wms-admin/commit/8596e47ed62e19083d6007448c5369d72fa4f2b6)) ### 💎 功能优化 -- 优化本地存储库注册 ([918e897](https://github.com/ysoft-org/ysoft-admin/commit/918e897838628b24a160c3a8f3b3dea1eefd1883)) -- 增加华为云镜像源仓库配置 ([16ee2b4](https://github.com/ysoft-org/ysoft-admin/commit/16ee2b4b6fe2a663830972ed99d4e80ddf5a3593)) -- 优化部分字段名称 ([e3e958b](https://github.com/ysoft-org/ysoft-admin/commit/e3e958b419e1ea23fe146b255fce749050302f63)) -- 调整代码生成前端 Vue 页面模板 ([7c34574](https://github.com/ysoft-org/ysoft-admin/commit/7c345745aadc6272e5f1db674c757ff0f9cea604)) -- 更新格式配置,优化全局代码格式 ([35e3123](https://github.com/ysoft-org/ysoft-admin/commit/35e31233c531b68b761c73fc0daf7444843b4059)) -- 优化配置文件格式 ([a8a4cad](https://github.com/ysoft-org/ysoft-admin/commit/a8a4cad840b6d32fbb8d3df24b193f9e7c826d22)) -- 使用钩子方法优化部分增、删、改处理 ([61c5724](https://github.com/ysoft-org/ysoft-admin/commit/61c57242fa481d2668b1d1ac4ff4802c47fd07bc)) -- 完善 flatten Maven 插件配置,以覆盖更多使用情况 ([657accd](https://github.com/ysoft-org/ysoft-admin/commit/657accd8a595ab0c2e9ff4d00e49c569eae03123)) -- 移除部分无用 Maven 配置 ([5db1f66](https://github.com/ysoft-org/ysoft-admin/commit/5db1f669e0bc5022bcd2164757a0f82dfe8d6c30)) -- 优化日志配置,滚动策略调整为基于日志文件大小和时间滚动 ([2fa8c25](https://github.com/ysoft-org/ysoft-admin/commit/2fa8c254fc53cda3d33c56931569822e645dd902)) +- 优化本地存储库注册 ([918e897](https://github.com/wms-org/wms-admin/commit/918e897838628b24a160c3a8f3b3dea1eefd1883)) +- 增加华为云镜像源仓库配置 ([16ee2b4](https://github.com/wms-org/wms-admin/commit/16ee2b4b6fe2a663830972ed99d4e80ddf5a3593)) +- 优化部分字段名称 ([e3e958b](https://github.com/wms-org/wms-admin/commit/e3e958b419e1ea23fe146b255fce749050302f63)) +- 调整代码生成前端 Vue 页面模板 ([7c34574](https://github.com/wms-org/wms-admin/commit/7c345745aadc6272e5f1db674c757ff0f9cea604)) +- 更新格式配置,优化全局代码格式 ([35e3123](https://github.com/wms-org/wms-admin/commit/35e31233c531b68b761c73fc0daf7444843b4059)) +- 优化配置文件格式 ([a8a4cad](https://github.com/wms-org/wms-admin/commit/a8a4cad840b6d32fbb8d3df24b193f9e7c826d22)) +- 使用钩子方法优化部分增、删、改处理 ([61c5724](https://github.com/wms-org/wms-admin/commit/61c57242fa481d2668b1d1ac4ff4802c47fd07bc)) +- 完善 flatten Maven 插件配置,以覆盖更多使用情况 ([657accd](https://github.com/wms-org/wms-admin/commit/657accd8a595ab0c2e9ff4d00e49c569eae03123)) +- 移除部分无用 Maven 配置 ([5db1f66](https://github.com/wms-org/wms-admin/commit/5db1f669e0bc5022bcd2164757a0f82dfe8d6c30)) +- 优化日志配置,滚动策略调整为基于日志文件大小和时间滚动 ([2fa8c25](https://github.com/wms-org/wms-admin/commit/2fa8c254fc53cda3d33c56931569822e645dd902)) ### 🐛 问题修复 -- 完善代码生成前端路径配置校验 ([bee04d5](https://github.com/ysoft-org/ysoft-admin/commit/bee04d5f363b6de88df5249b0fba85607978b303)) +- 完善代码生成前端路径配置校验 ([bee04d5](https://github.com/wms-org/wms-admin/commit/bee04d5f363b6de88df5249b0fba85607978b303)) ### 💥 破坏性变更 -- 根据发展需要,拆分前端项目 ysoft-admin-ui 到独立仓库 ([4067eb9](https://github.com/ysoft-org/ysoft-admin/commit/4067eb97bf344dec6ae718433b57bdb7d0b8d6cd)) -- PageDataResp => PageResp ([d8c946e](https://github.com/ysoft-org/ysoft-admin/commit/d8c946e8014d205c4fd3f38d1f04b3225faede7a)) -- 适配 ContiNew Starter IService 接口,CRUD 查询详情方法不再检查是否存在 ([47a133a](https://github.com/ysoft-org/ysoft-admin/commit/47a133a065b5c858b588bf77ad51bb9fc38d1222)) -- 适配 ContiNew Starter CRUD 模块注解 ([7fa70e7](https://github.com/ysoft-org/ysoft-admin/commit/7fa70e74070c7c0f487baa5098f85d7dfb808106)) -- 调整部分类的所在包 ([8dc42c7](https://github.com/ysoft-org/ysoft-admin/commit/8dc42c7a21e7422399b49690b28899df299e20c7)) ([6efe1ad](https://github.com/ysoft-org/ysoft-admin/commit/6efe1ad6f416c52130b2380a699129e7dae29499)) +- 根据发展需要,拆分前端项目 wms-admin-ui 到独立仓库 ([4067eb9](https://github.com/wms-org/wms-admin/commit/4067eb97bf344dec6ae718433b57bdb7d0b8d6cd)) +- PageDataResp => PageResp ([d8c946e](https://github.com/wms-org/wms-admin/commit/d8c946e8014d205c4fd3f38d1f04b3225faede7a)) +- 适配 ContiNew Starter IService 接口,CRUD 查询详情方法不再检查是否存在 ([47a133a](https://github.com/wms-org/wms-admin/commit/47a133a065b5c858b588bf77ad51bb9fc38d1222)) +- 适配 ContiNew Starter CRUD 模块注解 ([7fa70e7](https://github.com/wms-org/wms-admin/commit/7fa70e74070c7c0f487baa5098f85d7dfb808106)) +- 调整部分类的所在包 ([8dc42c7](https://github.com/wms-org/wms-admin/commit/8dc42c7a21e7422399b49690b28899df299e20c7)) ([6efe1ad](https://github.com/wms-org/wms-admin/commit/6efe1ad6f416c52130b2380a699129e7dae29499)) ### 📦 依赖升级 -- ContiNew Starter 1.1.0 => 1.2.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) +- ContiNew Starter 1.1.0 => 1.2.0 (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) -## [v2.2.0](https://github.com/ysoft-org/ysoft-admin/compare/v2.1.0...v2.2.0) (2023-12-31) +## [v2.2.0](https://github.com/wms-org/wms-admin/compare/v2.1.0...v2.2.0) (2023-12-31) ### ✨ 新特性 -* 发送短信验证码新增限流处理 ([e719d20](https://github.com/ysoft-org/ysoft-admin/commit/e719d207fb76c82b584f2e1ac7210061dc71a89a)) -* 代码生成新增生成预览功能 ([4017029](https://github.com/ysoft-org/ysoft-admin/commit/401702972f30c4e556a2cf8d048f78fa9ee1c5ba)) ([505ba49](https://github.com/ysoft-org/ysoft-admin/commit/505ba49a5304fb3e2ba655dea901cd5e3ea74673)) -* 适配 ContiNew Starter 行为验证码,系统内所有短信发送新增前置行为验证码验证 ([Gitee PR#9](https://gitee.com/ysoft/ysoft-admin/pulls/9)) +* 发送短信验证码新增限流处理 ([e719d20](https://github.com/wms-org/wms-admin/commit/e719d207fb76c82b584f2e1ac7210061dc71a89a)) +* 代码生成新增生成预览功能 ([4017029](https://github.com/wms-org/wms-admin/commit/401702972f30c4e556a2cf8d048f78fa9ee1c5ba)) ([505ba49](https://github.com/wms-org/wms-admin/commit/505ba49a5304fb3e2ba655dea901cd5e3ea74673)) +* 适配 ContiNew Starter 行为验证码,系统内所有短信发送新增前置行为验证码验证 ([Gitee PR#9](https://gitee.com/wms/wms-admin/pulls/9)) * 文件管理:提供文件上传、下载、预览(目前支持图片、音视频)、重命名、切换视图(列表、网格)等功能 * 存储库管理:提供文件存储库新增、编辑、删除、导出等功能 ### 💎 功能优化 -- 优化 API 文档配置 ([108f1c4](https://github.com/ysoft-org/ysoft-admin/commit/108f1c4ae7b855ac0bab2d3fe028270472a8be71)) -- 调整枚举配置值为大写 ([3ece42b](https://github.com/ysoft-org/ysoft-admin/commit/3ece42b94e071ece87e6b4616f7817bf851ba28f)) -- 优化由于 Mock 引起的导出报错提示 ([349899b](https://github.com/ysoft-org/ysoft-admin/commit/349899b4fc9572450ca31d9a5e19268ce0b868a8)) -- 优化查询访客地域分布信息接口 SQL ([4df887d](https://github.com/ysoft-org/ysoft-admin/commit/4df887d82678ced0d30aa0c7a6f92edcac902052)) -- 调整后端部分方法名 save => add ([45bd3e1](https://github.com/ysoft-org/ysoft-admin/commit/45bd3e10b6ac6aecde41ff9484668e557a485b27)) -- 优化系统日志详情 ([55effa3](https://github.com/ysoft-org/ysoft-admin/commit/55effa36580a57ddedb688e2ce30bec45c761224)) ([99997c1](https://github.com/ysoft-org/ysoft-admin/commit/99997c160eefc152a6f4e74bcd9c5ef6fc77a9c5)) -- 移除部分方法中仅有单个非读操作的事务处理 ([b85d692](https://github.com/ysoft-org/ysoft-admin/commit/b85d69298de1a6c48d15300bb9ff1b3ea569fdbd)) -- 优化编译配置 ([ed8bb57](https://github.com/ysoft-org/ysoft-admin/commit/ed8bb57fe24dfbe8f45b8f53370ebb79f1511268)) -- 优化配置文件格式 ([3399bc8](https://github.com/ysoft-org/ysoft-admin/commit/3399bc8dde0c8c8ac6d3e583ffbe299f7e6dd80b)) +- 优化 API 文档配置 ([108f1c4](https://github.com/wms-org/wms-admin/commit/108f1c4ae7b855ac0bab2d3fe028270472a8be71)) +- 调整枚举配置值为大写 ([3ece42b](https://github.com/wms-org/wms-admin/commit/3ece42b94e071ece87e6b4616f7817bf851ba28f)) +- 优化由于 Mock 引起的导出报错提示 ([349899b](https://github.com/wms-org/wms-admin/commit/349899b4fc9572450ca31d9a5e19268ce0b868a8)) +- 优化查询访客地域分布信息接口 SQL ([4df887d](https://github.com/wms-org/wms-admin/commit/4df887d82678ced0d30aa0c7a6f92edcac902052)) +- 调整后端部分方法名 save => add ([45bd3e1](https://github.com/wms-org/wms-admin/commit/45bd3e10b6ac6aecde41ff9484668e557a485b27)) +- 优化系统日志详情 ([55effa3](https://github.com/wms-org/wms-admin/commit/55effa36580a57ddedb688e2ce30bec45c761224)) ([99997c1](https://github.com/wms-org/wms-admin/commit/99997c160eefc152a6f4e74bcd9c5ef6fc77a9c5)) +- 移除部分方法中仅有单个非读操作的事务处理 ([b85d692](https://github.com/wms-org/wms-admin/commit/b85d69298de1a6c48d15300bb9ff1b3ea569fdbd)) +- 优化编译配置 ([ed8bb57](https://github.com/wms-org/wms-admin/commit/ed8bb57fe24dfbe8f45b8f53370ebb79f1511268)) +- 优化配置文件格式 ([3399bc8](https://github.com/wms-org/wms-admin/commit/3399bc8dde0c8c8ac6d3e583ffbe299f7e6dd80b)) ### 🐛 问题修复 -- 修复代码生成相关错误 ([3fdc50d](https://github.com/ysoft-org/ysoft-admin/commit/3fdc50d78ec50a878cec2b35c7d5028e741c42d7)) -- 更新仪表盘帮助文档部分过期链接 ([ac42836](https://github.com/ysoft-org/ysoft-admin/commit/ac4283679a847ed372db28aae1ea05fd791651b8)) +- 修复代码生成相关错误 ([3fdc50d](https://github.com/wms-org/wms-admin/commit/3fdc50d78ec50a878cec2b35c7d5028e741c42d7)) +- 更新仪表盘帮助文档部分过期链接 ([ac42836](https://github.com/wms-org/wms-admin/commit/ac4283679a847ed372db28aae1ea05fd791651b8)) ### 💥 破坏性变更 -- 适配 ContiNew Starter QueryTypeEnum 命名变更 ([97c273f](https://github.com/ysoft-org/ysoft-admin/commit/97c273f99ecb038e041e3d39dbfacf326d49cc1b)) -- 适配 ContiNew Starter Log HttpTracePro(日志模块) ([9bf0150](https://github.com/ysoft-org/ysoft-admin/commit/9bf015059b96f41c29f05ecbf7612d611b3a98c3)) -- 适配 ContiNew Starter 全局异常处理器 ([4ed4ddd](https://github.com/ysoft-org/ysoft-admin/commit/4ed4ddd4f055cefe1f85482bd6b9ef760978691b)) -- 适配 ContiNew Starter 数据权限解决方案(数据访问模块-MyBatis Plus) ([0849426](https://github.com/ysoft-org/ysoft-admin/commit/084942630ab0e1846c1836b8dc4bf5b2c9a5b16e)) -- 调整 IBaseEnum 所属包 ([e6c6e1c](https://github.com/ysoft-org/ysoft-admin/commit/e6c6e1cb0e326c5f531ca5cb2e17a1e26efac7d9)) -- 重构原有文件上传接口并优化配置文件配置格式 ([5e37025](https://github.com/ysoft-org/ysoft-admin/commit/5e370254dd00deaab62438c5feb4de14192ad7e6)) +- 适配 ContiNew Starter QueryTypeEnum 命名变更 ([97c273f](https://github.com/wms-org/wms-admin/commit/97c273f99ecb038e041e3d39dbfacf326d49cc1b)) +- 适配 ContiNew Starter Log HttpTracePro(日志模块) ([9bf0150](https://github.com/wms-org/wms-admin/commit/9bf015059b96f41c29f05ecbf7612d611b3a98c3)) +- 适配 ContiNew Starter 全局异常处理器 ([4ed4ddd](https://github.com/wms-org/wms-admin/commit/4ed4ddd4f055cefe1f85482bd6b9ef760978691b)) +- 适配 ContiNew Starter 数据权限解决方案(数据访问模块-MyBatis Plus) ([0849426](https://github.com/wms-org/wms-admin/commit/084942630ab0e1846c1836b8dc4bf5b2c9a5b16e)) +- 调整 IBaseEnum 所属包 ([e6c6e1c](https://github.com/wms-org/wms-admin/commit/e6c6e1cb0e326c5f531ca5cb2e17a1e26efac7d9)) +- 重构原有文件上传接口并优化配置文件配置格式 ([5e37025](https://github.com/wms-org/wms-admin/commit/5e370254dd00deaab62438c5feb4de14192ad7e6)) ### 📦 依赖升级 -- ContiNew Starter 1.0.0 => 1.1.0 ([fc80921](https://github.com/ysoft-org/ysoft-admin/commit/fc80921c047862b424ca625317f4657667bc2c6b)) (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/ysoft-org/ysoft-starter/blob/dev/CHANGELOG.md)) -- Arco Design Vue 2.53.0 => 2.53.3 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- Vite 4.5.0 => 4.5.1 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- TypeScript 5.2.2 => 5.3.3 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- unplugin-vue-components 0.25.2 => 0.26.0 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- @kangc/v-md-editor 2.3.17 => 2.3.18 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- eslint 8.53.0 => 8.56.0 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- @vueuse/core 10.5.0 => 10.7.0 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- vue-i18n 9.6.5 => 9.8.0 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- vue-json-pretty 2.2.4 => 2.3.0 ([2720275](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) -- 由于篇幅限制,仅列出部分前端依赖升级情况,更多请查看 [提交记录](https://github.com/ysoft-org/ysoft-admin/commit/2720275b97334545dde71d548173bfcda7e660cb) +- ContiNew Starter 1.0.0 => 1.1.0 ([fc80921](https://github.com/wms-org/wms-admin/commit/fc80921c047862b424ca625317f4657667bc2c6b)) (更多依赖升级详情,请查看 ContiNew Starter [更新日志](https://github.com/wms-org/wms-starter/blob/dev/CHANGELOG.md)) +- Arco Design Vue 2.53.0 => 2.53.3 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- Vite 4.5.0 => 4.5.1 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- TypeScript 5.2.2 => 5.3.3 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- unplugin-vue-components 0.25.2 => 0.26.0 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- @kangc/v-md-editor 2.3.17 => 2.3.18 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- eslint 8.53.0 => 8.56.0 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- @vueuse/core 10.5.0 => 10.7.0 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- vue-i18n 9.6.5 => 9.8.0 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- vue-json-pretty 2.2.4 => 2.3.0 ([2720275](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb)) +- 由于篇幅限制,仅列出部分前端依赖升级情况,更多请查看 [提交记录](https://github.com/wms-org/wms-admin/commit/2720275b97334545dde71d548173bfcda7e660cb) -## [v2.1.0](https://github.com/ysoft-org/ysoft-admin/compare/v2.0.0...v2.1.0) (2023-12-03) +## [v2.1.0](https://github.com/wms-org/wms-admin/compare/v2.0.0...v2.1.0) (2023-12-03) ### 💎 功能优化 -- 优化数据权限注解 ([bb59a78](https://github.com/ysoft-org/ysoft-admin/commit/bb59a78573bec521e8852f1c88ce6078fb14b14e)) -- 回退全局响应结果处理器 ([c7a4e32](https://github.com/ysoft-org/ysoft-admin/commit/c7a4e329945d8368a9b93a2488c059cf3333feba)) -- 优化字典 Controller CRUD 注解使用 ([8c1c4b0](https://github.com/ysoft-org/ysoft-admin/commit/8c1c4b014463d073e848e2f2abc33e089efa2abb)) -- 优化常量命名风格,XxxConsts => XxxConstants ([ec28705](https://github.com/ysoft-org/ysoft-admin/commit/ec28705b6ff6dd26ec3ef673fb3827259f1b9c41)) -- 移除 XML 文件头部的协议信息 ([b476956](https://github.com/ysoft-org/ysoft-admin/commit/b47695603afb0c19679c4100c1e3c23bc8007238)) -- 优化菜单标题校验 ([3dd81a1](https://github.com/ysoft-org/ysoft-admin/commit/3dd81a1192c4e340dad0b1bae5e29d1d7218fb25)) +- 优化数据权限注解 ([bb59a78](https://github.com/wms-org/wms-admin/commit/bb59a78573bec521e8852f1c88ce6078fb14b14e)) +- 回退全局响应结果处理器 ([c7a4e32](https://github.com/wms-org/wms-admin/commit/c7a4e329945d8368a9b93a2488c059cf3333feba)) +- 优化字典 Controller CRUD 注解使用 ([8c1c4b0](https://github.com/wms-org/wms-admin/commit/8c1c4b014463d073e848e2f2abc33e089efa2abb)) +- 优化常量命名风格,XxxConsts => XxxConstants ([ec28705](https://github.com/wms-org/wms-admin/commit/ec28705b6ff6dd26ec3ef673fb3827259f1b9c41)) +- 移除 XML 文件头部的协议信息 ([b476956](https://github.com/wms-org/wms-admin/commit/b47695603afb0c19679c4100c1e3c23bc8007238)) +- 优化菜单标题校验 ([3dd81a1](https://github.com/wms-org/wms-admin/commit/3dd81a1192c4e340dad0b1bae5e29d1d7218fb25)) ### 🐛 问题修复 -- 修复 mock 被错误关闭的问题 ([a34070f](https://github.com/ysoft-org/ysoft-admin/commit/a34070ffed3044ad2bea604701b074665e7b4e42)) -- 修复保存生成配置校验失效的问题,并优化部分提示效果 ([c34e934](https://github.com/ysoft-org/ysoft-admin/commit/c34e934bb553d7f814d0fb5aa87eac0f565289b4)) +- 修复 mock 被错误关闭的问题 ([a34070f](https://github.com/wms-org/wms-admin/commit/a34070ffed3044ad2bea604701b074665e7b4e42)) +- 修复保存生成配置校验失效的问题,并优化部分提示效果 ([c34e934](https://github.com/wms-org/wms-admin/commit/c34e934bb553d7f814d0fb5aa87eac0f565289b4)) ### 💥 破坏性变更 -- 项目包结构 top.charles7c.cnadmin => top.charles7c.ysoft.admin ([b86fe32](https://github.com/ysoft-org/ysoft-admin/commit/b86fe329d07317fed6a7d0b7015856de4b9e75d1)) -- 适配 ContiNew Starter 全局错误处理配置 ([b62095d](https://github.com/ysoft-org/ysoft-admin/commit/b62095d66e2318d35e4af07b128203b5a5e016f7)) -- 适配 ContiNew Starter CRUD(扩展模块) ([ce5a2ec](https://github.com/ysoft-org/ysoft-admin/commit/ce5a2ec9319b86e69a6bda67a886e1c96079ffc2)) -- 适配 ContiNew Starter Mail(消息模块) ([ce785dd](https://github.com/ysoft-org/ysoft-admin/commit/ce785ddce28733eeefbf970ed08b01e36e0abd4b)) -- 适配 ContiNew Starter Excel(文件处理模块) ([1311ae3](https://github.com/ysoft-org/ysoft-admin/commit/1311ae3603a26dc44dfffc5be86ea1ab81ff7958)) -- 适配 ContiNew Starter 认证模块-JustAuth ([7ad8d17](https://github.com/ysoft-org/ysoft-admin/commit/7ad8d1773a8e50e37a326b8f73f9ba38a3a7ff3a)) ([f28fbd1](https://github.com/ysoft-org/ysoft-admin/commit/f28fbd14fa83a82df49b07f16070e0ff3385b0ec)) -- 适配 ContiNew Starter 认证模块-SaToken ([86ca8f0](https://github.com/ysoft-org/ysoft-admin/commit/86ca8f094ff6d1c00b52c1406985bc00105b297f)) -- 适配 ContiNew Starter 图形验证码 ([8a11a02](https://github.com/ysoft-org/ysoft-admin/commit/8a11a020e04e271da7b700b5d73cf8475b50ee5c)) -- 适配 ContiNew Starter MyBatis Plus 自动配置 ([7306cd9](https://github.com/ysoft-org/ysoft-admin/commit/7306cd9d2f9492aa39e11b8f0dc8c7c11b534a3f)) -- 适配 ContiNew Starter Redisson 自动配置 ([a40e609](https://github.com/ysoft-org/ysoft-admin/commit/a40e609ea14acda840d2771f05ca9690d41236a1)) -- 适配 ContiNew Starter Jackson、API 文档(Knife4j:Spring Doc)自动配置 ([a86f3a5](https://github.com/ysoft-org/ysoft-admin/commit/a86f3a5047eda2f67cc9ad7721006d2db1fd710f)) -- 适配 ContiNew Starter 线程池自动配置 ([ec1daaf](https://github.com/ysoft-org/ysoft-admin/commit/ec1daaf0456296dbc3704ae700b9577001bdd5bb)) -- 引入 ContiNew Starter,适配跨域自动配置 ([2c4f511](https://github.com/ysoft-org/ysoft-admin/commit/2c4f5116c999b9316ab0bee4fa661338fea63c11)) -- 项目 group id top.charles7c => top.charles7c.ysoft ([3e23acb](https://github.com/ysoft-org/ysoft-admin/commit/3e23acb3e257d5813b858356aa926a96c906acf1)) +- 项目包结构 top.charles7c.cnadmin => top.charles7c.wms.admin ([b86fe32](https://github.com/wms-org/wms-admin/commit/b86fe329d07317fed6a7d0b7015856de4b9e75d1)) +- 适配 ContiNew Starter 全局错误处理配置 ([b62095d](https://github.com/wms-org/wms-admin/commit/b62095d66e2318d35e4af07b128203b5a5e016f7)) +- 适配 ContiNew Starter CRUD(扩展模块) ([ce5a2ec](https://github.com/wms-org/wms-admin/commit/ce5a2ec9319b86e69a6bda67a886e1c96079ffc2)) +- 适配 ContiNew Starter Mail(消息模块) ([ce785dd](https://github.com/wms-org/wms-admin/commit/ce785ddce28733eeefbf970ed08b01e36e0abd4b)) +- 适配 ContiNew Starter Excel(文件处理模块) ([1311ae3](https://github.com/wms-org/wms-admin/commit/1311ae3603a26dc44dfffc5be86ea1ab81ff7958)) +- 适配 ContiNew Starter 认证模块-JustAuth ([7ad8d17](https://github.com/wms-org/wms-admin/commit/7ad8d1773a8e50e37a326b8f73f9ba38a3a7ff3a)) ([f28fbd1](https://github.com/wms-org/wms-admin/commit/f28fbd14fa83a82df49b07f16070e0ff3385b0ec)) +- 适配 ContiNew Starter 认证模块-SaToken ([86ca8f0](https://github.com/wms-org/wms-admin/commit/86ca8f094ff6d1c00b52c1406985bc00105b297f)) +- 适配 ContiNew Starter 图形验证码 ([8a11a02](https://github.com/wms-org/wms-admin/commit/8a11a020e04e271da7b700b5d73cf8475b50ee5c)) +- 适配 ContiNew Starter MyBatis Plus 自动配置 ([7306cd9](https://github.com/wms-org/wms-admin/commit/7306cd9d2f9492aa39e11b8f0dc8c7c11b534a3f)) +- 适配 ContiNew Starter Redisson 自动配置 ([a40e609](https://github.com/wms-org/wms-admin/commit/a40e609ea14acda840d2771f05ca9690d41236a1)) +- 适配 ContiNew Starter Jackson、API 文档(Knife4j:Spring Doc)自动配置 ([a86f3a5](https://github.com/wms-org/wms-admin/commit/a86f3a5047eda2f67cc9ad7721006d2db1fd710f)) +- 适配 ContiNew Starter 线程池自动配置 ([ec1daaf](https://github.com/wms-org/wms-admin/commit/ec1daaf0456296dbc3704ae700b9577001bdd5bb)) +- 引入 ContiNew Starter,适配跨域自动配置 ([2c4f511](https://github.com/wms-org/wms-admin/commit/2c4f5116c999b9316ab0bee4fa661338fea63c11)) +- 项目 group id top.charles7c => top.charles7c.wms ([3e23acb](https://github.com/wms-org/wms-admin/commit/3e23acb3e257d5813b858356aa926a96c906acf1)) -## [v2.0.0](https://github.com/ysoft-org/ysoft-admin/compare/v1.3.1...v2.0.0) (2023-11-15) +## [v2.0.0](https://github.com/wms-org/wms-admin/compare/v1.3.1...v2.0.0) (2023-11-15) ### 💎 功能优化 -- 优化部分代码格式 ([2f87310](https://github.com/ysoft-org/ysoft-admin/commit/2f87310bc886af604a2667285a973ec6ae983430)) -- 优化 401 状态处理逻辑 ([c70e28a](https://github.com/ysoft-org/ysoft-admin/commit/c70e28a535c78214fe8d68a09824c786c457ef06)) -- 优化超时登录处理逻辑 ([d5da184](https://github.com/ysoft-org/ysoft-admin/commit/d5da1847e33e6cd7a0e5c3434335044167c1241c)) +- 优化部分代码格式 ([2f87310](https://github.com/wms-org/wms-admin/commit/2f87310bc886af604a2667285a973ec6ae983430)) +- 优化 401 状态处理逻辑 ([c70e28a](https://github.com/wms-org/wms-admin/commit/c70e28a535c78214fe8d68a09824c786c457ef06)) +- 优化超时登录处理逻辑 ([d5da184](https://github.com/wms-org/wms-admin/commit/d5da1847e33e6cd7a0e5c3434335044167c1241c)) ### 🐛 问题修复 -- sms4j 3.0.3 => 3.0.4 ([23558d4](https://github.com/ysoft-org/ysoft-admin/commit/23558d45620a48ed82b32a5bdd2f948a4a37263d)) -- 发送消息增加事务处理 ([Gitee#7](https://gitee.com/ysoft/ysoft-admin/pulls/7)) ([1ca6f6c](https://github.com/ysoft-org/ysoft-admin/commit/1ca6f6c7e5f8a7c78f74df547f14517293241ac4)) -- 修复前端控制台 eslint 告警 ([Gitee#6](https://gitee.com/ysoft/ysoft-admin/pulls/6)) ([f4523d2](https://github.com/ysoft-org/ysoft-admin/commit/f4523d24817b4fee5c015eaba6b98fe99f350bba)) ([2304f28](https://github.com/ysoft-org/ysoft-admin/commit/2304f28a942fa8ea3e6d36fbebbe9346b0d3b741)) -- 修复仪表盘访问趋势区块 y 轴数值过大时无法展示的问题 ([fea6024](https://github.com/ysoft-org/ysoft-admin/commit/fea602439a3c9589bee078bfa9ff1e7efb378d71)) -- 修复控制台报错 Please use theme before using plugins ([98fbe05](https://github.com/ysoft-org/ysoft-admin/commit/98fbe0506c1cbe2f3c16347d9610ebfa5688b506)) -- 调整 Logback 配置,取消启动时打印 Logback 状态日志 ([1f7fef5](https://github.com/ysoft-org/ysoft-admin/commit/1f7fef5b31212e94652777be37bea4d4e02eb8c7)) +- sms4j 3.0.3 => 3.0.4 ([23558d4](https://github.com/wms-org/wms-admin/commit/23558d45620a48ed82b32a5bdd2f948a4a37263d)) +- 发送消息增加事务处理 ([Gitee#7](https://gitee.com/wms/wms-admin/pulls/7)) ([1ca6f6c](https://github.com/wms-org/wms-admin/commit/1ca6f6c7e5f8a7c78f74df547f14517293241ac4)) +- 修复前端控制台 eslint 告警 ([Gitee#6](https://gitee.com/wms/wms-admin/pulls/6)) ([f4523d2](https://github.com/wms-org/wms-admin/commit/f4523d24817b4fee5c015eaba6b98fe99f350bba)) ([2304f28](https://github.com/wms-org/wms-admin/commit/2304f28a942fa8ea3e6d36fbebbe9346b0d3b741)) +- 修复仪表盘访问趋势区块 y 轴数值过大时无法展示的问题 ([fea6024](https://github.com/wms-org/wms-admin/commit/fea602439a3c9589bee078bfa9ff1e7efb378d71)) +- 修复控制台报错 Please use theme before using plugins ([98fbe05](https://github.com/wms-org/wms-admin/commit/98fbe0506c1cbe2f3c16347d9610ebfa5688b506)) +- 调整 Logback 配置,取消启动时打印 Logback 状态日志 ([1f7fef5](https://github.com/wms-org/wms-admin/commit/1f7fef5b31212e94652777be37bea4d4e02eb8c7)) ### 💥 破坏性变更 -- 优化部署相关脚本,mariadb => mysql ([5f4f0f1](https://github.com/ysoft-org/ysoft-admin/commit/5f4f0f1b21fe882dc51801d7c508c10b87d7af36)) -- 适配 Java 16 新特性 ([cf30443](https://github.com/ysoft-org/ysoft-admin/commit/cf3044312c8631a8c2b306e466e3d4d663d8eb6d)) -- 适配 Java 14 新特性 ([38f52aa](https://github.com/ysoft-org/ysoft-admin/commit/38f52aaafa22ebc958a22b7c38b084c655064fbc)) -- 适配 Java 11 新特性 ([5a5bd16](https://github.com/ysoft-org/ysoft-admin/commit/5a5bd1681e076ac6814d552da5415a8f154b93af)) -- 升级前端依赖 ([79fa2c8](https://github.com/ysoft-org/ysoft-admin/commit/79fa2c8abcf5f70f96ae7c6de35c47dbae76ee2d)) ([c44162d](https://github.com/ysoft-org/ysoft-admin/commit/c44162d431cb87cae251067fff9a5ae707aed9b3)) +- 优化部署相关脚本,mariadb => mysql ([5f4f0f1](https://github.com/wms-org/wms-admin/commit/5f4f0f1b21fe882dc51801d7c508c10b87d7af36)) +- 适配 Java 16 新特性 ([cf30443](https://github.com/wms-org/wms-admin/commit/cf3044312c8631a8c2b306e466e3d4d663d8eb6d)) +- 适配 Java 14 新特性 ([38f52aa](https://github.com/wms-org/wms-admin/commit/38f52aaafa22ebc958a22b7c38b084c655064fbc)) +- 适配 Java 11 新特性 ([5a5bd16](https://github.com/wms-org/wms-admin/commit/5a5bd1681e076ac6814d552da5415a8f154b93af)) +- 升级前端依赖 ([79fa2c8](https://github.com/wms-org/wms-admin/commit/79fa2c8abcf5f70f96ae7c6de35c47dbae76ee2d)) ([c44162d](https://github.com/wms-org/wms-admin/commit/c44162d431cb87cae251067fff9a5ae707aed9b3)) - Arco Design Vue 2.52.0 => 2.53.0 - Vue 3.3.4 => 3.3.7 - Vite 3.2.7 => 4.5.0 @@ -560,7 +560,7 @@ - eslint 8.48.0 => 8.53.0 - stylelint 15.10.3 => 15.11.0 - lint-staged 13.2.0 => 3.0.3 -- 升级后端依赖 ([dea160a](https://github.com/ysoft-org/ysoft-admin/commit/dea160a7b2d69e1b46edc936c9a697048bbb507a)) ([95c27ea](https://github.com/ysoft-org/ysoft-admin/commit/95c27ea323e015c915d352618158df830b4d1c05)) ([fa23287](https://github.com/ysoft-org/ysoft-admin/commit/fa232874aa88ab14fdc669e54a907e5ef05d2a7e)) ([8dbec9d](https://github.com/ysoft-org/ysoft-admin/commit/8dbec9d1a3bcb0f6d7ef4bbfb9715effd61b2025)) ([3bd56d8](https://github.com/ysoft-org/ysoft-admin/commit/3bd56d8a1ee274aac6d4ea57d61f6d470de0dc9c)) ([7b741d5](https://github.com/ysoft-org/ysoft-admin/commit/7b741d5f8c42d154c5b325326d0cc954fb566502)) +- 升级后端依赖 ([dea160a](https://github.com/wms-org/wms-admin/commit/dea160a7b2d69e1b46edc936c9a697048bbb507a)) ([95c27ea](https://github.com/wms-org/wms-admin/commit/95c27ea323e015c915d352618158df830b4d1c05)) ([fa23287](https://github.com/wms-org/wms-admin/commit/fa232874aa88ab14fdc669e54a907e5ef05d2a7e)) ([8dbec9d](https://github.com/wms-org/wms-admin/commit/8dbec9d1a3bcb0f6d7ef4bbfb9715effd61b2025)) ([3bd56d8](https://github.com/wms-org/wms-admin/commit/3bd56d8a1ee274aac6d4ea57d61f6d470de0dc9c)) ([7b741d5](https://github.com/wms-org/wms-admin/commit/7b741d5f8c42d154c5b325326d0cc954fb566502)) - Spring Boot 2.7.16 => 3.0.5 => 3.1.5 - javax.* => jakarta.* - ServletUtil => JakartaServletUtil(Hutool) @@ -574,48 +574,48 @@ - ip2region 2.7.15 => 3.1.5.1(适配 Spring Boot 3.x) - spotless 2.30.0 => 2.40.0 -## [v1.3.1](https://github.com/ysoft-org/ysoft-admin/compare/v1.3.0...v1.3.1) (2023-11-15) +## [v1.3.1](https://github.com/wms-org/wms-admin/compare/v1.3.0...v1.3.1) (2023-11-15) ### 💎 功能优化 -- 完善 Redis 部署配置 ([39969eb](https://github.com/ysoft-org/ysoft-admin/commit/39969ebf6173fc379dc3501e9204a344d1cf62cf)) -- 优化 401 状态处理逻辑 ([8820c1d](https://github.com/ysoft-org/ysoft-admin/commit/8820c1dfc858b9ef9df470e90dfe9ba4b1166e29)) -- 优化超时登录处理逻辑 ([712eedb](https://github.com/ysoft-org/ysoft-admin/commit/712eedba1be0ec371119745d4596cd35c2ce25d6)) -- 优化部分变量命名 ([f15494d](https://github.com/ysoft-org/ysoft-admin/commit/f15494d34823ded87efc396d98e2eb0108f74a3d)) +- 完善 Redis 部署配置 ([39969eb](https://github.com/wms-org/wms-admin/commit/39969ebf6173fc379dc3501e9204a344d1cf62cf)) +- 优化 401 状态处理逻辑 ([8820c1d](https://github.com/wms-org/wms-admin/commit/8820c1dfc858b9ef9df470e90dfe9ba4b1166e29)) +- 优化超时登录处理逻辑 ([712eedb](https://github.com/wms-org/wms-admin/commit/712eedba1be0ec371119745d4596cd35c2ce25d6)) +- 优化部分变量命名 ([f15494d](https://github.com/wms-org/wms-admin/commit/f15494d34823ded87efc396d98e2eb0108f74a3d)) ### 🐛 问题修复 -- sms4j 3.0.3 => 3.0.4 ([3fcdb54](https://github.com/ysoft-org/ysoft-admin/commit/3fcdb54442b380e76838478fa46e8dfb70a2759b)) -- 发送消息增加事务处理 ([5d159c6](https://github.com/ysoft-org/ysoft-admin/commit/5d159c6ab337a9432419d84cf246cff506500567)) -- 修复仪表盘访问趋势区块 y 轴数值过大时无法展示的问题 ([47a5746](https://github.com/ysoft-org/ysoft-admin/commit/47a5746794e552faf9c41fbcc21af091a878eb95)) -- 修复控制台报错 Please use theme before using plugins ([47a8160](https://github.com/ysoft-org/ysoft-admin/commit/47a8160d70862a5ee7284c165004cece2714a10f)) -- 修复 Swagger 分组接口缺失 ([b63d7d7](https://github.com/ysoft-org/ysoft-admin/commit/b63d7d725da5e9e9b2db9fd59bd140d64b50040c)) +- sms4j 3.0.3 => 3.0.4 ([3fcdb54](https://github.com/wms-org/wms-admin/commit/3fcdb54442b380e76838478fa46e8dfb70a2759b)) +- 发送消息增加事务处理 ([5d159c6](https://github.com/wms-org/wms-admin/commit/5d159c6ab337a9432419d84cf246cff506500567)) +- 修复仪表盘访问趋势区块 y 轴数值过大时无法展示的问题 ([47a5746](https://github.com/wms-org/wms-admin/commit/47a5746794e552faf9c41fbcc21af091a878eb95)) +- 修复控制台报错 Please use theme before using plugins ([47a8160](https://github.com/wms-org/wms-admin/commit/47a8160d70862a5ee7284c165004cece2714a10f)) +- 修复 Swagger 分组接口缺失 ([b63d7d7](https://github.com/wms-org/wms-admin/commit/b63d7d725da5e9e9b2db9fd59bd140d64b50040c)) -## [v1.3.0](https://github.com/ysoft-org/ysoft-admin/compare/v1.2.0...v1.3.0) (2023-11-04) +## [v1.3.0](https://github.com/wms-org/wms-admin/compare/v1.2.0...v1.3.0) (2023-11-04) ### ✨ 新特性 * 消息管理:提供消息查看、标记已读、全部已读、删除等功能(适配对接导航栏站内信功能) -* 新增头像上传前裁剪功能 ([Gitee#5](https://gitee.com/ysoft/ysoft-admin/pulls/5)) ([cbc652d](https://gitee.com/ysoft/ysoft-admin/commit/cbc652de77200d29bcd42bb399c86c2e7df29c4d)) ([28f4791](https://gitee.com/ysoft/ysoft-admin/commit/28f4791833060469d132c4383665e81458f9c852)) -* 支持手机号登录(演示环境不开放) ([4d70bc8](https://github.com/ysoft-org/ysoft-admin/commit/4d70bc84db47c36c13d8e41e3a33e5a589483de8)) -* 支持邮箱登录 ([17b169e](https://github.com/ysoft-org/ysoft-admin/commit/17b169eb0ea2ded759b6bccb213c78bfb3425941)) -* 个人中心-安全设置,支持绑定、解绑三方账号 ([efe4557](https://github.com/ysoft-org/ysoft-admin/commit/efe455736c158e73bf0c6514c31bec5d83fe843b)) -* 支持第三方账号登录 ([05cb609](https://github.com/ysoft-org/ysoft-admin/commit/05cb60978017edbd14f1c7af83053f8a91800b5c)) +* 新增头像上传前裁剪功能 ([Gitee#5](https://gitee.com/wms/wms-admin/pulls/5)) ([cbc652d](https://gitee.com/wms/wms-admin/commit/cbc652de77200d29bcd42bb399c86c2e7df29c4d)) ([28f4791](https://gitee.com/wms/wms-admin/commit/28f4791833060469d132c4383665e81458f9c852)) +* 支持手机号登录(演示环境不开放) ([4d70bc8](https://github.com/wms-org/wms-admin/commit/4d70bc84db47c36c13d8e41e3a33e5a589483de8)) +* 支持邮箱登录 ([17b169e](https://github.com/wms-org/wms-admin/commit/17b169eb0ea2ded759b6bccb213c78bfb3425941)) +* 个人中心-安全设置,支持绑定、解绑三方账号 ([efe4557](https://github.com/wms-org/wms-admin/commit/efe455736c158e73bf0c6514c31bec5d83fe843b)) +* 支持第三方账号登录 ([05cb609](https://github.com/wms-org/wms-admin/commit/05cb60978017edbd14f1c7af83053f8a91800b5c)) ### 💎 功能优化 -- 新增接口文档菜单,演示环境开放接口文档 ([4a42336](https://github.com/ysoft-org/ysoft-admin/commit/4a4233647f2ea212b007f591aafc50380b15c099)) -- 项目配置增加是否为生产环境配置项 ([38deb95](https://github.com/ysoft-org/ysoft-admin/commit/38deb950ac7b2ed81f0e10816e943156aa076795)) -- 优化校验相关方法命名 ([f25de2d](https://github.com/ysoft-org/ysoft-admin/commit/f25de2d7f835a3fa75d59d3de0a014c37b3b32e1)) -- 新增全局响应结果处理器 ([Gitee#3](https://gitee.com/ysoft/ysoft-admin/pulls/3)) ([992a8fc](https://gitee.com/ysoft/ysoft-admin/commit/992a8fca173ea76722b388aca462cff8a1128803)) ([Gitee#4](https://gitee.com/ysoft/ysoft-admin/pulls/4)) ([a0b1afc](https://gitee.com/ysoft/ysoft-admin/commit/a0b1afc546657766cb6031794b98ccc2b6e4cb2d)) -- 优化部分代码格式及注释 ([3a176ac](https://github.com/ysoft-org/ysoft-admin/commit/3a176ac5efbda4aea1e883b29e68861bd352d642)) -- 重构登录页面 UI 以适配多维度认证、第三方登录等场景 ([d40d5b4](https://github.com/ysoft-org/ysoft-admin/commit/d40d5b4ae61d858fbee3ffa0606ebebb4282d9a2)) ([a5a4cd4](https://github.com/ysoft-org/ysoft-admin/commit/a5a4cd49646db3fa1108a8b917ef70c7757e81ad)) -- 升级前端依赖 ([698a725](https://github.com/ysoft-org/ysoft-admin/commit/698a7251b742e6b679694f21bfc174904dca8990)) +- 新增接口文档菜单,演示环境开放接口文档 ([4a42336](https://github.com/wms-org/wms-admin/commit/4a4233647f2ea212b007f591aafc50380b15c099)) +- 项目配置增加是否为生产环境配置项 ([38deb95](https://github.com/wms-org/wms-admin/commit/38deb950ac7b2ed81f0e10816e943156aa076795)) +- 优化校验相关方法命名 ([f25de2d](https://github.com/wms-org/wms-admin/commit/f25de2d7f835a3fa75d59d3de0a014c37b3b32e1)) +- 新增全局响应结果处理器 ([Gitee#3](https://gitee.com/wms/wms-admin/pulls/3)) ([992a8fc](https://gitee.com/wms/wms-admin/commit/992a8fca173ea76722b388aca462cff8a1128803)) ([Gitee#4](https://gitee.com/wms/wms-admin/pulls/4)) ([a0b1afc](https://gitee.com/wms/wms-admin/commit/a0b1afc546657766cb6031794b98ccc2b6e4cb2d)) +- 优化部分代码格式及注释 ([3a176ac](https://github.com/wms-org/wms-admin/commit/3a176ac5efbda4aea1e883b29e68861bd352d642)) +- 重构登录页面 UI 以适配多维度认证、第三方登录等场景 ([d40d5b4](https://github.com/wms-org/wms-admin/commit/d40d5b4ae61d858fbee3ffa0606ebebb4282d9a2)) ([a5a4cd4](https://github.com/wms-org/wms-admin/commit/a5a4cd49646db3fa1108a8b917ef70c7757e81ad)) +- 升级前端依赖 ([698a725](https://github.com/wms-org/wms-admin/commit/698a7251b742e6b679694f21bfc174904dca8990)) - Arco Design Vue 2.51.0 => 2.52.0 - vue-i18n 9.2.2 => 9.5.0 - dayjs 1.11.9 => 1.11.10 -- 升级后端依赖 ([698a725](https://github.com/ysoft-org/ysoft-admin/commit/698a7251b742e6b679694f21bfc174904dca8990)) +- 升级后端依赖 ([698a725](https://github.com/wms-org/wms-admin/commit/698a7251b742e6b679694f21bfc174904dca8990)) - Spring Boot 2.7.15 => 2.7.16 - Sa-Token 1.35.0.RC => 1.36.0 - Hutool 5.8.20 => 5.8.22 @@ -623,160 +623,160 @@ ### 🐛 问题修复 -- 开放前端项目IP访问 ([22a291d](https://github.com/ysoft-org/ysoft-admin/commit/22a291d4cf48e33dc2415e44b5d991b46451e7eb)) -- 修复获取验证码倒计时显示 ([2f2905e](https://github.com/ysoft-org/ysoft-admin/commit/2f2905efdc0baec2f2c38f686f72306394801ebf)) -- 用户邮箱信息增加脱敏处理 ([5bb35a1](https://github.com/ysoft-org/ysoft-admin/commit/5bb35a13d6b5801317a295eacc67d88b2c3e1682)) -- 修复重载校验方法定义及使用错误 ([a1ccc42](https://github.com/ysoft-org/ysoft-admin/commit/a1ccc421c440e5fef54e5d22b9bed26d2b16dda5)) -- 修复个人中心密码设置状态显示错误的问题 ([b04a228](https://github.com/ysoft-org/ysoft-admin/commit/b04a228a1a5bc0a575dd9e29e515285708b8ca85)) -- 修复登录后访问首页却跳转到登录页面的问题 ([Fixes #23](https://github.com/ysoft-org/ysoft-admin/issues/23)) ([7cf5e00](https://github.com/ysoft-org/ysoft-admin/commit/7cf5e0018c87720303f731317b5eb3cb7d127327)) -- 修复字典名称表单校验 ([#22](https://github.com/ysoft-org/ysoft-admin/pull/22)) ([c0ee2ea](https://github.com/ysoft-org/ysoft-admin/commit/c0ee2eac026d2d5a950a41b6f0a475b95b71d47a)) +- 开放前端项目IP访问 ([22a291d](https://github.com/wms-org/wms-admin/commit/22a291d4cf48e33dc2415e44b5d991b46451e7eb)) +- 修复获取验证码倒计时显示 ([2f2905e](https://github.com/wms-org/wms-admin/commit/2f2905efdc0baec2f2c38f686f72306394801ebf)) +- 用户邮箱信息增加脱敏处理 ([5bb35a1](https://github.com/wms-org/wms-admin/commit/5bb35a13d6b5801317a295eacc67d88b2c3e1682)) +- 修复重载校验方法定义及使用错误 ([a1ccc42](https://github.com/wms-org/wms-admin/commit/a1ccc421c440e5fef54e5d22b9bed26d2b16dda5)) +- 修复个人中心密码设置状态显示错误的问题 ([b04a228](https://github.com/wms-org/wms-admin/commit/b04a228a1a5bc0a575dd9e29e515285708b8ca85)) +- 修复登录后访问首页却跳转到登录页面的问题 ([Fixes #23](https://github.com/wms-org/wms-admin/issues/23)) ([7cf5e00](https://github.com/wms-org/wms-admin/commit/7cf5e0018c87720303f731317b5eb3cb7d127327)) +- 修复字典名称表单校验 ([#22](https://github.com/wms-org/wms-admin/pull/22)) ([c0ee2ea](https://github.com/wms-org/wms-admin/commit/c0ee2eac026d2d5a950a41b6f0a475b95b71d47a)) ### 💥 破坏性变更 -- 调整后端请求、响应参数模型命名风格 ([87f9056](https://github.com/ysoft-org/ysoft-admin/commit/87f90567dbd99f873aea1b85510c7b9939a2abb8)) -- 枚举接口 BaseEnum => IBaseEnum ([f5e8b09](https://github.com/ysoft-org/ysoft-admin/commit/f5e8b0943c6076c476b7d78bb623707740fb452f)) -- 优化前端登录模块 API 路径 ([43590bf](https://github.com/ysoft-org/ysoft-admin/commit/43590bf66e7e4873a85bdd416bd38b269f3af80e)) -- 优化后端部分参数模型命名 ([51f5528](https://github.com/ysoft-org/ysoft-admin/commit/51f552892ccb11ed594bf908069a1fd426324b69)) -- 优化个人中心路由地址 ([36d52d3](https://github.com/ysoft-org/ysoft-admin/commit/36d52d3e1522cd221cf3f03d76efd3e0eaf1b18f)) -- 还原前端 loginStore 命名,重命名为 userStore ([8d39493](https://github.com/ysoft-org/ysoft-admin/commit/8d394937cfc8418799215bd3659d26bed1f834c5)) +- 调整后端请求、响应参数模型命名风格 ([87f9056](https://github.com/wms-org/wms-admin/commit/87f90567dbd99f873aea1b85510c7b9939a2abb8)) +- 枚举接口 BaseEnum => IBaseEnum ([f5e8b09](https://github.com/wms-org/wms-admin/commit/f5e8b0943c6076c476b7d78bb623707740fb452f)) +- 优化前端登录模块 API 路径 ([43590bf](https://github.com/wms-org/wms-admin/commit/43590bf66e7e4873a85bdd416bd38b269f3af80e)) +- 优化后端部分参数模型命名 ([51f5528](https://github.com/wms-org/wms-admin/commit/51f552892ccb11ed594bf908069a1fd426324b69)) +- 优化个人中心路由地址 ([36d52d3](https://github.com/wms-org/wms-admin/commit/36d52d3e1522cd221cf3f03d76efd3e0eaf1b18f)) +- 还原前端 loginStore 命名,重命名为 userStore ([8d39493](https://github.com/wms-org/wms-admin/commit/8d394937cfc8418799215bd3659d26bed1f834c5)) -## [v1.2.0](https://github.com/ysoft-org/ysoft-admin/compare/v1.1.2...v1.2.0) (2023-09-24) +## [v1.2.0](https://github.com/wms-org/wms-admin/compare/v1.1.2...v1.2.0) (2023-09-24) ### ✨ 新特性 * 字典管理:提供对系统公用数据字典的维护,例如:公告类型,支持字典标签背景色和排序等配置 * 系统配置:提供修改系统标题、Logo、favicon 等基础配置功能,以方便用户系统与其自身品牌形象保持一致 -* 完善仪表盘最近访问区块内容 ([36fda57](https://github.com/ysoft-org/ysoft-admin/commit/36fda57d499b0c3fb092a13f269bc9ffb7a26a9e)) -* 完善仪表盘访问趋势区块内容 ([a1c20af](https://github.com/ysoft-org/ysoft-admin/commit/a1c20afb1b9eb447f62bfd2e4f2996dfdf37c8ca)) ([1722133](https://github.com/ysoft-org/ysoft-admin/commit/1722133ac4872b40d6d47f65f359dea8a354b91a)) -* 完善仪表盘访客地域分布区块内容 ([dc1691f](https://github.com/ysoft-org/ysoft-admin/commit/dc1691f0195ef6c96aee36f50fc7e86cfcf651b9)) -* 完善仪表盘热门模块区块内容 ([83b2e2a](https://github.com/ysoft-org/ysoft-admin/commit/83b2e2a7c02d38c7041497e0ac5b3b0e78abac29)) -* 完善仪表盘总计区块内容 ([3440aa4](https://github.com/ysoft-org/ysoft-admin/commit/3440aa4faa23e267735f564476d8bccaf8c0208f)) -* 完善仪表盘快捷操作区块内容 ([0178fbb](https://github.com/ysoft-org/ysoft-admin/commit/0178fbb89a0e75729aa60443a812496bd5b19cb8)) +* 完善仪表盘最近访问区块内容 ([36fda57](https://github.com/wms-org/wms-admin/commit/36fda57d499b0c3fb092a13f269bc9ffb7a26a9e)) +* 完善仪表盘访问趋势区块内容 ([a1c20af](https://github.com/wms-org/wms-admin/commit/a1c20afb1b9eb447f62bfd2e4f2996dfdf37c8ca)) ([1722133](https://github.com/wms-org/wms-admin/commit/1722133ac4872b40d6d47f65f359dea8a354b91a)) +* 完善仪表盘访客地域分布区块内容 ([dc1691f](https://github.com/wms-org/wms-admin/commit/dc1691f0195ef6c96aee36f50fc7e86cfcf651b9)) +* 完善仪表盘热门模块区块内容 ([83b2e2a](https://github.com/wms-org/wms-admin/commit/83b2e2a7c02d38c7041497e0ac5b3b0e78abac29)) +* 完善仪表盘总计区块内容 ([3440aa4](https://github.com/wms-org/wms-admin/commit/3440aa4faa23e267735f564476d8bccaf8c0208f)) +* 完善仪表盘快捷操作区块内容 ([0178fbb](https://github.com/wms-org/wms-admin/commit/0178fbb89a0e75729aa60443a812496bd5b19cb8)) ### 💎 功能优化 -- 前端表单重置优化 ([e947312](https://github.com/ysoft-org/ysoft-admin/commit/e947312f244d6af01f18b542ff7395440c68b089)) -- 优化登录和菜单加载相关提示 ([d080120](https://github.com/ysoft-org/ysoft-admin/commit/d080120d4228e77200d8f152397b0ebee413b089)) -- 完善前后端校验 ([90d825a](https://github.com/ysoft-org/ysoft-admin/commit/90d825a02fdc54e8685508a6fe4fb2d5f20e77f4)) ([8e506dc](https://github.com/ysoft-org/ysoft-admin/commit/8e506dc6e69529627a0aace6118f7310cc2f030a)) -- 优化枚举字典处理,增加颜色类型 ([1f73aa7](https://github.com/ysoft-org/ysoft-admin/commit/1f73aa732d101c7f7a58bc678e85d597d54d9770)) -- 公告类型适配字典数据 ([3a3a5d6](https://github.com/ysoft-org/ysoft-admin/commit/3a3a5d6b712f435d77ea04301afa0bdd8703567f)) -- 优化通用查询注解多字段模糊查询 ([3758107](https://github.com/ysoft-org/ysoft-admin/commit/375810772aa8cb928fb1f6820e781cb43f869e03)) -- 合并菜单管理图标和标题列 ([36d38ae](https://github.com/ysoft-org/ysoft-admin/commit/36d38aec1602f5ac6d2afbb5c5adf4d6e455ab97)) -- 封装 Spring Boot 默认错误处理 ([b874ca0](https://github.com/ysoft-org/ysoft-admin/commit/b874ca0782eb116bdedfc08023959a977f170a94)) -- 优化分页查询登录日志列表接口实现 ([566c9a1](https://github.com/ysoft-org/ysoft-admin/commit/566c9a122453980b585bd68442bb545073504a3d)) -- 更换登录页面 banner ([6f19660](https://github.com/ysoft-org/ysoft-admin/commit/6f19660cfbc3be6e0d702e3f488e266c50622f0a)) -- 优化登录用户信息角色相关信息命名 ([be394f3](https://github.com/ysoft-org/ysoft-admin/commit/be394f3de4ea7ea692042db3556f706a3d141b51)) ([31f0abb](https://github.com/ysoft-org/ysoft-admin/commit/31f0abbae2e38d1cfa3f6221c9be0b54cf5337ad)) -- 升级前端依赖 ([c665902](https://github.com/ysoft-org/ysoft-admin/commit/c6659020f8bac7319c5c407389cd745527a8cd97)) -- 升级后端依赖 ([5049e1e](https://github.com/ysoft-org/ysoft-admin/commit/5049e1e312ab500e284abccbbee4186db2710d01)) ([d20aadf](https://github.com/ysoft-org/ysoft-admin/commit/d20aadfc93b54339d19d173fce364310e90b016d)) ([32904b5](https://github.com/ysoft-org/ysoft-admin/commit/32904b54ef63536ef5c5106adc00a7376b907632)) +- 前端表单重置优化 ([e947312](https://github.com/wms-org/wms-admin/commit/e947312f244d6af01f18b542ff7395440c68b089)) +- 优化登录和菜单加载相关提示 ([d080120](https://github.com/wms-org/wms-admin/commit/d080120d4228e77200d8f152397b0ebee413b089)) +- 完善前后端校验 ([90d825a](https://github.com/wms-org/wms-admin/commit/90d825a02fdc54e8685508a6fe4fb2d5f20e77f4)) ([8e506dc](https://github.com/wms-org/wms-admin/commit/8e506dc6e69529627a0aace6118f7310cc2f030a)) +- 优化枚举字典处理,增加颜色类型 ([1f73aa7](https://github.com/wms-org/wms-admin/commit/1f73aa732d101c7f7a58bc678e85d597d54d9770)) +- 公告类型适配字典数据 ([3a3a5d6](https://github.com/wms-org/wms-admin/commit/3a3a5d6b712f435d77ea04301afa0bdd8703567f)) +- 优化通用查询注解多字段模糊查询 ([3758107](https://github.com/wms-org/wms-admin/commit/375810772aa8cb928fb1f6820e781cb43f869e03)) +- 合并菜单管理图标和标题列 ([36d38ae](https://github.com/wms-org/wms-admin/commit/36d38aec1602f5ac6d2afbb5c5adf4d6e455ab97)) +- 封装 Spring Boot 默认错误处理 ([b874ca0](https://github.com/wms-org/wms-admin/commit/b874ca0782eb116bdedfc08023959a977f170a94)) +- 优化分页查询登录日志列表接口实现 ([566c9a1](https://github.com/wms-org/wms-admin/commit/566c9a122453980b585bd68442bb545073504a3d)) +- 更换登录页面 banner ([6f19660](https://github.com/wms-org/wms-admin/commit/6f19660cfbc3be6e0d702e3f488e266c50622f0a)) +- 优化登录用户信息角色相关信息命名 ([be394f3](https://github.com/wms-org/wms-admin/commit/be394f3de4ea7ea692042db3556f706a3d141b51)) ([31f0abb](https://github.com/wms-org/wms-admin/commit/31f0abbae2e38d1cfa3f6221c9be0b54cf5337ad)) +- 升级前端依赖 ([c665902](https://github.com/wms-org/wms-admin/commit/c6659020f8bac7319c5c407389cd745527a8cd97)) +- 升级后端依赖 ([5049e1e](https://github.com/wms-org/wms-admin/commit/5049e1e312ab500e284abccbbee4186db2710d01)) ([d20aadf](https://github.com/wms-org/wms-admin/commit/d20aadfc93b54339d19d173fce364310e90b016d)) ([32904b5](https://github.com/wms-org/wms-admin/commit/32904b54ef63536ef5c5106adc00a7376b907632)) ### 🐛 问题修复 -- 修复删除列表数据后 Select 选择框重置问题 ([#21](https://github.com/ysoft-org/ysoft-admin/pull/21)) ([3288f2d](https://github.com/ysoft-org/ysoft-admin/commit/3288f2d38dfebc1381842d67cdfb17675c786859)) -- 修复前端部分拼写错误 ([62021f8](https://github.com/ysoft-org/ysoft-admin/commit/62021f8fdc171ad04d07c25c5a9357a64cc4a087)) +- 修复删除列表数据后 Select 选择框重置问题 ([#21](https://github.com/wms-org/wms-admin/pull/21)) ([3288f2d](https://github.com/wms-org/wms-admin/commit/3288f2d38dfebc1381842d67cdfb17675c786859)) +- 修复前端部分拼写错误 ([62021f8](https://github.com/wms-org/wms-admin/commit/62021f8fdc171ad04d07c25c5a9357a64cc4a087)) ### 💥 破坏性变更 -- 优化系统内置类型数据标识 ([8a02401](https://github.com/ysoft-org/ysoft-admin/commit/8a02401a24b546f2a6aab04cf05371ecb4236ca0)) -- 分离 HTTP 状态码和业务状态码 ([b3b6446](https://github.com/ysoft-org/ysoft-admin/commit/b3b6446433972422cf62dfc47c031134b91cd7ec)) -- 调整生产环境本地存储、日志位置 ([2254e55](https://github.com/ysoft-org/ysoft-admin/commit/2254e555af9cade4897d5335b252a0312d6805eb)) -- 调整项目打包结构,分离依赖、配置文件 ([e679abf](https://github.com/ysoft-org/ysoft-admin/commit/e679abfccc6c80198512958b6d07b363074d9d76)) +- 优化系统内置类型数据标识 ([8a02401](https://github.com/wms-org/wms-admin/commit/8a02401a24b546f2a6aab04cf05371ecb4236ca0)) +- 分离 HTTP 状态码和业务状态码 ([b3b6446](https://github.com/wms-org/wms-admin/commit/b3b6446433972422cf62dfc47c031134b91cd7ec)) +- 调整生产环境本地存储、日志位置 ([2254e55](https://github.com/wms-org/wms-admin/commit/2254e555af9cade4897d5335b252a0312d6805eb)) +- 调整项目打包结构,分离依赖、配置文件 ([e679abf](https://github.com/wms-org/wms-admin/commit/e679abfccc6c80198512958b6d07b363074d9d76)) -## [v1.1.2](https://github.com/ysoft-org/ysoft-admin/compare/v1.1.1...v1.1.2) (2023-09-24) +## [v1.1.2](https://github.com/wms-org/wms-admin/compare/v1.1.1...v1.1.2) (2023-09-24) ### 💎 功能优化 -- 优化后端程序启动成功输出内容 ([6322859](https://github.com/ysoft-org/ysoft-admin/commit/63228598d9fcd6e5d00172c12418a371d4c96766)) -- 配置子级菜单图标 ([5544836](https://github.com/ysoft-org/ysoft-admin/commit/55448364a39085debb776463f5e95a15b186c447)) +- 优化后端程序启动成功输出内容 ([6322859](https://github.com/wms-org/wms-admin/commit/63228598d9fcd6e5d00172c12418a371d4c96766)) +- 配置子级菜单图标 ([5544836](https://github.com/wms-org/wms-admin/commit/55448364a39085debb776463f5e95a15b186c447)) ### 🐛 问题修复 -- 修复生产环境和开发环境样式不一致的问题 ([be8732d](https://github.com/ysoft-org/ysoft-admin/commit/be8732d812e021631864b0ff6225b4da24cafcee)) -- 排除路径配置放开 /error ([0428fe7](https://github.com/ysoft-org/ysoft-admin/commit/0428fe776224afb64601901cef4d3100e5d30bd6)) -- 修复初始数据缺失字段列表的问题 ([d5138e1](https://github.com/ysoft-org/ysoft-admin/commit/d5138e1e43bdc8b347e061890131ac2646b2dd3c)) -- 修复系统日志表索引缺失导致查询耗时较长的问题 ([ac43833](https://github.com/ysoft-org/ysoft-admin/commit/ac438337219f5a160d49b255805774da36ab865c)) -- 修复部分菜单数据 component 信息配置错误 ([11ea072](https://github.com/ysoft-org/ysoft-admin/commit/11ea072d600f24fe97fe8145208e821712b84839)) -- 修复图标 SVG 内容格式错误 ([20f1e8a](https://github.com/ysoft-org/ysoft-admin/commit/20f1e8aecc737b28ab869d363957513d868b4ab7)) +- 修复生产环境和开发环境样式不一致的问题 ([be8732d](https://github.com/wms-org/wms-admin/commit/be8732d812e021631864b0ff6225b4da24cafcee)) +- 排除路径配置放开 /error ([0428fe7](https://github.com/wms-org/wms-admin/commit/0428fe776224afb64601901cef4d3100e5d30bd6)) +- 修复初始数据缺失字段列表的问题 ([d5138e1](https://github.com/wms-org/wms-admin/commit/d5138e1e43bdc8b347e061890131ac2646b2dd3c)) +- 修复系统日志表索引缺失导致查询耗时较长的问题 ([ac43833](https://github.com/wms-org/wms-admin/commit/ac438337219f5a160d49b255805774da36ab865c)) +- 修复部分菜单数据 component 信息配置错误 ([11ea072](https://github.com/wms-org/wms-admin/commit/11ea072d600f24fe97fe8145208e821712b84839)) +- 修复图标 SVG 内容格式错误 ([20f1e8a](https://github.com/wms-org/wms-admin/commit/20f1e8aecc737b28ab869d363957513d868b4ab7)) -## [v1.1.1](https://github.com/ysoft-org/ysoft-admin/compare/v1.1.0...v1.1.1) (2023-09-06) +## [v1.1.1](https://github.com/wms-org/wms-admin/compare/v1.1.0...v1.1.1) (2023-09-06) ### 💎 功能优化 -- 调整 Mock 响应时长,以解决前端偶发需重复登录问题 ([df19c5d](https://github.com/ysoft-org/ysoft-admin/commit/df19c5d2197fabb61cbdd4dccf1c427fb23d77d4)) +- 调整 Mock 响应时长,以解决前端偶发需重复登录问题 ([df19c5d](https://github.com/wms-org/wms-admin/commit/df19c5d2197fabb61cbdd4dccf1c427fb23d77d4)) ### 🐛 问题修复 -- 还原登录 Helper 优化(导致重大登录问题及查询在线用户错误) ([#15](https://github.com/ysoft-org/ysoft-admin/pull/15)) ([7a6db2d](https://github.com/ysoft-org/ysoft-admin/commit/7a6db2d14e60a5fcc1a2786e6eaa3d46a0714e6c)) ([#9](https://github.com/ysoft-org/ysoft-admin/pull/9)) ([9e2a5ef](https://github.com/ysoft-org/ysoft-admin/commit/9e2a5ef1249fd93dd10f2c255bf77c3eaa64a241)) -- 修复刷新页面后,选中菜单无法保持展开状态的问题 ([3fc7adb](https://github.com/ysoft-org/ysoft-admin/commit/3fc7adb1e2bd4b648753bd2999df725417e01680)) -- 修复侧边栏菜单无法显示自定义图标的问题 ([10ca5d8](https://github.com/ysoft-org/ysoft-admin/commit/10ca5d8c76aa39a207ea7db4442bf63ff4578273)) -- 更正 README 文档项目结构部分内容 ([486da2f](https://github.com/ysoft-org/ysoft-admin/commit/486da2f79bfc5379213bf666b8f325fb8096ebc6)) -- 修复公告缺失待发布状态的问题 ([#14](https://github.com/ysoft-org/ysoft-admin/pull/14)) ([46cc4c9](https://github.com/ysoft-org/ysoft-admin/commit/46cc4c9307e3cc7060ae436f59f007831104884a)) +- 还原登录 Helper 优化(导致重大登录问题及查询在线用户错误) ([#15](https://github.com/wms-org/wms-admin/pull/15)) ([7a6db2d](https://github.com/wms-org/wms-admin/commit/7a6db2d14e60a5fcc1a2786e6eaa3d46a0714e6c)) ([#9](https://github.com/wms-org/wms-admin/pull/9)) ([9e2a5ef](https://github.com/wms-org/wms-admin/commit/9e2a5ef1249fd93dd10f2c255bf77c3eaa64a241)) +- 修复刷新页面后,选中菜单无法保持展开状态的问题 ([3fc7adb](https://github.com/wms-org/wms-admin/commit/3fc7adb1e2bd4b648753bd2999df725417e01680)) +- 修复侧边栏菜单无法显示自定义图标的问题 ([10ca5d8](https://github.com/wms-org/wms-admin/commit/10ca5d8c76aa39a207ea7db4442bf63ff4578273)) +- 更正 README 文档项目结构部分内容 ([486da2f](https://github.com/wms-org/wms-admin/commit/486da2f79bfc5379213bf666b8f325fb8096ebc6)) +- 修复公告缺失待发布状态的问题 ([#14](https://github.com/wms-org/wms-admin/pull/14)) ([46cc4c9](https://github.com/wms-org/wms-admin/commit/46cc4c9307e3cc7060ae436f59f007831104884a)) -## [v1.1.0](https://github.com/ysoft-org/ysoft-admin/compare/v1.0.1...v1.1.0) (2023-09-01) +## [v1.1.0](https://github.com/wms-org/wms-admin/compare/v1.0.1...v1.1.0) (2023-09-01) ### ✨ 新特性 * 公告管理:提供公告的发布、查看和删除等功能。管理员可以在后台发布公告,并可以设置公告的生效时间、终止时间,以 markdown-it 为内核渲染 Markdown 格式内容显示 * 代码生成:提供根据数据库表自动生成相应的前后端 CRUD 代码的功能 -* 允许表格调整列宽,不允许新增/修改类表单对话框按 Esc 关闭 ([1b06a96](https://github.com/ysoft-org/ysoft-admin/commit/1b06a96cfbe5774931d8c4c0d7827703caa096df)) +* 允许表格调整列宽,不允许新增/修改类表单对话框按 Esc 关闭 ([1b06a96](https://github.com/wms-org/wms-admin/commit/1b06a96cfbe5774931d8c4c0d7827703caa096df)) ### 💎 功能优化 -- 最终适配及启用 Arco Design Pro Vue 动态路由 ([9baf341](https://github.com/ysoft-org/ysoft-admin/commit/9baf3410138cb8a152ec51f70340d500fa009510)) -- 优化分页总记录数数据类型 ([bfea689](https://github.com/ysoft-org/ysoft-admin/commit/bfea689b0eaf44c8d54b4fd59c042d72ac71e395)) -- 修复在线用户列表等自定义分页查询 NPE 的问题 ([015ff55](https://github.com/ysoft-org/ysoft-admin/commit/015ff5512b3662efce88d02ab1dda6d55501a501)) -- 对获取路由信息接口增加缓存处理 ([4639d13](https://github.com/ysoft-org/ysoft-admin/commit/4639d13ba61abfaed3c9d3da0e057892577b5c40))⚡ -- 完善前端 axios 请求响应拦截器 ([bb398d8](https://github.com/ysoft-org/ysoft-admin/commit/bb398d8101e3780f450c6508852fc727fb936cee)) ([e18692f](https://github.com/ysoft-org/ysoft-admin/commit/e18692fa74e0a0d9558db6643b945c6c6a00db36)) -- 优化仪表盘公告区块、帮助文档区块内容 ([b59a819](https://github.com/ysoft-org/ysoft-admin/commit/b59a819ad5f2bdbd357951f070d155e91f2d7903)) ([315c059](https://github.com/ysoft-org/ysoft-admin/commit/315c059713833be10b0cf05d302259a3146f3707)) ([6d024a9](https://github.com/ysoft-org/ysoft-admin/commit/6d024a90d7a231439c8e260b9bd625e8b5027515)) -- 将 Swagger 文档中的额外请求参数隐藏 ([#11](https://github.com/ysoft-org/ysoft-admin/pull/11)) ([a9ed02b](https://github.com/ysoft-org/ysoft-admin/commit/a9ed02bf4ff6a8a4d9f68db2d62d29000c543943)) -- 优化前端 CRUD 相关命名 ([6d81928](https://github.com/ysoft-org/ysoft-admin/commit/6d81928541f4da568e9c7138f91d4dc1c5c6dd4e)) -- 优化部分超链接标签属性 ([46a75d0](https://github.com/ysoft-org/ysoft-admin/commit/46a75d029798e8d5a162b53b8a61c8e3c3f4dd9e)) -- 使用属性变量消除配置文件中分散的 ContiNew Admin 品牌元素 ([54ea410](https://github.com/ysoft-org/ysoft-admin/commit/54ea41048abd096cf1e2c32ee871c1eb85d4ece1)) -- 拆分 Swagger 接口文档分组 ([#10](https://github.com/ysoft-org/ysoft-admin/pull/10)) ([72df45e](https://github.com/ysoft-org/ysoft-admin/commit/72df45e9b3373d28f1845af16a81cb8bd8408647)) -- 优化登录 Helper ([#9](https://github.com/ysoft-org/ysoft-admin/pull/9)) ([9e2a5ef](https://github.com/ysoft-org/ysoft-admin/commit/9e2a5ef1249fd93dd10f2c255bf77c3eaa64a241)) -- 将全局异常处理器未知异常的异常类型从 Exception 调整为 Throwable ([90e1c64](https://github.com/ysoft-org/ysoft-admin/commit/90e1c64db684df97454e4753932b7f4017d8e23d)) -- 优化 == 及 != 表达式格式 ([487fa82](https://github.com/ysoft-org/ysoft-admin/commit/487fa82306fbd84033f6c39ad20b72755b03e875)) -- 集成 Spring Cache,优化查询用户昵称性能 ([b23b00d](https://github.com/ysoft-org/ysoft-admin/commit/b23b00d02a4738a61b4a13676fab6d2c9ec927de)) ([76622c2](https://github.com/ysoft-org/ysoft-admin/commit/76622c238f1d6028826407490e50a14bdba25ade))⚡ -- 将验证码唯一标识格式从无符号 UUID 调整为带符号 UUID ([a61196c](https://github.com/ysoft-org/ysoft-admin/commit/a61196cd62cea4f684154bb42a949656650f626b)) -- 完善接口文档示例信息 ([#7](https://github.com/ysoft-org/ysoft-admin/pull/7)) ([ad7d699](https://github.com/ysoft-org/ysoft-admin/commit/ad7d6995ba40a0cb70a194693fa450bdbb3cc7a0)) ([#8](https://github.com/ysoft-org/ysoft-admin/pull/8)) ([0ac0213](https://github.com/ysoft-org/ysoft-admin/commit/0ac0213628023c04b5be531522d76f09712f7317)) ([190385e](https://github.com/ysoft-org/ysoft-admin/commit/190385ed3636206224bc90780fcede2e49f9c118)) ([332bd6c](https://github.com/ysoft-org/ysoft-admin/commit/332bd6cd2a9b4e25678a3eec565965c5b2702aa2)) -- 使用 DatePattern 中的日期格式常量替代字符串常量中的日期格式 ([241a9cf](https://github.com/ysoft-org/ysoft-admin/commit/241a9cf85b3c19eb093d4d661c35d71c490adf1f)) -- 优化分组校验 ([78a5d5e](https://github.com/ysoft-org/ysoft-admin/commit/78a5d5ec7a14ee37d92a9520211adca23f12b287)) -- 优化 springdoc-openapi 对象型参数处理 ([ae8d294](https://github.com/ysoft-org/ysoft-admin/commit/ae8d294705536e99d6c30a9ff5257fdb3ee5b35f)) -- 升级前端依赖,并更换包管理器 yarn => pnpm ([6164110](https://github.com/ysoft-org/ysoft-admin/commit/6164110462cc3aff66d79539f54e84d47c6d5894)) -- 升级后端依赖 ([51a82d8](https://github.com/ysoft-org/ysoft-admin/commit/51a82d8f4eabd6aa27e1a991f05f516171b6ae03)) +- 最终适配及启用 Arco Design Pro Vue 动态路由 ([9baf341](https://github.com/wms-org/wms-admin/commit/9baf3410138cb8a152ec51f70340d500fa009510)) +- 优化分页总记录数数据类型 ([bfea689](https://github.com/wms-org/wms-admin/commit/bfea689b0eaf44c8d54b4fd59c042d72ac71e395)) +- 修复在线用户列表等自定义分页查询 NPE 的问题 ([015ff55](https://github.com/wms-org/wms-admin/commit/015ff5512b3662efce88d02ab1dda6d55501a501)) +- 对获取路由信息接口增加缓存处理 ([4639d13](https://github.com/wms-org/wms-admin/commit/4639d13ba61abfaed3c9d3da0e057892577b5c40))⚡ +- 完善前端 axios 请求响应拦截器 ([bb398d8](https://github.com/wms-org/wms-admin/commit/bb398d8101e3780f450c6508852fc727fb936cee)) ([e18692f](https://github.com/wms-org/wms-admin/commit/e18692fa74e0a0d9558db6643b945c6c6a00db36)) +- 优化仪表盘公告区块、帮助文档区块内容 ([b59a819](https://github.com/wms-org/wms-admin/commit/b59a819ad5f2bdbd357951f070d155e91f2d7903)) ([315c059](https://github.com/wms-org/wms-admin/commit/315c059713833be10b0cf05d302259a3146f3707)) ([6d024a9](https://github.com/wms-org/wms-admin/commit/6d024a90d7a231439c8e260b9bd625e8b5027515)) +- 将 Swagger 文档中的额外请求参数隐藏 ([#11](https://github.com/wms-org/wms-admin/pull/11)) ([a9ed02b](https://github.com/wms-org/wms-admin/commit/a9ed02bf4ff6a8a4d9f68db2d62d29000c543943)) +- 优化前端 CRUD 相关命名 ([6d81928](https://github.com/wms-org/wms-admin/commit/6d81928541f4da568e9c7138f91d4dc1c5c6dd4e)) +- 优化部分超链接标签属性 ([46a75d0](https://github.com/wms-org/wms-admin/commit/46a75d029798e8d5a162b53b8a61c8e3c3f4dd9e)) +- 使用属性变量消除配置文件中分散的 ContiNew Admin 品牌元素 ([54ea410](https://github.com/wms-org/wms-admin/commit/54ea41048abd096cf1e2c32ee871c1eb85d4ece1)) +- 拆分 Swagger 接口文档分组 ([#10](https://github.com/wms-org/wms-admin/pull/10)) ([72df45e](https://github.com/wms-org/wms-admin/commit/72df45e9b3373d28f1845af16a81cb8bd8408647)) +- 优化登录 Helper ([#9](https://github.com/wms-org/wms-admin/pull/9)) ([9e2a5ef](https://github.com/wms-org/wms-admin/commit/9e2a5ef1249fd93dd10f2c255bf77c3eaa64a241)) +- 将全局异常处理器未知异常的异常类型从 Exception 调整为 Throwable ([90e1c64](https://github.com/wms-org/wms-admin/commit/90e1c64db684df97454e4753932b7f4017d8e23d)) +- 优化 == 及 != 表达式格式 ([487fa82](https://github.com/wms-org/wms-admin/commit/487fa82306fbd84033f6c39ad20b72755b03e875)) +- 集成 Spring Cache,优化查询用户昵称性能 ([b23b00d](https://github.com/wms-org/wms-admin/commit/b23b00d02a4738a61b4a13676fab6d2c9ec927de)) ([76622c2](https://github.com/wms-org/wms-admin/commit/76622c238f1d6028826407490e50a14bdba25ade))⚡ +- 将验证码唯一标识格式从无符号 UUID 调整为带符号 UUID ([a61196c](https://github.com/wms-org/wms-admin/commit/a61196cd62cea4f684154bb42a949656650f626b)) +- 完善接口文档示例信息 ([#7](https://github.com/wms-org/wms-admin/pull/7)) ([ad7d699](https://github.com/wms-org/wms-admin/commit/ad7d6995ba40a0cb70a194693fa450bdbb3cc7a0)) ([#8](https://github.com/wms-org/wms-admin/pull/8)) ([0ac0213](https://github.com/wms-org/wms-admin/commit/0ac0213628023c04b5be531522d76f09712f7317)) ([190385e](https://github.com/wms-org/wms-admin/commit/190385ed3636206224bc90780fcede2e49f9c118)) ([332bd6c](https://github.com/wms-org/wms-admin/commit/332bd6cd2a9b4e25678a3eec565965c5b2702aa2)) +- 使用 DatePattern 中的日期格式常量替代字符串常量中的日期格式 ([241a9cf](https://github.com/wms-org/wms-admin/commit/241a9cf85b3c19eb093d4d661c35d71c490adf1f)) +- 优化分组校验 ([78a5d5e](https://github.com/wms-org/wms-admin/commit/78a5d5ec7a14ee37d92a9520211adca23f12b287)) +- 优化 springdoc-openapi 对象型参数处理 ([ae8d294](https://github.com/wms-org/wms-admin/commit/ae8d294705536e99d6c30a9ff5257fdb3ee5b35f)) +- 升级前端依赖,并更换包管理器 yarn => pnpm ([6164110](https://github.com/wms-org/wms-admin/commit/6164110462cc3aff66d79539f54e84d47c6d5894)) +- 升级后端依赖 ([51a82d8](https://github.com/wms-org/wms-admin/commit/51a82d8f4eabd6aa27e1a991f05f516171b6ae03)) ### 🐛 问题修复 -- 完善部分数据库表的唯一索引 ([88d6118](https://github.com/ysoft-org/ysoft-admin/commit/88d6118693586fbd8da573df3b2f942d049e4b3c)) -- 修复访问 doc.html 接口文档,控制台报 No mapping for GET /favicon.ico 警告的问题 ([94f88ba](https://github.com/ysoft-org/ysoft-admin/commit/94f88bad2278d64a4b8a3bc930a9f754fb00cba6)) -- 登录页面输入错误时,自动清空验证码输入框 ([a76f47f](https://github.com/ysoft-org/ysoft-admin/commit/a76f47fbd86bfa7fbf85440c653ae6259fce7969)) +- 完善部分数据库表的唯一索引 ([88d6118](https://github.com/wms-org/wms-admin/commit/88d6118693586fbd8da573df3b2f942d049e4b3c)) +- 修复访问 doc.html 接口文档,控制台报 No mapping for GET /favicon.ico 警告的问题 ([94f88ba](https://github.com/wms-org/wms-admin/commit/94f88bad2278d64a4b8a3bc930a9f754fb00cba6)) +- 登录页面输入错误时,自动清空验证码输入框 ([a76f47f](https://github.com/wms-org/wms-admin/commit/a76f47fbd86bfa7fbf85440c653ae6259fce7969)) ### 💥 破坏性变更 -- 更新信息调整为仅在更新数据时自动填充 ([df77e57](https://github.com/ysoft-org/ysoft-admin/commit/df77e574cca605afd89f1b3781f1cde699bcb7e6)) -- 将时间戳单位从毫秒调整为秒 ([fa916b9](https://github.com/ysoft-org/ysoft-admin/commit/fa916b93247e10462eb44185ad45cdca4dedda7d)) -- 移除所有的 @Accessors(chain = true),并全局配置禁止使用 ([76c6546](https://github.com/ysoft-org/ysoft-admin/commit/76c65463c2e5ddf0c90fa1622fd86706a4373c80)) +- 更新信息调整为仅在更新数据时自动填充 ([df77e57](https://github.com/wms-org/wms-admin/commit/df77e574cca605afd89f1b3781f1cde699bcb7e6)) +- 将时间戳单位从毫秒调整为秒 ([fa916b9](https://github.com/wms-org/wms-admin/commit/fa916b93247e10462eb44185ad45cdca4dedda7d)) +- 移除所有的 @Accessors(chain = true),并全局配置禁止使用 ([76c6546](https://github.com/wms-org/wms-admin/commit/76c65463c2e5ddf0c90fa1622fd86706a4373c80)) -## [v1.0.1](https://github.com/ysoft-org/ysoft-admin/compare/v1.0.0...v1.0.1) (2023-08-17) +## [v1.0.1](https://github.com/wms-org/wms-admin/compare/v1.0.0...v1.0.1) (2023-08-17) ### 💎 功能优化 -- 优化根据 ID 查询用户昵称方法 ([4a8af1f](https://github.com/ysoft-org/ysoft-admin/commit/4a8af1f72d9249afa1c013e08674f492f453b020)) -- 优化 BaseController 中部分权限码的使用 ([b0b1127](https://github.com/ysoft-org/ysoft-admin/commit/b0b1127b5bd39e9bc431e9fa9c86201bbc18e891)) -- 优化分页总记录数数据类型 ([76f04dd](https://github.com/ysoft-org/ysoft-admin/commit/76f04dd38f90aad6abf82d2dccba031d4d9108cf)) -- 优化通用查询注解解析器 ([a623acd](https://github.com/ysoft-org/ysoft-admin/commit/a623acd4a5529ae42898ec359f595716acc5bab8)) ([b632c18](https://github.com/ysoft-org/ysoft-admin/commit/b632c183994ac71382180a38bf7bdb7a6315c1e6)) -- 优化数据库表结构中部分类型长度 ([f3fabea](https://github.com/ysoft-org/ysoft-admin/commit/f3fabea7dd736d94badecbc08091eec6274f5fb7)) -- 使用常量优化部分魔法值 ([e6f7429](https://github.com/ysoft-org/ysoft-admin/commit/e6f7429fa30cbc87c03a073a53b6f7df24d33d8d)) -- 优化部分 Properties 用法 ([48de2e8](https://github.com/ysoft-org/ysoft-admin/commit/48de2e85e0fbf60f10769cd3529f79ac3c531e92)) +- 优化根据 ID 查询用户昵称方法 ([4a8af1f](https://github.com/wms-org/wms-admin/commit/4a8af1f72d9249afa1c013e08674f492f453b020)) +- 优化 BaseController 中部分权限码的使用 ([b0b1127](https://github.com/wms-org/wms-admin/commit/b0b1127b5bd39e9bc431e9fa9c86201bbc18e891)) +- 优化分页总记录数数据类型 ([76f04dd](https://github.com/wms-org/wms-admin/commit/76f04dd38f90aad6abf82d2dccba031d4d9108cf)) +- 优化通用查询注解解析器 ([a623acd](https://github.com/wms-org/wms-admin/commit/a623acd4a5529ae42898ec359f595716acc5bab8)) ([b632c18](https://github.com/wms-org/wms-admin/commit/b632c183994ac71382180a38bf7bdb7a6315c1e6)) +- 优化数据库表结构中部分类型长度 ([f3fabea](https://github.com/wms-org/wms-admin/commit/f3fabea7dd736d94badecbc08091eec6274f5fb7)) +- 使用常量优化部分魔法值 ([e6f7429](https://github.com/wms-org/wms-admin/commit/e6f7429fa30cbc87c03a073a53b6f7df24d33d8d)) +- 优化部分 Properties 用法 ([48de2e8](https://github.com/wms-org/wms-admin/commit/48de2e85e0fbf60f10769cd3529f79ac3c531e92)) ### 🐛 问题修复 -- 修复获取字典参数为空时的判断条件 ([#6](https://github.com/ysoft-org/ysoft-admin/pull/6)) ([104f69e](https://github.com/ysoft-org/ysoft-admin/commit/104f69e8a09ce36163f6f9680b2d8d61bb45f11a)) -- 完善查询用户数据权限 ([026247f](https://github.com/ysoft-org/ysoft-admin/commit/026247f677110ae199124a67c68503729cbaec92)) -- 解决 IDE 报 Delete ␍ eslint(prettier/prettier) 警告的问题 ([8743ed1](https://github.com/ysoft-org/ysoft-admin/commit/8743ed14d927ab52814ed5f5f166afaa7a6b78b2)) -- 修复分页查询条件默认值未生效的问题 ([2d2a7e7](https://github.com/ysoft-org/ysoft-admin/commit/2d2a7e7c8e31763ac3ea514d8a92c3938376dd3a)) -- 完善各模块事务注解 ([18c54a7](https://github.com/ysoft-org/ysoft-admin/commit/18c54a74fc6ff0650ff53eeadc094d7e1df0b0a5)) -- 修复邮箱健康检查报错问题并优化部分配置写法 ([5968f40](https://github.com/ysoft-org/ysoft-admin/commit/5968f402ed478244d36f5825373190ed00d8c1f1)) -- 完善各模块参数校验 ([8b955a0](https://github.com/ysoft-org/ysoft-admin/commit/8b955a0b1bde4e8959fc0dfbc11a326d9eec0b45)) +- 修复获取字典参数为空时的判断条件 ([#6](https://github.com/wms-org/wms-admin/pull/6)) ([104f69e](https://github.com/wms-org/wms-admin/commit/104f69e8a09ce36163f6f9680b2d8d61bb45f11a)) +- 完善查询用户数据权限 ([026247f](https://github.com/wms-org/wms-admin/commit/026247f677110ae199124a67c68503729cbaec92)) +- 解决 IDE 报 Delete ␍ eslint(prettier/prettier) 警告的问题 ([8743ed1](https://github.com/wms-org/wms-admin/commit/8743ed14d927ab52814ed5f5f166afaa7a6b78b2)) +- 修复分页查询条件默认值未生效的问题 ([2d2a7e7](https://github.com/wms-org/wms-admin/commit/2d2a7e7c8e31763ac3ea514d8a92c3938376dd3a)) +- 完善各模块事务注解 ([18c54a7](https://github.com/wms-org/wms-admin/commit/18c54a74fc6ff0650ff53eeadc094d7e1df0b0a5)) +- 修复邮箱健康检查报错问题并优化部分配置写法 ([5968f40](https://github.com/wms-org/wms-admin/commit/5968f402ed478244d36f5825373190ed00d8c1f1)) +- 完善各模块参数校验 ([8b955a0](https://github.com/wms-org/wms-admin/commit/8b955a0b1bde4e8959fc0dfbc11a326d9eec0b45)) ## v1.0.0 (2023-03-26) diff --git a/README.md b/README.md index 5bf3ca5..8eb2c32 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,44 @@ # ContiNew Admin 中后台管理框架 - + Release - + ContiNew Starter Spring Boot - + Open JDK - + Codacy - -Sonar + +Sonar
- + License - -GitHub Stars + +GitHub Stars - -GitHub Forks + +GitHub Forks - -Gitee Stars + +Gitee Stars - -Gitee Forks + +Gitee Forks - -GitCode Stars + +GitCode Stars -📚 [在线文档](https://ysoft.top) | 🚀 [演示地址](https://admin.ysoft.top)(账号/密码:admin/admin123) +📚 [在线文档](https://wms.top) | 🚀 [演示地址](https://admin.wms.top)(账号/密码:admin/admin123) ## 简介 @@ -50,9 +50,9 @@ ContiNew Admin(Continue New Admin)持续迭代优化的前后端分离中后 | | 后端 | 前端 | | :------ | :----------------------------------------------------------- | :----------------------------------------------------------- | -| Gitee | [ysoft/ysoft-admin](https://gitee.com/ysoft/ysoft-admin) | [ysoft/ysoft-admin-ui](https://gitee.com/ysoft/ysoft-admin-ui) | -| GitCode | [ysoft/ysoft-admin](https://gitcode.com/ysoft/ysoft-admin) | [ysoft/ysoft-admin-ui](https://gitcode.com/ysoft/ysoft-admin-ui) | -| GitHub | [ysoft-org/ysoft-admin](https://github.com/ysoft-org/ysoft-admin) | [ysoft-org/ysoft-admin-ui](https://github.com/ysoft-org/ysoft-admin-ui) | +| Gitee | [wms/wms-admin](https://gitee.com/wms/wms-admin) | [wms/wms-admin-ui](https://gitee.com/wms/wms-admin-ui) | +| GitCode | [wms/wms-admin](https://gitcode.com/wms/wms-admin) | [wms/wms-admin-ui](https://gitcode.com/wms/wms-admin-ui) | +| GitHub | [wms-org/wms-admin](https://github.com/wms-org/wms-admin) | [wms-org/wms-admin-ui](https://github.com/wms-org/wms-admin-ui) | ## 项目起源 @@ -74,11 +74,11 @@ ContiNew Admin(Continue New Admin)持续迭代优化的前后端分离中后 ## 为什么选我们? > [!TIP] -> 更为完整的图文描述请查阅[《在线文档》](https://ysoft.top/admin/intro/why.html)。 +> 更为完整的图文描述请查阅[《在线文档》](https://wms.top/admin/intro/why.html)。 1.**甄选技术栈:** ContiNew(Continue New) 项目致力于持续迭代优化,让技术不掉队。在技术选型时,进行深度广泛地调研,从流行度、成熟度和发展潜力等多方面甄选技术栈。 -2.**Starter 组件:** 从 v2.1.0 版本开始,抽取并封装后端基础组件及各框架集成配置到 ContiNew Starter 项目,且 **[已发布至 Maven 中央仓库](https://central.sonatype.com/search?q=ysoft-starter&namespace=top.ysoft)**,可在你的任意项目中直接引入所需依赖使用。即使你不用脚手架项目,难道能让你搭项目框架更快、更爽、更省力的 Starter 也要 Say No 吗? +2.**Starter 组件:** 从 v2.1.0 版本开始,抽取并封装后端基础组件及各框架集成配置到 ContiNew Starter 项目,且 **[已发布至 Maven 中央仓库](https://central.sonatype.com/search?q=wms-starter&namespace=top.wms)**,可在你的任意项目中直接引入所需依赖使用。即使你不用脚手架项目,难道能让你搭项目框架更快、更爽、更省力的 Starter 也要 Say No 吗? 3.**CRUD 套件:** 封装通用增删改查套件,适配后端各分层,几分钟即可提供一套 CRUD API,包括新增、修改、批量删除、查询详情、分页列表查询、全部列表查询、树型列表查询、导出到 Excel,且 API 支持按实际所需开放或扩展。 @@ -116,7 +116,7 @@ public class DeptController extends BaseController [!TIP] -> 更多功能和优化正在赶来💦,最新项目计划、进展请进群或关注 [需求墙](https://ysoft.top/require.html) 和 [更新日志](https://ysoft.top/admin/other/changelog.html)。 +> 更多功能和优化正在赶来💦,最新项目计划、进展请进群或关注 [需求墙](https://wms.top/require.html) 和 [更新日志](https://wms.top/admin/other/changelog.html)。 - 仪表盘:提供工作台、分析页,工作台提供功能快捷导航入口、最新公告、动态;分析页提供全面数据可视化能力 - 个人中心:支持基础信息修改、密码修改、邮箱绑定、手机号绑定(并提供行为验证码、短信限流等安全处理)、第三方账号绑定/解绑、头像裁剪上传 @@ -231,7 +231,7 @@ public class DeptController extends BaseControllerArco Design | 2.56.0 | 字节跳动推出的前端 UI 框架,年轻化的色彩和组件设计。 | | TypeScript | 5.0.4 | TypeScript 是微软开发的一个开源的编程语言,通过在 JavaScript 的基础上添加静态类型定义构建而成。 | | Vite | 5.1.5 | 下一代的前端工具链,为开发提供极速响应。 | -| [ContiNew Starter](https://github.com/ysoft-org/ysoft-starter) | 2.9.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包(如 MyBatis-Plus、SaToken),可轻松集成到应用中,为开发人员减少手动引入依赖及配置的麻烦,为 Spring Boot Web 项目的灵活快速构建提供支持。 | +| [ContiNew Starter](https://github.com/wms-org/wms-starter) | 2.9.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包(如 MyBatis-Plus、SaToken),可轻松集成到应用中,为开发人员减少手动引入依赖及配置的麻烦,为 Spring Boot Web 项目的灵活快速构建提供支持。 | | Spring Boot | 3.2.12 | 简化 Spring 应用的初始搭建和开发过程,基于“约定优于配置”的理念,使开发人员不再需要定义样板化的配置。(Spring Boot 3.0 开始,要求 Java 17 作为最低版本) | | Undertow | 2.3.17.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 | | Sa-Token + JWT | 1.39.0 | 轻量级 Java 权限认证框架,让鉴权变得简单、优雅。 | @@ -262,11 +262,11 @@ public class DeptController extends BaseController [!TIP] -> 更详细的流程,请查看在线文档[《快速开始》](https://ysoft.top/admin/intro/quick-start.html)。 +> 更详细的流程,请查看在线文档[《快速开始》](https://wms.top/admin/intro/quick-start.html)。 ```bash # 1.克隆本项目 -git clone https://github.com/ysoft-org/ysoft-admin.git +git clone https://github.com/wms-org/wms-admin.git # 2.在 IDE(IntelliJ IDEA/Eclipse)中打开本项目 @@ -280,9 +280,9 @@ git clone https://github.com/ysoft-org/ysoft-admin.git # 5.部署 # 5.1 Docker 部署 # 5.1.1 服务器安装好 docker 及 docker-compose(参考:https://blog.charles7c.top/categories/fragments/2022/10/31/CentOS%E5%AE%89%E8%A3%85Docker) -# 5.1.2 执行 mvn package 进行项目打包,将 target/app 目录下的所有内容放到 /docker/ysoft-admin 目录下 +# 5.1.2 执行 mvn package 进行项目打包,将 target/app 目录下的所有内容放到 /docker/wms-admin 目录下 # 5.1.3 将 docker 目录上传到服务器 / 目录下,并授权(chmod -R 777 /docker) -# 5.1.4 修改 docker-compose.yml 中的 MySQL 配置、Redis 配置、ysoft-admin-server 配置、Nginx 配置 +# 5.1.4 修改 docker-compose.yml 中的 MySQL 配置、Redis 配置、wms-admin-server 配置、Nginx 配置 # 5.1.5 执行 docker-compose up -d 创建并后台运行所有容器 # 5.2 其他方式部署 ``` @@ -290,14 +290,14 @@ git clone https://github.com/ysoft-org/ysoft-admin.git ## 项目结构 > [!TIP] -> 后端采用按功能拆分模块的开发方式,下方项目目录结构是按照模块的层次顺序进行介绍的,实际 IDE 中 `ysoft-admin-common` 模块会因为字母排序原因排在上方。 +> 后端采用按功能拆分模块的开发方式,下方项目目录结构是按照模块的层次顺序进行介绍的,实际 IDE 中 `wms-admin-common` 模块会因为字母排序原因排在上方。 ``` -ysoft-admin -├─ ysoft-webapi(API 及打包部署模块) +wms-admin +├─ wms-webapi(API 及打包部署模块) │ ├─ src │ │ ├─ main -│ │ │ ├─ java/top/ysoft/admin +│ │ │ ├─ java/top/wms/admin │ │ │ │ ├─ config (配置) │ │ │ │ ├─ controller │ │ │ │ │ ├─ auth(系统认证相关 API) @@ -320,10 +320,10 @@ ysoft-admin │ │ │ └─ logback-spring.xml(日志配置文件) │ │ └─ test(测试相关代码目录) │ └─ pom.xml(包含打包相关配置) -├─ ysoft-module-system(系统管理模块,存放系统管理相关业务功能,例如:部门管理、角色管理、用户管理等) +├─ wms-module-system(系统管理模块,存放系统管理相关业务功能,例如:部门管理、角色管理、用户管理等) │ ├─ src │ │ ├─ main -│ │ │ ├─ java/top/ysoft/admin +│ │ │ ├─ java/top/wms/admin │ │ │ │ ├─ auth(系统认证相关业务) │ │ │ │ │ ├─ model(系统认证相关模型) │ │ │ │ │ │ ├─ query(系统认证相关查询条件) @@ -345,10 +345,10 @@ ysoft-admin │ │ │ └─ mapper(系统管理相关 Mapper XML 文件目录) │ │ └─ test(测试相关代码目录) │ └─ pom.xml -├─ ysoft-plugin(插件模块,存放代码生成、任务调度等扩展模块,后续会进行插件化改造) -│ ├─ ysoft-plugin-schedule(任务调度插件模块) +├─ wms-plugin(插件模块,存放代码生成、任务调度等扩展模块,后续会进行插件化改造) +│ ├─ wms-plugin-schedule(任务调度插件模块) │ │ ├─ src -│ │ │ ├─ main/java/top/ysoft/admin/schedule +│ │ │ ├─ main/java/top/wms/admin/schedule │ │ │ │ ├─ api(任务调度中心相关 API) │ │ │ │ ├─ config(任务调度相关配置) │ │ │ │ ├─ constant(任务调度相关常量) @@ -360,9 +360,9 @@ ysoft-admin │ │ │ │ └─ service(代码生成器相关业务接口及实现类) │ │ │ └─ test(测试相关代码目录) │ │ └─ pom.xml -│ ├─ ysoft-plugin-open(能力开放插件模块) +│ ├─ wms-plugin-open(能力开放插件模块) │ │ ├─ src -│ │ │ ├─ main/java/top/ysoft/admin/open +│ │ │ ├─ main/java/top/wms/admin/open │ │ │ │ ├─ mapper(代码生成器相关 Mapper) │ │ │ │ ├─ model(能力开放相关模型) │ │ │ │ │ ├─ entity(能力开放相关实体对象) @@ -372,10 +372,10 @@ ysoft-admin │ │ │ │ └─ service(能力开放相关业务接口及实现类) │ │ │ └─ test(测试相关代码目录) │ │ └─ pom.xml -│ ├─ ysoft-plugin-generator(代码生成器插件模块) +│ ├─ wms-plugin-generator(代码生成器插件模块) │ │ ├─ src │ │ │ ├─ main -│ │ │ │ ├─ java/top/ysoft/admin/generator +│ │ │ │ ├─ java/top/wms/admin/generator │ │ │ │ │ ├─ config(代码生成器相关配置) │ │ │ │ │ ├─ enums(代码生成器相关枚举) │ │ │ │ │ ├─ mapper(代码生成器相关 Mapper) @@ -392,9 +392,9 @@ ysoft-admin │ │ │ └─ test(测试相关代码目录) │ │ └─ pom.xml │ └─ pom.xml -├─ ysoft-common(公共模块,存放公共工具类,公共配置等) +├─ wms-common(公共模块,存放公共工具类,公共配置等) │ ├─ src -│ │ ├─ main/java/top/ysoft/admin/common +│ │ ├─ main/java/top/wms/admin/common │ │ │ ├─ config(公共配置) │ │ │ ├─ constant(公共常量) │ │ │ ├─ enums(公共枚举) @@ -405,11 +405,11 @@ ysoft-admin │ │ │ └─ util(公共工具类) │ │ └─ test(测试相关代码目录) │ └─ pom.xml -├─ ysoft-extension(扩展模块) -│ ├─ ysoft-extension-schedule-server(任务调度服务端模块,实际开发时如果是公司统一提供环境,可直接删除本模块) +├─ wms-extension(扩展模块) +│ ├─ wms-extension-schedule-server(任务调度服务端模块,实际开发时如果是公司统一提供环境,可直接删除本模块) │ │ ├─ src │ │ │ ├─ main -│ │ │ │ ├─ java/top/ysoft/admin/extension/schedule +│ │ │ │ ├─ java/top/wms/admin/extension/schedule │ │ │ │ │ └─ ScheduleServerApplication.java(任务调度服务端启动程序) │ │ │ │ └─ resources │ │ │ │ ├─ config(核心配置目录) @@ -442,11 +442,11 @@ ysoft-admin ContiNew Admin 致力于提供开箱即用,持续舒适的开发体验。作为一个开源项目,Creator 的初心是希望 ContiNew Admin 依托开源协作模式,提升技术透明度、放大集体智慧、共创优秀实践,源源不断地为企业级项目开发提供助力。 -我们非常欢迎广大社区用户为 ContiNew Admin **贡献(开发,测试、文档、答疑等)** 或优化代码,欢迎各位感兴趣的小伙伴儿,[添加微信](https://ysoft.top/support.html) 讨论或认领任务。 +我们非常欢迎广大社区用户为 ContiNew Admin **贡献(开发,测试、文档、答疑等)** 或优化代码,欢迎各位感兴趣的小伙伴儿,[添加微信](https://wms.top/support.html) 讨论或认领任务。 ### 分支说明 -ContiNew Admin 的分支目前分为下个大版本的开发分支和上个大版本的维护分支,PR 前请注意对应分支是否处于维护状态,版本支持情况请查看 [更新日志/版本支持](https://ysoft.top/admin/other/changelog.html#%E7%89%88%E6%9C%AC%E6%94%AF%E6%8C%81)。 +ContiNew Admin 的分支目前分为下个大版本的开发分支和上个大版本的维护分支,PR 前请注意对应分支是否处于维护状态,版本支持情况请查看 [更新日志/版本支持](https://wms.top/admin/other/changelog.html#%E7%89%88%E6%9C%AC%E6%94%AF%E6%8C%81)。 | 分支 | 说明 | | ----- | ------------------------------------------------------------ | @@ -461,7 +461,7 @@ ContiNew Admin 的分支目前分为下个大版本的开发分支和上个大 2. 然后,将 fork 过来的项目(即您的项目)克隆到本地 3. 切换到当前仍在维护的分支(请务必充分了解分支使用说明,可进群联系维护者确认) 4. 开始修改代码,修改完成后,将代码 commit 并 push 到您的远程仓库 -5. 在 Gitee 或 Github 上新建 pull request(pr),选择好源和目标,按模板要求填写说明信息后提交即可(多多参考 [已批准合并的 pr 记录](https://github.com/ysoft-org/ysoft-admin/pulls?q=is%3Apr+is%3Amerged),会大大增加批准合并率) +5. 在 Gitee 或 Github 上新建 pull request(pr),选择好源和目标,按模板要求填写说明信息后提交即可(多多参考 [已批准合并的 pr 记录](https://github.com/wms-org/wms-admin/pulls?q=is%3Apr+is%3Amerged),会大大增加批准合并率) 6. 最后,耐心等待维护者合并您的请求即可 请记住,如果您有任何疑问或需要帮助,我们将随时提供支持。 @@ -469,7 +469,7 @@ ContiNew Admin 的分支目前分为下个大版本的开发分支和上个大 > [!IMPORTANT] > 欢迎大家为 ContiNew Admin 贡献代码,我们非常感谢您的支持!为了更好地管理项目,维护者有一些要求: > -> 1. 请确保代码、配置文件的结构和命名规范良好,完善的代码注释甚至包括接口文档参数示例,并遵循阿里巴巴的 《Java开发手册(黄山版)》 中的代码规范,保证代码质量和可维护性 +> 1. 请确保代码、配置文件的结构和命名规范良好,完善的代码注释甚至包括接口文档参数示例,并遵循阿里巴巴的 《Java开发手册(黄山版)》 中的代码规范,保证代码质量和可维护性 > 2. 在提交代码前,请按照 [Angular 提交规范](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular) 编写 commit 的 message(建议在 IntelliJ IDEA 中下载并安装 Git Commit Template 插件,以便按照规范进行 commit) > 3. 提交代码之前,请关闭所有代码窗口,执行 `mvn compile` 命令(代码格式化插件会在项目编译时对全局代码进行格式修正),编译通过后,不要再打开查看任何代码窗口,直接提交即可,以免不同的 IDE 配置会自动进行代码格式化 @@ -487,8 +487,8 @@ ContiNew Admin 的分支目前分为下个大版本的开发分支和上个大 感谢参与贡献的每一位小伙伴🥰 - - contributors + + contributors ### 特别鸣谢 @@ -499,9 +499,9 @@ ContiNew Admin 的分支目前分为下个大版本的开发分支和上个大 ## License -- 遵循 Apache-2.0 开源许可协议 +- 遵循 Apache-2.0 开源许可协议 - Copyright © 2022-present Charles7c ## GitHub Star 趋势 -![GitHub Star 趋势](https://starchart.cc/charles7c/ysoft-admin.svg) \ No newline at end of file +![GitHub Star 趋势](https://starchart.cc/charles7c/wms-admin.svg) \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e8ee6f3..a0bba57 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -10,7 +10,7 @@ services: TZ: Asia/Shanghai MYSQL_ROOT_PASSWORD: 你的root用户密码 # 初始化数据库(后续的初始化 SQL 会在这个库执行) - MYSQL_DATABASE: ysoft_admin + MYSQL_DATABASE: wms_admin #MYSQL_USER: 你的数据库用户名 #MYSQL_PASSWORD: 你的数据库密码 volumes: @@ -32,7 +32,7 @@ services: # TZ: Asia/Shanghai # POSTGRES_USER: 你的用户名 # POSTGRES_PASSWORD: 你的用户密码 -# POSTGRES_DB: ysoft_admin +# POSTGRES_DB: wms_admin # volumes: # - /docker/postgresql/data/:/var/lib/postgresql/data/ redis: @@ -48,10 +48,10 @@ services: - /docker/redis/data/:/data/ - /docker/redis/logs/:/logs/ command: 'redis-server /usr/local/redis/config/redis.conf --appendonly yes --requirepass 你的 Redis 密码' - ysoft-admin-server: - build: ./ysoft-admin + wms-admin-server: + build: ./wms-admin restart: always - container_name: ysoft-admin-server + container_name: wms-admin-server ports: - '18000:18000' - '1789:1789' @@ -61,7 +61,7 @@ services: DB_PORT: 3306 DB_USER: 你的数据库用户名 DB_PWD: 你的数据库密码 - DB_NAME: ysoft_admin + DB_NAME: wms_admin REDIS_HOST: 172.17.0.1 REDIS_PORT: 6379 REDIS_PWD: 你的 Redis 密码 @@ -70,17 +70,17 @@ services: SCHEDULE_PORT: 1788 SCHEDULE_TOKEN: 任务调度服务端 Token volumes: - - /docker/ysoft-admin/config/:/app/config/ - - /docker/ysoft-admin/data/file/:/app/data/file/ - - /docker/ysoft-admin/logs/:/app/logs/ - - /docker/ysoft-admin/lib/:/app/lib/ + - /docker/wms-admin/config/:/app/config/ + - /docker/wms-admin/data/file/:/app/data/file/ + - /docker/wms-admin/logs/:/app/logs/ + - /docker/wms-admin/lib/:/app/lib/ depends_on: - redis - mysql schedule-server: build: ./schedule-server restart: always - container_name: ysoft-admin-schedule-server + container_name: wms-admin-schedule-server ports: - '18001:18001' - '1788:1788' @@ -90,7 +90,7 @@ services: DB_PORT: 3306 DB_USER: 你的数据库用户名 DB_PWD: 你的数据库密码 - DB_NAME: ysoft_admin_job + DB_NAME: wms_admin_job volumes: - /docker/schedule-server/logs/:/app/logs/ depends_on: @@ -109,4 +109,4 @@ services: - /docker/nginx/cert/:/etc/nginx/cert/ - /docker/nginx/logs/:/var/log/nginx/ # 前端页面目录 - - /docker/ysoft-admin/html/:/usr/share/nginx/html/ + - /docker/wms-admin/html/:/usr/share/nginx/html/ diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index c8c8b46..4b573d0 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -29,7 +29,7 @@ http { server { listen 443 ssl; - server_name api.ysoft.top; + server_name api.wms.top; # 证书直接存放 /docker/nginx/cert 目录下即可(更改证书名称即可,无需更改证书路径) ssl_certificate /etc/nginx/cert/xxx.local.pem; # /etc/nginx/cert/ 为 docker 映射路径 不允许更改 @@ -59,14 +59,14 @@ http { # HTTP 请求 将转发到 HTTPS server { listen 80; - server_name api.ysoft.top; + server_name api.wms.top; rewrite ^ https://$http_host$request_uri? permanent; } # 前端项目 server { listen 443 ssl; - server_name admin.ysoft.top; + server_name admin.wms.top; # 证书直接存放 /docker/nginx/cert 目录下即可(更改证书名称即可,无需更改证书路径) ssl_certificate /etc/nginx/cert/xxx.local.pem; # /etc/nginx/cert/ 为 docker 映射路径 不允许更改 @@ -106,7 +106,7 @@ http { # 将 HTTP 请求转发到 HTTPS server { listen 80; - server_name admin.ysoft.top; + server_name admin.wms.top; rewrite ^ https://$http_host$request_uri? permanent; } } diff --git a/pom.xml b/pom.xml index f2772bf..08e5b86 100644 --- a/pom.xml +++ b/pom.xml @@ -16,19 +16,19 @@ 2.9.0 - top.ysoft - ysoft-admin + top.wms + wms-admin ${revision} pom 园区管理系统 - https://github.com/ysoft-org/ysoft-admin + https://github.com/wms-org/wms-admin - ysoft-webapi - ysoft-module-system - ysoft-plugin - ysoft-common - ysoft-extension + wms-webapi + wms-module-system + wms-plugin + wms-common + wms-extension @@ -41,43 +41,43 @@ - top.ysoft - ysoft-webapi + top.wms + wms-webapi ${revision} - top.ysoft - ysoft-module-system + top.wms + wms-module-system ${revision} - top.ysoft - ysoft-common + top.wms + wms-common ${revision} - top.ysoft - ysoft-plugin-schedule + top.wms + wms-plugin-schedule ${revision} - top.ysoft - ysoft-plugin-open + top.wms + wms-plugin-open ${revision} - top.ysoft - ysoft-plugin-generator + top.wms + wms-plugin-generator ${revision} @@ -209,7 +209,7 @@ https://sonarcloud.io charles7c - Charles7c_ysoft-admin + Charles7c_wms-admin ${project.groupId}:${project.artifactId} diff --git a/target/spotless-index b/target/spotless-index index ef3166c..9d1d40a 100644 --- a/target/spotless-index +++ b/target/spotless-index @@ -1 +1 @@ -nO9TaZSKPf1ylImyltTZX/68jGy+GEEGnIFWrxOoIa0= +6kwy4MVBmzUzV/DfFkQfBmtAlArfQ0IiSbbmZcLEHyY= diff --git a/wms-common/.flattened-pom.xml b/wms-common/.flattened-pom.xml index 111aea8..2645cfc 100644 --- a/wms-common/.flattened-pom.xml +++ b/wms-common/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - top.ysoft - ysoft-admin + top.wms + wms-admin 3.6.0-SNAPSHOT - ysoft-common + wms-common 3.6.0-SNAPSHOT 公共模块(存放公共工具类,公共配置等) @@ -35,9 +35,9 @@ 2.2.1 - software.amazon.awssdk - s3 - 2.25.0 + com.amazonaws + aws-java-sdk-s3 + 1.12.780 org.freemarker diff --git a/wms-common/pom.xml b/wms-common/pom.xml index 32e7af6..ad10aa6 100644 --- a/wms-common/pom.xml +++ b/wms-common/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.ysoft - ysoft-admin + top.wms + wms-admin ${revision} - ysoft-common + wms-common 公共模块(存放公共工具类,公共配置等) @@ -37,9 +37,9 @@ - software.amazon.awssdk - s3 - 2.25.0 + com.amazonaws + aws-java-sdk-s3 + 1.12.780 diff --git a/wms-common/src/main/java/top/wms/admin/common/config/doc/GlobalAuthenticationCustomizer.java b/wms-common/src/main/java/top/wms/admin/common/config/doc/GlobalAuthenticationCustomizer.java index fb83c68..80987ca 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/doc/GlobalAuthenticationCustomizer.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/doc/GlobalAuthenticationCustomizer.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.doc; +package top.wms.admin.common.config.doc; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.map.MapUtil; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/doc/GlobalDescriptionCustomizer.java b/wms-common/src/main/java/top/wms/admin/common/config/doc/GlobalDescriptionCustomizer.java index 81f440b..d9f977f 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/doc/GlobalDescriptionCustomizer.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/doc/GlobalDescriptionCustomizer.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.doc; +package top.wms.admin.common.config.doc; import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.models.Operation; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/doc/OperationDescriptionCustomizer.java b/wms-common/src/main/java/top/wms/admin/common/config/doc/OperationDescriptionCustomizer.java index a94bda1..256fabb 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/doc/OperationDescriptionCustomizer.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/doc/OperationDescriptionCustomizer.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.doc; +package top.wms.admin.common.config.doc; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/exception/GlobalExceptionHandler.java b/wms-common/src/main/java/top/wms/admin/common/config/exception/GlobalExceptionHandler.java index 660f780..93911df 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/exception/GlobalExceptionHandler.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.exception; +package top.wms.admin.common.config.exception; import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.CharSequenceUtil; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/exception/GlobalSaTokenExceptionHandler.java b/wms-common/src/main/java/top/wms/admin/common/config/exception/GlobalSaTokenExceptionHandler.java index 746f265..2841060 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/exception/GlobalSaTokenExceptionHandler.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/exception/GlobalSaTokenExceptionHandler.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.exception; +package top.wms.admin.common.config.exception; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/BCryptEncryptor.java b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/BCryptEncryptor.java index 93c25b8..3daa847 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/BCryptEncryptor.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/BCryptEncryptor.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.mybatis; +package top.wms.admin.common.config.mybatis; import org.springframework.security.crypto.password.PasswordEncoder; import top.continew.starter.security.crypto.encryptor.IEncryptor; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/DataPermissionMapper.java b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/DataPermissionMapper.java index 193f969..2f208b1 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/DataPermissionMapper.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/DataPermissionMapper.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.mybatis; +package top.wms.admin.common.config.mybatis; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java index 71c9131..02d104d 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.common.config.mybatis; +package top.wms.admin.common.config.mybatis; import cn.hutool.core.convert.Convert; -import top.ysoft.admin.common.context.UserContextHolder; +import top.wms.admin.common.context.UserContextHolder; import top.continew.starter.extension.datapermission.enums.DataScope; import top.continew.starter.extension.datapermission.filter.DataPermissionUserContextProvider; import top.continew.starter.extension.datapermission.model.RoleContext; @@ -24,7 +24,7 @@ public class DefaultDataPermissionUserContextProvider implements DataPermissionU @Override public UserContext getUserContext() { - top.ysoft.admin.common.context.UserContext context = UserContextHolder.getContext(); + top.wms.admin.common.context.UserContext context = UserContextHolder.getContext(); UserContext userContext = new UserContext(); userContext.setUserId(Convert.toStr(context.getId())); userContext.setDeptId(Convert.toStr(context.getDeptId())); diff --git a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 8d85078..e925383 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.common.config.mybatis; +package top.wms.admin.common.config.mybatis; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.common.model.entity.BaseDO; import java.time.LocalDateTime; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/MybatisPlusConfiguration.java b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/MybatisPlusConfiguration.java index 09fe05f..0b4da14 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/mybatis/MybatisPlusConfiguration.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/mybatis/MybatisPlusConfiguration.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.mybatis; +package top.wms.admin.common.config.mybatis; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.springframework.context.annotation.Bean; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/properties/CaptchaProperties.java b/wms-common/src/main/java/top/wms/admin/common/config/properties/CaptchaProperties.java index 6a9a6f7..2ace23c 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/properties/CaptchaProperties.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/properties/CaptchaProperties.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.properties; +package top.wms.admin.common.config.properties; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/properties/RsaProperties.java b/wms-common/src/main/java/top/wms/admin/common/config/properties/RsaProperties.java index 9346f9f..5e6391c 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/properties/RsaProperties.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/properties/RsaProperties.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.properties; +package top.wms.admin.common.config.properties; import cn.hutool.extra.spring.SpringUtil; diff --git a/wms-common/src/main/java/top/wms/admin/common/config/websocket/WebSocketClientServiceImpl.java b/wms-common/src/main/java/top/wms/admin/common/config/websocket/WebSocketClientServiceImpl.java index fab890d..9156b9c 100644 --- a/wms-common/src/main/java/top/wms/admin/common/config/websocket/WebSocketClientServiceImpl.java +++ b/wms-common/src/main/java/top/wms/admin/common/config/websocket/WebSocketClientServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.config.websocket; +package top.wms.admin.common.config.websocket; import cn.dev33.satoken.stp.StpUtil; import jakarta.servlet.http.HttpServletRequest; diff --git a/wms-common/src/main/java/top/wms/admin/common/constant/CacheConstants.java b/wms-common/src/main/java/top/wms/admin/common/constant/CacheConstants.java index 11fedc8..0f68752 100644 --- a/wms-common/src/main/java/top/wms/admin/common/constant/CacheConstants.java +++ b/wms-common/src/main/java/top/wms/admin/common/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.constant; +package top.wms.admin.common.constant; import top.continew.starter.core.constant.StringConstants; diff --git a/wms-common/src/main/java/top/wms/admin/common/constant/Constants.java b/wms-common/src/main/java/top/wms/admin/common/constant/Constants.java index 7d8f0c8..a95b92f 100644 --- a/wms-common/src/main/java/top/wms/admin/common/constant/Constants.java +++ b/wms-common/src/main/java/top/wms/admin/common/constant/Constants.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.constant; +package top.wms.admin.common.constant; /** * 通用常量信息 diff --git a/wms-common/src/main/java/top/wms/admin/common/constant/ContainerConstants.java b/wms-common/src/main/java/top/wms/admin/common/constant/ContainerConstants.java index 475e922..2dd92eb 100644 --- a/wms-common/src/main/java/top/wms/admin/common/constant/ContainerConstants.java +++ b/wms-common/src/main/java/top/wms/admin/common/constant/ContainerConstants.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.constant; +package top.wms.admin.common.constant; /** * 数据源容器相关常量(Crane4j 数据填充组件使用) diff --git a/wms-common/src/main/java/top/wms/admin/common/constant/RegexConstants.java b/wms-common/src/main/java/top/wms/admin/common/constant/RegexConstants.java index 9b9926d..a9dc00f 100644 --- a/wms-common/src/main/java/top/wms/admin/common/constant/RegexConstants.java +++ b/wms-common/src/main/java/top/wms/admin/common/constant/RegexConstants.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.constant; +package top.wms.admin.common.constant; /** * 正则相关常量 diff --git a/wms-common/src/main/java/top/wms/admin/common/constant/SysConstants.java b/wms-common/src/main/java/top/wms/admin/common/constant/SysConstants.java index 38caa18..43e85d5 100644 --- a/wms-common/src/main/java/top/wms/admin/common/constant/SysConstants.java +++ b/wms-common/src/main/java/top/wms/admin/common/constant/SysConstants.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.constant; +package top.wms.admin.common.constant; /** * 系统相关常量 diff --git a/wms-common/src/main/java/top/wms/admin/common/constant/UiConstants.java b/wms-common/src/main/java/top/wms/admin/common/constant/UiConstants.java index e3eb2b5..1612b01 100644 --- a/wms-common/src/main/java/top/wms/admin/common/constant/UiConstants.java +++ b/wms-common/src/main/java/top/wms/admin/common/constant/UiConstants.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.constant; +package top.wms.admin.common.constant; /** * UI 相关常量 diff --git a/wms-common/src/main/java/top/wms/admin/common/context/RoleContext.java b/wms-common/src/main/java/top/wms/admin/common/context/RoleContext.java index fab7d0c..c2763a7 100644 --- a/wms-common/src/main/java/top/wms/admin/common/context/RoleContext.java +++ b/wms-common/src/main/java/top/wms/admin/common/context/RoleContext.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.common.context; +package top.wms.admin.common.context; import lombok.Data; import lombok.NoArgsConstructor; -import top.ysoft.admin.common.enums.DataScopeEnum; +import top.wms.admin.common.enums.DataScopeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-common/src/main/java/top/wms/admin/common/context/UserContext.java b/wms-common/src/main/java/top/wms/admin/common/context/UserContext.java index b5f3f7f..5bcd49c 100644 --- a/wms-common/src/main/java/top/wms/admin/common/context/UserContext.java +++ b/wms-common/src/main/java/top/wms/admin/common/context/UserContext.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.common.context; +package top.wms.admin.common.context; import cn.hutool.core.collection.CollUtil; import lombok.Data; import lombok.NoArgsConstructor; -import top.ysoft.admin.common.constant.SysConstants; +import top.wms.admin.common.constant.SysConstants; import java.io.Serial; import java.io.Serializable; diff --git a/wms-common/src/main/java/top/wms/admin/common/context/UserContextHolder.java b/wms-common/src/main/java/top/wms/admin/common/context/UserContextHolder.java index c7804e9..c8cba13 100644 --- a/wms-common/src/main/java/top/wms/admin/common/context/UserContextHolder.java +++ b/wms-common/src/main/java/top/wms/admin/common/context/UserContextHolder.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.common.context; +package top.wms.admin.common.context; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.Convert; import cn.hutool.extra.spring.SpringUtil; -import top.ysoft.admin.common.service.CommonUserService; +import top.wms.admin.common.service.CommonUserService; import top.continew.starter.core.util.ExceptionUtils; /** diff --git a/wms-common/src/main/java/top/wms/admin/common/context/UserExtraContext.java b/wms-common/src/main/java/top/wms/admin/common/context/UserExtraContext.java index 657222f..1bda77a 100644 --- a/wms-common/src/main/java/top/wms/admin/common/context/UserExtraContext.java +++ b/wms-common/src/main/java/top/wms/admin/common/context/UserExtraContext.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.context; +package top.wms.admin.common.context; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; diff --git a/wms-common/src/main/java/top/wms/admin/common/controller/BaseController.java b/wms-common/src/main/java/top/wms/admin/common/controller/BaseController.java index 643fa29..238c494 100644 --- a/wms-common/src/main/java/top/wms/admin/common/controller/BaseController.java +++ b/wms-common/src/main/java/top/wms/admin/common/controller/BaseController.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.controller; +package top.wms.admin.common.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.context.SaHolder; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/CommonExceptionEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/CommonExceptionEnum.java index 9238664..0b83477 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/CommonExceptionEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/CommonExceptionEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; public enum CommonExceptionEnum { RULE_ERROR(1000, "您所所在得部门所属规则未绑定设备"), REQUEST_ERROR(1001, "请求异常"), PEOPLE_ERROR(1002, "您的信息未录入"), diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeOrderTypeEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeOrderTypeEnum.java index 3e54825..1a2c11a 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeOrderTypeEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeOrderTypeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumePayModeEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumePayModeEnum.java index f606c35..da09a49 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumePayModeEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumePayModeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeModeEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeModeEnum.java index 1fde42a..589deac 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeModeEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeModeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeTypeEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeTypeEnum.java index 3097553..54660e5 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeTypeEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeTypeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeWayEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeWayEnum.java index 664bfdd..ca79367 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeWayEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeWayEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeResultEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeResultEnum.java index b1b081a..de2f564 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeResultEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeResultEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTmrtypeEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTmrtypeEnum.java index 07afd9f..404770a 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTmrtypeEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTmrtypeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTypeConverter.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTypeConverter.java index 98a5961..a09f74b 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTypeConverter.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTypeConverter.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeWalletModeEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeWalletModeEnum.java index 5196e04..3108daa 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeWalletModeEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/ConsumeWalletModeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/DataScopeEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/DataScopeEnum.java index 65308de..774081f 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/DataScopeEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/DataScopeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/DisEnableStatusEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/DisEnableStatusEnum.java index 8a8797a..37d193f 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/DisEnableStatusEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/DisEnableStatusEnum.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.ysoft.admin.common.constant.UiConstants; +import top.wms.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; /** diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/EnableEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/EnableEnum.java index 3f0c72e..e6b1d17 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/EnableEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/EnableEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -24,7 +24,6 @@ public enum EnableEnum implements BaseEnum { */ ENABLE(1, "启用"); - private final Integer value; private final String description; } diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/GenderEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/GenderEnum.java index 34752db..9a3e20a 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/GenderEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/GenderEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/OperTypeEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/OperTypeEnum.java index ded3ed8..0b7e760 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/OperTypeEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/OperTypeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/SuccessFailureStatusEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/SuccessFailureStatusEnum.java index bbf52b9..47af52f 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/SuccessFailureStatusEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/SuccessFailureStatusEnum.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.ysoft.admin.common.constant.UiConstants; +import top.wms.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; /** diff --git a/wms-common/src/main/java/top/wms/admin/common/enums/YesNoEnum.java b/wms-common/src/main/java/top/wms/admin/common/enums/YesNoEnum.java index e7476f2..3585d28 100644 --- a/wms-common/src/main/java/top/wms/admin/common/enums/YesNoEnum.java +++ b/wms-common/src/main/java/top/wms/admin/common/enums/YesNoEnum.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.common.enums; +package top.wms.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.starter.core.enums.BaseEnum; -import top.ysoft.admin.common.constant.UiConstants; +import top.wms.admin.common.constant.UiConstants; /** * 成功/失败状态枚举 @@ -31,6 +31,7 @@ public enum YesNoEnum implements BaseEnum { /** * 根据描述获取枚举常量 + * * @param description 描述 * @return 枚举常量 */ diff --git a/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseCreateDO.java b/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseCreateDO.java index a5ee63e..bcef4b0 100644 --- a/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseCreateDO.java +++ b/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseCreateDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.model.entity; +package top.wms.admin.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseDO.java b/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseDO.java index 6e48ec2..f50415b 100644 --- a/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseDO.java +++ b/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.model.entity; +package top.wms.admin.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseStrIdDO.java b/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseStrIdDO.java index c85eca0..dd433f3 100644 --- a/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseStrIdDO.java +++ b/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseStrIdDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.model.entity; +package top.wms.admin.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseUpdateDO.java b/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseUpdateDO.java index aede3ff..00fa7b6 100644 --- a/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseUpdateDO.java +++ b/wms-common/src/main/java/top/wms/admin/common/model/entity/BaseUpdateDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.model.entity; +package top.wms.admin.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/wms-common/src/main/java/top/wms/admin/common/model/req/CommonStatusUpdateReq.java b/wms-common/src/main/java/top/wms/admin/common/model/req/CommonStatusUpdateReq.java index 96d7abd..36fa00d 100644 --- a/wms-common/src/main/java/top/wms/admin/common/model/req/CommonStatusUpdateReq.java +++ b/wms-common/src/main/java/top/wms/admin/common/model/req/CommonStatusUpdateReq.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.common.model.req; +package top.wms.admin.common.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import java.io.Serializable; diff --git a/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseDetailResp.java b/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseDetailResp.java index f5d3ae6..f477796 100644 --- a/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseDetailResp.java +++ b/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseDetailResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.model.resp; +package top.wms.admin.common.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -7,7 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.constant.ContainerConstants; +import top.wms.admin.common.constant.ContainerConstants; import java.io.Serial; import java.time.LocalDateTime; diff --git a/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseResp.java b/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseResp.java index 6906349..16a9cf3 100644 --- a/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseResp.java +++ b/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.model.resp; +package top.wms.admin.common.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.constant.ContainerConstants; +import top.wms.admin.common.constant.ContainerConstants; import java.io.Serial; import java.io.Serializable; diff --git a/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseStrIdResp.java b/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseStrIdResp.java index 03da063..044e0ba 100644 --- a/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseStrIdResp.java +++ b/wms-common/src/main/java/top/wms/admin/common/model/resp/BaseStrIdResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.model.resp; +package top.wms.admin.common.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.constant.ContainerConstants; +import top.wms.admin.common.constant.ContainerConstants; import java.io.Serial; import java.io.Serializable; diff --git a/wms-common/src/main/java/top/wms/admin/common/service/CommonUserService.java b/wms-common/src/main/java/top/wms/admin/common/service/CommonUserService.java index 4e42a69..018d17f 100644 --- a/wms-common/src/main/java/top/wms/admin/common/service/CommonUserService.java +++ b/wms-common/src/main/java/top/wms/admin/common/service/CommonUserService.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.common.service; +package top.wms.admin.common.service; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; -import top.ysoft.admin.common.constant.ContainerConstants; +import top.wms.admin.common.constant.ContainerConstants; /** * 公共用户业务接口 diff --git a/wms-common/src/main/java/top/wms/admin/common/util/ImageToBase64Utils.java b/wms-common/src/main/java/top/wms/admin/common/util/ImageToBase64Utils.java index 852d712..99f9b2f 100644 --- a/wms-common/src/main/java/top/wms/admin/common/util/ImageToBase64Utils.java +++ b/wms-common/src/main/java/top/wms/admin/common/util/ImageToBase64Utils.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.util; +package top.wms.admin.common.util; import org.apache.commons.codec.binary.Base64; diff --git a/wms-common/src/main/java/top/wms/admin/common/util/PictureUtils.java b/wms-common/src/main/java/top/wms/admin/common/util/PictureUtils.java index cb23fa6..d2df118 100644 --- a/wms-common/src/main/java/top/wms/admin/common/util/PictureUtils.java +++ b/wms-common/src/main/java/top/wms/admin/common/util/PictureUtils.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.common.util; +package top.wms.admin.common.util; import net.coobird.thumbnailator.Thumbnails; import org.springframework.mock.web.MockMultipartFile; diff --git a/wms-common/src/main/java/top/wms/admin/common/util/SecureUtils.java b/wms-common/src/main/java/top/wms/admin/common/util/SecureUtils.java index 8060ba9..9191ba8 100644 --- a/wms-common/src/main/java/top/wms/admin/common/util/SecureUtils.java +++ b/wms-common/src/main/java/top/wms/admin/common/util/SecureUtils.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.common.util; +package top.wms.admin.common.util; import cn.hutool.core.codec.Base64; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.extra.spring.SpringUtil; -import top.ysoft.admin.common.config.properties.RsaProperties; +import top.wms.admin.common.config.properties.RsaProperties; import top.continew.starter.core.exception.BusinessException; import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.security.crypto.autoconfigure.CryptoProperties; diff --git a/wms-extension/.flattened-pom.xml b/wms-extension/.flattened-pom.xml index 398afb9..c111612 100644 --- a/wms-extension/.flattened-pom.xml +++ b/wms-extension/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - top.ysoft - ysoft-admin + top.wms + wms-admin 3.6.0-SNAPSHOT - ysoft-extension + wms-extension 3.6.0-SNAPSHOT pom 扩展模块(存放其他扩展模块) @@ -18,6 +18,6 @@ - ysoft-extension-schedule-server + wms-extension-schedule-server diff --git a/wms-extension/pom.xml b/wms-extension/pom.xml index 13a984b..38447ca 100644 --- a/wms-extension/pom.xml +++ b/wms-extension/pom.xml @@ -2,16 +2,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.ysoft - ysoft-admin + top.wms + wms-admin ${revision} - ysoft-extension + wms-extension pom 扩展模块(存放其他扩展模块) - ysoft-extension-schedule-server + wms-extension-schedule-server diff --git a/wms-extension/wms-extension-schedule-server/.flattened-pom.xml b/wms-extension/wms-extension-schedule-server/.flattened-pom.xml index 3d69551..1235b0c 100644 --- a/wms-extension/wms-extension-schedule-server/.flattened-pom.xml +++ b/wms-extension/wms-extension-schedule-server/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - top.ysoft - ysoft-extension + top.wms + wms-extension 3.6.0-SNAPSHOT - ysoft-extension-schedule-server + wms-extension-schedule-server 3.6.0-SNAPSHOT 任务调度服务端 diff --git a/wms-extension/wms-extension-schedule-server/pom.xml b/wms-extension/wms-extension-schedule-server/pom.xml index 523aa6d..71c96b3 100644 --- a/wms-extension/wms-extension-schedule-server/pom.xml +++ b/wms-extension/wms-extension-schedule-server/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.ysoft - ysoft-extension + top.wms + wms-extension ${revision} - ysoft-extension-schedule-server + wms-extension-schedule-server 任务调度服务端 diff --git a/wms-extension/wms-extension-schedule-server/src/main/java/top/wms/admin/extension/scheduling/ScheduleServerApplication.java b/wms-extension/wms-extension-schedule-server/src/main/java/top/wms/admin/extension/scheduling/ScheduleServerApplication.java index 71b0761..72e3f1d 100644 --- a/wms-extension/wms-extension-schedule-server/src/main/java/top/wms/admin/extension/scheduling/ScheduleServerApplication.java +++ b/wms-extension/wms-extension-schedule-server/src/main/java/top/wms/admin/extension/scheduling/ScheduleServerApplication.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.extension.scheduling; +package top.wms.admin.extension.scheduling; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.URLUtil; diff --git a/wms-extension/wms-extension-schedule-server/src/main/resources/config/application-prod.yml b/wms-extension/wms-extension-schedule-server/src/main/resources/config/application-prod.yml index 07cfc53..372f0a5 100644 --- a/wms-extension/wms-extension-schedule-server/src/main/resources/config/application-prod.yml +++ b/wms-extension/wms-extension-schedule-server/src/main/resources/config/application-prod.yml @@ -3,12 +3,12 @@ server: --- ### 数据源配置 spring.datasource: - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ysoft_admin_job}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false + url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms_admin_job}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false username: ${DB_USER:root} password: ${DB_PWD:123456} driver-class-name: com.mysql.cj.jdbc.Driver # # PostgreSQL 配置 -# url: jdbc:postgresql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ysoft_admin_job}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false +# url: jdbc:postgresql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms_admin_job}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false # username: ${DB_USER:root} # password: ${DB_PWD:123456} # driver-class-name: org.postgresql.Driver diff --git a/wms-extension/wms-extension-schedule-server/src/main/resources/config/application.yml b/wms-extension/wms-extension-schedule-server/src/main/resources/config/application.yml index 9581a4f..2adc080 100644 --- a/wms-extension/wms-extension-schedule-server/src/main/resources/config/application.yml +++ b/wms-extension/wms-extension-schedule-server/src/main/resources/config/application.yml @@ -1,7 +1,7 @@ --- ### Spring 配置 spring: application: - name: ysoft-admin-schedule-server + name: wms-admin-schedule-server ## 环境配置 profiles: # 启用的环境 diff --git a/wms-extension/wms-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql b/wms-extension/wms-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql index 1ad18aa..61d15c4 100644 --- a/wms-extension/wms-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql +++ b/wms-extension/wms-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql @@ -5,9 +5,9 @@ INSERT INTO `sj_namespace` (`id`, `name`, `unique_id`, `create_dt`, `update_dt`, `deleted`) VALUES (1, 'Default', '764d604ec6fc45f68cd92514c40e9e1a', NOW(), NOW(), 0); --- 默认分组:ysoft-admin +-- 默认分组:wms-admin INSERT INTO `sj_group_config` (`id`, `namespace_id`, `group_name`, `description`, `token`, `group_status`, `version`, `group_partition`, `id_generator_mode`, `init_scene`, `bucket_index`, `create_dt`, `update_dt`) -VALUES (1, '764d604ec6fc45f68cd92514c40e9e1a', 'ysoft-admin', '默认分组', 'SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj', 1, 1, 0, 2, 1, 119, NOW(), NOW()); +VALUES (1, '764d604ec6fc45f68cd92514c40e9e1a', 'wms-admin', '默认分组', 'SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj', 1, 1, 0, 2, 1, 119, NOW(), NOW()); -- 默认用户:admin/admin INSERT INTO `sj_system_user` (username, password, role) diff --git a/wms-extension/wms-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql b/wms-extension/wms-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql index ff47729..d675666 100644 --- a/wms-extension/wms-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql +++ b/wms-extension/wms-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql @@ -5,9 +5,9 @@ INSERT INTO sj_namespace (id, name, unique_id, create_dt, update_dt, deleted) VALUES (1, 'Default', '764d604ec6fc45f68cd92514c40e9e1a', NOW(), NOW(), 0); --- 默认分组:ysoft-admin +-- 默认分组:wms-admin INSERT INTO sj_group_config (id, namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, bucket_index, create_dt, update_dt) -VALUES (1, '764d604ec6fc45f68cd92514c40e9e1a', 'ysoft-admin', '默认分组', 'SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj', 1, 1, 0, 2, 1, 119, NOW(), NOW()); +VALUES (1, '764d604ec6fc45f68cd92514c40e9e1a', 'wms-admin', '默认分组', 'SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj', 1, 1, 0, 2, 1, 119, NOW(), NOW()); -- 默认用户:admin/admin INSERT INTO sj_system_user (username, password, role) diff --git a/wms-module-system/.flattened-pom.xml b/wms-module-system/.flattened-pom.xml index 4c89b7a..e1939ad 100644 --- a/wms-module-system/.flattened-pom.xml +++ b/wms-module-system/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - top.ysoft - ysoft-admin + top.wms + wms-admin 3.6.0-SNAPSHOT - ysoft-module-system + wms-module-system 3.6.0-SNAPSHOT 系统管理模块(存放系统管理相关业务功能,例如:部门管理、角色管理、用户管理等) @@ -18,8 +18,8 @@ - top.ysoft - ysoft-common + top.wms + wms-common diff --git a/wms-module-system/pom.xml b/wms-module-system/pom.xml index 6062a0a..64845da 100644 --- a/wms-module-system/pom.xml +++ b/wms-module-system/pom.xml @@ -4,19 +4,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.ysoft - ysoft-admin + top.wms + wms-admin ${revision} - ysoft-module-system + wms-module-system 系统管理模块(存放系统管理相关业务功能,例如:部门管理、角色管理、用户管理等) - top.ysoft - ysoft-common + top.wms + wms-common \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java b/wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java index 504df23..5de7e4c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth; +package top.wms.admin.auth; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -7,19 +7,19 @@ import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; -import top.ysoft.admin.auth.model.req.LoginReq; -import top.ysoft.admin.common.context.RoleContext; -import top.ysoft.admin.common.context.UserContext; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.common.context.UserExtraContext; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.model.entity.DeptDO; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.model.resp.ClientResp; -import top.ysoft.admin.system.service.DeptService; -import top.ysoft.admin.system.service.OptionService; -import top.ysoft.admin.system.service.RoleService; -import top.ysoft.admin.system.service.UserService; +import top.wms.admin.auth.model.req.LoginReq; +import top.wms.admin.common.context.RoleContext; +import top.wms.admin.common.context.UserContext; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.common.context.UserExtraContext; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.model.entity.DeptDO; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.model.resp.ClientResp; +import top.wms.admin.system.service.DeptService; +import top.wms.admin.system.service.OptionService; +import top.wms.admin.system.service.RoleService; +import top.wms.admin.system.service.UserService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.core.validation.Validator; import top.continew.starter.web.util.SpringWebUtils; @@ -27,7 +27,7 @@ import top.continew.starter.web.util.SpringWebUtils; import java.util.Set; import java.util.concurrent.CompletableFuture; -import static top.ysoft.admin.system.enums.PasswordPolicyEnum.PASSWORD_EXPIRATION_DAYS; +import static top.wms.admin.system.enums.PasswordPolicyEnum.PASSWORD_EXPIRATION_DAYS; /** * 登录处理器基类 diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/LoginHandler.java b/wms-module-system/src/main/java/top/wms/admin/auth/LoginHandler.java index a841fc9..f4c0c42 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/LoginHandler.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/LoginHandler.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.auth; +package top.wms.admin.auth; import jakarta.servlet.http.HttpServletRequest; -import top.ysoft.admin.auth.enums.AuthTypeEnum; -import top.ysoft.admin.auth.model.req.LoginReq; -import top.ysoft.admin.auth.model.resp.LoginResp; -import top.ysoft.admin.system.model.resp.ClientResp; +import top.wms.admin.auth.enums.AuthTypeEnum; +import top.wms.admin.auth.model.req.LoginReq; +import top.wms.admin.auth.model.resp.LoginResp; +import top.wms.admin.system.model.resp.ClientResp; /** * 登录处理器 diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/LoginHandlerFactory.java b/wms-module-system/src/main/java/top/wms/admin/auth/LoginHandlerFactory.java index b72fbe7..5a082da 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/LoginHandlerFactory.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/LoginHandlerFactory.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.auth; +package top.wms.admin.auth; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import top.ysoft.admin.auth.enums.AuthTypeEnum; -import top.ysoft.admin.auth.model.req.LoginReq; +import top.wms.admin.auth.enums.AuthTypeEnum; +import top.wms.admin.auth.model.req.LoginReq; import java.util.EnumMap; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/enums/AuthTypeEnum.java b/wms-module-system/src/main/java/top/wms/admin/auth/enums/AuthTypeEnum.java index b5db9e2..93d28d4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/enums/AuthTypeEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/enums/AuthTypeEnum.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.auth.enums; +package top.wms.admin.auth.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.ysoft.admin.common.constant.UiConstants; +import top.wms.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/handler/AccountLoginHandler.java b/wms-module-system/src/main/java/top/wms/admin/auth/handler/AccountLoginHandler.java index 3776bad..6913b2c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/handler/AccountLoginHandler.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/handler/AccountLoginHandler.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.handler; +package top.wms.admin.auth.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -6,16 +6,16 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; -import top.ysoft.admin.auth.AbstractLoginHandler; -import top.ysoft.admin.auth.enums.AuthTypeEnum; -import top.ysoft.admin.auth.model.req.AccountLoginReq; -import top.ysoft.admin.auth.model.resp.LoginResp; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.common.util.SecureUtils; -import top.ysoft.admin.system.enums.PasswordPolicyEnum; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.model.resp.ClientResp; +import top.wms.admin.auth.AbstractLoginHandler; +import top.wms.admin.auth.enums.AuthTypeEnum; +import top.wms.admin.auth.model.req.AccountLoginReq; +import top.wms.admin.auth.model.resp.LoginResp; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.common.util.SecureUtils; +import top.wms.admin.system.enums.PasswordPolicyEnum; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.validation.CheckUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/handler/EmailLoginHandler.java b/wms-module-system/src/main/java/top/wms/admin/auth/handler/EmailLoginHandler.java index ac6c11a..c5aae56 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/handler/EmailLoginHandler.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/handler/EmailLoginHandler.java @@ -1,14 +1,14 @@ -package top.ysoft.admin.auth.handler; +package top.wms.admin.auth.handler; import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import top.ysoft.admin.auth.AbstractLoginHandler; -import top.ysoft.admin.auth.enums.AuthTypeEnum; -import top.ysoft.admin.auth.model.req.EmailLoginReq; -import top.ysoft.admin.auth.model.resp.LoginResp; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.model.resp.ClientResp; +import top.wms.admin.auth.AbstractLoginHandler; +import top.wms.admin.auth.enums.AuthTypeEnum; +import top.wms.admin.auth.model.req.EmailLoginReq; +import top.wms.admin.auth.model.resp.LoginResp; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.validation.ValidationUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/handler/PhoneLoginHandler.java b/wms-module-system/src/main/java/top/wms/admin/auth/handler/PhoneLoginHandler.java index 542170a..e40b5ed 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/handler/PhoneLoginHandler.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/handler/PhoneLoginHandler.java @@ -1,14 +1,14 @@ -package top.ysoft.admin.auth.handler; +package top.wms.admin.auth.handler; import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import top.ysoft.admin.auth.AbstractLoginHandler; -import top.ysoft.admin.auth.enums.AuthTypeEnum; -import top.ysoft.admin.auth.model.req.PhoneLoginReq; -import top.ysoft.admin.auth.model.resp.LoginResp; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.model.resp.ClientResp; +import top.wms.admin.auth.AbstractLoginHandler; +import top.wms.admin.auth.enums.AuthTypeEnum; +import top.wms.admin.auth.model.req.PhoneLoginReq; +import top.wms.admin.auth.model.resp.LoginResp; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.validation.ValidationUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/handler/SocialLoginHandler.java b/wms-module-system/src/main/java/top/wms/admin/auth/handler/SocialLoginHandler.java index c829d6f..f5ac178 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/handler/SocialLoginHandler.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/handler/SocialLoginHandler.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.handler; +package top.wms.admin.auth.handler; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; @@ -15,24 +15,24 @@ import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthRequest; import org.springframework.stereotype.Component; -import top.ysoft.admin.auth.AbstractLoginHandler; -import top.ysoft.admin.auth.enums.AuthTypeEnum; -import top.ysoft.admin.auth.model.req.SocialLoginReq; -import top.ysoft.admin.auth.model.resp.LoginResp; -import top.ysoft.admin.common.constant.RegexConstants; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.enums.GenderEnum; -import top.ysoft.admin.system.enums.MessageTemplateEnum; -import top.ysoft.admin.system.enums.MessageTypeEnum; -import top.ysoft.admin.system.model.entity.RoleDO; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.model.entity.UserSocialDO; -import top.ysoft.admin.system.model.req.MessageReq; -import top.ysoft.admin.system.model.resp.ClientResp; -import top.ysoft.admin.system.service.MessageService; -import top.ysoft.admin.system.service.UserRoleService; -import top.ysoft.admin.system.service.UserSocialService; +import top.wms.admin.auth.AbstractLoginHandler; +import top.wms.admin.auth.enums.AuthTypeEnum; +import top.wms.admin.auth.model.req.SocialLoginReq; +import top.wms.admin.auth.model.resp.LoginResp; +import top.wms.admin.common.constant.RegexConstants; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.GenderEnum; +import top.wms.admin.system.enums.MessageTemplateEnum; +import top.wms.admin.system.enums.MessageTypeEnum; +import top.wms.admin.system.model.entity.RoleDO; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.model.entity.UserSocialDO; +import top.wms.admin.system.model.req.MessageReq; +import top.wms.admin.system.model.resp.ClientResp; +import top.wms.admin.system.service.MessageService; +import top.wms.admin.system.service.UserRoleService; +import top.wms.admin.system.service.UserSocialService; import top.continew.starter.core.autoconfigure.project.ProjectProperties; import top.continew.starter.core.exception.BadRequestException; import top.continew.starter.core.validation.ValidationUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/query/OnlineUserQuery.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/query/OnlineUserQuery.java index ad8b555..28db913 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/query/OnlineUserQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/query/OnlineUserQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.query; +package top.wms.admin.auth.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/AccountLoginReq.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/AccountLoginReq.java index c93b1e4..0d60b8c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/AccountLoginReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/AccountLoginReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.req; +package top.wms.admin.auth.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/EmailLoginReq.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/EmailLoginReq.java index 83e25dc..3c42481 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/EmailLoginReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/EmailLoginReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.req; +package top.wms.admin.auth.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/LoginReq.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/LoginReq.java index 81fe20a..d27e49f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/LoginReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/LoginReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.req; +package top.wms.admin.auth.model.req; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.ysoft.admin.auth.enums.AuthTypeEnum; +import top.wms.admin.auth.enums.AuthTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/PhoneLoginReq.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/PhoneLoginReq.java index 51f8bb8..b38c901 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/PhoneLoginReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/PhoneLoginReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.req; +package top.wms.admin.auth.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/SocialLoginReq.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/SocialLoginReq.java index fbddaa1..f938ccb 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/req/SocialLoginReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/req/SocialLoginReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.req; +package top.wms.admin.auth.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/CaptchaResp.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/CaptchaResp.java index 6ccb149..af2dca9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/CaptchaResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/CaptchaResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.resp; +package top.wms.admin.auth.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/LoginResp.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/LoginResp.java index fbed5f2..8ff5f37 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/LoginResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/LoginResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.resp; +package top.wms.admin.auth.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/OnlineUserResp.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/OnlineUserResp.java index b605115..d61dd38 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/OnlineUserResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/OnlineUserResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.resp; +package top.wms.admin.auth.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.AssembleMethod; @@ -6,8 +6,8 @@ import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.auth.service.OnlineUserService; -import top.ysoft.admin.common.constant.ContainerConstants; +import top.wms.admin.auth.service.OnlineUserService; +import top.wms.admin.common.constant.ContainerConstants; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/RouteResp.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/RouteResp.java index 84ddeba..a5e9d10 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/RouteResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/RouteResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.resp; +package top.wms.admin.auth.model.resp; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/SocialAuthAuthorizeResp.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/SocialAuthAuthorizeResp.java index d3aa18f..44dab92 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/SocialAuthAuthorizeResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/SocialAuthAuthorizeResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.model.resp; +package top.wms.admin.auth.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/UserInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/UserInfoResp.java index aa2fdd5..79b3e4d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/UserInfoResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/model/resp/UserInfoResp.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.auth.model.resp; +package top.wms.admin.auth.model.resp; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.enums.GenderEnum; +import top.wms.admin.common.enums.GenderEnum; import top.continew.starter.security.mask.annotation.JsonMask; import top.continew.starter.security.mask.enums.MaskType; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/service/AuthService.java b/wms-module-system/src/main/java/top/wms/admin/auth/service/AuthService.java index a4bdc84..8e415be 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/service/AuthService.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/service/AuthService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.auth.service; +package top.wms.admin.auth.service; import jakarta.servlet.http.HttpServletRequest; -import top.ysoft.admin.auth.model.req.LoginReq; -import top.ysoft.admin.auth.model.resp.LoginResp; -import top.ysoft.admin.auth.model.resp.RouteResp; +import top.wms.admin.auth.model.req.LoginReq; +import top.wms.admin.auth.model.resp.LoginResp; +import top.wms.admin.auth.model.resp.RouteResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/service/OnlineUserService.java b/wms-module-system/src/main/java/top/wms/admin/auth/service/OnlineUserService.java index b7c2e1f..3628526 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/service/OnlineUserService.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/service/OnlineUserService.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.auth.service; +package top.wms.admin.auth.service; -import top.ysoft.admin.auth.model.query.OnlineUserQuery; -import top.ysoft.admin.auth.model.resp.OnlineUserResp; +import top.wms.admin.auth.model.query.OnlineUserQuery; +import top.wms.admin.auth.model.resp.OnlineUserResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/service/impl/AuthServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/auth/service/impl/AuthServiceImpl.java index d2c80d9..7b45cf2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/service/impl/AuthServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/service/impl/AuthServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.service.impl; +package top.wms.admin.auth.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -8,22 +8,22 @@ import cn.hutool.core.lang.tree.TreeUtil; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.auth.LoginHandler; -import top.ysoft.admin.auth.LoginHandlerFactory; -import top.ysoft.admin.auth.enums.AuthTypeEnum; -import top.ysoft.admin.auth.model.req.LoginReq; -import top.ysoft.admin.auth.model.resp.LoginResp; -import top.ysoft.admin.auth.model.resp.RouteResp; -import top.ysoft.admin.auth.service.AuthService; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.common.context.RoleContext; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.MenuTypeEnum; -import top.ysoft.admin.system.model.resp.ClientResp; -import top.ysoft.admin.system.model.resp.MenuResp; -import top.ysoft.admin.system.service.ClientService; -import top.ysoft.admin.system.service.MenuService; -import top.ysoft.admin.system.service.RoleService; +import top.wms.admin.auth.LoginHandler; +import top.wms.admin.auth.LoginHandlerFactory; +import top.wms.admin.auth.enums.AuthTypeEnum; +import top.wms.admin.auth.model.req.LoginReq; +import top.wms.admin.auth.model.resp.LoginResp; +import top.wms.admin.auth.model.resp.RouteResp; +import top.wms.admin.auth.service.AuthService; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.common.context.RoleContext; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.MenuTypeEnum; +import top.wms.admin.system.model.resp.ClientResp; +import top.wms.admin.system.model.resp.MenuResp; +import top.wms.admin.system.service.ClientService; +import top.wms.admin.system.service.MenuService; +import top.wms.admin.system.service.RoleService; import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.autoconfigure.CrudProperties; diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/service/impl/OnlineUserServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/auth/service/impl/OnlineUserServiceImpl.java index 2d70ecc..8582154 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/service/impl/OnlineUserServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/service/impl/OnlineUserServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.auth.service.impl; +package top.wms.admin.auth.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.dev33.satoken.dao.SaTokenDao; @@ -10,12 +10,12 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.auth.model.query.OnlineUserQuery; -import top.ysoft.admin.auth.model.resp.OnlineUserResp; -import top.ysoft.admin.auth.service.OnlineUserService; -import top.ysoft.admin.common.context.UserContext; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.common.context.UserExtraContext; +import top.wms.admin.auth.model.query.OnlineUserQuery; +import top.wms.admin.auth.model.resp.OnlineUserResp; +import top.wms.admin.auth.service.OnlineUserService; +import top.wms.admin.common.context.UserContext; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.common.context.UserExtraContext; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/DownRecordMapper.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/DownRecordMapper.java index 934b018..251bf11 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/DownRecordMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/DownRecordMapper.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.mapper; +package top.wms.admin.consume.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.consume.model.entity.DownRecordDO; -import top.ysoft.admin.consume.model.resp.DownRecordResp; +import top.wms.admin.consume.model.entity.DownRecordDO; +import top.wms.admin.consume.model.resp.DownRecordResp; /** -* 消费下发记录 Mapper -* -* @author zc -* @since 2026/02/25 11:01 -*/ + * 消费下发记录 Mapper + * + * @author zc + * @since 2026/02/25 11:01 + */ @Repository public interface DownRecordMapper extends BaseMapper { diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupMapper.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupMapper.java index 7f93f6f..d8e9dba 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.consume.mapper; +package top.wms.admin.consume.mapper; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.consume.model.entity.GroupDO; +import top.wms.admin.consume.model.entity.GroupDO; import org.springframework.stereotype.Repository; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupUserMapper.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupUserMapper.java index a48e88d..662db9d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupUserMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupUserMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.consume.mapper; +package top.wms.admin.consume.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; -import top.ysoft.admin.consume.model.entity.GroupUserDO; +import top.wms.admin.consume.model.entity.GroupUserDO; /** * 消费组用户映射器 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/RechargeRecordMapper.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/RechargeRecordMapper.java index a38a9e3..19d9db9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/RechargeRecordMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/RechargeRecordMapper.java @@ -1,13 +1,13 @@ -package top.ysoft.admin.consume.mapper; +package top.wms.admin.consume.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.consume.model.entity.RechargeRecordDO; +import top.wms.admin.consume.model.entity.RechargeRecordDO; import org.springframework.stereotype.Repository; -import top.ysoft.admin.consume.model.resp.RechargeRecordResp; +import top.wms.admin.consume.model.resp.RechargeRecordResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/RecordMapper.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/RecordMapper.java index 6a82d98..8041969 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/RecordMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/RecordMapper.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.mapper; +package top.wms.admin.consume.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.consume.model.entity.RecordDO; -import top.ysoft.admin.consume.model.resp.RecordResp; +import top.wms.admin.consume.model.entity.RecordDO; +import top.wms.admin.consume.model.resp.RecordResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/ReportMapper.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/ReportMapper.java index 59a663d..e87ece9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/ReportMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/ReportMapper.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.consume.mapper; +package top.wms.admin.consume.mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import top.ysoft.admin.consume.model.query.ReportQuery; -import top.ysoft.admin.consume.model.resp.report.*; +import top.wms.admin.consume.model.query.ReportQuery; +import top.wms.admin.consume.model.resp.report.*; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/TenantMapper.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/TenantMapper.java index 423aae9..951212b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/TenantMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/TenantMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.consume.mapper; +package top.wms.admin.consume.mapper; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.consume.model.entity.TenantDO; +import top.wms.admin.consume.model.entity.TenantDO; import org.springframework.stereotype.Repository; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/TimeIntervalMapper.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/TimeIntervalMapper.java index 568ef20..cb1dca3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapper/TimeIntervalMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapper/TimeIntervalMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.consume.mapper; +package top.wms.admin.consume.mapper; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.consume.model.entity.TimeIntervalDO; +import top.wms.admin.consume.model.entity.TimeIntervalDO; import org.springframework.stereotype.Repository; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RechargeRecordConvert.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RechargeRecordConvert.java index 4441755..ac0ada9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RechargeRecordConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RechargeRecordConvert.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.consume.mapstruct; +package top.wms.admin.consume.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; -import top.ysoft.admin.common.enums.ConsumeRechargeModeEnum; -import top.ysoft.admin.common.enums.ConsumeRechargeTypeEnum; -import top.ysoft.admin.common.enums.ConsumeRechargeWayEnum; -import top.ysoft.admin.consume.model.entity.RechargeRecordDO; -import top.ysoft.admin.consume.model.resp.RechargeRecordResp; +import top.wms.admin.common.enums.ConsumeRechargeModeEnum; +import top.wms.admin.common.enums.ConsumeRechargeTypeEnum; +import top.wms.admin.common.enums.ConsumeRechargeWayEnum; +import top.wms.admin.consume.model.entity.RechargeRecordDO; +import top.wms.admin.consume.model.resp.RechargeRecordResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RecordConvert.java b/wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RecordConvert.java index f1a8588..dbfdf4e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RecordConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RecordConvert.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.mapstruct; +package top.wms.admin.consume.mapstruct; import org.mapstruct.Mapper; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/DownRecordDO.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/DownRecordDO.java index 1145537..f1c1bd0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/DownRecordDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/DownRecordDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.entity; +package top.wms.admin.consume.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupDO.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupDO.java index 377d097..3d10377 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupDO.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.consume.model.entity; +package top.wms.admin.consume.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupUserDO.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupUserDO.java index 71e14a4..9cd2b6a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupUserDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupUserDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.entity; +package top.wms.admin.consume.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RechargeRecordDO.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RechargeRecordDO.java index 7f10a05..9480d6d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RechargeRecordDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RechargeRecordDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.entity; +package top.wms.admin.consume.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.time.*; @@ -102,7 +102,7 @@ public class RechargeRecordDO extends BaseDO { * 充值类型 0补贴 1充值 2退款 */ private Integer rechargeType; - /** + /** * 清除补贴金额,分 */ private BigDecimal clearBtje; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RecordDO.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RecordDO.java index 891cc64..c6942dc 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RecordDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RecordDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.entity; +package top.wms.admin.consume.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TenantDO.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TenantDO.java index ba53773..64adabe 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TenantDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TenantDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.entity; +package top.wms.admin.consume.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TimeIntervalDO.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TimeIntervalDO.java index c2fa451..086aa7c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TimeIntervalDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TimeIntervalDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.entity; +package top.wms.admin.consume.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/DownRecordQuery.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/DownRecordQuery.java index 22c24b3..5f499ad 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/DownRecordQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/DownRecordQuery.java @@ -1,20 +1,16 @@ -package top.ysoft.admin.consume.model.query; +package top.wms.admin.consume.model.query; import cn.hutool.core.date.DatePattern; -import jakarta.validation.constraints.Size; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.format.annotation.DateTimeFormat; -import top.continew.starter.data.core.annotation.Query; -import top.continew.starter.data.core.enums.QueryType; import java.io.Serial; import java.io.Serializable; import java.time.*; import java.util.Date; -import java.util.List; /** * 消费下发记录查询条件 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/GroupQuery.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/GroupQuery.java index 58a4730..b99dcc7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/GroupQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/GroupQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.query; +package top.wms.admin.consume.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/RechargeRecordQuery.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/RechargeRecordQuery.java index 86a4355..d606801 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/RechargeRecordQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/RechargeRecordQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.query; +package top.wms.admin.consume.model.query; import cn.hutool.core.date.DatePattern; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/RecordQuery.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/RecordQuery.java index fa583c8..873aded 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/RecordQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/RecordQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.query; +package top.wms.admin.consume.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/ReportQuery.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/ReportQuery.java index fff5998..c29f14e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/ReportQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/ReportQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.query; +package top.wms.admin.consume.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/TenantQuery.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/TenantQuery.java index 997ab35..c74a84d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/TenantQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/TenantQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.query; +package top.wms.admin.consume.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/TimeIntervalQuery.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/TimeIntervalQuery.java index 9f62bd4..ae42566 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/query/TimeIntervalQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/query/TimeIntervalQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.query; +package top.wms.admin.consume.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/DownRecordReq.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/DownRecordReq.java index bd91635..000ef62 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/DownRecordReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/DownRecordReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.req; +package top.wms.admin.consume.model.req; import jakarta.validation.constraints.*; @@ -6,8 +6,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.hibernate.validator.constraints.Length; - import java.io.Serial; import java.io.Serializable; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/GroupReq.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/GroupReq.java index d744342..5dd7587 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/GroupReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/GroupReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.req; +package top.wms.admin.consume.model.req; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportReq.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportReq.java index 9b3baf6..6b2089a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportReq.java @@ -1,11 +1,10 @@ -package top.ysoft.admin.consume.model.req; +package top.wms.admin.consume.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.ImportPolicyEnum; +import top.wms.admin.system.enums.ImportPolicyEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportRowReq.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportRowReq.java index 9b865b6..d523cb5 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportRowReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportRowReq.java @@ -1,14 +1,13 @@ -package top.ysoft.admin.consume.model.req; +package top.wms.admin.consume.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; -import top.ysoft.admin.common.constant.RegexConstants; +import top.wms.admin.common.constant.RegexConstants; import java.io.Serial; import java.io.Serializable; -import java.math.BigDecimal; /** * 人员充值导入行数据 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/RechargeRecordReq.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/RechargeRecordReq.java index 0a5d7da..3e07540 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/RechargeRecordReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/RechargeRecordReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.req; +package top.wms.admin.consume.model.req; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/RecordReq.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/RecordReq.java index bfc2acd..11e9998 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/RecordReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/RecordReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.req; +package top.wms.admin.consume.model.req; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/TenantReq.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/TenantReq.java index 6ccf51d..e5c7176 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/TenantReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/TenantReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.req; +package top.wms.admin.consume.model.req; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/TimeIntervalReq.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/TimeIntervalReq.java index 24b704a..1647bad 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/req/TimeIntervalReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/req/TimeIntervalReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.req; +package top.wms.admin.consume.model.req; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/DownRecordResp.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/DownRecordResp.java index b7025bd..86f66ae 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/DownRecordResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/DownRecordResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.resp; +package top.wms.admin.consume.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/GroupResp.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/GroupResp.java index ae2d07d..2cc756d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/GroupResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/GroupResp.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.consume.model.resp; +package top.wms.admin.consume.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; import top.continew.starter.extension.crud.model.resp.LabelValueResp; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/PeopleDepositImportParseResp.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/PeopleDepositImportParseResp.java index 965cf76..e918976 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/PeopleDepositImportParseResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/PeopleDepositImportParseResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.resp; +package top.wms.admin.consume.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RechargeRecordResp.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RechargeRecordResp.java index d153fac..5802102 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RechargeRecordResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RechargeRecordResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.resp; +package top.wms.admin.consume.model.resp; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,10 +6,10 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.ysoft.admin.common.enums.ConsumeRechargeModeEnum; -import top.ysoft.admin.common.enums.ConsumeRechargeTypeEnum; -import top.ysoft.admin.common.enums.ConsumeRechargeWayEnum; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.ConsumeRechargeModeEnum; +import top.wms.admin.common.enums.ConsumeRechargeTypeEnum; +import top.wms.admin.common.enums.ConsumeRechargeWayEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.math.BigDecimal; @@ -155,7 +155,7 @@ public class RechargeRecordResp extends BaseDetailResp { @ColumnWidth(30) private LocalDateTime createTime; - /** + /** * 清除补贴金额,分 */ @Schema(description = "清除补贴金额,分") diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RecordResp.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RecordResp.java index 567971b..d5dc158 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RecordResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RecordResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.resp; +package top.wms.admin.consume.model.resp; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,8 +6,8 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.ysoft.admin.common.enums.*; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.*; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TenantResp.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TenantResp.java index 878af69..3ecc594 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TenantResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TenantResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.resp; +package top.wms.admin.consume.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TimeIntervalResp.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TimeIntervalResp.java index 7395315..9826af4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TimeIntervalResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TimeIntervalResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.resp; +package top.wms.admin.consume.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BaseReport.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BaseReport.java index b2d6cc1..6905328 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BaseReport.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BaseReport.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.resp.report; +package top.wms.admin.consume.model.resp.report; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BranchReport.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BranchReport.java index 3464bf9..946aa2f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BranchReport.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BranchReport.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.resp.report; +package top.wms.admin.consume.model.resp.report; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MealReport.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MealReport.java index d1619cb..e775001 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MealReport.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MealReport.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.consume.model.resp.report; +package top.wms.admin.consume.model.resp.report; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.ysoft.admin.common.enums.ConsumeTmrtypeEnum; +import top.wms.admin.common.enums.ConsumeTmrtypeEnum; /** * 餐段报表 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MerchantReport.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MerchantReport.java index 83e9a98..4cff2db 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MerchantReport.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MerchantReport.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.resp.report; +package top.wms.admin.consume.model.resp.report; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/PeopleReport.java b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/PeopleReport.java index 04c64b3..55c6dce 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/PeopleReport.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/PeopleReport.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.model.resp.report; +package top.wms.admin.consume.model.resp.report; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/DownRecordService.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/DownRecordService.java index 264b655..7881f3b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/DownRecordService.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/DownRecordService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.consume.service; +package top.wms.admin.consume.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.consume.model.query.DownRecordQuery; -import top.ysoft.admin.consume.model.req.DownRecordReq; -import top.ysoft.admin.consume.model.resp.DownRecordResp; +import top.wms.admin.consume.model.query.DownRecordQuery; +import top.wms.admin.consume.model.req.DownRecordReq; +import top.wms.admin.consume.model.resp.DownRecordResp; /** * 消费下发记录业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/GroupService.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/GroupService.java index ff7fce7..1cb176e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/GroupService.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/GroupService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.consume.service; +package top.wms.admin.consume.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.consume.model.query.GroupQuery; -import top.ysoft.admin.consume.model.req.GroupReq; -import top.ysoft.admin.consume.model.resp.GroupResp; +import top.wms.admin.consume.model.query.GroupQuery; +import top.wms.admin.consume.model.req.GroupReq; +import top.wms.admin.consume.model.resp.GroupResp; /** * 消费组业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/GroupUserService.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/GroupUserService.java index a8bca2f..3dbb9fe 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/GroupUserService.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/GroupUserService.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.consume.service; +package top.wms.admin.consume.service; import com.baomidou.mybatisplus.extension.service.IService; -import top.ysoft.admin.consume.model.entity.GroupUserDO; +import top.wms.admin.consume.model.entity.GroupUserDO; public interface GroupUserService extends IService { diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/RechargeRecordService.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/RechargeRecordService.java index 1463ee5..21e9a69 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/RechargeRecordService.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/RechargeRecordService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.consume.service; +package top.wms.admin.consume.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.consume.model.query.RechargeRecordQuery; -import top.ysoft.admin.consume.model.req.RechargeRecordReq; -import top.ysoft.admin.consume.model.resp.RechargeRecordResp; +import top.wms.admin.consume.model.query.RechargeRecordQuery; +import top.wms.admin.consume.model.req.RechargeRecordReq; +import top.wms.admin.consume.model.resp.RechargeRecordResp; /** * 充值记录业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/RecordService.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/RecordService.java index 32e07c2..840d460 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/RecordService.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/RecordService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.consume.service; +package top.wms.admin.consume.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.consume.model.query.RecordQuery; -import top.ysoft.admin.consume.model.req.RecordReq; -import top.ysoft.admin.consume.model.resp.RecordResp; +import top.wms.admin.consume.model.query.RecordQuery; +import top.wms.admin.consume.model.req.RecordReq; +import top.wms.admin.consume.model.resp.RecordResp; /** * 消费记录业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/ReportService.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/ReportService.java index c612304..fd71ea8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/ReportService.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/ReportService.java @@ -1,14 +1,14 @@ -package top.ysoft.admin.consume.service; +package top.wms.admin.consume.service; import jakarta.servlet.http.HttpServletResponse; import org.apache.ibatis.annotations.Param; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; -import top.ysoft.admin.consume.model.query.ReportQuery; -import top.ysoft.admin.consume.model.resp.report.BranchReport; -import top.ysoft.admin.consume.model.resp.report.MealReport; -import top.ysoft.admin.consume.model.resp.report.MerchantReport; -import top.ysoft.admin.consume.model.resp.report.PeopleReport; +import top.wms.admin.consume.model.query.ReportQuery; +import top.wms.admin.consume.model.resp.report.BranchReport; +import top.wms.admin.consume.model.resp.report.MealReport; +import top.wms.admin.consume.model.resp.report.MerchantReport; +import top.wms.admin.consume.model.resp.report.PeopleReport; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/TenantService.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/TenantService.java index b8d5cbf..b446526 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/TenantService.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/TenantService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.consume.service; +package top.wms.admin.consume.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.consume.model.query.TenantQuery; -import top.ysoft.admin.consume.model.req.TenantReq; -import top.ysoft.admin.consume.model.resp.TenantResp; +import top.wms.admin.consume.model.query.TenantQuery; +import top.wms.admin.consume.model.req.TenantReq; +import top.wms.admin.consume.model.resp.TenantResp; /** * 商户信息业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/TimeIntervalService.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/TimeIntervalService.java index 1610be9..703030f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/TimeIntervalService.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/TimeIntervalService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.consume.service; +package top.wms.admin.consume.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.consume.model.query.TimeIntervalQuery; -import top.ysoft.admin.consume.model.req.TimeIntervalReq; -import top.ysoft.admin.consume.model.resp.TimeIntervalResp; +import top.wms.admin.consume.model.query.TimeIntervalQuery; +import top.wms.admin.consume.model.req.TimeIntervalReq; +import top.wms.admin.consume.model.resp.TimeIntervalResp; /** * 消费时段业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/DownRecordServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/DownRecordServiceImpl.java index 1523e7a..da9c813 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/DownRecordServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/DownRecordServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.service.impl; +package top.wms.admin.consume.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -11,17 +11,14 @@ import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.consume.mapper.DownRecordMapper; -import top.ysoft.admin.consume.model.entity.DownRecordDO; -import top.ysoft.admin.consume.model.entity.RecordDO; -import top.ysoft.admin.consume.model.query.DownRecordQuery; -import top.ysoft.admin.consume.model.query.RecordQuery; -import top.ysoft.admin.consume.model.req.DownRecordReq; -import top.ysoft.admin.consume.model.resp.DownRecordResp; -import top.ysoft.admin.consume.model.resp.RecordResp; -import top.ysoft.admin.consume.service.DownRecordService; -import top.ysoft.admin.system.mapper.PeopleEquipmentMapper; -import top.ysoft.admin.system.model.entity.PeopleEquipmentDO; +import top.wms.admin.consume.mapper.DownRecordMapper; +import top.wms.admin.consume.model.entity.DownRecordDO; +import top.wms.admin.consume.model.query.DownRecordQuery; +import top.wms.admin.consume.model.req.DownRecordReq; +import top.wms.admin.consume.model.resp.DownRecordResp; +import top.wms.admin.consume.service.DownRecordService; +import top.wms.admin.system.mapper.PeopleEquipmentMapper; +import top.wms.admin.system.model.entity.PeopleEquipmentDO; /** * 消费下发记录业务实现 @@ -47,16 +44,14 @@ public class DownRecordServiceImpl extends BaseServiceImpl page = baseMapper.selectRecordsPage(new Page<>(pageQuery.getPage(), pageQuery - .getSize()), queryWrapper); + .getSize()), queryWrapper); return PageResp.build(page); } - @Override public void down(Long equipmentId, Long peopleId) { - peopleEquipmentMapper.delete(new QueryWrapper() - .eq("equipment_id", equipmentId) - .eq("people_id", peopleId)); + peopleEquipmentMapper.delete(new QueryWrapper().eq("equipment_id", equipmentId) + .eq("people_id", peopleId)); } } \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupServiceImpl.java index aa967ad..dc4a898 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.service.impl; +package top.wms.admin.consume.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -6,17 +6,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.consume.mapper.GroupMapper; -import top.ysoft.admin.consume.model.entity.GroupDO; -import top.ysoft.admin.consume.model.entity.GroupUserDO; -import top.ysoft.admin.consume.model.query.GroupQuery; -import top.ysoft.admin.consume.model.req.GroupReq; -import top.ysoft.admin.consume.model.resp.GroupResp; -import top.ysoft.admin.consume.service.GroupService; -import top.ysoft.admin.consume.service.GroupUserService; -import top.ysoft.admin.peopleBranch.mapper.PeopleMapper; -import top.ysoft.admin.peopleBranch.mapstruct.PeopleConvert; -import top.ysoft.admin.peopleBranch.model.entity.PeopleDO; +import top.wms.admin.consume.mapper.GroupMapper; +import top.wms.admin.consume.model.entity.GroupDO; +import top.wms.admin.consume.model.entity.GroupUserDO; +import top.wms.admin.consume.model.query.GroupQuery; +import top.wms.admin.consume.model.req.GroupReq; +import top.wms.admin.consume.model.resp.GroupResp; +import top.wms.admin.consume.service.GroupService; +import top.wms.admin.consume.service.GroupUserService; +import top.wms.admin.peopleBranch.mapper.PeopleMapper; +import top.wms.admin.peopleBranch.mapstruct.PeopleConvert; +import top.wms.admin.peopleBranch.model.entity.PeopleDO; import java.util.List; import java.util.stream.Collectors; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupUserServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupUserServiceImpl.java index 0eaf928..b552756 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupUserServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupUserServiceImpl.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.consume.service.impl; +package top.wms.admin.consume.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.consume.mapper.GroupUserMapper; -import top.ysoft.admin.consume.model.entity.GroupUserDO; -import top.ysoft.admin.consume.service.GroupUserService; +import top.wms.admin.consume.mapper.GroupUserMapper; +import top.wms.admin.consume.model.entity.GroupUserDO; +import top.wms.admin.consume.service.GroupUserService; /** * 消费组用户业务实现 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RechargeRecordServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RechargeRecordServiceImpl.java index 83b7ca8..be85902 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RechargeRecordServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RechargeRecordServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.service.impl; +package top.wms.admin.consume.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.date.DateUtil; @@ -14,12 +14,12 @@ import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; import top.continew.starter.file.excel.util.ExcelUtils; -import top.ysoft.admin.consume.mapper.RechargeRecordMapper; -import top.ysoft.admin.consume.model.entity.RechargeRecordDO; -import top.ysoft.admin.consume.model.query.RechargeRecordQuery; -import top.ysoft.admin.consume.model.req.RechargeRecordReq; -import top.ysoft.admin.consume.model.resp.RechargeRecordResp; -import top.ysoft.admin.consume.service.RechargeRecordService; +import top.wms.admin.consume.mapper.RechargeRecordMapper; +import top.wms.admin.consume.model.entity.RechargeRecordDO; +import top.wms.admin.consume.model.query.RechargeRecordQuery; +import top.wms.admin.consume.model.req.RechargeRecordReq; +import top.wms.admin.consume.model.resp.RechargeRecordResp; +import top.wms.admin.consume.service.RechargeRecordService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RecordServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RecordServiceImpl.java index afc0489..51af2fb 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RecordServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RecordServiceImpl.java @@ -1,6 +1,5 @@ -package top.ysoft.admin.consume.service.impl; +package top.wms.admin.consume.service.impl; -import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,13 +15,12 @@ import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; import top.continew.starter.file.excel.util.ExcelUtils; -import top.ysoft.admin.consume.mapper.RecordMapper; -import top.ysoft.admin.consume.model.entity.RecordDO; -import top.ysoft.admin.consume.model.query.RecordQuery; -import top.ysoft.admin.consume.model.req.RecordReq; -import top.ysoft.admin.consume.model.resp.RecordResp; -import top.ysoft.admin.consume.service.RecordService; -import top.ysoft.admin.peopleBranch.mapper.PeopleMapper; +import top.wms.admin.consume.mapper.RecordMapper; +import top.wms.admin.consume.model.entity.RecordDO; +import top.wms.admin.consume.model.query.RecordQuery; +import top.wms.admin.consume.model.req.RecordReq; +import top.wms.admin.consume.model.resp.RecordResp; +import top.wms.admin.consume.service.RecordService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/ReportServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/ReportServiceImpl.java index 6edd689..c750d58 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/ReportServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/ReportServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.consume.service.impl; +package top.wms.admin.consume.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; @@ -8,10 +8,10 @@ import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.file.excel.util.ExcelUtils; -import top.ysoft.admin.consume.mapper.ReportMapper; -import top.ysoft.admin.consume.model.query.ReportQuery; -import top.ysoft.admin.consume.model.resp.report.*; -import top.ysoft.admin.consume.service.ReportService; +import top.wms.admin.consume.mapper.ReportMapper; +import top.wms.admin.consume.model.query.ReportQuery; +import top.wms.admin.consume.model.resp.report.*; +import top.wms.admin.consume.service.ReportService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TenantServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TenantServiceImpl.java index 5b00365..9aed596 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TenantServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TenantServiceImpl.java @@ -1,16 +1,16 @@ -package top.ysoft.admin.consume.service.impl; +package top.wms.admin.consume.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.consume.mapper.TenantMapper; -import top.ysoft.admin.consume.model.entity.TenantDO; -import top.ysoft.admin.consume.model.query.TenantQuery; -import top.ysoft.admin.consume.model.req.TenantReq; -import top.ysoft.admin.consume.model.resp.TenantResp; -import top.ysoft.admin.consume.service.TenantService; +import top.wms.admin.consume.mapper.TenantMapper; +import top.wms.admin.consume.model.entity.TenantDO; +import top.wms.admin.consume.model.query.TenantQuery; +import top.wms.admin.consume.model.req.TenantReq; +import top.wms.admin.consume.model.resp.TenantResp; +import top.wms.admin.consume.service.TenantService; /** * 商户信息业务实现 diff --git a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TimeIntervalServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TimeIntervalServiceImpl.java index c7dd056..ba12b17 100644 --- a/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TimeIntervalServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TimeIntervalServiceImpl.java @@ -1,16 +1,16 @@ -package top.ysoft.admin.consume.service.impl; +package top.wms.admin.consume.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.consume.mapper.TimeIntervalMapper; -import top.ysoft.admin.consume.model.entity.TimeIntervalDO; -import top.ysoft.admin.consume.model.query.TimeIntervalQuery; -import top.ysoft.admin.consume.model.req.TimeIntervalReq; -import top.ysoft.admin.consume.model.resp.TimeIntervalResp; -import top.ysoft.admin.consume.service.TimeIntervalService; +import top.wms.admin.consume.mapper.TimeIntervalMapper; +import top.wms.admin.consume.model.entity.TimeIntervalDO; +import top.wms.admin.consume.model.query.TimeIntervalQuery; +import top.wms.admin.consume.model.req.TimeIntervalReq; +import top.wms.admin.consume.model.resp.TimeIntervalResp; +import top.wms.admin.consume.service.TimeIntervalService; /** * 消费时段业务实现 diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/mapper/EquipmentMapper.java b/wms-module-system/src/main/java/top/wms/admin/equipment/mapper/EquipmentMapper.java index f8babfd..c7201de 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/mapper/EquipmentMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/mapper/EquipmentMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.equipment.mapper; +package top.wms.admin.equipment.mapper; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.equipment.model.entity.EquipmentDO; +import top.wms.admin.equipment.model.entity.EquipmentDO; /** * 设备信息 Mapper diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/mapper/ProductMapper.java b/wms-module-system/src/main/java/top/wms/admin/equipment/mapper/ProductMapper.java index b0c0292..feabaf7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/mapper/ProductMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/mapper/ProductMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.equipment.mapper; +package top.wms.admin.equipment.mapper; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.equipment.model.entity.ProductDO; +import top.wms.admin.equipment.model.entity.ProductDO; /** * 产品信息 Mapper diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/EquipmentConvert.java b/wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/EquipmentConvert.java index e10b7ef..67990dd 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/EquipmentConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/EquipmentConvert.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.equipment.mapstruct; +package top.wms.admin.equipment.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import top.continew.starter.extension.crud.model.resp.LabelValueResp; -import top.ysoft.admin.equipment.model.entity.EquipmentDO; -import top.ysoft.admin.equipment.model.req.EquipmentReq; -import top.ysoft.admin.equipment.model.resp.EquipmentResp; +import top.wms.admin.equipment.model.entity.EquipmentDO; +import top.wms.admin.equipment.model.req.EquipmentReq; +import top.wms.admin.equipment.model.resp.EquipmentResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/ProductConvert.java b/wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/ProductConvert.java index 287502a..c392a17 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/ProductConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/ProductConvert.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.equipment.mapstruct; +package top.wms.admin.equipment.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import top.continew.starter.extension.crud.model.resp.LabelValueResp; -import top.ysoft.admin.equipment.model.entity.ProductDO; +import top.wms.admin.equipment.model.entity.ProductDO; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/EquipmentDO.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/EquipmentDO.java index 3a6aa64..a86f1bf 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/EquipmentDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/EquipmentDO.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.equipment.model.entity; +package top.wms.admin.equipment.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/ProductDO.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/ProductDO.java index 21278cb..da5f763 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/ProductDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/ProductDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.equipment.model.entity; +package top.wms.admin.equipment.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/query/EquipmentQuery.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/query/EquipmentQuery.java index 3401ba7..71c4f71 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/query/EquipmentQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/query/EquipmentQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.model.query; +package top.wms.admin.equipment.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/query/ProductQuery.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/query/ProductQuery.java index 580996f..55a598b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/query/ProductQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/query/ProductQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.model.query; +package top.wms.admin.equipment.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/req/EquipmentReq.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/req/EquipmentReq.java index a31c7ba..cad9f0b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/req/EquipmentReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/req/EquipmentReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.model.req; +package top.wms.admin.equipment.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/req/ProductReq.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/req/ProductReq.java index 33e559f..ffcb3c5 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/req/ProductReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/req/ProductReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.model.req; +package top.wms.admin.equipment.model.req; import jakarta.validation.constraints.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentDetailResp.java index a35b2ea..f15b406 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentDetailResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.model.resp; +package top.wms.admin.equipment.model.resp; import lombok.Data; @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentResp.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentResp.java index 6c48d2b..9d3cde0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.model.resp; +package top.wms.admin.equipment.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -6,8 +6,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.model.resp.BaseResp; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.model.resp.BaseResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductDetailResp.java index bf837bf..30f1463 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductDetailResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.model.resp; +package top.wms.admin.equipment.model.resp; import lombok.Data; @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductResp.java b/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductResp.java index d708157..4d9e36f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.equipment.model.resp; +package top.wms.admin.equipment.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/service/EquipmentService.java b/wms-module-system/src/main/java/top/wms/admin/equipment/service/EquipmentService.java index bd99c29..3725047 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/service/EquipmentService.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/service/EquipmentService.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.equipment.service; +package top.wms.admin.equipment.service; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.equipment.model.query.EquipmentQuery; -import top.ysoft.admin.equipment.model.req.EquipmentReq; -import top.ysoft.admin.equipment.model.resp.EquipmentDetailResp; -import top.ysoft.admin.equipment.model.resp.EquipmentResp; +import top.wms.admin.equipment.model.query.EquipmentQuery; +import top.wms.admin.equipment.model.req.EquipmentReq; +import top.wms.admin.equipment.model.resp.EquipmentDetailResp; +import top.wms.admin.equipment.model.resp.EquipmentResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/service/ProductService.java b/wms-module-system/src/main/java/top/wms/admin/equipment/service/ProductService.java index ecffd26..2591d7a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/service/ProductService.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/service/ProductService.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.equipment.service; +package top.wms.admin.equipment.service; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.equipment.model.entity.ProductDO; -import top.ysoft.admin.equipment.model.query.ProductQuery; -import top.ysoft.admin.equipment.model.req.ProductReq; -import top.ysoft.admin.equipment.model.resp.ProductResp; +import top.wms.admin.equipment.model.entity.ProductDO; +import top.wms.admin.equipment.model.query.ProductQuery; +import top.wms.admin.equipment.model.req.ProductReq; +import top.wms.admin.equipment.model.resp.ProductResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/service/impl/EquipmentServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/equipment/service/impl/EquipmentServiceImpl.java index 75d19b7..57a5970 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/service/impl/EquipmentServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/service/impl/EquipmentServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.service.impl; +package top.wms.admin.equipment.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.crane4j.annotation.ContainerMethod; @@ -19,16 +19,16 @@ import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.equipment.mapper.EquipmentMapper; -import top.ysoft.admin.equipment.mapstruct.EquipmentConvert; -import top.ysoft.admin.equipment.model.entity.EquipmentDO; -import top.ysoft.admin.equipment.model.query.EquipmentQuery; -import top.ysoft.admin.equipment.model.req.EquipmentReq; -import top.ysoft.admin.equipment.model.resp.EquipmentDetailResp; -import top.ysoft.admin.equipment.model.resp.EquipmentResp; -import top.ysoft.admin.equipment.service.EquipmentService; -import top.ysoft.admin.yfApi.service.IYFPushService; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.equipment.mapper.EquipmentMapper; +import top.wms.admin.equipment.mapstruct.EquipmentConvert; +import top.wms.admin.equipment.model.entity.EquipmentDO; +import top.wms.admin.equipment.model.query.EquipmentQuery; +import top.wms.admin.equipment.model.req.EquipmentReq; +import top.wms.admin.equipment.model.resp.EquipmentDetailResp; +import top.wms.admin.equipment.model.resp.EquipmentResp; +import top.wms.admin.equipment.service.EquipmentService; +import top.wms.admin.yfApi.service.IYFPushService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/equipment/service/impl/ProductServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/equipment/service/impl/ProductServiceImpl.java index 578cf5e..d6f93a1 100644 --- a/wms-module-system/src/main/java/top/wms/admin/equipment/service/impl/ProductServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/equipment/service/impl/ProductServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.equipment.service.impl; +package top.wms.admin.equipment.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; @@ -9,14 +9,14 @@ import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.equipment.mapper.ProductMapper; -import top.ysoft.admin.equipment.mapstruct.ProductConvert; -import top.ysoft.admin.equipment.model.entity.ProductDO; -import top.ysoft.admin.equipment.model.query.ProductQuery; -import top.ysoft.admin.equipment.model.req.ProductReq; -import top.ysoft.admin.equipment.model.resp.ProductResp; -import top.ysoft.admin.equipment.service.ProductService; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.equipment.mapper.ProductMapper; +import top.wms.admin.equipment.mapstruct.ProductConvert; +import top.wms.admin.equipment.model.entity.ProductDO; +import top.wms.admin.equipment.model.query.ProductQuery; +import top.wms.admin.equipment.model.req.ProductReq; +import top.wms.admin.equipment.model.resp.ProductResp; +import top.wms.admin.equipment.service.ProductService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/BranchMapper.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/BranchMapper.java index 9fc8862..404c1c4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/BranchMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/BranchMapper.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.peopleBranch.mapper; +package top.wms.admin.peopleBranch.mapper; // import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.peopleBranch.model.entity.BranchDO; -import top.ysoft.admin.peopleBranch.model.resp.BranchResp; +import top.wms.admin.peopleBranch.model.entity.BranchDO; +import top.wms.admin.peopleBranch.model.resp.BranchResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/BranchRuleMapper.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/BranchRuleMapper.java index 014dd4b..9c43802 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/BranchRuleMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/BranchRuleMapper.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.peopleBranch.mapper; +package top.wms.admin.peopleBranch.mapper; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.peopleBranch.model.entity.BranchRuleDO; -import top.ysoft.admin.peopleBranch.model.resp.BranchRuleResp; +import top.wms.admin.peopleBranch.model.entity.BranchRuleDO; +import top.wms.admin.peopleBranch.model.resp.BranchRuleResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/PeopleMapper.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/PeopleMapper.java index 263a5b4..176cb66 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/PeopleMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapper/PeopleMapper.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.mapper; +package top.wms.admin.peopleBranch.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.peopleBranch.model.entity.PeopleDO; -import top.ysoft.admin.peopleBranch.model.resp.ConsumePeopleResp; -import top.ysoft.admin.peopleBranch.model.resp.PeopleResp; +import top.wms.admin.peopleBranch.model.entity.PeopleDO; +import top.wms.admin.peopleBranch.model.resp.ConsumePeopleResp; +import top.wms.admin.peopleBranch.model.resp.PeopleResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/BranchConvert.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/BranchConvert.java index 254262c..f4b842f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/BranchConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/BranchConvert.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.peopleBranch.mapstruct; +package top.wms.admin.peopleBranch.mapstruct; import org.mapstruct.Mapper; -import top.ysoft.admin.peopleBranch.model.entity.BranchDO; -import top.ysoft.admin.peopleBranch.model.req.BranchReq; -import top.ysoft.admin.peopleBranch.model.resp.BranchResp; +import top.wms.admin.peopleBranch.model.entity.BranchDO; +import top.wms.admin.peopleBranch.model.req.BranchReq; +import top.wms.admin.peopleBranch.model.resp.BranchResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/PeopleConvert.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/PeopleConvert.java index e97e059..aa7b6f4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/PeopleConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/PeopleConvert.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.peopleBranch.mapstruct; +package top.wms.admin.peopleBranch.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import top.continew.starter.extension.crud.model.resp.LabelValueResp; -import top.ysoft.admin.peopleBranch.model.entity.PeopleDO; +import top.wms.admin.peopleBranch.model.entity.PeopleDO; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/SexConverter.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/SexConverter.java index 3ccb485..86515b0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/SexConverter.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/mapstruct/SexConverter.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.mapstruct; +package top.wms.admin.peopleBranch.mapstruct; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/BranchDO.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/BranchDO.java index 57d424d..4b78b97 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/BranchDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/BranchDO.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.peopleBranch.model.entity; +package top.wms.admin.peopleBranch.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.model.entity.BaseStrIdDO; +import top.wms.admin.common.model.entity.BaseStrIdDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/BranchRuleDO.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/BranchRuleDO.java index 786832f..36c9491 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/BranchRuleDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/BranchRuleDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.entity; +package top.wms.admin.peopleBranch.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/PeopleDO.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/PeopleDO.java index a9ce395..1e6eb4f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/PeopleDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/entity/PeopleDO.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.peopleBranch.model.entity; +package top.wms.admin.peopleBranch.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/query/BranchQuery.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/query/BranchQuery.java index 40c2852..64028ae 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/query/BranchQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/query/BranchQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.query; +package top.wms.admin.peopleBranch.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/query/PeopleQuery.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/query/PeopleQuery.java index a05328e..e151a45 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/query/PeopleQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/query/PeopleQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.query; +package top.wms.admin.peopleBranch.model.query; import lombok.Builder; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/BranchReq.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/BranchReq.java index 3180377..8fbcc1a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/BranchReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/BranchReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.req; +package top.wms.admin.peopleBranch.model.req; import jakarta.validation.constraints.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleImportReq.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleImportReq.java index d966785..7a9c6b9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleImportReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleImportReq.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.peopleBranch.model.req; +package top.wms.admin.peopleBranch.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.ImportPolicyEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.ImportPolicyEnum; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleImportRowReq.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleImportRowReq.java index 98c72fc..3104930 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleImportRowReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleImportRowReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.req; +package top.wms.admin.peopleBranch.model.req; import cn.hutool.core.lang.RegexPool; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,8 +6,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; -import top.ysoft.admin.common.constant.RegexConstants; -import top.ysoft.admin.peopleBranch.mapstruct.SexConverter; +import top.wms.admin.common.constant.RegexConstants; +import top.wms.admin.peopleBranch.mapstruct.SexConverter; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleReq.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleReq.java index be36b19..304a1e3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/req/PeopleReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.req; +package top.wms.admin.peopleBranch.model.req; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/BranchResp.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/BranchResp.java index ad6eb1d..54af019 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/BranchResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/BranchResp.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.peopleBranch.model.resp; +package top.wms.admin.peopleBranch.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseStrIdResp; +import top.wms.admin.common.model.resp.BaseStrIdResp; import java.io.Serial; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/BranchRuleResp.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/BranchRuleResp.java index ae3f63d..3d352d7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/BranchRuleResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/BranchRuleResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.resp; +package top.wms.admin.peopleBranch.model.resp; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/ConsumePeopleResp.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/ConsumePeopleResp.java index 2d6b32a..935bb92 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/ConsumePeopleResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/ConsumePeopleResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.resp; +package top.wms.admin.peopleBranch.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; @@ -8,11 +8,11 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.enums.EnableEnum; -import top.ysoft.admin.common.enums.YesNoEnum; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.peopleBranch.mapstruct.SexConverter; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.enums.EnableEnum; +import top.wms.admin.common.enums.YesNoEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.peopleBranch.mapstruct.SexConverter; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleImportParseResp.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleImportParseResp.java index fefab93..e0658b0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleImportParseResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleImportParseResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.resp; +package top.wms.admin.peopleBranch.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleImportResp.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleImportResp.java index 0e9f300..518250e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleImportResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleImportResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.resp; +package top.wms.admin.peopleBranch.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleResp.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleResp.java index 5103ec4..c8218ad 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/model/resp/PeopleResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.model.resp; +package top.wms.admin.peopleBranch.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; @@ -9,9 +9,9 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.peopleBranch.mapstruct.SexConverter; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.peopleBranch.mapstruct.SexConverter; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/BranchService.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/BranchService.java index d19db53..7f7132b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/BranchService.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/BranchService.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.peopleBranch.service; +package top.wms.admin.peopleBranch.service; import cn.hutool.core.lang.tree.Tree; import top.continew.starter.data.mp.service.IService; -import top.ysoft.admin.peopleBranch.model.entity.BranchDO; -import top.ysoft.admin.peopleBranch.model.query.BranchQuery; -import top.ysoft.admin.peopleBranch.model.req.BranchReq; -import top.ysoft.admin.peopleBranch.model.resp.BranchResp; +import top.wms.admin.peopleBranch.model.entity.BranchDO; +import top.wms.admin.peopleBranch.model.query.BranchQuery; +import top.wms.admin.peopleBranch.model.req.BranchReq; +import top.wms.admin.peopleBranch.model.resp.BranchResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/PeopleService.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/PeopleService.java index 202098e..ba6cd11 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/PeopleService.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/PeopleService.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.service; +package top.wms.admin.peopleBranch.service; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; @@ -6,16 +6,16 @@ import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.consume.model.req.PeopleDepositImportReq; -import top.ysoft.admin.consume.model.resp.PeopleDepositImportParseResp; -import top.ysoft.admin.peopleBranch.model.query.PeopleQuery; -import top.ysoft.admin.peopleBranch.model.req.PeopleImportReq; -import top.ysoft.admin.peopleBranch.model.req.PeopleReq; -import top.ysoft.admin.peopleBranch.model.resp.ConsumePeopleResp; -import top.ysoft.admin.peopleBranch.model.resp.PeopleImportParseResp; -import top.ysoft.admin.peopleBranch.model.resp.PeopleImportResp; -import top.ysoft.admin.peopleBranch.model.resp.PeopleResp; -import top.ysoft.admin.system.model.resp.user.UserImportResp; +import top.wms.admin.consume.model.req.PeopleDepositImportReq; +import top.wms.admin.consume.model.resp.PeopleDepositImportParseResp; +import top.wms.admin.peopleBranch.model.query.PeopleQuery; +import top.wms.admin.peopleBranch.model.req.PeopleImportReq; +import top.wms.admin.peopleBranch.model.req.PeopleReq; +import top.wms.admin.peopleBranch.model.resp.ConsumePeopleResp; +import top.wms.admin.peopleBranch.model.resp.PeopleImportParseResp; +import top.wms.admin.peopleBranch.model.resp.PeopleImportResp; +import top.wms.admin.peopleBranch.model.resp.PeopleResp; +import top.wms.admin.system.model.resp.user.UserImportResp; import java.io.IOException; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/impl/BranchServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/impl/BranchServiceImpl.java index 21a9b59..6fc1b23 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/impl/BranchServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/impl/BranchServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.service.impl; +package top.wms.admin.peopleBranch.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; @@ -13,18 +13,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.peopleBranch.mapper.BranchMapper; -import top.ysoft.admin.peopleBranch.mapper.BranchRuleMapper; -import top.ysoft.admin.peopleBranch.mapstruct.BranchConvert; -import top.ysoft.admin.peopleBranch.model.entity.BranchDO; -import top.ysoft.admin.peopleBranch.model.entity.BranchRuleDO; -import top.ysoft.admin.peopleBranch.model.query.BranchQuery; -import top.ysoft.admin.peopleBranch.model.req.BranchReq; -import top.ysoft.admin.peopleBranch.model.resp.BranchResp; -import top.ysoft.admin.peopleBranch.model.resp.BranchRuleResp; -import top.ysoft.admin.peopleBranch.service.BranchService; -import top.ysoft.admin.rule.mapper.RuleMapper; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.peopleBranch.mapper.BranchMapper; +import top.wms.admin.peopleBranch.mapper.BranchRuleMapper; +import top.wms.admin.peopleBranch.mapstruct.BranchConvert; +import top.wms.admin.peopleBranch.model.entity.BranchDO; +import top.wms.admin.peopleBranch.model.entity.BranchRuleDO; +import top.wms.admin.peopleBranch.model.query.BranchQuery; +import top.wms.admin.peopleBranch.model.req.BranchReq; +import top.wms.admin.peopleBranch.model.resp.BranchResp; +import top.wms.admin.peopleBranch.model.resp.BranchRuleResp; +import top.wms.admin.peopleBranch.service.BranchService; +import top.wms.admin.rule.mapper.RuleMapper; import java.util.Collections; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/impl/PeopleServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/impl/PeopleServiceImpl.java index db1fe11..5aa6ab3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/impl/PeopleServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleBranch/service/impl/PeopleServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleBranch.service.impl; +package top.wms.admin.peopleBranch.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; @@ -25,8 +25,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.ahoo.cosid.IdGenerator; -import me.ahoo.cosid.provider.DefaultIdGeneratorProvider; import net.dreamlu.mica.core.result.R; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,50 +40,47 @@ import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; import top.continew.starter.file.excel.util.ExcelUtils; import top.continew.starter.web.util.FileUploadUtils; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.enums.*; -import top.ysoft.admin.common.util.SecureUtils; -import top.ysoft.admin.consume.mapper.RechargeRecordMapper; -import top.ysoft.admin.consume.model.entity.RechargeRecordDO; -import top.ysoft.admin.consume.model.req.PeopleDepositImportReq; -import top.ysoft.admin.consume.model.req.PeopleDepositImportRowReq; -import top.ysoft.admin.consume.model.resp.PeopleDepositImportParseResp; -import top.ysoft.admin.peopleBranch.mapper.BranchMapper; -import top.ysoft.admin.peopleBranch.mapper.BranchRuleMapper; -import top.ysoft.admin.peopleBranch.mapper.PeopleMapper; -import top.ysoft.admin.peopleBranch.mapstruct.PeopleConvert; -import top.ysoft.admin.peopleBranch.model.entity.BranchDO; -import top.ysoft.admin.peopleBranch.model.entity.BranchRuleDO; -import top.ysoft.admin.peopleBranch.model.entity.PeopleDO; -import top.ysoft.admin.peopleBranch.model.query.PeopleQuery; -import top.ysoft.admin.peopleBranch.model.req.PeopleImportReq; -import top.ysoft.admin.peopleBranch.model.req.PeopleImportRowReq; -import top.ysoft.admin.peopleBranch.model.req.PeopleReq; -import top.ysoft.admin.peopleBranch.model.resp.*; -import top.ysoft.admin.peopleBranch.service.BranchService; -import top.ysoft.admin.peopleBranch.service.PeopleService; -import top.ysoft.admin.peopleDownRecord.mapper.PeopleDownMapper; -import top.ysoft.admin.peopleDownRecord.model.entity.PeopleDownDO; -import top.ysoft.admin.peopleDownRecord.model.req.PeopleDownReq; -import top.ysoft.admin.peopleDownRecord.service.PeopleDownService; -import top.ysoft.admin.system.mapper.RuleRelationMapper; -import top.ysoft.admin.system.model.entity.*; -import top.ysoft.admin.system.model.req.user.UserImportReq; -import top.ysoft.admin.system.model.req.user.UserImportRowReq; -import top.ysoft.admin.system.model.resp.user.UserImportResp; -import top.ysoft.admin.system.service.ConfigService; -import top.ysoft.admin.yfApi.service.ISysYFService; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.enums.*; +import top.wms.admin.common.util.SecureUtils; +import top.wms.admin.consume.mapper.RechargeRecordMapper; +import top.wms.admin.consume.model.entity.RechargeRecordDO; +import top.wms.admin.consume.model.req.PeopleDepositImportReq; +import top.wms.admin.consume.model.req.PeopleDepositImportRowReq; +import top.wms.admin.consume.model.resp.PeopleDepositImportParseResp; +import top.wms.admin.peopleBranch.mapper.BranchMapper; +import top.wms.admin.peopleBranch.mapper.BranchRuleMapper; +import top.wms.admin.peopleBranch.mapper.PeopleMapper; +import top.wms.admin.peopleBranch.mapstruct.PeopleConvert; +import top.wms.admin.peopleBranch.model.entity.BranchDO; +import top.wms.admin.peopleBranch.model.entity.BranchRuleDO; +import top.wms.admin.peopleBranch.model.entity.PeopleDO; +import top.wms.admin.peopleBranch.model.query.PeopleQuery; +import top.wms.admin.peopleBranch.model.req.PeopleImportReq; +import top.wms.admin.peopleBranch.model.req.PeopleImportRowReq; +import top.wms.admin.peopleBranch.model.req.PeopleReq; +import top.wms.admin.peopleBranch.model.resp.*; +import top.wms.admin.peopleBranch.service.BranchService; +import top.wms.admin.peopleBranch.service.PeopleService; +import top.wms.admin.peopleDownRecord.mapper.PeopleDownMapper; +import top.wms.admin.peopleDownRecord.model.entity.PeopleDownDO; +import top.wms.admin.peopleDownRecord.model.req.PeopleDownReq; +import top.wms.admin.peopleDownRecord.service.PeopleDownService; +import top.wms.admin.system.mapper.RuleRelationMapper; +import top.wms.admin.system.model.entity.*; +import top.wms.admin.system.model.resp.user.UserImportResp; +import top.wms.admin.system.service.ConfigService; +import top.wms.admin.yfApi.service.ISysYFService; import java.io.IOException; import java.math.BigDecimal; import java.time.Duration; -import java.time.LocalDateTime; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static top.ysoft.admin.system.enums.ImportPolicyEnum.*; +import static top.wms.admin.system.enums.ImportPolicyEnum.*; /** * 人员管理业务实现 @@ -622,7 +617,6 @@ public class PeopleServiceImpl extends BaseServiceImpl seenGhs = new HashSet<>(); boolean hasDuplicateGh = validRowList.stream() - .map(PeopleDepositImportRowReq::getGh) - .anyMatch(gh -> gh != null && !seenGhs.add(gh)); + .map(PeopleDepositImportRowReq::getGh) + .anyMatch(gh -> gh != null && !seenGhs.add(gh)); CheckUtils.throwIf(hasDuplicateGh, "存在重复工号,请检测数据"); - // 查询重复用户 int duplicateGhRows = 0; - List fieldValues = validRowList.stream().map(PeopleDepositImportRowReq::getGh).filter(Objects::nonNull).toList(); + List fieldValues = validRowList.stream() + .map(PeopleDepositImportRowReq::getGh) + .filter(Objects::nonNull) + .toList(); if (CollUtil.isNotEmpty(fieldValues)) { - int peopleCount = (int)this.count(Wrappers.lambdaQuery() - .in(PeopleDO::getGh, fieldValues)); + int peopleCount = (int)this.count(Wrappers.lambdaQuery().in(PeopleDO::getGh, fieldValues)); duplicateGhRows = fieldValues.size() - peopleCount; } userImportResp.setValidRows(validRowList.size() - duplicateGhRows); @@ -964,7 +959,9 @@ public class PeopleServiceImpl extends BaseServiceImpl fieldValues2 = validRowList.stream().filter(row -> "禁用".equals(row.getIsConsume())).toList(); + List fieldValues2 = validRowList.stream() + .filter(row -> "禁用".equals(row.getIsConsume())) + .toList(); if (CollUtil.isNotEmpty(fieldValues2)) { unEnabledRows = fieldValues2.size(); } @@ -973,7 +970,7 @@ public class PeopleServiceImpl extends BaseServiceImpl filterConsumeImportData(List importRowList) { // 校验过滤 - return importRowList.stream() - .filter(row -> ValidationUtil.validate(row).isEmpty()) - .toList(); + return importRowList.stream().filter(row -> ValidationUtil.validate(row).isEmpty()).toList(); } - - - @Override @Transactional(rollbackFor = Exception.class) public UserImportResp importConsumePeople(PeopleDepositImportReq req) { @@ -1008,25 +1000,31 @@ public class PeopleServiceImpl extends BaseServiceImpl fieldValues = importUserList.stream().map(PeopleDepositImportRowReq::getGh).filter(Objects::nonNull).toList(); + List fieldValues = importUserList.stream() + .map(PeopleDepositImportRowReq::getGh) + .filter(Objects::nonNull) + .toList(); List peopleNotExistGhs = new ArrayList<>(); List peopleList = new ArrayList<>(); if (CollUtil.isNotEmpty(fieldValues)) { - peopleList = baseMapper.selectList(new QueryWrapper().in("gh",fieldValues)); + peopleList = baseMapper.selectList(new QueryWrapper().in("gh", fieldValues)); List finalPeopleList = peopleList; List collect = finalPeopleList.stream().map(PeopleDO::getGh).toList(); peopleNotExistGhs = fieldValues.stream().filter(gh -> !collect.contains(gh)).toList(); } - //禁用消费得人员 - List consumeNotEnable = importUserList.stream().map(PeopleDepositImportRowReq::getIsConsume).filter("禁用"::equals).toList(); + List consumeNotEnable = importUserList.stream() + .map(PeopleDepositImportRowReq::getIsConsume) + .filter("禁用"::equals) + .toList(); CheckUtils.throwIf(errorImport(req, importUserList, peopleNotExistGhs, consumeNotEnable), "数据异常,已停止导入!"); - Map peopleIdMap = peopleList.stream().collect(Collectors.toMap(PeopleDO::getGh, PeopleDO::getId, (people1, people2) -> people1)); + Map peopleIdMap = peopleList.stream() + .collect(Collectors.toMap(PeopleDO::getGh, PeopleDO::getId, (people1, people2) -> people1)); List updateList = new ArrayList<>(); - for(PeopleDepositImportRowReq row : importUserList) { + for (PeopleDepositImportRowReq row : importUserList) { if (isSkipImport(req, row, peopleNotExistGhs, consumeNotEnable)) { // 按规则跳过该行 continue; @@ -1051,16 +1049,16 @@ public class PeopleServiceImpl extends BaseServiceImpl list, - List peopleNotExistGhs, - List consumeNotEnable) { + List list, + List peopleNotExistGhs, + List consumeNotEnable) { return list.stream() - .anyMatch(row -> EXIT.validate(req.getPeopleNotExist(), row.getGh(), peopleNotExistGhs) || EXIT - .validate(req.getConsumeNotEnable(), row.getIsConsume(), consumeNotEnable)); + .anyMatch(row -> EXIT.validate(req.getPeopleNotExist(), row.getGh(), peopleNotExistGhs) || EXIT.validate(req + .getConsumeNotEnable(), row.getIsConsume(), consumeNotEnable)); } private boolean isSkipImport(PeopleDepositImportReq req, - PeopleDepositImportRowReq row, + PeopleDepositImportRowReq row, List peopleNotExistGhs, List consumeNotEnable) { return SKIP.validate(req.getPeopleNotExist(), row.getGh(), peopleNotExistGhs) || SKIP.validate(req diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/mapper/PeopleDownMapper.java b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/mapper/PeopleDownMapper.java index 375d317..c1aaf93 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/mapper/PeopleDownMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/mapper/PeopleDownMapper.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleDownRecord.mapper; +package top.wms.admin.peopleDownRecord.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.peopleDownRecord.model.entity.PeopleDownDO; -import top.ysoft.admin.peopleDownRecord.model.req.PeopleDownReq; -import top.ysoft.admin.peopleDownRecord.model.resp.PeopleDownResp; +import top.wms.admin.peopleDownRecord.model.entity.PeopleDownDO; +import top.wms.admin.peopleDownRecord.model.req.PeopleDownReq; +import top.wms.admin.peopleDownRecord.model.resp.PeopleDownResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/mapstruct/PeopleDownConvert.java b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/mapstruct/PeopleDownConvert.java index 8f17202..df3c17a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/mapstruct/PeopleDownConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/mapstruct/PeopleDownConvert.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleDownRecord.mapstruct; +package top.wms.admin.peopleDownRecord.mapstruct; import org.mapstruct.Mapper; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/entity/PeopleDownDO.java b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/entity/PeopleDownDO.java index 9d662b8..7d8657f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/entity/PeopleDownDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/entity/PeopleDownDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleDownRecord.model.entity; +package top.wms.admin.peopleDownRecord.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/query/PeopleDownQuery.java b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/query/PeopleDownQuery.java index 586d69a..f630481 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/query/PeopleDownQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/query/PeopleDownQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleDownRecord.model.query; +package top.wms.admin.peopleDownRecord.model.query; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/req/PeopleDownReq.java b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/req/PeopleDownReq.java index 4ecb2b1..f030835 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/req/PeopleDownReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/req/PeopleDownReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleDownRecord.model.req; +package top.wms.admin.peopleDownRecord.model.req; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/resp/PeopleDownResp.java b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/resp/PeopleDownResp.java index b0d3c47..a4be2d3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/resp/PeopleDownResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/model/resp/PeopleDownResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleDownRecord.model.resp; +package top.wms.admin.peopleDownRecord.model.resp; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; @@ -9,8 +9,8 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; -import top.ysoft.admin.common.enums.SuccessFailureStatusEnum; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.SuccessFailureStatusEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/service/PeopleDownService.java b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/service/PeopleDownService.java index b3fac71..d44f7ff 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/service/PeopleDownService.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/service/PeopleDownService.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.peopleDownRecord.service; +package top.wms.admin.peopleDownRecord.service; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.peopleDownRecord.model.query.PeopleDownQuery; -import top.ysoft.admin.peopleDownRecord.model.req.PeopleDownReq; -import top.ysoft.admin.peopleDownRecord.model.resp.PeopleDownResp; +import top.wms.admin.peopleDownRecord.model.query.PeopleDownQuery; +import top.wms.admin.peopleDownRecord.model.req.PeopleDownReq; +import top.wms.admin.peopleDownRecord.model.resp.PeopleDownResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/service/impl/PeopleDownServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/service/impl/PeopleDownServiceImpl.java index a8200ad..64ebcd5 100644 --- a/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/service/impl/PeopleDownServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/peopleDownRecord/service/impl/PeopleDownServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.peopleDownRecord.service.impl; +package top.wms.admin.peopleDownRecord.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.date.DateUtil; @@ -16,19 +16,19 @@ import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; import top.continew.starter.file.excel.util.ExcelUtils; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.equipment.model.req.EquipmentReq; -import top.ysoft.admin.equipment.model.resp.EquipmentResp; -import top.ysoft.admin.equipment.service.EquipmentService; -import top.ysoft.admin.peopleBranch.mapper.PeopleMapper; -import top.ysoft.admin.peopleBranch.model.entity.PeopleDO; -import top.ysoft.admin.peopleDownRecord.mapper.PeopleDownMapper; -import top.ysoft.admin.peopleDownRecord.mapstruct.PeopleDownConvert; -import top.ysoft.admin.peopleDownRecord.model.entity.PeopleDownDO; -import top.ysoft.admin.peopleDownRecord.model.query.PeopleDownQuery; -import top.ysoft.admin.peopleDownRecord.model.req.PeopleDownReq; -import top.ysoft.admin.peopleDownRecord.model.resp.PeopleDownResp; -import top.ysoft.admin.peopleDownRecord.service.PeopleDownService; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.equipment.model.req.EquipmentReq; +import top.wms.admin.equipment.model.resp.EquipmentResp; +import top.wms.admin.equipment.service.EquipmentService; +import top.wms.admin.peopleBranch.mapper.PeopleMapper; +import top.wms.admin.peopleBranch.model.entity.PeopleDO; +import top.wms.admin.peopleDownRecord.mapper.PeopleDownMapper; +import top.wms.admin.peopleDownRecord.mapstruct.PeopleDownConvert; +import top.wms.admin.peopleDownRecord.model.entity.PeopleDownDO; +import top.wms.admin.peopleDownRecord.model.query.PeopleDownQuery; +import top.wms.admin.peopleDownRecord.model.req.PeopleDownReq; +import top.wms.admin.peopleDownRecord.model.resp.PeopleDownResp; +import top.wms.admin.peopleDownRecord.service.PeopleDownService; import java.util.Date; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/mapper/EmpowerRecordMapper.java b/wms-module-system/src/main/java/top/wms/admin/rule/mapper/EmpowerRecordMapper.java index 4c88740..3162479 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/mapper/EmpowerRecordMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/mapper/EmpowerRecordMapper.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.mapper; +package top.wms.admin.rule.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.rule.model.entity.EmpowerRecordDO; -import top.ysoft.admin.rule.model.resp.EmpowerRecordDetailResp; -import top.ysoft.admin.rule.model.resp.EmpowerRecordResp; +import top.wms.admin.rule.model.entity.EmpowerRecordDO; +import top.wms.admin.rule.model.resp.EmpowerRecordDetailResp; +import top.wms.admin.rule.model.resp.EmpowerRecordResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/mapper/PeopleRecordMapper.java b/wms-module-system/src/main/java/top/wms/admin/rule/mapper/PeopleRecordMapper.java index 0cddb2e..2fc41fc 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/mapper/PeopleRecordMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/mapper/PeopleRecordMapper.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.mapper; +package top.wms.admin.rule.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.rule.model.entity.PeopleRecordDO; -import top.ysoft.admin.rule.model.resp.PeopleRecordResp; +import top.wms.admin.rule.model.entity.PeopleRecordDO; +import top.wms.admin.rule.model.resp.PeopleRecordResp; /** * 人员识别记录 Mapper diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/mapper/RuleMapper.java b/wms-module-system/src/main/java/top/wms/admin/rule/mapper/RuleMapper.java index ff65312..50779cc 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/mapper/RuleMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/mapper/RuleMapper.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.rule.mapper; +package top.wms.admin.rule.mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.rule.model.entity.RuleDO; -import top.ysoft.admin.rule.model.resp.YFPeopleResp; +import top.wms.admin.rule.model.entity.RuleDO; +import top.wms.admin.rule.model.resp.YFPeopleResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/mapstruct/RuleConvert.java b/wms-module-system/src/main/java/top/wms/admin/rule/mapstruct/RuleConvert.java index 69e292c..87b1880 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/mapstruct/RuleConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/mapstruct/RuleConvert.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.rule.mapstruct; +package top.wms.admin.rule.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import top.continew.starter.extension.crud.model.resp.LabelValueResp; -import top.ysoft.admin.rule.model.entity.RuleDO; -import top.ysoft.admin.rule.model.req.RuleReq; -import top.ysoft.admin.rule.model.resp.RuleResp; +import top.wms.admin.rule.model.entity.RuleDO; +import top.wms.admin.rule.model.req.RuleReq; +import top.wms.admin.rule.model.resp.RuleResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/EmpowerRecordDO.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/EmpowerRecordDO.java index cd6dc75..372a037 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/EmpowerRecordDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/EmpowerRecordDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.rule.model.entity; +package top.wms.admin.rule.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/PeopleRecordDO.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/PeopleRecordDO.java index 3b1c949..e642ae2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/PeopleRecordDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/PeopleRecordDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.rule.model.entity; +package top.wms.admin.rule.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/RuleDO.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/RuleDO.java index 385425d..d3e66ab 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/RuleDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/entity/RuleDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.rule.model.entity; +package top.wms.admin.rule.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/query/EmpowerRecordQuery.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/query/EmpowerRecordQuery.java index 4956351..7011943 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/query/EmpowerRecordQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/query/EmpowerRecordQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.query; +package top.wms.admin.rule.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/query/PeopleRecordQuery.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/query/PeopleRecordQuery.java index 079593a..08d7566 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/query/PeopleRecordQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/query/PeopleRecordQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.query; +package top.wms.admin.rule.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/query/RuleQuery.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/query/RuleQuery.java index 0aad090..502c9ab 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/query/RuleQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/query/RuleQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.query; +package top.wms.admin.rule.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/req/EmpowerRecordReq.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/req/EmpowerRecordReq.java index c9afa1c..6618030 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/req/EmpowerRecordReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/req/EmpowerRecordReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.req; +package top.wms.admin.rule.model.req; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/req/PeopleRecordReq.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/req/PeopleRecordReq.java index 64b1982..e35d965 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/req/PeopleRecordReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/req/PeopleRecordReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.req; +package top.wms.admin.rule.model.req; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/req/RuleReq.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/req/RuleReq.java index 41ff623..7d6921a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/req/RuleReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/req/RuleReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.req; +package top.wms.admin.rule.model.req; import jakarta.validation.constraints.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/EmpowerRecordDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/EmpowerRecordDetailResp.java index 1e2e5b6..d09f614 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/EmpowerRecordDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/EmpowerRecordDetailResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.resp; +package top.wms.admin.rule.model.resp; import lombok.Data; @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/EmpowerRecordResp.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/EmpowerRecordResp.java index 6395eb9..96f8188 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/EmpowerRecordResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/EmpowerRecordResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.rule.model.resp; +package top.wms.admin.rule.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/PeopleRecordDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/PeopleRecordDetailResp.java index 664cd81..3837ea0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/PeopleRecordDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/PeopleRecordDetailResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.resp; +package top.wms.admin.rule.model.resp; import lombok.Data; @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/PeopleRecordResp.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/PeopleRecordResp.java index 039218d..2a8da13 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/PeopleRecordResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/PeopleRecordResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.resp; +package top.wms.admin.rule.model.resp; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,7 +6,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/RuleResp.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/RuleResp.java index 2575df3..7c786d3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/RuleResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/RuleResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.resp; +package top.wms.admin.rule.model.resp; import cn.crane4j.annotation.Assemble; import com.alibaba.excel.annotation.ExcelIgnore; @@ -6,8 +6,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/YFPeopleResp.java b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/YFPeopleResp.java index e84cc87..ae374b1 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/YFPeopleResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/model/resp/YFPeopleResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.model.resp; +package top.wms.admin.rule.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/service/EmpowerRecordService.java b/wms-module-system/src/main/java/top/wms/admin/rule/service/EmpowerRecordService.java index 1c8070a..b9ef515 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/service/EmpowerRecordService.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/service/EmpowerRecordService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.rule.service; +package top.wms.admin.rule.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.rule.model.query.EmpowerRecordQuery; -import top.ysoft.admin.rule.model.req.EmpowerRecordReq; -import top.ysoft.admin.rule.model.resp.EmpowerRecordResp; +import top.wms.admin.rule.model.query.EmpowerRecordQuery; +import top.wms.admin.rule.model.req.EmpowerRecordReq; +import top.wms.admin.rule.model.resp.EmpowerRecordResp; /** * 授权记录业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/service/PeopleRecordService.java b/wms-module-system/src/main/java/top/wms/admin/rule/service/PeopleRecordService.java index bfbf18f..4891f89 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/service/PeopleRecordService.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/service/PeopleRecordService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.rule.service; +package top.wms.admin.rule.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.rule.model.query.PeopleRecordQuery; -import top.ysoft.admin.rule.model.req.PeopleRecordReq; -import top.ysoft.admin.rule.model.resp.PeopleRecordResp; +import top.wms.admin.rule.model.query.PeopleRecordQuery; +import top.wms.admin.rule.model.req.PeopleRecordReq; +import top.wms.admin.rule.model.resp.PeopleRecordResp; /** * 人员识别记录业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/service/RuleService.java b/wms-module-system/src/main/java/top/wms/admin/rule/service/RuleService.java index 2263398..3eb7759 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/service/RuleService.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/service/RuleService.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.rule.service; +package top.wms.admin.rule.service; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.rule.model.query.RuleQuery; -import top.ysoft.admin.rule.model.req.RuleReq; -import top.ysoft.admin.rule.model.resp.YFPeopleResp; -import top.ysoft.admin.rule.model.resp.RuleResp; +import top.wms.admin.rule.model.query.RuleQuery; +import top.wms.admin.rule.model.req.RuleReq; +import top.wms.admin.rule.model.resp.YFPeopleResp; +import top.wms.admin.rule.model.resp.RuleResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/EmpowerRecordServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/EmpowerRecordServiceImpl.java index ce596ac..2003897 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/EmpowerRecordServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/EmpowerRecordServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.service.impl; +package top.wms.admin.rule.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -15,16 +15,16 @@ import top.continew.starter.core.exception.BusinessException; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.common.enums.CommonExceptionEnum; -import top.ysoft.admin.rule.mapper.EmpowerRecordMapper; -import top.ysoft.admin.rule.model.entity.EmpowerRecordDO; -import top.ysoft.admin.rule.model.query.EmpowerRecordQuery; -import top.ysoft.admin.rule.model.req.EmpowerRecordReq; -import top.ysoft.admin.rule.model.resp.EmpowerRecordDetailResp; -import top.ysoft.admin.rule.model.resp.EmpowerRecordResp; -import top.ysoft.admin.rule.service.EmpowerRecordService; -import top.ysoft.admin.common.constant.Constants; -import top.ysoft.admin.yfApi.service.IYFPushService; +import top.wms.admin.common.enums.CommonExceptionEnum; +import top.wms.admin.rule.mapper.EmpowerRecordMapper; +import top.wms.admin.rule.model.entity.EmpowerRecordDO; +import top.wms.admin.rule.model.query.EmpowerRecordQuery; +import top.wms.admin.rule.model.req.EmpowerRecordReq; +import top.wms.admin.rule.model.resp.EmpowerRecordDetailResp; +import top.wms.admin.rule.model.resp.EmpowerRecordResp; +import top.wms.admin.rule.service.EmpowerRecordService; +import top.wms.admin.common.constant.Constants; +import top.wms.admin.yfApi.service.IYFPushService; import java.util.HashMap; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/PeopleRecordServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/PeopleRecordServiceImpl.java index 77fb7c4..d087b64 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/PeopleRecordServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/PeopleRecordServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.service.impl; +package top.wms.admin.rule.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -10,12 +10,12 @@ import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.rule.mapper.PeopleRecordMapper; -import top.ysoft.admin.rule.model.entity.PeopleRecordDO; -import top.ysoft.admin.rule.model.query.PeopleRecordQuery; -import top.ysoft.admin.rule.model.req.PeopleRecordReq; -import top.ysoft.admin.rule.model.resp.PeopleRecordResp; -import top.ysoft.admin.rule.service.PeopleRecordService; +import top.wms.admin.rule.mapper.PeopleRecordMapper; +import top.wms.admin.rule.model.entity.PeopleRecordDO; +import top.wms.admin.rule.model.query.PeopleRecordQuery; +import top.wms.admin.rule.model.req.PeopleRecordReq; +import top.wms.admin.rule.model.resp.PeopleRecordResp; +import top.wms.admin.rule.service.PeopleRecordService; /** * 人员识别记录业务实现 diff --git a/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/RuleServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/RuleServiceImpl.java index 1731ff2..df2787a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/RuleServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/rule/service/impl/RuleServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.rule.service.impl; +package top.wms.admin.rule.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; @@ -17,23 +17,23 @@ import org.springframework.util.StringUtils; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.equipment.model.resp.EquipmentResp; -import top.ysoft.admin.equipment.service.EquipmentService; -import top.ysoft.admin.peopleBranch.mapper.BranchRuleMapper; -import top.ysoft.admin.peopleBranch.model.entity.BranchRuleDO; -import top.ysoft.admin.rule.mapper.RuleMapper; -import top.ysoft.admin.rule.mapstruct.RuleConvert; -import top.ysoft.admin.rule.model.entity.RuleDO; -import top.ysoft.admin.rule.model.query.RuleQuery; -import top.ysoft.admin.rule.model.req.RuleReq; -import top.ysoft.admin.rule.model.resp.RuleResp; -import top.ysoft.admin.rule.model.resp.YFPeopleResp; -import top.ysoft.admin.rule.service.RuleService; -import top.ysoft.admin.system.mapper.RuleRelationMapper; -import top.ysoft.admin.system.model.entity.RuleRelationDO; -import top.ysoft.admin.yfApi.domain.RuleBody; -import top.ysoft.admin.yfApi.service.IYFPushService; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.equipment.model.resp.EquipmentResp; +import top.wms.admin.equipment.service.EquipmentService; +import top.wms.admin.peopleBranch.mapper.BranchRuleMapper; +import top.wms.admin.peopleBranch.model.entity.BranchRuleDO; +import top.wms.admin.rule.mapper.RuleMapper; +import top.wms.admin.rule.mapstruct.RuleConvert; +import top.wms.admin.rule.model.entity.RuleDO; +import top.wms.admin.rule.model.query.RuleQuery; +import top.wms.admin.rule.model.req.RuleReq; +import top.wms.admin.rule.model.resp.RuleResp; +import top.wms.admin.rule.model.resp.YFPeopleResp; +import top.wms.admin.rule.service.RuleService; +import top.wms.admin.system.mapper.RuleRelationMapper; +import top.wms.admin.system.model.entity.RuleRelationDO; +import top.wms.admin.yfApi.domain.RuleBody; +import top.wms.admin.yfApi.service.IYFPushService; import java.time.ZoneOffset; import java.util.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/mapper/PointMapper.java b/wms-module-system/src/main/java/top/wms/admin/space/mapper/PointMapper.java index b22cf61..af7f0c9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/mapper/PointMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/mapper/PointMapper.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.space.mapper; +package top.wms.admin.space.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.space.model.entity.PointDO; -import top.ysoft.admin.space.model.resp.PointResp; +import top.wms.admin.space.model.entity.PointDO; +import top.wms.admin.space.model.resp.PointResp; /** * 点位管理 Mapper diff --git a/wms-module-system/src/main/java/top/wms/admin/space/mapper/SpaceMapper.java b/wms-module-system/src/main/java/top/wms/admin/space/mapper/SpaceMapper.java index 8057bbe..4babcc2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/mapper/SpaceMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/mapper/SpaceMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.space.mapper; +package top.wms.admin.space.mapper; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.space.model.entity.SpaceDO; -import top.ysoft.admin.space.model.resp.SpaceResp; +import top.wms.admin.space.model.entity.SpaceDO; +import top.wms.admin.space.model.resp.SpaceResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/mapstruct/PointConvert.java b/wms-module-system/src/main/java/top/wms/admin/space/mapstruct/PointConvert.java index 63fc2bd..dc0eddb 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/mapstruct/PointConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/mapstruct/PointConvert.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.space.mapstruct; +package top.wms.admin.space.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; -import top.ysoft.admin.space.model.entity.PointDO; -import top.ysoft.admin.space.model.resp.SpaceResp; +import top.wms.admin.space.model.entity.PointDO; +import top.wms.admin.space.model.resp.SpaceResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/mapstruct/SpaceConvert.java b/wms-module-system/src/main/java/top/wms/admin/space/mapstruct/SpaceConvert.java index 92f8591..f5541c7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/mapstruct/SpaceConvert.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/mapstruct/SpaceConvert.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.space.mapstruct; +package top.wms.admin.space.mapstruct; import org.mapstruct.Mapper; -import top.ysoft.admin.space.model.entity.SpaceDO; -import top.ysoft.admin.space.model.resp.SpaceResp; +import top.wms.admin.space.model.entity.SpaceDO; +import top.wms.admin.space.model.resp.SpaceResp; @Mapper(componentModel = "spring") public interface SpaceConvert { diff --git a/wms-module-system/src/main/java/top/wms/admin/space/model/entity/PointDO.java b/wms-module-system/src/main/java/top/wms/admin/space/model/entity/PointDO.java index db50942..58d1fa9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/model/entity/PointDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/model/entity/PointDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.space.model.entity; +package top.wms.admin.space.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/model/entity/SpaceDO.java b/wms-module-system/src/main/java/top/wms/admin/space/model/entity/SpaceDO.java index f4cba90..c3ff45b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/model/entity/SpaceDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/model/entity/SpaceDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.space.model.entity; +package top.wms.admin.space.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/model/query/PointQuery.java b/wms-module-system/src/main/java/top/wms/admin/space/model/query/PointQuery.java index 8632c17..fe57e67 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/model/query/PointQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/model/query/PointQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.space.model.query; +package top.wms.admin.space.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/model/query/SpaceQuery.java b/wms-module-system/src/main/java/top/wms/admin/space/model/query/SpaceQuery.java index 2aa19f9..6a73df0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/model/query/SpaceQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/model/query/SpaceQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.space.model.query; +package top.wms.admin.space.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/model/req/PointReq.java b/wms-module-system/src/main/java/top/wms/admin/space/model/req/PointReq.java index 0416c12..5cb05af 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/model/req/PointReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/model/req/PointReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.space.model.req; +package top.wms.admin.space.model.req; import jakarta.validation.constraints.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/model/req/SpaceReq.java b/wms-module-system/src/main/java/top/wms/admin/space/model/req/SpaceReq.java index d47e0b9..8cbb3d9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/model/req/SpaceReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/model/req/SpaceReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.space.model.req; +package top.wms.admin.space.model.req; import jakarta.validation.constraints.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/model/resp/PointResp.java b/wms-module-system/src/main/java/top/wms/admin/space/model/resp/PointResp.java index 89e6355..9f22360 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/model/resp/PointResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/model/resp/PointResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.space.model.resp; +package top.wms.admin.space.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/model/resp/SpaceResp.java b/wms-module-system/src/main/java/top/wms/admin/space/model/resp/SpaceResp.java index 35a543a..b63b4ae 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/model/resp/SpaceResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/model/resp/SpaceResp.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.space.model.resp; +package top.wms.admin.space.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; import top.continew.starter.extension.crud.annotation.TreeField; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/service/PointService.java b/wms-module-system/src/main/java/top/wms/admin/space/service/PointService.java index d67bc01..0208bb4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/service/PointService.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/service/PointService.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.space.service; +package top.wms.admin.space.service; import cn.hutool.core.lang.tree.Tree; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.space.model.query.PointQuery; -import top.ysoft.admin.space.model.req.PointReq; -import top.ysoft.admin.space.model.resp.PointResp; +import top.wms.admin.space.model.query.PointQuery; +import top.wms.admin.space.model.req.PointReq; +import top.wms.admin.space.model.resp.PointResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/service/SpaceService.java b/wms-module-system/src/main/java/top/wms/admin/space/service/SpaceService.java index aa56b7a..af52a59 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/service/SpaceService.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/service/SpaceService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.space.service; +package top.wms.admin.space.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.space.model.query.SpaceQuery; -import top.ysoft.admin.space.model.req.SpaceReq; -import top.ysoft.admin.space.model.resp.SpaceResp; +import top.wms.admin.space.model.query.SpaceQuery; +import top.wms.admin.space.model.req.SpaceReq; +import top.wms.admin.space.model.resp.SpaceResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/service/impl/PointServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/space/service/impl/PointServiceImpl.java index 4bb7a5f..7e961b9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/service/impl/PointServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/service/impl/PointServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.space.service.impl; +package top.wms.admin.space.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; @@ -15,16 +15,16 @@ import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.space.mapper.PointMapper; -import top.ysoft.admin.space.mapstruct.PointConvert; -import top.ysoft.admin.space.model.entity.PointDO; -import top.ysoft.admin.space.model.query.PointQuery; -import top.ysoft.admin.space.model.query.SpaceQuery; -import top.ysoft.admin.space.model.req.PointReq; -import top.ysoft.admin.space.model.resp.PointResp; -import top.ysoft.admin.space.model.resp.SpaceResp; -import top.ysoft.admin.space.service.PointService; -import top.ysoft.admin.space.service.SpaceService; +import top.wms.admin.space.mapper.PointMapper; +import top.wms.admin.space.mapstruct.PointConvert; +import top.wms.admin.space.model.entity.PointDO; +import top.wms.admin.space.model.query.PointQuery; +import top.wms.admin.space.model.query.SpaceQuery; +import top.wms.admin.space.model.req.PointReq; +import top.wms.admin.space.model.resp.PointResp; +import top.wms.admin.space.model.resp.SpaceResp; +import top.wms.admin.space.service.PointService; +import top.wms.admin.space.service.SpaceService; import java.util.ArrayList; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/space/service/impl/SpaceServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/space/service/impl/SpaceServiceImpl.java index 8cf6e4f..0742ada 100644 --- a/wms-module-system/src/main/java/top/wms/admin/space/service/impl/SpaceServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/space/service/impl/SpaceServiceImpl.java @@ -1,18 +1,18 @@ -package top.ysoft.admin.space.service.impl; +package top.wms.admin.space.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.space.mapper.SpaceMapper; -import top.ysoft.admin.space.mapstruct.SpaceConvert; -import top.ysoft.admin.space.model.entity.SpaceDO; -import top.ysoft.admin.space.model.query.SpaceQuery; -import top.ysoft.admin.space.model.req.SpaceReq; -import top.ysoft.admin.space.model.resp.SpaceResp; -import top.ysoft.admin.space.service.SpaceService; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.space.mapper.SpaceMapper; +import top.wms.admin.space.mapstruct.SpaceConvert; +import top.wms.admin.space.model.entity.SpaceDO; +import top.wms.admin.space.model.query.SpaceQuery; +import top.wms.admin.space.model.req.SpaceReq; +import top.wms.admin.space.model.resp.SpaceResp; +import top.wms.admin.space.service.SpaceService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileInfoContainer.java b/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileInfoContainer.java index f34abef..9810d04 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileInfoContainer.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileInfoContainer.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.config.file; +package top.wms.admin.system.config.file; import cn.crane4j.core.container.Container; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.system.model.entity.FileDO; -import top.ysoft.admin.system.service.FileService; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.system.model.entity.FileDO; +import top.wms.admin.system.service.FileService; import java.util.Collection; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileRecorderImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileRecorderImpl.java index 8a481f2..f2ac23b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileRecorderImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileRecorderImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.config.file; +package top.wms.admin.system.config.file; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ClassUtil; @@ -12,12 +12,12 @@ import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.recorder.FileRecorder; import org.dromara.x.file.storage.core.upload.FilePartInfo; import org.springframework.stereotype.Component; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.system.enums.FileTypeEnum; -import top.ysoft.admin.system.mapper.FileMapper; -import top.ysoft.admin.system.mapper.StorageMapper; -import top.ysoft.admin.system.model.entity.FileDO; -import top.ysoft.admin.system.model.entity.StorageDO; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.system.enums.FileTypeEnum; +import top.wms.admin.system.mapper.FileMapper; +import top.wms.admin.system.mapper.StorageMapper; +import top.wms.admin.system.model.entity.FileDO; +import top.wms.admin.system.model.entity.StorageDO; import top.continew.starter.core.constant.StringConstants; import java.util.Optional; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileStorageConfigLoader.java b/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileStorageConfigLoader.java index 0683582..0405ecf 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileStorageConfigLoader.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/config/file/FileStorageConfigLoader.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.config.file; +package top.wms.admin.system.config.file; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -7,11 +7,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.model.query.StorageQuery; -import top.ysoft.admin.system.model.req.StorageReq; -import top.ysoft.admin.system.model.resp.StorageResp; -import top.ysoft.admin.system.service.StorageService; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.model.query.StorageQuery; +import top.wms.admin.system.model.req.StorageReq; +import top.wms.admin.system.model.resp.StorageResp; +import top.wms.admin.system.service.StorageService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/config/mail/MailConfigurerImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/config/mail/MailConfigurerImpl.java index 4eb5038..5d42b9d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/config/mail/MailConfigurerImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/config/mail/MailConfigurerImpl.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.system.config.mail; +package top.wms.admin.system.config.mail; import cn.hutool.core.map.MapUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.system.enums.OptionCategoryEnum; -import top.ysoft.admin.system.service.OptionService; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.system.enums.OptionCategoryEnum; +import top.wms.admin.system.service.OptionService; import top.continew.starter.messaging.mail.core.MailConfig; import top.continew.starter.messaging.mail.core.MailConfigurer; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/FileTypeEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/FileTypeEnum.java index 8a25630..f931f69 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/FileTypeEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/FileTypeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import cn.hutool.core.util.StrUtil; import lombok.Getter; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/ImportPolicyEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/ImportPolicyEnum.java index d5b6077..7edc883 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/ImportPolicyEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/ImportPolicyEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import cn.hutool.core.collection.CollUtil; import lombok.Getter; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/LogStatusEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/LogStatusEnum.java index 4cfd0e9..8027e5c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/LogStatusEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/LogStatusEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/MenuTypeEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/MenuTypeEnum.java index 26dacdb..fd1c157 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/MenuTypeEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/MenuTypeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/MessageTemplateEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/MessageTemplateEnum.java index fd44037..ca6ae08 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/MessageTemplateEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/MessageTemplateEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/MessageTypeEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/MessageTypeEnum.java index a78173b..24cf8e2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/MessageTypeEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/MessageTypeEnum.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.ysoft.admin.common.constant.UiConstants; +import top.wms.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/NoticeScopeEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/NoticeScopeEnum.java index ed0ed6a..ee7100e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/NoticeScopeEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/NoticeScopeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/NoticeStatusEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/NoticeStatusEnum.java index a06c154..5dc5620 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/NoticeStatusEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/NoticeStatusEnum.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.ysoft.admin.common.constant.UiConstants; +import top.wms.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/OptionCategoryEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/OptionCategoryEnum.java index 3021717..5f9b8c6 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/OptionCategoryEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/OptionCategoryEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; /** * 参数类别枚举 diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/PasswordPolicyEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/PasswordPolicyEnum.java index 7dbc2c1..ca7e1ae 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/PasswordPolicyEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/PasswordPolicyEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -8,11 +8,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.ysoft.admin.common.constant.RegexConstants; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.service.OptionService; -import top.ysoft.admin.system.service.UserPasswordHistoryService; +import top.wms.admin.common.constant.RegexConstants; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.service.OptionService; +import top.wms.admin.system.service.UserPasswordHistoryService; import top.continew.starter.core.validation.ValidationUtils; import java.util.Map; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/SocialSourceEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/SocialSourceEnum.java index 3b62a2f..abbc254 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/SocialSourceEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/SocialSourceEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/enums/StorageTypeEnum.java b/wms-module-system/src/main/java/top/wms/admin/system/enums/StorageTypeEnum.java index 0419803..ca586ad 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/enums/StorageTypeEnum.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/enums/StorageTypeEnum.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.enums; +package top.wms.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/ClientMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/ClientMapper.java index 18095d5..a919fa8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/ClientMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/ClientMapper.java @@ -1,6 +1,6 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; -import top.ysoft.admin.system.model.entity.ClientDO; +import top.wms.admin.system.model.entity.ClientDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/ConfigMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/ConfigMapper.java index a44aa4f..ce5475d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/ConfigMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/ConfigMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.system.model.entity.ConfigDO; +import top.wms.admin.system.model.entity.ConfigDO; /** * 参数配置 Mapper diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/DeptMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/DeptMapper.java index d255321..07835bf 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/DeptMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/DeptMapper.java @@ -1,6 +1,6 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; -import top.ysoft.admin.system.model.entity.DeptDO; +import top.wms.admin.system.model.entity.DeptDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/DictItemMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/DictItemMapper.java index 3ff85b4..af0d09b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/DictItemMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/DictItemMapper.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import com.alicp.jetcache.anno.Cached; import org.apache.ibatis.annotations.Param; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.system.model.entity.DictItemDO; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.system.model.entity.DictItemDO; import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.extension.crud.model.resp.LabelValueResp; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/DictMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/DictMapper.java index eb2c4c2..853c4e6 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/DictMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/DictMapper.java @@ -1,6 +1,6 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; -import top.ysoft.admin.system.model.entity.DictDO; +import top.wms.admin.system.model.entity.DictDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/FileMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/FileMapper.java index dd29600..d275102 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/FileMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/FileMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.apache.ibatis.annotations.Select; -import top.ysoft.admin.system.model.entity.FileDO; -import top.ysoft.admin.system.model.resp.file.FileStatisticsResp; +import top.wms.admin.system.model.entity.FileDO; +import top.wms.admin.system.model.resp.file.FileStatisticsResp; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/LogMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/LogMapper.java index dfc0a8d..e45aaa5 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/LogMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/LogMapper.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import com.alicp.jetcache.anno.Cached; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.system.model.entity.LogDO; -import top.ysoft.admin.system.model.resp.dashboard.DashboardAccessTrendResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardOverviewCommonResp; -import top.ysoft.admin.system.model.resp.log.LogResp; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.system.model.entity.LogDO; +import top.wms.admin.system.model.resp.dashboard.DashboardAccessTrendResp; +import top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp; +import top.wms.admin.system.model.resp.dashboard.DashboardOverviewCommonResp; +import top.wms.admin.system.model.resp.log.LogResp; import top.continew.starter.data.mp.base.BaseMapper; import java.util.Date; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/MenuMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/MenuMapper.java index d5244c6..fa703c7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/MenuMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/MenuMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.ysoft.admin.system.model.entity.MenuDO; +import top.wms.admin.system.model.entity.MenuDO; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/MessageMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/MessageMapper.java index 4f7a41b..e4a6462 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/MessageMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/MessageMapper.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; -import top.ysoft.admin.system.model.entity.MessageDO; -import top.ysoft.admin.system.model.resp.message.MessageResp; +import top.wms.admin.system.model.entity.MessageDO; +import top.wms.admin.system.model.resp.message.MessageResp; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/MessageUserMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/MessageUserMapper.java index c7e2217..f1058d7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/MessageUserMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/MessageUserMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.ysoft.admin.system.model.entity.MessageUserDO; +import top.wms.admin.system.model.entity.MessageUserDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/NoticeMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/NoticeMapper.java index 7f1034e..2b0c82c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/NoticeMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/NoticeMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.ysoft.admin.system.model.entity.NoticeDO; -import top.ysoft.admin.system.model.resp.dashboard.DashboardNoticeResp; +import top.wms.admin.system.model.entity.NoticeDO; +import top.wms.admin.system.model.resp.dashboard.DashboardNoticeResp; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/OptionMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/OptionMapper.java index 18682fa..ec760f3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/OptionMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/OptionMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.ysoft.admin.system.model.entity.OptionDO; +import top.wms.admin.system.model.entity.OptionDO; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/PeopleEquipmentMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/PeopleEquipmentMapper.java index fb45f69..6a711bc 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/PeopleEquipmentMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/PeopleEquipmentMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.system.model.entity.PeopleEquipmentDO; +import top.wms.admin.system.model.entity.PeopleEquipmentDO; /** * 人员设备下发信息 Mapper diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleDeptMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleDeptMapper.java index 6e9dbb7..dba1b58 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleDeptMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleDeptMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.ysoft.admin.system.model.entity.RoleDeptDO; +import top.wms.admin.system.model.entity.RoleDeptDO; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleMapper.java index c3c5d18..a34a16e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleMapper.java @@ -1,6 +1,6 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; -import top.ysoft.admin.system.model.entity.RoleDO; +import top.wms.admin.system.model.entity.RoleDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleMenuMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleMenuMapper.java index d58ca74..ebc8a64 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleMenuMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RoleMenuMapper.java @@ -1,6 +1,6 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; -import top.ysoft.admin.system.model.entity.RoleMenuDO; +import top.wms.admin.system.model.entity.RoleMenuDO; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RuleRelationMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RuleRelationMapper.java index 3a7e80e..722b2ec 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/RuleRelationMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/RuleRelationMapper.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.ysoft.admin.system.model.entity.RuleRelationDO; +import top.wms.admin.system.model.entity.RuleRelationDO; /** * 通行规则-设备关联 Mapper diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/StorageMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/StorageMapper.java index c3ffdae..2779951 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/StorageMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/StorageMapper.java @@ -1,6 +1,6 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; -import top.ysoft.admin.system.model.entity.StorageDO; +import top.wms.admin.system.model.entity.StorageDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserMapper.java index 1b46979..b06dba9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserMapper.java @@ -1,13 +1,13 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.ysoft.admin.common.config.mybatis.DataPermissionMapper; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.model.resp.user.UserDetailResp; +import top.wms.admin.common.config.mybatis.DataPermissionMapper; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.model.resp.user.UserDetailResp; import top.continew.starter.extension.datapermission.annotation.DataPermission; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserPasswordHistoryMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserPasswordHistoryMapper.java index 89abf13..21563b2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserPasswordHistoryMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserPasswordHistoryMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.ysoft.admin.system.model.entity.UserPasswordHistoryDO; +import top.wms.admin.system.model.entity.UserPasswordHistoryDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserRoleMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserRoleMapper.java index 23da663..b849846 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserRoleMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserRoleMapper.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; -import top.ysoft.admin.system.model.entity.UserRoleDO; -import top.ysoft.admin.system.model.resp.role.RoleUserResp; +import top.wms.admin.system.model.entity.UserRoleDO; +import top.wms.admin.system.model.resp.role.RoleUserResp; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserSocialMapper.java b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserSocialMapper.java index c84e991..2a6298f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserSocialMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/mapper/UserSocialMapper.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.system.mapper; +package top.wms.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.ysoft.admin.system.model.entity.UserSocialDO; +import top.wms.admin.system.model.entity.UserSocialDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/ClientDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/ClientDO.java index 46e7139..9d988b2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/ClientDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/ClientDO.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/ConfigDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/ConfigDO.java index 766a378..b16aa20 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/ConfigDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/ConfigDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DeptDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DeptDO.java index 0535706..a9d619c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DeptDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DeptDO.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DictDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DictDO.java index 0246c48..0117e39 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DictDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DictDO.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.starter.extension.crud.annotation.DictField; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DictItemDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DictItemDO.java index f0a045b..943395c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DictItemDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/DictItemDO.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/FileDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/FileDO.java index fe5ed64..4020d14 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/FileDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/FileDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.SneakyThrows; import org.dromara.x.file.storage.core.FileInfo; -import top.ysoft.admin.common.model.entity.BaseDO; -import top.ysoft.admin.system.enums.FileTypeEnum; -import top.ysoft.admin.system.enums.StorageTypeEnum; +import top.wms.admin.common.model.entity.BaseDO; +import top.wms.admin.system.enums.FileTypeEnum; +import top.wms.admin.system.enums.StorageTypeEnum; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.StrUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/LogDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/LogDO.java index ccf95e1..2002fda 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/LogDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/LogDO.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.system.enums.LogStatusEnum; +import top.wms.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MenuDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MenuDO.java index 86ef454..7f5e9b2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MenuDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MenuDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.MenuTypeEnum; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.MenuTypeEnum; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MessageDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MessageDO.java index 1786435..f014dfc 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MessageDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MessageDO.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.system.enums.MessageTypeEnum; +import top.wms.admin.system.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MessageUserDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MessageUserDO.java index fe816a3..deaf8fd 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MessageUserDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/MessageUserDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/NoticeDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/NoticeDO.java index dea42d5..3f34686 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/NoticeDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/NoticeDO.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; -import top.ysoft.admin.common.model.entity.BaseDO; -import top.ysoft.admin.system.enums.NoticeScopeEnum; +import top.wms.admin.common.model.entity.BaseDO; +import top.wms.admin.system.enums.NoticeScopeEnum; import java.io.Serial; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/OptionDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/OptionDO.java index e75f8b7..b55924c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/OptionDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/OptionDO.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.model.entity.BaseUpdateDO; +import top.wms.admin.common.model.entity.BaseUpdateDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/PeopleEquipmentDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/PeopleEquipmentDO.java index 5ff7470..29aee53 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/PeopleEquipmentDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/PeopleEquipmentDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleDO.java index bb877ad..9027995 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.enums.DataScopeEnum; +import top.wms.admin.common.enums.DataScopeEnum; import top.continew.starter.extension.crud.annotation.DictField; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleDeptDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleDeptDO.java index 47a2c9b..5b347c4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleDeptDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleDeptDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleMenuDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleMenuDO.java index 79289b0..471440d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleMenuDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RoleMenuDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RuleRelationDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RuleRelationDO.java index e410b8c..2310d12 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RuleRelationDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/RuleRelationDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/StorageDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/StorageDO.java index 160b09c..76fd894 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/StorageDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/StorageDO.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.StorageTypeEnum; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.StorageTypeEnum; +import top.wms.admin.common.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserDO.java index c58c069..9f034e9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserDO.java @@ -1,13 +1,13 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.enums.GenderEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.GenderEnum; import top.continew.starter.extension.crud.annotation.DictField; -import top.ysoft.admin.common.model.entity.BaseDO; +import top.wms.admin.common.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserPasswordHistoryDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserPasswordHistoryDO.java index bf10d6a..4e0fb4c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserPasswordHistoryDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserPasswordHistoryDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserRoleDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserRoleDO.java index 81fe159..264305c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserRoleDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserRoleDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserSocialDO.java b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserSocialDO.java index 81637d8..75a117a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserSocialDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/entity/UserSocialDO.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.entity; +package top.wms.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/ClientQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/ClientQuery.java index 4294129..1a09733 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/ClientQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/ClientQuery.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/ConfigQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/ConfigQuery.java index 8e00289..734a5f1 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/ConfigQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/ConfigQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import cn.hutool.core.date.DatePattern; import jakarta.validation.constraints.Size; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/DeptQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/DeptQuery.java index b24e3c5..881eb0b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/DeptQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/DeptQuery.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/DictItemQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/DictItemQuery.java index 722c19d..03f37db 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/DictItemQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/DictItemQuery.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/DictQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/DictQuery.java index 9c1975e..6249a52 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/DictQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/DictQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/FileQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/FileQuery.java index 55f3639..f6f26a7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/FileQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/FileQuery.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.system.enums.FileTypeEnum; +import top.wms.admin.system.enums.FileTypeEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/LogQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/LogQuery.java index e6fc518..6fc8c5d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/LogQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/LogQuery.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/MenuQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/MenuQuery.java index 528a8f5..e9f8c3f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/MenuQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/MenuQuery.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/MessageQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/MessageQuery.java index ae14885..250e09f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/MessageQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/MessageQuery.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.system.enums.MessageTypeEnum; +import top.wms.admin.system.enums.MessageTypeEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.annotation.QueryIgnore; import top.continew.starter.data.core.enums.QueryType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/NoticeQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/NoticeQuery.java index 13bd2fa..02ae6e7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/NoticeQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/NoticeQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/OptionQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/OptionQuery.java index 8cb54e2..d079e84 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/OptionQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/OptionQuery.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.system.enums.OptionCategoryEnum; +import top.wms.admin.system.enums.OptionCategoryEnum; import top.continew.starter.core.validation.constraints.EnumValue; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/PeopleEquipmentQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/PeopleEquipmentQuery.java index de00309..a061b3d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/PeopleEquipmentQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/PeopleEquipmentQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/RoleQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/RoleQuery.java index 969e999..746b807 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/RoleQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/RoleQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/RoleUserQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/RoleUserQuery.java index 328a63e..52f3efc 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/RoleUserQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/RoleUserQuery.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/StorageQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/StorageQuery.java index 885646a..202286c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/StorageQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/StorageQuery.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.StorageTypeEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.StorageTypeEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/query/UserQuery.java b/wms-module-system/src/main/java/top/wms/admin/system/model/query/UserQuery.java index 5111a68..1087715 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/query/UserQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/query/UserQuery.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.query; +package top.wms.admin.system.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/ClientReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/ClientReq.java index 0412d8f..0ddc737 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/ClientReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/ClientReq.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/ConfigReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/ConfigReq.java index 2fd1515..9a2bedb 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/ConfigReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/ConfigReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/DeptReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/DeptReq.java index 11d0bc3..6674c75 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/DeptReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/DeptReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/DictItemReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/DictItemReq.java index 7fc0d40..30a4426 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/DictItemReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/DictItemReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/DictReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/DictReq.java index 99e31fd..faa0d2e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/DictReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/DictReq.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.constant.RegexConstants; +import top.wms.admin.common.constant.RegexConstants; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/FileReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/FileReq.java index a9c9f68..75269a1 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/FileReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/FileReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/MenuReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/MenuReq.java index 691641e..d227c21 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/MenuReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/MenuReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -6,8 +6,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.MenuTypeEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.MenuTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/MessageReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/MessageReq.java index 6922f6f..ded4501 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/MessageReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/MessageReq.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.system.enums.MessageTypeEnum; +import top.wms.admin.system.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/NoticeReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/NoticeReq.java index d5d811e..0565fbe 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/NoticeReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/NoticeReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Future; @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.system.enums.NoticeScopeEnum; +import top.wms.admin.system.enums.NoticeScopeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/OptionReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/OptionReq.java index f09203e..c6bc9b1 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/OptionReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/OptionReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -40,6 +40,6 @@ public class OptionReq implements Serializable { /** * 值 */ - @Schema(description = "值", example = "Ysoft Admin") + @Schema(description = "值", example = "Wms Admin") private String value; } \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/OptionResetValueReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/OptionResetValueReq.java index a38f329..6f26137 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/OptionResetValueReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/OptionResetValueReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/PeopleEquipmentReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/PeopleEquipmentReq.java index f12e707..a0bc729 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/PeopleEquipmentReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/PeopleEquipmentReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/RoleReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/RoleReq.java index 96921b5..83a1056 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/RoleReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/RoleReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -6,8 +6,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.constant.RegexConstants; -import top.ysoft.admin.common.enums.DataScopeEnum; +import top.wms.admin.common.constant.RegexConstants; +import top.wms.admin.common.enums.DataScopeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/RoleUpdatePermissionReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/RoleUpdatePermissionReq.java index aed0b19..7fd80d4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/RoleUpdatePermissionReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/RoleUpdatePermissionReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/RuleRelationReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/RuleRelationReq.java index 755cd0d..82518c8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/RuleRelationReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/RuleRelationReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import jakarta.validation.constraints.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/StorageReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/StorageReq.java index 1bf9049..7134a19 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/StorageReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/StorageReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req; +package top.wms.admin.system.model.req; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,10 +7,10 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.constant.RegexConstants; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.StorageTypeEnum; -import top.ysoft.admin.system.validation.ValidationGroup; +import top.wms.admin.common.constant.RegexConstants; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.StorageTypeEnum; +import top.wms.admin.system.validation.ValidationGroup; import java.io.Serial; import java.io.Serializable; @@ -77,7 +77,7 @@ public class StorageReq implements Serializable { /** * Bucket/存储路径 */ - @Schema(description = "Bucket/存储路径", example = "C:/ysoft-admin/data/file/") + @Schema(description = "Bucket/存储路径", example = "C:/wms-admin/data/file/") @Length(max = 255, message = "Bucket长度不能超过 {max} 个字符", groups = ValidationGroup.Storage.OSS.class) @Length(max = 255, message = "存储路径长度不能超过 {max} 个字符", groups = ValidationGroup.Storage.Local.class) @NotBlank(message = "Bucket不能为空", groups = ValidationGroup.Storage.OSS.class) diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserBasicInfoUpdateReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserBasicInfoUpdateReq.java index a5a6ddd..67047b0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserBasicInfoUpdateReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserBasicInfoUpdateReq.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.Data; -import top.ysoft.admin.common.constant.RegexConstants; -import top.ysoft.admin.common.enums.GenderEnum; +import top.wms.admin.common.constant.RegexConstants; +import top.wms.admin.common.enums.GenderEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserEmailUpdateRequest.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserEmailUpdateRequest.java index 8ce25d1..b500618 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserEmailUpdateRequest.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserEmailUpdateRequest.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserImportReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserImportReq.java index 4a218ae..9ff0dc2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserImportReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserImportReq.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.ImportPolicyEnum; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.ImportPolicyEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserImportRowReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserImportRowReq.java index b15ce3f..9f89f3f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserImportRowReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserImportRowReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.constant.RegexConstants; +import top.wms.admin.common.constant.RegexConstants; import top.continew.starter.extension.crud.validation.CrudValidationGroup; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPasswordResetReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPasswordResetReq.java index 8767ba6..10e6837 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPasswordResetReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPasswordResetReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPasswordUpdateReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPasswordUpdateReq.java index 1f9ab23..fe5b80e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPasswordUpdateReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPasswordUpdateReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPhoneUpdateReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPhoneUpdateReq.java index ea5b476..b534151 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPhoneUpdateReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserPhoneUpdateReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserReq.java index 21e76db..aae5a4a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,9 +8,9 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.ysoft.admin.common.constant.RegexConstants; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.enums.GenderEnum; +import top.wms.admin.common.constant.RegexConstants; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.GenderEnum; import top.continew.starter.extension.crud.validation.CrudValidationGroup; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserRoleUpdateReq.java b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserRoleUpdateReq.java index d503547..e3e508f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserRoleUpdateReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/req/user/UserRoleUpdateReq.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.req.user; +package top.wms.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/AvatarResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/AvatarResp.java index abf5eb0..93e540f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/AvatarResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/AvatarResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ClientResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ClientResp.java index d1fb7c4..32600f8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ClientResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ClientResp.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ConfigDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ConfigDetailResp.java index a904c28..82b171a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ConfigDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ConfigDetailResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import lombok.Data; @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ConfigResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ConfigResp.java index fcdd5f9..98a2e99 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ConfigResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/ConfigResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DeptResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DeptResp.java index 3ce847e..e82cb9a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DeptResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DeptResp.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DictItemResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DictItemResp.java index 3f2a4e4..653bd1c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DictItemResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DictItemResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DictResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DictResp.java index 95e6454..3049cbf 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DictResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/DictResp.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/MenuResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/MenuResp.java index 6d098ec..277d16a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/MenuResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/MenuResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseResp; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.MenuTypeEnum; +import top.wms.admin.common.model.resp.BaseResp; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.MenuTypeEnum; import top.continew.starter.extension.crud.annotation.TreeField; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/NoticeDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/NoticeDetailResp.java index 9d6f611..451127f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/NoticeDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/NoticeDetailResp.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.system.enums.NoticeScopeEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.system.enums.NoticeScopeEnum; import java.io.Serial; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/NoticeResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/NoticeResp.java index c555410..0920f80 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/NoticeResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/NoticeResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseResp; -import top.ysoft.admin.system.enums.NoticeScopeEnum; -import top.ysoft.admin.system.enums.NoticeStatusEnum; +import top.wms.admin.common.model.resp.BaseResp; +import top.wms.admin.system.enums.NoticeScopeEnum; +import top.wms.admin.system.enums.NoticeStatusEnum; import java.io.Serial; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/OptionResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/OptionResp.java index c597bf5..1ae26d6 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/OptionResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/OptionResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -42,7 +42,7 @@ public class OptionResp implements Serializable { /** * 值 */ - @Schema(description = "值", example = "Ysoft Admin") + @Schema(description = "值", example = "Wms Admin") private String value; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/PeopleEquipmentResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/PeopleEquipmentResp.java index 7a5d988..41d8fd2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/PeopleEquipmentResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/PeopleEquipmentResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.ysoft.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/StorageResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/StorageResp.java index ed92ec7..a1a1fb9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/StorageResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/StorageResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp; +package top.wms.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.StorageTypeEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.StorageTypeEnum; import top.continew.starter.security.mask.annotation.JsonMask; import java.io.Serial; @@ -68,7 +68,7 @@ public class StorageResp extends BaseDetailResp { /** * Bucket/存储路径 */ - @Schema(description = "Bucket/存储路径", example = "C:/ysoft-admin/data/file/") + @Schema(description = "Bucket/存储路径", example = "C:/wms-admin/data/file/") private String bucketName; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java index 070c01e..61eb5bf 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.dashboard; +package top.wms.admin.system.model.resp.dashboard; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardChartCommonResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardChartCommonResp.java index f3bf0c1..558b733 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardChartCommonResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardChartCommonResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.dashboard; +package top.wms.admin.system.model.resp.dashboard; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardNoticeResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardNoticeResp.java index 2674ca5..63007a5 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardNoticeResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardNoticeResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.dashboard; +package top.wms.admin.system.model.resp.dashboard; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java index 61fe7b8..2572488 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.dashboard; +package top.wms.admin.system.model.resp.dashboard; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardTotalResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardTotalResp.java index aac6518..f3eddb3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardTotalResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/dashboard/DashboardTotalResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.dashboard; +package top.wms.admin.system.model.resp.dashboard; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileResp.java index 428fdc2..a2b5bc4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp.file; +package top.wms.admin.system.model.resp.file; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.system.enums.FileTypeEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.system.enums.FileTypeEnum; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileStatisticsResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileStatisticsResp.java index c2dc782..927feb8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileStatisticsResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileStatisticsResp.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.resp.file; +package top.wms.admin.system.model.resp.file; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.system.enums.FileTypeEnum; +import top.wms.admin.system.enums.FileTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileUploadResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileUploadResp.java index 920369a..f9944b3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileUploadResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/file/FileUploadResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.file; +package top.wms.admin.system.model.resp.file; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LogDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LogDetailResp.java index 26f6e27..a3851b9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LogDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LogDetailResp.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.system.model.resp.log; +package top.wms.admin.system.model.resp.log; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.system.enums.LogStatusEnum; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; @@ -52,7 +52,7 @@ public class LogDetailResp implements Serializable { /** * 请求 URL */ - @Schema(description = "请求 URL", example = "http://api.ysoft.top/system/dept") + @Schema(description = "请求 URL", example = "http://api.wms.top/system/dept") private String requestUrl; /** @@ -64,7 +64,7 @@ public class LogDetailResp implements Serializable { /** * 请求头 */ - @Schema(description = "请求头", example = "{\"Origin\": [\"https://admin.ysoft.top\"],...}") + @Schema(description = "请求头", example = "{\"Origin\": [\"https://admin.wms.top\"],...}") private String requestHeaders; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LogResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LogResp.java index be18016..69df61a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LogResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LogResp.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.resp.log; +package top.wms.admin.system.model.resp.log; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.system.enums.LogStatusEnum; +import top.wms.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LoginLogExportResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LoginLogExportResp.java index ad4f472..7c36732 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LoginLogExportResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/LoginLogExportResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp.log; +package top.wms.admin.system.model.resp.log; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.system.enums.LogStatusEnum; +import top.wms.admin.system.enums.LogStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/OperationLogExportResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/OperationLogExportResp.java index f162d8e..946bade 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/OperationLogExportResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/log/OperationLogExportResp.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.model.resp.log; +package top.wms.admin.system.model.resp.log; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.system.enums.LogStatusEnum; +import top.wms.admin.system.enums.LogStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageResp.java index ef74662..2c93309 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageResp.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.model.resp.message; +package top.wms.admin.system.model.resp.message; import cn.crane4j.annotation.Assemble; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.system.enums.MessageTypeEnum; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.system.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageTypeUnreadResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageTypeUnreadResp.java index 795b03f..d69281c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageTypeUnreadResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageTypeUnreadResp.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.model.resp.message; +package top.wms.admin.system.model.resp.message; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.system.enums.MessageTypeEnum; +import top.wms.admin.system.enums.MessageTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageUnreadResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageUnreadResp.java index e02c668..f8091c5 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageUnreadResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/message/MessageUnreadResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.message; +package top.wms.admin.system.model.resp.message; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleDetailResp.java index bf9f496..289f373 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleDetailResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.role; +package top.wms.admin.system.model.resp.role; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; @@ -7,9 +7,9 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.common.enums.DataScopeEnum; -import top.ysoft.admin.system.service.RoleDeptService; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.DataScopeEnum; +import top.wms.admin.system.service.RoleDeptService; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleResp.java index eecd514..5eea37b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleResp.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.model.resp.role; +package top.wms.admin.system.model.resp.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.common.enums.DataScopeEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.enums.DataScopeEnum; import java.io.Serial; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleUserResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleUserResp.java index 54fecd0..55abebb 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleUserResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/role/RoleUserResp.java @@ -1,13 +1,13 @@ -package top.ysoft.admin.system.model.resp.role; +package top.wms.admin.system.model.resp.role; import cn.crane4j.annotation.Assemble; import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.enums.GenderEnum; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.GenderEnum; import java.io.Serial; import java.io.Serializable; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserDetailResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserDetailResp.java index b8f3433..0b296f6 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserDetailResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserDetailResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.user; +package top.wms.admin.system.model.resp.user; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.AssembleMethod; @@ -10,13 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.enums.GenderEnum; -import top.ysoft.admin.system.model.resp.DeptResp; -import top.ysoft.admin.system.service.DeptService; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.GenderEnum; +import top.wms.admin.system.model.resp.DeptResp; +import top.wms.admin.system.service.DeptService; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import top.continew.starter.file.excel.converter.ExcelListConverter; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserImportParseResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserImportParseResp.java index 3b8058a..2680818 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserImportParseResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserImportParseResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.user; +package top.wms.admin.system.model.resp.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserImportResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserImportResp.java index a426aa2..507e140 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserImportResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserImportResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.user; +package top.wms.admin.system.model.resp.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserResp.java index 1db7dd7..77eeac1 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserResp.java @@ -1,14 +1,14 @@ -package top.ysoft.admin.system.model.resp.user; +package top.wms.admin.system.model.resp.user; import cn.crane4j.annotation.Assemble; import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.ysoft.admin.common.model.resp.BaseDetailResp; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.enums.GenderEnum; +import top.wms.admin.common.model.resp.BaseDetailResp; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.GenderEnum; import top.continew.starter.security.mask.annotation.JsonMask; import top.continew.starter.security.mask.enums.MaskType; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserSocialBindResp.java b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserSocialBindResp.java index bb118bb..6e3b33e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserSocialBindResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/model/resp/user/UserSocialBindResp.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.model.resp.user; +package top.wms.admin.system.model.resp.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/ClientService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/ClientService.java index 63ed1ca..8e7e0c9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/ClientService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/ClientService.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.query.ClientQuery; -import top.ysoft.admin.system.model.req.ClientReq; -import top.ysoft.admin.system.model.resp.ClientResp; +import top.wms.admin.system.model.query.ClientQuery; +import top.wms.admin.system.model.req.ClientReq; +import top.wms.admin.system.model.resp.ClientResp; import top.continew.starter.extension.crud.service.BaseService; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/ConfigService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/ConfigService.java index a3de6e8..047796d 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/ConfigService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/ConfigService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.system.model.query.ConfigQuery; -import top.ysoft.admin.system.model.req.ConfigReq; -import top.ysoft.admin.system.model.resp.ConfigResp; +import top.wms.admin.system.model.query.ConfigQuery; +import top.wms.admin.system.model.req.ConfigReq; +import top.wms.admin.system.model.resp.ConfigResp; /** * 参数配置业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/DashboardService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/DashboardService.java index d25a6d6..ee84518 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/DashboardService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/DashboardService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.resp.dashboard.DashboardAccessTrendResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardNoticeResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardOverviewCommonResp; +import top.wms.admin.system.model.resp.dashboard.DashboardAccessTrendResp; +import top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp; +import top.wms.admin.system.model.resp.dashboard.DashboardNoticeResp; +import top.wms.admin.system.model.resp.dashboard.DashboardOverviewCommonResp; import java.io.IOException; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/DeptService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/DeptService.java index f8e25a2..3e488d9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/DeptService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/DeptService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.entity.DeptDO; -import top.ysoft.admin.system.model.query.DeptQuery; -import top.ysoft.admin.system.model.req.DeptReq; -import top.ysoft.admin.system.model.resp.DeptResp; +import top.wms.admin.system.model.entity.DeptDO; +import top.wms.admin.system.model.query.DeptQuery; +import top.wms.admin.system.model.req.DeptReq; +import top.wms.admin.system.model.resp.DeptResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/DictItemService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/DictItemService.java index 4b1e4c1..47c16ca 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/DictItemService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/DictItemService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.entity.DictItemDO; -import top.ysoft.admin.system.model.query.DictItemQuery; -import top.ysoft.admin.system.model.req.DictItemReq; -import top.ysoft.admin.system.model.resp.DictItemResp; +import top.wms.admin.system.model.entity.DictItemDO; +import top.wms.admin.system.model.query.DictItemQuery; +import top.wms.admin.system.model.req.DictItemReq; +import top.wms.admin.system.model.resp.DictItemResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/DictService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/DictService.java index 6679cfc..ac9d29e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/DictService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/DictService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.entity.DictDO; -import top.ysoft.admin.system.model.query.DictQuery; -import top.ysoft.admin.system.model.req.DictReq; -import top.ysoft.admin.system.model.resp.DictResp; +import top.wms.admin.system.model.entity.DictDO; +import top.wms.admin.system.model.query.DictQuery; +import top.wms.admin.system.model.req.DictReq; +import top.wms.admin.system.model.resp.DictResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/FileService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/FileService.java index b60e399..eb98cbe 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/FileService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/FileService.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import org.dromara.x.file.storage.core.FileInfo; import org.springframework.web.multipart.MultipartFile; -import top.ysoft.admin.system.model.entity.FileDO; -import top.ysoft.admin.system.model.query.FileQuery; -import top.ysoft.admin.system.model.req.FileReq; -import top.ysoft.admin.system.model.resp.file.FileResp; -import top.ysoft.admin.system.model.resp.file.FileStatisticsResp; +import top.wms.admin.system.model.entity.FileDO; +import top.wms.admin.system.model.query.FileQuery; +import top.wms.admin.system.model.req.FileReq; +import top.wms.admin.system.model.resp.file.FileResp; +import top.wms.admin.system.model.resp.file.FileStatisticsResp; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/ImportExcelService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/ImportExcelService.java index 3fd783a..80575e0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/ImportExcelService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/ImportExcelService.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import jakarta.servlet.http.HttpServletResponse; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/LogService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/LogService.java index ff3bde5..bbcbeb3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/LogService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/LogService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import jakarta.servlet.http.HttpServletResponse; -import top.ysoft.admin.system.model.query.LogQuery; -import top.ysoft.admin.system.model.resp.log.LogDetailResp; -import top.ysoft.admin.system.model.resp.log.LogResp; +import top.wms.admin.system.model.query.LogQuery; +import top.wms.admin.system.model.resp.log.LogDetailResp; +import top.wms.admin.system.model.resp.log.LogResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/MenuService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/MenuService.java index 2ca1673..6ce1349 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/MenuService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/MenuService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.entity.MenuDO; -import top.ysoft.admin.system.model.query.MenuQuery; -import top.ysoft.admin.system.model.req.MenuReq; -import top.ysoft.admin.system.model.resp.MenuResp; +import top.wms.admin.system.model.entity.MenuDO; +import top.wms.admin.system.model.query.MenuQuery; +import top.wms.admin.system.model.req.MenuReq; +import top.wms.admin.system.model.resp.MenuResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/MessageService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/MessageService.java index f61690d..c4cb819 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/MessageService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/MessageService.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.query.MessageQuery; -import top.ysoft.admin.system.model.req.MessageReq; -import top.ysoft.admin.system.model.resp.message.MessageResp; +import top.wms.admin.system.model.query.MessageQuery; +import top.wms.admin.system.model.req.MessageReq; +import top.wms.admin.system.model.resp.message.MessageResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/MessageUserService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/MessageUserService.java index 04f54ad..b6e5e1c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/MessageUserService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/MessageUserService.java @@ -1,6 +1,6 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.resp.message.MessageUnreadResp; +import top.wms.admin.system.model.resp.message.MessageUnreadResp; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/NoticeService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/NoticeService.java index a88c43c..cd2171c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/NoticeService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/NoticeService.java @@ -1,11 +1,11 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.entity.NoticeDO; -import top.ysoft.admin.system.model.query.NoticeQuery; -import top.ysoft.admin.system.model.req.NoticeReq; -import top.ysoft.admin.system.model.resp.NoticeDetailResp; -import top.ysoft.admin.system.model.resp.NoticeResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardNoticeResp; +import top.wms.admin.system.model.entity.NoticeDO; +import top.wms.admin.system.model.query.NoticeQuery; +import top.wms.admin.system.model.req.NoticeReq; +import top.wms.admin.system.model.resp.NoticeDetailResp; +import top.wms.admin.system.model.resp.NoticeResp; +import top.wms.admin.system.model.resp.dashboard.DashboardNoticeResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/OptionService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/OptionService.java index 436d184..358a18c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/OptionService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/OptionService.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.enums.OptionCategoryEnum; -import top.ysoft.admin.system.model.query.OptionQuery; -import top.ysoft.admin.system.model.req.OptionReq; -import top.ysoft.admin.system.model.req.OptionResetValueReq; -import top.ysoft.admin.system.model.resp.OptionResp; +import top.wms.admin.system.enums.OptionCategoryEnum; +import top.wms.admin.system.model.query.OptionQuery; +import top.wms.admin.system.model.req.OptionReq; +import top.wms.admin.system.model.req.OptionResetValueReq; +import top.wms.admin.system.model.resp.OptionResp; import java.util.List; import java.util.Map; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/PeopleEquipmentService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/PeopleEquipmentService.java index 9f1a703..541e325 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/PeopleEquipmentService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/PeopleEquipmentService.java @@ -1,9 +1,9 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import top.continew.starter.extension.crud.service.BaseService; -import top.ysoft.admin.system.model.query.PeopleEquipmentQuery; -import top.ysoft.admin.system.model.req.PeopleEquipmentReq; -import top.ysoft.admin.system.model.resp.PeopleEquipmentResp; +import top.wms.admin.system.model.query.PeopleEquipmentQuery; +import top.wms.admin.system.model.req.PeopleEquipmentReq; +import top.wms.admin.system.model.resp.PeopleEquipmentResp; /** * 人员设备下发信息业务接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/RoleDeptService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/RoleDeptService.java index 0d8b838..a6555aa 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/RoleDeptService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/RoleDeptService.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/RoleMenuService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/RoleMenuService.java index 5543afa..9273b06 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/RoleMenuService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/RoleMenuService.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/RoleService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/RoleService.java index 14796cb..c4abfb8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/RoleService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/RoleService.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.common.context.RoleContext; -import top.ysoft.admin.system.model.entity.RoleDO; -import top.ysoft.admin.system.model.query.RoleQuery; -import top.ysoft.admin.system.model.req.RoleReq; -import top.ysoft.admin.system.model.req.RoleUpdatePermissionReq; -import top.ysoft.admin.system.model.resp.role.RoleDetailResp; -import top.ysoft.admin.system.model.resp.role.RoleResp; +import top.wms.admin.common.context.RoleContext; +import top.wms.admin.system.model.entity.RoleDO; +import top.wms.admin.system.model.query.RoleQuery; +import top.wms.admin.system.model.req.RoleReq; +import top.wms.admin.system.model.req.RoleUpdatePermissionReq; +import top.wms.admin.system.model.resp.role.RoleDetailResp; +import top.wms.admin.system.model.resp.role.RoleResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/StorageService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/StorageService.java index edca157..fe267da 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/StorageService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/StorageService.java @@ -1,10 +1,10 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.common.model.req.CommonStatusUpdateReq; -import top.ysoft.admin.system.model.entity.StorageDO; -import top.ysoft.admin.system.model.query.StorageQuery; -import top.ysoft.admin.system.model.req.StorageReq; -import top.ysoft.admin.system.model.resp.StorageResp; +import top.wms.admin.common.model.req.CommonStatusUpdateReq; +import top.wms.admin.system.model.entity.StorageDO; +import top.wms.admin.system.model.query.StorageQuery; +import top.wms.admin.system.model.req.StorageReq; +import top.wms.admin.system.model.resp.StorageResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/UserPasswordHistoryService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/UserPasswordHistoryService.java index 06e7b10..6ecbc91 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/UserPasswordHistoryService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/UserPasswordHistoryService.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/UserRoleService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/UserRoleService.java index f76ae94..0c765c8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/UserRoleService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/UserRoleService.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; -import top.ysoft.admin.system.model.entity.UserRoleDO; -import top.ysoft.admin.system.model.query.RoleUserQuery; -import top.ysoft.admin.system.model.resp.role.RoleUserResp; +import top.wms.admin.system.model.entity.UserRoleDO; +import top.wms.admin.system.model.query.RoleUserQuery; +import top.wms.admin.system.model.resp.role.RoleUserResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/UserService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/UserService.java index 9f91962..5f2b305 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/UserService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/UserService.java @@ -1,14 +1,14 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.model.query.UserQuery; -import top.ysoft.admin.system.model.req.user.*; -import top.ysoft.admin.system.model.resp.user.UserDetailResp; -import top.ysoft.admin.system.model.resp.user.UserImportParseResp; -import top.ysoft.admin.system.model.resp.user.UserImportResp; -import top.ysoft.admin.system.model.resp.user.UserResp; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.model.query.UserQuery; +import top.wms.admin.system.model.req.user.*; +import top.wms.admin.system.model.resp.user.UserDetailResp; +import top.wms.admin.system.model.resp.user.UserImportParseResp; +import top.wms.admin.system.model.resp.user.UserImportResp; +import top.wms.admin.system.model.resp.user.UserResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/UserSocialService.java b/wms-module-system/src/main/java/top/wms/admin/system/service/UserSocialService.java index 6d0cf9d..5e8682c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/UserSocialService.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/UserSocialService.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.system.service; +package top.wms.admin.system.service; import me.zhyd.oauth.model.AuthUser; -import top.ysoft.admin.system.model.entity.UserSocialDO; +import top.wms.admin.system.model.entity.UserSocialDO; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ClientServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ClientServiceImpl.java index 8fbb375..ed25c9b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ClientServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ClientServiceImpl.java @@ -1,17 +1,17 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.crypto.digest.DigestUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.auth.model.query.OnlineUserQuery; -import top.ysoft.admin.auth.service.OnlineUserService; -import top.ysoft.admin.system.mapper.ClientMapper; -import top.ysoft.admin.system.model.entity.ClientDO; -import top.ysoft.admin.system.model.query.ClientQuery; -import top.ysoft.admin.system.model.req.ClientReq; -import top.ysoft.admin.system.model.resp.ClientResp; -import top.ysoft.admin.system.service.ClientService; +import top.wms.admin.auth.model.query.OnlineUserQuery; +import top.wms.admin.auth.service.OnlineUserService; +import top.wms.admin.system.mapper.ClientMapper; +import top.wms.admin.system.model.entity.ClientDO; +import top.wms.admin.system.model.query.ClientQuery; +import top.wms.admin.system.model.req.ClientReq; +import top.wms.admin.system.model.resp.ClientResp; +import top.wms.admin.system.service.ClientService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.extension.crud.service.BaseServiceImpl; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ConfigServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ConfigServiceImpl.java index a5870de..bf285da 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ConfigServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ConfigServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import com.alicp.jetcache.anno.Cached; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,13 +7,13 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.system.mapper.ConfigMapper; -import top.ysoft.admin.system.model.entity.ConfigDO; -import top.ysoft.admin.system.model.query.ConfigQuery; -import top.ysoft.admin.system.model.req.ConfigReq; -import top.ysoft.admin.system.model.resp.ConfigResp; -import top.ysoft.admin.system.service.ConfigService; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.system.mapper.ConfigMapper; +import top.wms.admin.system.model.entity.ConfigDO; +import top.wms.admin.system.model.query.ConfigQuery; +import top.wms.admin.system.model.req.ConfigReq; +import top.wms.admin.system.model.resp.ConfigResp; +import top.wms.admin.system.service.ConfigService; import java.time.Duration; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DashboardServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DashboardServiceImpl.java index 4e5ab7c..e7ce3e9 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DashboardServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DashboardServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateField; @@ -13,13 +13,13 @@ import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; -import top.ysoft.admin.system.mapper.LogMapper; -import top.ysoft.admin.system.model.resp.dashboard.DashboardAccessTrendResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardNoticeResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardOverviewCommonResp; -import top.ysoft.admin.system.service.DashboardService; -import top.ysoft.admin.system.service.NoticeService; +import top.wms.admin.system.mapper.LogMapper; +import top.wms.admin.system.model.resp.dashboard.DashboardAccessTrendResp; +import top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp; +import top.wms.admin.system.model.resp.dashboard.DashboardNoticeResp; +import top.wms.admin.system.model.resp.dashboard.DashboardOverviewCommonResp; +import top.wms.admin.system.service.DashboardService; +import top.wms.admin.system.service.NoticeService; import top.continew.starter.core.constant.StringConstants; import java.io.IOException; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DeptServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DeptServiceImpl.java index 5f90bf9..fed95ce 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DeptServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DeptServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.mapper.DeptMapper; -import top.ysoft.admin.system.model.entity.DeptDO; -import top.ysoft.admin.system.model.query.DeptQuery; -import top.ysoft.admin.system.model.req.DeptReq; -import top.ysoft.admin.system.model.resp.DeptResp; -import top.ysoft.admin.system.service.DeptService; -import top.ysoft.admin.system.service.RoleDeptService; -import top.ysoft.admin.system.service.UserService; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.mapper.DeptMapper; +import top.wms.admin.system.model.entity.DeptDO; +import top.wms.admin.system.model.query.DeptQuery; +import top.wms.admin.system.model.req.DeptReq; +import top.wms.admin.system.model.resp.DeptResp; +import top.wms.admin.system.service.DeptService; +import top.wms.admin.system.service.RoleDeptService; +import top.wms.admin.system.service.UserService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.data.core.enums.DatabaseType; import top.continew.starter.data.core.util.MetaUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DictItemServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DictItemServiceImpl.java index 400e184..2b4c1b6 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DictItemServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DictItemServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ClassUtil; @@ -7,13 +7,13 @@ import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.system.mapper.DictItemMapper; -import top.ysoft.admin.system.model.entity.DictItemDO; -import top.ysoft.admin.system.model.query.DictItemQuery; -import top.ysoft.admin.system.model.req.DictItemReq; -import top.ysoft.admin.system.model.resp.DictItemResp; -import top.ysoft.admin.system.service.DictItemService; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.system.mapper.DictItemMapper; +import top.wms.admin.system.model.entity.DictItemDO; +import top.wms.admin.system.model.query.DictItemQuery; +import top.wms.admin.system.model.req.DictItemReq; +import top.wms.admin.system.model.resp.DictItemResp; +import top.wms.admin.system.service.DictItemService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.autoconfigure.project.ProjectProperties; import top.continew.starter.core.constant.StringConstants; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DictServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DictServiceImpl.java index 992afa4..8a7b427 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DictServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/DictServiceImpl.java @@ -1,14 +1,14 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.system.mapper.DictMapper; -import top.ysoft.admin.system.model.entity.DictDO; -import top.ysoft.admin.system.model.query.DictQuery; -import top.ysoft.admin.system.model.req.DictReq; -import top.ysoft.admin.system.model.resp.DictResp; -import top.ysoft.admin.system.service.DictItemService; -import top.ysoft.admin.system.service.DictService; +import top.wms.admin.system.mapper.DictMapper; +import top.wms.admin.system.model.entity.DictDO; +import top.wms.admin.system.model.query.DictQuery; +import top.wms.admin.system.model.req.DictReq; +import top.wms.admin.system.model.resp.DictResp; +import top.wms.admin.system.service.DictItemService; +import top.wms.admin.system.service.DictService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java index 41c452c..45bb7c5 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.file.FileNameUtil; @@ -14,16 +14,16 @@ import org.dromara.x.file.storage.core.ProgressListener; import org.dromara.x.file.storage.core.upload.UploadPretreatment; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import top.ysoft.admin.system.enums.FileTypeEnum; -import top.ysoft.admin.system.mapper.FileMapper; -import top.ysoft.admin.system.model.entity.FileDO; -import top.ysoft.admin.system.model.entity.StorageDO; -import top.ysoft.admin.system.model.query.FileQuery; -import top.ysoft.admin.system.model.req.FileReq; -import top.ysoft.admin.system.model.resp.file.FileResp; -import top.ysoft.admin.system.model.resp.file.FileStatisticsResp; -import top.ysoft.admin.system.service.FileService; -import top.ysoft.admin.system.service.StorageService; +import top.wms.admin.system.enums.FileTypeEnum; +import top.wms.admin.system.mapper.FileMapper; +import top.wms.admin.system.model.entity.FileDO; +import top.wms.admin.system.model.entity.StorageDO; +import top.wms.admin.system.model.query.FileQuery; +import top.wms.admin.system.model.req.FileReq; +import top.wms.admin.system.model.resp.file.FileResp; +import top.wms.admin.system.model.resp.file.FileStatisticsResp; +import top.wms.admin.system.service.FileService; +import top.wms.admin.system.service.StorageService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.StrUtils; import top.continew.starter.core.util.URLUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ImportExcelServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ImportExcelServiceImpl.java index acd5a03..8278fb6 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ImportExcelServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/ImportExcelServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.CharsetUtil; @@ -7,7 +7,7 @@ import cn.hutool.json.JSONUtil; import jakarta.servlet.http.HttpServletResponse; import net.dreamlu.mica.core.result.R; import top.continew.starter.web.util.FileUploadUtils; -import top.ysoft.admin.system.service.ImportExcelService; +import top.wms.admin.system.service.ImportExcelService; import java.io.IOException; import lombok.extern.slf4j.Slf4j; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/LogServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/LogServiceImpl.java index a6ff9da..bea9cbe 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/LogServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/LogServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.bean.BeanUtil; @@ -11,15 +11,15 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.mapper.LogMapper; -import top.ysoft.admin.system.model.entity.LogDO; -import top.ysoft.admin.system.model.query.LogQuery; -import top.ysoft.admin.system.model.resp.log.LogDetailResp; -import top.ysoft.admin.system.model.resp.log.LogResp; -import top.ysoft.admin.system.model.resp.log.LoginLogExportResp; -import top.ysoft.admin.system.model.resp.log.OperationLogExportResp; -import top.ysoft.admin.system.service.LogService; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.mapper.LogMapper; +import top.wms.admin.system.model.entity.LogDO; +import top.wms.admin.system.model.query.LogQuery; +import top.wms.admin.system.model.resp.log.LogDetailResp; +import top.wms.admin.system.model.resp.log.LogResp; +import top.wms.admin.system.model.resp.log.LoginLogExportResp; +import top.wms.admin.system.model.resp.log.OperationLogExportResp; +import top.wms.admin.system.service.LogService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.data.mp.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MenuServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MenuServiceImpl.java index a0c0122..d3b4faf 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MenuServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MenuServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; @@ -6,16 +6,16 @@ import com.alicp.jetcache.anno.Cached; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.system.enums.MenuTypeEnum; -import top.ysoft.admin.system.mapper.MenuMapper; -import top.ysoft.admin.system.model.entity.MenuDO; -import top.ysoft.admin.system.model.query.MenuQuery; -import top.ysoft.admin.system.model.req.MenuReq; -import top.ysoft.admin.system.model.resp.MenuResp; -import top.ysoft.admin.system.service.MenuService; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.system.enums.MenuTypeEnum; +import top.wms.admin.system.mapper.MenuMapper; +import top.wms.admin.system.model.entity.MenuDO; +import top.wms.admin.system.model.query.MenuQuery; +import top.wms.admin.system.model.req.MenuReq; +import top.wms.admin.system.model.resp.MenuResp; +import top.wms.admin.system.service.MenuService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.validation.CheckUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MessageServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MessageServiceImpl.java index a201625..51ffbe8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MessageServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MessageServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.bean.BeanUtil; @@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.ysoft.admin.system.mapper.MessageMapper; -import top.ysoft.admin.system.model.entity.MessageDO; -import top.ysoft.admin.system.model.query.MessageQuery; -import top.ysoft.admin.system.model.req.MessageReq; -import top.ysoft.admin.system.model.resp.message.MessageResp; -import top.ysoft.admin.system.service.MessageService; -import top.ysoft.admin.system.service.MessageUserService; +import top.wms.admin.system.mapper.MessageMapper; +import top.wms.admin.system.model.entity.MessageDO; +import top.wms.admin.system.model.query.MessageQuery; +import top.wms.admin.system.model.req.MessageReq; +import top.wms.admin.system.model.resp.message.MessageResp; +import top.wms.admin.system.service.MessageService; +import top.wms.admin.system.service.MessageUserService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.data.mp.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MessageUserServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MessageUserServiceImpl.java index 8ec301d..5119955 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MessageUserServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/MessageUserServiceImpl.java @@ -1,14 +1,14 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.system.enums.MessageTypeEnum; -import top.ysoft.admin.system.mapper.MessageUserMapper; -import top.ysoft.admin.system.model.entity.MessageUserDO; -import top.ysoft.admin.system.model.resp.message.MessageTypeUnreadResp; -import top.ysoft.admin.system.model.resp.message.MessageUnreadResp; -import top.ysoft.admin.system.service.MessageUserService; +import top.wms.admin.system.enums.MessageTypeEnum; +import top.wms.admin.system.mapper.MessageUserMapper; +import top.wms.admin.system.model.entity.MessageUserDO; +import top.wms.admin.system.model.resp.message.MessageTypeUnreadResp; +import top.wms.admin.system.model.resp.message.MessageUnreadResp; +import top.wms.admin.system.service.MessageUserService; import top.continew.starter.core.validation.CheckUtils; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/NoticeServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/NoticeServiceImpl.java index da7b22a..e60a13e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/NoticeServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/NoticeServiceImpl.java @@ -1,16 +1,16 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.system.mapper.NoticeMapper; -import top.ysoft.admin.system.model.entity.NoticeDO; -import top.ysoft.admin.system.model.query.NoticeQuery; -import top.ysoft.admin.system.model.req.NoticeReq; -import top.ysoft.admin.system.model.resp.NoticeDetailResp; -import top.ysoft.admin.system.model.resp.NoticeResp; -import top.ysoft.admin.system.model.resp.dashboard.DashboardNoticeResp; -import top.ysoft.admin.system.service.NoticeService; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.system.mapper.NoticeMapper; +import top.wms.admin.system.model.entity.NoticeDO; +import top.wms.admin.system.model.query.NoticeQuery; +import top.wms.admin.system.model.req.NoticeReq; +import top.wms.admin.system.model.resp.NoticeDetailResp; +import top.wms.admin.system.model.resp.NoticeResp; +import top.wms.admin.system.model.resp.dashboard.DashboardNoticeResp; +import top.wms.admin.system.service.NoticeService; import top.continew.starter.extension.crud.service.BaseServiceImpl; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/OptionServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/OptionServiceImpl.java index 1bdb47b..cf6e61b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/OptionServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/OptionServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -9,16 +9,16 @@ import com.alicp.jetcache.anno.Cached; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.system.enums.OptionCategoryEnum; -import top.ysoft.admin.system.enums.PasswordPolicyEnum; -import top.ysoft.admin.system.mapper.OptionMapper; -import top.ysoft.admin.system.model.entity.OptionDO; -import top.ysoft.admin.system.model.query.OptionQuery; -import top.ysoft.admin.system.model.req.OptionReq; -import top.ysoft.admin.system.model.req.OptionResetValueReq; -import top.ysoft.admin.system.model.resp.OptionResp; -import top.ysoft.admin.system.service.OptionService; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.system.enums.OptionCategoryEnum; +import top.wms.admin.system.enums.PasswordPolicyEnum; +import top.wms.admin.system.mapper.OptionMapper; +import top.wms.admin.system.model.entity.OptionDO; +import top.wms.admin.system.model.query.OptionQuery; +import top.wms.admin.system.model.req.OptionReq; +import top.wms.admin.system.model.req.OptionResetValueReq; +import top.wms.admin.system.model.resp.OptionResp; +import top.wms.admin.system.service.OptionService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.validation.CheckUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/PeopleEquipmentServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/PeopleEquipmentServiceImpl.java index abe7d59..6d6e18f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/PeopleEquipmentServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/PeopleEquipmentServiceImpl.java @@ -1,16 +1,16 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.ysoft.admin.system.mapper.PeopleEquipmentMapper; -import top.ysoft.admin.system.model.entity.PeopleEquipmentDO; -import top.ysoft.admin.system.model.query.PeopleEquipmentQuery; -import top.ysoft.admin.system.model.req.PeopleEquipmentReq; -import top.ysoft.admin.system.model.resp.PeopleEquipmentResp; -import top.ysoft.admin.system.service.PeopleEquipmentService; +import top.wms.admin.system.mapper.PeopleEquipmentMapper; +import top.wms.admin.system.model.entity.PeopleEquipmentDO; +import top.wms.admin.system.model.query.PeopleEquipmentQuery; +import top.wms.admin.system.model.req.PeopleEquipmentReq; +import top.wms.admin.system.model.resp.PeopleEquipmentResp; +import top.wms.admin.system.service.PeopleEquipmentService; /** * 人员设备下发信息业务实现 diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleDeptServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleDeptServiceImpl.java index d37b2af..e91d011 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleDeptServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleDeptServiceImpl.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.ysoft.admin.system.mapper.RoleDeptMapper; -import top.ysoft.admin.system.model.entity.RoleDeptDO; -import top.ysoft.admin.system.service.RoleDeptService; +import top.wms.admin.system.mapper.RoleDeptMapper; +import top.wms.admin.system.model.entity.RoleDeptDO; +import top.wms.admin.system.service.RoleDeptService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleMenuServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleMenuServiceImpl.java index 03878d3..ed70f84 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleMenuServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleMenuServiceImpl.java @@ -1,12 +1,12 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.ysoft.admin.system.mapper.RoleMenuMapper; -import top.ysoft.admin.system.model.entity.RoleMenuDO; -import top.ysoft.admin.system.service.RoleMenuService; +import top.wms.admin.system.mapper.RoleMenuMapper; +import top.wms.admin.system.model.entity.RoleMenuDO; +import top.wms.admin.system.service.RoleMenuService; import java.util.ArrayList; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleServiceImpl.java index fee7767..231160f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/RoleServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; @@ -9,22 +9,22 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.common.context.RoleContext; -import top.ysoft.admin.common.context.UserContext; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.common.enums.DataScopeEnum; -import top.ysoft.admin.system.mapper.RoleMapper; -import top.ysoft.admin.system.model.entity.RoleDO; -import top.ysoft.admin.system.model.query.RoleQuery; -import top.ysoft.admin.system.model.req.RoleReq; -import top.ysoft.admin.system.model.req.RoleUpdatePermissionReq; -import top.ysoft.admin.system.model.resp.MenuResp; -import top.ysoft.admin.system.model.resp.role.RoleDetailResp; -import top.ysoft.admin.system.model.resp.role.RoleResp; -import top.ysoft.admin.system.service.*; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.common.context.RoleContext; +import top.wms.admin.common.context.UserContext; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.common.enums.DataScopeEnum; +import top.wms.admin.system.mapper.RoleMapper; +import top.wms.admin.system.model.entity.RoleDO; +import top.wms.admin.system.model.query.RoleQuery; +import top.wms.admin.system.model.req.RoleReq; +import top.wms.admin.system.model.req.RoleUpdatePermissionReq; +import top.wms.admin.system.model.resp.MenuResp; +import top.wms.admin.system.model.resp.role.RoleDetailResp; +import top.wms.admin.system.model.resp.role.RoleResp; +import top.wms.admin.system.service.*; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.extension.crud.service.BaseServiceImpl; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/StorageServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/StorageServiceImpl.java index 1998f91..647f2fb 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/StorageServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/StorageServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.map.MapUtil; @@ -12,18 +12,18 @@ import org.dromara.x.file.storage.core.FileStorageServiceBuilder; import org.dromara.x.file.storage.core.platform.FileStorage; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.model.req.CommonStatusUpdateReq; -import top.ysoft.admin.common.util.SecureUtils; -import top.ysoft.admin.system.enums.StorageTypeEnum; -import top.ysoft.admin.system.mapper.StorageMapper; -import top.ysoft.admin.system.model.entity.StorageDO; -import top.ysoft.admin.system.model.query.StorageQuery; -import top.ysoft.admin.system.model.req.StorageReq; -import top.ysoft.admin.system.model.resp.StorageResp; -import top.ysoft.admin.system.service.FileService; -import top.ysoft.admin.system.service.StorageService; -import top.ysoft.admin.system.validation.ValidationGroup; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.model.req.CommonStatusUpdateReq; +import top.wms.admin.common.util.SecureUtils; +import top.wms.admin.system.enums.StorageTypeEnum; +import top.wms.admin.system.mapper.StorageMapper; +import top.wms.admin.system.model.entity.StorageDO; +import top.wms.admin.system.model.query.StorageQuery; +import top.wms.admin.system.model.req.StorageReq; +import top.wms.admin.system.model.resp.StorageResp; +import top.wms.admin.system.service.FileService; +import top.wms.admin.system.service.StorageService; +import top.wms.admin.system.validation.ValidationGroup; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.URLUtils; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserPasswordHistoryServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserPasswordHistoryServiceImpl.java index ae96e4c..eb9ab0b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserPasswordHistoryServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserPasswordHistoryServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.ysoft.admin.system.mapper.UserPasswordHistoryMapper; -import top.ysoft.admin.system.model.entity.UserPasswordHistoryDO; -import top.ysoft.admin.system.service.UserPasswordHistoryService; +import top.wms.admin.system.mapper.UserPasswordHistoryMapper; +import top.wms.admin.system.model.entity.UserPasswordHistoryDO; +import top.wms.admin.system.service.UserPasswordHistoryService; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserRoleServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserRoleServiceImpl.java index 97a969c..a692fcd 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserRoleServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserRoleServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.crane4j.annotation.ContainerMethod; @@ -11,13 +11,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.system.mapper.UserRoleMapper; -import top.ysoft.admin.system.model.entity.UserRoleDO; -import top.ysoft.admin.system.model.query.RoleUserQuery; -import top.ysoft.admin.system.model.resp.role.RoleUserResp; -import top.ysoft.admin.system.service.UserRoleService; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.system.mapper.UserRoleMapper; +import top.wms.admin.system.model.entity.UserRoleDO; +import top.wms.admin.system.model.query.RoleUserQuery; +import top.wms.admin.system.model.resp.role.RoleUserResp; +import top.wms.admin.system.service.UserRoleService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.data.mp.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserServiceImpl.java index 367d94e..fc1b23f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; @@ -40,29 +40,29 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import top.ysoft.admin.auth.service.OnlineUserService; -import top.ysoft.admin.common.constant.CacheConstants; -import top.ysoft.admin.common.constant.ContainerConstants; -import top.ysoft.admin.common.constant.SysConstants; -import top.ysoft.admin.common.context.UserContext; -import top.ysoft.admin.common.context.UserContextHolder; -import top.ysoft.admin.common.enums.DisEnableStatusEnum; -import top.ysoft.admin.common.enums.GenderEnum; -import top.ysoft.admin.common.service.CommonUserService; -import top.ysoft.admin.common.util.SecureUtils; -import top.ysoft.admin.system.enums.OptionCategoryEnum; -import top.ysoft.admin.system.mapper.UserMapper; -import top.ysoft.admin.system.model.entity.DeptDO; -import top.ysoft.admin.system.model.entity.RoleDO; -import top.ysoft.admin.system.model.entity.UserDO; -import top.ysoft.admin.system.model.entity.UserRoleDO; -import top.ysoft.admin.system.model.query.UserQuery; -import top.ysoft.admin.system.model.req.user.*; -import top.ysoft.admin.system.model.resp.user.UserDetailResp; -import top.ysoft.admin.system.model.resp.user.UserImportParseResp; -import top.ysoft.admin.system.model.resp.user.UserImportResp; -import top.ysoft.admin.system.model.resp.user.UserResp; -import top.ysoft.admin.system.service.*; +import top.wms.admin.auth.service.OnlineUserService; +import top.wms.admin.common.constant.CacheConstants; +import top.wms.admin.common.constant.ContainerConstants; +import top.wms.admin.common.constant.SysConstants; +import top.wms.admin.common.context.UserContext; +import top.wms.admin.common.context.UserContextHolder; +import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.wms.admin.common.enums.GenderEnum; +import top.wms.admin.common.service.CommonUserService; +import top.wms.admin.common.util.SecureUtils; +import top.wms.admin.system.enums.OptionCategoryEnum; +import top.wms.admin.system.mapper.UserMapper; +import top.wms.admin.system.model.entity.DeptDO; +import top.wms.admin.system.model.entity.RoleDO; +import top.wms.admin.system.model.entity.UserDO; +import top.wms.admin.system.model.entity.UserRoleDO; +import top.wms.admin.system.model.query.UserQuery; +import top.wms.admin.system.model.req.user.*; +import top.wms.admin.system.model.resp.user.UserDetailResp; +import top.wms.admin.system.model.resp.user.UserImportParseResp; +import top.wms.admin.system.model.resp.user.UserImportResp; +import top.wms.admin.system.model.resp.user.UserResp; +import top.wms.admin.system.service.*; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; @@ -81,8 +81,8 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static top.ysoft.admin.system.enums.ImportPolicyEnum.*; -import static top.ysoft.admin.system.enums.PasswordPolicyEnum.*; +import static top.wms.admin.system.enums.ImportPolicyEnum.*; +import static top.wms.admin.system.enums.PasswordPolicyEnum.*; /** * 用户业务实现 diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserSocialServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserSocialServiceImpl.java index 3691119..c804012 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserSocialServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/UserSocialServiceImpl.java @@ -1,13 +1,13 @@ -package top.ysoft.admin.system.service.impl; +package top.wms.admin.system.service.impl; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import me.zhyd.oauth.model.AuthUser; import org.springframework.stereotype.Service; -import top.ysoft.admin.system.enums.SocialSourceEnum; -import top.ysoft.admin.system.mapper.UserSocialMapper; -import top.ysoft.admin.system.model.entity.UserSocialDO; -import top.ysoft.admin.system.service.UserSocialService; +import top.wms.admin.system.enums.SocialSourceEnum; +import top.wms.admin.system.mapper.UserSocialMapper; +import top.wms.admin.system.model.entity.UserSocialDO; +import top.wms.admin.system.service.UserSocialService; import top.continew.starter.core.validation.CheckUtils; import java.time.LocalDateTime; diff --git a/wms-module-system/src/main/java/top/wms/admin/system/validation/ValidationGroup.java b/wms-module-system/src/main/java/top/wms/admin/system/validation/ValidationGroup.java index 4b4ca96..200221e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/system/validation/ValidationGroup.java +++ b/wms-module-system/src/main/java/top/wms/admin/system/validation/ValidationGroup.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.system.validation; +package top.wms.admin.system.validation; import jakarta.validation.groups.Default; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/BackInfo.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/BackInfo.java index 9136250..a19b181 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/BackInfo.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/BackInfo.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/BackResult.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/BackResult.java index d654d2d..43a3202 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/BackResult.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/BackResult.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/DingtalkCode.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/DingtalkCode.java index eeb4ce0..723cd57 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/DingtalkCode.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/DingtalkCode.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/DingtalkMsgVo.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/DingtalkMsgVo.java index ccd9145..5ddba78 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/DingtalkMsgVo.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/DingtalkMsgVo.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; import lombok.Getter; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/EventResult.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/EventResult.java index 8885cea..fccfdf7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/EventResult.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/EventResult.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/EwmInfo.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/EwmInfo.java index 54a0a2f..fc3520b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/EwmInfo.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/EwmInfo.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/HeartInfo.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/HeartInfo.java index 7a49886..77de26b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/HeartInfo.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/HeartInfo.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICCardWhite.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICCardWhite.java index 8b9b083..d9d48b6 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICCardWhite.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICCardWhite.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICCheckCode.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICCheckCode.java index 5f8ad07..8c5fd62 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICCheckCode.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICCheckCode.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICQueryCmd.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICQueryCmd.java index 14baacd..0e44c1f 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICQueryCmd.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICQueryCmd.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICQueryCmdPostData.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICQueryCmdPostData.java index a69c6b6..adabb24 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICQueryCmdPostData.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/ICQueryCmdPostData.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import com.alibaba.fastjson2.JSONObject; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/Person.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/Person.java index d3e661e..6e6fac2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/Person.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/Person.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import com.alibaba.fastjson2.JSONObject; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/QrCodeVo.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/QrCodeVo.java index 017cb68..cc7eb6b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/QrCodeVo.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/QrCodeVo.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import lombok.Data; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/RuleBody.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/RuleBody.java index 94d92f3..25c4eee 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/RuleBody.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/domain/RuleBody.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.domain; +package top.wms.admin.yfApi.domain; import java.util.LinkedHashMap; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/ISysYFService.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/ISysYFService.java index fcb474e..faca2c3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/ISysYFService.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/ISysYFService.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.service; +package top.wms.admin.yfApi.service; import java.util.List; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/IYFListenService.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/IYFListenService.java index 5e05a0f..92972a6 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/IYFListenService.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/IYFListenService.java @@ -1,7 +1,7 @@ -package top.ysoft.admin.yfApi.service; +package top.wms.admin.yfApi.service; -import top.ysoft.admin.yfApi.domain.BackInfo; -import top.ysoft.admin.yfApi.domain.HeartInfo; +import top.wms.admin.yfApi.domain.BackInfo; +import top.wms.admin.yfApi.domain.HeartInfo; /** * 接收宇泛推送接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/IYFPushService.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/IYFPushService.java index 0621050..714edcc 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/IYFPushService.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/IYFPushService.java @@ -1,8 +1,8 @@ -package top.ysoft.admin.yfApi.service; +package top.wms.admin.yfApi.service; import com.alibaba.fastjson.JSONObject; -import top.ysoft.admin.yfApi.domain.Person; -import top.ysoft.admin.yfApi.domain.RuleBody; +import top.wms.admin.yfApi.domain.Person; +import top.wms.admin.yfApi.domain.RuleBody; /** * 宇泛下发设备接口 diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/SysYFServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/SysYFServiceImpl.java index 2c43656..f60a75a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/SysYFServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/SysYFServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.service.impl; +package top.wms.admin.yfApi.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -9,20 +9,20 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import top.continew.starter.core.validation.CheckUtils; -import top.ysoft.admin.common.enums.OperTypeEnum; -import top.ysoft.admin.equipment.mapper.EquipmentMapper; -import top.ysoft.admin.equipment.model.entity.EquipmentDO; -import top.ysoft.admin.peopleBranch.mapper.PeopleMapper; -import top.ysoft.admin.peopleBranch.model.entity.PeopleDO; -import top.ysoft.admin.peopleDownRecord.model.req.PeopleDownReq; -import top.ysoft.admin.peopleDownRecord.service.PeopleDownService; -import top.ysoft.admin.rule.model.resp.YFPeopleResp; -import top.ysoft.admin.rule.service.RuleService; -import top.ysoft.admin.system.mapper.RuleRelationMapper; -import top.ysoft.admin.system.model.entity.RuleRelationDO; -import top.ysoft.admin.yfApi.domain.Person; -import top.ysoft.admin.yfApi.service.ISysYFService; -import top.ysoft.admin.yfApi.service.IYFPushService; +import top.wms.admin.common.enums.OperTypeEnum; +import top.wms.admin.equipment.mapper.EquipmentMapper; +import top.wms.admin.equipment.model.entity.EquipmentDO; +import top.wms.admin.peopleBranch.mapper.PeopleMapper; +import top.wms.admin.peopleBranch.model.entity.PeopleDO; +import top.wms.admin.peopleDownRecord.model.req.PeopleDownReq; +import top.wms.admin.peopleDownRecord.service.PeopleDownService; +import top.wms.admin.rule.model.resp.YFPeopleResp; +import top.wms.admin.rule.service.RuleService; +import top.wms.admin.system.mapper.RuleRelationMapper; +import top.wms.admin.system.model.entity.RuleRelationDO; +import top.wms.admin.yfApi.domain.Person; +import top.wms.admin.yfApi.service.ISysYFService; +import top.wms.admin.yfApi.service.IYFPushService; import java.util.*; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/YFListenServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/YFListenServiceImpl.java index 32f2974..e915d10 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/YFListenServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/YFListenServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.service.impl; +package top.wms.admin.yfApi.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -7,15 +7,15 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import top.continew.starter.cache.redisson.util.RedisUtils; -import top.ysoft.admin.equipment.mapper.EquipmentMapper; -import top.ysoft.admin.equipment.model.entity.EquipmentDO; -import top.ysoft.admin.peopleBranch.mapper.PeopleMapper; -import top.ysoft.admin.peopleBranch.model.entity.PeopleDO; -import top.ysoft.admin.rule.mapper.PeopleRecordMapper; -import top.ysoft.admin.rule.model.entity.PeopleRecordDO; -import top.ysoft.admin.yfApi.domain.BackInfo; -import top.ysoft.admin.yfApi.domain.HeartInfo; -import top.ysoft.admin.yfApi.service.IYFListenService; +import top.wms.admin.equipment.mapper.EquipmentMapper; +import top.wms.admin.equipment.model.entity.EquipmentDO; +import top.wms.admin.peopleBranch.mapper.PeopleMapper; +import top.wms.admin.peopleBranch.model.entity.PeopleDO; +import top.wms.admin.rule.mapper.PeopleRecordMapper; +import top.wms.admin.rule.model.entity.PeopleRecordDO; +import top.wms.admin.yfApi.domain.BackInfo; +import top.wms.admin.yfApi.domain.HeartInfo; +import top.wms.admin.yfApi.service.IYFListenService; import java.time.Duration; import java.util.Date; diff --git a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/YFPushServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/YFPushServiceImpl.java index bc8301c..f5f0837 100644 --- a/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/YFPushServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/yfApi/service/impl/YFPushServiceImpl.java @@ -1,4 +1,4 @@ -package top.ysoft.admin.yfApi.service.impl; +package top.wms.admin.yfApi.service.impl; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; @@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import top.ysoft.admin.yfApi.domain.Person; -import top.ysoft.admin.yfApi.domain.RuleBody; -import top.ysoft.admin.yfApi.service.IYFPushService; +import top.wms.admin.yfApi.domain.Person; +import top.wms.admin.yfApi.domain.RuleBody; +import top.wms.admin.yfApi.service.IYFPushService; import java.util.*; diff --git a/wms-module-system/src/main/resources/mapper/BranchMapper.xml b/wms-module-system/src/main/resources/mapper/BranchMapper.xml index 0b77cf6..9cab3a9 100644 --- a/wms-module-system/src/main/resources/mapper/BranchMapper.xml +++ b/wms-module-system/src/main/resources/mapper/BranchMapper.xml @@ -1,9 +1,9 @@ - + - WITH RECURSIVE subdepartments AS ( SELECT id, name, parent_id FROM sys_branch diff --git a/wms-module-system/src/main/resources/mapper/BranchRuleMapper.xml b/wms-module-system/src/main/resources/mapper/BranchRuleMapper.xml index c98e452..9fd760a 100644 --- a/wms-module-system/src/main/resources/mapper/BranchRuleMapper.xml +++ b/wms-module-system/src/main/resources/mapper/BranchRuleMapper.xml @@ -1,8 +1,8 @@ - + - SELECT br.branch_id branchId, br.rule_id ruleId, diff --git a/wms-module-system/src/main/resources/mapper/DeptMapper.xml b/wms-module-system/src/main/resources/mapper/DeptMapper.xml index 4001e8b..7e14587 100644 --- a/wms-module-system/src/main/resources/mapper/DeptMapper.xml +++ b/wms-module-system/src/main/resources/mapper/DeptMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/DictItemMapper.xml b/wms-module-system/src/main/resources/mapper/DictItemMapper.xml index 7493855..108771f 100644 --- a/wms-module-system/src/main/resources/mapper/DictItemMapper.xml +++ b/wms-module-system/src/main/resources/mapper/DictItemMapper.xml @@ -1,6 +1,6 @@ - + + + - SELECT er.people_id, er.equipment_id, diff --git a/wms-module-system/src/main/resources/mapper/GroupMapper.xml b/wms-module-system/src/main/resources/mapper/GroupMapper.xml index 085af3d..f25b07e 100644 --- a/wms-module-system/src/main/resources/mapper/GroupMapper.xml +++ b/wms-module-system/src/main/resources/mapper/GroupMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/LogMapper.xml b/wms-module-system/src/main/resources/mapper/LogMapper.xml index abfa05a..045d9c1 100644 --- a/wms-module-system/src/main/resources/mapper/LogMapper.xml +++ b/wms-module-system/src/main/resources/mapper/LogMapper.xml @@ -1,7 +1,7 @@ - - SELECT t1.id, t1.description, @@ -21,7 +21,7 @@ ${ew.customSqlSegment} - SELECT t1.id, t1.description, @@ -41,14 +41,14 @@ ${ew.customSqlSegment} - SELECT (SELECT COUNT(*) FROM sys_log) AS total, (SELECT COUNT(*) FROM sys_log WHERE create_time >= CURDATE() AND create_time < DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today, (SELECT COUNT(*) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time < CURDATE()) AS yesterday - SELECT (SELECT COUNT(DISTINCT ip) FROM sys_log) AS total, (SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURDATE() AND create_time < DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today, @@ -56,7 +56,7 @@ - SELECT CASE WHEN POSITION(' ' IN address) > 0 THEN SUBSTRING(address FROM 1 FOR POSITION(' ' IN address) - 1) @@ -96,7 +96,7 @@ SELECT DISTINCT t1.permission FROM sys_menu AS t1 @@ -13,7 +13,7 @@ AND t1.permission IS NOT NULL - SELECT t1.* FROM sys_menu AS t1 LEFT JOIN sys_role_menu AS t2 ON t2.menu_id = t1.id diff --git a/wms-module-system/src/main/resources/mapper/MessageMapper.xml b/wms-module-system/src/main/resources/mapper/MessageMapper.xml index edac0e9..b3ec9a3 100644 --- a/wms-module-system/src/main/resources/mapper/MessageMapper.xml +++ b/wms-module-system/src/main/resources/mapper/MessageMapper.xml @@ -1,7 +1,7 @@ - - SELECT t1.*, t2.user_id, diff --git a/wms-module-system/src/main/resources/mapper/MessageUserMapper.xml b/wms-module-system/src/main/resources/mapper/MessageUserMapper.xml index a28d168..92d0ba2 100644 --- a/wms-module-system/src/main/resources/mapper/MessageUserMapper.xml +++ b/wms-module-system/src/main/resources/mapper/MessageUserMapper.xml @@ -1,6 +1,6 @@ - + + resultType="top.wms.admin.system.model.resp.dashboard.DashboardNoticeResp"> SELECT id, title, type FROM sys_notice diff --git a/wms-module-system/src/main/resources/mapper/PeopleDownMapper.xml b/wms-module-system/src/main/resources/mapper/PeopleDownMapper.xml index 28d9d90..ef8ffd7 100644 --- a/wms-module-system/src/main/resources/mapper/PeopleDownMapper.xml +++ b/wms-module-system/src/main/resources/mapper/PeopleDownMapper.xml @@ -1,8 +1,8 @@ - + - + INSERT INTO equipment_down_record ( people_id, equipment_id, @@ -33,7 +33,7 @@ oper_type = values(oper_type) - SELECT sp.name peopleName, se.name equipmentName, @@ -49,7 +49,7 @@ ${ew.getCustomSqlSegment} - SELECT pd.*, sp.name peopleName, diff --git a/wms-module-system/src/main/resources/mapper/PeopleEquipmentMapper.xml b/wms-module-system/src/main/resources/mapper/PeopleEquipmentMapper.xml index 00dd594..5722e05 100644 --- a/wms-module-system/src/main/resources/mapper/PeopleEquipmentMapper.xml +++ b/wms-module-system/src/main/resources/mapper/PeopleEquipmentMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/PeopleMapper.xml b/wms-module-system/src/main/resources/mapper/PeopleMapper.xml index 5886517..55966d8 100644 --- a/wms-module-system/src/main/resources/mapper/PeopleMapper.xml +++ b/wms-module-system/src/main/resources/mapper/PeopleMapper.xml @@ -1,8 +1,8 @@ - + - select p.`name`, p.sex, @@ -17,7 +17,7 @@ ${ew.getCustomSqlSegment} - select p.*, b.name as branch_name @@ -26,7 +26,7 @@ ${ew.getCustomSqlSegment} - select p.*, b.name as branch_name @@ -35,7 +35,7 @@ ${ew.getCustomSqlSegment} - select p.`name`, p.phone, diff --git a/wms-module-system/src/main/resources/mapper/PeopleRecordMapper.xml b/wms-module-system/src/main/resources/mapper/PeopleRecordMapper.xml index ef1802f..864e9dc 100644 --- a/wms-module-system/src/main/resources/mapper/PeopleRecordMapper.xml +++ b/wms-module-system/src/main/resources/mapper/PeopleRecordMapper.xml @@ -1,8 +1,8 @@ - + - select spr.id, spr.people_id, spr.equipment_id, spr.device_ip, spr.admit_guid, spr.rec_mode, spr.file_path, spr.show_time, spr.show_date, spr.alive_type, spr.rec_score, spr.device_no, spr.device_version, spr.source, spr.type, spr.card_no, spr.device_name, spr.rec_type, spr.result, spr.permission_time_type, spr.pass_time_type, spr.rec_mode_type, spr.storage_id, spr.timestamp, spr.admit_name, spr.remark, spr.create_user, spr.create_time, spr.update_user, spr.update_time, diff --git a/wms-module-system/src/main/resources/mapper/PointMapper.xml b/wms-module-system/src/main/resources/mapper/PointMapper.xml index 85cdc65..35aac55 100644 --- a/wms-module-system/src/main/resources/mapper/PointMapper.xml +++ b/wms-module-system/src/main/resources/mapper/PointMapper.xml @@ -1,6 +1,6 @@ - + SELECT @@ -18,7 +18,7 @@ LEFT JOIN sys_space AS t2 ON t2.id = t1.space_id - ${ew.customSqlSegment} diff --git a/wms-module-system/src/main/resources/mapper/ProductMapper.xml b/wms-module-system/src/main/resources/mapper/ProductMapper.xml index 2864de4..50cafc6 100644 --- a/wms-module-system/src/main/resources/mapper/ProductMapper.xml +++ b/wms-module-system/src/main/resources/mapper/ProductMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/RechargeRecordMapper.xml b/wms-module-system/src/main/resources/mapper/RechargeRecordMapper.xml index 474373e..75fdd07 100644 --- a/wms-module-system/src/main/resources/mapper/RechargeRecordMapper.xml +++ b/wms-module-system/src/main/resources/mapper/RechargeRecordMapper.xml @@ -1,8 +1,8 @@ - + - SELECT r.id, r.account_id, @@ -30,7 +30,7 @@ ${ew.getCustomSqlSegment} - SELECT r.consume_money consumeMoney, ifnull(r.emp_id, p.gh) empId, diff --git a/wms-module-system/src/main/resources/mapper/RecordMapper.xml b/wms-module-system/src/main/resources/mapper/RecordMapper.xml index e5ee10c..eeb371e 100644 --- a/wms-module-system/src/main/resources/mapper/RecordMapper.xml +++ b/wms-module-system/src/main/resources/mapper/RecordMapper.xml @@ -1,8 +1,8 @@ - + - SELECT r.*, p.`name` accountName, @@ -15,7 +15,7 @@ ${ew.getCustomSqlSegment} - SELECT r.*, p.`name` accountName, diff --git a/wms-module-system/src/main/resources/mapper/ReportMapper.xml b/wms-module-system/src/main/resources/mapper/ReportMapper.xml index 82c90b6..1b203e9 100644 --- a/wms-module-system/src/main/resources/mapper/ReportMapper.xml +++ b/wms-module-system/src/main/resources/mapper/ReportMapper.xml @@ -1,9 +1,9 @@ - + - SELECT ct.`name` AS merchant, e.`name` AS equipmentName, @@ -30,7 +30,7 @@ GROUP BY cr.dev_id - SELECT sum(CASE WHEN cr.consume_type = 0 THEN cr.consume_money ELSE 0 END) AS unitPriceAmount, sum(CASE WHEN cr.consume_type = 0 THEN 1 ELSE 0 END) AS unitPriceCount, @@ -52,7 +52,7 @@ - SELECT ct.`name` AS merchant, e.`name` AS equipmentName, @@ -83,7 +83,7 @@ GROUP BY cr.dev_id,cti.tmrtype - SELECT b.`name` AS branchName, sum(CASE WHEN cr.consume_type = 0 THEN cr.consume_money ELSE 0 END) AS unitPriceAmount, @@ -111,7 +111,7 @@ GROUP BY b.id - SELECT p.`name` AS peopleName, b.`name` AS branchName, @@ -167,7 +167,7 @@ - SELECT p.`name` AS peopleName, b.`name` AS branchName, diff --git a/wms-module-system/src/main/resources/mapper/RoleMapper.xml b/wms-module-system/src/main/resources/mapper/RoleMapper.xml index 3755911..23e1f43 100644 --- a/wms-module-system/src/main/resources/mapper/RoleMapper.xml +++ b/wms-module-system/src/main/resources/mapper/RoleMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/RoleMenuMapper.xml b/wms-module-system/src/main/resources/mapper/RoleMenuMapper.xml index a39262a..30c501b 100644 --- a/wms-module-system/src/main/resources/mapper/RoleMenuMapper.xml +++ b/wms-module-system/src/main/resources/mapper/RoleMenuMapper.xml @@ -1,6 +1,6 @@ - + + - SELECT er.rule_id ruleId, er.equipment_id equipmentId, diff --git a/wms-module-system/src/main/resources/mapper/RuleRelationMapper.xml b/wms-module-system/src/main/resources/mapper/RuleRelationMapper.xml index cd39489..ab80cba 100644 --- a/wms-module-system/src/main/resources/mapper/RuleRelationMapper.xml +++ b/wms-module-system/src/main/resources/mapper/RuleRelationMapper.xml @@ -1,9 +1,9 @@ - + - + DELETE FROM equipment_rule_relation WHERE 1=1 diff --git a/wms-module-system/src/main/resources/mapper/SpaceMapper.xml b/wms-module-system/src/main/resources/mapper/SpaceMapper.xml index 53f218c..ecf31b7 100644 --- a/wms-module-system/src/main/resources/mapper/SpaceMapper.xml +++ b/wms-module-system/src/main/resources/mapper/SpaceMapper.xml @@ -1,9 +1,9 @@ - + - WITH RECURSIVE subdepartments AS ( SELECT id, name, parent_id FROM sys_space diff --git a/wms-module-system/src/main/resources/mapper/TenantMapper.xml b/wms-module-system/src/main/resources/mapper/TenantMapper.xml index 1c0c98b..2109b35 100644 --- a/wms-module-system/src/main/resources/mapper/TenantMapper.xml +++ b/wms-module-system/src/main/resources/mapper/TenantMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/TimeIntervalMapper.xml b/wms-module-system/src/main/resources/mapper/TimeIntervalMapper.xml index dbc5379..f83e04e 100644 --- a/wms-module-system/src/main/resources/mapper/TimeIntervalMapper.xml +++ b/wms-module-system/src/main/resources/mapper/TimeIntervalMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/UserMapper.xml b/wms-module-system/src/main/resources/mapper/UserMapper.xml index 102b80e..fb0c809 100644 --- a/wms-module-system/src/main/resources/mapper/UserMapper.xml +++ b/wms-module-system/src/main/resources/mapper/UserMapper.xml @@ -1,6 +1,6 @@ - + SELECT @@ -26,12 +26,12 @@ LEFT JOIN sys_dept AS t2 ON t2.id = t1.dept_id - ${ew.customSqlSegment} - ${ew.customSqlSegment} diff --git a/wms-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml b/wms-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml index 08fda30..d82044c 100644 --- a/wms-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml +++ b/wms-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml @@ -1,6 +1,6 @@ - + DELETE t1 FROM sys_user_password_history AS t1 LEFT JOIN ( diff --git a/wms-module-system/src/main/resources/mapper/UserRoleMapper.xml b/wms-module-system/src/main/resources/mapper/UserRoleMapper.xml index c4cc9dd..f01b4e9 100644 --- a/wms-module-system/src/main/resources/mapper/UserRoleMapper.xml +++ b/wms-module-system/src/main/resources/mapper/UserRoleMapper.xml @@ -1,8 +1,8 @@ - + - SELECT t1.*, t2.nickname, diff --git a/wms-module-system/src/main/resources/mapper/UserSocialMapper.xml b/wms-module-system/src/main/resources/mapper/UserSocialMapper.xml index 18c5ea4..4fee4e7 100644 --- a/wms-module-system/src/main/resources/mapper/UserSocialMapper.xml +++ b/wms-module-system/src/main/resources/mapper/UserSocialMapper.xml @@ -1,8 +1,8 @@ - +