feat(card_client&dlcm):支持m1卡操作

支持m1卡，卡片入库时写入卡片基本信息，读卡时先调用cpu接口，然后调用m1卡接口。

feat(card_client&dlcm):支持m1卡操作
支持m1卡，卡片入库时写入卡片基本信息，读卡时先调用cpu接口，然后调用m1卡接口。
liuye
1 parent 20dbffcd
Showing 8 changed files with 286 additions and 55 deletions
dlcm/dlcm/DLCDevice.cc
dlcm/dlcm/main.cpp
etrade_card_client/Config/application_config.json
etrade_card_client/ETradeClient/browser/async_js_callback_handler.cpp
etrade_card_client/ETradeClient/hardware/dili_card_device.cpp
etrade_card_client/ETradeClient/hardware/dili_card_device.h
etrade_card_client/ETradeClient/hardware/hardware_cmd.cpp
etrade_card_client/ETradeClient/hardware/hardware_cmd.h
@@ -123,12 +123,12 @@ int DLCDevice::M1LoadKeyHex(const unsigned char mode, const unsigned char* key, 
 int DLCDevice::M1Read(const unsigned char adr, const unsigned char* data)
 {
-	return dc_read(dev_, adr, (unsigned char*)data);
+	return dc_read_hex(dev_, adr, (char*)data);
 }
 int DLCDevice::M1Write(const unsigned char adr, const unsigned char* data)
 {
-	return dc_write(dev_, adr, (unsigned char*)data);
+	return dc_write_hex(dev_, adr, (char*)data);
 }
 int DLCDevice::M1FindCard()
@@ -8,16 +8,26 @@ int main()
 {
 	std::cout << "Test start " << std::endl;
 	DLCConnectDevice();
-	int result = DLCFindCard();
-
-	result = DLCM1FindCard();
-	result = DLCM1AuthenticationKey(0, (unsigned char*)"ffffffffffff");
+	//int result = DLCFindCard();
+
+	int result = DLCM1FindCard();
+
+	result = DLCM1AuthenticationKey(1, (unsigned char*)"ffffffffffff");
+
+	unsigned char read_text[32] = {0};
+
+	//result = DLCM1ReadCard(4, read_text);
+
+	result = DLCM1WriteCard(4, read_text);
+
+	char card_num[8] = { 0 };
+	memcpy(card_num, read_text, 8);
+
+	/*int result = DLCFindCard();
-	unsigned char read_text[32] = { 0 };
-	result = DLCM1ReadCard(1, read_text);
-	const char *write_text = "222222222222";
-	result = DLCM1WriteCard(1, (const unsigned char*)write_text);
+	unsigned char card_num[12] = { 0 };
+	result = DLCReadCardData((const unsigned char*)"3f00", 5, 0, 12, 0, card_num);*/
 	DLCDisconnectDevice();
@@ -9,7 +9,7 @@
 	"client_cert_subject": "*.diligrp.com",
 	"client_cert_filename": "",
 	"client_cert_password": "",
-	"security_level": 2,
+	"security_level": 0,
 	"encrypt_type": 1,
 	"id_reader": 1
 }
 \ No newline at end of file
@@ -46,6 +46,7 @@ namespace HW
 	static const std::string JSON_VAL_FILEID_ID_CARD = "10";
 	static const std::string JSON_VAL_FILEID_PIN_PAD = "11";
 	static const std::string JSON_VAL_FILEID_BANK_CARD_NUM = "20";
+	static const std::string JSON_VAL_FILEID_M1_CARD = "30";
 	struct HWRequest
 	{
@@ -63,7 +64,20 @@ namespace HW
 		PT::read_json(ss, ptree);
 		std::string cmd = ptree.get<std::string>(JSON_TAG_CMD);
 		std::string file_id = ptree.get<std::string>(JSON_TAG_FILEID);
-		std::string data = ptree.get<std::string>(JSON_TAG_DATA);
+		std::string data;
+
+		if (file_id.compare(JSON_VAL_FILEID_M1_CARD) == 0 && 
+			cmd.compare(JSON_VAL_CMD_ACTIVATE) == 0)
+		{
+			PT::ptree data_tree = ptree.get_child(JSON_TAG_DATA);
+			std::stringstream os;
+			PT::write_json(os, data_tree);
+			data = os.str();
+		}
+		else
+		{
+			data = ptree.get<std::string>(JSON_TAG_DATA);
+		}
 		std::string seq = ptree.get<std::string>(JSON_TAG_SEQ);
 		return { cmd, file_id, data, seq };
 	}
@@ -99,6 +113,7 @@ namespace HW
 			m_hw_cmd_map.insert(JSON_VAL_CMD_READ + JSON_VAL_FILEID_DILI_CARD_SERVICE_INFO, new ReadDILICardServiceInfoCmd());
 			m_hw_cmd_map.insert(JSON_VAL_CMD_WRITE + JSON_VAL_FILEID_DILI_CARD_SERVICE_INFO, new WriteDILICardServiceInfoCmd());
 			m_hw_cmd_map.insert(JSON_VAL_CMD_READ + JSON_VAL_FILEID_BANK_CARD_NUM, new ReadBankCardNumCmd());
+			m_hw_cmd_map.insert(JSON_VAL_CMD_ACTIVATE + JSON_VAL_FILEID_M1_CARD, new ActivateDILIM1CardCmd());
 		}
 		std::string HandleRequest(const std::string& request_json)
 		{
@@ -353,7 +353,7 @@ namespace DILICard
 		WriteCardFile(DF01_DIR, SERVICE_INFO_FILE_ID, 0/*offset*/, ACTIVATE_KEY_ID, K_F0015_DAMK1_DV, DecToHex(0)); // Default length is 0.
 	}
