Merge pull request #15 from apache/dev (c6150e38) · Commits · SUMMER2020 / students / proj-2002252

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -154,8 +154,13 @@ public class AccessTokenService extends BaseService {
		*/
		public Map<String, Object> updateToken(int id,int userId, String expireTime, String token) {
		Map<String, Object> result = new HashMap<>(5);
		AccessToken accessToken = new AccessToken();
		accessToken.setId(id);

		AccessToken accessToken = accessTokenMapper.selectById(id);
		if (accessToken == null) {
		logger.error("access token not exist, access token id {}", id);
		putMsg(result, Status.ACCESS_TOKEN_NOT_EXIST);
		return result;
		}
		accessToken.setUserId(userId);
		accessToken.setExpireTime(DateUtils.stringToDate(expireTime));
		accessToken.setToken(token);

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,6 @@ public class ResourcesService extends BaseService {
		}

		Resource resource = resourcesMapper.selectById(resourceId);
		String originResourceName = resource.getAlias();
		if (resource == null) {
		putMsg(result, Status.RESOURCE_NOT_EXIST);
		return result;
		@@ -236,6 +235,7 @@ public class ResourcesService extends BaseService {
		}

		//get the file suffix
		String originResourceName = resource.getAlias();
		String suffix = originResourceName.substring(originResourceName.lastIndexOf("."));

		//if the name without suffix then add it ,else use the origin name

+8 −2

Original line number	Diff line number	Diff line
		@@ -17,12 +17,10 @@
		package org.apache.dolphinscheduler.common.enums;

		import com.baomidou.mybatisplus.annotation.EnumValue;
		import lombok.Getter;

		/**
		* alert status
		*/
		@Getter
		public enum AlertStatus {
		/**
		* 0 waiting executed; 1 execute successfully，2 execute failed
		@@ -40,4 +38,12 @@ public enum AlertStatus {
		@EnumValue
		private final int code;
		private final String descp;

		public int getCode() {
		return code;
		}

		public String getDescp() {
		return descp;
		}
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -17,12 +17,10 @@
		package org.apache.dolphinscheduler.common.enums;

		import com.baomidou.mybatisplus.annotation.EnumValue;
		import lombok.Getter;

		/**
		* warning message notification method
		*/
		@Getter
		public enum AlertType {
		/**
		* 0 email; 1 SMS
		@@ -39,4 +37,12 @@ public enum AlertType {
		@EnumValue
		private final int code;
		private final String descp;

		public int getCode() {
		return code;
		}

		public String getDescp() {
		return descp;
		}
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -17,12 +17,10 @@
		package org.apache.dolphinscheduler.common.enums;

		import com.baomidou.mybatisplus.annotation.EnumValue;
		import lombok.Getter;

		/**
		* command types
		*/
		@Getter
		public enum CommandType {

		/**
		@@ -59,4 +57,12 @@ public enum CommandType {
		@EnumValue
		private final int code;
		private final String descp;

		public int getCode() {
		return code;
		}

		public String getDescp() {
		return descp;
		}
		}