diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
index 73a3ad49e..b68bc058f 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
@@ -30,7 +30,7 @@ public class AdminAdController {
 
     @RequiresPermissions("admin:ad:list")
     @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="查询")
-    @GetMapping("/list")
+    @RequestMapping("/list")
     public Object list(String name, String content,
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer limit,
diff --git a/litemall-admin/src/lang/en.js b/litemall-admin/src/lang/en.js
index 3f6641944..930f0ad1f 100644
--- a/litemall-admin/src/lang/en.js
+++ b/litemall-admin/src/lang/en.js
@@ -87,7 +87,6 @@ export default {
   },
   permission: {
     roles: 'Your roles',
-    perms: 'Your permissions',
     switchRoles: 'Switch roles'
   },
   guide: {
diff --git a/litemall-admin/src/lang/zh.js b/litemall-admin/src/lang/zh.js
index 6960274b1..46e96ccf5 100644
--- a/litemall-admin/src/lang/zh.js
+++ b/litemall-admin/src/lang/zh.js
@@ -86,9 +86,8 @@ export default {
     github: 'Github 地址'
   },
   permission: {
-    roles: '你的角色',
-    perms: '你的权限',
-    switchRoles: '切换角色'
+    roles: '你的权限',
+    switchRoles: '切换权限'
   },
   guide: {
     description: '引导页对于一些第一次进入项目的人很有用，你可以简单介绍下项目的功能。本 Demo 是基于',
diff --git a/litemall-admin/src/main.js b/litemall-admin/src/main.js
index 0daf46773..499409837 100644
--- a/litemall-admin/src/main.js
+++ b/litemall-admin/src/main.js
@@ -19,15 +19,11 @@ import './permission' // permission control
 
 import * as filters from './filters' // global filters
 
-import permission from '@/directive/permission/index.js' // 权限判断指令
-
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium', // set element-ui default size
   i18n: (key, value) => i18n.t(key, value)
 })
 
-Vue.directive('permission', permission)
-
 // register global utility filters.
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])
diff --git a/litemall-admin/src/permission.js b/litemall-admin/src/permission.js
index 4603bbc6d..8da249569 100644
--- a/litemall-admin/src/permission.js
+++ b/litemall-admin/src/permission.js
@@ -8,10 +8,10 @@ import { getToken } from '@/utils/auth' // getToken from cookie
 NProgress.configure({ showSpinner: false })// NProgress Configuration
 
 // permission judge function