-	BasicInfo RWDevice::ReadCardBasicInfo() const
+	DILICard::BasicInfo RWDevice::ReadCardBasicInfo() const
 	{
 		const uint32_t kOffset = 0;
 		const uint32_t kLength = CARD_CHIP_NUM_LEN + CARD_SN_LEN + CARD_TYPE_CODE_LEN + CARD_ISSUER_CODE_LEN + CARD_VERIFY_CODE_LEN;
@@ -361,7 +361,7 @@ namespace DILICard
 		const std::string kKey = "";
 		std::string basic_info_str = ReadCardFile(MF_FILE_DIR, BASIC_INFO_FILE_ID, kOffset, kLength, kKeyID, kKey);
-		BasicInfo basic_info;
+		DILICard::BasicInfo basic_info;
 		uint32_t offset = 0;
 		basic_info.chip_num = basic_info_str.substr(offset, CARD_CHIP_NUM_LEN);
@@ -425,7 +425,7 @@ namespace DILICard
 		if (NULL != key_id)
 		{
 			memcpy(aucKey, key.c_str(), 32);
-			iResult = DLCReadCardData(aucDir, file_id, offset, length, aucData, aucKey);
+			iResult = DLCReadCardData(aucDir, file_id, offset, length, aucKey, aucData);
 		}
 		else
 		{
@@ -529,4 +529,92 @@ namespace DILICard
 		return bResult;
 	}
+
+	int RWDevice::M1FindCard() const 
+	{
+		return DLCM1FindCard();
+	}
+
+	BasicInfo RWDevice::M1ReadBasicInfo() const
+	{
+		BasicInfo basic_info;
+		unsigned char data[33] = { 0 };
+
+		const char* key = "ffffffffffff";
+		int error_code = DLCM1AuthenticationKey(1, (unsigned char*)key);
+		if (error_code)
+		{
+			throw std::exception(std::to_string(error_code).c_str());
+		}
+
+		error_code = DLCM1ReadCard(4, data);
+		if (error_code)
+		{
+			throw std::exception(std::to_string(error_code).c_str());
+		}
+		basic_info.chip_num.insert(0, (char*)data, 8);
+		basic_info.type_code.insert(0, (char*)&data[16], 6);
+
+		error_code = DLCM1ReadCard(5, data);
+		if (error_code)
+		{
+			throw std::exception(std::to_string(error_code).c_str());
+		}
+		basic_info.issuer_code.insert(0, (char*)data, 4);
+		basic_info.verify_code.insert(0, (char*)&data[16], 3);
+
+		error_code = DLCM1ReadCard(6, data);
+		if (error_code)
+		{
+		throw std::exception(std::to_string(error_code).c_str());
+		}
+		basic_info.sub_type.insert(0, (char*)data, 2);
+		basic_info.maker_version.insert(0, (char*)&data[16], 2);
+
+		basic_info.device_id = basic_info.chip_num;
+
+		return basic_info;
+	}
+
+	int RWDevice::M1WriteBasicInfo(std::string card_num, std::string card_type_num, std::string market_id, std::string safe_code, std::string m1_type, std::string card_version) const
+	{
+		int result = 0;
+
+		do 
+		{
+			const char* key = "ffffffffffff";
+			
+			if (DLCM1AuthenticationKey(1, (unsigned char*)key))
+			{
+				break;
+			}
+
+			unsigned char data[32] = { 0 };
+			memset(data, '0', 32);
+			memcpy(data, card_num.c_str(), 8);
+			memcpy(&data[16], card_type_num.c_str(), 6);
+			if (DLCM1WriteCard(4, (unsigned char*)data))
+			{
+				break;
+			}
+
+			memset(data, '0', 32);
+			memcpy(data, market_id.c_str(), 4);
+			memcpy(&data[16], safe_code.c_str(), 3);
+			if (DLCM1WriteCard(5, (unsigned char*)data))
+			{
+				break;
+			}
+
+			memset(data, '0', 32);
+			memcpy(data, m1_type.c_str(), 2);
+			memcpy(&data[16], card_version.c_str(), 2);
+			if (DLCM1WriteCard(6, (unsigned char*)data))
+			{
+				break;
+			}
+		} while (0);
+
+		return result;
+	}
 } // DILICard
 \ No newline at end of file
