test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: 修改num初始化方式

This commit is contained in:
CaptainB 2023-10-27 21:37:06 +08:00 committed by 刘瑞斌
parent eb72d0d0e2
commit c4aa93d598
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/services/system-setting/src/main/java/io/metersphere/system/uid/NumGenerator.java
View File

@ -4,8 +4,8 @@ import com.fit2cloud.quartz.anno.QuartzScheduled;
import io.metersphere.project.domain.Project; import io.metersphere.project.domain.Project;
import io.metersphere.project.mapper.ProjectMapper; import io.metersphere.project.mapper.ProjectMapper;
import io.metersphere.sdk.constants.ApplicationNumScope; import io.metersphere.sdk.constants.ApplicationNumScope;
import io.metersphere.sdk.util.CommonBeanFactory;
import io.metersphere.sdk.util.LogUtils; import io.metersphere.sdk.util.LogUtils;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.redisson.Redisson; import org.redisson.Redisson;
import org.redisson.api.RIdGenerator; import org.redisson.api.RIdGenerator;
@ -23,20 +23,11 @@ public class NumGenerator {
private static StringRedisTemplate stringRedisTemplate; private static StringRedisTemplate stringRedisTemplate;
private static ProjectMapper projectMapper; private static ProjectMapper projectMapper;
public NumGenerator(StringRedisTemplate stringRedisTemplate, ProjectMapper projectMapper) {
NumGenerator.stringRedisTemplate = stringRedisTemplate;
NumGenerator.projectMapper = projectMapper;
}
/** /**
* @param prefix 前缀: PROJECT_ID, 或者 PROJECT_ID + "_" + DOMAIN 例如接口用例的前缀为: 100001_12345 * @param prefix 前缀: PROJECT_ID, 或者 PROJECT_ID + "_" + DOMAIN 例如接口用例的前缀为: 100001_12345
* @param scope 用例类型 * @param scope 用例类型
*/ */
public static long nextNum(String prefix, ApplicationNumScope scope) { public static long nextNum(String prefix, ApplicationNumScope scope) {
// 初始化
if (redisson == null) {
redisson = CommonBeanFactory.getBean(Redisson.class);
}
RIdGenerator idGenerator = redisson.getIdGenerator(prefix + "_" + scope.name()); RIdGenerator idGenerator = redisson.getIdGenerator(prefix + "_" + scope.name());
// 每次都尝试初始化，容量为1，只有一个线程可以初始化成功 // 每次都尝试初始化，容量为1，只有一个线程可以初始化成功
if (scope.equals(ApplicationNumScope.API_TEST_CASE)) { if (scope.equals(ApplicationNumScope.API_TEST_CASE)) {
@ -77,4 +68,18 @@ public class NumGenerator {
} }
} }
@Resource
public void setRedisson(Redisson redisson) {
NumGenerator.redisson = redisson;
}
@Resource
public void setStringRedisTemplate(StringRedisTemplate stringRedisTemplate) {
NumGenerator.stringRedisTemplate = stringRedisTemplate;
}
@Resource
public void setProjectMapper(ProjectMapper projectMapper) {
NumGenerator.projectMapper = projectMapper;
}
} }