调整ID生成方式、管理员权限优化

README.md

@@ -88,6 +88,8 @@
 
 ### 前台
 
+![image](doc/images/image_web_login.png)
+
 ![image](doc/images/image_web_exam.png)
 
 ![image](doc/images/image_web_exam_card.png)

common/common-core/src/main/java/com/github/tangyi/common/core/config/SnowFlake.java

+package com.github.tangyi.common.core.config;
+
+import com.github.tangyi.common.core.properties.SnowflakeProperties;
+import com.github.tangyi.common.core.utils.SnowflakeIdWorker;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * ID生成配置
+ *
+ * @author tangyi
+ * @date 2019/4/26 11:17
+ */
+@Configuration
+public class SnowFlake {
+
+    @Autowired
+    private SnowflakeProperties snowflakeProperties;
+
+    @Bean
+    public SnowflakeIdWorker initTokenWorker() {
+        return new SnowflakeIdWorker(Integer.parseInt(snowflakeProperties.getWorkId()), Integer.parseInt(snowflakeProperties.getDataCenterId()));
+    }
+}

common/common-core/src/main/java/com/github/tangyi/common/core/persistence/BaseEntity.java

@@ -64,7 +64,7 @@ public class BaseEntity<T> implements Serializable {
      */
     public void setCommonValue(String userCode, String applicationCode) {
         if (this.isNewRecord()) {
-            this.setId(IdGen.uuid());
+            this.setId(IdGen.snowflakeId());
             this.setNewRecord(true);
             this.creator = userCode;
             this.createDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());

common/common-core/src/main/java/com/github/tangyi/common/core/properties/SnowflakeProperties.java

+package com.github.tangyi.common.core.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * ID生成配置
+ *
+ * @author tangyi
+ * @date 2019/4/26 10:47
+ */
+@Configuration
+@ConfigurationProperties(prefix = "cluster")
+public class SnowflakeProperties {
+
+    /**
+     * 工作节点ID
+     */
+    private String workId;
+
+    /**
+     * 数据中心ID
+     */
+    private String dataCenterId;
+
+    public String getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(String workId) {
+        this.workId = workId;
+    }
+
+    public String getDataCenterId() {
+        return dataCenterId;
+    }
+
+    public void setDataCenterId(String dataCenterId) {
+        this.dataCenterId = dataCenterId;
+    }
+}

common/common-core/src/main/java/com/github/tangyi/common/core/service/CrudService.java

@@ -8,6 +8,7 @@ import com.github.tangyi.common.core.utils.ReflectionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -71,6 +72,8 @@ public abstract class CrudService<D extends CrudMapper<T>, T extends BaseEntity<
      * @return List
      */
     public List<T> findListById(T entity) {
+        if (entity.getIds() == null || entity.getIds().length == 0)
+            return new ArrayList<>();
         return dao.findListById(entity);
     }
 

common/common-core/src/main/java/com/github/tangyi/common/core/utils/FileUtil.java

@@ -14,7 +14,7 @@ public class FileUtil {
      * @param fileName fileName
      * @return String
      * @author tangyi
-     * @date 2018/10/30 0030 下午 10:05
+     * @date 2018/10/30 22:05
      */
     public static String getFileNameEx(String fileName) {
         if ((fileName != null) && (fileName.length() > 0)) {

common/common-core/src/main/java/com/github/tangyi/common/core/utils/IdGen.java

@@ -16,4 +16,15 @@ public class IdGen {
     public static String uuid() {
         return UUID.randomUUID().toString().replaceAll("-", "");
     }
+
+    /**
+     * 基于snowflake算法生成ID
+     *
+     * @return String
+     * @author tangyi
+     * @date 2019/04/26 11:24
+     */
+    public static String snowflakeId() {
+        return Long.toString(SpringContextHolder.getApplicationContext().getBean(SnowflakeIdWorker.class).nextId());
+    }
 }
\ No newline at end of file

common/common-core/src/main/java/com/github/tangyi/common/core/utils/SnowflakeIdWorker.java

+package com.github.tangyi.common.core.utils;
+
+import cn.hutool.core.date.SystemClock;
+
+/**
+ * Twitter_Snowflake<br>
+ * SnowFlake的结构如下(每部分用-分开):<br>
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
+ * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0<br>
+ * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截)
+ * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
+ * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId<br>
+ * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号<br>
+ * 加起来刚好64位，为一个Long型。<br>
+ * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。
+ */
+public class SnowflakeIdWorker {
+
+    /**
+     * 机器id所占的位数
+     */
+    private final long workerIdBits = 5L;
+
+    /**
+     * 数据标识id所占的位数
+     */
+    private final long datacenterIdBits = 5L;
+
+    /**
+     * 工作机器ID(0~31)
+     */
+    private long workerId;
+
+    /**
+     * 数据中心ID(0~31)
+     */
+    private long datacenterId;
+
+    /**
+     * 毫秒内序列(0~4095)
+     */
+    private long sequence = 0L;
+
+    /**
+     * 上次生成ID的时间截
+     */
+    private long lastTimestamp = -1L;
+
+    /**
+     * 构造函数
+     *
+     * @param workerId     工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeIdWorker(long workerId, long datacenterId) {
+        // 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
+        long maxWorkerId = ~(-1L << workerIdBits);
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        // 支持的最大数据标识id，结果是31
+        long maxDatacenterId = ~(-1L << datacenterIdBits);
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     *
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+        // 如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+        // 如果是同一时间生成的，则进行毫秒内序列
+        // 序列在id中占的位数
+        long sequenceBits = 12L;
+        if (lastTimestamp == timestamp) {
+            // 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095)
+            long sequenceMask = ~(-1L << sequenceBits);
+            sequence = (sequence + 1) & sequenceMask;
+            // 毫秒内序列溢出
+            if (sequence == 0) {
+                // 阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        // 时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        // 上次生成ID的时间截
+        lastTimestamp = timestamp;
+        long datacenterIdShift = sequenceBits + workerIdBits;
+        // 时间截向左移22位(5+5+12)
+        long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+        // 开始时间截 (2015-01-01)
+        long twepoch = 1420041600000L;
+        return ((timestamp - twepoch) << timestampLeftShift)
+                | (datacenterId << datacenterIdShift)
+                | (workerId << sequenceBits)
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     *
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    private long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     *
+     * @return 当前时间(毫秒)
+     */
+    private long timeGen() {
+        return SystemClock.now();
+    }
+}

config-service/README.md

+Config Service
+=============
+
+### 手动刷新配置
+
+1. 修改`config-service`服务的`/resources/conf`下对应服务的配置文件
+
+2. 访问对应服务的`/actuator/refresh`，如：`localhost:8000/actuator/refresh`
\ No newline at end of file

config-service/src/main/resources/config/auth-service.yml

@@ -85,6 +85,7 @@ ignore:
     - /v1/user/findUserByUsername/**
     - /v1/user/checkExist/**
     - /v1/menu/findMenuByRole/**
+    - /v1/menu/findAllMenu
     - /v1/code/**
     - /v1/attachment/download
     - /v1/log/**
@@ -100,8 +101,15 @@ ignore:
     - /loggers/**
     - /mobile/token
 
-mobile:
-  token: test
+# 集群ID生成配置
+cluster:
+  workId: ${CLUSTER_WORKID:1}
+  dataCenterId: ${CLUSTER_DATA_CENTER_ID:1}
+
+# 系统配置
+sys:
+  adminUser: ${ADMIN_USER:admin}  # 管理员账号，默认是admin
+
 logging:
   level:
     root: info

config-service/src/main/resources/config/exam-service.yml

@@ -98,6 +98,7 @@ ignore:
     - /hystrix.sender
     - /v1/user/findUserByUsername/**
     - /v1/menu/findMenuByRole/**
+    - /v1/menu/findAllMenu
     - /v1/user/checkExist/**
     - /v1/code/**
     - /v1/attachment/download
@@ -114,6 +115,11 @@ ignore:
     - /loggers/**
     - /mobile/token
 
+# 集群ID生成配置
+cluster:
+  workId: ${CLUSTER_WORKID:1}
+  dataCenterId: ${CLUSTER_DATA_CENTER_ID:1}
+
 logging:
   level:
     root: info

config-service/src/main/resources/config/gateway-service.yml

@@ -66,7 +66,7 @@ swagger:
 # 演示环境
 preview:
   enabled: ${PREVIEW_ENABLED:false}
-  ignoreUrls:
+  ignores:
     - token
     - examRecord
     - saveOrUpdate
@@ -76,6 +76,11 @@ preview:
     - updateInfo
     - attachment
 
+# 集群ID生成配置
+cluster:
+  workId: ${CLUSTER_WORKID:1}
+  dataCenterId: ${CLUSTER_DATA_CENTER_ID:1}
+
 logging:
   level:
     root: info

config-service/src/main/resources/config/monitor-service.yml

@@ -36,3 +36,8 @@ spring:
   # zipkin 配置
   zipkin:
     base-url: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}  # 指定了Zipkin服务器的地址
+
+# 集群ID生成配置
+cluster:
+  workId: ${CLUSTER_WORKID:1}
+  dataCenterId: ${CLUSTER_DATA_CENTER_ID:1}
\ No newline at end of file

config-service/src/main/resources/config/user-service.yml

@@ -122,6 +122,7 @@ ignore:
     - /hystrix.sender
     - /v1/user/findUserByUsername/**
     - /v1/menu/findMenuByRole/**
+    - /v1/menu/findAllMenu
     - /v1/user/register
     - /v1/user/checkExist/**
     - /v1/code/**
@@ -140,6 +141,11 @@ ignore:
     - /mobile/token
     - /bus/refresh
 
+# 集群ID生成配置
+cluster:
+  workId: ${CLUSTER_WORKID:1}
+  dataCenterId: ${CLUSTER_DATA_CENTER_ID:1}
+
 logging:
   level:
     root: info

doc/deploy/mysql/microservice-auth.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50710
  File Encoding         : 65001
 
- Date: 23/04/2019 20:03:29
+ Date: 26/04/2019 23:22:30
 */
 
 SET NAMES utf8mb4;

docker-compose.env

@@ -49,3 +49,10 @@ ZIPKIN_PORT=9411
 
 // 演示环境
 PREVIEW_ENABLED=false
+
+// ID生成配置
+CLUSTER_WORK_ID=1
+CLUSTER_DATA_CENTER_ID=1
+
+// 时区设置，否则容器里的时间和主机时间差8小时
+TZ=Asia/Shanghai
\ No newline at end of file

gateway-service/src/main/java/com/github/tangyi/gateway/config/PreviewConfig.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 /**
  * 演示环境配置
+ *
  * @author tangyi
  * @date 2019/4/23 13:38
  */
@@ -19,13 +20,23 @@ import java.util.List;
 @ConfigurationProperties(prefix = "preview")
 public class PreviewConfig {
 
-    private List<String> ignoreUrls = new ArrayList<>();
+    private boolean enabled;
 
-    public List<String> getIgnoreUrls() {
-        return ignoreUrls;
+    private List<String> ignores = new ArrayList<>();
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public List<String> getIgnores() {
+        return ignores;
     }
 
-    public void setIgnoreUrls(List<String> ignoreUrls) {
-        this.ignoreUrls = ignoreUrls;
+    public void setIgnores(List<String> ignores) {
+        this.ignores = ignores;
     }
 }

gateway-service/src/main/java/com/github/tangyi/gateway/filters/PreviewFilter.java

@@ -39,8 +39,9 @@ public class PreviewFilter implements GlobalFilter, Ordered {
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         // 当前请求
         ServerHttpRequest request = exchange.getRequest();
-        // GET或者忽略的URL，直接向下执行
-        if (StrUtil.equalsIgnoreCase(request.getMethodValue(), HttpMethod.GET.name()) || isIgnore(request.getURI().getPath()))
+        // enabled为false、GET请求、忽略的URL，直接向下执行
+        logger.debug("preview.enabled:{}", previewConfig.isEnabled());
+        if (!previewConfig.isEnabled() || StrUtil.equalsIgnoreCase(request.getMethodValue(), HttpMethod.GET.name()) || isIgnore(request.getURI().getPath()))
             return chain.filter(exchange);
         logger.warn("演示环境不能操作，{},{}", request.getMethodValue(), request.getURI().getPath());
         ServerHttpResponse response = exchange.getResponse();
@@ -57,7 +58,7 @@ public class PreviewFilter implements GlobalFilter, Ordered {
      * @date 2019/04/23 13:44
      */
     private boolean isIgnore(String uri) {
-        List<String> ignoreUrls = previewConfig.getIgnoreUrls();
+        List<String> ignoreUrls = previewConfig.getIgnores();
         if (ignoreUrls != null && !ignoreUrls.isEmpty()) {
             for (String ignoreUrl : ignoreUrls) {
                 if (StrUtil.containsIgnoreCase(uri, ignoreUrl))

service-api-impl/auth-service/src/main/java/com/github/tangyi/auth/controller/TestController.java

-package com.github.tangyi.auth.controller;
-
-import com.github.tangyi.common.core.model.ResponseBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author tangyi
- * @date 2019/3/30 14:40
- */
-@RestController
-// 动态刷新，修改配置后post请求/actuator/refresh
-@RefreshScope
-public class TestController {
-
-    @Value("${mobile.token}")
-    private String mobileToken;
-
-    @RequestMapping("/mobile/token")
-    public ResponseBean<String> mobileToken() {
-        return new ResponseBean<>(mobileToken);
-    }
-}

service-api-impl/auth-service/src/main/java/com/github/tangyi/auth/properties/SysProperties.java

+package com.github.tangyi.auth.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author tangyi
+ * @date 2019/4/26 11:54
+ */
+@Configuration
+@ConfigurationProperties(prefix = "sys")
+public class SysProperties {
+
+    /**
+     * 管理员账号
+     */
+    private String adminUser;
+
+    public String getAdminUser() {
+        return adminUser;
+    }
+
+    public void setAdminUser(String adminUser) {
+        this.adminUser = adminUser;
+    }
+}

service-api-impl/auth-service/src/main/java/com/github/tangyi/auth/service/UserDetailsServiceImpl.java

 package com.github.tangyi.auth.service;
 
+import com.github.tangyi.auth.properties.SysProperties;
 import com.github.tangyi.common.core.vo.Role;
 import com.github.tangyi.common.core.vo.UserVo;
 import com.github.tangyi.common.security.core.GrantedAuthorityImpl;
@@ -33,6 +34,9 @@ public class UserDetailsServiceImpl implements UserDetailsService {
     @Autowired
     private UserServiceClient userServiceClient;
 
+    @Autowired
+    private SysProperties sysProperties;
+
     /**
      * 加载用户信息
      *
@@ -72,7 +76,15 @@ public class UserDetailsServiceImpl implements UserDetailsService {
                 // 权限如果前缀是ROLE_，security就会认为这是个角色信息，而不是权限，例如ROLE_ADMIN就是ADMIN角色，MENU:ADD就是MENU:ADD权限
                 authorities.add(new GrantedAuthorityImpl(role.getRoleCode()));
                 // 根据角色查找菜单权限
-                Stream<Menu> menuStream = userServiceClient.findMenuByRole(role.getRoleCode()).stream();
+                Stream<Menu> menuStream;
+                // 判断是否是管理员，是则查找所有菜单权限
+                if (userVo.getUsername().equals(sysProperties.getAdminUser())) {
+                    // 查找所有菜单权限，因为角色一般是一个，这里只会执行一次
+                    menuStream = userServiceClient.findAllMenu().stream();
+                } else {
+                    // 根据角色查找菜单权限
+                    menuStream = userServiceClient.findMenuByRole(role.getRoleCode()).stream();
+                }
                 if (Optional.ofNullable(menuStream).isPresent()) {
                     menuStream
                             // 菜单权限

service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/service/SubjectService.java

@@ -49,7 +49,7 @@ public class SubjectService extends CrudService<SubjectMapper, Subject> {
      * @param subject subject
      * @return int
      * @author tangyi
-     * @date 2019/01/23 下午 8:19
+     * @date 2019/01/23 20:19
      */
     int getExaminationTotalSubject(Subject subject) {
         return this.dao.getExaminationTotalSubject(subject);

service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/LogController.java

@@ -63,7 +63,7 @@ public class LogController extends BaseController {
      * @param log      log
      * @return PageInfo
      * @author tangyi
-     * @date 2018/10/24 0024 下午 10:13
+     * @date 2018/10/24 0024 22:13
      */
     @RequestMapping("logList")
     @ApiOperation(value = "获取日志列表")

service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/MenuController.java

@@ -215,6 +215,21 @@ public class MenuController extends BaseController {
     }
 
     /**
+     * 查询所有菜单
+     *
+     * @return List
+     * @author tangyi
+     * @date 2019/04/26 11:50
+     */
+    @GetMapping("findAllMenu")
+    @ApiOperation(value = "查询所有菜单", notes = "查询所有菜单")
+    public List<Menu> findAllMenu() {
+        Menu menu = new Menu();
+        menu.setApplicationCode(SysUtil.getSysCode());
+        return menuService.findAllList(menu);
+    }
+
+    /**
      * 根据角色查找菜单
      *
      * @param roleCode 角色code

service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/RoleController.java

@@ -84,7 +84,7 @@ public class RoleController extends BaseController {
      * @param role     role
      * @return PageInfo
      * @author tangyi
-     * @date 2018/10/24 0024 下午 10:13
+     * @date 2018/10/24 22:13
      */
     @RequestMapping("roleList")
     @ApiOperation(value = "获取角色列表")
@@ -175,7 +175,7 @@ public class RoleController extends BaseController {
      * @param role role
      * @return ResponseBean
      * @author tangyi
-     * @date 2018/10/28 下午 2:20
+     * @date 2018/10/28 14:20
      */
     @PutMapping("roleMenuUpdate")
     @ApiOperation(value = "更新角色菜单信息", notes = "更新角色菜单信息")

service-api-impl/user-service/src/main/java/com/github/tangyi/user/service/MenuService.java

@@ -59,7 +59,7 @@ public class MenuService extends CrudService<MenuMapper, Menu> {
      * @param menu menu
      * @return int
      * @author tangyi
-     * @date 2018/10/28 0028 下午 3:56
+     * @date 2018/10/28 15:56
      */
     @Transactional
     @Override
@@ -73,7 +73,7 @@ public class MenuService extends CrudService<MenuMapper, Menu> {
      * @param menu menu
      * @return int
      * @author tangyi
-     * @date 2018/10/30 0030 下午 8:19
+     * @date 2018/10/30 20:19
      */
     @Transactional
     @Override

service-api-impl/user-service/src/main/java/com/github/tangyi/user/service/RoleMenuService.java

@@ -28,7 +28,7 @@ public class RoleMenuService extends CrudService<RoleMenuMapper, RoleMenu> {
      * @param menus 菜单ID集合
      * @return int
      * @author tangyi
-     * @date 2018/10/28 0028 下午 2:29
+     * @date 2018/10/28 14:29
      */
     @Transactional
     @CacheEvict(value = "menu", allEntries = true)
@@ -40,7 +40,7 @@ public class RoleMenuService extends CrudService<RoleMenuMapper, RoleMenu> {
             List<RoleMenu> roleMenus = new ArrayList<>();
             for (String menuId : menus) {
                 RoleMenu roleMenu = new RoleMenu();
-                roleMenu.setId(IdGen.uuid());
+                roleMenu.setId(IdGen.snowflakeId());
                 roleMenu.setRoleId(role);
                 roleMenu.setMenuId(menuId);
                 roleMenus.add(roleMenu);
@@ -56,7 +56,7 @@ public class RoleMenuService extends CrudService<RoleMenuMapper, RoleMenu> {
      * @param roleMenus roleMenus
      * @return int
      * @author tangyi
-     * @date 2018/10/30 0030 下午 7:59
+     * @date 2018/10/30 19:59
      */
     @Transactional
     public int insertBatch(List<RoleMenu> roleMenus) {

service-api-impl/user-service/src/main/java/com/github/tangyi/user/service/RoleService.java

@@ -44,7 +44,7 @@ public class RoleService extends CrudService<RoleMapper, Role> {
         if (StringUtils.isNotBlank(role.getDeptId())) {
             RoleDept roleDept = new RoleDept();
             roleDept.setRoleId(role.getId());
-            roleDept.setId(IdGen.uuid());
+            roleDept.setId(IdGen.snowflakeId());
             roleDept.setDeptId(role.getDeptId());
             roleDeptMapper.insert(roleDept);
         }
@@ -65,7 +65,7 @@ public class RoleService extends CrudService<RoleMapper, Role> {
             RoleDept roleDept = new RoleDept();
             roleDept.setRoleId(role.getId());
             roleDeptMapper.deleteByRoleId(role.getId());
-            roleDept.setId(IdGen.uuid());
+            roleDept.setId(IdGen.snowflakeId());
             roleDept.setDeptId(role.getDeptId());
             roleDeptMapper.insert(roleDept);
         }

service-api-impl/user-service/src/main/java/com/github/tangyi/user/service/UserService.java

@@ -142,7 +142,7 @@ public class UserService extends CrudService<UserMapper, User> {
         if (CollectionUtils.isNotEmpty(userDto.getRole())) {
             userDto.getRole().forEach(roleId -> {
                 UserRole role = new UserRole();
-                role.setId(IdGen.uuid());
+                role.setId(IdGen.snowflakeId());
                 role.setUserId(user.getId());
                 role.setRoleId(roleId);
                 // 保存角色信息

service-api-impl/user-service/src/main/java/com/github/tangyi/user/utils/MenuUtil.java

@@ -24,7 +24,7 @@ public class MenuUtil {
      * @param menu menu
      * @return List
      * @author tangyi
-     * @date 2018/10/28 0028 下午 3:59
+     * @date 2018/10/28 15:59
      */
     public static List<Menu> initMenuPermission(Menu menu) {
         List<Menu> menus = new ArrayList<>();

service-api/user-api/src/main/java/com/github/tangyi/user/api/feign/UserServiceClient.java

@@ -104,4 +104,14 @@ public interface UserServiceClient {
      */
     @GetMapping("/v1/menu/findMenuByRole/{role}")
     List<Menu> findMenuByRole(@PathVariable("role") String role);
+
+    /**
+     * 查询所有菜单
+     *
+     * @return List
+     * @author tangyi
+     * @date 2019/04/26 11:48
+     */
+    @GetMapping("/v1/menu/findAllMenu")
+    List<Menu> findAllMenu();
 }

service-api/user-api/src/main/java/com/github/tangyi/user/api/feign/fallback/UserServiceClientFallbackImpl.java

@@ -124,6 +124,17 @@ public class UserServiceClientFallbackImpl implements UserServiceClient {
         return new ArrayList<>();
     }
 
+    /**
+     * 查询所有菜单
+     *
+     * @return List
+     */
+    @Override
+    public List<Menu> findAllMenu() {
+        logger.error("feign 获取所有菜单失败,{}", throwable);
+        return new ArrayList<>();
+    }
+
     public Throwable getThrowable() {
         return throwable;
     }