@@ -13,6 +13,8 @@ CPU卡读写器产品信息：
 #include <string>
 #include <cstdint>
+#include <boost/property_tree/ptree.hpp>
+
 namespace DILICard
 {
 	struct BasicInfo
@@ -22,6 +24,9 @@ namespace DILICard
 		std::string type_code; // 卡片类型码（卡类型编码）
 		std::string issuer_code; // 发卡机构编码
 		std::string verify_code; // 校验码（安全码编码(3位数)）
+		std::string sub_type;  //m1卡卡类型
+		std::string maker_version; //卡片硬件版本
+		std::string chip_type; //芯片类型（2-m1卡|1-cpu卡）
 	};
 	// 卡密钥代码
@@ -54,14 +59,14 @@ namespace DILICard
 						  const std::string& key_F0015_DEAK,
 						  const std::string& key_F0015_DAMK1) const;
 		void ResetCard(const std::string& key_DCCK, const std::string& key_F0015_DACK) const;
-		BasicInfo ReadCardBasicInfo() const;
+		DILICard::BasicInfo ReadCardBasicInfo() const;
 		std::string ReadCardServiceInfo(const std::string& key_F0015_DEAK) const;
 		void WriteCardServiceInfo(const std::string& key_F0015_DAMK1, const std::string& data) const;
 		bool AuthenticationKey(const std::string sKey) const;
 		int M1FindCard() const;
-		BasicInfo M1ReadBasicInfo() const;
-		int M1WriteBasicInfo(std::string card_num, std::string card_type_num, std::string market_id, std::string safe_code, std::string m1_type, std::string card_version);
+		DILICard::BasicInfo M1ReadBasicInfo() const;
+		int M1WriteBasicInfo(std::string card_num, std::string card_type_num, std::string market_id, std::string safe_code, std::string m1_type, std::string card_version) const;
 		enum KeyType
 		{
@@ -69,6 +74,9 @@ namespace DILICard
 			KT_DEAK,
 			KT_DAMK,
 		};
