diff --git a/HEZON_ITK/HEZON_ITK.vcxproj b/HEZON_ITK/HEZON_ITK.vcxproj index 41bc918..aa64509 100644 --- a/HEZON_ITK/HEZON_ITK.vcxproj +++ b/HEZON_ITK/HEZON_ITK.vcxproj @@ -129,7 +129,7 @@ true true WIN32;NDEBUG;_CONSOLE;IPLIB=none;%(PreprocessorDefinitions) - C:\work\include12_2;C:\work\include_cpp12_2;C:\Java\jdk1.8.0_231\include\win32;C:\Java\jdk1.8.0_231\include;%(AdditionalIncludeDirectories) + C:\work\include12_1;C:\work\include_cpp12_1;C:\Java\jdk1.8.0_231\include\win32;C:\Java\jdk1.8.0_231\include;%(AdditionalIncludeDirectories) Cdecl @@ -139,7 +139,7 @@ true - C:\work\lib12_2\*.lib;%(AdditionalDependencies) + C:\work\lib12_1\*.lib;%(AdditionalDependencies) libuser_exits.ar.lib;%(IgnoreSpecificDefaultLibraries) $(OutDir)\bs.dll /FORCE %(AdditionalOptions) diff --git a/HEZON_ITK/epm_handler_common.h b/HEZON_ITK/epm_handler_common.h index e04da47..766928a 100644 --- a/HEZON_ITK/epm_handler_common.h +++ b/HEZON_ITK/epm_handler_common.h @@ -44,6 +44,7 @@ int bs_wl_check(EPM_rule_message_t msg); int bs_bom_save_check(METHOD_message_t *msg, va_list args); int bs_sign_cad(EPM_action_message_t msg); int jd_signoff(EPM_action_message_t msg); +int bs_bypass(void *retValType); ////将流程信息签入版本属性上去 //int qtmc_sign_ir(EPM_action_message_t msg); diff --git a/HEZON_ITK/epm_register_handler.cxx b/HEZON_ITK/epm_register_handler.cxx index 36ed1bb..12d6cc1 100644 --- a/HEZON_ITK/epm_register_handler.cxx +++ b/HEZON_ITK/epm_register_handler.cxx @@ -159,6 +159,20 @@ extern DLLAPI int USERSERVICE_custom_register_methods() printf("register bomwindow_save failed\n"); } + + int numberOfArguments = 1, + returnValueType = USERARG_STRING_TYPE, + *argumentList = (int*)MEM_alloc(numberOfArguments * sizeof(int)); + argumentList[0] = USERARG_LOGICAL_TYPE;; + USER_function_t functionPtr; + functionPtr = bs_bypass; + status = USERSERVICE_register_method("bs_bypass", functionPtr, numberOfArguments, argumentList, returnValueType); + if (status == ITK_ok) { + printf("register bs_bypass success\n"); + } else { + printf("register bs_bypass failed\n"); + + } } return 0; diff --git a/HEZON_ITK/jd_clear_field.cpp b/HEZON_ITK/jd_clear_field.cpp index a4a7d8d..552fd31 100644 --- a/HEZON_ITK/jd_clear_field.cpp +++ b/HEZON_ITK/jd_clear_field.cpp @@ -105,7 +105,7 @@ #define MKDIR(path) mkdir(path,S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) #endif -#define LOCALJARPATH "D:\\Siemens\\Teamcenter11\\bin\\tc_extra_jar\\" +#define LOCALJARPATH "D:\\Siemens\\Teamcenter12\\bin\\tc_extra_jar\\" #define REMOTEJARPATH "D:\\app\\Siemens\\Teamcenter12\\bin\\tc_extra_jar\\" //#include @@ -201,9 +201,9 @@ extern "C" { */ static int sign(JNIEnv* env, jclass class_Test, const char* path, char* name, char* sign_location, char* sign_str) { printf("signin\n"); - jmethodID methodId_main = env->GetStaticMethodID(class_Test, "sign", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String)I"); + jmethodID methodId_main = env->GetStaticMethodID(class_Test, "sign", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I"); if (methodId_main == NULL) { - printf("error\n"); + printf("error, check jar location\n"); return 0; } string path1 = GBKToUTF8(path); @@ -214,7 +214,7 @@ extern "C" { jstring jname = env->NewStringUTF(name1.c_str()); jstring jsign_location = env->NewStringUTF(sign_location1.c_str()); jstring jsign_str = env->NewStringUTF(sign_str1.c_str()); - printf("path:%s,name:%s,sign_location:%s\n,sign_str:%s\n", path1.c_str(), name1.c_str(), sign_location1.c_str(), sign_str1.c_str()); + printf("path:%s\nname:%s\nsign_location:%s\nsign_str:%s\n", path1.c_str(), name1.c_str(), sign_location1.c_str(), sign_str1.c_str()); jint result = 0; result = env->CallStaticIntMethod(class_Test, methodId_main, jpath, jname, jsign_location, jsign_str); int res = result; @@ -359,7 +359,6 @@ extern "C" { temps << pref_values1[i]; temps << ","; } - sign_str = temps.str().c_str(); //琛ㄥ崟绛惧悕 for (auto iii = 0; iii < objects_count; iii++) { AOM_lock(objects[iii]); @@ -411,13 +410,13 @@ extern "C" { printf("file_type:%d\n", file_type); if (file_type == 0) { class_Test = env->FindClass("sign2file/SignToWord"); - int res = sign(env, class_Test, ss.str().c_str(), "", "clear", (char*)sign_str); + int res = sign(env, class_Test, ss.str().c_str(), "", "clear", (char*)temps.str().c_str()); if (res) { replace_dataset_named_reference(dataset[i], word_ref, ss.str().c_str(), "word"); } } else if (file_type == 1) { class_Test = env->FindClass("sign2file/SignToExcel"); - int res = sign(env, class_Test, ss.str().c_str(), "", "clear", (char*)sign_str); + int res = sign(env, class_Test, ss.str().c_str(), "", "clear", (char*)temps.str().c_str()); if (res) { replace_dataset_named_reference(dataset[i], excel_ref, ss.str().c_str(), "excel"); } @@ -455,13 +454,13 @@ extern "C" { printf("file_type:%d\n", file_type); if (file_type == 0) { class_Test = env->FindClass("sign2file/SignToWord"); - int res = sign(env, class_Test, ss.str().c_str(), "", "clear", (char*)sign_str); + int res = sign(env, class_Test, ss.str().c_str(), "", "clear", (char*)temps.str().c_str()); if (res) { replace_dataset_named_reference(dataset[i], word_ref, ss.str().c_str(), "word"); } } else if (file_type == 1) { class_Test = env->FindClass("sign2file/SignToExcel"); - int res = sign(env, class_Test, ss.str().c_str(), "", "clear", (char*)sign_str); + int res = sign(env, class_Test, ss.str().c_str(), "", "clear", (char*)temps.str().c_str()); if (res) { replace_dataset_named_reference(dataset[i], excel_ref, ss.str().c_str(), "excel"); } diff --git a/HEZON_ITK/jd_signoff.cpp b/HEZON_ITK/jd_signoff.cpp index 1da2d4f..43d7a45 100644 --- a/HEZON_ITK/jd_signoff.cpp +++ b/HEZON_ITK/jd_signoff.cpp @@ -62,6 +62,8 @@ #include #define MAX_PATH_LEN 256 +#define GUID_LEN 64 + #ifdef WIN32 #define ACCESS(fileName,accessMode) _access(fileName,accessMode) #define MKDIR(path) _mkdir(path) @@ -70,7 +72,7 @@ #define MKDIR(path) mkdir(path,S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) #endif -#define LOCALJARPATH "D:\\Siemens\\Teamcenter11\\bin\\tc_extra_jar\\" +#define LOCALJARPATH "D:\\Siemens\\Teamcenter12\\bin\\tc_extra_jar\\" #define REMOTEJARPATH "D:\\app\\Siemens\\Teamcenter12\\bin\\tc_extra_jar\\" using namespace std; @@ -96,6 +98,7 @@ int32_t createDirectory(const std::string &directoryPath) { return 0; } + static void replace_dataset_named_reference(tag_t dataset_tag, tag_t old_file, const char *new_file_path, char *ref_name) { IMF_file_data_p_t file_data; @@ -162,9 +165,9 @@ string GBKToUTF8(const char* strGBK) */ static int sign(JNIEnv* env, jclass class_Test,const char* path, char* name, char* sign_location, char* sign_str) { printf("signin\n"); - jmethodID methodId_main = env->GetStaticMethodID(class_Test, "sign", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String)I"); + jmethodID methodId_main = env->GetStaticMethodID(class_Test, "sign", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I"); if (methodId_main==NULL) { - printf("error\n"); + printf("error, check jar location\n"); return 0; } string path1 = GBKToUTF8(path); @@ -175,7 +178,7 @@ static int sign(JNIEnv* env, jclass class_Test,const char* path, char* name, cha jstring jname = env->NewStringUTF(name1.c_str()); jstring jsign_location = env->NewStringUTF(sign_location1.c_str()); jstring jsign_str = env->NewStringUTF(sign_str1.c_str()); - printf("path:%s,name:%s,sign_location:%s\n,sign_str:%s\n", path1.c_str(), name1.c_str(), sign_location1.c_str(),sign_str1.c_str()); + printf("path:%s\nname:%s\nsign_location:%s\nsign_str:%s\n", path1.c_str(), name1.c_str(), sign_location1.c_str(),sign_str1.c_str()); jint result = 0; result = env->CallStaticIntMethod(class_Test, methodId_main, jpath, jname, jsign_location, jsign_str); int res = result; @@ -216,12 +219,26 @@ int jd_signoff(EPM_action_message_t msg) { time(&t); tm* time = localtime(&t); stringstream date; - date << time->tm_year + 1900 << "-"; - date << time->tm_mon + 1 << "-"; - date << time->tm_mday << "-"; - date << time->tm_hour << "-"; - date << time->tm_min << "-"; - date << time->tm_sec; + date << time->tm_year + 1900 << "."; + date << time->tm_mon + 1 << "."; + date << time->tm_mday ; + + //鑾峰彇guid + //鑾峰彇guid + char buffer[GUID_LEN] = { 0 }; + GUID guid; + + if (CoCreateGuid(&guid)) { + fprintf(stderr, "create guid error\n"); + return NULL; + } + _snprintf(buffer, sizeof(buffer), + "%08X-%04X-%04x-%02X%02X-%02X%02X%02X%02X%02X%02X", + guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], + guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + printf("guid: %s\n", buffer); //鑾峰彇鏁版嵁闆 @@ -280,7 +297,6 @@ int jd_signoff(EPM_action_message_t msg) { if (!flag) { return -1; } - sign_str = temps.str().c_str(); //鍒涘缓tc_export鐩綍 stringstream dir; @@ -436,7 +452,7 @@ int jd_signoff(EPM_action_message_t msg) { ITKCALL(AE_ask_dataset_named_ref2(dataset[i], "word", &ae_ref, &word_ref)); char *file_name; ITKCALL(AOM_UIF_ask_value(word_ref, "file_name", &file_name)); - ss << date.str().c_str(); + ss << buffer; ss << "_"; ss << file_name; printf("path:%s\n", ss.str().c_str()); @@ -446,7 +462,7 @@ int jd_signoff(EPM_action_message_t msg) { ITKCALL(AE_ask_dataset_named_ref2(dataset[i], "excel", &ae_ref, &excel_ref)); char *file_name; ITKCALL(AOM_UIF_ask_value(excel_ref, "file_name", &file_name)); - ss << date.str().c_str(); + ss << buffer; ss << "_"; ss << file_name; printf("path:%s\n", ss.str().c_str()); @@ -457,13 +473,13 @@ int jd_signoff(EPM_action_message_t msg) { printf("file_type:%d\n", file_type); if (file_type == 0) { class_Test = env->FindClass("sign2file/SignToWord"); - int res = sign(env, class_Test, ss.str().c_str(), user_name, (char*)sign_location, (char*)sign_str); + int res = sign(env, class_Test, ss.str().c_str(), user_name, (char*)sign_location, (char*)temps.str().c_str()); if (res) { replace_dataset_named_reference(dataset[i], word_ref, ss.str().c_str(), "word"); } } else if (file_type == 1) { class_Test = env->FindClass("sign2file/SignToExcel"); - int res = sign(env, class_Test, ss.str().c_str(), user_name, (char*)sign_location, (char*)sign_str); + int res = sign(env, class_Test, ss.str().c_str(), user_name, (char*)sign_location, (char*)temps.str().c_str()); if (res) { replace_dataset_named_reference(dataset[i], excel_ref, ss.str().c_str(), "excel"); } @@ -480,7 +496,7 @@ int jd_signoff(EPM_action_message_t msg) { ITKCALL(AE_ask_dataset_named_ref2(dataset[i], "word", &ae_ref, &word_ref)); char *file_name; ITKCALL(AOM_UIF_ask_value(word_ref, "file_name", &file_name)); - ss << date.str().c_str(); + ss << buffer; ss << "_"; ss << file_name; printf("path:%s\n", ss.str().c_str()); @@ -490,7 +506,7 @@ int jd_signoff(EPM_action_message_t msg) { ITKCALL(AE_ask_dataset_named_ref2(dataset[i], "excel", &ae_ref, &excel_ref)); char *file_name; ITKCALL(AOM_UIF_ask_value(excel_ref, "file_name", &file_name)); - ss << date.str().c_str(); + ss << buffer; ss << "_"; ss << file_name; printf("path:%s\n", ss.str().c_str()); @@ -501,13 +517,13 @@ int jd_signoff(EPM_action_message_t msg) { printf("file_type:%d\n", file_type); if (file_type == 0) { class_Test = env->FindClass("sign2file/SignToWord"); - int res = sign(env, class_Test, ss.str().c_str(), user_name, (char*)sign_location, (char*)sign_str); + int res = sign(env, class_Test, ss.str().c_str(), user_name, (char*)sign_location, (char*)temps.str().c_str()); if (res) { replace_dataset_named_reference(dataset[i], word_ref, ss.str().c_str(), "word"); } } else if (file_type == 1) { class_Test = env->FindClass("sign2file/SignToExcel"); - int res = sign(env, class_Test, ss.str().c_str(), user_name, (char*)sign_location, (char*)sign_str); + int res = sign(env, class_Test, ss.str().c_str(), user_name, (char*)sign_location, (char*)temps.str().c_str()); if (res) { replace_dataset_named_reference(dataset[i], excel_ref, ss.str().c_str(), "excel"); } diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.log b/HEZON_ITK/x64/Release/HEZON_ITK.log index 5bf2978..f0ecaaa 100644 --- a/HEZON_ITK/x64/Release/HEZON_ITK.log +++ b/HEZON_ITK/x64/Release/HEZON_ITK.log @@ -1,68 +1,48 @@ -锘 bs_bom_check.cpp -c1xx : fatal error C1083: 鏃犳硶鎵撳紑婧愭枃浠: 鈥渂s_bom_check.cpp鈥: No such file or directory - bs_bom_save_check.cpp -c1xx : fatal error C1083: 鏃犳硶鎵撳紑婧愭枃浠: 鈥渂s_bom_save_check.cpp鈥: No such file or directory - bs_bypass.cpp -C:\work\include12_2\pom/pom/pom.h(806): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -C:\work\include12_2\pom/pom/pom.h(5417): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 - bs_file_transfer.cpp -C:\work\include12_2\pom/pom/pom.h(806): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -C:\work\include12_2\pom/pom/pom.h(5417): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 - bs_sap.cpp -bs_sap.cpp(1): fatal error C1083: 鏃犳硶鎵撳紑鍖呮嫭鏂囦欢: 鈥渦til.h鈥: No such file or directory - bs_signoff.cxx -C:\work\include12_2\pom/pom/pom.h(806): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -C:\work\include12_2\pom/pom/pom.h(5417): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -bs_signoff.cxx(63): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. - C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\time.h(505): note: 鍙傝鈥渓ocaltime鈥濈殑澹版槑 - bs_sign_cad.cpp -c1xx : fatal error C1083: 鏃犳硶鎵撳紑婧愭枃浠: 鈥渂s_sign_cad.cpp鈥: No such file or directory - bs_wl_check.cpp -c1xx : fatal error C1083: 鏃犳硶鎵撳紑婧愭枃浠: 鈥渂s_wl_check.cpp鈥: No such file or directory - epm_register_handler.cxx -epm_register_handler.cxx(50): warning C4101: 鈥渘ow鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -epm_register_handler.cxx(49): warning C4101: 鈥渆xpire_date鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -epm_register_handler.cxx(49): warning C4101: 鈥渄ate_buf鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -epm_register_handler.cxx(51): warning C4101: 鈥減鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 - bs_custom_main.cxx - jd_clear_field.cpp -C:\work\include12_2\pom/pom/pom.h(806): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -C:\work\include12_2\pom/pom/pom.h(5417): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +锘 jd_clear_field.cpp +C:\work\include12_1\pom/pom/pom.h(816): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\pom/pom/pom.h(5420): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\qry/qry.h(591): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\qry/qry.h(591): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 jd_clear_field.cpp(119): warning C4267: 鈥滃垵濮嬪寲鈥: 浠庘渟ize_t鈥濊浆鎹㈠埌鈥渦int32_t鈥濓紝鍙兘涓㈠け鏁版嵁 jd_clear_field.cpp(181): warning C4190: 鈥淕BKToUTF8鈥濇湁鎸囧畾鐨 C 閾炬帴锛屼絾杩斿洖浜嗕笌 C 涓嶅吋瀹圭殑 UDT鈥渟td::basic_string,std::allocator>鈥 C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xstring(2633): note: 鍙傝鈥渟td::basic_string,std::allocator>鈥濈殑澹版槑 -jd_clear_field.cpp(251): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. +jd_clear_field.cpp(255): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\stdlib.h(1183): note: 鍙傝鈥済etenv鈥濈殑澹版槑 -jd_clear_field.cpp(271): warning C4996: '_snprintf': This function or variable may be unsafe. Consider using _snprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. +jd_clear_field.cpp(275): warning C4996: '_snprintf': This function or variable may be unsafe. Consider using _snprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\stdio.h(1952): note: 鍙傝鈥淿snprintf鈥濈殑澹版槑 -jd_clear_field.cpp(283): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. +jd_clear_field.cpp(287): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\stdlib.h(1183): note: 鍙傝鈥済etenv鈥濈殑澹版槑 -jd_clear_field.cpp(285): warning C4477: 鈥減rintf鈥: 鏍煎紡瀛楃涓测%s鈥濋渶瑕佺被鍨嬧渃har *鈥濈殑鍙傛暟锛屼絾鍙彉鍙傛暟 1 鎷ユ湁浜嗙被鍨嬧渃onst wchar_t *鈥 - jd_clear_field.cpp(285): note: 璇疯冭檻鍦ㄦ牸寮忓瓧绗︿覆涓娇鐢ㄢ%ls鈥 - jd_clear_field.cpp(285): note: 璇疯冭檻鍦ㄦ牸寮忓瓧绗︿覆涓娇鐢ㄢ%lls鈥 - jd_clear_field.cpp(285): note: 璇疯冭檻鍦ㄦ牸寮忓瓧绗︿覆涓娇鐢ㄢ%Ls鈥 - jd_clear_field.cpp(285): note: 璇疯冭檻鍦ㄦ牸寮忓瓧绗︿覆涓娇鐢ㄢ%ws鈥 -jd_clear_field.cpp(245): warning C4101: 鈥渞ev_attachments鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -jd_clear_field.cpp(244): warning C4101: 鈥渞ef_obj鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -jd_clear_field.cpp(242): warning C4101: 鈥渁ttach_type鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -jd_clear_field.cpp(492): warning C4101: 鈥渆rr_function鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -jd_clear_field.cpp(492): warning C4101: 鈥渆rr_string鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_clear_field.cpp(289): warning C4477: 鈥減rintf鈥: 鏍煎紡瀛楃涓测%s鈥濋渶瑕佺被鍨嬧渃har *鈥濈殑鍙傛暟锛屼絾鍙彉鍙傛暟 1 鎷ユ湁浜嗙被鍨嬧渃onst wchar_t *鈥 + jd_clear_field.cpp(289): note: 璇疯冭檻鍦ㄦ牸寮忓瓧绗︿覆涓娇鐢ㄢ%ls鈥 + jd_clear_field.cpp(289): note: 璇疯冭檻鍦ㄦ牸寮忓瓧绗︿覆涓娇鐢ㄢ%lls鈥 + jd_clear_field.cpp(289): note: 璇疯冭檻鍦ㄦ牸寮忓瓧绗︿覆涓娇鐢ㄢ%Ls鈥 + jd_clear_field.cpp(289): note: 璇疯冭檻鍦ㄦ牸寮忓瓧绗︿覆涓娇鐢ㄢ%ws鈥 +jd_clear_field.cpp(244): warning C4101: 鈥渟ign_location1鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_clear_field.cpp(249): warning C4101: 鈥渞ev_attachments鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_clear_field.cpp(247): warning C4101: 鈥渞ef_obj鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_clear_field.cpp(245): warning C4101: 鈥渁ttach_type鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_clear_field.cpp(244): warning C4101: 鈥渟ign_str鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_clear_field.cpp(504): warning C4101: 鈥渆rr_function鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_clear_field.cpp(504): warning C4101: 鈥渆rr_string鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 jd_signoff.cpp -C:\work\include12_2\pom/pom/pom.h(806): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -C:\work\include12_2\pom/pom/pom.h(5417): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -jd_signoff.cpp(80): warning C4267: 鈥滃垵濮嬪寲鈥: 浠庘渟ize_t鈥濊浆鎹㈠埌鈥渦int32_t鈥濓紝鍙兘涓㈠け鏁版嵁 -jd_signoff.cpp(213): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. +C:\work\include12_1\pom/pom/pom.h(816): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\pom/pom/pom.h(5420): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\qry/qry.h(591): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\qry/qry.h(591): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +jd_signoff.cpp(82): warning C4267: 鈥滃垵濮嬪寲鈥: 浠庘渟ize_t鈥濊浆鎹㈠埌鈥渦int32_t鈥濓紝鍙兘涓㈠け鏁版嵁 +jd_signoff.cpp(220): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\time.h(505): note: 鍙傝鈥渓ocaltime鈥濈殑澹版槑 -jd_signoff.cpp(233): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. +jd_signoff.cpp(235): warning C4996: '_snprintf': This function or variable may be unsafe. Consider using _snprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. + C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\stdio.h(1952): note: 鍙傝鈥淿snprintf鈥濈殑澹版槑 +jd_signoff.cpp(254): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\stdlib.h(1183): note: 鍙傝鈥済etenv鈥濈殑澹版槑 -jd_signoff.cpp(309): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. +jd_signoff.cpp(353): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\stdlib.h(1183): note: 鍙傝鈥済etenv鈥濈殑澹版槑 -jd_signoff.cpp(209): warning C4101: 鈥渧erdict鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -jd_signoff.cpp(227): warning C4101: 鈥渞ev_attachments鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -jd_signoff.cpp(226): warning C4101: 鈥渞ef_obj鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -jd_signoff.cpp(224): warning C4101: 鈥渁ttach_type鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 - util.cpp -c1xx : fatal error C1083: 鏃犳硶鎵撳紑婧愭枃浠: 鈥渦til.cpp鈥: No such file or directory +jd_signoff.cpp(214): warning C4101: 鈥渧erdict鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_signoff.cpp(248): warning C4101: 鈥渞ev_attachments鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_signoff.cpp(247): warning C4101: 鈥渞ef_obj鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_signoff.cpp(245): warning C4101: 鈥渁ttach_type鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 +jd_signoff.cpp(209): warning C4101: 鈥渟ign_str鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 姝ｅ湪鐢熸垚浠ｇ爜... c:\java\jdk1.8.0_231\include\jni.h(1442): warning C4793: 鈥淛NIEnv_::CallStaticIntMethod鈥: 缂栬瘧涓烘湰鏈虹殑鍑芥暟: /clr 涓嬩笉鏀寔 varargs @@ -88,9 +68,9 @@ c:\java\jdk1.8.0_231\include\jni.h(1053): warning C4793: 鈥淛NIEnv_::CallVoidMet 鎵樼浠ｇ爜涓彂鐜颁竴涓笉鍙楁敮鎸佺殑鍐呴儴鍑芥暟 c:\java\jdk1.8.0_231\include\jni.h(1055): warning C4793: 鈥淛NIEnv_::CallVoidMethod鈥: 缂栬瘧涓烘湰鏈虹殑鍑芥暟: 鎵樼浠ｇ爜涓彂鐜颁竴涓笉鍙楁敮鎸佺殑鍐呴儴鍑芥暟 -c:\work\vs_workspace\jditk\hezon_itk\jd_clear_field.cpp(468): warning C4793: 鈥淛D_Revise_clear鈥: 缂栬瘧涓烘湰鏈虹殑鍑芥暟: +c:\work\vs_workspace\jditk\hezon_itk\jd_clear_field.cpp(480): warning C4793: 鈥淛D_Revise_clear鈥: 缂栬瘧涓烘湰鏈虹殑鍑芥暟: 鎵樼浠ｇ爜涓彂鐜颁竴涓笉鍙楁敮鎸佺殑鍐呴儴鍑芥暟 -c:\work\vs_workspace\jditk\hezon_itk\jd_clear_field.cpp(469): warning C4793: 鈥淛D_Revise_clear鈥: 缂栬瘧涓烘湰鏈虹殑鍑芥暟: +c:\work\vs_workspace\jditk\hezon_itk\jd_clear_field.cpp(481): warning C4793: 鈥淛D_Revise_clear鈥: 缂栬瘧涓烘湰鏈虹殑鍑芥暟: 鎵樼浠ｇ爜涓彂鐜颁竴涓笉鍙楁敮鎸佺殑鍐呴儴鍑芥暟 c:\java\jdk1.8.0_231\include\jni.h(1442): warning C4793: 鈥淛NIEnv_::CallStaticIntMethod鈥: 缂栬瘧涓烘湰鏈虹殑鍑芥暟: /clr 涓嬩笉鏀寔 varargs @@ -116,3 +96,14 @@ c:\java\jdk1.8.0_231\include\jni.h(1053): warning C4793: 鈥淛NIEnv_::CallVoidMet 鎵樼浠ｇ爜涓彂鐜颁竴涓笉鍙楁敮鎸佺殑鍐呴儴鍑芥暟 c:\java\jdk1.8.0_231\include\jni.h(1055): warning C4793: 鈥淛NIEnv_::CallVoidMethod鈥: 缂栬瘧涓烘湰鏈虹殑鍑芥暟: 鎵樼浠ｇ爜涓彂鐜颁竴涓笉鍙楁敮鎸佺殑鍐呴儴鍑芥暟 +C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppBuild.targets(1189,5): warning MSB8012: TargetPath(C:\work\vs_workspace\jditk\x64\Release\HEZON_ITK.dll) does not match the Linker's OutputFile property value (C:\work\vs_workspace\jditk\x64\Release\bs.dll). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile). +C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppBuild.targets(1191,5): warning MSB8012: TargetName(HEZON_ITK) does not match the Linker's OutputFile property value (bs). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile). +util.obj : warning LNK4006: "bool __cdecl isTypeOf(unsigned int,char const *)" (?isTypeOf@@$$FYA_NIPEBD@Z) 宸插湪 jd_signoff.obj 涓畾涔夛紱宸插拷鐣ョ浜屼釜瀹氫箟 +util.obj : warning LNK4006: "bool __cdecl isTypeOf(unsigned int,char const *)" (?isTypeOf@@YA_NIPEBD@Z) 宸插湪 jd_signoff.obj 涓畾涔夛紱宸插拷鐣ョ浜屼釜瀹氫箟 +MSVCRT.lib(default_local_stdio_options.obj) : warning LNK4006: __local_stdio_printf_options 宸插湪 libassy_jt.lib(libassy_jt.dll) 涓畾涔夛紱宸插拷鐣ョ浜屼釜瀹氫箟 + 姝ｅ湪鍒涘缓搴 C:\work\vs_workspace\jditk\x64\Release\\bs.lib 鍜屽璞 C:\work\vs_workspace\jditk\x64\Release\\bs.exp +jd_signoff.obj : warning LNK4248: 鏃犳硶瑙ｆ瀽 typeref 鏍囪(01000016)(涓衡淿jmethodID鈥)锛涙槧鍍忓彲鑳芥棤娉曡繍琛 +jd_clear_field.obj : warning LNK4248: 鏃犳硶瑙ｆ瀽 typeref 鏍囪(01000017)(涓衡淿jmethodID鈥)锛涙槧鍍忓彲鑳芥棤娉曡繍琛 +C:\work\vs_workspace\jditk\x64\Release\\bs.dll : warning LNK4088: 鍥 /FORCE 閫夐」鐢熸垚浜嗘槧鍍忥紱鏄犲儚鍙兘涓嶈兘杩愯 + HEZON_ITK.vcxproj -> C:\work\vs_workspace\jditk\x64\Release\HEZON_ITK.dll + HEZON_ITK.vcxproj -> C:\work\vs_workspace\jditk\x64\Release\HEZON_ITK.pdb (Full PDB) diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog index f696c9e..dd46630 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog index 34fd129..2f33b9e 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog index 436ea85..1d3a82f 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog index f72c52c..be78164 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog index 0a1ccb1..edce585 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog index 2c3b60a..d42ce3a 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog differ diff --git a/HEZON_ITK/x64/Release/vc140.pdb b/HEZON_ITK/x64/Release/vc140.pdb index 4d4c630..2efc39f 100644 Binary files a/HEZON_ITK/x64/Release/vc140.pdb and b/HEZON_ITK/x64/Release/vc140.pdb differ diff --git a/x64/Release/HEZON_ITK.pdb b/x64/Release/HEZON_ITK.pdb index 55681ab..d52ec92 100644 Binary files a/x64/Release/HEZON_ITK.pdb and b/x64/Release/HEZON_ITK.pdb differ diff --git a/x64/Release/bs.exp b/x64/Release/bs.exp index 46176db..3ecf162 100644 Binary files a/x64/Release/bs.exp and b/x64/Release/bs.exp differ