From c476488de03707a5053d9c0e74d30086a9d14765 Mon Sep 17 00:00:00 2001
From: zhangmeng <1334717033@qq.com>
Date: Fri, 12 Nov 2021 14:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=202021=E5=B9=B411=E6=9C=8812=E6=97=A514:55:0?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/controller/EncryptController.java | 42 +++++++++++++++++++
 .../controller/PermissionController.java      |  2 +-
 .../controller/UrlRequestController.java      | 27 ++++++++++--
 .../admin/manager/feign/ArticleFeign.java     |  2 +-
 .../admin/manager/feign/CategoryFeign.java    |  3 +-
 .../admin/manager/feign/QuartzFeign.java      |  2 +-
 .../manager/service/PermissionService.java    |  2 +-
 .../service/impl/PermissionServiceImpl.java   |  2 +-
 .../static/system/admin/js/mystyle-admin.js   |  3 ++
 .../templates/admin/code/encrypt.ftl          | 11 ++---
 .../resources/templates/admin/code/form.ftl   |  8 ++--
 .../resources/templates/admin/mail/list.ftl   | 15 +++----
 .../admin_manager/EncryptControllerApi.java   | 15 +++++++
 .../com/zhangmeng/blog/feign/UserFeign.java   |  2 +-
 .../com/zhangmeng/file/feign/TokenFeign.java  |  2 +-
 .../file/feign/UserFeignService.java          |  2 +-
 .../file/service/impl/UploadServiceImpl.java  |  5 +--
 .../zhangmeng/file/utils/FastDfsClient.java   |  3 +-
 mystyle-cloud-model/pom.xml                   |  4 ++
 .../model/base/baseUtil/CommonUtil.java       | 23 ++++++++++
 .../model/dto/system/EncryptType.java         | 24 +++++++++++
 .../dto/{ => system}/FastDfsFileInfo.java     |  2 +-
 .../model/dto/{ => system}/File.java          |  2 +-
 .../model/dto/{ => system}/Menu.java          |  2 +-
 .../model/dto/{ => system}/MySpecCaptcha.java |  2 +-
 .../model/dto/{ => system}/RequestData.java   |  2 +-
 .../model/dto/{ => system}/SysConstant.java   |  2 +-
 .../com/zhangmeng/oauth/feign/AdminFeign.java |  3 +-
 .../oauth/service/impl/AuthServiceImpl.java   |  2 +-
 29 files changed, 170 insertions(+), 46 deletions(-)
 create mode 100644 mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/EncryptController.java
 create mode 100644 mystyle-cloud-api/src/main/java/com/zhangmeng/api/service/admin_manager/EncryptControllerApi.java
 create mode 100644 mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/EncryptType.java
 rename mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/{ => system}/FastDfsFileInfo.java (87%)
 rename mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/{ => system}/File.java (84%)
 rename mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/{ => system}/Menu.java (93%)
 rename mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/{ => system}/MySpecCaptcha.java (98%)
 rename mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/{ => system}/RequestData.java (75%)
 rename mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/{ => system}/SysConstant.java (90%)

diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/EncryptController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/EncryptController.java
new file mode 100644
index 0000000..cc9be90
--- /dev/null
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/EncryptController.java
@@ -0,0 +1,42 @@
+package com.zhangmeng.admin.manager.controller;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import com.zhangmeng.api.service.admin_manager.EncryptControllerApi;
+import com.zhangmeng.model.base.baseController.BaseController;
+import com.zhangmeng.model.base.baseUtil.CommonUtil;
+import com.zhangmeng.model.dto.system.EncryptType;
+import com.zhangmeng.model.vo.Result;
+import com.zhangmeng.model.vo.StatusCode;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/crypt")
+public class EncryptController extends BaseController implements EncryptControllerApi {
+
+    @Override
+    @PostMapping("/encode")
+    public Result encode(Model model, EncryptType encryptType, String text) {
+        EncryptType[] values = EncryptType.values();
+        model.addAttribute("values",values);
+        String encrypt_text = null;
+        if (encryptType != null) {
+            switch (encryptType) {
+                case Md5:
+                    encrypt_text = CommonUtil.md5Encrypt(text);
+                    break;
+                case SHA256:
+                    encrypt_text = DigestUtil.sha256Hex(text);
+                    break;
+                case BCryptPasswordEncoder:
+                    encrypt_text = CommonUtil.bCryptPasswordEncoder(text);
+                    break;
+            }
+        }
+        return new Result(true, StatusCode.OK,"查询成功",encrypt_text);
+    }
+}
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/PermissionController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/PermissionController.java
index 4c11ed4..a1fd524 100644
--- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/PermissionController.java
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/PermissionController.java
@@ -5,7 +5,7 @@ import com.zhangmeng.admin.manager.utils.UserUtil;
 import com.zhangmeng.api.service.admin_manager.PermissionControllerApi;
 import com.zhangmeng.model.base.baseController.BaseController;
 import com.zhangmeng.model.base.baseUtil.CommonUtil;