+
+		
+
 	private:
 		std::string ReadCardFile(const std::string& dir, 
 								 char				file_id, 
@@ -87,6 +95,8 @@ namespace DILICard
 						 const std::string& main_key, 
 						 const std::string& install_key, 
 						 KeyType			emKeyType) const;
+
+
 	};
 } // DILICard
 #endif // ETRADECLIENT_HARDWARE_DILI_CARD_DEVICE_H_INCLUDED
@@ -44,6 +44,7 @@ namespace StatusCode
 	static const std::string DILI_CARD_DEVICE_WRITE_SERVICE_INFO_FAILED = "306"; // 写入卡片业务信息失败.
 	static const std::string DILI_CARD_DEVICE_WRITE_UNMATCHED_CARD = "307"; // 写卡卡片的序列号不匹配.
 	static const std::string DILI_CARD_DEVICE_NEED_UPDATE = "308"; //卡片需要升级，请升级后继续使用。
+	static const std::string DILI_CARD_DEVICE_PARSE_SEVER_DATA_FAILED = "309"; //解析服务器数据失败。
 	static const std::string PWD_MACHINE_CONNECT_FAILED = "401"; // 连接加密机失败.
 	static const std::string PWD_MACHINE_GET_KEY_FAILED = "402"; // 从加密机读取密钥失败.
@@ -218,10 +219,6 @@ namespace EncryptTools
 		{
 			throw std::exception("9999");
 		}
-		/*for (int index = 0, iStrIndex = 0; iStrIndex < iLen; ++index, iStrIndex += 2)
-		{
-		CharToHex(&pStr[iStrIndex], pHex[index]);
-		}*/
 		return bResult;
 	}
@@ -259,7 +256,7 @@ namespace
 		return bank_card_reader;
 	}
-	std::string g_sCardNum;//用于办卡时，保证操作的卡片是同一张
+	std::string g_card_num;//用于办卡时，保证操作的卡片是同一张
 }
 ReadPINPadCmd::Reply ReadPINPadCmd::Execute(const std::string& input)
@@ -459,8 +456,8 @@ ReadPINPadCmd::Reply ActivateDILICardCmd::Execute(const std::string&amp; input)
 			break;
 		}
