Merge branch 'features/1.3.0' into 'features/1.3.0_test'

pushApiはchatapiを指定するように修正

See merge request !59

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java

@@ -792,12 +792,6 @@ public class AcmsClient implements AcmsClientResponseListener {
 		
 		
 		String apiUrl = AcmsApis.getApiUrl(env.acmsAddress, urlPath, methodName);
 		String apiUrl = AcmsApis.getApiUrl(env.acmsAddress, urlPath, methodName);
 
 
-		// チャット
-		if(apiUrl.equals("https://abookcheckdemo.abook.bz/acms/aisinfo/abvapi/push/"))
-		{
-			apiUrl = "https://abookcheckdemo.abook.bz/acms/aisinfo/chatapi/push/";
-		}
-
 		HttpResponse response = send(apiUrl, methodName, param);
 		HttpResponse response = send(apiUrl, methodName, param);
 		
 		
 		// 最終アクセス時間更新
 		// 最終アクセス時間更新

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java

@@ -206,6 +206,8 @@ public class AcmsApis {
 				methodName.equals(ApiSendPushMessage) || methodName.equals(ApiGetPushMessages) || methodName.equals(ApiSendRoutineTaskData) ||
 				methodName.equals(ApiSendPushMessage) || methodName.equals(ApiGetPushMessages) || methodName.equals(ApiSendRoutineTaskData) ||
 				methodName.equals(ApiOperationGroupMaster) || methodName.equals(ApiGetApertureMasterData)) {
 				methodName.equals(ApiOperationGroupMaster) || methodName.equals(ApiGetApertureMasterData)) {
 			apiValue = Constant.ApiValue.checkapi;
 			apiValue = Constant.ApiValue.checkapi;
+		} else if (methodName.equals(ApiGetChatPushData)) {	// pushActionはchatapiを指定
+			apiValue = Constant.ApiValue.chatapi;
 		}
 		}
 
 
 		switch (apiValue) {
 		switch (apiValue) {
@@ -221,7 +223,8 @@ public class AcmsApis {
 				//ABookCheck用のapi
 				//ABookCheck用のapi
 				url = String.format(CheckApiUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath), methodName);
 				url = String.format(CheckApiUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath), methodName);
 				break;
 				break;
-			case Constant.ApiValue.chatapi: // チャット
+			case Constant.ApiValue.chatapi:
+				// チャットAPI
 				url = String.format(ChatApiUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath), methodName);
 				url = String.format(ChatApiUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath), methodName);
 				break;
 				break;
         }
         }