-import com.zhangmeng.model.dto.Menu;
+import com.zhangmeng.model.dto.system.Menu;
 import com.zhangmeng.model.entity.Permission;
 import com.zhangmeng.model.vo.Result;
 import com.zhangmeng.model.vo.ResultTree;
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java
index fac166a..043673a 100644
--- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java
@@ -11,7 +11,8 @@ import com.zhangmeng.admin.manager.service.UserService;
 import com.zhangmeng.admin.manager.utils.UserUtil;
 import com.zhangmeng.model.base.baseController.BaseController;
 import com.zhangmeng.model.base.baseUtil.CommonUtil;
-import com.zhangmeng.model.dto.Menu;
+import com.zhangmeng.model.dto.system.EncryptType;
+import com.zhangmeng.model.dto.system.Menu;
 import com.zhangmeng.model.dto.query.QueryParams;
 import com.zhangmeng.model.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,8 +24,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.*;
 
 /**
@@ -328,4 +327,26 @@ public class UrlRequestController extends BaseController {
         }
         return this.jumpPage("admin/job/job-edit");
     }
+
+    @GetMapping("/crypt/encrypt")
+    public ModelAndView index(Model model) {
+        EncryptType[] values = EncryptType.values();
+        model.addAttribute("encryptTypeList",values);
+        return this.jumpPage("admin/code/encrypt");
+    }
+
+    @GetMapping("/admin/form/tools")
+    public ModelAndView form_gen(){
+        return this.jumpPage("admin/code/form");
+    }
+
+    @GetMapping("/mail/index")
+    public ModelAndView mail_index() {
+        return this.jumpPage("admin/mail/list");
+    }
+
+    @GetMapping("/mail/add")
+    public ModelAndView mail_add() {
+        return this.jumpPage("admin/mail/add");
+    }
 }
\ No newline at end of file
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java
index c53d36c..453e1d9 100644
--- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java
@@ -1,6 +1,6 @@
 package com.zhangmeng.admin.manager.feign;
 
-import com.zhangmeng.model.dto.SysConstant;
+import com.zhangmeng.model.dto.system.SysConstant;
 import com.zhangmeng.model.entity.Article;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/CategoryFeign.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/CategoryFeign.java
index fbe91fe..292396d 100644
--- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/CategoryFeign.java
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/CategoryFeign.java
@@ -1,7 +1,6 @@
 package com.zhangmeng.admin.manager.feign;
 
-import com.zhangmeng.model.dto.SysConstant;
-import com.zhangmeng.model.entity.Article;
+import com.zhangmeng.model.dto.system.SysConstant;
 import com.zhangmeng.model.entity.Category;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/QuartzFeign.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/QuartzFeign.java
index d98a035..743233f 100644
--- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/QuartzFeign.java
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/QuartzFeign.java
@@ -1,6 +1,6 @@
 package com.zhangmeng.admin.manager.feign;
 
-import com.zhangmeng.model.dto.SysConstant;
+import com.zhangmeng.model.dto.system.SysConstant;
 import com.zhangmeng.model.entity.QuartzJob;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/PermissionService.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/PermissionService.java
index cdd7ae3..c81850c 100644
--- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/PermissionService.java
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/PermissionService.java
@@ -1,7 +1,7 @@
 package com.zhangmeng.admin.manager.service;
 
 import com.zhangmeng.model.base.baseService.BaseService;
-import com.zhangmeng.model.dto.Menu;
+import com.zhangmeng.model.dto.system.Menu;
 import com.zhangmeng.model.entity.Permission;
 
 import java.util.List;
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/impl/PermissionServiceImpl.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/impl/PermissionServiceImpl.java
index 6024171..630aa0d 100644
--- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/impl/PermissionServiceImpl.java
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/impl/PermissionServiceImpl.java
@@ -3,7 +3,7 @@ package com.zhangmeng.admin.manager.service.impl;
 import com.zhangmeng.admin.manager.dao.PermissionDao;
 import com.zhangmeng.admin.manager.service.PermissionService;
 import com.zhangmeng.model.base.baseService.impl.AbstractBaseServiceImpl;
-import com.zhangmeng.model.dto.Menu;
+import com.zhangmeng.model.dto.system.Menu;
 import com.zhangmeng.model.entity.Permission;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js b/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js
index 67bca9e..cd4ec83 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js
+++ b/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js
@@ -111,6 +111,9 @@ var checkCron_url = gate_way_url + "/" + quartz_url + "/quartz/cron" + access_to
 var quartz_delete_url = gate_way_url + "/" + quartz_url + "/quartz/delete" ;
 //定时任务批量删除
 var quartz_batchRemove_url = gate_way_url + "/" + quartz_url + "/quartz/batchRemove" ;
+//---------------------------------------------------------------------------------------------------------------
+//加密工具
+var crypt_encode_url  = gate_way_url + "/" + admin_manager_url + "/crypt/encode";
 
 //页面跳转
 function postToPage(url, token) {
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/code/encrypt.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/code/encrypt.ftl
index a918b9a..e48f748 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/code/encrypt.ftl
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/code/encrypt.ftl
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>权限管理</title>
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/system/component/pear/css/pear.css"/>
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/css/pear.css"/>
 </head>
 <body class="pear-container">
 <div class="layui-col-md9">
@@ -47,8 +47,9 @@
         </div>
     </div>
 </div>
-<script src="${springMacroRequestContext.contextPath}/system/component/layui/layui.js"></script>
-<script src="${springMacroRequestContext.contextPath}/system/component/pear/pear.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/layui/layui.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/pear.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/admin/js/mystyle-admin.js"></script>
 <script>
     layui.use(['table', 'form', 'jquery', 'treetable'], function () {
         let table = layui.table;
@@ -64,9 +65,9 @@
                 $("#content").val(code);
             } else {
                 var obj = data.field;
-                obj['token'] = localStorage.getItem("token");
+                obj['access_token'] = access_token;
                 $.ajax({
-                    url: '/crypt/encode',
+                    url: crypt_encode_url,
                     data: obj,
                     type: 'post',
                     success: function (result) {
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/code/form.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/code/form.ftl
index ba67929..7a1b5dc 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/code/form.ftl
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/code/form.ftl
@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>layui表单生成器</title>
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/system/component/pear/css/pear.css">
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/system/component/code/css/style.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/css/pear.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/code/css/style.css">
 </head>
 <body>
 <div class="layui-fluid">
@@ -73,8 +73,8 @@
     </div>
 </div>
 </body>
-<script type="text/javascript" src="${springMacroRequestContext.contextPath}/system/component/layui/layui.js"></script>
-<script type="text/javascript" src="${springMacroRequestContext.contextPath}/system/component/pear/pear.js"></script>
+<script type="text/javascript" src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/layui/layui.js"></script>
+<script type="text/javascript" src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/pear.js"></script>
 <script>
     layui.use('design');
 </script>
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/mail/list.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/mail/list.ftl
index f325cff..29add94 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/mail/list.ftl
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/mail/list.ftl
@@ -3,13 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>邮件管理</title>
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/system/component/pear/css/pear.css" />
-    <style>
-        .layui-table-cell{
-            display:table-cell;
-            vertical-align: middle;
-        }
-    </style>
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/css/pear.css" />
 </head>
 <body class="pear-container">
 <div class="layui-card">
@@ -80,8 +74,9 @@
     }}
 </script>
 
-<script src="${springMacroRequestContext.contextPath}/system/component/layui/layui.js"></script>
-<script src="${springMacroRequestContext.contextPath}/system/component/pear/pear.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/layui/layui.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/pear.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/admin/js/mystyle-admin.js"></script>
 <script>
     layui.use(['table', 'form', 'jquery','common'], function() {
         let table = layui.table;
@@ -149,7 +144,7 @@
             headers: {token: localStorage.getItem("token")},
             page: true,
             cols: cols,
-            skin: 'line',
+            skin: 'rows',
             even: true, //开启隔行背景
             toolbar: '#mail-toolbar',
             defaultToolbar: [{
diff --git a/mystyle-cloud-api/src/main/java/com/zhangmeng/api/service/admin_manager/EncryptControllerApi.java b/mystyle-cloud-api/src/main/java/com/zhangmeng/api/service/admin_manager/EncryptControllerApi.java
new file mode 100644
index 0000000..200adc0
--- /dev/null
+++ b/mystyle-cloud-api/src/main/java/com/zhangmeng/api/service/admin_manager/EncryptControllerApi.java
@@ -0,0 +1,15 @@
+package com.zhangmeng.api.service.admin_manager;
+
+import com.zhangmeng.model.dto.system.EncryptType;
+import com.zhangmeng.model.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Api(tags = "加密")
+public interface EncryptControllerApi {
+
+    @ApiOperation("加密")
+    public Result encode(Model model, EncryptType encryptType, String text);
+}
diff --git a/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/UserFeign.java b/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/UserFeign.java
index 0d4a991..671fc97 100644
--- a/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/UserFeign.java
+++ b/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/UserFeign.java
@@ -1,6 +1,6 @@
 package com.zhangmeng.blog.feign;
 
-import com.zhangmeng.model.dto.SysConstant;
+import com.zhangmeng.model.dto.system.SysConstant;
 import com.zhangmeng.model.entity.User;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/mystyle-cloud-file/src/main/java/com/zhangmeng/file/feign/TokenFeign.java b/mystyle-cloud-file/src/main/java/com/zhangmeng/file/feign/TokenFeign.java
index b0a53e4..39e9bbc 100644
--- a/mystyle-cloud-file/src/main/java/com/zhangmeng/file/feign/TokenFeign.java
+++ b/mystyle-cloud-file/src/main/java/com/zhangmeng/file/feign/TokenFeign.java
@@ -1,6 +1,6 @@
 package com.zhangmeng.file.feign;
 
-import com.zhangmeng.model.dto.SysConstant;
+import com.zhangmeng.model.dto.system.SysConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
diff --git a/mystyle-cloud-file/src/main/java/com/zhangmeng/file/feign/UserFeignService.java b/mystyle-cloud-file/src/main/java/com/zhangmeng/file/feign/UserFeignService.java
index c50d0d8..dc2f1b2 100644
--- a/mystyle-cloud-file/src/main/java/com/zhangmeng/file/feign/UserFeignService.java
+++ b/mystyle-cloud-file/src/main/java/com/zhangmeng/file/feign/UserFeignService.java
@@ -1,6 +1,6 @@
 package com.zhangmeng.file.feign;
 
-import com.zhangmeng.model.dto.SysConstant;
+import com.zhangmeng.model.dto.system.SysConstant;
 import com.zhangmeng.model.entity.Permission;
 import com.zhangmeng.model.entity.User;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/mystyle-cloud-file/src/main/java/com/zhangmeng/file/service/impl/UploadServiceImpl.java b/mystyle-cloud-file/src/main/java/com/zhangmeng/file/service/impl/UploadServiceImpl.java
index c26e320..9f330f2 100644
--- a/mystyle-cloud-file/src/main/java/com/zhangmeng/file/service/impl/UploadServiceImpl.java
+++ b/mystyle-cloud-file/src/main/java/com/zhangmeng/file/service/impl/UploadServiceImpl.java
@@ -7,7 +7,7 @@ import com.zhangmeng.file.service.FileInfoService;
 import com.zhangmeng.file.service.UploadService;
 import com.zhangmeng.file.utils.FastDfsClient;
 import com.zhangmeng.file.utils.FileUtil;
-import com.zhangmeng.model.dto.FastDfsFileInfo;
+import com.zhangmeng.model.dto.system.FastDfsFileInfo;
 import com.zhangmeng.model.entity.FileInfo;
 import com.zhangmeng.model.vo.Result;
 import com.zhangmeng.model.vo.StatusCode;
@@ -21,10 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.Objects;
diff --git a/mystyle-cloud-file/src/main/java/com/zhangmeng/file/utils/FastDfsClient.java b/mystyle-cloud-file/src/main/java/com/zhangmeng/file/utils/FastDfsClient.java
index 8604106..c6ef512 100644
--- a/mystyle-cloud-file/src/main/java/com/zhangmeng/file/utils/FastDfsClient.java
+++ b/mystyle-cloud-file/src/main/java/com/zhangmeng/file/utils/FastDfsClient.java
@@ -1,5 +1,6 @@
 package com.zhangmeng.file.utils;
 
+import com.zhangmeng.model.dto.system.FastDfsFileInfo;
 import org.csource.common.NameValuePair;
 import org.csource.fastdfs.*;
 import org.springframework.core.io.ClassPathResource;
@@ -26,7 +27,7 @@ public class FastDfsClient {
      * @param file
      * @return
      */