-		DILICard::BasicInfo stuCardBasicInfo;
-		try { stuCardBasicInfo = dili_card_device.ReadCardBasicInfo(); }
+		DILICard::BasicInfo card_basic_info;
+		try { card_basic_info = dili_card_device.ReadCardBasicInfo(); }
 		catch (std::exception& ex)
 		{
 			LOG_FATAL(L"读取卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
@@ -469,12 +466,12 @@ ReadPINPadCmd::Reply ActivateDILICardCmd::Execute(const std::string&amp; input)
 		}
 		LOG_TRACE(L"计算SN。");
-		card_sn = stuCardBasicInfo.chip_num + std::string("44494c49") + stuCardBasicInfo.chip_num;
+		card_sn = card_basic_info.chip_num + std::string("44494c49") + card_basic_info.chip_num;
 		if (slLevel == HardwareCmd::SL_0)
 		{
-			stuCardBasicInfo.device_id = card_sn;
-			card_basic_info = stuCardBasicInfo;
+			card_basic_info.device_id = card_sn;
+			card_basic_info = card_basic_info;
 			reply.error_code = StatusCode::OK;
 			break;
 		}
@@ -589,8 +586,6 @@ ReadPINPadCmd::Reply ActivateDILICardCmd::Execute(const std::string&amp; input)
 ReadPINPadCmd::Reply ResetDILICardCmd::Execute(const std::string& input)
 {
-	//const uint8_t BEEP_TIME = 20; // 20 * 10ms
-	
 	LOG_TRACE(L"卡片撤销激活。");
 	auto& dili_card_device = DILICardRWDevice();
@@ -642,8 +637,6 @@ ReadPINPadCmd::Reply ResetDILICardCmd::Execute(const std::string&amp; input)
 			break;
 		}
-		//card_sn = stuCardBasicInfo.device_id;
-
 		LOG_TRACE(L"计算SN。");
 		if (slLevel == HardwareCmd::SL_1)
 		{
@@ -798,7 +791,7 @@ ReadPINPadCmd::Reply ReadDILICardBasicInfoCmd::Execute(const std::string&amp; input)
 				reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
 				break;
 			}
-
+			card_basic_info.chip_type = "1";//cpu卡类型
 			if (SL_2 == ApplicationConfig::Instance().SecurityLevel())
 			{
@@ -869,7 +862,34 @@ ReadPINPadCmd::Reply ReadDILICardBasicInfoCmd::Execute(const std::string&amp; input)
 		//读取m1卡
 		do 
 		{
-			
+			//判断是否为cpu卡，以防CPU卡读卡失败
+			if (card_basic_info.chip_type.compare("1") == 0)
+			{
+				break;
+			}
+
+			if (0 != dili_card_device.M1FindCard())
+			{
+				reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD;
+				CString error;
+				error.Format(L"m1卡寻卡失败，错误信息：%d", reply.error_code);
+				LOG_FATAL(error.GetBuffer());
+				break;
+			}
+
+			try
+			{
+				card_basic_info = dili_card_device.M1ReadBasicInfo();
+			}
+			catch (std::exception& ex)
+			{
+				LOG_FATAL(L"m1卡读取基本信息失败，错误信息： " + str_2_wstr(ex.what()));
+				reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
+				break;
+			}
+			card_basic_info.chip_type = "2";//m1卡类型
+			card_basic_info.device_id = card_basic_info.chip_num;
+			reply.error_code = StatusCode::OK;
 		} while (0);
 	} while (0);
@@ -882,7 +902,10 @@ ReadPINPadCmd::Reply ReadDILICardBasicInfoCmd::Execute(const std::string&amp; input)
 	reply.data.put("type", card_basic_info.type_code);
 	reply.data.put("issuerCode", card_basic_info.issuer_code);
 	reply.data.put("verifyCode", card_basic_info.verify_code);
-	g_sCardNum = card_basic_info.device_id;
+	reply.data.put("subType", card_basic_info.sub_type);
+	reply.data.put("makerVersion", card_basic_info.maker_version);
+	reply.data.put("chipType", card_basic_info.chip_type);
+	g_card_num = card_basic_info.device_id;
 	return reply;
 }
@@ -928,8 +951,8 @@ ReadPINPadCmd::Reply ReadDILICardServiceInfoCmd::Execute(const std::string&amp; inpu
 			break;
 		}
