mirror of
https://github.com/PowerJob/PowerJob.git
synced 2025-07-17 00:00:04 +08:00
chore: upgrade project version to 5.0.0-beta
This commit is contained in:
tjq
parent
3ea089eaee
commit
5e1f7e2d11
2
pom.xml
2
pom.xml
@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>powerjob</name>
|
||||
<url>http://www.powerjob.tech</url>
|
||||
|
||||
@ -5,18 +5,18 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>powerjob-client</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<junit.version>5.9.1</junit.version>
|
||||
<fastjson.version>1.2.83</fastjson.version>
|
||||
<powerjob.common.version>4.3.7</powerjob.common.version>
|
||||
<powerjob.common.version>5.0.0-beta</powerjob.common.version>
|
||||
|
||||
<mvn.shade.plugin.version>3.2.4</mvn.shade.plugin.version>
|
||||
</properties>
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>powerjob-common</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>powerjob-official-processors</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
@ -20,7 +20,7 @@
|
||||
<!-- 不会被打包的部分，scope 只能是 test 或 provide -->
|
||||
<junit.version>5.9.1</junit.version>
|
||||
<logback.version>1.2.13</logback.version>
|
||||
<powerjob.worker.version>4.3.7</powerjob.worker.version>
|
||||
<powerjob.worker.version>5.0.0-beta</powerjob.worker.version>
|
||||
<h2.db.version>2.2.224</h2.db.version>
|
||||
<mysql.version>8.0.28</mysql.version>
|
||||
<spring.version>5.3.31</spring.version>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-remote</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -21,8 +21,8 @@
|
||||
|
||||
<logback.version>1.2.13</logback.version>
|
||||
<springboot.version>2.7.18</springboot.version>
|
||||
<powerjob-remote-impl-http.version>4.3.7</powerjob-remote-impl-http.version>
|
||||
<powerjob-remote-impl-akka.version>4.3.7</powerjob-remote-impl-akka.version>
|
||||
<powerjob-remote-impl-http.version>5.0.0-beta</powerjob-remote-impl-http.version>
|
||||
<powerjob-remote-impl-akka.version>5.0.0-beta</powerjob-remote-impl-akka.version>
|
||||
|
||||
<gatling.version>3.9.0</gatling.version>
|
||||
<gatling-maven-plugin.version>4.2.9</gatling-maven-plugin.version>
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-remote</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<artifactId>powerjob-remote-framework</artifactId>
|
||||
|
||||
<properties>
|
||||
@ -17,7 +17,7 @@
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<powerjob-common.version>4.3.7</powerjob-common.version>
|
||||
<powerjob-common.version>5.0.0-beta</powerjob-common.version>
|
||||
<reflections.version>0.10.2</reflections.version>
|
||||
|
||||
|
||||
|
||||
@ -5,19 +5,19 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-remote</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>powerjob-remote-impl-akka</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<powerjob-remote-framework.version>4.3.7</powerjob-remote-framework.version>
|
||||
<powerjob-remote-framework.version>5.0.0-beta</powerjob-remote-framework.version>
|
||||
|
||||
<akka.version>2.6.13</akka.version>
|
||||
</properties>
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-remote</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>powerjob-remote-impl-http</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
@ -18,7 +18,7 @@
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<vertx.version>4.3.7</vertx.version>
|
||||
<powerjob-remote-framework.version>4.3.7</powerjob-remote-framework.version>
|
||||
<powerjob-remote-framework.version>5.0.0-beta</powerjob-remote-framework.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
@ -51,9 +51,9 @@
|
||||
<groovy.version>3.0.10</groovy.version>
|
||||
<cron-utils.version>9.2.1</cron-utils.version>
|
||||
|
||||
<powerjob-common.version>4.3.7</powerjob-common.version>
|
||||
<powerjob-remote-impl-http.version>4.3.7</powerjob-remote-impl-http.version>
|
||||
<powerjob-remote-impl-akka.version>4.3.7</powerjob-remote-impl-akka.version>
|
||||
<powerjob-common.version>5.0.0-beta</powerjob-common.version>
|
||||
<powerjob-remote-impl-http.version>5.0.0-beta</powerjob-remote-impl-http.version>
|
||||
<powerjob-remote-impl-akka.version>5.0.0-beta</powerjob-remote-impl-akka.version>
|
||||
<springdoc-openapi-ui.version>1.6.14</springdoc-openapi-ui.version>
|
||||
<aliyun-sdk-oss.version>3.17.1</aliyun-sdk-oss.version>
|
||||
<minio.version>8.5.2</minio.version>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -33,4 +33,16 @@ public class LoginUserHolder {
|
||||
}
|
||||
return "UNKNOWN";
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户ID
|
||||
* @return 存在则返回，否则返回 null
|
||||
*/
|
||||
public static Long getUserId() {
|
||||
PowerJobUser powerJobUser = get();
|
||||
if (powerJobUser != null) {
|
||||
return powerJobUser.getId();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ public class DingTalkLoginService implements ThirdPartyLoginService {
|
||||
配置示例
|
||||
oms.auth.dingtalk.appkey=dinggzqqzqqzqqzqq
|
||||
oms.auth.dingtalk.appSecret=iY-FS8mzqqzqq_xEizqqzqqzqqzqqzqqzqqYEbkZOal
|
||||
oms.auth.dingtalk.callbackUrl=http://localhost:7700/auth/loginCallback
|
||||
oms.auth.dingtalk.callbackUrl=http://localhost:7700
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -50,9 +50,9 @@ public class DingTalkLoginService implements ThirdPartyLoginService {
|
||||
@Value("${oms.auth.dingtalk.appSecret:#{null}}")
|
||||
private String dingTalkAppSecret;
|
||||
/**
|
||||
* 回调地址，powerjob-server 地址 + /user/auth
|
||||
* 比如本地调试时为 <a href="http://localhost:7700/auth/loginCallback">LocalDemoCallbackUrl</a>
|
||||
* 部署后则为 <a href="http://try.powerjob.tech/auth/loginCallback">demoCallBackUrl</a>
|
||||
* 回调地址，powerjob 前端控制台地址，即 powerjob-console 地址
|
||||
* 比如本地调试时为 <a href="http://localhost:7700">LocalDemoCallbackUrl</a>
|
||||
* 部署后则为 <a href="http://try.powerjob.tech">demoCallBackUrl</a>
|
||||
*/
|
||||
@Value("${oms.auth.dingtalk.callbackUrl:#{null}}")
|
||||
private String dingTalkCallbackUrl;
|
||||
|
||||
@ -25,7 +25,6 @@ import tech.powerjob.server.common.Loggers;
|
||||
import tech.powerjob.server.persistence.remote.model.UserInfoDO;
|
||||
import tech.powerjob.server.persistence.remote.repository.UserInfoRepository;
|
||||
|
||||
import javax.servlet.http.Cookie;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
@ -202,6 +201,10 @@ public class PowerJobLoginServiceImpl implements PowerJobLoginService {
|
||||
// header、cookie 都能获取
|
||||
String jwtStr = HttpServletUtils.fetchFromHeader(AuthConstants.JWT_NAME, httpServletRequest);
|
||||
|
||||
/*
|
||||
|
||||
开发阶段跨域无法简单传输 cookies，暂时采取 header 方案传输 JWT
|
||||
|
||||
if (StringUtils.isEmpty(jwtStr)) {
|
||||
for (Cookie cookie : Optional.ofNullable(httpServletRequest.getCookies()).orElse(new Cookie[]{})) {
|
||||
if (cookie.getName().equals(AuthConstants.JWT_NAME)) {
|
||||
@ -209,6 +212,8 @@ public class PowerJobLoginServiceImpl implements PowerJobLoginService {
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if (StringUtils.isEmpty(jwtStr)) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -59,7 +59,7 @@ public class AppInfoDO {
|
||||
|
||||
private Date gmtModified;
|
||||
|
||||
private String creator;
|
||||
private Long creator;
|
||||
|
||||
private String modifier;
|
||||
private Long modifier;
|
||||
}
|
||||
|
||||
@ -59,7 +59,7 @@ public class NamespaceDO {
|
||||
|
||||
private Date gmtModified;
|
||||
|
||||
private String creator;
|
||||
private Long creator;
|
||||
|
||||
private String modifier;
|
||||
private Long modifier;
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>powerjob-server</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -33,7 +33,9 @@ import tech.powerjob.server.web.request.ModifyAppInfoRequest;
|
||||
import tech.powerjob.server.web.request.QueryAppInfoRequest;
|
||||
import tech.powerjob.server.web.response.AppInfoVO;
|
||||
import tech.powerjob.server.web.response.NamespaceBaseVO;
|
||||
import tech.powerjob.server.web.response.UserBaseVO;
|
||||
import tech.powerjob.server.web.service.NamespaceWebService;
|
||||
import tech.powerjob.server.web.service.UserWebService;
|
||||
|
||||
import javax.persistence.criteria.Predicate;
|
||||
import java.util.*;
|
||||
@ -53,6 +55,8 @@ public class AppInfoController {
|
||||
|
||||
private final WebAuthService webAuthService;
|
||||
|
||||
private final UserWebService userWebService;
|
||||
|
||||
private final AppInfoRepository appInfoRepository;
|
||||
|
||||
private final NamespaceWebService namespaceWebService;
|
||||
@ -68,7 +72,7 @@ public class AppInfoController {
|
||||
if (id == null) {
|
||||
appInfoDO = new AppInfoDO();
|
||||
appInfoDO.setGmtCreate(new Date());
|
||||
appInfoDO.setCreator(LoginUserHolder.getUserName());
|
||||
appInfoDO.setCreator(LoginUserHolder.getUserId());
|
||||
} else {
|
||||
appInfoDO = appInfoRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("can't find appInfo by id:" + id));
|
||||
|
||||
@ -86,7 +90,7 @@ public class AppInfoController {
|
||||
appInfoDO.setExtra(req.getExtra());
|
||||
|
||||
appInfoDO.setGmtModified(new Date());
|
||||
appInfoDO.setModifier(LoginUserHolder.getUserName());
|
||||
appInfoDO.setModifier(LoginUserHolder.getUserId());
|
||||
|
||||
AppInfoDO savedAppInfo = appInfoRepository.saveAndFlush(appInfoDO);
|
||||
|
||||
@ -138,6 +142,10 @@ public class AppInfoController {
|
||||
predicates.add(criteriaBuilder.like(root.get("appName"), QueryConvertUtils.convertLikeParams(queryAppInfoRequest.getAppNameLike())));
|
||||
}
|
||||
|
||||
if (StringUtils.isNotEmpty(queryAppInfoRequest.getTagLike())) {
|
||||
predicates.add(criteriaBuilder.like(root.get("tags"), QueryConvertUtils.convertLikeParams(queryAppInfoRequest.getTagLike())));
|
||||
}
|
||||
|
||||
if (!queryAppIds.isEmpty()) {
|
||||
predicates.add(criteriaBuilder.in(root.get("id")).value(queryAppIds));
|
||||
}
|
||||
@ -149,8 +157,8 @@ public class AppInfoController {
|
||||
|
||||
PageResult<AppInfoVO> pageRet = new PageResult<>(pageAppInfoResult);
|
||||
|
||||
List<AppInfoDO> appinfoDos = pageAppInfoResult.get().collect(Collectors.toList());
|
||||
pageRet.setData(convert(appinfoDos, true));
|
||||
List<AppInfoDO> appInfoDos = pageAppInfoResult.get().collect(Collectors.toList());
|
||||
pageRet.setData(convert(appInfoDos, true));
|
||||
|
||||
return ResultDTO.success(pageRet);
|
||||
}
|
||||
@ -160,7 +168,7 @@ public class AppInfoController {
|
||||
return Lists.newLinkedList();
|
||||
}
|
||||
|
||||
return data.stream().map(appInfoDO -> {
|
||||
return data.parallelStream().map(appInfoDO -> {
|
||||
AppInfoVO appInfoVO = new AppInfoVO();
|
||||
BeanUtils.copyProperties(appInfoDO, appInfoVO);
|
||||
|
||||
@ -177,13 +185,17 @@ public class AppInfoController {
|
||||
appInfoVO.setPassword(hasPermission ? appInfoDO.getPassword() : AuthConstants.TIPS_NO_PERMISSION_TO_SEE);
|
||||
|
||||
// namespace
|
||||
Optional<NamespaceDO> namespaceOpt = namespaceWebService.findById(appInfoVO.getId());
|
||||
Optional<NamespaceDO> namespaceOpt = namespaceWebService.findById(appInfoDO.getNamespaceId());
|
||||
if (namespaceOpt.isPresent()) {
|
||||
NamespaceBaseVO baseNamespace = NamespaceConverter.do2BaseVo(namespaceOpt.get());
|
||||
appInfoVO.setNamespace(baseNamespace);
|
||||
appInfoVO.setNamespaceName(baseNamespace.getName());
|
||||
}
|
||||
|
||||
// user 信息
|
||||
appInfoVO.setCreatorShowName(userWebService.fetchBaseUserInfo(appInfoDO.getCreator()).map(UserBaseVO::getShowName).orElse(null));
|
||||
appInfoVO.setModifierShowName(userWebService.fetchBaseUserInfo(appInfoDO.getModifier()).map(UserBaseVO::getShowName).orElse(null));
|
||||
|
||||
}
|
||||
|
||||
return appInfoVO;
|
||||
|
||||
@ -20,7 +20,9 @@ import tech.powerjob.server.web.request.ModifyNamespaceRequest;
|
||||
import tech.powerjob.server.web.request.QueryNamespaceRequest;
|
||||
import tech.powerjob.server.web.response.NamespaceBaseVO;
|
||||
import tech.powerjob.server.web.response.NamespaceVO;
|
||||
import tech.powerjob.server.web.response.UserBaseVO;
|
||||
import tech.powerjob.server.web.service.NamespaceWebService;
|
||||
import tech.powerjob.server.web.service.UserWebService;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
@ -40,6 +42,8 @@ public class NamespaceController {
|
||||
@Resource
|
||||
private WebAuthService webAuthService;
|
||||
@Resource
|
||||
private UserWebService userWebService;
|
||||
@Resource
|
||||
private NamespaceWebService namespaceWebService;
|
||||
|
||||
@ResponseBody
|
||||
@ -70,7 +74,7 @@ public class NamespaceController {
|
||||
NamespaceBaseVO baseVO = NamespaceConverter.do2BaseVo(x);
|
||||
BeanUtils.copyProperties(baseVO, detailVo);
|
||||
|
||||
fillPermissionInfo(x, detailVo);
|
||||
fillDetail(x, detailVo);
|
||||
return detailVo;
|
||||
}).collect(Collectors.toList()));
|
||||
|
||||
@ -93,7 +97,7 @@ public class NamespaceController {
|
||||
return ResultDTO.success(namespaceBaseVOList);
|
||||
}
|
||||
|
||||
private void fillPermissionInfo(NamespaceDO namespaceDO, NamespaceVO namespaceVO) {
|
||||
private void fillDetail(NamespaceDO namespaceDO, NamespaceVO namespaceVO) {
|
||||
|
||||
Long namespaceId = namespaceVO.getId();
|
||||
|
||||
@ -104,6 +108,10 @@ public class NamespaceController {
|
||||
// 有权限用户填充 token
|
||||
boolean hasPermission = webAuthService.hasPermission(RoleScope.NAMESPACE, namespaceId, Permission.READ);
|
||||
namespaceVO.setToken(hasPermission ? namespaceDO.getToken() : AuthConstants.TIPS_NO_PERMISSION_TO_SEE);
|
||||
|
||||
// 用户信息
|
||||
namespaceVO.setCreatorShowName(userWebService.fetchBaseUserInfo(namespaceDO.getCreator()).map(UserBaseVO::getShowName).orElse(null));
|
||||
namespaceVO.setModifierShowName(userWebService.fetchBaseUserInfo(namespaceDO.getModifier()).map(UserBaseVO::getShowName).orElse(null));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -34,9 +34,9 @@ public class AppInfoVO extends AppBaseVO {
|
||||
|
||||
private String gmtModifiedStr;
|
||||
|
||||
private String creator;
|
||||
private String creatorShowName;
|
||||
|
||||
private String modifier;
|
||||
private String modifierShowName;
|
||||
|
||||
/**
|
||||
* Namespace Info
|
||||
|
||||
@ -39,10 +39,6 @@ public class NamespaceBaseVO implements Serializable {
|
||||
|
||||
private String gmtModifiedStr;
|
||||
|
||||
private String creator;
|
||||
|
||||
private String modifier;
|
||||
|
||||
/**
|
||||
* 前端名称（拼接 code + name，更容易辨认）
|
||||
*/
|
||||
|
||||
@ -32,4 +32,8 @@ public class NamespaceVO extends NamespaceBaseVO {
|
||||
|
||||
private ComponentUserRoleInfo componentUserRoleInfo;
|
||||
|
||||
private String creatorShowName;
|
||||
|
||||
private String modifierShowName;
|
||||
|
||||
}
|
||||
|
||||
@ -25,6 +25,7 @@ public class UserBaseVO {
|
||||
protected String showName;
|
||||
|
||||
public void genShowName() {
|
||||
|
||||
if (StringUtils.isEmpty(nick)) {
|
||||
showName = username;
|
||||
} else {
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
package tech.powerjob.server.web.service;
|
||||
|
||||
import tech.powerjob.server.web.response.UserBaseVO;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* 用户 WEB 服务
|
||||
*
|
||||
* @author tjq
|
||||
* @since 2024/2/17
|
||||
*/
|
||||
public interface UserWebService {
|
||||
|
||||
Optional<UserBaseVO> fetchBaseUserInfo(Long userId);
|
||||
}
|
||||
@ -64,11 +64,11 @@ public class NamespaceWebServiceImpl implements NamespaceWebService {
|
||||
namespaceDO.setCode(req.getCode());
|
||||
// 创建时生成 token
|
||||
namespaceDO.setToken(UUID.randomUUID().toString());
|
||||
namespaceDO.setCreator(LoginUserHolder.getUserName());
|
||||
namespaceDO.setCreator(LoginUserHolder.getUserId());
|
||||
|
||||
} else {
|
||||
namespaceDO = fetchById(id);
|
||||
namespaceDO.setModifier(LoginUserHolder.getUserName());
|
||||
namespaceDO.setModifier(LoginUserHolder.getUserId());
|
||||
|
||||
if (!namespaceDO.getCode().equalsIgnoreCase(req.getCode())) {
|
||||
throw new IllegalArgumentException("NOT_ALLOW_CHANGE_THE_NAMESPACE_CODE");
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package tech.powerjob.server.web.service.impl;
|
||||
|
||||
import com.google.common.collect.Sets;
|
||||
import lombok.SneakyThrows;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
@ -17,6 +18,7 @@ import tech.powerjob.server.web.service.PwjbUserWebService;
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* PwjbUserWebService
|
||||
@ -30,11 +32,15 @@ public class PwjbUserWebServiceImplImpl implements PwjbUserWebService {
|
||||
@Resource
|
||||
private PwjbUserInfoRepository pwjbUserInfoRepository;
|
||||
|
||||
private static final Set<String> NOT_ALLOWED_CHANGE_PASSWORD_ACCOUNTS = Sets.newHashSet("powerjob_trial_account");
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public PwjbUserInfoDO save(ModifyUserInfoRequest request) {
|
||||
String username = request.getUsername();
|
||||
CommonUtils.requireNonNull(username, "userName can't be null or empty!");
|
||||
CommonUtils.requireNonNull(request.getPassword(), "password can't be null or empty!");
|
||||
|
||||
Optional<PwjbUserInfoDO> oldUserOpt = pwjbUserInfoRepository.findByUsername(username);
|
||||
if (oldUserOpt.isPresent()) {
|
||||
throw new IllegalArgumentException("username already exist, please change one!");
|
||||
@ -81,6 +87,11 @@ public class PwjbUserWebServiceImplImpl implements PwjbUserWebService {
|
||||
throw new PowerJobAuthException(AuthErrorCode.INCORRECT_PASSWORD);
|
||||
}
|
||||
|
||||
// 测试账号特殊处理
|
||||
if (NOT_ALLOWED_CHANGE_PASSWORD_ACCOUNTS.contains(username)) {
|
||||
throw new IllegalArgumentException("this account not allowed change the password");
|
||||
}
|
||||
|
||||
dbUser.setPassword(DigestUtils.rePassword(changePasswordRequest.getNewPassword(), dbUser.getUsername()));
|
||||
dbUser.setGmtModified(new Date());
|
||||
pwjbUserInfoRepository.saveAndFlush(dbUser);
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
package tech.powerjob.server.web.service.impl;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import tech.powerjob.server.persistence.remote.model.UserInfoDO;
|
||||
import tech.powerjob.server.persistence.remote.repository.UserInfoRepository;
|
||||
import tech.powerjob.server.web.converter.UserConverter;
|
||||
import tech.powerjob.server.web.response.UserBaseVO;
|
||||
import tech.powerjob.server.web.service.UserWebService;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* UserWebService
|
||||
*
|
||||
* @author tjq
|
||||
* @since 2024/2/17
|
||||
*/
|
||||
@Service
|
||||
public class UserWebServiceImpl implements UserWebService {
|
||||
|
||||
@Resource
|
||||
private UserInfoRepository userInfoRepository;
|
||||
|
||||
@Override
|
||||
public Optional<UserBaseVO> fetchBaseUserInfo(Long userId) {
|
||||
|
||||
if (userId == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
Optional<UserInfoDO> userInfoOpt = userInfoRepository.findById(userId);
|
||||
return userInfoOpt.map(UserConverter::do2BaseVo);
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 222 KiB |
@ -4,14 +4,14 @@
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||
<link rel="icon" href="/favicon.ico">
|
||||
<link rel="icon" href="favicon.ico">
|
||||
<title>PowerJob</title>
|
||||
<link href="/js/0.js" rel="prefetch"><link href="/js/1.js" rel="prefetch"><link href="/js/10.js" rel="prefetch"><link href="/js/11.js" rel="prefetch"><link href="/js/2.js" rel="prefetch"><link href="/js/3.js" rel="prefetch"><link href="/js/4.js" rel="prefetch"><link href="/js/5.js" rel="prefetch"><link href="/js/6.js" rel="prefetch"><link href="/js/7.js" rel="prefetch"><link href="/js/8.js" rel="prefetch"><link href="/js/9.js" rel="prefetch"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"></head>
|
||||
<link href="js/0.js" rel="prefetch"><link href="js/1.js" rel="prefetch"><link href="js/10.js" rel="prefetch"><link href="js/11.js" rel="prefetch"><link href="js/12.js" rel="prefetch"><link href="js/13.js" rel="prefetch"><link href="js/14.js" rel="prefetch"><link href="js/15.js" rel="prefetch"><link href="js/16.js" rel="prefetch"><link href="js/2.js" rel="prefetch"><link href="js/3.js" rel="prefetch"><link href="js/4.js" rel="prefetch"><link href="js/5.js" rel="prefetch"><link href="js/6.js" rel="prefetch"><link href="js/7.js" rel="prefetch"><link href="js/8.js" rel="prefetch"><link href="js/9.js" rel="prefetch"><link href="js/app.js" rel="preload" as="script"><link href="js/chunk-vendors.js" rel="preload" as="script"></head>
|
||||
<body>
|
||||
<noscript>
|
||||
<strong>We're sorry but oms-console doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
|
||||
</noscript>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
<script type="text/javascript" src="/js/chunk-vendors.js"></script><script type="text/javascript" src="/js/app.js"></script></body>
|
||||
<script type="text/javascript" src="js/chunk-vendors.js"></script><script type="text/javascript" src="js/app.js"></script></body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -5,24 +5,24 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>powerjob-worker-agent</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
|
||||
<properties>
|
||||
<powerjob.worker.version>4.3.7</powerjob.worker.version>
|
||||
<powerjob.worker.version>5.0.0-beta</powerjob.worker.version>
|
||||
<logback.version>1.2.13</logback.version>
|
||||
<picocli.version>4.3.2</picocli.version>
|
||||
<spring.version>5.3.31</spring.version>
|
||||
|
||||
<spring.boot.version>2.3.4.RELEASE</spring.boot.version>
|
||||
|
||||
<powerjob.official.processors.version>4.3.7</powerjob.official.processors.version>
|
||||
<powerjob.official.processors.version>5.0.0-beta</powerjob.official.processors.version>
|
||||
|
||||
<!-- dependency for dynamic sql processor -->
|
||||
<mysql.version>8.0.28</mysql.version>
|
||||
|
||||
@ -5,18 +5,18 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>powerjob-worker-samples</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
|
||||
<properties>
|
||||
<springboot.version>2.7.18</springboot.version>
|
||||
<powerjob.worker.starter.version>4.3.7</powerjob.worker.starter.version>
|
||||
<powerjob.worker.starter.version>5.0.0-beta</powerjob.worker.starter.version>
|
||||
<fastjson.version>1.2.83</fastjson.version>
|
||||
<powerjob.official.processors.version>4.3.7</powerjob.official.processors.version>
|
||||
<powerjob.official.processors.version>5.0.0-beta</powerjob.official.processors.version>
|
||||
|
||||
<!-- 部署时跳过该module -->
|
||||
<maven.deploy.skip>true</maven.deploy.skip>
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>powerjob-worker-spring-boot-starter</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<powerjob.worker.version>4.3.7</powerjob.worker.version>
|
||||
<powerjob.worker.version>5.0.0-beta</powerjob.worker.version>
|
||||
<springboot.version>2.7.18</springboot.version>
|
||||
</properties>
|
||||
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
<parent>
|
||||
<artifactId>powerjob</artifactId>
|
||||
<groupId>tech.powerjob</groupId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>powerjob-worker</artifactId>
|
||||
<version>4.3.7</version>
|
||||
<version>5.0.0-beta</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
@ -21,10 +21,10 @@
|
||||
|
||||
<logback.version>1.2.13</logback.version>
|
||||
|
||||
<powerjob-common.version>4.3.7</powerjob-common.version>
|
||||
<powerjob-remote-framework.version>4.3.7</powerjob-remote-framework.version>
|
||||
<powerjob-remote-impl-akka.version>4.3.7</powerjob-remote-impl-akka.version>
|
||||
<powerjob-remote-impl-http.version>4.3.7</powerjob-remote-impl-http.version>
|
||||
<powerjob-common.version>5.0.0-beta</powerjob-common.version>
|
||||
<powerjob-remote-framework.version>5.0.0-beta</powerjob-remote-framework.version>
|
||||
<powerjob-remote-impl-akka.version>5.0.0-beta</powerjob-remote-impl-akka.version>
|
||||
<powerjob-remote-impl-http.version>5.0.0-beta</powerjob-remote-impl-http.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user