diff --git a/pom.xml b/pom.xml
index 822a9cb8..89f3f54a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
tech.powerjob
powerjob
- 4.3.7
+ 5.0.0-beta
pom
powerjob
http://www.powerjob.tech
diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml
index cf8ab18b..03d77d88 100644
--- a/powerjob-client/pom.xml
+++ b/powerjob-client/pom.xml
@@ -5,18 +5,18 @@
powerjob
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
powerjob-client
- 4.3.7
+ 5.0.0-beta
jar
5.9.1
1.2.83
- 4.3.7
+ 5.0.0-beta
3.2.4
diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml
index 893a08d8..7eb8ccf5 100644
--- a/powerjob-common/pom.xml
+++ b/powerjob-common/pom.xml
@@ -5,12 +5,12 @@
powerjob
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
powerjob-common
- 4.3.7
+ 5.0.0-beta
jar
diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml
index 5de9dfdb..d87a84c1 100644
--- a/powerjob-official-processors/pom.xml
+++ b/powerjob-official-processors/pom.xml
@@ -5,12 +5,12 @@
powerjob
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
powerjob-official-processors
- 4.3.7
+ 5.0.0-beta
jar
@@ -20,7 +20,7 @@
5.9.1
1.2.13
- 4.3.7
+ 5.0.0-beta
2.2.224
8.0.28
5.3.31
diff --git a/powerjob-remote/pom.xml b/powerjob-remote/pom.xml
index 3b339c5d..602db2a3 100644
--- a/powerjob-remote/pom.xml
+++ b/powerjob-remote/pom.xml
@@ -5,7 +5,7 @@
powerjob
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
pom
diff --git a/powerjob-remote/powerjob-remote-benchmark/pom.xml b/powerjob-remote/powerjob-remote-benchmark/pom.xml
index fa282187..263d575f 100644
--- a/powerjob-remote/powerjob-remote-benchmark/pom.xml
+++ b/powerjob-remote/powerjob-remote-benchmark/pom.xml
@@ -5,7 +5,7 @@
powerjob-remote
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
@@ -21,8 +21,8 @@
1.2.13
2.7.18
- 4.3.7
- 4.3.7
+ 5.0.0-beta
+ 5.0.0-beta
3.9.0
4.2.9
diff --git a/powerjob-remote/powerjob-remote-framework/pom.xml b/powerjob-remote/powerjob-remote-framework/pom.xml
index 883f27ba..f7c82536 100644
--- a/powerjob-remote/powerjob-remote-framework/pom.xml
+++ b/powerjob-remote/powerjob-remote-framework/pom.xml
@@ -5,11 +5,11 @@
powerjob-remote
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
- 4.3.7
+ 5.0.0-beta
powerjob-remote-framework
@@ -17,7 +17,7 @@
8
UTF-8
- 4.3.7
+ 5.0.0-beta
0.10.2
diff --git a/powerjob-remote/powerjob-remote-impl-akka/pom.xml b/powerjob-remote/powerjob-remote-impl-akka/pom.xml
index ccbd9732..68ce450f 100644
--- a/powerjob-remote/powerjob-remote-impl-akka/pom.xml
+++ b/powerjob-remote/powerjob-remote-impl-akka/pom.xml
@@ -5,19 +5,19 @@
powerjob-remote
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
powerjob-remote-impl-akka
- 4.3.7
+ 5.0.0-beta
8
8
UTF-8
- 4.3.7
+ 5.0.0-beta
2.6.13
diff --git a/powerjob-remote/powerjob-remote-impl-http/pom.xml b/powerjob-remote/powerjob-remote-impl-http/pom.xml
index 8ecb4baa..30838af8 100644
--- a/powerjob-remote/powerjob-remote-impl-http/pom.xml
+++ b/powerjob-remote/powerjob-remote-impl-http/pom.xml
@@ -5,12 +5,12 @@
powerjob-remote
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
powerjob-remote-impl-http
- 4.3.7
+ 5.0.0-beta
8
@@ -18,7 +18,7 @@
UTF-8
4.3.7
- 4.3.7
+ 5.0.0-beta
diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml
index 3b4ec5ea..c0e55ebe 100644
--- a/powerjob-server/pom.xml
+++ b/powerjob-server/pom.xml
@@ -5,12 +5,12 @@
powerjob
tech.powerjob
- 4.3.7
+ 5.0.0-beta
4.0.0
powerjob-server
- 4.3.7
+ 5.0.0-beta
pom
@@ -51,9 +51,9 @@
3.0.10
9.2.1
- 4.3.7
- 4.3.7
- 4.3.7
+ 5.0.0-beta
+ 5.0.0-beta
+ 5.0.0-beta
1.6.14
3.17.1
8.5.2
diff --git a/powerjob-server/powerjob-server-auth/pom.xml b/powerjob-server/powerjob-server-auth/pom.xml
index 79746431..eb38433b 100644
--- a/powerjob-server/powerjob-server-auth/pom.xml
+++ b/powerjob-server/powerjob-server-auth/pom.xml
@@ -6,7 +6,7 @@
tech.powerjob
powerjob-server
- 4.3.7
+ 5.0.0-beta
4.0.0
diff --git a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/LoginUserHolder.java b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/LoginUserHolder.java
index 2ade7416..7cf324a6 100644
--- a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/LoginUserHolder.java
+++ b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/LoginUserHolder.java
@@ -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;
+ }
}
diff --git a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/login/impl/DingTalkLoginService.java b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/login/impl/DingTalkLoginService.java
index 9255ca1b..c9a646c3 100644
--- a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/login/impl/DingTalkLoginService.java
+++ b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/login/impl/DingTalkLoginService.java
@@ -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
- * 比如本地调试时为 LocalDemoCallbackUrl
- * 部署后则为 demoCallBackUrl
+ * 回调地址,powerjob 前端控制台地址,即 powerjob-console 地址
+ * 比如本地调试时为 LocalDemoCallbackUrl
+ * 部署后则为 demoCallBackUrl
*/
@Value("${oms.auth.dingtalk.callbackUrl:#{null}}")
private String dingTalkCallbackUrl;
diff --git a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/login/impl/PowerJobLoginServiceImpl.java b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/login/impl/PowerJobLoginServiceImpl.java
index e107b889..b7da1439 100644
--- a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/login/impl/PowerJobLoginServiceImpl.java
+++ b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/login/impl/PowerJobLoginServiceImpl.java
@@ -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();
}
diff --git a/powerjob-server/powerjob-server-common/pom.xml b/powerjob-server/powerjob-server-common/pom.xml
index 7391b562..e634e99e 100644
--- a/powerjob-server/powerjob-server-common/pom.xml
+++ b/powerjob-server/powerjob-server-common/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.7
+ 5.0.0-beta
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-core/pom.xml b/powerjob-server/powerjob-server-core/pom.xml
index 20c19bbd..e9af6c77 100644
--- a/powerjob-server/powerjob-server-core/pom.xml
+++ b/powerjob-server/powerjob-server-core/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.7
+ 5.0.0-beta
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-extension/pom.xml b/powerjob-server/powerjob-server-extension/pom.xml
index 20c39dc1..747ae260 100644
--- a/powerjob-server/powerjob-server-extension/pom.xml
+++ b/powerjob-server/powerjob-server-extension/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.7
+ 5.0.0-beta
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-migrate/pom.xml b/powerjob-server/powerjob-server-migrate/pom.xml
index ecb09e50..0a4fb86f 100644
--- a/powerjob-server/powerjob-server-migrate/pom.xml
+++ b/powerjob-server/powerjob-server-migrate/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.7
+ 5.0.0-beta
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-monitor/pom.xml b/powerjob-server/powerjob-server-monitor/pom.xml
index 4b0b4d11..cfa5c264 100644
--- a/powerjob-server/powerjob-server-monitor/pom.xml
+++ b/powerjob-server/powerjob-server-monitor/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.7
+ 5.0.0-beta
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-persistence/pom.xml b/powerjob-server/powerjob-server-persistence/pom.xml
index b8bdfa56..c401e997 100644
--- a/powerjob-server/powerjob-server-persistence/pom.xml
+++ b/powerjob-server/powerjob-server-persistence/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.7
+ 5.0.0-beta
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/AppInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/AppInfoDO.java
index bd6dee28..fe073946 100644
--- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/AppInfoDO.java
+++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/AppInfoDO.java
@@ -59,7 +59,7 @@ public class AppInfoDO {
private Date gmtModified;
- private String creator;
+ private Long creator;
- private String modifier;
+ private Long modifier;
}
diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/NamespaceDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/NamespaceDO.java
index cd2e1de8..35d01bf8 100644
--- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/NamespaceDO.java
+++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/NamespaceDO.java
@@ -59,7 +59,7 @@ public class NamespaceDO {
private Date gmtModified;
- private String creator;
+ private Long creator;
- private String modifier;
+ private Long modifier;
}
diff --git a/powerjob-server/powerjob-server-remote/pom.xml b/powerjob-server/powerjob-server-remote/pom.xml
index cf491b41..39698059 100644
--- a/powerjob-server/powerjob-server-remote/pom.xml
+++ b/powerjob-server/powerjob-server-remote/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.7
+ 5.0.0-beta
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-starter/pom.xml b/powerjob-server/powerjob-server-starter/pom.xml
index c4900ac6..5511c0f2 100644
--- a/powerjob-server/powerjob-server-starter/pom.xml
+++ b/powerjob-server/powerjob-server-starter/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.7
+ 5.0.0-beta
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java
index c62c90d6..435eed93 100644
--- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java
@@ -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 pageRet = new PageResult<>(pageAppInfoResult);
- List appinfoDos = pageAppInfoResult.get().collect(Collectors.toList());
- pageRet.setData(convert(appinfoDos, true));
+ List 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 namespaceOpt = namespaceWebService.findById(appInfoVO.getId());
+ Optional 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;
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/NamespaceController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/NamespaceController.java
index 551d82b4..11cbcd9e 100644
--- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/NamespaceController.java
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/NamespaceController.java
@@ -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));
}
}
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/AppInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/AppInfoVO.java
index dce59f0b..9e08f1f2 100644
--- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/AppInfoVO.java
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/AppInfoVO.java
@@ -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
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceBaseVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceBaseVO.java
index 6453b2cb..dbfa6ce5 100644
--- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceBaseVO.java
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceBaseVO.java
@@ -39,10 +39,6 @@ public class NamespaceBaseVO implements Serializable {
private String gmtModifiedStr;
- private String creator;
-
- private String modifier;
-
/**
* 前端名称(拼接 code + name,更容易辨认)
*/
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceVO.java
index 72bfee4d..f9bc1b83 100644
--- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceVO.java
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/NamespaceVO.java
@@ -32,4 +32,8 @@ public class NamespaceVO extends NamespaceBaseVO {
private ComponentUserRoleInfo componentUserRoleInfo;
+ private String creatorShowName;
+
+ private String modifierShowName;
+
}
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/UserBaseVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/UserBaseVO.java
index fb15d663..1b0ee206 100644
--- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/UserBaseVO.java
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/UserBaseVO.java
@@ -25,6 +25,7 @@ public class UserBaseVO {
protected String showName;
public void genShowName() {
+
if (StringUtils.isEmpty(nick)) {
showName = username;
} else {
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/UserWebService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/UserWebService.java
new file mode 100644
index 00000000..c6fe2ccc
--- /dev/null
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/UserWebService.java
@@ -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 fetchBaseUserInfo(Long userId);
+}
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/NamespaceWebServiceImpl.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/NamespaceWebServiceImpl.java
index 5e4b02b3..42266fc5 100644
--- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/NamespaceWebServiceImpl.java
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/NamespaceWebServiceImpl.java
@@ -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");
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/PwjbUserWebServiceImplImpl.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/PwjbUserWebServiceImplImpl.java
index 5b0c7ec9..104783c6 100644
--- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/PwjbUserWebServiceImplImpl.java
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/PwjbUserWebServiceImplImpl.java
@@ -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 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 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);
diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/UserWebServiceImpl.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/UserWebServiceImpl.java
new file mode 100644
index 00000000..2806ecd2
--- /dev/null
+++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/service/impl/UserWebServiceImpl.java
@@ -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 fetchBaseUserInfo(Long userId) {
+
+ if (userId == null) {
+ return Optional.empty();
+ }
+
+ Optional userInfoOpt = userInfoRepository.findById(userId);
+ return userInfoOpt.map(UserConverter::do2BaseVo);
+ }
+}
diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/static/img/banner.f4c75b86.jpg b/powerjob-server/powerjob-server-starter/src/main/resources/static/img/banner.f4c75b86.jpg
deleted file mode 100644
index 5ea2145a..00000000
Binary files a/powerjob-server/powerjob-server-starter/src/main/resources/static/img/banner.f4c75b86.jpg and /dev/null differ
diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/static/index.html b/powerjob-server/powerjob-server-starter/src/main/resources/static/index.html
index 8d933786..73bc0011 100644
--- a/powerjob-server/powerjob-server-starter/src/main/resources/static/index.html
+++ b/powerjob-server/powerjob-server-starter/src/main/resources/static/index.html
@@ -4,14 +4,14 @@
-
+
PowerJob
-
+
-
+