-		DILICard::BasicInfo stuCardBasicInfo;
-		try { stuCardBasicInfo = dili_card_device.ReadCardBasicInfo(); }
+		DILICard::BasicInfo card_basic_info;
+		try { card_basic_info = dili_card_device.ReadCardBasicInfo(); }
 		catch (std::exception& ex)
 		{
 			LOG_FATAL(L"读取卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
@@ -941,11 +964,11 @@ ReadPINPadCmd::Reply ReadDILICardServiceInfoCmd::Execute(const std::string&amp; inpu
 		std::string sSN;
 		if (slLevel == HardwareCmd::SL_1)
 		{
-			sSN = stuCardBasicInfo.device_id;
+			sSN = card_basic_info.device_id;
 		}
 		else if (slLevel == HardwareCmd::SL_2)
 		{
-			sSN = stuCardBasicInfo.chip_num + "44494c49" + stuCardBasicInfo.chip_num;
+			sSN = card_basic_info.chip_num + "44494c49" + card_basic_info.chip_num;
 		}
 		if (etEncrypType == ET_PWM)
@@ -1015,14 +1038,13 @@ ReadPINPadCmd::Reply ReadDILICardServiceInfoCmd::Execute(const std::string&amp; inpu
 ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string& input)
 {
 	const char DATA_SPLITER = ':';
-	SecurityLevel slLevel = (SecurityLevel)ApplicationConfig::Instance().SecurityLevel();
-	EncryptType etEncrypType = (EncryptType)ApplicationConfig::Instance().EncryptType();
+	SecurityLevel secu_level = (SecurityLevel)ApplicationConfig::Instance().SecurityLevel();
+	EncryptType encrypt_type = (EncryptType)ApplicationConfig::Instance().EncryptType();
 	LOG_TRACE(L"写入卡片业务信息。");
 	auto& dili_card_device = DILICardRWDevice();
 	Reply reply;
-	//std::string card_sn;
 	std::string key_w;
 	do
 	{
@@ -1038,7 +1060,7 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string&amp; inp
 		}
 		//安全等级都为0了，还写个毛的业务信息，直接返回！
-		if (slLevel == HardwareCmd::SL_0)
+		if (secu_level == HardwareCmd::SL_0)
 		{
 			reply.error_code == StatusCode::OK;
 			LOG_TRACE(L"读取卡片业务信息成功。");
@@ -1056,25 +1078,24 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string&amp; inp
 			break;
 		}
-		DILICard::BasicInfo stuCardBasicInfo;
-		try { stuCardBasicInfo = dili_card_device.ReadCardBasicInfo(); }
+		DILICard::BasicInfo card_basic_info;
+		try { card_basic_info = dili_card_device.ReadCardBasicInfo(); }
 		catch (std::exception& ex)
 		{
 			LOG_FATAL(L"读取卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
 			reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
 			break;
 		}
-		//card_sn = stuCardBasicInfo.device_id;
 		LOG_TRACE(L"计算SN。");
 		std::string sSN;
-		if (slLevel == HardwareCmd::SL_1)
+		if (secu_level == HardwareCmd::SL_1)
 		{
-			sSN = stuCardBasicInfo.device_id;
+			sSN = card_basic_info.device_id;
 		}
-		else if (slLevel == HardwareCmd::SL_2)
+		else if (secu_level == HardwareCmd::SL_2)
 		{
-			sSN = stuCardBasicInfo.chip_num + "44494c49" + stuCardBasicInfo.chip_num;
+			sSN = card_basic_info.chip_num + "44494c49" + card_basic_info.chip_num;
 		}
@@ -1085,7 +1106,7 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string&amp; inp
 			reply.error_code = StatusCode::DILI_CARD_DEVICE_WRITE_SERVICE_INFO_FAILED;
 			break;
 		}
-		std::string device_id = g_sCardNum;//用于办卡时，保证操作的卡片是同一张;
+		std::string device_id = g_card_num;//用于办卡时，保证操作的卡片是同一张;
 		std::string service_data = input.substr(index + 1, input.size() - index - 1);
 		// 验证操作的是否是同一张卡，即device_id是否匹配
@@ -1096,7 +1117,7 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string&amp; inp
 			break;
 		}
-		if (etEncrypType == ET_PWM)
+		if (encrypt_type == ET_PWM)
 		{
 			LOG_TRACE(L"加密机模式计算主控秘钥。");
 			auto& pwd_machine = PWDMachine_();
@@ -1122,7 +1143,7 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string&amp; inp
 			pwd_machine.Disconnect();
 		}
-		else if (etEncrypType == ET_DES)
+		else if (encrypt_type == ET_DES)
 		{
 			LOG_TRACE(L"软加密模式计算15写秘钥。");
 			const char* pDAMKDL = "414d4b31414d4b31";
@@ -1151,8 +1172,6 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string&amp; inp
 			reply.error_code = StatusCode::DILI_CARD_DEVICE_WRITE_SERVICE_INFO_FAILED;
 			break;
 		}
-
-		
 	} while (0);
 	dili_card_device.Disconnect();
@@ -1194,3 +1213,86 @@ ReadPINPadCmd::Reply ReadBankCardNumCmd::Execute(const std::string&amp; input)
 	reply.data.put("chipNo", bank_card_no);
 	return reply;
 }
+
+ReadPINPadCmd::Reply ActivateDILIM1CardCmd::Execute(const std::string& input)
+{
+	LOG_TRACE(L"m1卡入库。");
+	Reply reply;
+	DILICard::BasicInfo card_basic_info;
+
+	auto& dili_card_device = DILICardRWDevice();
+
+	do 
+	{
+		try
+		{
+			dili_card_device.Connect();
+		}
+		catch (std::exception& ex)
+		{
+			LOG_FATAL(L"连接读卡器失败，错误信息： " + str_2_wstr(ex.what()));
+			reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED;
+			break;
+		}
+
+		int error_code = dili_card_device.M1FindCard();
+		if (error_code)
+		{
+			CString error;
+			error.Format(L"m1卡寻卡失败，错误信息： %d", error_code);
+			LOG_FATAL(error.GetBuffer());
+			reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD;
+			break;
+		}
+
+		try
+		{
+			namespace PT = boost::property_tree;
+			PT::ptree ptree;
+			std::stringstream ss;
+			ss << input;
+			PT::read_json(ss, ptree);
+			card_basic_info.chip_num = ptree.get<std::string>("chipNo");
+			card_basic_info.type_code = ptree.get<std::string>("type");
+			card_basic_info.issuer_code = ptree.get<std::string>("issuerCode");
+			card_basic_info.verify_code = ptree.get<std::string>("verifyCode");
+			card_basic_info.sub_type = ptree.get<std::string>("subType");
+			card_basic_info.maker_version = ptree.get<std::string>("makerVersion");
+			card_basic_info.device_id = ptree.get<std::string>("deviceId");
+		}
+		catch (std::exception& ex)
+		{
+			LOG_FATAL(L"解析服务器数据失败。");
+			reply.error_code = StatusCode::DILI_CARD_DEVICE_PARSE_SEVER_DATA_FAILED;
+			break;
+		}
+		
+
+		error_code = dili_card_device.M1WriteBasicInfo(card_basic_info.chip_num, card_basic_info.type_code, card_basic_info.issuer_code,\
+			card_basic_info.verify_code, card_basic_info.sub_type, card_basic_info.maker_version);
+		if (error_code)
+		{
+			CString error;
+			error.Format(L"m1卡初始化失败，错误信息： %d", error_code);
+			LOG_FATAL(error.GetBuffer());
+			reply.error_code = StatusCode::DILI_CARD_DEVICE_ACTIVATE_CARD_FAILED;
+			break;
+		}
+		card_basic_info.chip_type = "2"; //m1卡类型
+	} while (0);
+
+	dili_card_device.Disconnect();
+	if (boost::iequals(reply.error_code, StatusCode::OK))
+		LOG_TRACE(L"卡片激活成功。");
+
+	reply.data.put("chipNo", card_basic_info.chip_num);
+	reply.data.put("deviceId", card_basic_info.device_id);
+	reply.data.put("type", card_basic_info.type_code);
+	reply.data.put("issuerCode", card_basic_info.issuer_code);
+	reply.data.put("verifyCode", card_basic_info.verify_code);
+	reply.data.put("subType", card_basic_info.sub_type);
+	reply.data.put("makerVersion", card_basic_info.maker_version);
+	reply.data.put("chipType", card_basic_info.chip_type);
+	return reply;
+
+}
 \ No newline at end of file
@@ -86,4 +86,10 @@ class ReadBankCardNumCmd : public HardwareCmd
 public:
 	virtual Reply Execute(const std::string& input) override;
 };
+
+class ActivateDILIM1CardCmd : public HardwareCmd
+{
+public:
+	virtual Reply Execute(const std::string& input) override;
+};
 #endif // ETRADECLIENT_HARDWARE_HARDWARE_CMD_H_INCLUDED