同步arm修改
This commit is contained in:
@@ -45,10 +45,10 @@
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
extern char* OSS_ENDPOINT;
|
||||
extern char* ACCESS_KEY_ID;
|
||||
extern char* ACCESS_KEY_SECRET;
|
||||
extern char* BUCKET_NAME;
|
||||
//extern char* OSS_ENDPOINT;
|
||||
//extern char* ACCESS_KEY_ID;
|
||||
//extern char* ACCESS_KEY_SECRET;
|
||||
//extern char* BUCKET_NAME;
|
||||
|
||||
extern char* POSTGRES_SCHEMA;
|
||||
extern char* POSTGRES_TABLEPREFIX;
|
||||
@@ -105,10 +105,10 @@ void TestToken();
|
||||
void TestBodyPost();//WW 测试qt post
|
||||
void TestSMSPost();//WW 测试qt post
|
||||
void TestJson(char* szJson);
|
||||
void TestOSS();//WW 测试
|
||||
void PutOSS(char* File_Name, char* data); //zw修改 2023-9-7 上送oss文件
|
||||
void GetOSS(char* File_Name, char* savepath); //zw修改 2023-9-7 获取oss文件
|
||||
void DelOSS(char* File_Name);
|
||||
//void TestOSS();//WW 测试
|
||||
//void PutOSS(char* File_Name, char* data); //zw修改 2023-9-7 上送oss文件
|
||||
//void GetOSS(char* File_Name, char* savepath); //zw修改 2023-9-7 获取oss文件
|
||||
//void DelOSS(char* File_Name);
|
||||
void delete_object_new(char* File_Name);
|
||||
void coutTest();//CZY 2023-09-11 test
|
||||
void TestOBS();//WW 20230921 测试华为云服务器
|
||||
|
||||
@@ -2100,7 +2100,7 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
|
||||
memset(oss_file_fullname_cfg, 0, sizeof(oss_file_fullname_cfg));
|
||||
apr_snprintf(oss_file_fullname_cfg, sizeof(oss_file_fullname_cfg), "comtrade/wave/%s/%s", LD_info->mp_id, cfg_only_filename_ret);
|
||||
if (FILE_FLAG == 1) {
|
||||
PutOSS(oss_file_fullname_cfg, loc_file_fullname_cfg);//使用buffer推送文件
|
||||
//PutOSS(oss_file_fullname_cfg, loc_file_fullname_cfg);//使用buffer推送文件
|
||||
}
|
||||
else if (FILE_FLAG == 2) {
|
||||
OBSFile(loc_file_fullname_cfg, oss_file_fullname_cfg, "putObject");//这里并没有上传文件流
|
||||
@@ -2138,7 +2138,7 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
|
||||
memset(oss_file_fullname_dat, 0, sizeof(oss_file_fullname_dat));
|
||||
apr_snprintf(oss_file_fullname_dat, sizeof(oss_file_fullname_dat), "comtrade/wave/%s/%s", LD_info->mp_id, dat_only_filename_ret);
|
||||
if (FILE_FLAG == 1) {
|
||||
PutOSS(oss_file_fullname_dat, loc_file_fullname_dat);//使用buffer推送文件
|
||||
//PutOSS(oss_file_fullname_dat, loc_file_fullname_dat);//使用buffer推送文件
|
||||
}
|
||||
else if (FILE_FLAG == 2) {
|
||||
OBSFile(loc_file_fullname_dat, oss_file_fullname_dat, "putObject");//这里并没有上传文件流
|
||||
|
||||
Reference in New Issue
Block a user