calvin 2 gadi atpakaļ
vecāks
revīzija
b4947b471c

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

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

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