-    public static String[] upload(com.zhangmeng.model.dto.FastDfsFileInfo file) {
+    public static String[] upload(FastDfsFileInfo file) {
         try {
             TrackerClient trackerClient = new TrackerClient();
             TrackerServer trackerServer = trackerClient.getConnection();
diff --git a/mystyle-cloud-model/pom.xml b/mystyle-cloud-model/pom.xml
index 4ae848a..e2bc505 100644
--- a/mystyle-cloud-model/pom.xml
+++ b/mystyle-cloud-model/pom.xml
@@ -105,5 +105,9 @@
             <artifactId>spring-cloud-starter-oauth2</artifactId>
             <version>2.2.4.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/base/baseUtil/CommonUtil.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/base/baseUtil/CommonUtil.java
index 99284a8..ac799b2 100644
--- a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/base/baseUtil/CommonUtil.java
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/base/baseUtil/CommonUtil.java
@@ -1,6 +1,8 @@
 package com.zhangmeng.model.base.baseUtil;
 
+import cn.hutool.crypto.digest.DigestUtil;
 import com.zhangmeng.model.dto.date.DateBean;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -363,4 +365,25 @@ public class CommonUtil {
         }
         return null;
     }
+
+    /**
+     * 摘要 md5 加密
+     *
+     * @param encodeStr 将要加密的字符串
+     * @return md5
+     */
+    public static String md5Encrypt(String encodeStr) {
+        return DigestUtil.md5Hex(encodeStr);
+    }
+
+    /**
+     * spring security 加密
+     *
+     * @param encrypt 加密字符
+     * @return String
+     */
+    public static String bCryptPasswordEncoder(String encrypt) {
+        BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
+        return bCryptPasswordEncoder.encode(encrypt);
+    }
 }
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/EncryptType.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/EncryptType.java
new file mode 100644
index 0000000..5ca5901
--- /dev/null
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/EncryptType.java
@@ -0,0 +1,24 @@
+package com.zhangmeng.model.dto.system;
+
+/**
+ * 加密方式
+ */
+public enum EncryptType {
+    Md5("md5"),
+    SHA256("SHA-256"),
+    BCryptPasswordEncoder("bCryptPasswordEncoder"),
+    editPlusCodeGen("editPlusCodeGen");
+    EncryptType(String desc) {
+        this.desc = desc;
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}
\ No newline at end of file
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/FastDfsFileInfo.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/FastDfsFileInfo.java
similarity index 87%
rename from mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/FastDfsFileInfo.java
rename to mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/FastDfsFileInfo.java
index 838a063..aea0b5b 100644
--- a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/FastDfsFileInfo.java
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/FastDfsFileInfo.java
@@ -1,4 +1,4 @@
-package com.zhangmeng.model.dto;
+package com.zhangmeng.model.dto.system;
 
 import lombok.Data;
 
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/File.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/File.java
similarity index 84%
rename from mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/File.java
rename to mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/File.java
index 1942f40..0f67858 100644
--- a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/File.java
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/File.java
@@ -1,4 +1,4 @@
-package com.zhangmeng.model.dto;
+package com.zhangmeng.model.dto.system;
 
 import lombok.Data;
 
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/Menu.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/Menu.java
similarity index 93%
rename from mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/Menu.java
rename to mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/Menu.java
index 2ae9fd7..c347be8 100644
--- a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/Menu.java
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/Menu.java
@@ -1,4 +1,4 @@
-package com.zhangmeng.model.dto;
+package com.zhangmeng.model.dto.system;
 
 import com.zhangmeng.model.base.baseEntity.BaseEntity;
 import lombok.Data;
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/MySpecCaptcha.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/MySpecCaptcha.java
similarity index 98%
rename from mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/MySpecCaptcha.java
rename to mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/MySpecCaptcha.java
index 21d6533..491d6aa 100644
--- a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/MySpecCaptcha.java
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/MySpecCaptcha.java
@@ -1,4 +1,4 @@
-package com.zhangmeng.model.dto;
+package com.zhangmeng.model.dto.system;
 
 import com.wf.captcha.SpecCaptcha;
 import lombok.Data;
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/RequestData.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/RequestData.java
similarity index 75%
rename from mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/RequestData.java
rename to mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/RequestData.java
index 61acfd6..96ddc57 100644
--- a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/RequestData.java
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/RequestData.java
@@ -1,4 +1,4 @@
-package com.zhangmeng.model.dto;
+package com.zhangmeng.model.dto.system;
 
 /**
  * @author 转身的背影在心底里沉沦
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/SysConstant.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/SysConstant.java
similarity index 90%
rename from mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/SysConstant.java
rename to mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/SysConstant.java
index 2117f1b..4ac2376 100644
--- a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/SysConstant.java
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/dto/system/SysConstant.java
@@ -1,4 +1,4 @@
-package com.zhangmeng.model.dto;
+package com.zhangmeng.model.dto.system;
 
 /**
  * 系统常量
diff --git a/mystyle-cloud-oauth/src/main/java/com/zhangmeng/oauth/feign/AdminFeign.java b/mystyle-cloud-oauth/src/main/java/com/zhangmeng/oauth/feign/AdminFeign.java
index c5f41cc..55206b4 100644
--- a/mystyle-cloud-oauth/src/main/java/com/zhangmeng/oauth/feign/AdminFeign.java
+++ b/mystyle-cloud-oauth/src/main/java/com/zhangmeng/oauth/feign/AdminFeign.java
@@ -1,10 +1,9 @@
 package com.zhangmeng.oauth.feign;
 
-import com.zhangmeng.model.dto.SysConstant;
+import com.zhangmeng.model.dto.system.SysConstant;
 import com.zhangmeng.model.entity.Permission;
 import com.zhangmeng.model.entity.User;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
diff --git a/mystyle-cloud-oauth/src/main/java/com/zhangmeng/oauth/service/impl/AuthServiceImpl.java b/mystyle-cloud-oauth/src/main/java/com/zhangmeng/oauth/service/impl/AuthServiceImpl.java
index 07483bb..493950b 100644
--- a/mystyle-cloud-oauth/src/main/java/com/zhangmeng/oauth/service/impl/AuthServiceImpl.java
+++ b/mystyle-cloud-oauth/src/main/java/com/zhangmeng/oauth/service/impl/AuthServiceImpl.java
@@ -1,6 +1,6 @@
 package com.zhangmeng.oauth.service.impl;
 
-import com.zhangmeng.model.dto.SysConstant;
+import com.zhangmeng.model.dto.system.SysConstant;
 import com.zhangmeng.model.dto.exception.CustomizeException;
 import com.zhangmeng.oauth.dto.AuthToken;
 import com.zhangmeng.oauth.service.AuthService;