From c358c16de2415513a12bcfb3ef7550c5216ed0f5 Mon Sep 17 00:00:00 2001 From: wangziyangyang <707231019@qq.com> Date: Sat, 14 Mar 2020 08:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=85=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- {sparchetype => mes}/.gitignore | 0 {sparchetype => mes}/mvnw | 0 {sparchetype => mes}/mvnw.cmd | 0 {sparchetype => mes}/pom.xml | 0 .../src/main/docker/Dockerfile | 0 .../mes}/SparchetypeApplication.java | 4 ++-- .../controller/TableNameDataController.java | 14 ++++++------ .../mes}/basedata/common/dto/CommonDto.java | 4 ++-- .../mapper/QueryTableNameDataMapper.java | 9 ++++---- .../common/request/QueryTableNameDataReq.java | 4 ++-- .../common/service/TableNameDataService.java | 8 +++---- .../impl/TableNameDataServiceImpl.java | 18 ++++++++-------- .../controller/SpTableManagerController.java | 18 ++++++++-------- .../SpTableManagerItemController.java | 10 ++++----- .../mes}/basedata/dto/SpTableManagerDto.java | 6 +++--- .../mes}/basedata/entity/SpTableManager.java | 6 ++---- .../basedata/entity/SpTableManagerItem.java | 4 ++-- .../mapper/SpTableManagerItemMapper.java | 4 ++-- .../basedata/mapper/SpTableManagerMapper.java | 6 +++--- .../basedata/request/SpTableManagerReq.java | 9 ++++++++ .../service/ISpTableManagerItemService.java | 4 ++-- .../service/ISpTableManagerService.java | 6 +++--- .../impl/SpTableManagerItemServiceImpl.java | 8 +++---- .../impl/SpTableManagerServiceImpl.java | 11 +++++----- .../mes}/common/BaseController.java | 4 ++-- .../wangziyang/mes}/common/BaseEntity.java | 2 +- .../wangziyang/mes}/common/BasePageReq.java | 2 +- .../com/wangziyang/mes}/common/Result.java | 2 +- .../mes}/common/advice/ExceptionAdvice.java | 6 +++--- .../common/advice/MyErrorViewResolver.java | 2 +- .../mes}/common/config/JsonConfig.java | 2 +- .../mes}/common/config/MybatisPlusConfig.java | 4 ++-- .../config/ShiroTagsFreeMarkerConfig.java | 2 +- .../common/config/SpMetaObjectHandler.java | 4 ++-- .../controller/admin/CommonController.java | 2 +- .../mes}/common/enums/CommonEnum.java | 2 +- .../wangziyang/mes}/common/util/ByteUtil.java | 2 +- .../mes}/common/util/CodeGenerator.java | 8 +++---- .../wangziyang/mes}/common/util/HashUtil.java | 2 +- .../wangziyang/mes}/common/util/HttpUtil.java | 2 +- .../wangziyang/mes}/common/util/IdUtil.java | 2 +- .../util/RandomVerificationCodeUtil.java | 2 +- .../wangziyang/mes}/common/util/TreeUtil.java | 4 ++-- .../company/client/CompanyController.java | 2 +- .../com/wangziyang/mes}/package-info.java | 2 +- .../mes/system/config/package-info.java | 4 ++++ .../mes}/system/config/shiro/RedisCache.java | 2 +- .../config/shiro/RedisCacheManager.java | 2 +- .../system/config/shiro/RedisManager.java | 2 +- .../system/config/shiro/RedisSessionDAO.java | 2 +- .../shiro/RetryLimitCredentialsMatcher.java | 2 +- .../system/config/shiro/SerializeUtils.java | 2 +- .../mes}/system/config/shiro/ShiroConfig.java | 2 +- .../mes}/system/config/shiro/ShiroRealm.java | 12 +++++------ .../config/shiro/SpLoginFormFilter.java | 4 ++-- .../config/shiro/SpSessionListener.java | 2 +- .../config/shiro/SpUsernamePasswordToken.java | 2 +- .../system/config/swagger/SwaggerConfig.java | 2 +- .../admin/SysDepartmentController.java | 14 ++++++------ .../controller/admin/SysDictController.java | 12 +++++------ .../controller/admin/SysLoginController.java | 8 +++---- .../controller/admin/SysMenuController.java | 14 ++++++------ .../controller/admin/SysRoleController.java | 12 +++++------ .../controller/admin/SysToolController.java | 4 ++-- .../controller/admin/SysUserController.java | 18 ++++++++-------- .../controller/client/SysLoginController.java | 8 +++---- .../wangziyang/mes/system/dto/SysDictDTO.java | 10 +++++++++ .../mes}/system/dto/SysMenuDTO.java | 4 ++-- .../mes}/system/dto/SysRoleDTO.java | 4 ++-- .../mes}/system/dto/SysUserDTO.java | 4 ++-- .../mes}/system/entity/SysDepartment.java | 4 ++-- .../mes}/system/entity/SysDict.java | 4 ++-- .../mes}/system/entity/SysMenu.java | 4 ++-- .../mes}/system/entity/SysRole.java | 4 ++-- .../mes}/system/entity/SysRoleMenu.java | 4 ++-- .../mes}/system/entity/SysUser.java | 4 ++-- .../mes}/system/entity/SysUserRole.java | 4 ++-- .../mes}/system/enums/SysMenuEnum.java | 2 +- .../mes}/system/enums/SysRoleEnum.java | 2 +- .../mes}/system/enums/SysUserEnum.java | 2 +- .../system/mapper/SysDepartmentMapper.java | 4 ++-- .../mes}/system/mapper/SysDictMapper.java | 4 ++-- .../mes}/system/mapper/SysMenuMapper.java | 6 +++--- .../mes}/system/mapper/SysRoleMapper.java | 4 ++-- .../mes}/system/mapper/SysRoleMenuMapper.java | 4 ++-- .../mes}/system/mapper/SysUserMapper.java | 6 +++--- .../mes}/system/mapper/SysUserRoleMapper.java | 4 ++-- .../system/request/SysDepartmentPageReq.java | 4 ++-- .../mes}/system/request/SysDictPageReq.java | 4 ++-- .../mes}/system/request/SysMenuPageReq.java | 4 ++-- .../mes}/system/request/SysRolePageReq.java | 4 ++-- .../mes}/system/request/SysUserPageReq.java | 4 ++-- .../system/service/ISysDepartmentService.java | 4 ++-- .../mes}/system/service/ISysDictService.java | 4 ++-- .../mes}/system/service/ISysMenuService.java | 8 +++---- .../system/service/ISysRoleMenuService.java | 4 ++-- .../mes}/system/service/ISysRoleService.java | 8 +++---- .../system/service/ISysUserRoleService.java | 4 ++-- .../mes}/system/service/ISysUserService.java | 6 +++--- .../impl/SysDepartmentServiceImpl.java | 8 +++---- .../service/impl/SysDictServiceImpl.java | 8 +++---- .../service/impl/SysMenuServiceImpl.java | 14 ++++++------ .../service/impl/SysRoleMenuServiceImpl.java | 8 +++---- .../service/impl/SysRoleServiceImpl.java | 20 +++++++++--------- .../service/impl/SysUserRoleServiceImpl.java | 8 +++---- .../service/impl/SysUserServiceImpl.java | 18 ++++++++-------- .../com/wangziyang/mes}/system/vo/TreeVO.java | 2 +- .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-pro.yml | 0 .../src/main/resources/application.yml | 2 +- .../src/main/resources/ehcache.xml | 0 .../src/main/resources/logback.xml | 0 .../basedata/SpTableManagerItemMapper.xml | 4 ++-- .../mapper/basedata/SpTableManagerMapper.xml | 6 +++--- .../common/QueryTableNameDataMapper.xml | 2 +- .../resources/mapper/system/SysDictMapper.xml | 2 +- .../mapper/system/SysIDepartmentMapper.xml | 2 +- .../resources/mapper/system/SysMenuMapper.xml | 6 +++--- .../resources/mapper/system/SysRoleMapper.xml | 4 ++-- .../mapper/system/SysRoleMenuMapper.xml | 2 +- .../resources/mapper/system/SysUserMapper.xml | 8 +++---- .../mapper/system/SysUserRoleMapper.xml | 2 +- .../src/main/resources/static/css/admin.css | 0 .../src/main/resources/static/css/client.css | 0 .../src/main/resources/static/css/company.css | 0 .../src/main/resources/static/css/public.css | 0 .../src/main/resources/static/css/splayui.css | 0 .../src/main/resources/static/css/start.css | 0 .../src/main/resources/static/favicon.ico | Bin .../src/main/resources/static/image/bg.jpg | Bin .../main/resources/static/image/captcha.jpg | Bin .../static/image/company/Big_icon1.png | Bin .../static/image/company/Big_icon2.png | Bin .../static/image/company/Big_icon3.png | Bin .../static/image/company/Big_icon4.png | Bin .../static/image/company/Product_img1.jpg | Bin .../static/image/company/Product_img2.jpg | Bin .../static/image/company/Product_img3.jpg | Bin .../static/image/company/Product_img4.jpg | Bin .../static/image/company/banner1.jpg | Bin .../static/image/company/banner2.jpg | Bin .../resources/static/image/company/case1.jpg | Bin .../resources/static/image/company/case2.jpg | Bin .../resources/static/image/company/case3.jpg | Bin .../resources/static/image/company/case4.jpg | Bin .../resources/static/image/company/case5.jpg | Bin .../resources/static/image/company/case6.jpg | Bin .../resources/static/image/company/case7.jpg | Bin .../resources/static/image/company/case8.jpg | Bin .../resources/static/image/company/case9.jpg | Bin .../static/image/company/erweima.jpg | Bin .../static/image/company/home_img1.jpg | Bin .../static/image/company/home_img2.jpg | Bin .../static/image/company/home_img3.jpg | Bin .../static/image/company/home_img4.jpg | Bin .../resources/static/image/company/logo.png | Bin .../static/image/company/nav_img1.jpg | Bin .../static/image/company/nav_img2.jpg | Bin .../static/image/company/nav_img3.jpg | Bin .../static/image/company/nav_img4.jpg | Bin .../static/image/company/news_big.jpg | Bin .../static/image/company/news_img1.jpg | Bin .../static/image/company/us_img1.jpg | Bin .../static/image/company/us_img2.jpg | Bin .../static/image/company/us_img3.jpg | Bin .../static/image/company/us_img4.png | Bin .../static/image/company/us_img5.png | Bin .../static/image/company/us_img6.png | Bin .../static/image/company/us_img7.png | Bin .../static/image/company/us_img8.png | Bin .../src/main/resources/static/image/hk.png | Bin .../src/main/resources/static/image/logo.png | Bin .../resources/static/js/layuimodule/config.js | 0 .../js/layuimodule/iconPicker/iconPickerFa.js | 0 .../static/js/layuimodule/sp/spCompany.js | 0 .../static/js/layuimodule/sp/spLayer.js | 0 .../static/js/layuimodule/sp/spLayui.js | 0 .../static/js/layuimodule/sp/spSearchPanel.js | 0 .../static/js/layuimodule/sp/spTable.js | 0 .../static/js/layuimodule/step-lay/step.css | 0 .../static/js/layuimodule/step-lay/step.js | 0 .../js/layuimodule/tableSelect/tableSelect.js | 0 .../js/layuimodule/treeTable/treeTable.css | 0 .../js/layuimodule/treeTable/treeTable.js | 0 .../wangEditor/fonts/w-e-icon.woff | Bin .../js/layuimodule/wangEditor/wangEditor.css | 0 .../js/layuimodule/wangEditor/wangEditor.js | 0 .../layuimodule/wangEditor/wangEditor.min.css | 0 .../layuimodule/wangEditor/wangEditor.min.js | 0 .../wangEditor/wangEditor.min.js.map | 0 .../src/main/resources/static/js/spConfig.js | 0 .../src/main/resources/static/js/spUtil.js | 0 .../src/main/resources/static/json/clear.json | 0 .../src/main/resources/static/json/init.json | 0 .../src/main/resources/static/json/menus.json | 0 .../src/main/resources/static/json/table.json | 0 .../resources/static/json/tableSelect.json | 0 .../main/resources/static/json/upload.json | 0 .../main/resources/static/lib/dayjs.min.js | 0 .../static/lib/echarts/echarts.min.js | 0 .../lib/font-awesome-4.7.0/HELP-US-OUT.txt | 0 .../font-awesome-4.7.0/css/font-awesome.css | 0 .../css/font-awesome.min.css | 0 .../font-awesome-4.7.0/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../lib/font-awesome-4.7.0/less/animated.less | 0 .../less/bordered-pulled.less | 0 .../lib/font-awesome-4.7.0/less/core.less | 0 .../font-awesome-4.7.0/less/fixed-width.less | 0 .../font-awesome-4.7.0/less/font-awesome.less | 0 .../lib/font-awesome-4.7.0/less/icons.less | 0 .../lib/font-awesome-4.7.0/less/larger.less | 0 .../lib/font-awesome-4.7.0/less/list.less | 0 .../lib/font-awesome-4.7.0/less/mixins.less | 0 .../lib/font-awesome-4.7.0/less/path.less | 0 .../less/rotated-flipped.less | 0 .../less/screen-reader.less | 0 .../lib/font-awesome-4.7.0/less/stacked.less | 0 .../font-awesome-4.7.0/less/variables.less | 0 .../font-awesome-4.7.0/scss/_animated.scss | 0 .../scss/_bordered-pulled.scss | 0 .../lib/font-awesome-4.7.0/scss/_core.scss | 0 .../font-awesome-4.7.0/scss/_fixed-width.scss | 0 .../lib/font-awesome-4.7.0/scss/_icons.scss | 0 .../lib/font-awesome-4.7.0/scss/_larger.scss | 0 .../lib/font-awesome-4.7.0/scss/_list.scss | 0 .../lib/font-awesome-4.7.0/scss/_mixins.scss | 0 .../lib/font-awesome-4.7.0/scss/_path.scss | 0 .../scss/_rotated-flipped.scss | 0 .../scss/_screen-reader.scss | 0 .../lib/font-awesome-4.7.0/scss/_stacked.scss | 0 .../font-awesome-4.7.0/scss/_variables.scss | 0 .../font-awesome-4.7.0/scss/font-awesome.scss | 0 .../jq-module/jquery.particleground.min.js | 0 .../static/lib/jq-module/paigusu.min.js | 0 .../jq-module/zyupload/zyupload-1.0.0.min.css | 0 .../jq-module/zyupload/zyupload-1.0.0.min.js | 0 .../resources/static/lib/jquery/jquery.min.js | 0 .../resources/static/lib/layui/css/layui.css | 0 .../static/lib/layui/css/layui.mobile.css | 0 .../static/lib/layui/css/modules/code.css | 0 .../css/modules/laydate/default/laydate.css | 0 .../css/modules/layer/default/icon-ext.png | Bin .../layui/css/modules/layer/default/icon.png | Bin .../layui/css/modules/layer/default/layer.css | 0 .../css/modules/layer/default/loading-0.gif | Bin .../css/modules/layer/default/loading-1.gif | Bin .../css/modules/layer/default/loading-2.gif | Bin .../static/lib/layui/font/iconfont.eot | Bin .../static/lib/layui/font/iconfont.svg | 0 .../static/lib/layui/font/iconfont.ttf | Bin .../static/lib/layui/font/iconfont.woff | Bin .../static/lib/layui/font/iconfont.woff2 | Bin .../static/lib/layui/images/face/0.gif | Bin .../static/lib/layui/images/face/1.gif | Bin .../static/lib/layui/images/face/10.gif | Bin .../static/lib/layui/images/face/11.gif | Bin .../static/lib/layui/images/face/12.gif | Bin .../static/lib/layui/images/face/13.gif | Bin .../static/lib/layui/images/face/14.gif | Bin .../static/lib/layui/images/face/15.gif | Bin .../static/lib/layui/images/face/16.gif | Bin .../static/lib/layui/images/face/17.gif | Bin .../static/lib/layui/images/face/18.gif | Bin .../static/lib/layui/images/face/19.gif | Bin .../static/lib/layui/images/face/2.gif | Bin .../static/lib/layui/images/face/20.gif | Bin .../static/lib/layui/images/face/21.gif | Bin .../static/lib/layui/images/face/22.gif | Bin .../static/lib/layui/images/face/23.gif | Bin .../static/lib/layui/images/face/24.gif | Bin .../static/lib/layui/images/face/25.gif | Bin .../static/lib/layui/images/face/26.gif | Bin .../static/lib/layui/images/face/27.gif | Bin .../static/lib/layui/images/face/28.gif | Bin .../static/lib/layui/images/face/29.gif | Bin .../static/lib/layui/images/face/3.gif | Bin .../static/lib/layui/images/face/30.gif | Bin .../static/lib/layui/images/face/31.gif | Bin .../static/lib/layui/images/face/32.gif | Bin .../static/lib/layui/images/face/33.gif | Bin .../static/lib/layui/images/face/34.gif | Bin .../static/lib/layui/images/face/35.gif | Bin .../static/lib/layui/images/face/36.gif | Bin .../static/lib/layui/images/face/37.gif | Bin .../static/lib/layui/images/face/38.gif | Bin .../static/lib/layui/images/face/39.gif | Bin .../static/lib/layui/images/face/4.gif | Bin .../static/lib/layui/images/face/40.gif | Bin .../static/lib/layui/images/face/41.gif | Bin .../static/lib/layui/images/face/42.gif | Bin .../static/lib/layui/images/face/43.gif | Bin .../static/lib/layui/images/face/44.gif | Bin .../static/lib/layui/images/face/45.gif | Bin .../static/lib/layui/images/face/46.gif | Bin .../static/lib/layui/images/face/47.gif | Bin .../static/lib/layui/images/face/48.gif | Bin .../static/lib/layui/images/face/49.gif | Bin .../static/lib/layui/images/face/5.gif | Bin .../static/lib/layui/images/face/50.gif | Bin .../static/lib/layui/images/face/51.gif | Bin .../static/lib/layui/images/face/52.gif | Bin .../static/lib/layui/images/face/53.gif | Bin .../static/lib/layui/images/face/54.gif | Bin .../static/lib/layui/images/face/55.gif | Bin .../static/lib/layui/images/face/56.gif | Bin .../static/lib/layui/images/face/57.gif | Bin .../static/lib/layui/images/face/58.gif | Bin .../static/lib/layui/images/face/59.gif | Bin .../static/lib/layui/images/face/6.gif | Bin .../static/lib/layui/images/face/60.gif | Bin .../static/lib/layui/images/face/61.gif | Bin .../static/lib/layui/images/face/62.gif | Bin .../static/lib/layui/images/face/63.gif | Bin .../static/lib/layui/images/face/64.gif | Bin .../static/lib/layui/images/face/65.gif | Bin .../static/lib/layui/images/face/66.gif | Bin .../static/lib/layui/images/face/67.gif | Bin .../static/lib/layui/images/face/68.gif | Bin .../static/lib/layui/images/face/69.gif | Bin .../static/lib/layui/images/face/7.gif | Bin .../static/lib/layui/images/face/70.gif | Bin .../static/lib/layui/images/face/71.gif | Bin .../static/lib/layui/images/face/8.gif | Bin .../static/lib/layui/images/face/9.gif | Bin .../static/lib/layui/lay/modules/carousel.js | 0 .../static/lib/layui/lay/modules/code.js | 0 .../lib/layui/lay/modules/colorpicker.js | 0 .../static/lib/layui/lay/modules/element.js | 0 .../static/lib/layui/lay/modules/flow.js | 0 .../static/lib/layui/lay/modules/form.js | 0 .../static/lib/layui/lay/modules/jquery.js | 0 .../static/lib/layui/lay/modules/laydate.js | 0 .../static/lib/layui/lay/modules/layedit.js | 0 .../static/lib/layui/lay/modules/layer.js | 0 .../static/lib/layui/lay/modules/laypage.js | 0 .../static/lib/layui/lay/modules/laytpl.js | 0 .../static/lib/layui/lay/modules/mobile.js | 0 .../static/lib/layui/lay/modules/rate.js | 0 .../static/lib/layui/lay/modules/slider.js | 0 .../static/lib/layui/lay/modules/table.js | 0 .../static/lib/layui/lay/modules/transfer.js | 0 .../static/lib/layui/lay/modules/tree.js | 0 .../static/lib/layui/lay/modules/upload.js | 0 .../static/lib/layui/lay/modules/util.js | 0 .../resources/static/lib/layui/layui.all.js | 0 .../main/resources/static/lib/layui/layui.js | 0 .../main/resources/static/lib/lodash.min.js | 0 .../src/main/resources/templates/404.ftl | 0 .../templates/admin/blog/article/list.ftl | 0 .../resources/templates/admin/blog/index.ftl | 0 .../main/resources/templates/admin/index.ftl | 0 .../admin/system/department/addOrUpdate.ftl | 0 .../admin/system/department/list.ftl | 0 .../admin/system/dict/addOrUpdate.ftl | 0 .../templates/admin/system/dict/list.ftl | 0 .../admin/system/menu/addOrUpdate.ftl | 0 .../templates/admin/system/menu/list.ftl | 0 .../admin/system/role/addOrUpdate.ftl | 0 .../templates/admin/system/role/list.ftl | 0 .../admin/system/tool/colorSelect.ftl | 0 .../templates/admin/system/tool/editor.ftl | 0 .../templates/admin/system/tool/formStep.ftl | 0 .../templates/admin/system/tool/icon.ftl | 0 .../admin/system/tool/iconPicker.ftl | 0 .../admin/system/user/addOrUpdate.ftl | 0 .../templates/admin/system/user/list.ftl | 0 .../resources/templates/admin/welcome.ftl | 0 .../basedata/manager/addOrUpdate.ftl | 0 .../templates/basedata/manager/list.ftl | 0 .../basedata/manageritem/addOrUpdate.ftl | 0 .../templates/basedata/manageritem/list.ftl | 0 .../codegenerator/controller.java.ftl | 0 .../templates/codegenerator/entity.java.ftl | 0 .../templates/codegenerator/mapper.java.ftl | 0 .../templates/codegenerator/mapper.xml.ftl | 0 .../templates/codegenerator/service.java.ftl | 0 .../codegenerator/serviceImpl.java.ftl | 0 .../resources/templates/common/common.ftl | 0 .../common/spSearchPanel4SysUser.ftl | 0 .../main/resources/templates/error/403.ftl | 0 .../main/resources/templates/error/500.ftl | 0 .../src/main/resources/templates/login.ftl | 0 .../mes}/SparchetypeApplicationTests.java | 2 +- .../basedata/request/SpTableManagerReq.java | 9 -------- .../system/config/package-info.java | 4 ---- .../sparchetype/system/dto/SysDictDTO.java | 10 --------- 392 files changed, 320 insertions(+), 324 deletions(-) rename {sparchetype => mes}/.gitignore (100%) rename {sparchetype => mes}/mvnw (100%) rename {sparchetype => mes}/mvnw.cmd (100%) rename {sparchetype => mes}/pom.xml (100%) rename {sparchetype => mes}/src/main/docker/Dockerfile (100%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/SparchetypeApplication.java (80%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/common/controller/TableNameDataController.java (89%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/common/dto/CommonDto.java (93%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/common/mapper/QueryTableNameDataMapper.java (78%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/common/request/QueryTableNameDataReq.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/common/service/TableNameDataService.java (85%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/common/service/impl/TableNameDataServiceImpl.java (90%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/controller/SpTableManagerController.java (90%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/controller/SpTableManagerItemController.java (85%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/dto/SpTableManagerDto.java (78%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/entity/SpTableManager.java (95%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/entity/SpTableManagerItem.java (95%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/mapper/SpTableManagerItemMapper.java (85%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/mapper/SpTableManagerMapper.java (70%) create mode 100644 mes/src/main/java/com/wangziyang/mes/basedata/request/SpTableManagerReq.java rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/service/ISpTableManagerItemService.java (84%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/service/ISpTableManagerService.java (71%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/service/impl/SpTableManagerItemServiceImpl.java (80%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/basedata/service/impl/SpTableManagerServiceImpl.java (75%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/BaseController.java (73%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/BaseEntity.java (97%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/BasePageReq.java (90%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/Result.java (96%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/advice/ExceptionAdvice.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/advice/MyErrorViewResolver.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/config/JsonConfig.java (98%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/config/MybatisPlusConfig.java (90%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/config/ShiroTagsFreeMarkerConfig.java (92%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/config/SpMetaObjectHandler.java (93%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/controller/admin/CommonController.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/enums/CommonEnum.java (95%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/util/ByteUtil.java (98%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/util/CodeGenerator.java (94%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/util/HashUtil.java (99%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/util/HttpUtil.java (93%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/util/IdUtil.java (99%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/util/RandomVerificationCodeUtil.java (98%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/common/util/TreeUtil.java (95%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/company/client/CompanyController.java (97%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/package-info.java (94%) create mode 100644 mes/src/main/java/com/wangziyang/mes/system/config/package-info.java rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/RedisCache.java (98%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/RedisCacheManager.java (97%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/RedisManager.java (98%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/RedisSessionDAO.java (98%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/RetryLimitCredentialsMatcher.java (97%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/SerializeUtils.java (97%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/ShiroConfig.java (99%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/ShiroRealm.java (90%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/SpLoginFormFilter.java (94%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/SpSessionListener.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/shiro/SpUsernamePasswordToken.java (90%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/config/swagger/SwaggerConfig.java (96%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/controller/admin/SysDepartmentController.java (84%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/controller/admin/SysDictController.java (86%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/controller/admin/SysLoginController.java (87%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/controller/admin/SysMenuController.java (83%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/controller/admin/SysRoleController.java (83%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/controller/admin/SysToolController.java (93%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/controller/admin/SysUserController.java (83%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/controller/client/SysLoginController.java (94%) create mode 100644 mes/src/main/java/com/wangziyang/mes/system/dto/SysDictDTO.java rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/dto/SysMenuDTO.java (53%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/dto/SysRoleDTO.java (86%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/dto/SysUserDTO.java (87%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/entity/SysDepartment.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/entity/SysDict.java (94%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/entity/SysMenu.java (95%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/entity/SysRole.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/entity/SysRoleMenu.java (87%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/entity/SysUser.java (97%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/entity/SysUserRole.java (87%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/enums/SysMenuEnum.java (92%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/enums/SysRoleEnum.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/enums/SysUserEnum.java (91%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/mapper/SysDepartmentMapper.java (66%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/mapper/SysDictMapper.java (68%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/mapper/SysMenuMapper.java (71%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/mapper/SysRoleMapper.java (79%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/mapper/SysRoleMenuMapper.java (66%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/mapper/SysUserMapper.java (64%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/mapper/SysUserRoleMapper.java (66%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/request/SysDepartmentPageReq.java (61%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/request/SysDictPageReq.java (60%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/request/SysMenuPageReq.java (60%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/request/SysRolePageReq.java (60%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/request/SysUserPageReq.java (85%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/ISysDepartmentService.java (66%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/ISysDictService.java (68%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/ISysMenuService.java (79%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/ISysRoleMenuService.java (66%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/ISysRoleService.java (75%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/ISysUserRoleService.java (66%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/ISysUserService.java (82%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/impl/SysDepartmentServiceImpl.java (57%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/impl/SysDictServiceImpl.java (66%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/impl/SysMenuServiceImpl.java (89%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/impl/SysRoleMenuServiceImpl.java (57%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/impl/SysRoleServiceImpl.java (82%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/impl/SysUserRoleServiceImpl.java (57%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/service/impl/SysUserServiceImpl.java (78%) rename {sparchetype/src/main/java/com/songpeng/sparchetype => mes/src/main/java/com/wangziyang/mes}/system/vo/TreeVO.java (98%) rename {sparchetype => mes}/src/main/resources/application-dev.yml (100%) rename {sparchetype => mes}/src/main/resources/application-pro.yml (100%) rename {sparchetype => mes}/src/main/resources/application.yml (85%) rename {sparchetype => mes}/src/main/resources/ehcache.xml (100%) rename {sparchetype => mes}/src/main/resources/logback.xml (100%) rename {sparchetype => mes}/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml (84%) rename {sparchetype => mes}/src/main/resources/mapper/basedata/SpTableManagerMapper.xml (70%) rename {sparchetype => mes}/src/main/resources/mapper/basedata/common/QueryTableNameDataMapper.xml (90%) rename sparchetype/src/main/resources/mapper/system/SysIDepartmentMapper.xml => mes/src/main/resources/mapper/system/SysDictMapper.xml (66%) rename sparchetype/src/main/resources/mapper/system/SysDictMapper.xml => mes/src/main/resources/mapper/system/SysIDepartmentMapper.xml (72%) rename {sparchetype => mes}/src/main/resources/mapper/system/SysMenuMapper.xml (82%) rename {sparchetype => mes}/src/main/resources/mapper/system/SysRoleMapper.xml (87%) rename {sparchetype => mes}/src/main/resources/mapper/system/SysRoleMenuMapper.xml (66%) rename {sparchetype => mes}/src/main/resources/mapper/system/SysUserMapper.xml (90%) rename {sparchetype => mes}/src/main/resources/mapper/system/SysUserRoleMapper.xml (66%) rename {sparchetype => mes}/src/main/resources/static/css/admin.css (100%) rename {sparchetype => mes}/src/main/resources/static/css/client.css (100%) rename {sparchetype => mes}/src/main/resources/static/css/company.css (100%) rename {sparchetype => mes}/src/main/resources/static/css/public.css (100%) rename {sparchetype => mes}/src/main/resources/static/css/splayui.css (100%) rename {sparchetype => mes}/src/main/resources/static/css/start.css (100%) rename {sparchetype => mes}/src/main/resources/static/favicon.ico (100%) rename {sparchetype => mes}/src/main/resources/static/image/bg.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/captcha.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/Big_icon1.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/Big_icon2.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/Big_icon3.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/Big_icon4.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/Product_img1.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/Product_img2.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/Product_img3.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/Product_img4.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/banner1.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/banner2.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case1.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case2.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case3.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case4.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case5.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case6.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case7.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case8.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/case9.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/erweima.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/home_img1.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/home_img2.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/home_img3.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/home_img4.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/logo.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/nav_img1.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/nav_img2.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/nav_img3.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/nav_img4.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/news_big.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/news_img1.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/us_img1.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/us_img2.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/us_img3.jpg (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/us_img4.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/us_img5.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/us_img6.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/us_img7.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/company/us_img8.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/hk.png (100%) rename {sparchetype => mes}/src/main/resources/static/image/logo.png (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/config.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/sp/spCompany.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/sp/spLayer.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/sp/spLayui.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/sp/spSearchPanel.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/sp/spTable.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/step-lay/step.css (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/step-lay/step.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/tableSelect/tableSelect.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/treeTable/treeTable.css (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/treeTable/treeTable.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/wangEditor/fonts/w-e-icon.woff (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.css (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.css (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js.map (100%) rename {sparchetype => mes}/src/main/resources/static/js/spConfig.js (100%) rename {sparchetype => mes}/src/main/resources/static/js/spUtil.js (100%) rename {sparchetype => mes}/src/main/resources/static/json/clear.json (100%) rename {sparchetype => mes}/src/main/resources/static/json/init.json (100%) rename {sparchetype => mes}/src/main/resources/static/json/menus.json (100%) rename {sparchetype => mes}/src/main/resources/static/json/table.json (100%) rename {sparchetype => mes}/src/main/resources/static/json/tableSelect.json (100%) rename {sparchetype => mes}/src/main/resources/static/json/upload.json (100%) rename {sparchetype => mes}/src/main/resources/static/lib/dayjs.min.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/echarts/echarts.min.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/HELP-US-OUT.txt (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.css (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.min.css (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/fonts/FontAwesome.otf (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.eot (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.svg (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/animated.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/bordered-pulled.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/core.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/fixed-width.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/font-awesome.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/icons.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/larger.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/list.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/mixins.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/path.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/rotated-flipped.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/screen-reader.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/stacked.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/less/variables.less (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_animated.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_bordered-pulled.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_core.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_fixed-width.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_icons.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_larger.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_list.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_mixins.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_path.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_rotated-flipped.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_screen-reader.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_stacked.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/_variables.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/font-awesome-4.7.0/scss/font-awesome.scss (100%) rename {sparchetype => mes}/src/main/resources/static/lib/jq-module/jquery.particleground.min.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/jq-module/paigusu.min.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.css (100%) rename {sparchetype => mes}/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/jquery/jquery.min.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/layui.css (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/layui.mobile.css (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/modules/code.css (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/modules/laydate/default/laydate.css (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/modules/layer/default/icon-ext.png (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/modules/layer/default/icon.png (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/modules/layer/default/layer.css (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/modules/layer/default/loading-0.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/modules/layer/default/loading-1.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/css/modules/layer/default/loading-2.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/font/iconfont.eot (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/font/iconfont.svg (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/font/iconfont.ttf (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/font/iconfont.woff (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/font/iconfont.woff2 (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/0.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/1.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/10.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/11.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/12.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/13.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/14.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/15.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/16.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/17.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/18.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/19.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/2.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/20.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/21.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/22.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/23.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/24.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/25.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/26.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/27.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/28.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/29.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/3.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/30.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/31.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/32.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/33.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/34.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/35.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/36.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/37.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/38.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/39.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/4.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/40.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/41.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/42.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/43.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/44.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/45.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/46.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/47.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/48.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/49.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/5.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/50.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/51.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/52.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/53.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/54.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/55.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/56.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/57.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/58.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/59.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/6.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/60.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/61.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/62.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/63.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/64.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/65.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/66.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/67.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/68.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/69.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/7.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/70.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/71.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/8.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/images/face/9.gif (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/carousel.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/code.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/colorpicker.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/element.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/flow.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/form.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/jquery.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/laydate.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/layedit.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/layer.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/laypage.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/laytpl.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/mobile.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/rate.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/slider.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/table.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/transfer.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/tree.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/upload.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/lay/modules/util.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/layui.all.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/layui/layui.js (100%) rename {sparchetype => mes}/src/main/resources/static/lib/lodash.min.js (100%) rename {sparchetype => mes}/src/main/resources/templates/404.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/blog/article/list.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/blog/index.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/index.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/department/addOrUpdate.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/department/list.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/dict/addOrUpdate.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/dict/list.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/menu/addOrUpdate.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/menu/list.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/role/addOrUpdate.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/role/list.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/tool/colorSelect.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/tool/editor.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/tool/formStep.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/tool/icon.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/tool/iconPicker.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/user/addOrUpdate.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/system/user/list.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/admin/welcome.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/basedata/manager/addOrUpdate.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/basedata/manager/list.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/basedata/manageritem/addOrUpdate.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/basedata/manageritem/list.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/codegenerator/controller.java.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/codegenerator/entity.java.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/codegenerator/mapper.java.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/codegenerator/mapper.xml.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/codegenerator/service.java.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/codegenerator/serviceImpl.java.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/common/common.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/common/spSearchPanel4SysUser.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/error/403.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/error/500.ftl (100%) rename {sparchetype => mes}/src/main/resources/templates/login.ftl (100%) rename {sparchetype/src/test/java/com/songpeng/sparchetype => mes/src/test/java/com/wangziyang/mes}/SparchetypeApplicationTests.java (90%) delete mode 100644 sparchetype/src/main/java/com/songpeng/sparchetype/basedata/request/SpTableManagerReq.java delete mode 100644 sparchetype/src/main/java/com/songpeng/sparchetype/system/config/package-info.java delete mode 100644 sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysDictDTO.java diff --git a/README.md b/README.md index e4b1280..6cfaaf3 100644 --- a/README.md +++ b/README.md @@ -51,10 +51,10 @@ * 后端 * Hutool 是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。 * 枚举 - * 公共枚举类：com.songpeng.sparchetype.common.enums.CommonEnum + * 公共枚举类：CommonEnum * 不同模块下的枚举：如 com.songpeng.sparchetype.system.enums * 请求参数 - * 每张表的分页查询参数，严格按照一张表对应一个请求参数对象进行开发，如系统用户分页查询参数：com.songpeng.sparchetype.system.request.SysUserPageReq + * 每张表的分页查询参数，严格按照一张表对应一个请求参数对象进行开发，如系统用户分页查询参数：SysUserPageReq # 总结 欢迎想一起开发的小伙伴。。本人前端太弱，都是自己乱摸索。还请有一个前端选手能一起弄 ## QQ Group87652870 diff --git a/sparchetype/.gitignore b/mes/.gitignore similarity index 100% rename from sparchetype/.gitignore rename to mes/.gitignore diff --git a/sparchetype/mvnw b/mes/mvnw similarity index 100% rename from sparchetype/mvnw rename to mes/mvnw diff --git a/sparchetype/mvnw.cmd b/mes/mvnw.cmd similarity index 100% rename from sparchetype/mvnw.cmd rename to mes/mvnw.cmd diff --git a/sparchetype/pom.xml b/mes/pom.xml similarity index 100% rename from sparchetype/pom.xml rename to mes/pom.xml diff --git a/sparchetype/src/main/docker/Dockerfile b/mes/src/main/docker/Dockerfile similarity index 100% rename from sparchetype/src/main/docker/Dockerfile rename to mes/src/main/docker/Dockerfile diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/SparchetypeApplication.java b/mes/src/main/java/com/wangziyang/mes/SparchetypeApplication.java similarity index 80% rename from sparchetype/src/main/java/com/songpeng/sparchetype/SparchetypeApplication.java rename to mes/src/main/java/com/wangziyang/mes/SparchetypeApplication.java index 41b8c00..e54d879 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/SparchetypeApplication.java +++ b/mes/src/main/java/com/wangziyang/mes/SparchetypeApplication.java @@ -1,11 +1,11 @@ -package com.songpeng.sparchetype; +package com.wangziyang.mes; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -@MapperScan("com.songpeng.sparchetype.**.mapper*") +@MapperScan("com.wangziyang.mes.**.mapper*") public class SparchetypeApplication { public static void main(String[] args) { diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/controller/TableNameDataController.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/controller/TableNameDataController.java similarity index 89% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/controller/TableNameDataController.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/controller/TableNameDataController.java index f5b8164..a5a382c 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/controller/TableNameDataController.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/controller/TableNameDataController.java @@ -1,12 +1,12 @@ -package com.songpeng.sparchetype.basedata.common.controller; +package com.wangziyang.mes.basedata.common.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.basedata.common.dto.CommonDto; -import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; -import com.songpeng.sparchetype.basedata.common.service.TableNameDataService; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.basedata.common.dto.CommonDto; +import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq; +import com.wangziyang.mes.basedata.common.service.TableNameDataService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysUser; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/dto/CommonDto.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/dto/CommonDto.java similarity index 93% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/dto/CommonDto.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/dto/CommonDto.java index 2234c8a..9236448 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/dto/CommonDto.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/dto/CommonDto.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.basedata.common.dto; +package com.wangziyang.mes.basedata.common.dto; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** * 基础数据通用查询复杂对象 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/mapper/QueryTableNameDataMapper.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/QueryTableNameDataMapper.java similarity index 78% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/mapper/QueryTableNameDataMapper.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/QueryTableNameDataMapper.java index 480f865..0ccd507 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/mapper/QueryTableNameDataMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/QueryTableNameDataMapper.java @@ -1,10 +1,9 @@ -package com.songpeng.sparchetype.basedata.common.mapper; +package com.wangziyang.mes.basedata.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.basedata.common.dto.CommonDto; -import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import org.apache.ibatis.annotations.Param; +import com.wangziyang.mes.basedata.common.dto.CommonDto; +import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; import java.util.Map; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/request/QueryTableNameDataReq.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/request/QueryTableNameDataReq.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/request/QueryTableNameDataReq.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/request/QueryTableNameDataReq.java index fc1a079..011844d 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/request/QueryTableNameDataReq.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/request/QueryTableNameDataReq.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.basedata.common.request; +package com.wangziyang.mes.basedata.common.request; -import com.songpeng.sparchetype.common.BasePageReq; +import com.wangziyang.mes.common.BasePageReq; /** * @author wangziyang diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/TableNameDataService.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/TableNameDataService.java similarity index 85% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/TableNameDataService.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/service/TableNameDataService.java index e517f25..a5686df 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/TableNameDataService.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/TableNameDataService.java @@ -1,9 +1,9 @@ -package com.songpeng.sparchetype.basedata.common.service; +package com.wangziyang.mes.basedata.common.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.basedata.common.dto.CommonDto; -import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.basedata.common.dto.CommonDto; +import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq; +import com.wangziyang.mes.system.entity.SysUser; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/impl/TableNameDataServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/TableNameDataServiceImpl.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/impl/TableNameDataServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/TableNameDataServiceImpl.java index ccec333..a8f6deb 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/common/service/impl/TableNameDataServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/TableNameDataServiceImpl.java @@ -1,14 +1,14 @@ -package com.songpeng.sparchetype.basedata.common.service.impl; +package com.wangziyang.mes.basedata.common.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.basedata.common.dto.CommonDto; -import com.songpeng.sparchetype.basedata.common.mapper.QueryTableNameDataMapper; -import com.songpeng.sparchetype.basedata.common.request.QueryTableNameDataReq; -import com.songpeng.sparchetype.basedata.common.service.TableNameDataService; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; -import com.songpeng.sparchetype.common.util.IdUtil; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.basedata.common.dto.CommonDto; +import com.wangziyang.mes.basedata.common.mapper.QueryTableNameDataMapper; +import com.wangziyang.mes.basedata.common.request.QueryTableNameDataReq; +import com.wangziyang.mes.basedata.common.service.TableNameDataService; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.service.ISpTableManagerItemService; +import com.wangziyang.mes.common.util.IdUtil; +import com.wangziyang.mes.system.entity.SysUser; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerController.java b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerController.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerController.java rename to mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerController.java index ea6c35b..cc41294 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerController.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerController.java @@ -1,16 +1,16 @@ -package com.songpeng.sparchetype.basedata.controller; +package com.wangziyang.mes.basedata.controller; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.basedata.dto.SpTableManagerDto; -import com.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.request.SpTableManagerReq; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerService; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; +import com.wangziyang.mes.basedata.dto.SpTableManagerDto; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.request.SpTableManagerReq; +import com.wangziyang.mes.basedata.service.ISpTableManagerItemService; +import com.wangziyang.mes.basedata.service.ISpTableManagerService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerItemController.java b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerItemController.java similarity index 85% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerItemController.java rename to mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerItemController.java index 3380a38..158d00c 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/controller/SpTableManagerItemController.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpTableManagerItemController.java @@ -1,10 +1,10 @@ -package com.songpeng.sparchetype.basedata.controller; +package com.wangziyang.mes.basedata.controller; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.service.ISpTableManagerItemService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/dto/SpTableManagerDto.java b/mes/src/main/java/com/wangziyang/mes/basedata/dto/SpTableManagerDto.java similarity index 78% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/dto/SpTableManagerDto.java rename to mes/src/main/java/com/wangziyang/mes/basedata/dto/SpTableManagerDto.java index cbb9a8a..31bac3f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/dto/SpTableManagerDto.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/dto/SpTableManagerDto.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.basedata.dto; +package com.wangziyang.mes.basedata.dto; -import com.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManager.java b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManager.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManager.java rename to mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManager.java index 65b53f5..0d190d6 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManager.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManager.java @@ -1,9 +1,7 @@ -package com.songpeng.sparchetype.basedata.entity; +package com.wangziyang.mes.basedata.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; - -import java.util.List; +import com.wangziyang.mes.common.BaseEntity; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManagerItem.java b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManagerItem.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManagerItem.java rename to mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManagerItem.java index 41884b8..4c024f2 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/entity/SpTableManagerItem.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpTableManagerItem.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.basedata.entity; +package com.wangziyang.mes.basedata.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerItemMapper.java b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerItemMapper.java similarity index 85% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerItemMapper.java rename to mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerItemMapper.java index e16e4a0..605b008 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerItemMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerItemMapper.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.basedata.mapper; +package com.wangziyang.mes.basedata.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerMapper.java b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerMapper.java similarity index 70% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerMapper.java rename to mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerMapper.java index dd30a61..507edef 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/mapper/SpTableManagerMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpTableManagerMapper.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.basedata.mapper; +package com.wangziyang.mes.basedata.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/request/SpTableManagerReq.java b/mes/src/main/java/com/wangziyang/mes/basedata/request/SpTableManagerReq.java new file mode 100644 index 0000000..b20ccac --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/basedata/request/SpTableManagerReq.java @@ -0,0 +1,9 @@ +package com.wangziyang.mes.basedata.request; + +import com.wangziyang.mes.common.BasePageReq; + +/** + * + */ +public class SpTableManagerReq extends BasePageReq { +} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerItemService.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerItemService.java similarity index 84% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerItemService.java rename to mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerItemService.java index 4244dbc..ffa431f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerItemService.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerItemService.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.basedata.service; +package com.wangziyang.mes.basedata.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerService.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerService.java similarity index 71% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerService.java rename to mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerService.java index 05771ab..dcf6dec 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/ISpTableManagerService.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpTableManagerService.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.basedata.service; +package com.wangziyang.mes.basedata.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerItemServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerItemServiceImpl.java similarity index 80% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerItemServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerItemServiceImpl.java index b0f6105..0860a18 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerItemServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.songpeng.sparchetype.basedata.service.impl; +package com.wangziyang.mes.basedata.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.mapper.SpTableManagerItemMapper; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerItemService; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.mapper.SpTableManagerItemMapper; +import com.wangziyang.mes.basedata.service.ISpTableManagerItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerServiceImpl.java similarity index 75% rename from sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerServiceImpl.java index 2394dbb..68c28e9 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/service/impl/SpTableManagerServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpTableManagerServiceImpl.java @@ -1,12 +1,11 @@ -package com.songpeng.sparchetype.basedata.service.impl; +package com.wangziyang.mes.basedata.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.basedata.entity.SpTableManager; -import com.songpeng.sparchetype.basedata.entity.SpTableManagerItem; -import com.songpeng.sparchetype.basedata.mapper.SpTableManagerMapper; -import com.songpeng.sparchetype.basedata.service.ISpTableManagerService; -import org.apache.ibatis.annotations.Param; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.entity.SpTableManagerItem; +import com.wangziyang.mes.basedata.mapper.SpTableManagerMapper; +import com.wangziyang.mes.basedata.service.ISpTableManagerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseController.java b/mes/src/main/java/com/wangziyang/mes/common/BaseController.java similarity index 73% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseController.java rename to mes/src/main/java/com/wangziyang/mes/common/BaseController.java index 938c968..f2a7c93 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseController.java +++ b/mes/src/main/java/com/wangziyang/mes/common/BaseController.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.common; +package com.wangziyang.mes.common; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.system.entity.SysUser; import org.apache.shiro.SecurityUtils; /** diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseEntity.java b/mes/src/main/java/com/wangziyang/mes/common/BaseEntity.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseEntity.java rename to mes/src/main/java/com/wangziyang/mes/common/BaseEntity.java index f8a1896..083ebdb 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BaseEntity.java +++ b/mes/src/main/java/com/wangziyang/mes/common/BaseEntity.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common; +package com.wangziyang.mes.common; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BasePageReq.java b/mes/src/main/java/com/wangziyang/mes/common/BasePageReq.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/BasePageReq.java rename to mes/src/main/java/com/wangziyang/mes/common/BasePageReq.java index ed8e7ca..63cab61 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/BasePageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/common/BasePageReq.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common; +package com.wangziyang.mes.common; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/Result.java b/mes/src/main/java/com/wangziyang/mes/common/Result.java similarity index 96% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/Result.java rename to mes/src/main/java/com/wangziyang/mes/common/Result.java index af0fd30..29680ac 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/Result.java +++ b/mes/src/main/java/com/wangziyang/mes/common/Result.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common; +package com.wangziyang.mes.common; import java.util.HashMap; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/ExceptionAdvice.java b/mes/src/main/java/com/wangziyang/mes/common/advice/ExceptionAdvice.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/ExceptionAdvice.java rename to mes/src/main/java/com/wangziyang/mes/common/advice/ExceptionAdvice.java index c7f3e4e..d3f0e4b 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/ExceptionAdvice.java +++ b/mes/src/main/java/com/wangziyang/mes/common/advice/ExceptionAdvice.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.common.advice; +package com.wangziyang.mes.common.advice; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.common.util.HttpUtil; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.common.util.HttpUtil; import org.apache.shiro.authz.AuthorizationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java b/mes/src/main/java/com/wangziyang/mes/common/advice/MyErrorViewResolver.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java rename to mes/src/main/java/com/wangziyang/mes/common/advice/MyErrorViewResolver.java index 5bcdbd1..d3703ec 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java +++ b/mes/src/main/java/com/wangziyang/mes/common/advice/MyErrorViewResolver.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.advice; +package com.wangziyang.mes.common.advice; import org.springframework.boot.web.server.ErrorPage; import org.springframework.boot.web.server.ErrorPageRegistrar; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/JsonConfig.java b/mes/src/main/java/com/wangziyang/mes/common/config/JsonConfig.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/config/JsonConfig.java rename to mes/src/main/java/com/wangziyang/mes/common/config/JsonConfig.java index c640f63..e340076 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/JsonConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/common/config/JsonConfig.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.config; +package com.wangziyang.mes.common.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/MybatisPlusConfig.java b/mes/src/main/java/com/wangziyang/mes/common/config/MybatisPlusConfig.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/config/MybatisPlusConfig.java rename to mes/src/main/java/com/wangziyang/mes/common/config/MybatisPlusConfig.java index 3abfdfd..74c8193 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/MybatisPlusConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/common/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.config; +package com.wangziyang.mes.common.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import org.mybatis.spring.annotation.MapperScan; @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; */ @EnableTransactionManagement @Configuration -@MapperScan("com.songpeng.sparchetype.*.mapper*") +@MapperScan("com.wangziyang.mes.*.mapper*") public class MybatisPlusConfig { @Bean diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/ShiroTagsFreeMarkerConfig.java b/mes/src/main/java/com/wangziyang/mes/common/config/ShiroTagsFreeMarkerConfig.java similarity index 92% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/config/ShiroTagsFreeMarkerConfig.java rename to mes/src/main/java/com/wangziyang/mes/common/config/ShiroTagsFreeMarkerConfig.java index 8524369..0c085a0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/ShiroTagsFreeMarkerConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/common/config/ShiroTagsFreeMarkerConfig.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.config; +package com.wangziyang.mes.common.config; import com.jagregory.shiro.freemarker.ShiroTags; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/SpMetaObjectHandler.java b/mes/src/main/java/com/wangziyang/mes/common/config/SpMetaObjectHandler.java similarity index 93% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/config/SpMetaObjectHandler.java rename to mes/src/main/java/com/wangziyang/mes/common/config/SpMetaObjectHandler.java index a75d50e..fdb4ac3 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/config/SpMetaObjectHandler.java +++ b/mes/src/main/java/com/wangziyang/mes/common/config/SpMetaObjectHandler.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.common.config; +package com.wangziyang.mes.common.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.system.entity.SysUser; import org.apache.ibatis.reflection.MetaObject; import org.apache.shiro.SecurityUtils; import org.slf4j.Logger; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/controller/admin/CommonController.java b/mes/src/main/java/com/wangziyang/mes/common/controller/admin/CommonController.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/controller/admin/CommonController.java rename to mes/src/main/java/com/wangziyang/mes/common/controller/admin/CommonController.java index b531893..57adcb6 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/controller/admin/CommonController.java +++ b/mes/src/main/java/com/wangziyang/mes/common/controller/admin/CommonController.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.controller.admin; +package com.wangziyang.mes.common.controller.admin; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/enums/CommonEnum.java b/mes/src/main/java/com/wangziyang/mes/common/enums/CommonEnum.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/enums/CommonEnum.java rename to mes/src/main/java/com/wangziyang/mes/common/enums/CommonEnum.java index 1a9dbf1..807438a 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/enums/CommonEnum.java +++ b/mes/src/main/java/com/wangziyang/mes/common/enums/CommonEnum.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.enums; +package com.wangziyang.mes.common.enums; /** * 系统用户枚举 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/ByteUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/ByteUtil.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/ByteUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/ByteUtil.java index 9d7e14d..12e14bb 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/ByteUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/ByteUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import java.util.regex.Pattern; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java b/mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java rename to mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java index efd7f5d..d8fc0ab 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/CodeGenerator.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.core.toolkit.StringPool; @@ -50,7 +50,7 @@ public class CodeGenerator { // 包配置 PackageConfig pc = new PackageConfig(); pc.setModuleName(scanner("模块名")); - pc.setParent("com.songpeng.sparchetype"); + pc.setParent("com.wangziyang.mes"); mpg.setPackageInfo(pc); // 自定义配置 @@ -104,12 +104,12 @@ public class CodeGenerator { StrategyConfig strategy = new StrategyConfig(); strategy.setNaming(NamingStrategy.underline_to_camel); strategy.setColumnNaming(NamingStrategy.underline_to_camel); - strategy.setSuperEntityClass("com.songpeng.sparchetype.common.BaseEntity"); + strategy.setSuperEntityClass("com.wangziyang.mes.common.BaseEntity"); strategy.setEntityLombokModel(true); //strategy.setRestControllerStyle(true); strategy.setRestControllerStyle(false); // 公共父类 - strategy.setSuperControllerClass("com.songpeng.sparchetype.common.BaseController"); + strategy.setSuperControllerClass("com.wangziyang.mes.common.BaseController"); // 写于父类中的公共字段 strategy.setSuperEntityColumns("id", "create_time", "create_username", "update_time", "update_username"); strategy.setInclude(scanner("表名，多个英文逗号分割").split(",")); diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HashUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/HashUtil.java similarity index 99% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HashUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/HashUtil.java index 896bd89..d316e00 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HashUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/HashUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HttpUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/HttpUtil.java similarity index 93% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HttpUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/HttpUtil.java index ca9c5ea..aebfd71 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/HttpUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/HttpUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import org.apache.commons.lang3.StringUtils; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/IdUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/IdUtil.java similarity index 99% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/IdUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/IdUtil.java index 174c9da..e6a8bdf 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/IdUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/IdUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/RandomVerificationCodeUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/RandomVerificationCodeUtil.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/RandomVerificationCodeUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/RandomVerificationCodeUtil.java index a53f9df..12ef914 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/RandomVerificationCodeUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/RandomVerificationCodeUtil.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/TreeUtil.java b/mes/src/main/java/com/wangziyang/mes/common/util/TreeUtil.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/common/util/TreeUtil.java rename to mes/src/main/java/com/wangziyang/mes/common/util/TreeUtil.java index 3b963cb..845a4b9 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/common/util/TreeUtil.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/TreeUtil.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.common.util; +package com.wangziyang.mes.common.util; -import com.songpeng.sparchetype.system.vo.TreeVO; +import com.wangziyang.mes.system.vo.TreeVO; import java.util.ArrayList; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/company/client/CompanyController.java b/mes/src/main/java/com/wangziyang/mes/company/client/CompanyController.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/company/client/CompanyController.java rename to mes/src/main/java/com/wangziyang/mes/company/client/CompanyController.java index 58942bc..a2d5906 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/company/client/CompanyController.java +++ b/mes/src/main/java/com/wangziyang/mes/company/client/CompanyController.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.company.client; +package com.wangziyang.mes.company.client; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/package-info.java b/mes/src/main/java/com/wangziyang/mes/package-info.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/package-info.java rename to mes/src/main/java/com/wangziyang/mes/package-info.java index cfc5a30..15314d0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/package-info.java +++ b/mes/src/main/java/com/wangziyang/mes/package-info.java @@ -16,4 +16,4 @@ * 5） 删除的方法用 remove/delete 做前缀。 * 6） 修改的方法用 update 做前缀。 */ -package com.songpeng.sparchetype; \ No newline at end of file +package com.wangziyang.mes; \ No newline at end of file diff --git a/mes/src/main/java/com/wangziyang/mes/system/config/package-info.java b/mes/src/main/java/com/wangziyang/mes/system/config/package-info.java new file mode 100644 index 0000000..4024626 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/system/config/package-info.java @@ -0,0 +1,4 @@ +/** + * 系统配置 + */ +package com.wangziyang.mes.system.config; \ No newline at end of file diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCache.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCache.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCache.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCache.java index 08c5cd4..08d413e 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCache.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCache.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.CacheException; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCacheManager.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCacheManager.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCacheManager.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCacheManager.java index a0a6b36..951a1d9 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisCacheManager.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisCacheManager.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.CacheException; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisManager.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisManager.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisManager.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisManager.java index 6e0eecd..3689900 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisManager.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisManager.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.springframework.beans.factory.annotation.Value; import redis.clients.jedis.Jedis; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisSessionDAO.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisSessionDAO.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisSessionDAO.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisSessionDAO.java index d6eee84..515944a 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RedisSessionDAO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RedisSessionDAO.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.apache.shiro.session.Session; import org.apache.shiro.session.UnknownSessionException; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RetryLimitCredentialsMatcher.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RetryLimitCredentialsMatcher.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RetryLimitCredentialsMatcher.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/RetryLimitCredentialsMatcher.java index 70ff6a2..6f5f7a6 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/RetryLimitCredentialsMatcher.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/RetryLimitCredentialsMatcher.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SerializeUtils.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SerializeUtils.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SerializeUtils.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/SerializeUtils.java index fbe51af..383856e 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SerializeUtils.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SerializeUtils.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroConfig.java similarity index 99% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroConfig.java index 813d731..83f6dd5 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroConfig.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.apache.shiro.cache.ehcache.EhCacheManager; import org.apache.shiro.mgt.SecurityManager; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroRealm.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroRealm.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroRealm.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroRealm.java index 191a7fe..da667b4 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroRealm.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/ShiroRealm.java @@ -1,10 +1,10 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; -import com.songpeng.sparchetype.system.dto.SysMenuDTO; -import com.songpeng.sparchetype.system.dto.SysRoleDTO; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.enums.SysUserEnum; -import com.songpeng.sparchetype.system.service.ISysUserService; +import com.wangziyang.mes.system.dto.SysMenuDTO; +import com.wangziyang.mes.system.dto.SysRoleDTO; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.enums.SysUserEnum; +import com.wangziyang.mes.system.service.ISysUserService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.*; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpLoginFormFilter.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpLoginFormFilter.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpLoginFormFilter.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpLoginFormFilter.java index 49e3f40..3b180ae 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpLoginFormFilter.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpLoginFormFilter.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; -import com.songpeng.sparchetype.common.util.HttpUtil; +import com.wangziyang.mes.common.util.HttpUtil; import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpSessionListener.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpSessionListener.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpSessionListener.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpSessionListener.java index e2031aa..3802576 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpSessionListener.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpSessionListener.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.apache.shiro.session.Session; import org.apache.shiro.session.SessionListener; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpUsernamePasswordToken.java b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpUsernamePasswordToken.java similarity index 90% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpUsernamePasswordToken.java rename to mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpUsernamePasswordToken.java index 8ef7296..4577a14 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/SpUsernamePasswordToken.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/shiro/SpUsernamePasswordToken.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.shiro; +package com.wangziyang.mes.system.config.shiro; import org.apache.shiro.authc.UsernamePasswordToken; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/swagger/SwaggerConfig.java b/mes/src/main/java/com/wangziyang/mes/system/config/swagger/SwaggerConfig.java similarity index 96% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/config/swagger/SwaggerConfig.java rename to mes/src/main/java/com/wangziyang/mes/system/config/swagger/SwaggerConfig.java index d332e06..4f3e024 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/swagger/SwaggerConfig.java +++ b/mes/src/main/java/com/wangziyang/mes/system/config/swagger/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.config.swagger; +package com.wangziyang.mes.system.config.swagger; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDepartmentController.java similarity index 84% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDepartmentController.java index 8215ce6..8541a8f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDepartmentController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDepartmentController.java @@ -1,13 +1,13 @@ -package com.songpeng.sparchetype.system.controller.admin; +package com.wangziyang.mes.system.controller.admin; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysDepartment; -import com.songpeng.sparchetype.system.entity.SysDict; -import com.songpeng.sparchetype.system.request.SysDepartmentPageReq; -import com.songpeng.sparchetype.system.service.ISysDepartmentService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysDepartment; +import com.wangziyang.mes.system.entity.SysDict; +import com.wangziyang.mes.system.request.SysDepartmentPageReq; +import com.wangziyang.mes.system.service.ISysDepartmentService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDictController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDictController.java similarity index 86% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDictController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDictController.java index 803f51b..99feeb2 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysDictController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysDictController.java @@ -1,12 +1,12 @@ -package com.songpeng.sparchetype.system.controller.admin; +package com.wangziyang.mes.system.controller.admin; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysDict; -import com.songpeng.sparchetype.system.request.SysDictPageReq; -import com.songpeng.sparchetype.system.service.ISysDictService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysDict; +import com.wangziyang.mes.system.request.SysDictPageReq; +import com.wangziyang.mes.system.service.ISysDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysLoginController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysLoginController.java similarity index 87% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysLoginController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysLoginController.java index 441c166..23f7312 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysLoginController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysLoginController.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.system.controller.admin; +package com.wangziyang.mes.system.controller.admin; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.service.ISysMenuService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.service.ISysMenuService; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysMenuController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysMenuController.java similarity index 83% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysMenuController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysMenuController.java index bc86b8b..fdfe6c0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysMenuController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysMenuController.java @@ -1,13 +1,13 @@ -package com.songpeng.sparchetype.system.controller.admin; +package com.wangziyang.mes.system.controller.admin; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysMenu; -import com.songpeng.sparchetype.system.request.SysMenuPageReq; -import com.songpeng.sparchetype.system.service.ISysMenuService; -import com.songpeng.sparchetype.system.vo.TreeVO; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysMenu; +import com.wangziyang.mes.system.request.SysMenuPageReq; +import com.wangziyang.mes.system.service.ISysMenuService; +import com.wangziyang.mes.system.vo.TreeVO; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysRoleController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysRoleController.java similarity index 83% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysRoleController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysRoleController.java index 0a04bff..c2ad168 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysRoleController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysRoleController.java @@ -1,13 +1,13 @@ -package com.songpeng.sparchetype.system.controller.admin; +package com.wangziyang.mes.system.controller.admin; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.entity.SysRole; -import com.songpeng.sparchetype.system.request.SysRolePageReq; -import com.songpeng.sparchetype.system.service.ISysRoleService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.entity.SysRole; +import com.wangziyang.mes.system.request.SysRolePageReq; +import com.wangziyang.mes.system.service.ISysRoleService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysToolController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysToolController.java similarity index 93% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysToolController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysToolController.java index 70a0556..3385458 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysToolController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysToolController.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.controller.admin; +package com.wangziyang.mes.system.controller.admin; -import com.songpeng.sparchetype.common.BaseController; +import com.wangziyang.mes.common.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysUserController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysUserController.java similarity index 83% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysUserController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysUserController.java index 76365df..533b26d 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/admin/SysUserController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/admin/SysUserController.java @@ -1,15 +1,15 @@ -package com.songpeng.sparchetype.system.controller.admin; +package com.wangziyang.mes.system.controller.admin; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.songpeng.sparchetype.common.BaseController; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.system.dto.SysRoleDTO; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysUser; -import com.songpeng.sparchetype.system.request.SysUserPageReq; -import com.songpeng.sparchetype.system.service.ISysRoleService; -import com.songpeng.sparchetype.system.service.ISysUserService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.system.dto.SysRoleDTO; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysUser; +import com.wangziyang.mes.system.request.SysUserPageReq; +import com.wangziyang.mes.system.service.ISysRoleService; +import com.wangziyang.mes.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java b/mes/src/main/java/com/wangziyang/mes/system/controller/client/SysLoginController.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java rename to mes/src/main/java/com/wangziyang/mes/system/controller/client/SysLoginController.java index 2eef3d9..7db2f06 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java +++ b/mes/src/main/java/com/wangziyang/mes/system/controller/client/SysLoginController.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.system.controller.client; +package com.wangziyang.mes.system.controller.client; -import com.songpeng.sparchetype.common.Result; -import com.songpeng.sparchetype.common.util.RandomVerificationCodeUtil; -import com.songpeng.sparchetype.system.config.shiro.SpUsernamePasswordToken; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.common.util.RandomVerificationCodeUtil; +import com.wangziyang.mes.system.config.shiro.SpUsernamePasswordToken; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.*; diff --git a/mes/src/main/java/com/wangziyang/mes/system/dto/SysDictDTO.java b/mes/src/main/java/com/wangziyang/mes/system/dto/SysDictDTO.java new file mode 100644 index 0000000..38d5fad --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/system/dto/SysDictDTO.java @@ -0,0 +1,10 @@ +package com.wangziyang.mes.system.dto; + +import com.wangziyang.mes.system.entity.SysDict; + +/** + * @author SongPeng + * @date 2019/9/30 9:49 + */ +public class SysDictDTO extends SysDict { +} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysMenuDTO.java b/mes/src/main/java/com/wangziyang/mes/system/dto/SysMenuDTO.java similarity index 53% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysMenuDTO.java rename to mes/src/main/java/com/wangziyang/mes/system/dto/SysMenuDTO.java index cd25aa1..a210434 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysMenuDTO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/dto/SysMenuDTO.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.dto; +package com.wangziyang.mes.system.dto; -import com.songpeng.sparchetype.system.entity.SysMenu; +import com.wangziyang.mes.system.entity.SysMenu; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysRoleDTO.java b/mes/src/main/java/com/wangziyang/mes/system/dto/SysRoleDTO.java similarity index 86% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysRoleDTO.java rename to mes/src/main/java/com/wangziyang/mes/system/dto/SysRoleDTO.java index 6671e16..f1f895d 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysRoleDTO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/dto/SysRoleDTO.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.dto; +package com.wangziyang.mes.system.dto; -import com.songpeng.sparchetype.system.entity.SysRole; +import com.wangziyang.mes.system.entity.SysRole; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysUserDTO.java b/mes/src/main/java/com/wangziyang/mes/system/dto/SysUserDTO.java similarity index 87% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysUserDTO.java rename to mes/src/main/java/com/wangziyang/mes/system/dto/SysUserDTO.java index 7dfa91c..55a4056 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysUserDTO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/dto/SysUserDTO.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.dto; +package com.wangziyang.mes.system.dto; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.system.entity.SysUser; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysDepartment.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysDepartment.java index 2de0a3b..bf64ed3 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDepartment.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysDepartment.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDict.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysDict.java similarity index 94% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDict.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysDict.java index cabb8a5..a76a423 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysDict.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysDict.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysMenu.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysMenu.java similarity index 95% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysMenu.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysMenu.java index 76b0805..12e6d47 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysMenu.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysMenu.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRole.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysRole.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRole.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysRole.java index be8d516..e024136 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRole.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysRole.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRoleMenu.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysRoleMenu.java similarity index 87% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRoleMenu.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysRoleMenu.java index 9300e1f..5cdbcb8 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysRoleMenu.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysRoleMenu.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUser.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysUser.java similarity index 97% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUser.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysUser.java index 2906a96..24fab90 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUser.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysUser.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; import java.time.LocalDateTime; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUserRole.java b/mes/src/main/java/com/wangziyang/mes/system/entity/SysUserRole.java similarity index 87% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUserRole.java rename to mes/src/main/java/com/wangziyang/mes/system/entity/SysUserRole.java index 31a41ec..9b08cfd 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/entity/SysUserRole.java +++ b/mes/src/main/java/com/wangziyang/mes/system/entity/SysUserRole.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.entity; +package com.wangziyang.mes.system.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.songpeng.sparchetype.common.BaseEntity; +import com.wangziyang.mes.common.BaseEntity; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysMenuEnum.java b/mes/src/main/java/com/wangziyang/mes/system/enums/SysMenuEnum.java similarity index 92% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysMenuEnum.java rename to mes/src/main/java/com/wangziyang/mes/system/enums/SysMenuEnum.java index 6b73da9..27b4bc9 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysMenuEnum.java +++ b/mes/src/main/java/com/wangziyang/mes/system/enums/SysMenuEnum.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.enums; +package com.wangziyang.mes.system.enums; /** * 系统用户枚举 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysRoleEnum.java b/mes/src/main/java/com/wangziyang/mes/system/enums/SysRoleEnum.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysRoleEnum.java rename to mes/src/main/java/com/wangziyang/mes/system/enums/SysRoleEnum.java index fa03b62..334094f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysRoleEnum.java +++ b/mes/src/main/java/com/wangziyang/mes/system/enums/SysRoleEnum.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.enums; +package com.wangziyang.mes.system.enums; /** * 系统用户枚举 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysUserEnum.java b/mes/src/main/java/com/wangziyang/mes/system/enums/SysUserEnum.java similarity index 91% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysUserEnum.java rename to mes/src/main/java/com/wangziyang/mes/system/enums/SysUserEnum.java index b770f03..2c29cdb 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/enums/SysUserEnum.java +++ b/mes/src/main/java/com/wangziyang/mes/system/enums/SysUserEnum.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.enums; +package com.wangziyang.mes.system.enums; /** * 系统用户枚举 diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysDepartmentMapper.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysDepartmentMapper.java index 31df9dd..c99b93b 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDepartmentMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysDepartmentMapper.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.mapper; +package com.wangziyang.mes.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.system.entity.SysDepartment; +import com.wangziyang.mes.system.entity.SysDepartment; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDictMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysDictMapper.java similarity index 68% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDictMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysDictMapper.java index 4556dbb..ab4e9b5 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysDictMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysDictMapper.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.mapper; +package com.wangziyang.mes.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.system.entity.SysDict; +import com.wangziyang.mes.system.entity.SysDict; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysMenuMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysMenuMapper.java similarity index 71% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysMenuMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysMenuMapper.java index a35ffb9..e900981 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysMenuMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysMenuMapper.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.system.mapper; +package com.wangziyang.mes.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.system.dto.SysMenuDTO; -import com.songpeng.sparchetype.system.entity.SysMenu; +import com.wangziyang.mes.system.dto.SysMenuDTO; +import com.wangziyang.mes.system.entity.SysMenu; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMapper.java similarity index 79% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMapper.java index f473376..d5f0356 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.mapper; +package com.wangziyang.mes.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.system.entity.SysRole; +import com.wangziyang.mes.system.entity.SysRole; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMenuMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMenuMapper.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMenuMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMenuMapper.java index ec46c3f..77f6353 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysRoleMenuMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.mapper; +package com.wangziyang.mes.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.system.entity.SysRoleMenu; +import com.wangziyang.mes.system.entity.SysRoleMenu; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserMapper.java similarity index 64% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserMapper.java index 8d16115..62b64de 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserMapper.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.system.mapper; +package com.wangziyang.mes.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysUser; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserRoleMapper.java b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserRoleMapper.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserRoleMapper.java rename to mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserRoleMapper.java index 6d91334..463addf 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/mapper/SysUserRoleMapper.java +++ b/mes/src/main/java/com/wangziyang/mes/system/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.mapper; +package com.wangziyang.mes.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.songpeng.sparchetype.system.entity.SysUserRole; +import com.wangziyang.mes.system.entity.SysUserRole; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDepartmentPageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysDepartmentPageReq.java similarity index 61% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDepartmentPageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysDepartmentPageReq.java index 7088560..fba25b8 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDepartmentPageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysDepartmentPageReq.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.request; +package com.wangziyang.mes.system.request; -import com.songpeng.sparchetype.common.BasePageReq; +import com.wangziyang.mes.common.BasePageReq; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDictPageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysDictPageReq.java similarity index 60% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDictPageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysDictPageReq.java index 73ce072..7c5749e 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysDictPageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysDictPageReq.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.request; +package com.wangziyang.mes.system.request; -import com.songpeng.sparchetype.common.BasePageReq; +import com.wangziyang.mes.common.BasePageReq; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysMenuPageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysMenuPageReq.java similarity index 60% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysMenuPageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysMenuPageReq.java index ca3f9e9..0f5ae8f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysMenuPageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysMenuPageReq.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.request; +package com.wangziyang.mes.system.request; -import com.songpeng.sparchetype.common.BasePageReq; +import com.wangziyang.mes.common.BasePageReq; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysRolePageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysRolePageReq.java similarity index 60% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysRolePageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysRolePageReq.java index 99ab4c0..98752f0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysRolePageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysRolePageReq.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.request; +package com.wangziyang.mes.system.request; -import com.songpeng.sparchetype.common.BasePageReq; +import com.wangziyang.mes.common.BasePageReq; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysUserPageReq.java b/mes/src/main/java/com/wangziyang/mes/system/request/SysUserPageReq.java similarity index 85% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysUserPageReq.java rename to mes/src/main/java/com/wangziyang/mes/system/request/SysUserPageReq.java index df13e92..06983e7 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/request/SysUserPageReq.java +++ b/mes/src/main/java/com/wangziyang/mes/system/request/SysUserPageReq.java @@ -1,6 +1,6 @@ -package com.songpeng.sparchetype.system.request; +package com.wangziyang.mes.system.request; -import com.songpeng.sparchetype.common.BasePageReq; +import com.wangziyang.mes.common.BasePageReq; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysDepartmentService.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysDepartmentService.java index 32a1708..c1307ea 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDepartmentService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysDepartmentService.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.service; +package com.wangziyang.mes.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.system.entity.SysDepartment; +import com.wangziyang.mes.system.entity.SysDepartment; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDictService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysDictService.java similarity index 68% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDictService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysDictService.java index 10b500f..350ac70 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysDictService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysDictService.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.service; +package com.wangziyang.mes.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.system.entity.SysDict; +import com.wangziyang.mes.system.entity.SysDict; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysMenuService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysMenuService.java similarity index 79% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysMenuService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysMenuService.java index 2c65dfd..e327411 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysMenuService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysMenuService.java @@ -1,9 +1,9 @@ -package com.songpeng.sparchetype.system.service; +package com.wangziyang.mes.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.system.dto.SysMenuDTO; -import com.songpeng.sparchetype.system.entity.SysMenu; -import com.songpeng.sparchetype.system.vo.TreeVO; +import com.wangziyang.mes.system.dto.SysMenuDTO; +import com.wangziyang.mes.system.entity.SysMenu; +import com.wangziyang.mes.system.vo.TreeVO; import java.util.List; import java.util.Map; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleMenuService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleMenuService.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleMenuService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleMenuService.java index aa5bd98..6ec57cd 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleMenuService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleMenuService.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.service; +package com.wangziyang.mes.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.system.entity.SysRoleMenu; +import com.wangziyang.mes.system.entity.SysRoleMenu; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleService.java similarity index 75% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleService.java index b2bfdab..d8ed6d5 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysRoleService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysRoleService.java @@ -1,10 +1,10 @@ -package com.songpeng.sparchetype.system.service; +package com.wangziyang.mes.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.system.dto.SysRoleDTO; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysRole; +import com.wangziyang.mes.system.dto.SysRoleDTO; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysRole; import java.util.List; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserRoleService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysUserRoleService.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserRoleService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysUserRoleService.java index 071d6c9..a09e398 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserRoleService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysUserRoleService.java @@ -1,7 +1,7 @@ -package com.songpeng.sparchetype.system.service; +package com.wangziyang.mes.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.system.entity.SysUserRole; +import com.wangziyang.mes.system.entity.SysUserRole; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserService.java b/mes/src/main/java/com/wangziyang/mes/system/service/ISysUserService.java similarity index 82% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserService.java rename to mes/src/main/java/com/wangziyang/mes/system/service/ISysUserService.java index 788fe2c..a92614f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/ISysUserService.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/ISysUserService.java @@ -1,8 +1,8 @@ -package com.songpeng.sparchetype.system.service; +package com.wangziyang.mes.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysUser; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysUser; /** *

diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDepartmentServiceImpl.java similarity index 57% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDepartmentServiceImpl.java index ec33587..57eb11f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDepartmentServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDepartmentServiceImpl.java @@ -1,9 +1,9 @@ -package com.songpeng.sparchetype.system.service.impl; +package com.wangziyang.mes.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.system.entity.SysDepartment; -import com.songpeng.sparchetype.system.mapper.SysDepartmentMapper; -import com.songpeng.sparchetype.system.service.ISysDepartmentService; +import com.wangziyang.mes.system.entity.SysDepartment; +import com.wangziyang.mes.system.mapper.SysDepartmentMapper; +import com.wangziyang.mes.system.service.ISysDepartmentService; import org.springframework.stereotype.Service; /** diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDictServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDictServiceImpl.java similarity index 66% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDictServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDictServiceImpl.java index 3b17d13..85721e0 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysDictServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysDictServiceImpl.java @@ -1,9 +1,9 @@ -package com.songpeng.sparchetype.system.service.impl; +package com.wangziyang.mes.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.system.entity.SysDict; -import com.songpeng.sparchetype.system.mapper.SysDictMapper; -import com.songpeng.sparchetype.system.service.ISysDictService; +import com.wangziyang.mes.system.entity.SysDict; +import com.wangziyang.mes.system.mapper.SysDictMapper; +import com.wangziyang.mes.system.service.ISysDictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysMenuServiceImpl.java similarity index 89% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysMenuServiceImpl.java index fe41388..df152bc 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysMenuServiceImpl.java @@ -1,12 +1,12 @@ -package com.songpeng.sparchetype.system.service.impl; +package com.wangziyang.mes.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.common.util.TreeUtil; -import com.songpeng.sparchetype.system.dto.SysMenuDTO; -import com.songpeng.sparchetype.system.entity.SysMenu; -import com.songpeng.sparchetype.system.mapper.SysMenuMapper; -import com.songpeng.sparchetype.system.service.ISysMenuService; -import com.songpeng.sparchetype.system.vo.TreeVO; +import com.wangziyang.mes.common.util.TreeUtil; +import com.wangziyang.mes.system.dto.SysMenuDTO; +import com.wangziyang.mes.system.entity.SysMenu; +import com.wangziyang.mes.system.mapper.SysMenuMapper; +import com.wangziyang.mes.system.service.ISysMenuService; +import com.wangziyang.mes.system.vo.TreeVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleMenuServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleMenuServiceImpl.java similarity index 57% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleMenuServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleMenuServiceImpl.java index aacbe1e..3b80cdc 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleMenuServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleMenuServiceImpl.java @@ -1,9 +1,9 @@ -package com.songpeng.sparchetype.system.service.impl; +package com.wangziyang.mes.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.system.entity.SysRoleMenu; -import com.songpeng.sparchetype.system.mapper.SysRoleMenuMapper; -import com.songpeng.sparchetype.system.service.ISysRoleMenuService; +import com.wangziyang.mes.system.entity.SysRoleMenu; +import com.wangziyang.mes.system.mapper.SysRoleMenuMapper; +import com.wangziyang.mes.system.service.ISysRoleMenuService; import org.springframework.stereotype.Service; /** diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleServiceImpl.java similarity index 82% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleServiceImpl.java index 84276b2..850cc3f 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysRoleServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysRoleServiceImpl.java @@ -1,16 +1,16 @@ -package com.songpeng.sparchetype.system.service.impl; +package com.wangziyang.mes.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.common.enums.CommonEnum; -import com.songpeng.sparchetype.system.dto.SysRoleDTO; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysRole; -import com.songpeng.sparchetype.system.entity.SysUserRole; -import com.songpeng.sparchetype.system.enums.SysRoleEnum; -import com.songpeng.sparchetype.system.mapper.SysRoleMapper; -import com.songpeng.sparchetype.system.service.ISysRoleService; -import com.songpeng.sparchetype.system.service.ISysUserRoleService; +import com.wangziyang.mes.common.enums.CommonEnum; +import com.wangziyang.mes.system.dto.SysRoleDTO; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysRole; +import com.wangziyang.mes.system.entity.SysUserRole; +import com.wangziyang.mes.system.enums.SysRoleEnum; +import com.wangziyang.mes.system.mapper.SysRoleMapper; +import com.wangziyang.mes.system.service.ISysRoleService; +import com.wangziyang.mes.system.service.ISysUserRoleService; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserRoleServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserRoleServiceImpl.java similarity index 57% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserRoleServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserRoleServiceImpl.java index 81ce7a3..307b69a 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserRoleServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserRoleServiceImpl.java @@ -1,9 +1,9 @@ -package com.songpeng.sparchetype.system.service.impl; +package com.wangziyang.mes.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.system.entity.SysUserRole; -import com.songpeng.sparchetype.system.mapper.SysUserRoleMapper; -import com.songpeng.sparchetype.system.service.ISysUserRoleService; +import com.wangziyang.mes.system.entity.SysUserRole; +import com.wangziyang.mes.system.mapper.SysUserRoleMapper; +import com.wangziyang.mes.system.service.ISysUserRoleService; import org.springframework.stereotype.Service; /** diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserServiceImpl.java similarity index 78% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserServiceImpl.java rename to mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserServiceImpl.java index 9be7128..f292734 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysUserServiceImpl.java +++ b/mes/src/main/java/com/wangziyang/mes/system/service/impl/SysUserServiceImpl.java @@ -1,14 +1,14 @@ -package com.songpeng.sparchetype.system.service.impl; +package com.wangziyang.mes.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.songpeng.sparchetype.system.dto.SysMenuDTO; -import com.songpeng.sparchetype.system.dto.SysRoleDTO; -import com.songpeng.sparchetype.system.dto.SysUserDTO; -import com.songpeng.sparchetype.system.entity.SysUser; -import com.songpeng.sparchetype.system.mapper.SysUserMapper; -import com.songpeng.sparchetype.system.service.ISysMenuService; -import com.songpeng.sparchetype.system.service.ISysRoleService; -import com.songpeng.sparchetype.system.service.ISysUserService; +import com.wangziyang.mes.system.dto.SysMenuDTO; +import com.wangziyang.mes.system.dto.SysRoleDTO; +import com.wangziyang.mes.system.dto.SysUserDTO; +import com.wangziyang.mes.system.entity.SysUser; +import com.wangziyang.mes.system.mapper.SysUserMapper; +import com.wangziyang.mes.system.service.ISysMenuService; +import com.wangziyang.mes.system.service.ISysRoleService; +import com.wangziyang.mes.system.service.ISysUserService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/vo/TreeVO.java b/mes/src/main/java/com/wangziyang/mes/system/vo/TreeVO.java similarity index 98% rename from sparchetype/src/main/java/com/songpeng/sparchetype/system/vo/TreeVO.java rename to mes/src/main/java/com/wangziyang/mes/system/vo/TreeVO.java index 86ede6d..aa062ae 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/vo/TreeVO.java +++ b/mes/src/main/java/com/wangziyang/mes/system/vo/TreeVO.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype.system.vo; +package com.wangziyang.mes.system.vo; import java.util.ArrayList; import java.util.List; diff --git a/sparchetype/src/main/resources/application-dev.yml b/mes/src/main/resources/application-dev.yml similarity index 100% rename from sparchetype/src/main/resources/application-dev.yml rename to mes/src/main/resources/application-dev.yml diff --git a/sparchetype/src/main/resources/application-pro.yml b/mes/src/main/resources/application-pro.yml similarity index 100% rename from sparchetype/src/main/resources/application-pro.yml rename to mes/src/main/resources/application-pro.yml diff --git a/sparchetype/src/main/resources/application.yml b/mes/src/main/resources/application.yml similarity index 85% rename from sparchetype/src/main/resources/application.yml rename to mes/src/main/resources/application.yml index 584e7ea..d1e5c5d 100644 --- a/sparchetype/src/main/resources/application.yml +++ b/mes/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: config: classpath:config/ehcache.xml swagger: - controller: com.songpeng.sparchetype + controller: com.wangziyang.mes description: MES接口管理 enable: true license: wangziyang diff --git a/sparchetype/src/main/resources/ehcache.xml b/mes/src/main/resources/ehcache.xml similarity index 100% rename from sparchetype/src/main/resources/ehcache.xml rename to mes/src/main/resources/ehcache.xml diff --git a/sparchetype/src/main/resources/logback.xml b/mes/src/main/resources/logback.xml similarity index 100% rename from sparchetype/src/main/resources/logback.xml rename to mes/src/main/resources/logback.xml diff --git a/sparchetype/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml b/mes/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml similarity index 84% rename from sparchetype/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml rename to mes/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml index 699c1f2..551f786 100644 --- a/sparchetype/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml +++ b/mes/src/main/resources/mapper/basedata/SpTableManagerItemMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/sparchetype/src/main/resources/mapper/basedata/SpTableManagerMapper.xml b/mes/src/main/resources/mapper/basedata/SpTableManagerMapper.xml similarity index 70% rename from sparchetype/src/main/resources/mapper/basedata/SpTableManagerMapper.xml rename to mes/src/main/resources/mapper/basedata/SpTableManagerMapper.xml index 87935c8..a8b9481 100644 --- a/sparchetype/src/main/resources/mapper/basedata/SpTableManagerMapper.xml +++ b/mes/src/main/resources/mapper/basedata/SpTableManagerMapper.xml @@ -1,13 +1,13 @@ - - + + - diff --git a/sparchetype/src/main/resources/mapper/system/SysIDepartmentMapper.xml b/mes/src/main/resources/mapper/system/SysDictMapper.xml similarity index 66% rename from sparchetype/src/main/resources/mapper/system/SysIDepartmentMapper.xml rename to mes/src/main/resources/mapper/system/SysDictMapper.xml index 35dccc2..d0e6709 100644 --- a/sparchetype/src/main/resources/mapper/system/SysIDepartmentMapper.xml +++ b/mes/src/main/resources/mapper/system/SysDictMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/sparchetype/src/main/resources/mapper/system/SysDictMapper.xml b/mes/src/main/resources/mapper/system/SysIDepartmentMapper.xml similarity index 72% rename from sparchetype/src/main/resources/mapper/system/SysDictMapper.xml rename to mes/src/main/resources/mapper/system/SysIDepartmentMapper.xml index 75a5670..0c3287a 100644 --- a/sparchetype/src/main/resources/mapper/system/SysDictMapper.xml +++ b/mes/src/main/resources/mapper/system/SysIDepartmentMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/sparchetype/src/main/resources/mapper/system/SysMenuMapper.xml b/mes/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 82% rename from sparchetype/src/main/resources/mapper/system/SysMenuMapper.xml rename to mes/src/main/resources/mapper/system/SysMenuMapper.xml index 8395678..44632d3 100644 --- a/sparchetype/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/mes/src/main/resources/mapper/system/SysMenuMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,7 +18,7 @@ - + diff --git a/sparchetype/src/main/resources/mapper/system/SysRoleMapper.xml b/mes/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 87% rename from sparchetype/src/main/resources/mapper/system/SysRoleMapper.xml rename to mes/src/main/resources/mapper/system/SysRoleMapper.xml index 9859dd2..781c66e 100644 --- a/sparchetype/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/mes/src/main/resources/mapper/system/SysRoleMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/sparchetype/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/mes/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 66% rename from sparchetype/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to mes/src/main/resources/mapper/system/SysRoleMenuMapper.xml index e171933..1edbb68 100644 --- a/sparchetype/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/mes/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/sparchetype/src/main/resources/mapper/system/SysUserMapper.xml b/mes/src/main/resources/mapper/system/SysUserMapper.xml similarity index 90% rename from sparchetype/src/main/resources/mapper/system/SysUserMapper.xml rename to mes/src/main/resources/mapper/system/SysUserMapper.xml index 1d47213..1817586 100644 --- a/sparchetype/src/main/resources/mapper/system/SysUserMapper.xml +++ b/mes/src/main/resources/mapper/system/SysUserMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -29,8 +29,8 @@ - - + + diff --git a/sparchetype/src/main/resources/mapper/system/SysUserRoleMapper.xml b/mes/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 66% rename from sparchetype/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to mes/src/main/resources/mapper/system/SysUserRoleMapper.xml index 7b56f8c..edd5d95 100644 --- a/sparchetype/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/mes/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/sparchetype/src/main/resources/static/css/admin.css b/mes/src/main/resources/static/css/admin.css similarity index 100% rename from sparchetype/src/main/resources/static/css/admin.css rename to mes/src/main/resources/static/css/admin.css diff --git a/sparchetype/src/main/resources/static/css/client.css b/mes/src/main/resources/static/css/client.css similarity index 100% rename from sparchetype/src/main/resources/static/css/client.css rename to mes/src/main/resources/static/css/client.css diff --git a/sparchetype/src/main/resources/static/css/company.css b/mes/src/main/resources/static/css/company.css similarity index 100% rename from sparchetype/src/main/resources/static/css/company.css rename to mes/src/main/resources/static/css/company.css diff --git a/sparchetype/src/main/resources/static/css/public.css b/mes/src/main/resources/static/css/public.css similarity index 100% rename from sparchetype/src/main/resources/static/css/public.css rename to mes/src/main/resources/static/css/public.css diff --git a/sparchetype/src/main/resources/static/css/splayui.css b/mes/src/main/resources/static/css/splayui.css similarity index 100% rename from sparchetype/src/main/resources/static/css/splayui.css rename to mes/src/main/resources/static/css/splayui.css diff --git a/sparchetype/src/main/resources/static/css/start.css b/mes/src/main/resources/static/css/start.css similarity index 100% rename from sparchetype/src/main/resources/static/css/start.css rename to mes/src/main/resources/static/css/start.css diff --git a/sparchetype/src/main/resources/static/favicon.ico b/mes/src/main/resources/static/favicon.ico similarity index 100% rename from sparchetype/src/main/resources/static/favicon.ico rename to mes/src/main/resources/static/favicon.ico diff --git a/sparchetype/src/main/resources/static/image/bg.jpg b/mes/src/main/resources/static/image/bg.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/bg.jpg rename to mes/src/main/resources/static/image/bg.jpg diff --git a/sparchetype/src/main/resources/static/image/captcha.jpg b/mes/src/main/resources/static/image/captcha.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/captcha.jpg rename to mes/src/main/resources/static/image/captcha.jpg diff --git a/sparchetype/src/main/resources/static/image/company/Big_icon1.png b/mes/src/main/resources/static/image/company/Big_icon1.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/Big_icon1.png rename to mes/src/main/resources/static/image/company/Big_icon1.png diff --git a/sparchetype/src/main/resources/static/image/company/Big_icon2.png b/mes/src/main/resources/static/image/company/Big_icon2.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/Big_icon2.png rename to mes/src/main/resources/static/image/company/Big_icon2.png diff --git a/sparchetype/src/main/resources/static/image/company/Big_icon3.png b/mes/src/main/resources/static/image/company/Big_icon3.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/Big_icon3.png rename to mes/src/main/resources/static/image/company/Big_icon3.png diff --git a/sparchetype/src/main/resources/static/image/company/Big_icon4.png b/mes/src/main/resources/static/image/company/Big_icon4.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/Big_icon4.png rename to mes/src/main/resources/static/image/company/Big_icon4.png diff --git a/sparchetype/src/main/resources/static/image/company/Product_img1.jpg b/mes/src/main/resources/static/image/company/Product_img1.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/Product_img1.jpg rename to mes/src/main/resources/static/image/company/Product_img1.jpg diff --git a/sparchetype/src/main/resources/static/image/company/Product_img2.jpg b/mes/src/main/resources/static/image/company/Product_img2.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/Product_img2.jpg rename to mes/src/main/resources/static/image/company/Product_img2.jpg diff --git a/sparchetype/src/main/resources/static/image/company/Product_img3.jpg b/mes/src/main/resources/static/image/company/Product_img3.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/Product_img3.jpg rename to mes/src/main/resources/static/image/company/Product_img3.jpg diff --git a/sparchetype/src/main/resources/static/image/company/Product_img4.jpg b/mes/src/main/resources/static/image/company/Product_img4.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/Product_img4.jpg rename to mes/src/main/resources/static/image/company/Product_img4.jpg diff --git a/sparchetype/src/main/resources/static/image/company/banner1.jpg b/mes/src/main/resources/static/image/company/banner1.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/banner1.jpg rename to mes/src/main/resources/static/image/company/banner1.jpg diff --git a/sparchetype/src/main/resources/static/image/company/banner2.jpg b/mes/src/main/resources/static/image/company/banner2.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/banner2.jpg rename to mes/src/main/resources/static/image/company/banner2.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case1.jpg b/mes/src/main/resources/static/image/company/case1.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case1.jpg rename to mes/src/main/resources/static/image/company/case1.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case2.jpg b/mes/src/main/resources/static/image/company/case2.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case2.jpg rename to mes/src/main/resources/static/image/company/case2.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case3.jpg b/mes/src/main/resources/static/image/company/case3.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case3.jpg rename to mes/src/main/resources/static/image/company/case3.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case4.jpg b/mes/src/main/resources/static/image/company/case4.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case4.jpg rename to mes/src/main/resources/static/image/company/case4.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case5.jpg b/mes/src/main/resources/static/image/company/case5.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case5.jpg rename to mes/src/main/resources/static/image/company/case5.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case6.jpg b/mes/src/main/resources/static/image/company/case6.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case6.jpg rename to mes/src/main/resources/static/image/company/case6.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case7.jpg b/mes/src/main/resources/static/image/company/case7.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case7.jpg rename to mes/src/main/resources/static/image/company/case7.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case8.jpg b/mes/src/main/resources/static/image/company/case8.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case8.jpg rename to mes/src/main/resources/static/image/company/case8.jpg diff --git a/sparchetype/src/main/resources/static/image/company/case9.jpg b/mes/src/main/resources/static/image/company/case9.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/case9.jpg rename to mes/src/main/resources/static/image/company/case9.jpg diff --git a/sparchetype/src/main/resources/static/image/company/erweima.jpg b/mes/src/main/resources/static/image/company/erweima.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/erweima.jpg rename to mes/src/main/resources/static/image/company/erweima.jpg diff --git a/sparchetype/src/main/resources/static/image/company/home_img1.jpg b/mes/src/main/resources/static/image/company/home_img1.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/home_img1.jpg rename to mes/src/main/resources/static/image/company/home_img1.jpg diff --git a/sparchetype/src/main/resources/static/image/company/home_img2.jpg b/mes/src/main/resources/static/image/company/home_img2.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/home_img2.jpg rename to mes/src/main/resources/static/image/company/home_img2.jpg diff --git a/sparchetype/src/main/resources/static/image/company/home_img3.jpg b/mes/src/main/resources/static/image/company/home_img3.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/home_img3.jpg rename to mes/src/main/resources/static/image/company/home_img3.jpg diff --git a/sparchetype/src/main/resources/static/image/company/home_img4.jpg b/mes/src/main/resources/static/image/company/home_img4.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/home_img4.jpg rename to mes/src/main/resources/static/image/company/home_img4.jpg diff --git a/sparchetype/src/main/resources/static/image/company/logo.png b/mes/src/main/resources/static/image/company/logo.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/logo.png rename to mes/src/main/resources/static/image/company/logo.png diff --git a/sparchetype/src/main/resources/static/image/company/nav_img1.jpg b/mes/src/main/resources/static/image/company/nav_img1.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/nav_img1.jpg rename to mes/src/main/resources/static/image/company/nav_img1.jpg diff --git a/sparchetype/src/main/resources/static/image/company/nav_img2.jpg b/mes/src/main/resources/static/image/company/nav_img2.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/nav_img2.jpg rename to mes/src/main/resources/static/image/company/nav_img2.jpg diff --git a/sparchetype/src/main/resources/static/image/company/nav_img3.jpg b/mes/src/main/resources/static/image/company/nav_img3.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/nav_img3.jpg rename to mes/src/main/resources/static/image/company/nav_img3.jpg diff --git a/sparchetype/src/main/resources/static/image/company/nav_img4.jpg b/mes/src/main/resources/static/image/company/nav_img4.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/nav_img4.jpg rename to mes/src/main/resources/static/image/company/nav_img4.jpg diff --git a/sparchetype/src/main/resources/static/image/company/news_big.jpg b/mes/src/main/resources/static/image/company/news_big.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/news_big.jpg rename to mes/src/main/resources/static/image/company/news_big.jpg diff --git a/sparchetype/src/main/resources/static/image/company/news_img1.jpg b/mes/src/main/resources/static/image/company/news_img1.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/news_img1.jpg rename to mes/src/main/resources/static/image/company/news_img1.jpg diff --git a/sparchetype/src/main/resources/static/image/company/us_img1.jpg b/mes/src/main/resources/static/image/company/us_img1.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/us_img1.jpg rename to mes/src/main/resources/static/image/company/us_img1.jpg diff --git a/sparchetype/src/main/resources/static/image/company/us_img2.jpg b/mes/src/main/resources/static/image/company/us_img2.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/us_img2.jpg rename to mes/src/main/resources/static/image/company/us_img2.jpg diff --git a/sparchetype/src/main/resources/static/image/company/us_img3.jpg b/mes/src/main/resources/static/image/company/us_img3.jpg similarity index 100% rename from sparchetype/src/main/resources/static/image/company/us_img3.jpg rename to mes/src/main/resources/static/image/company/us_img3.jpg diff --git a/sparchetype/src/main/resources/static/image/company/us_img4.png b/mes/src/main/resources/static/image/company/us_img4.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/us_img4.png rename to mes/src/main/resources/static/image/company/us_img4.png diff --git a/sparchetype/src/main/resources/static/image/company/us_img5.png b/mes/src/main/resources/static/image/company/us_img5.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/us_img5.png rename to mes/src/main/resources/static/image/company/us_img5.png diff --git a/sparchetype/src/main/resources/static/image/company/us_img6.png b/mes/src/main/resources/static/image/company/us_img6.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/us_img6.png rename to mes/src/main/resources/static/image/company/us_img6.png diff --git a/sparchetype/src/main/resources/static/image/company/us_img7.png b/mes/src/main/resources/static/image/company/us_img7.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/us_img7.png rename to mes/src/main/resources/static/image/company/us_img7.png diff --git a/sparchetype/src/main/resources/static/image/company/us_img8.png b/mes/src/main/resources/static/image/company/us_img8.png similarity index 100% rename from sparchetype/src/main/resources/static/image/company/us_img8.png rename to mes/src/main/resources/static/image/company/us_img8.png diff --git a/sparchetype/src/main/resources/static/image/hk.png b/mes/src/main/resources/static/image/hk.png similarity index 100% rename from sparchetype/src/main/resources/static/image/hk.png rename to mes/src/main/resources/static/image/hk.png diff --git a/sparchetype/src/main/resources/static/image/logo.png b/mes/src/main/resources/static/image/logo.png similarity index 100% rename from sparchetype/src/main/resources/static/image/logo.png rename to mes/src/main/resources/static/image/logo.png diff --git a/sparchetype/src/main/resources/static/js/layuimodule/config.js b/mes/src/main/resources/static/js/layuimodule/config.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/config.js rename to mes/src/main/resources/static/js/layuimodule/config.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js b/mes/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js rename to mes/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/sp/spCompany.js b/mes/src/main/resources/static/js/layuimodule/sp/spCompany.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/sp/spCompany.js rename to mes/src/main/resources/static/js/layuimodule/sp/spCompany.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/sp/spLayer.js b/mes/src/main/resources/static/js/layuimodule/sp/spLayer.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/sp/spLayer.js rename to mes/src/main/resources/static/js/layuimodule/sp/spLayer.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/sp/spLayui.js b/mes/src/main/resources/static/js/layuimodule/sp/spLayui.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/sp/spLayui.js rename to mes/src/main/resources/static/js/layuimodule/sp/spLayui.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/sp/spSearchPanel.js b/mes/src/main/resources/static/js/layuimodule/sp/spSearchPanel.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/sp/spSearchPanel.js rename to mes/src/main/resources/static/js/layuimodule/sp/spSearchPanel.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/sp/spTable.js b/mes/src/main/resources/static/js/layuimodule/sp/spTable.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/sp/spTable.js rename to mes/src/main/resources/static/js/layuimodule/sp/spTable.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/step-lay/step.css b/mes/src/main/resources/static/js/layuimodule/step-lay/step.css similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/step-lay/step.css rename to mes/src/main/resources/static/js/layuimodule/step-lay/step.css diff --git a/sparchetype/src/main/resources/static/js/layuimodule/step-lay/step.js b/mes/src/main/resources/static/js/layuimodule/step-lay/step.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/step-lay/step.js rename to mes/src/main/resources/static/js/layuimodule/step-lay/step.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/tableSelect/tableSelect.js b/mes/src/main/resources/static/js/layuimodule/tableSelect/tableSelect.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/tableSelect/tableSelect.js rename to mes/src/main/resources/static/js/layuimodule/tableSelect/tableSelect.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/treeTable/treeTable.css b/mes/src/main/resources/static/js/layuimodule/treeTable/treeTable.css similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/treeTable/treeTable.css rename to mes/src/main/resources/static/js/layuimodule/treeTable/treeTable.css diff --git a/sparchetype/src/main/resources/static/js/layuimodule/treeTable/treeTable.js b/mes/src/main/resources/static/js/layuimodule/treeTable/treeTable.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/treeTable/treeTable.js rename to mes/src/main/resources/static/js/layuimodule/treeTable/treeTable.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/wangEditor/fonts/w-e-icon.woff b/mes/src/main/resources/static/js/layuimodule/wangEditor/fonts/w-e-icon.woff similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/wangEditor/fonts/w-e-icon.woff rename to mes/src/main/resources/static/js/layuimodule/wangEditor/fonts/w-e-icon.woff diff --git a/sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.css b/mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.css similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.css rename to mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.css diff --git a/sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.js b/mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.js rename to mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.css b/mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.css similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.css rename to mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.css diff --git a/sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js b/mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js rename to mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js diff --git a/sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js.map b/mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js.map similarity index 100% rename from sparchetype/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js.map rename to mes/src/main/resources/static/js/layuimodule/wangEditor/wangEditor.min.js.map diff --git a/sparchetype/src/main/resources/static/js/spConfig.js b/mes/src/main/resources/static/js/spConfig.js similarity index 100% rename from sparchetype/src/main/resources/static/js/spConfig.js rename to mes/src/main/resources/static/js/spConfig.js diff --git a/sparchetype/src/main/resources/static/js/spUtil.js b/mes/src/main/resources/static/js/spUtil.js similarity index 100% rename from sparchetype/src/main/resources/static/js/spUtil.js rename to mes/src/main/resources/static/js/spUtil.js diff --git a/sparchetype/src/main/resources/static/json/clear.json b/mes/src/main/resources/static/json/clear.json similarity index 100% rename from sparchetype/src/main/resources/static/json/clear.json rename to mes/src/main/resources/static/json/clear.json diff --git a/sparchetype/src/main/resources/static/json/init.json b/mes/src/main/resources/static/json/init.json similarity index 100% rename from sparchetype/src/main/resources/static/json/init.json rename to mes/src/main/resources/static/json/init.json diff --git a/sparchetype/src/main/resources/static/json/menus.json b/mes/src/main/resources/static/json/menus.json similarity index 100% rename from sparchetype/src/main/resources/static/json/menus.json rename to mes/src/main/resources/static/json/menus.json diff --git a/sparchetype/src/main/resources/static/json/table.json b/mes/src/main/resources/static/json/table.json similarity index 100% rename from sparchetype/src/main/resources/static/json/table.json rename to mes/src/main/resources/static/json/table.json diff --git a/sparchetype/src/main/resources/static/json/tableSelect.json b/mes/src/main/resources/static/json/tableSelect.json similarity index 100% rename from sparchetype/src/main/resources/static/json/tableSelect.json rename to mes/src/main/resources/static/json/tableSelect.json diff --git a/sparchetype/src/main/resources/static/json/upload.json b/mes/src/main/resources/static/json/upload.json similarity index 100% rename from sparchetype/src/main/resources/static/json/upload.json rename to mes/src/main/resources/static/json/upload.json diff --git a/sparchetype/src/main/resources/static/lib/dayjs.min.js b/mes/src/main/resources/static/lib/dayjs.min.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/dayjs.min.js rename to mes/src/main/resources/static/lib/dayjs.min.js diff --git a/sparchetype/src/main/resources/static/lib/echarts/echarts.min.js b/mes/src/main/resources/static/lib/echarts/echarts.min.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/echarts/echarts.min.js rename to mes/src/main/resources/static/lib/echarts/echarts.min.js diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/HELP-US-OUT.txt b/mes/src/main/resources/static/lib/font-awesome-4.7.0/HELP-US-OUT.txt similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/HELP-US-OUT.txt rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/HELP-US-OUT.txt diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.css b/mes/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.css similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.css rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.css diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.min.css b/mes/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.min.css similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.min.css rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/css/font-awesome.min.css diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/FontAwesome.otf b/mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/FontAwesome.otf similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/FontAwesome.otf rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/FontAwesome.otf diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.eot b/mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.eot similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.eot rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.eot diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.svg b/mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.svg similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.svg rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.svg diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf b/mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff b/mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 b/mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/animated.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/animated.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/animated.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/animated.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/bordered-pulled.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/bordered-pulled.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/bordered-pulled.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/bordered-pulled.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/core.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/core.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/core.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/core.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/fixed-width.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/fixed-width.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/fixed-width.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/fixed-width.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/font-awesome.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/font-awesome.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/font-awesome.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/font-awesome.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/icons.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/icons.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/icons.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/icons.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/larger.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/larger.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/larger.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/larger.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/list.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/list.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/list.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/list.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/mixins.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/mixins.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/mixins.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/mixins.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/path.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/path.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/path.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/path.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/rotated-flipped.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/rotated-flipped.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/rotated-flipped.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/rotated-flipped.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/screen-reader.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/screen-reader.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/screen-reader.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/screen-reader.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/stacked.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/stacked.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/stacked.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/stacked.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/variables.less b/mes/src/main/resources/static/lib/font-awesome-4.7.0/less/variables.less similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/less/variables.less rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/less/variables.less diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_animated.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_animated.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_animated.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_animated.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_bordered-pulled.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_bordered-pulled.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_bordered-pulled.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_bordered-pulled.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_core.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_core.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_core.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_core.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_fixed-width.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_fixed-width.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_fixed-width.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_fixed-width.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_icons.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_icons.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_icons.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_icons.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_larger.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_larger.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_larger.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_larger.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_list.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_list.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_list.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_list.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_mixins.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_mixins.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_mixins.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_mixins.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_path.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_path.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_path.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_path.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_rotated-flipped.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_rotated-flipped.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_rotated-flipped.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_rotated-flipped.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_screen-reader.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_screen-reader.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_screen-reader.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_screen-reader.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_stacked.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_stacked.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_stacked.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_stacked.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_variables.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_variables.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/_variables.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/_variables.scss diff --git a/sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/font-awesome.scss b/mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/font-awesome.scss similarity index 100% rename from sparchetype/src/main/resources/static/lib/font-awesome-4.7.0/scss/font-awesome.scss rename to mes/src/main/resources/static/lib/font-awesome-4.7.0/scss/font-awesome.scss diff --git a/sparchetype/src/main/resources/static/lib/jq-module/jquery.particleground.min.js b/mes/src/main/resources/static/lib/jq-module/jquery.particleground.min.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/jq-module/jquery.particleground.min.js rename to mes/src/main/resources/static/lib/jq-module/jquery.particleground.min.js diff --git a/sparchetype/src/main/resources/static/lib/jq-module/paigusu.min.js b/mes/src/main/resources/static/lib/jq-module/paigusu.min.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/jq-module/paigusu.min.js rename to mes/src/main/resources/static/lib/jq-module/paigusu.min.js diff --git a/sparchetype/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.css b/mes/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.css similarity index 100% rename from sparchetype/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.css rename to mes/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.css diff --git a/sparchetype/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.js b/mes/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.js rename to mes/src/main/resources/static/lib/jq-module/zyupload/zyupload-1.0.0.min.js diff --git a/sparchetype/src/main/resources/static/lib/jquery/jquery.min.js b/mes/src/main/resources/static/lib/jquery/jquery.min.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/jquery/jquery.min.js rename to mes/src/main/resources/static/lib/jquery/jquery.min.js diff --git a/sparchetype/src/main/resources/static/lib/layui/css/layui.css b/mes/src/main/resources/static/lib/layui/css/layui.css similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/layui.css rename to mes/src/main/resources/static/lib/layui/css/layui.css diff --git a/sparchetype/src/main/resources/static/lib/layui/css/layui.mobile.css b/mes/src/main/resources/static/lib/layui/css/layui.mobile.css similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/layui.mobile.css rename to mes/src/main/resources/static/lib/layui/css/layui.mobile.css diff --git a/sparchetype/src/main/resources/static/lib/layui/css/modules/code.css b/mes/src/main/resources/static/lib/layui/css/modules/code.css similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/modules/code.css rename to mes/src/main/resources/static/lib/layui/css/modules/code.css diff --git a/sparchetype/src/main/resources/static/lib/layui/css/modules/laydate/default/laydate.css b/mes/src/main/resources/static/lib/layui/css/modules/laydate/default/laydate.css similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/modules/laydate/default/laydate.css rename to mes/src/main/resources/static/lib/layui/css/modules/laydate/default/laydate.css diff --git a/sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/icon-ext.png b/mes/src/main/resources/static/lib/layui/css/modules/layer/default/icon-ext.png similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/icon-ext.png rename to mes/src/main/resources/static/lib/layui/css/modules/layer/default/icon-ext.png diff --git a/sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/icon.png b/mes/src/main/resources/static/lib/layui/css/modules/layer/default/icon.png similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/icon.png rename to mes/src/main/resources/static/lib/layui/css/modules/layer/default/icon.png diff --git a/sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/layer.css b/mes/src/main/resources/static/lib/layui/css/modules/layer/default/layer.css similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/layer.css rename to mes/src/main/resources/static/lib/layui/css/modules/layer/default/layer.css diff --git a/sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/loading-0.gif b/mes/src/main/resources/static/lib/layui/css/modules/layer/default/loading-0.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/loading-0.gif rename to mes/src/main/resources/static/lib/layui/css/modules/layer/default/loading-0.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/loading-1.gif b/mes/src/main/resources/static/lib/layui/css/modules/layer/default/loading-1.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/loading-1.gif rename to mes/src/main/resources/static/lib/layui/css/modules/layer/default/loading-1.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/loading-2.gif b/mes/src/main/resources/static/lib/layui/css/modules/layer/default/loading-2.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/css/modules/layer/default/loading-2.gif rename to mes/src/main/resources/static/lib/layui/css/modules/layer/default/loading-2.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/font/iconfont.eot b/mes/src/main/resources/static/lib/layui/font/iconfont.eot similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/font/iconfont.eot rename to mes/src/main/resources/static/lib/layui/font/iconfont.eot diff --git a/sparchetype/src/main/resources/static/lib/layui/font/iconfont.svg b/mes/src/main/resources/static/lib/layui/font/iconfont.svg similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/font/iconfont.svg rename to mes/src/main/resources/static/lib/layui/font/iconfont.svg diff --git a/sparchetype/src/main/resources/static/lib/layui/font/iconfont.ttf b/mes/src/main/resources/static/lib/layui/font/iconfont.ttf similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/font/iconfont.ttf rename to mes/src/main/resources/static/lib/layui/font/iconfont.ttf diff --git a/sparchetype/src/main/resources/static/lib/layui/font/iconfont.woff b/mes/src/main/resources/static/lib/layui/font/iconfont.woff similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/font/iconfont.woff rename to mes/src/main/resources/static/lib/layui/font/iconfont.woff diff --git a/sparchetype/src/main/resources/static/lib/layui/font/iconfont.woff2 b/mes/src/main/resources/static/lib/layui/font/iconfont.woff2 similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/font/iconfont.woff2 rename to mes/src/main/resources/static/lib/layui/font/iconfont.woff2 diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/0.gif b/mes/src/main/resources/static/lib/layui/images/face/0.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/0.gif rename to mes/src/main/resources/static/lib/layui/images/face/0.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/1.gif b/mes/src/main/resources/static/lib/layui/images/face/1.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/1.gif rename to mes/src/main/resources/static/lib/layui/images/face/1.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/10.gif b/mes/src/main/resources/static/lib/layui/images/face/10.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/10.gif rename to mes/src/main/resources/static/lib/layui/images/face/10.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/11.gif b/mes/src/main/resources/static/lib/layui/images/face/11.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/11.gif rename to mes/src/main/resources/static/lib/layui/images/face/11.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/12.gif b/mes/src/main/resources/static/lib/layui/images/face/12.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/12.gif rename to mes/src/main/resources/static/lib/layui/images/face/12.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/13.gif b/mes/src/main/resources/static/lib/layui/images/face/13.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/13.gif rename to mes/src/main/resources/static/lib/layui/images/face/13.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/14.gif b/mes/src/main/resources/static/lib/layui/images/face/14.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/14.gif rename to mes/src/main/resources/static/lib/layui/images/face/14.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/15.gif b/mes/src/main/resources/static/lib/layui/images/face/15.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/15.gif rename to mes/src/main/resources/static/lib/layui/images/face/15.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/16.gif b/mes/src/main/resources/static/lib/layui/images/face/16.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/16.gif rename to mes/src/main/resources/static/lib/layui/images/face/16.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/17.gif b/mes/src/main/resources/static/lib/layui/images/face/17.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/17.gif rename to mes/src/main/resources/static/lib/layui/images/face/17.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/18.gif b/mes/src/main/resources/static/lib/layui/images/face/18.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/18.gif rename to mes/src/main/resources/static/lib/layui/images/face/18.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/19.gif b/mes/src/main/resources/static/lib/layui/images/face/19.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/19.gif rename to mes/src/main/resources/static/lib/layui/images/face/19.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/2.gif b/mes/src/main/resources/static/lib/layui/images/face/2.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/2.gif rename to mes/src/main/resources/static/lib/layui/images/face/2.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/20.gif b/mes/src/main/resources/static/lib/layui/images/face/20.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/20.gif rename to mes/src/main/resources/static/lib/layui/images/face/20.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/21.gif b/mes/src/main/resources/static/lib/layui/images/face/21.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/21.gif rename to mes/src/main/resources/static/lib/layui/images/face/21.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/22.gif b/mes/src/main/resources/static/lib/layui/images/face/22.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/22.gif rename to mes/src/main/resources/static/lib/layui/images/face/22.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/23.gif b/mes/src/main/resources/static/lib/layui/images/face/23.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/23.gif rename to mes/src/main/resources/static/lib/layui/images/face/23.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/24.gif b/mes/src/main/resources/static/lib/layui/images/face/24.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/24.gif rename to mes/src/main/resources/static/lib/layui/images/face/24.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/25.gif b/mes/src/main/resources/static/lib/layui/images/face/25.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/25.gif rename to mes/src/main/resources/static/lib/layui/images/face/25.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/26.gif b/mes/src/main/resources/static/lib/layui/images/face/26.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/26.gif rename to mes/src/main/resources/static/lib/layui/images/face/26.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/27.gif b/mes/src/main/resources/static/lib/layui/images/face/27.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/27.gif rename to mes/src/main/resources/static/lib/layui/images/face/27.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/28.gif b/mes/src/main/resources/static/lib/layui/images/face/28.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/28.gif rename to mes/src/main/resources/static/lib/layui/images/face/28.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/29.gif b/mes/src/main/resources/static/lib/layui/images/face/29.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/29.gif rename to mes/src/main/resources/static/lib/layui/images/face/29.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/3.gif b/mes/src/main/resources/static/lib/layui/images/face/3.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/3.gif rename to mes/src/main/resources/static/lib/layui/images/face/3.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/30.gif b/mes/src/main/resources/static/lib/layui/images/face/30.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/30.gif rename to mes/src/main/resources/static/lib/layui/images/face/30.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/31.gif b/mes/src/main/resources/static/lib/layui/images/face/31.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/31.gif rename to mes/src/main/resources/static/lib/layui/images/face/31.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/32.gif b/mes/src/main/resources/static/lib/layui/images/face/32.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/32.gif rename to mes/src/main/resources/static/lib/layui/images/face/32.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/33.gif b/mes/src/main/resources/static/lib/layui/images/face/33.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/33.gif rename to mes/src/main/resources/static/lib/layui/images/face/33.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/34.gif b/mes/src/main/resources/static/lib/layui/images/face/34.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/34.gif rename to mes/src/main/resources/static/lib/layui/images/face/34.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/35.gif b/mes/src/main/resources/static/lib/layui/images/face/35.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/35.gif rename to mes/src/main/resources/static/lib/layui/images/face/35.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/36.gif b/mes/src/main/resources/static/lib/layui/images/face/36.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/36.gif rename to mes/src/main/resources/static/lib/layui/images/face/36.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/37.gif b/mes/src/main/resources/static/lib/layui/images/face/37.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/37.gif rename to mes/src/main/resources/static/lib/layui/images/face/37.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/38.gif b/mes/src/main/resources/static/lib/layui/images/face/38.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/38.gif rename to mes/src/main/resources/static/lib/layui/images/face/38.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/39.gif b/mes/src/main/resources/static/lib/layui/images/face/39.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/39.gif rename to mes/src/main/resources/static/lib/layui/images/face/39.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/4.gif b/mes/src/main/resources/static/lib/layui/images/face/4.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/4.gif rename to mes/src/main/resources/static/lib/layui/images/face/4.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/40.gif b/mes/src/main/resources/static/lib/layui/images/face/40.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/40.gif rename to mes/src/main/resources/static/lib/layui/images/face/40.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/41.gif b/mes/src/main/resources/static/lib/layui/images/face/41.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/41.gif rename to mes/src/main/resources/static/lib/layui/images/face/41.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/42.gif b/mes/src/main/resources/static/lib/layui/images/face/42.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/42.gif rename to mes/src/main/resources/static/lib/layui/images/face/42.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/43.gif b/mes/src/main/resources/static/lib/layui/images/face/43.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/43.gif rename to mes/src/main/resources/static/lib/layui/images/face/43.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/44.gif b/mes/src/main/resources/static/lib/layui/images/face/44.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/44.gif rename to mes/src/main/resources/static/lib/layui/images/face/44.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/45.gif b/mes/src/main/resources/static/lib/layui/images/face/45.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/45.gif rename to mes/src/main/resources/static/lib/layui/images/face/45.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/46.gif b/mes/src/main/resources/static/lib/layui/images/face/46.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/46.gif rename to mes/src/main/resources/static/lib/layui/images/face/46.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/47.gif b/mes/src/main/resources/static/lib/layui/images/face/47.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/47.gif rename to mes/src/main/resources/static/lib/layui/images/face/47.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/48.gif b/mes/src/main/resources/static/lib/layui/images/face/48.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/48.gif rename to mes/src/main/resources/static/lib/layui/images/face/48.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/49.gif b/mes/src/main/resources/static/lib/layui/images/face/49.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/49.gif rename to mes/src/main/resources/static/lib/layui/images/face/49.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/5.gif b/mes/src/main/resources/static/lib/layui/images/face/5.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/5.gif rename to mes/src/main/resources/static/lib/layui/images/face/5.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/50.gif b/mes/src/main/resources/static/lib/layui/images/face/50.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/50.gif rename to mes/src/main/resources/static/lib/layui/images/face/50.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/51.gif b/mes/src/main/resources/static/lib/layui/images/face/51.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/51.gif rename to mes/src/main/resources/static/lib/layui/images/face/51.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/52.gif b/mes/src/main/resources/static/lib/layui/images/face/52.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/52.gif rename to mes/src/main/resources/static/lib/layui/images/face/52.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/53.gif b/mes/src/main/resources/static/lib/layui/images/face/53.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/53.gif rename to mes/src/main/resources/static/lib/layui/images/face/53.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/54.gif b/mes/src/main/resources/static/lib/layui/images/face/54.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/54.gif rename to mes/src/main/resources/static/lib/layui/images/face/54.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/55.gif b/mes/src/main/resources/static/lib/layui/images/face/55.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/55.gif rename to mes/src/main/resources/static/lib/layui/images/face/55.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/56.gif b/mes/src/main/resources/static/lib/layui/images/face/56.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/56.gif rename to mes/src/main/resources/static/lib/layui/images/face/56.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/57.gif b/mes/src/main/resources/static/lib/layui/images/face/57.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/57.gif rename to mes/src/main/resources/static/lib/layui/images/face/57.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/58.gif b/mes/src/main/resources/static/lib/layui/images/face/58.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/58.gif rename to mes/src/main/resources/static/lib/layui/images/face/58.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/59.gif b/mes/src/main/resources/static/lib/layui/images/face/59.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/59.gif rename to mes/src/main/resources/static/lib/layui/images/face/59.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/6.gif b/mes/src/main/resources/static/lib/layui/images/face/6.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/6.gif rename to mes/src/main/resources/static/lib/layui/images/face/6.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/60.gif b/mes/src/main/resources/static/lib/layui/images/face/60.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/60.gif rename to mes/src/main/resources/static/lib/layui/images/face/60.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/61.gif b/mes/src/main/resources/static/lib/layui/images/face/61.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/61.gif rename to mes/src/main/resources/static/lib/layui/images/face/61.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/62.gif b/mes/src/main/resources/static/lib/layui/images/face/62.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/62.gif rename to mes/src/main/resources/static/lib/layui/images/face/62.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/63.gif b/mes/src/main/resources/static/lib/layui/images/face/63.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/63.gif rename to mes/src/main/resources/static/lib/layui/images/face/63.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/64.gif b/mes/src/main/resources/static/lib/layui/images/face/64.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/64.gif rename to mes/src/main/resources/static/lib/layui/images/face/64.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/65.gif b/mes/src/main/resources/static/lib/layui/images/face/65.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/65.gif rename to mes/src/main/resources/static/lib/layui/images/face/65.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/66.gif b/mes/src/main/resources/static/lib/layui/images/face/66.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/66.gif rename to mes/src/main/resources/static/lib/layui/images/face/66.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/67.gif b/mes/src/main/resources/static/lib/layui/images/face/67.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/67.gif rename to mes/src/main/resources/static/lib/layui/images/face/67.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/68.gif b/mes/src/main/resources/static/lib/layui/images/face/68.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/68.gif rename to mes/src/main/resources/static/lib/layui/images/face/68.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/69.gif b/mes/src/main/resources/static/lib/layui/images/face/69.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/69.gif rename to mes/src/main/resources/static/lib/layui/images/face/69.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/7.gif b/mes/src/main/resources/static/lib/layui/images/face/7.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/7.gif rename to mes/src/main/resources/static/lib/layui/images/face/7.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/70.gif b/mes/src/main/resources/static/lib/layui/images/face/70.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/70.gif rename to mes/src/main/resources/static/lib/layui/images/face/70.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/71.gif b/mes/src/main/resources/static/lib/layui/images/face/71.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/71.gif rename to mes/src/main/resources/static/lib/layui/images/face/71.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/8.gif b/mes/src/main/resources/static/lib/layui/images/face/8.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/8.gif rename to mes/src/main/resources/static/lib/layui/images/face/8.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/images/face/9.gif b/mes/src/main/resources/static/lib/layui/images/face/9.gif similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/images/face/9.gif rename to mes/src/main/resources/static/lib/layui/images/face/9.gif diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/carousel.js b/mes/src/main/resources/static/lib/layui/lay/modules/carousel.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/carousel.js rename to mes/src/main/resources/static/lib/layui/lay/modules/carousel.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/code.js b/mes/src/main/resources/static/lib/layui/lay/modules/code.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/code.js rename to mes/src/main/resources/static/lib/layui/lay/modules/code.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/colorpicker.js b/mes/src/main/resources/static/lib/layui/lay/modules/colorpicker.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/colorpicker.js rename to mes/src/main/resources/static/lib/layui/lay/modules/colorpicker.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/element.js b/mes/src/main/resources/static/lib/layui/lay/modules/element.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/element.js rename to mes/src/main/resources/static/lib/layui/lay/modules/element.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/flow.js b/mes/src/main/resources/static/lib/layui/lay/modules/flow.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/flow.js rename to mes/src/main/resources/static/lib/layui/lay/modules/flow.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/form.js b/mes/src/main/resources/static/lib/layui/lay/modules/form.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/form.js rename to mes/src/main/resources/static/lib/layui/lay/modules/form.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/jquery.js b/mes/src/main/resources/static/lib/layui/lay/modules/jquery.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/jquery.js rename to mes/src/main/resources/static/lib/layui/lay/modules/jquery.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/laydate.js b/mes/src/main/resources/static/lib/layui/lay/modules/laydate.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/laydate.js rename to mes/src/main/resources/static/lib/layui/lay/modules/laydate.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/layedit.js b/mes/src/main/resources/static/lib/layui/lay/modules/layedit.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/layedit.js rename to mes/src/main/resources/static/lib/layui/lay/modules/layedit.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/layer.js b/mes/src/main/resources/static/lib/layui/lay/modules/layer.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/layer.js rename to mes/src/main/resources/static/lib/layui/lay/modules/layer.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/laypage.js b/mes/src/main/resources/static/lib/layui/lay/modules/laypage.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/laypage.js rename to mes/src/main/resources/static/lib/layui/lay/modules/laypage.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/laytpl.js b/mes/src/main/resources/static/lib/layui/lay/modules/laytpl.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/laytpl.js rename to mes/src/main/resources/static/lib/layui/lay/modules/laytpl.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/mobile.js b/mes/src/main/resources/static/lib/layui/lay/modules/mobile.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/mobile.js rename to mes/src/main/resources/static/lib/layui/lay/modules/mobile.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/rate.js b/mes/src/main/resources/static/lib/layui/lay/modules/rate.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/rate.js rename to mes/src/main/resources/static/lib/layui/lay/modules/rate.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/slider.js b/mes/src/main/resources/static/lib/layui/lay/modules/slider.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/slider.js rename to mes/src/main/resources/static/lib/layui/lay/modules/slider.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/table.js b/mes/src/main/resources/static/lib/layui/lay/modules/table.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/table.js rename to mes/src/main/resources/static/lib/layui/lay/modules/table.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/transfer.js b/mes/src/main/resources/static/lib/layui/lay/modules/transfer.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/transfer.js rename to mes/src/main/resources/static/lib/layui/lay/modules/transfer.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/tree.js b/mes/src/main/resources/static/lib/layui/lay/modules/tree.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/tree.js rename to mes/src/main/resources/static/lib/layui/lay/modules/tree.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/upload.js b/mes/src/main/resources/static/lib/layui/lay/modules/upload.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/upload.js rename to mes/src/main/resources/static/lib/layui/lay/modules/upload.js diff --git a/sparchetype/src/main/resources/static/lib/layui/lay/modules/util.js b/mes/src/main/resources/static/lib/layui/lay/modules/util.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/lay/modules/util.js rename to mes/src/main/resources/static/lib/layui/lay/modules/util.js diff --git a/sparchetype/src/main/resources/static/lib/layui/layui.all.js b/mes/src/main/resources/static/lib/layui/layui.all.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/layui.all.js rename to mes/src/main/resources/static/lib/layui/layui.all.js diff --git a/sparchetype/src/main/resources/static/lib/layui/layui.js b/mes/src/main/resources/static/lib/layui/layui.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/layui/layui.js rename to mes/src/main/resources/static/lib/layui/layui.js diff --git a/sparchetype/src/main/resources/static/lib/lodash.min.js b/mes/src/main/resources/static/lib/lodash.min.js similarity index 100% rename from sparchetype/src/main/resources/static/lib/lodash.min.js rename to mes/src/main/resources/static/lib/lodash.min.js diff --git a/sparchetype/src/main/resources/templates/404.ftl b/mes/src/main/resources/templates/404.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/404.ftl rename to mes/src/main/resources/templates/404.ftl diff --git a/sparchetype/src/main/resources/templates/admin/blog/article/list.ftl b/mes/src/main/resources/templates/admin/blog/article/list.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/blog/article/list.ftl rename to mes/src/main/resources/templates/admin/blog/article/list.ftl diff --git a/sparchetype/src/main/resources/templates/admin/blog/index.ftl b/mes/src/main/resources/templates/admin/blog/index.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/blog/index.ftl rename to mes/src/main/resources/templates/admin/blog/index.ftl diff --git a/sparchetype/src/main/resources/templates/admin/index.ftl b/mes/src/main/resources/templates/admin/index.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/index.ftl rename to mes/src/main/resources/templates/admin/index.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/department/addOrUpdate.ftl b/mes/src/main/resources/templates/admin/system/department/addOrUpdate.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/department/addOrUpdate.ftl rename to mes/src/main/resources/templates/admin/system/department/addOrUpdate.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/department/list.ftl b/mes/src/main/resources/templates/admin/system/department/list.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/department/list.ftl rename to mes/src/main/resources/templates/admin/system/department/list.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/dict/addOrUpdate.ftl b/mes/src/main/resources/templates/admin/system/dict/addOrUpdate.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/dict/addOrUpdate.ftl rename to mes/src/main/resources/templates/admin/system/dict/addOrUpdate.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/dict/list.ftl b/mes/src/main/resources/templates/admin/system/dict/list.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/dict/list.ftl rename to mes/src/main/resources/templates/admin/system/dict/list.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/menu/addOrUpdate.ftl b/mes/src/main/resources/templates/admin/system/menu/addOrUpdate.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/menu/addOrUpdate.ftl rename to mes/src/main/resources/templates/admin/system/menu/addOrUpdate.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/menu/list.ftl b/mes/src/main/resources/templates/admin/system/menu/list.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/menu/list.ftl rename to mes/src/main/resources/templates/admin/system/menu/list.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/role/addOrUpdate.ftl b/mes/src/main/resources/templates/admin/system/role/addOrUpdate.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/role/addOrUpdate.ftl rename to mes/src/main/resources/templates/admin/system/role/addOrUpdate.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/role/list.ftl b/mes/src/main/resources/templates/admin/system/role/list.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/role/list.ftl rename to mes/src/main/resources/templates/admin/system/role/list.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/tool/colorSelect.ftl b/mes/src/main/resources/templates/admin/system/tool/colorSelect.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/tool/colorSelect.ftl rename to mes/src/main/resources/templates/admin/system/tool/colorSelect.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/tool/editor.ftl b/mes/src/main/resources/templates/admin/system/tool/editor.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/tool/editor.ftl rename to mes/src/main/resources/templates/admin/system/tool/editor.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/tool/formStep.ftl b/mes/src/main/resources/templates/admin/system/tool/formStep.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/tool/formStep.ftl rename to mes/src/main/resources/templates/admin/system/tool/formStep.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/tool/icon.ftl b/mes/src/main/resources/templates/admin/system/tool/icon.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/tool/icon.ftl rename to mes/src/main/resources/templates/admin/system/tool/icon.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/tool/iconPicker.ftl b/mes/src/main/resources/templates/admin/system/tool/iconPicker.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/tool/iconPicker.ftl rename to mes/src/main/resources/templates/admin/system/tool/iconPicker.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/user/addOrUpdate.ftl b/mes/src/main/resources/templates/admin/system/user/addOrUpdate.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/user/addOrUpdate.ftl rename to mes/src/main/resources/templates/admin/system/user/addOrUpdate.ftl diff --git a/sparchetype/src/main/resources/templates/admin/system/user/list.ftl b/mes/src/main/resources/templates/admin/system/user/list.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/system/user/list.ftl rename to mes/src/main/resources/templates/admin/system/user/list.ftl diff --git a/sparchetype/src/main/resources/templates/admin/welcome.ftl b/mes/src/main/resources/templates/admin/welcome.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/admin/welcome.ftl rename to mes/src/main/resources/templates/admin/welcome.ftl diff --git a/sparchetype/src/main/resources/templates/basedata/manager/addOrUpdate.ftl b/mes/src/main/resources/templates/basedata/manager/addOrUpdate.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/basedata/manager/addOrUpdate.ftl rename to mes/src/main/resources/templates/basedata/manager/addOrUpdate.ftl diff --git a/sparchetype/src/main/resources/templates/basedata/manager/list.ftl b/mes/src/main/resources/templates/basedata/manager/list.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/basedata/manager/list.ftl rename to mes/src/main/resources/templates/basedata/manager/list.ftl diff --git a/sparchetype/src/main/resources/templates/basedata/manageritem/addOrUpdate.ftl b/mes/src/main/resources/templates/basedata/manageritem/addOrUpdate.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/basedata/manageritem/addOrUpdate.ftl rename to mes/src/main/resources/templates/basedata/manageritem/addOrUpdate.ftl diff --git a/sparchetype/src/main/resources/templates/basedata/manageritem/list.ftl b/mes/src/main/resources/templates/basedata/manageritem/list.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/basedata/manageritem/list.ftl rename to mes/src/main/resources/templates/basedata/manageritem/list.ftl diff --git a/sparchetype/src/main/resources/templates/codegenerator/controller.java.ftl b/mes/src/main/resources/templates/codegenerator/controller.java.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/codegenerator/controller.java.ftl rename to mes/src/main/resources/templates/codegenerator/controller.java.ftl diff --git a/sparchetype/src/main/resources/templates/codegenerator/entity.java.ftl b/mes/src/main/resources/templates/codegenerator/entity.java.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/codegenerator/entity.java.ftl rename to mes/src/main/resources/templates/codegenerator/entity.java.ftl diff --git a/sparchetype/src/main/resources/templates/codegenerator/mapper.java.ftl b/mes/src/main/resources/templates/codegenerator/mapper.java.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/codegenerator/mapper.java.ftl rename to mes/src/main/resources/templates/codegenerator/mapper.java.ftl diff --git a/sparchetype/src/main/resources/templates/codegenerator/mapper.xml.ftl b/mes/src/main/resources/templates/codegenerator/mapper.xml.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/codegenerator/mapper.xml.ftl rename to mes/src/main/resources/templates/codegenerator/mapper.xml.ftl diff --git a/sparchetype/src/main/resources/templates/codegenerator/service.java.ftl b/mes/src/main/resources/templates/codegenerator/service.java.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/codegenerator/service.java.ftl rename to mes/src/main/resources/templates/codegenerator/service.java.ftl diff --git a/sparchetype/src/main/resources/templates/codegenerator/serviceImpl.java.ftl b/mes/src/main/resources/templates/codegenerator/serviceImpl.java.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/codegenerator/serviceImpl.java.ftl rename to mes/src/main/resources/templates/codegenerator/serviceImpl.java.ftl diff --git a/sparchetype/src/main/resources/templates/common/common.ftl b/mes/src/main/resources/templates/common/common.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/common/common.ftl rename to mes/src/main/resources/templates/common/common.ftl diff --git a/sparchetype/src/main/resources/templates/common/spSearchPanel4SysUser.ftl b/mes/src/main/resources/templates/common/spSearchPanel4SysUser.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/common/spSearchPanel4SysUser.ftl rename to mes/src/main/resources/templates/common/spSearchPanel4SysUser.ftl diff --git a/sparchetype/src/main/resources/templates/error/403.ftl b/mes/src/main/resources/templates/error/403.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/error/403.ftl rename to mes/src/main/resources/templates/error/403.ftl diff --git a/sparchetype/src/main/resources/templates/error/500.ftl b/mes/src/main/resources/templates/error/500.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/error/500.ftl rename to mes/src/main/resources/templates/error/500.ftl diff --git a/sparchetype/src/main/resources/templates/login.ftl b/mes/src/main/resources/templates/login.ftl similarity index 100% rename from sparchetype/src/main/resources/templates/login.ftl rename to mes/src/main/resources/templates/login.ftl diff --git a/sparchetype/src/test/java/com/songpeng/sparchetype/SparchetypeApplicationTests.java b/mes/src/test/java/com/wangziyang/mes/SparchetypeApplicationTests.java similarity index 90% rename from sparchetype/src/test/java/com/songpeng/sparchetype/SparchetypeApplicationTests.java rename to mes/src/test/java/com/wangziyang/mes/SparchetypeApplicationTests.java index b81b1c2..8d52520 100644 --- a/sparchetype/src/test/java/com/songpeng/sparchetype/SparchetypeApplicationTests.java +++ b/mes/src/test/java/com/wangziyang/mes/SparchetypeApplicationTests.java @@ -1,4 +1,4 @@ -package com.songpeng.sparchetype; +package com.wangziyang.mes; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/request/SpTableManagerReq.java b/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/request/SpTableManagerReq.java deleted file mode 100644 index 7dac333..0000000 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/basedata/request/SpTableManagerReq.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.songpeng.sparchetype.basedata.request; - -import com.songpeng.sparchetype.common.BasePageReq; - -/** - * - */ -public class SpTableManagerReq extends BasePageReq { -} diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/package-info.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/package-info.java deleted file mode 100644 index 29fe9a4..0000000 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 系统配置 - */ -package com.songpeng.sparchetype.system.config; \ No newline at end of file diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysDictDTO.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysDictDTO.java deleted file mode 100644 index e6fcb2b..0000000 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/dto/SysDictDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.songpeng.sparchetype.system.dto; - -import com.songpeng.sparchetype.system.entity.SysDict; - -/** - * @author SongPeng - * @date 2019/9/30 9:49 - */ -public class SysDictDTO extends SysDict { -}