-function hasPermission(perms, permissions) {
-  if (perms.indexOf('*') >= 0) return true // admin permission passed directly
-  if (!permissions) return true
-  return perms.some(perm => permissions.indexOf(perm) >= 0)
+function hasPermission(roles, permissionRoles) {
+  if (roles.indexOf('admin') >= 0) return true // admin permission passed directly
+  if (!permissionRoles) return true
+  return roles.some(role => permissionRoles.indexOf(role) >= 0)
 }
 
 const whiteList = ['/login', '/auth-redirect']// no redirect whitelist
@@ -24,10 +24,10 @@ router.beforeEach((to, from, next) => {
       next({ path: '/' })
       NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
     } else {
-      if (store.getters.perms.length === 0) { // 判断当前用户是否已拉取完user_info信息
+      if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetUserInfo').then(res => { // 拉取user_info
-          const perms = res.data.data.perms // note: perms must be a array! such as: ['GET /aaa','POST /bbb']
-          store.dispatch('GenerateRoutes', { perms }).then(() => { // 根据perms权限生成可访问的路由表
+          const roles = res.data.data.roles // note: roles must be a array! such as: ['editor','develop']
+          store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
@@ -39,7 +39,7 @@ router.beforeEach((to, from, next) => {
         })
       } else {
         // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
-        if (hasPermission(store.getters.perms, to.meta.perms)) {
+        if (hasPermission(store.getters.roles, to.meta.roles)) {
           next()
         } else {
           next({ path: '/401', replace: true, query: { noGoBack: true }})
diff --git a/litemall-admin/src/router/index.js b/litemall-admin/src/router/index.js
index 8930c5cf9..112e24f8e 100644
--- a/litemall-admin/src/router/index.js
+++ b/litemall-admin/src/router/index.js
@@ -18,7 +18,7 @@ import Layout from '@/views/layout/Layout'
 * redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
 * name:'router-name'             the name is used by <keep-alive> (must set!!!)
 * meta : {
-    perms: ['GET /aaa','POST /bbb']     will control the page perms (you can set multiple perms)
+    roles: ['admin','editor']     will control the page roles (you can set multiple roles)
     title: 'title'               the name show in submenu and breadcrumb (recommend set)
     icon: 'svg-name'             the icon show in the sidebar,
     noCache: true                if true ,the page will no be cached(default is false)
@@ -82,7 +82,6 @@ export const asyncRouterMap = [
     path: '/user',
     component: Layout,
     redirect: 'noredirect',
-    alwaysShow: true,
     name: 'userManage',
     meta: {
       title: '用户管理',
@@ -93,61 +92,37 @@ export const asyncRouterMap = [
         path: 'user',
         component: () => import('@/views/user/user'),
         name: 'user',
-        meta: {
-          perms: ['GET /admin/user/list', 'POST /admin/user/create', 'POST /admin/user/update'],
-          title: '会员管理',
-          noCache: true
-        }
+        meta: { title: '会员管理', noCache: true }
       },
       {
         path: 'address',
         component: () => import('@/views/user/address'),
         name: 'address',
-        meta: {
-          perms: ['GET /admin/address/list'],
-          title: '收货地址',
-          noCache: true
-        }
+        meta: { title: '收货地址', noCache: true }
       },
       {
         path: 'collect',
         component: () => import('@/views/user/collect'),
         name: 'collect',
-        meta: {
-          perms: ['GET /admin/collect/list'],
-          title: '会员收藏',
-          noCache: true
-        }
+        meta: { title: '会员收藏', noCache: true }
       },
       {
         path: 'footprint',
         component: () => import('@/views/user/footprint'),
         name: 'footprint',
-        meta: {
-          perms: ['GET /admin/footprint/list'],
-          title: '会员足迹',
-          noCache: true
-        }
+        meta: { title: '会员足迹', noCache: true }
       },
       {
         path: 'history',
         component: () => import('@/views/user/history'),
         name: 'history',
-        meta: {
-          perms: ['GET /admin/history/list'],
-          title: '搜索历史',
-          noCache: true
-        }
+        meta: { title: '搜索历史', noCache: true }
       },
       {
         path: 'feedback',
         component: () => import('@/views/user/feedback'),
         name: 'feedback',
-        meta: {
-          perms: ['GET /admin/feedback/list'],
-          title: '意见反馈',
-          noCache: true
-        }
+        meta: { title: '意见反馈', noCache: true }
       }
     ]
   },
@@ -156,7 +131,6 @@ export const asyncRouterMap = [
     path: '/mall',
     component: Layout,
     redirect: 'noredirect',
-    alwaysShow: true,
     name: 'mallManage',
     meta: {
       title: '商场管理',
@@ -167,60 +141,37 @@ export const asyncRouterMap = [
         path: 'region',
         component: () => import('@/views/mall/region'),
         name: 'region',
-        meta: {
-          title: '行政区域',
-          noCache: true
-        }
+        meta: { title: '行政区域', noCache: true }
       },
       {
         path: 'brand',
         component: () => import('@/views/mall/brand'),
         name: 'brand',
-        meta: {
-          perms: ['GET /admin/brand/list', 'POST /admin/brand/create', 'GET /admin/brand/read', 'POST /admin/brand/update', 'POST /admin/brand/delete'],
-          title: '品牌制造商',
-          noCache: true
-        }
+        meta: { title: '品牌制造商', noCache: true }
       },
       {
         path: 'category',
         component: () => import('@/views/mall/category'),
         name: 'category',
-        meta: {
-          perms: ['GET /admin/category/list', 'POST /admin/category/create', 'GET /admin/category/read', 'POST /admin/category/update', 'POST /admin/category/delete'],
-          title: '商品类目',
-          noCache: true
-        }
+        meta: { title: '商品类目', noCache: true }
       },
       {
         path: 'order',
         component: () => import('@/views/mall/order'),
         name: 'order',
-        meta: {
-          perms: ['GET /admin/order/list', 'GET /admin/order/detail', 'POST /admin/order/ordership', 'POST /admin/order/orderrefund', 'POST /admin/order/orderreply'],
-          title: '订单管理',
-          noCache: true
-        }
+        meta: { title: '订单管理', noCache: true }
       },
       {
         path: 'issue',
         component: () => import('@/views/mall/issue'),
         name: 'issue',
-        meta: {
-          perms: ['GET /admin/issue/list', 'POST /admin/issue/create', 'GET /admin/issue/read', 'POST /admin/issue/update', 'POST /admin/issue/delete'],
-          title: '通用问题',
-          noCache: true
-        }
+        meta: { title: '通用问题', noCache: true }
       },
       {
         path: 'keyword',
         component: () => import('@/views/mall/keyword'),
         name: 'keyword',
-        meta: {
-          perms: ['GET /admin/keyword/list', 'POST /admin/keyword/create', 'GET /admin/keyword/read', 'POST /admin/keyword/update', 'POST /admin/keyword/delete'],
-          title: '关键词',
-          noCache: true
-        }
+        meta: { title: '关键词', noCache: true }
       }
     ]
   },
@@ -229,7 +180,6 @@ export const asyncRouterMap = [
     path: '/goods',
     component: Layout,
     redirect: 'noredirect',
-    alwaysShow: true,
     name: 'goodsManage',
     meta: {
       title: '商品管理',
@@ -240,42 +190,26 @@ export const asyncRouterMap = [
         path: 'list',
         component: () => import('@/views/goods/list'),
         name: 'goodsList',
-        meta: {
-          perms: ['GET /admin/goods/list', 'POST /admin/goods/delete'],
-          title: '商品列表',
-          noCache: true
-        }
+        meta: { title: '商品列表', noCache: true }
       },
       {
         path: 'create',
         component: () => import('@/views/goods/create'),
         name: 'goodsCreate',
-        meta: {
-          perms: ['POST /admin/goods/create'],
-          title: '商品上架',
-          noCache: true
-        }
+        meta: { title: '商品上架', noCache: true }
       },
       {
         path: 'edit',
         component: () => import('@/views/goods/edit'),
         name: 'goodsEdit',
-        meta: {
-          perms: ['GET /admin/goods/detail', 'POST /admin/goods/update', 'POST /admin/goods/catAndBrand'],
-          title: '商品编辑',
-          noCache: true
-        },
+        meta: { title: '商品编辑', noCache: true },
         hidden: true
       },
       {
         path: 'comment',
         component: () => import('@/views/goods/comment'),
         name: 'goodsComment',
-        meta: {
-          perms: ['GET /admin/comment/list', 'POST /admin/comment/delete'],
-          title: '商品评论',
-          noCache: true
-        }
+        meta: { title: '商品评论', noCache: true }
       }
     ]
   },
@@ -283,7 +217,6 @@ export const asyncRouterMap = [
     path: '/promotion',
     component: Layout,
     redirect: 'noredirect',
-    alwaysShow: true,
     name: 'promotionManage',
     meta: {
       title: '推广管理',
@@ -294,62 +227,38 @@ export const asyncRouterMap = [
         path: 'ad',
         component: () => import('@/views/promotion/ad'),
         name: 'ad',
-        meta: {
-          perms: ['GET /admin/ad/list', 'POST /admin/ad/create', 'GET /admin/ad/read', 'POST /admin/ad/update', 'POST /admin/ad/delete'],
-          title: '广告管理',
-          noCache: true
-        }
+        meta: { title: '广告管理', noCache: true }
       },
       {
         path: 'coupon',
         component: () => import('@/views/promotion/coupon'),
         name: 'coupon',
-        meta: {
-          perms: ['GET /admin/coupon/list', 'POST /admin/coupon/create', 'POST /admin/coupon/update', 'POST /admin/coupon/delete'],
-          title: '优惠券管理',
-          noCache: true
-        }
+        meta: { title: '优惠券管理', noCache: true }
       },
       {
         path: 'couponDetail',
         component: () => import('@/views/promotion/couponDetail'),
         name: 'couponDetail',
-        meta: {
-          perms: ['GET /admin/coupon/list', 'GET /admin/coupon/listuser'],
-          title: '优惠券详情',
-          noCache: true
-        },
+        meta: { title: '优惠券详情', noCache: true },
         hidden: true
       },
       {
         path: 'topic',
         component: () => import('@/views/promotion/topic'),
         name: 'topic',
-        meta: {
-          perms: ['GET /admin/topic/list', 'POST /admin/topic/create', 'GET /admin/topic/read', 'POST /admin/topic/update', 'POST /admin/topic/delete'],
-          title: '专题管理',
-          noCache: true
-        }
+        meta: { title: '专题管理', noCache: true }
       },
       {
         path: 'groupon-rule',
         component: () => import('@/views/promotion/grouponRule'),
         name: 'grouponRule',
-        meta: {
-          perms: ['GET /admin/groupon/list', 'POST /admin/groupon/create', 'POST /admin/groupon/update', 'POST /admin/groupon/delete'],
-          title: '团购规则',
-          noCache: true
-        }
+        meta: { title: '团购规则', noCache: true }
       },
       {
         path: 'groupon-activity',
         component: () => import('@/views/promotion/grouponActivity'),
         name: 'grouponActivity',
-        meta: {
-          perms: ['GET /admin/groupon/listRecord'],
-          title: '团购活动',
-          noCache: true
-        }
+        meta: { title: '团购活动', noCache: true }
       }
     ]
   },
@@ -358,7 +267,6 @@ export const asyncRouterMap = [
     path: '/sys',
     component: Layout,
     redirect: 'noredirect',
-    alwaysShow: true,
     name: 'sysManage',
     meta: {
       title: '系统管理',
@@ -369,31 +277,19 @@ export const asyncRouterMap = [
         path: 'admin',
         component: () => import('@/views/sys/admin'),
         name: 'admin',
-        meta: {
-          perms: ['GET /admin/admin/list', 'POST /admin/admin/create', 'POST /admin/admin/update', 'POST /admin/admin/delete'],
-          title: '管理员',
-          noCache: true
-        }
+        meta: { title: '管理员', noCache: true }
       },
       {
         path: 'role',
         component: () => import('@/views/sys/role'),
         name: 'role',
-        meta: {
-          perms: ['GET /admin/role/list', 'POST /admin/role/create', 'POST /admin/role/update', 'POST /admin/role/delete', 'GET /admin/role/permissions', 'POST /admin/role/permissions'],
-          title: '角色管理',
-          noCache: true
-        }
+        meta: { title: '角色管理', noCache: true }
       },
       {
         path: 'os',
         component: () => import('@/views/sys/os'),
         name: 'os',
-        meta: {
-          perms: ['GET /admin/os/list', 'POST /admin/os/create', 'POST /admin/os/update', 'POST /admin/os/delete'],
-          title: '对象存储',
-          noCache: true
-        }
+        meta: { title: '对象存储', noCache: true }
       }
     ]
   },
@@ -402,7 +298,6 @@ export const asyncRouterMap = [
     path: '/stat',
     component: Layout,
     redirect: 'noredirect',
-    alwaysShow: true,
     name: 'statManage',
     meta: {
       title: '统计',
@@ -413,31 +308,19 @@ export const asyncRouterMap = [
         path: 'user',
         component: () => import('@/views/stat/user'),
         name: 'statUser',
-        meta: {
-          perms: ['GET /admin/stat/user'],
-          title: '用户统计',
-          noCache: true
-        }
+        meta: { title: '用户统计', noCache: true }
       },
       {
         path: 'order',
         component: () => import('@/views/stat/order'),
         name: 'statOrder',
-        meta: {
-          perms: ['GET /admin/stat/order'],
-          title: '订单统计',
-          noCache: true
-        }
+        meta: { title: '订单统计', noCache: true }
       },
       {
         path: 'goods',
         component: () => import('@/views/stat/goods'),
         name: 'statGoods',
-        meta: {
-          perms: ['GET /admin/stat/goods'],
-          title: '商品统计',
-          noCache: true
-        }
+        meta: { title: '商品统计', noCache: true }
       }
     ]
   },
@@ -445,7 +328,6 @@ export const asyncRouterMap = [
     path: 'external-link',
     component: Layout,
     redirect: 'noredirect',
-    alwaysShow: true,
     name: 'externalLink',
     meta: {
       title: '外链',
@@ -486,7 +368,6 @@ export const asyncRouterMap = [
     path: '/profile',
     component: Layout,
     redirect: 'noredirect',
-    alwaysShow: true,
     children: [
       {
         path: 'password',
diff --git a/litemall-admin/src/store/getters.js b/litemall-admin/src/store/getters.js
index 745789c73..0d05236e2 100644
--- a/litemall-admin/src/store/getters.js
+++ b/litemall-admin/src/store/getters.js
@@ -11,7 +11,6 @@ const getters = {
   introduction: state => state.user.introduction,
   status: state => state.user.status,
   roles: state => state.user.roles,
-  perms: state => state.user.perms,
   setting: state => state.user.setting,
   permission_routers: state => state.permission.routers,
   addRouters: state => state.permission.addRouters
diff --git a/litemall-admin/src/store/modules/permission.js b/litemall-admin/src/store/modules/permission.js
index bcdeea764..97de701e9 100644
--- a/litemall-admin/src/store/modules/permission.js
+++ b/litemall-admin/src/store/modules/permission.js
@@ -1,13 +1,13 @@
 import { asyncRouterMap, constantRouterMap } from '@/router'
 
 /**
- * 通过meta.perms判断是否与当前用户权限匹配
- * @param perms
+ * 通过meta.role判断是否与当前用户权限匹配
+ * @param roles
  * @param route
  */
-function hasPermission(perms, route) {
-  if (route.meta && route.meta.perms) {
-    return perms.some(perm => route.meta.perms.includes(perm))
+function hasPermission(roles, route) {
+  if (route.meta && route.meta.roles) {
+    return roles.some(role => route.meta.roles.includes(role))
   } else {
     return true
   }
@@ -16,22 +16,18 @@ function hasPermission(perms, route) {
 /**
  * 递归过滤异步路由表，返回符合用户角色权限的路由表
  * @param routes asyncRouterMap
- * @param perms
+ * @param roles
  */
-function filterAsyncRouter(routes, perms) {
+function filterAsyncRouter(routes, roles) {
   const res = []
 
   routes.forEach(route => {
     const tmp = { ...route }
-    if (tmp.children) {
-      tmp.children = filterAsyncRouter(tmp.children, perms)
-      if (tmp.children && tmp.children.length > 0) {
-        res.push(tmp)
-      }
-    } else {
-      if (hasPermission(perms, tmp)) {
-        res.push(tmp)
+    if (hasPermission(roles, tmp)) {
+      if (tmp.children) {
+        tmp.children = filterAsyncRouter(tmp.children, roles)
       }
+      res.push(tmp)
     }
   })
 
@@ -52,12 +48,12 @@ const permission = {
   actions: {
     GenerateRoutes({ commit }, data) {
       return new Promise(resolve => {
-        const { perms } = data
+        const { roles } = data
         let accessedRouters
-        if (perms.includes('*')) {
+        if (roles.includes('admin')) {
           accessedRouters = asyncRouterMap
         } else {
-          accessedRouters = filterAsyncRouter(asyncRouterMap, perms)
+          accessedRouters = filterAsyncRouter(asyncRouterMap, roles)
         }
         commit('SET_ROUTERS', accessedRouters)
         resolve()
diff --git a/litemall-admin/src/store/modules/user.js b/litemall-admin/src/store/modules/user.js
index 16d0cb2c5..67c1730d1 100644
--- a/litemall-admin/src/store/modules/user.js
+++ b/litemall-admin/src/store/modules/user.js
@@ -11,7 +11,6 @@ const user = {
     avatar: '',
     introduction: '',
     roles: [],
-    perms: [],
     setting: {
       articlePlatform: []
     }
@@ -41,9 +40,6 @@ const user = {
     },
     SET_ROLES: (state, roles) => {
       state.roles = roles
-    },
-    SET_PERMS: (state, perms) => {
-      state.perms = perms
     }
   },
 
@@ -69,13 +65,12 @@ const user = {
         getUserInfo(state.token).then(response => {
           const data = response.data.data
 
-          if (data.perms && data.perms.length > 0) { // 验证返回的perms是否是一个非空数组
-            commit('SET_PERMS', data.perms)
+          if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+            commit('SET_ROLES', data.roles)
           } else {
-            reject('getInfo: perms must be a non-null array !')
+            reject('getInfo: roles must be a non-null array !')
           }
 
-          commit('SET_ROLES', data.roles)
           commit('SET_NAME', data.name)
           commit('SET_AVATAR', data.avatar)
           commit('SET_INTRODUCTION', data.introduction)
@@ -106,7 +101,6 @@ const user = {
         logout(state.token).then(() => {
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
-          commit('SET_PERMS', [])
           removeToken()
           resolve()
         }).catch(error => {
@@ -132,7 +126,6 @@ const user = {
         getUserInfo(role).then(response => {
           const data = response.data
           commit('SET_ROLES', data.roles)
-          commit('SET_PERMS', data.perms)
           commit('SET_NAME', data.name)
           commit('SET_AVATAR', data.avatar)
           commit('SET_INTRODUCTION', data.introduction)
diff --git a/litemall-admin/src/views/login/index.vue b/litemall-admin/src/views/login/index.vue
index fe98db980..f1388cfc9 100644
--- a/litemall-admin/src/views/login/index.vue
+++ b/litemall-admin/src/views/login/index.vue
@@ -22,21 +22,6 @@
       </el-form-item>
 
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button>
-
-      <div style="position:relative">
-        <div class="tips">
-          <span> 超级管理员用户名: admin123</span>
-          <span> 超级管理员用户名：admin123</span>
-        </div>
-        <div class="tips">
-          <span> 商城管理员用户名: mall123</span>
-          <span> 商城管理员用户名：mall123</span>
-        </div>
-        <div class="tips">
-          <span> 推广管理员用户名: promotion123</span>
-          <span> 推广管理员用户名：promotion123</span>
-        </div>
-      </div>
     </el-form>
 
   </div>
diff --git a/litemall-admin/src/views/promotion/ad.vue b/litemall-admin/src/views/promotion/ad.vue
index 89a711f62..6011a0f7b 100644
--- a/litemall-admin/src/views/promotion/ad.vue
+++ b/litemall-admin/src/views/promotion/ad.vue
@@ -5,8 +5,8 @@
     <div class="filter-container">
       <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 200px;" placeholder="请输入广告标题"/>
       <el-input v-model="listQuery.content" clearable class="filter-item" style="width: 200px;" placeholder="请输入广告内容"/>
-      <el-button v-permission="['GET /admin/ad/list']" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
-      <el-button v-permission="['POST /admin/ad/create']" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
 
@@ -37,8 +37,8 @@
 
       <el-table-column align="center" label="操作" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-permission="['POST /admin/ad/update']" type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button>
-          <el-button v-permission="['POST /admin/ad/delete']" type="danger" size="mini" @click="handleDelete(scope.row)">删除</el-button>
+          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button>
+          <el-button type="danger" size="mini" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/litemall-admin/src/views/sys/role.vue b/litemall-admin/src/views/sys/role.vue
index 43453343e..b36760c36 100644
--- a/litemall-admin/src/views/sys/role.vue
+++ b/litemall-admin/src/views/sys/role.vue
@@ -50,12 +50,7 @@
         :default-checked-keys="assignedPermissions"
         show-checkbox
         node-key="id"
-        highlight-current>
-        <span slot-scope="{ node, data }" class="custom-tree-node">
-          <span>{{ data.label }}</span>
-          <el-tag v-if="data.api" type="success" size="mini">{{ data.api }}</el-tag>
-        </span>
-      </el-tree>
+        highlight-current/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="permissionDialogFormVisible = false">取消</el-button>
         <el-button type="primary" @click="updatePermission">确定</el-button>
diff --git a/litemall-all/pom.xml b/litemall-all/pom.xml
index 7c4c91399..11583e801 100644
--- a/litemall-all/pom.xml
+++ b/litemall-all/pom.xml
@@ -17,6 +17,22 @@
             <artifactId>litemall-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.linlinjava</groupId>
+            <artifactId>litemall-cache</artifactId>
+        </dependency>
+        <!-- 开启redis -->
+        <!--<dependency>-->
+            <!--<groupId>org.linlinjava</groupId>-->
+            <!--<artifactId>litemall-redis</artifactId>-->
+        <!--</dependency>-->
+
+        <!-- 开启ehcache -->
+        <!--<dependency>-->
+            <!--<groupId>org.linlinjava</groupId>-->
+            <!--<artifactId>litemall-ehcache</artifactId>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.linlinjava</groupId>
             <artifactId>litemall-db</artifactId>
diff --git a/litemall-all/src/main/java/org/linlinjava/litemall/Application.java b/litemall-all/src/main/java/org/linlinjava/litemall/Application.java
index fe5ef3fdc..900401ce5 100644
--- a/litemall-all/src/main/java/org/linlinjava/litemall/Application.java
+++ b/litemall-all/src/main/java/org/linlinjava/litemall/Application.java
@@ -3,6 +3,7 @@
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -10,6 +11,7 @@
 @MapperScan("org.linlinjava.litemall.db.dao")
 @EnableTransactionManagement
 @EnableScheduling
+@EnableCaching
 public class Application {
 
     public static void main(String[] args) throws Exception {
diff --git a/litemall-all/src/main/resources/application.yml b/litemall-all/src/main/resources/application.yml
index cbd57d797..7e74fa57a 100644
--- a/litemall-all/src/main/resources/application.yml
+++ b/litemall-all/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: db, core, admin, wx
+    active: db, core, admin, wx, cache
   messages:
     encoding: UTF-8
 
@@ -10,7 +10,7 @@ server:
 logging:
   level:
     root:  ERROR
-    org.springframework:  ERROR
+    org.springframework:  DEBUG
     org.mybatis:  ERROR
     org.linlinjava.litemall.core:  ERROR
     org.linlinjava.litemall.db:  ERROR
diff --git a/litemall-cache/litemall-ehcache/pom.xml b/litemall-cache/litemall-ehcache/pom.xml
new file mode 100644
index 000000000..705e8550a
--- /dev/null
+++ b/litemall-cache/litemall-ehcache/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>litemall-cache</artifactId>
+        <groupId>org.linlinjava</groupId>
+        <version>0.1.0</version>
+    </parent>
+    <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>litemall-ehcache</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/litemall-cache/litemall-redis/pom.xml b/litemall-cache/litemall-redis/pom.xml
new file mode 100644
index 000000000..0c221bebc
--- /dev/null
+++ b/litemall-cache/litemall-redis/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>litemall-redis</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.linlinjava</groupId>
+        <artifactId>litemall</artifactId>
+        <version>0.1.0</version>
+    </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.linlinjava</groupId>
+            <artifactId>litemall-cache</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+
+        <!-- 解决LocalDateTime序列化问题 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/litemall-cache/litemall-redis/src/main/java/org/linlinjava/litemall/core/cache/redis/Application.java b/litemall-cache/litemall-redis/src/main/java/org/linlinjava/litemall/core/cache/redis/Application.java
new file mode 100644
index 000000000..dcff89560
--- /dev/null
+++ b/litemall-cache/litemall-redis/src/main/java/org/linlinjava/litemall/core/cache/redis/Application.java
@@ -0,0 +1,14 @@
+package org.linlinjava.litemall.core.cache.redis;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+
+@SpringBootApplication(scanBasePackages = {"org.linlinjava.litemall.core.cache"})
+@EnableCaching
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/litemall-cache/litemall-redis/src/main/java/org/linlinjava/litemall/core/cache/redis/config/RedisConfig.java b/litemall-cache/litemall-redis/src/main/java/org/linlinjava/litemall/core/cache/redis/config/RedisConfig.java
new file mode 100644
index 000000000..f1340dc53
--- /dev/null
+++ b/litemall-cache/litemall-redis/src/main/java/org/linlinjava/litemall/core/cache/redis/config/RedisConfig.java
@@ -0,0 +1,47 @@
+package org.linlinjava.litemall.core.cache.redis.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.*;
+
+/**
+ *
+ * @author mail@dongguochao.com
+ */
+@Configuration
+public class RedisConfig extends CachingConfigurerSupport {
+
+    @Bean
+    public CacheManager cacheManager(RedisConnectionFactory factory) {
+        RedisSerializer<String> redisSerializer = new StringRedisSerializer();
+        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+
+        //解决查询缓存转换异常的问题
+        ObjectMapper om = new ObjectMapper();
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        om.registerModule(new Jdk8Module());
+        om.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+
+        // 配置序列化（解决乱码的问题）
+        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jackson2JsonRedisSerializer))
+                .disableCachingNullValues();
+
+        RedisCacheManager cacheManager = RedisCacheManager.builder(factory)
+                .cacheDefaults(config)
+                .build();
+        return cacheManager;
+    }
+}
diff --git a/litemall-cache/litemall-redis/src/main/resources/application-redis.yml b/litemall-cache/litemall-redis/src/main/resources/application-redis.yml
new file mode 100644
index 000000000..3111556bc
--- /dev/null
+++ b/litemall-cache/litemall-redis/src/main/resources/application-redis.yml
@@ -0,0 +1,29 @@
+# 查看spring-configuration-metadata.json
+spring:
+  redis:
+    # 集群配置
+#    sentinel:
+#      master: #
+#      nodes: #
+
+    # 使用jedis管理redis client
+    jedis:
+      pool:
+        max-idle: 20
+        min-idle: 1
+        max-active: 10
+        max-wait: 0
+    password:
+    host: 127.0.0.1
+    timeout: 5000
+    port: 6379
+    database: 0
+  cache:
+    redis:
+      use-key-prefix: true
+      key-prefix: dev
+      cache-null-values: false
+      time-to-live: 20s
+  jackson:
+    serialization:
+      WRITE_DATES_AS_TIMESTAMPS: false
\ No newline at end of file
diff --git a/litemall-cache/litemall-redis/src/main/resources/application.yml b/litemall-cache/litemall-redis/src/main/resources/application.yml
new file mode 100644
index 000000000..1002f668d
--- /dev/null
+++ b/litemall-cache/litemall-redis/src/main/resources/application.yml
@@ -0,0 +1,9 @@
+spring:
+  profiles:
+    active: redis, cache
+  messages:
+    encoding: UTF-8
+logging:
+  level:
+    root:  ERROR
+    org.springframework:  DEBUG
\ No newline at end of file
diff --git a/litemall-cache/litemall-redis/src/test/java/org/linlinjava/litemall/core/cache/redis/CacheTest.java b/litemall-cache/litemall-redis/src/test/java/org/linlinjava/litemall/core/cache/redis/CacheTest.java
new file mode 100644
index 000000000..526f086b7
--- /dev/null
+++ b/litemall-cache/litemall-redis/src/test/java/org/linlinjava/litemall/core/cache/redis/CacheTest.java
@@ -0,0 +1,25 @@
+package org.linlinjava.litemall.core.cache.redis;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class CacheTest {
+    @Autowired
+    Testor testor;
+
+    @Test
+    public void cacheEnableTest(){
+
+        int i1 = testor.increateAndGet();
+        int i2 = testor.increateAndGet();
+        int i3 = testor.increateAndGet();
+        assert i1==0;
+        assert i2==0;
+        assert i3==0;
+    }
+}
diff --git a/litemall-cache/litemall-redis/src/test/java/org/linlinjava/litemall/core/cache/redis/Testor.java b/litemall-cache/litemall-redis/src/test/java/org/linlinjava/litemall/core/cache/redis/Testor.java
new file mode 100644
index 000000000..264fc0b58
--- /dev/null
+++ b/litemall-cache/litemall-redis/src/test/java/org/linlinjava/litemall/core/cache/redis/Testor.java
@@ -0,0 +1,14 @@
+package org.linlinjava.litemall.core.cache.redis;
+
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Testor {
+    @Cacheable(value = "litemall" ,key = "targetClass + ' - ' + methodName")
+    public int increateAndGet() {
+        return count++;
+    }
+
+    private int count = 0;
+}
\ No newline at end of file
diff --git a/litemall-cache/pom.xml b/litemall-cache/pom.xml
new file mode 100644
index 000000000..282b33963
--- /dev/null
+++ b/litemall-cache/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.linlinjava</groupId>
+        <artifactId>litemall</artifactId>
+        <version>0.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>litemall-cache</artifactId>
+    <packaging>jar</packaging>
+    <!-- 打开注释可启用相应的缓存实现，不打开启用默认采用concurrenthashmap，只允许打开某一个 -->
+    <modules>
+        <module>litemall-ehcache</module>
+         <!--redis配置文件： application-redis.yml-->
+        <module>litemall-redis</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/litemall-cache/src/main/java/org/linlinjava/litemall/core/cache/Application.java b/litemall-cache/src/main/java/org/linlinjava/litemall/core/cache/Application.java
new file mode 100644
index 000000000..41c084eed
--- /dev/null
+++ b/litemall-cache/src/main/java/org/linlinjava/litemall/core/cache/Application.java
@@ -0,0 +1,14 @@
+package org.linlinjava.litemall.core.cache;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+
+@SpringBootApplication(scanBasePackages = {"org.linlinjava.litemall.core.cache"})
+@EnableCaching
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/litemall-cache/src/main/resources/application-cache.yml b/litemall-cache/src/main/resources/application-cache.yml
new file mode 100644
index 000000000..e7019669b
--- /dev/null
+++ b/litemall-cache/src/main/resources/application-cache.yml
@@ -0,0 +1,7 @@
+#litemall:
+#  cache:
+#    # 默认缓存最大时间，6个小时
+#    expiration: 3600
+#spring:
+#  cache:
+#    cache-names: litemall
\ No newline at end of file
diff --git a/litemall-cache/src/main/resources/application.yml b/litemall-cache/src/main/resources/application.yml
new file mode 100644
index 000000000..b66956507
--- /dev/null
+++ b/litemall-cache/src/main/resources/application.yml
@@ -0,0 +1,9 @@
+spring:
+  profiles:
+    active: cache
+  messages:
+    encoding: UTF-8
+logging:
+  level:
+    root:  ERROR
+    org.springframework:  ERROR
\ No newline at end of file
diff --git a/litemall-cache/src/test/java/org/linlinjava/litemall/core/cache/CacheTest.java b/litemall-cache/src/test/java/org/linlinjava/litemall/core/cache/CacheTest.java
new file mode 100644
index 000000000..f17257997
--- /dev/null
+++ b/litemall-cache/src/test/java/org/linlinjava/litemall/core/cache/CacheTest.java
@@ -0,0 +1,25 @@
+package org.linlinjava.litemall.core.cache;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class CacheTest {
+    @Autowired
+    Testor testor;
+
+    @Test
+    public void cacheEnableTest(){
+
+        int i1 = testor.increateAndGet();
+        int i2 = testor.increateAndGet();
+        int i3 = testor.increateAndGet();
+        assert i1==0;
+        assert i2==0;
+        assert i3==0;
+    }
+}
diff --git a/litemall-cache/src/test/java/org/linlinjava/litemall/core/cache/Testor.java b/litemall-cache/src/test/java/org/linlinjava/litemall/core/cache/Testor.java
new file mode 100644
index 000000000..2938fd971
--- /dev/null
+++ b/litemall-cache/src/test/java/org/linlinjava/litemall/core/cache/Testor.java
@@ -0,0 +1,15 @@
+package org.linlinjava.litemall.core.cache;
+
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Testor {
+    @Cacheable(value = "litemall" ,key = "targetClass + ' - ' + methodName")
+    public int increateAndGet() {
+        return count++;
+    }
+
+    private int count = 0;
+}
\ No newline at end of file
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java
index e8a98e3c9..82ff7e6c0 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java
@@ -3,9 +3,11 @@
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 
 @SpringBootApplication(scanBasePackages = {"org.linlinjava.litemall.db", "org.linlinjava.litemall.core"})
 @MapperScan("org.linlinjava.litemall.db.dao")
+@EnableCaching
 public class Application {
 
     public static void main(String[] args) {
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java
index 0dbd202c6..b0966a7ae 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java
@@ -4,6 +4,7 @@
 import org.linlinjava.litemall.db.dao.LitemallAdMapper;
 import org.linlinjava.litemall.db.domain.LitemallAd;
 import org.linlinjava.litemall.db.domain.LitemallAdExample;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -57,15 +58,18 @@ public int countSelective(String name, String content, Integer page, Integer siz
         return (int) adMapper.countByExample(example);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public int updateById(LitemallAd ad) {
         ad.setUpdateTime(LocalDateTime.now());
         return adMapper.updateByPrimaryKeySelective(ad);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void deleteById(Integer id) {
         adMapper.logicalDeleteByPrimaryKey(id);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void add(LitemallAd ad) {
         ad.setAddTime(LocalDateTime.now());
         ad.setUpdateTime(LocalDateTime.now());
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java
index 3229f2011..d749c228d 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java
@@ -5,6 +5,7 @@
 import org.linlinjava.litemall.db.domain.LitemallBrand;
 import org.linlinjava.litemall.db.domain.LitemallBrand.Column;
 import org.linlinjava.litemall.db.domain.LitemallBrandExample;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -71,15 +72,18 @@ public int countSelective(String id, String name, Integer page, Integer size, St
         return (int) brandMapper.countByExample(example);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public int updateById(LitemallBrand brand) {
         brand.setUpdateTime(LocalDateTime.now());
         return brandMapper.updateByPrimaryKeySelective(brand);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void deleteById(Integer id) {
         brandMapper.logicalDeleteByPrimaryKey(id);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void add(LitemallBrand brand) {
         brand.setAddTime(LocalDateTime.now());
         brand.setUpdateTime(LocalDateTime.now());
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java
index bb24da7dc..093988006 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java
@@ -4,6 +4,7 @@
 import org.linlinjava.litemall.db.dao.LitemallCategoryMapper;
 import org.linlinjava.litemall.db.domain.LitemallCategory;
 import org.linlinjava.litemall.db.domain.LitemallCategoryExample;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -88,15 +89,18 @@ public int countSelective(String id, String name, Integer page, Integer size, St
         return (int) categoryMapper.countByExample(example);
     }
 
+    @CacheEvict(value = {"category", "homepage"}, allEntries = true)
     public int updateById(LitemallCategory category) {
         category.setUpdateTime(LocalDateTime.now());
         return categoryMapper.updateByPrimaryKeySelective(category);
     }
 
+    @CacheEvict(value = "category", allEntries = true)
     public void deleteById(Integer id) {
         categoryMapper.logicalDeleteByPrimaryKey(id);
     }
 
+    @CacheEvict(value = "category", allEntries = true)
     public void add(LitemallCategory category) {
         category.setAddTime(LocalDateTime.now());
         category.setUpdateTime(LocalDateTime.now());
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponService.java
index e99f0663f..cc34a3d65 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponService.java
@@ -7,6 +7,7 @@
 import org.linlinjava.litemall.db.domain.*;
 import org.linlinjava.litemall.db.domain.LitemallCoupon.Column;
 import org.linlinjava.litemall.db.util.CouponConstant;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -161,11 +162,13 @@ public void add(LitemallCoupon coupon) {
         couponMapper.insertSelective(coupon);
     }
 
+    @CacheEvict(value = "homepage")
     public int updateById(LitemallCoupon coupon) {
         coupon.setUpdateTime(LocalDateTime.now());
         return couponMapper.updateByPrimaryKeySelective(coupon);
     }
 
+    @CacheEvict(value = "homepage")
     public void deleteById(Integer id) {
         couponMapper.logicalDeleteByPrimaryKey(id);
     }
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponUserService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponUserService.java
index b291b0d04..ec4dfe117 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponUserService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponUserService.java
@@ -5,6 +5,7 @@
 import org.linlinjava.litemall.db.domain.LitemallCouponUser;
 import org.linlinjava.litemall.db.domain.LitemallCouponUserExample;
 import org.linlinjava.litemall.db.util.CouponUserConstant;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -29,6 +30,12 @@ public Integer countUserAndCoupon(Integer userId, Integer couponId) {
         return (int)couponUserMapper.countByExample(example);
     }
 
+    /**
+     * 用户领取优惠券
+     * todo 检查重复领取
+     * @param couponUser
+     */
+    @CacheEvict(value = "homepage", key = "#couponUser.userId")
     public void add(LitemallCouponUser couponUser) {
         couponUser.setAddTime(LocalDateTime.now());
         couponUser.setUpdateTime(LocalDateTime.now());
@@ -106,7 +113,7 @@ public LitemallCouponUser findById(Integer id) {
         return couponUserMapper.selectByPrimaryKey(id);
     }
 
-
+    @CacheEvict(value = "homepage", key = "#couponUser.userId", condition = "#couponUser.userId != null")
     public int update(LitemallCouponUser couponUser) {
         couponUser.setUpdateTime(LocalDateTime.now());
         return couponUserMapper.updateByPrimaryKeySelective(couponUser);
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
index 1ff3e24c2..7eb9c8839 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
@@ -5,6 +5,7 @@
 import org.linlinjava.litemall.db.domain.LitemallGoods;
 import org.linlinjava.litemall.db.domain.LitemallGoods.Column;
 import org.linlinjava.litemall.db.domain.LitemallGoodsExample;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -232,15 +233,18 @@ public Integer queryOnSale() {
         return (int) goodsMapper.countByExample(example);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public int updateById(LitemallGoods goods) {
         goods.setUpdateTime(LocalDateTime.now());
         return goodsMapper.updateByPrimaryKeySelective(goods);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void deleteById(Integer id) {
         goodsMapper.logicalDeleteByPrimaryKey(id);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void add(LitemallGoods goods) {
         goods.setAddTime(LocalDateTime.now());
         goods.setUpdateTime(LocalDateTime.now());
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponRulesService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponRulesService.java
index c3472efee..88efd6311 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponRulesService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponRulesService.java
@@ -7,6 +7,7 @@
 import org.linlinjava.litemall.db.domain.LitemallGoods;
 import org.linlinjava.litemall.db.domain.LitemallGrouponRules;
 import org.linlinjava.litemall.db.domain.LitemallGrouponRulesExample;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -141,10 +142,12 @@ public int countSelective(String goodsId, Integer page, Integer limit, String so
         return (int) mapper.countByExample(example);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void delete(Integer id) {
         mapper.logicalDeleteByPrimaryKey(id);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public int updateById(LitemallGrouponRules grouponRules) {
         grouponRules.setUpdateTime(LocalDateTime.now());
         return mapper.updateByPrimaryKeySelective(grouponRules);
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponService.java
index 3ddfd05e5..f2641d1da 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponService.java
@@ -5,6 +5,7 @@
 import org.linlinjava.litemall.db.dao.LitemallGrouponMapper;
 import org.linlinjava.litemall.db.domain.LitemallGroupon;
 import org.linlinjava.litemall.db.domain.LitemallGrouponExample;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -91,6 +92,7 @@ public int countGroupon(Integer grouponId) {
         return (int) mapper.countByExample(example);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public int updateById(LitemallGroupon groupon) {
         groupon.setUpdateTime(LocalDateTime.now());
         return mapper.updateByPrimaryKeySelective(groupon);
@@ -102,6 +104,7 @@ public int updateById(LitemallGroupon groupon) {
      * @param groupon
      * @return
      */
+    @CacheEvict(value = "homepage", allEntries = true)
     public int createGroupon(LitemallGroupon groupon) {
         groupon.setAddTime(LocalDateTime.now());
         groupon.setUpdateTime(LocalDateTime.now());
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
index 25cac3dd3..9bf7ae913 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java
@@ -5,6 +5,7 @@
 import org.linlinjava.litemall.db.domain.LitemallTopic;
 import org.linlinjava.litemall.db.domain.LitemallTopic.Column;
 import org.linlinjava.litemall.db.domain.LitemallTopicExample;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -97,6 +98,7 @@ public int countSelective(String title, String subtitle, Integer page, Integer s
         return (int) topicMapper.countByExample(example);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public int updateById(LitemallTopic topic) {
         topic.setUpdateTime(LocalDateTime.now());
         LitemallTopicExample example = new LitemallTopicExample();
@@ -104,10 +106,12 @@ public int updateById(LitemallTopic topic) {
         return topicMapper.updateByExampleSelective(topic, example);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void deleteById(Integer id) {
         topicMapper.logicalDeleteByPrimaryKey(id);
     }
 
+    @CacheEvict(value = "homepage", allEntries = true)
     public void add(LitemallTopic topic) {
         topic.setAddTime(LocalDateTime.now());
         topic.setUpdateTime(LocalDateTime.now());
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/HomeCacheManager.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/HomeCacheManager.java
deleted file mode 100644
index e0ad689c8..000000000
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/HomeCacheManager.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.linlinjava.litemall.wx.service;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 简单缓存的数据
- */
-public class HomeCacheManager {
-    public static final boolean ENABLE = false;
-    public static final String INDEX = "index";
-    public static final String CATALOG = "catalog";
-    public static final String GOODS = "goods";
-
-    private static Map<String, Map<String, Object>> cacheDataList = new HashMap<>();
-
-    /**
-     * 缓存首页数据
-     *
-     * @param data
-     */
-    public static void loadData(String cacheKey, Map<String, Object> data) {
-        Map<String, Object> cacheData = cacheDataList.get(cacheKey);
-        //有记录，则先丢弃
-        if (cacheData != null) {
-            cacheData.remove(cacheKey);
-        }
-
-        cacheData = new HashMap<>();
-        //深拷贝
-        cacheData.putAll(data);
-        cacheData.put("isCache", "true");
-        //设置缓存有效期为10分钟
-        cacheData.put("expireTime", LocalDateTime.now().plusMinutes(10));
-        cacheDataList.put(cacheKey, cacheData);
-    }
-
-    public static Map<String, Object> getCacheData(String cacheKey) {
-        return cacheDataList.get(cacheKey);
-    }
-
-    /**
-     * 判断缓存中是否有数据
-     *
-     * @return
-     */
-    public static boolean hasData(String cacheKey) {
-        if (!ENABLE)
-            return false;
-
-        Map<String, Object> cacheData = cacheDataList.get(cacheKey);
-        if (cacheData == null) {
-            return false;
-        } else {
-            LocalDateTime expire = (LocalDateTime) cacheData.get("expireTime");
-            if (expire.isBefore(LocalDateTime.now())) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-    }
-
-    /**
-     * 清除所有缓存
-     */
-    public static void clearAll() {
-        cacheDataList = new HashMap<>();
-    }
-
-    /**
-     * 清除缓存数据
-     */
-    public static void clear(String cacheKey) {
-        Map<String, Object> cacheData = cacheDataList.get(cacheKey);
-        if (cacheData != null) {
-            cacheDataList.remove(cacheKey);
-        }
-    }
-}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java
index 4602e85ce..3904d125d 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java
@@ -5,8 +5,8 @@
 import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.db.domain.LitemallCategory;
 import org.linlinjava.litemall.db.service.LitemallCategoryService;
-import org.linlinjava.litemall.wx.service.HomeCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -75,12 +75,8 @@ public Object index(Integer id,
      * @return 所有分类数据
      */
     @GetMapping("all")
+    @Cacheable(value = "catalog")
     public Object queryAll() {
-        //优先从缓存中读取
-        if (HomeCacheManager.hasData(HomeCacheManager.CATALOG)) {
-            return ResponseUtil.ok(HomeCacheManager.getCacheData(HomeCacheManager.CATALOG));
-        }
-
 
         // 所有一级分类目录
         List<LitemallCategory> l1CatList = categoryService.queryL1();
@@ -108,8 +104,6 @@ public Object queryAll() {
         data.put("currentCategory", currentCategory);
         data.put("currentSubCategory", currentSubCategory);
 
-        //缓存数据
-        HomeCacheManager.loadData(HomeCacheManager.CATALOG, data);
         return ResponseUtil.ok(data);
     }
 
@@ -120,6 +114,7 @@ public Object queryAll() {
      * @return 当前分类栏目
      */
     @GetMapping("current")
+    @Cacheable(value = "category", key = "#p0")
     public Object current(@NotNull Integer id) {
         // 当前分类
         LitemallCategory currentCategory = categoryService.findById(id);
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
index 12c509e03..3210b232a 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
@@ -10,8 +10,8 @@
 import org.linlinjava.litemall.db.domain.*;
 import org.linlinjava.litemall.db.service.*;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
-import org.linlinjava.litemall.wx.service.GetRegionService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -242,6 +242,8 @@ public Object category(@NotNull Integer id) {
 	 * @return 根据条件搜素的商品详情
 	 */
 	@GetMapping("list")
+	// 目前的拉取策略是拉取100项（全部），只根据，可缓存 by mail@dongguochao.com
+	@Cacheable(value = "category", key = "#categoryId + #brandId + #isNew + #isHot", condition = "#keyword != null && #keyword.length() != 0")
 	public Object list(
 		Integer categoryId,
 		Integer brandId,
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
index 3d2941cae..73fcfe6ef 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
@@ -8,8 +8,9 @@
 import org.linlinjava.litemall.db.domain.LitemallGoods;
 import org.linlinjava.litemall.db.service.*;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
-import org.linlinjava.litemall.wx.service.HomeCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -58,28 +59,28 @@ public class WxHomeController {
 
     private static ThreadPoolExecutor executorService = new ThreadPoolExecutor(9, 9, 1000, TimeUnit.MILLISECONDS, WORK_QUEUE, HANDLER);
 
+    /**
+     * todo 建议重写
+     * by blackdog1987@gmail.com
+     * @param key
+     * @return
+     */
     @GetMapping("/cache")
+    @CacheEvict(value = {"homepage", "category"}, allEntries = true)
     public Object cache(@NotNull String key) {
-        if (!key.equals("litemall_cache")) {
-            return ResponseUtil.fail();
-        }
-
-        // 清除缓存
-        HomeCacheManager.clearAll();
+        logger.warn("缓存已经由cacheable实现，不再需要清除缓存");
         return ResponseUtil.ok("缓存已清除");
     }
 
     /**
-     * 首页数据
+     * 首页数据。获取内容包含：广告Ad，分类category，优惠券coupon，couponUser，商品goods，品牌brand，主题topic，团购groupon。
+     * 获取首页添加了缓存，在对缓存内容进行写操作的时候，需要对缓存进行evict操作。
      * @param userId 当用户已经登录时，非空。为登录状态为null
      * @return 首页数据
      */
     @GetMapping("/index")
+    @Cacheable(value = "homepage", key = "'' +#p0")
     public Object index(@LoginUser Integer userId) {
-        //优先从缓存中读取
-        if (HomeCacheManager.hasData(HomeCacheManager.INDEX)) {
-            return ResponseUtil.ok(HomeCacheManager.getCacheData(HomeCacheManager.INDEX));
-        }
         ExecutorService executorService = Executors.newFixedThreadPool(10);
 
         Map<String, Object> data = new HashMap<>();
@@ -92,6 +93,7 @@ public Object index(@LoginUser Integer userId) {
         if(userId == null){
             couponListCallable = () -> couponService.queryList(0, 3);
         } else {
+            // 获取登录用户可以领取的优惠券列表
             couponListCallable = () -> couponService.queryAvailableList(userId,0, 3);
         }
 
@@ -143,8 +145,6 @@ public Object index(@LoginUser Integer userId) {
         catch (Exception e) {
             e.printStackTrace();
         }
-        //缓存数据
-        HomeCacheManager.loadData(HomeCacheManager.INDEX, data);
         executorService.shutdown();
         return ResponseUtil.ok(data);
     }
diff --git a/pom.xml b/pom.xml
index 325c07cb9..19c15c2d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,9 @@
         <module>litemall-wx-api</module>
         <module>litemall-admin-api</module>
         <module>litemall-all</module>
+        <module>litemall-cache</module>
+        <module>litemall-cache/litemall-redis</module>
+        <module>litemall-cache/litemall-ehcache</module>
     </modules>
 
     <dependencyManagement>
@@ -54,6 +57,21 @@
                 <artifactId>litemall-all</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.linlinjava</groupId>
+                <artifactId>litemall-cache</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.linlinjava</groupId>
+                <artifactId>litemall-redis</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.linlinjava</groupId>
+                <artifactId>litemall-ehcache</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Spring Boot Mybatis 依赖 -->
             <dependency>
@@ -141,11 +159,11 @@
     <dependencies>
 
         <!-- 热部署模块 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-devtools</artifactId>-->
+            <!--<optional>true</optional>-->
+        <!--</dependency>-->
 
         <!-- 测试模块 -->
         <dependency>