wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：权限模块新增分配详情功能

Browse Source
This commit is contained in:
Jerry
2020-11-21 11:32:26 +08:00
parent ae7359230d
commit 5cdf9b7115
603 changed files with 7514 additions and 2249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfigure.java → orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfig.java
View File

@@ -9,6 +9,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
* @date 2020-08-08
*/
@EnableConfigurationProperties({IdGeneratorProperties.class})
public class IdGeneratorAutoConfigure {
public class IdGeneratorAutoConfig {
}

4
orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeIdGenerator.java
View File

@@ -91,12 +91,12 @@ public class SnowflakeIdGenerator implements MyIdGenerator {
if (lastTimestamp == timestamp) {
sequence = (sequence + 1) & SEQUENCE_MASK;
if (sequence == 0) {
//seq 为0的时候表示是下一毫秒时间开始对seq做随机
// seq 为0的时候表示是下一毫秒时间开始对seq做随机
sequence = RANDOM.nextInt(100);
timestamp = tilNextMillis(lastTimestamp);
}
} else {
//如果是新的ms开始
// 如果是新的ms开始
sequence = RANDOM.nextInt(100);
}
lastTimestamp = timestamp;

22
orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeZookeeperHolder.java
View File

@@ -68,19 +68,19 @@ public class SnowflakeZookeeperHolder {
curator.start();
Stat stat = curator.checkExists().forPath(pathForever);
if (stat == null) {
//不存在根节点,机器第一次启动,创建/snowflake/ip:port-000000000,并上传数据
// 不存在根节点,机器第一次启动,创建/snowflake/ip:port-000000000,并上传数据
zkAddressNode = createNode(curator);
//worker id 默认是0
// worker id 默认是0
updateLocalWorkerId(workerId);
//定时上报本机时间给forever节点
// 定时上报本机时间给forever节点
scheduledUploadData(curator, zkAddressNode);
return true;
} else {
//ip:port->00001
// ip:port->00001
Map<String, Integer> nodeMap = Maps.newHashMap();
//ip:port->(ipport-000001)
// ip:port->(ipport-000001)
Map<String, String> realNode = Maps.newHashMap();
//存在根节点,先检查是否有属于自己的根节点
// 存在根节点,先检查是否有属于自己的根节点
List<String> keys = curator.getChildren().forPath(pathForever);
for (String key : keys) {
String[] nodeKey = key.split("-");
@@ -89,16 +89,16 @@ public class SnowflakeZookeeperHolder {
}
Integer workerid = nodeMap.get(listenAddress);
if (workerid != null) {
//有自己的节点,zk_AddressNode=ip:port
// 有自己的节点,zk_AddressNode=ip:port
zkAddressNode = pathForever + "/" + realNode.get(listenAddress);
//启动worder时使用会使用
// 启动worder时使用会使用
workerId = workerid;
if (!checkInitTimeStamp(curator, zkAddressNode)) {
throw new CheckLastTimeException(
"Init timestamp check error,forever node timestamp greater than this node time");
}
} else {
//表示新启动的节点,创建持久节点 ,不用check时间
// 表示新启动的节点,创建持久节点 ,不用check时间
String newNode = createNode(curator);
zkAddressNode = newNode;
String[] nodeKey = newNode.split("-");
@@ -137,7 +137,7 @@ public class SnowflakeZookeeperHolder {
byte[] bytes = curator.getData().forPath(zkAddressNode);
ObjectMapper mapper = new ObjectMapper();
Endpoint endPoint = mapper.readValue(new String(bytes), Endpoint.class);
//该节点的时间不能小于最后一次上报的时间
// 该节点的时间不能小于最后一次上报的时间
return endPoint.getTimestamp() <= System.currentTimeMillis();
}
@@ -184,7 +184,7 @@ public class SnowflakeZookeeperHolder {
log.error("update file cache error ", e);
}
} else {
//不存在文件,父目录页肯定不存在
// 不存在文件,父目录页肯定不存在
try {
boolean mkdirs = leafConfFile.getParentFile().mkdirs();
log.info("init local file cache create parent dis status is {}, worker id is {}", mkdirs, workId);

2
orange-demo-multi-service/common/common-sequence/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.orange.demo.common.sequence.config.IdGeneratorAutoConfigure
com.orange.demo.common.sequence.config.IdGeneratorAutoConfig