Browse Source

fix this issue (#12281)

3.2.0-release
calvin 2 years ago committed by GitHub
parent
commit
b4947b471c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
  2. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/StoreConfiguration.java

3
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java

@ -144,7 +144,7 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
* @throws Exception exception * @throws Exception exception
*/ */
@Override @Override
@Transactional @Transactional(rollbackFor = Exception.class)
public Map<String, Object> createUser(User loginUser, public Map<String, Object> createUser(User loginUser,
String userName, String userName,
String userPassword, String userPassword,
@ -190,7 +190,6 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
result.put(Constants.DATA_LIST, user); result.put(Constants.DATA_LIST, user);
putMsg(result, Status.SUCCESS); putMsg(result, Status.SUCCESS);
return result; return result;
} }
@Override @Override

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/StoreConfiguration.java

@ -42,7 +42,7 @@ public class StoreConfiguration {
@Bean @Bean
public StorageOperate storageOperate() { public StorageOperate storageOperate() {
switch (PropertyUtils.getString(RESOURCE_STORAGE_TYPE)) { switch (PropertyUtils.getUpperCaseString(RESOURCE_STORAGE_TYPE)) {
case STORAGE_OSS: case STORAGE_OSS:
OssOperator ossOperator = new OssOperator(); OssOperator ossOperator = new OssOperator();
// TODO: change to use ossOperator.init(ossConnection) after DS supports Configuration / Connection // TODO: change to use ossOperator.init(ossConnection) after DS supports Configuration / Connection

Loading…
Cancel
Save