diff --git a/build/extraResources/java/entrance.jar b/build/extraResources/java/entrance.jar index 4e9c2bb..aafe48f 100644 Binary files a/build/extraResources/java/entrance.jar and b/build/extraResources/java/entrance.jar differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo44 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo44 index 6baefef..16c6e2f 100644 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo44 and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo44 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo45 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo45 new file mode 100644 index 0000000..b02f505 Binary files /dev/null and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo45 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo46 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo46 new file mode 100644 index 0000000..2f8bcfb Binary files /dev/null and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo46 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo46_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo46_tmp deleted file mode 100644 index 1ff1962..0000000 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo46_tmp and /dev/null differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo47 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo47 new file mode 100644 index 0000000..6112cd9 Binary files /dev/null and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo47 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo47_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo47_tmp deleted file mode 100644 index 1ff1962..0000000 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo47_tmp and /dev/null differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo48 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo48 new file mode 100644 index 0000000..a718c51 Binary files /dev/null and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo48 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo48_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo48_tmp deleted file mode 100644 index 1ff1962..0000000 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo48_tmp and /dev/null differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo49 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo49 new file mode 100644 index 0000000..7c6282e Binary files /dev/null and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo49 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo49_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo49_tmp deleted file mode 100644 index 1ff1962..0000000 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo49_tmp and /dev/null differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo50 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo50 new file mode 100644 index 0000000..c1b3d96 Binary files /dev/null and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo50 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo50_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo50_tmp deleted file mode 100644 index 1ff1962..0000000 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo50_tmp and /dev/null differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo45_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo51 similarity index 74% rename from build/extraResources/mysql/data/#innodb_redo/#ib_redo45_tmp rename to build/extraResources/mysql/data/#innodb_redo/#ib_redo51 index 1ff1962..fc7f556 100644 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo45_tmp and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo51 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo51_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo51_tmp deleted file mode 100644 index 1ff1962..0000000 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo51_tmp and /dev/null differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_1.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_1.ibt index 0832dc3..b47f7b7 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_1.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_1.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_10.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_10.ibt index 33e532f..5b116ec 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_10.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_10.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_2.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_2.ibt index 89f721b..8097d89 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_2.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_2.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_3.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_3.ibt index d1bd52b..5d2d4ea 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_3.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_3.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_4.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_4.ibt index 43fc762..71d3d4b 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_4.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_4.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_5.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_5.ibt index 09bfc83..90fe707 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_5.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_5.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_6.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_6.ibt index f49b87d..4f02370 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_6.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_6.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_7.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_7.ibt index 4a1de34..ea7cb3e 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_7.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_7.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_8.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_8.ibt index 7bbd37a..212fb87 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_8.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_8.ibt differ diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_9.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_9.ibt index ece895e..19abfbc 100644 Binary files a/build/extraResources/mysql/data/#innodb_temp/temp_9.ibt and b/build/extraResources/mysql/data/#innodb_temp/temp_9.ibt differ diff --git a/build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid b/build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid index 79e1722..cd5941d 100644 --- a/build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid +++ b/build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid @@ -1 +1 @@ -116212 +55936 diff --git a/build/extraResources/mysql/data/binlog.000040 b/build/extraResources/mysql/data/binlog.000040 index e5a39f4..3a58b49 100644 Binary files a/build/extraResources/mysql/data/binlog.000040 and b/build/extraResources/mysql/data/binlog.000040 differ diff --git a/build/extraResources/mysql/data/binlog.000041 b/build/extraResources/mysql/data/binlog.000041 new file mode 100644 index 0000000..78af1d8 Binary files /dev/null and b/build/extraResources/mysql/data/binlog.000041 differ diff --git a/build/extraResources/mysql/data/binlog.index b/build/extraResources/mysql/data/binlog.index index fbbc30f..ebc1f7d 100644 --- a/build/extraResources/mysql/data/binlog.index +++ b/build/extraResources/mysql/data/binlog.index @@ -16,3 +16,4 @@ .\binlog.000038 .\binlog.000039 .\binlog.000040 +.\binlog.000041 diff --git a/build/extraResources/mysql/data/ibdata1 b/build/extraResources/mysql/data/ibdata1 index 3d8c528..c7154f4 100644 Binary files a/build/extraResources/mysql/data/ibdata1 and b/build/extraResources/mysql/data/ibdata1 differ diff --git a/build/extraResources/mysql/data/ibtmp1 b/build/extraResources/mysql/data/ibtmp1 index 9c509f6..cdd0d48 100644 Binary files a/build/extraResources/mysql/data/ibtmp1 and b/build/extraResources/mysql/data/ibtmp1 differ diff --git a/build/extraResources/mysql/data/mysql.ibd b/build/extraResources/mysql/data/mysql.ibd index 0e3ced7..c22d22e 100644 Binary files a/build/extraResources/mysql/data/mysql.ibd and b/build/extraResources/mysql/data/mysql.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/ad_pair.ibd b/build/extraResources/mysql/data/pqs9100/ad_pair.ibd index 3d113b2..774acf3 100644 Binary files a/build/extraResources/mysql/data/pqs9100/ad_pair.ibd and b/build/extraResources/mysql/data/pqs9100/ad_pair.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/ad_plan.ibd b/build/extraResources/mysql/data/pqs9100/ad_plan.ibd index 8734fec..198219e 100644 Binary files a/build/extraResources/mysql/data/pqs9100/ad_plan.ibd and b/build/extraResources/mysql/data/pqs9100/ad_plan.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/ad_plan_source.ibd b/build/extraResources/mysql/data/pqs9100/ad_plan_source.ibd index 60255e5..389501e 100644 Binary files a/build/extraResources/mysql/data/pqs9100/ad_plan_source.ibd and b/build/extraResources/mysql/data/pqs9100/ad_plan_source.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/ad_plan_standard_dev.ibd b/build/extraResources/mysql/data/pqs9100/ad_plan_standard_dev.ibd index bed2f8a..ee95fea 100644 Binary files a/build/extraResources/mysql/data/pqs9100/ad_plan_standard_dev.ibd and b/build/extraResources/mysql/data/pqs9100/ad_plan_standard_dev.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/ad_plan_test_config.ibd b/build/extraResources/mysql/data/pqs9100/ad_plan_test_config.ibd index eea3fbc..6d6e129 100644 Binary files a/build/extraResources/mysql/data/pqs9100/ad_plan_test_config.ibd and b/build/extraResources/mysql/data/pqs9100/ad_plan_test_config.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_dev.ibd b/build/extraResources/mysql/data/pqs9100/pq_dev.ibd index 1ac60a2..3c46a68 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_dev.ibd and b/build/extraResources/mysql/data/pqs9100/pq_dev.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_dev_check_history.ibd b/build/extraResources/mysql/data/pqs9100/pq_dev_check_history.ibd new file mode 100644 index 0000000..1c8976c Binary files /dev/null and b/build/extraResources/mysql/data/pqs9100/pq_dev_check_history.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_dev_sub.ibd b/build/extraResources/mysql/data/pqs9100/pq_dev_sub.ibd index 4b06208..6bab1cf 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_dev_sub.ibd and b/build/extraResources/mysql/data/pqs9100/pq_dev_sub.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_dev_type.ibd b/build/extraResources/mysql/data/pqs9100/pq_dev_type.ibd index 1272058..5d8a143 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_dev_type.ibd and b/build/extraResources/mysql/data/pqs9100/pq_dev_type.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_err_sys.ibd b/build/extraResources/mysql/data/pqs9100/pq_err_sys.ibd index 4ecbe0e..78adf85 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_err_sys.ibd and b/build/extraResources/mysql/data/pqs9100/pq_err_sys.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_err_sys_dtls.ibd b/build/extraResources/mysql/data/pqs9100/pq_err_sys_dtls.ibd index fadd053..5bef3a5 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_err_sys_dtls.ibd and b/build/extraResources/mysql/data/pqs9100/pq_err_sys_dtls.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_freq_converter_config.ibd b/build/extraResources/mysql/data/pqs9100/pq_freq_converter_config.ibd index 4945d72..ec01a79 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_freq_converter_config.ibd and b/build/extraResources/mysql/data/pqs9100/pq_freq_converter_config.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_icd_path.ibd b/build/extraResources/mysql/data/pqs9100/pq_icd_path.ibd index 4bffd40..3f548f3 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_icd_path.ibd and b/build/extraResources/mysql/data/pqs9100/pq_icd_path.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_monitor.ibd b/build/extraResources/mysql/data/pqs9100/pq_monitor.ibd index 1097533..121d56a 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_monitor.ibd and b/build/extraResources/mysql/data/pqs9100/pq_monitor.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_pqdif_path.ibd b/build/extraResources/mysql/data/pqs9100/pq_pqdif_path.ibd new file mode 100644 index 0000000..127e4a9 Binary files /dev/null and b/build/extraResources/mysql/data/pqs9100/pq_pqdif_path.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_report.ibd b/build/extraResources/mysql/data/pqs9100/pq_report.ibd index e178989..a26b861 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_report.ibd and b/build/extraResources/mysql/data/pqs9100/pq_report.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_script.ibd b/build/extraResources/mysql/data/pqs9100/pq_script.ibd index 2a631ed..55fc1a6 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_script.ibd and b/build/extraResources/mysql/data/pqs9100/pq_script.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_script_checkdata.ibd b/build/extraResources/mysql/data/pqs9100/pq_script_checkdata.ibd index 0644a1a..7430086 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_script_checkdata.ibd and b/build/extraResources/mysql/data/pqs9100/pq_script_checkdata.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_script_dtls.ibd b/build/extraResources/mysql/data/pqs9100/pq_script_dtls.ibd index e0e6321..78219ec 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_script_dtls.ibd and b/build/extraResources/mysql/data/pqs9100/pq_script_dtls.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_source.ibd b/build/extraResources/mysql/data/pqs9100/pq_source.ibd index 87a5606..c38b1a8 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_source.ibd and b/build/extraResources/mysql/data/pqs9100/pq_source.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_standard_dev.ibd b/build/extraResources/mysql/data/pqs9100/pq_standard_dev.ibd index f3223da..10b076a 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_standard_dev.ibd and b/build/extraResources/mysql/data/pqs9100/pq_standard_dev.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_standard_dev_gain.ibd b/build/extraResources/mysql/data/pqs9100/pq_standard_dev_gain.ibd index 50c60a2..d46fe69 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_standard_dev_gain.ibd and b/build/extraResources/mysql/data/pqs9100/pq_standard_dev_gain.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/pq_standard_dev_gain_record.ibd b/build/extraResources/mysql/data/pqs9100/pq_standard_dev_gain_record.ibd index 3c3eee0..41205e5 100644 Binary files a/build/extraResources/mysql/data/pqs9100/pq_standard_dev_gain_record.ibd and b/build/extraResources/mysql/data/pqs9100/pq_standard_dev_gain_record.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_dict_data.ibd b/build/extraResources/mysql/data/pqs9100/sys_dict_data.ibd index 6b42b18..bf9f653 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_dict_data.ibd and b/build/extraResources/mysql/data/pqs9100/sys_dict_data.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_dict_pq.ibd b/build/extraResources/mysql/data/pqs9100/sys_dict_pq.ibd index d1000eb..b88af6a 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_dict_pq.ibd and b/build/extraResources/mysql/data/pqs9100/sys_dict_pq.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_dict_tree.ibd b/build/extraResources/mysql/data/pqs9100/sys_dict_tree.ibd index 1b76139..21ecf92 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_dict_tree.ibd and b/build/extraResources/mysql/data/pqs9100/sys_dict_tree.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_dict_type.ibd b/build/extraResources/mysql/data/pqs9100/sys_dict_type.ibd index 1b80ecc..e4f019e 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_dict_type.ibd and b/build/extraResources/mysql/data/pqs9100/sys_dict_type.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_function.ibd b/build/extraResources/mysql/data/pqs9100/sys_function.ibd index 4798d03..fd96238 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_function.ibd and b/build/extraResources/mysql/data/pqs9100/sys_function.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_log_audit.ibd b/build/extraResources/mysql/data/pqs9100/sys_log_audit.ibd index 6c704de..da231f1 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_log_audit.ibd and b/build/extraResources/mysql/data/pqs9100/sys_log_audit.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_log_run.ibd b/build/extraResources/mysql/data/pqs9100/sys_log_run.ibd index 9db71b3..f2c880c 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_log_run.ibd and b/build/extraResources/mysql/data/pqs9100/sys_log_run.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_reg_res.ibd b/build/extraResources/mysql/data/pqs9100/sys_reg_res.ibd index 1a2b995..740bf61 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_reg_res.ibd and b/build/extraResources/mysql/data/pqs9100/sys_reg_res.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_resource_manage.ibd b/build/extraResources/mysql/data/pqs9100/sys_resource_manage.ibd index 8737be3..3cf2512 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_resource_manage.ibd and b/build/extraResources/mysql/data/pqs9100/sys_resource_manage.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_role.ibd b/build/extraResources/mysql/data/pqs9100/sys_role.ibd index cbbd638..a35d989 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_role.ibd and b/build/extraResources/mysql/data/pqs9100/sys_role.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_role_function.ibd b/build/extraResources/mysql/data/pqs9100/sys_role_function.ibd index 6fed381..67bc8bd 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_role_function.ibd and b/build/extraResources/mysql/data/pqs9100/sys_role_function.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_test_config.ibd b/build/extraResources/mysql/data/pqs9100/sys_test_config.ibd index 11a070f..b075604 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_test_config.ibd and b/build/extraResources/mysql/data/pqs9100/sys_test_config.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_user.ibd b/build/extraResources/mysql/data/pqs9100/sys_user.ibd index 1ff0c4f..0d7feed 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_user.ibd and b/build/extraResources/mysql/data/pqs9100/sys_user.ibd differ diff --git a/build/extraResources/mysql/data/pqs9100/sys_user_role.ibd b/build/extraResources/mysql/data/pqs9100/sys_user_role.ibd index e26f668..3a0ea71 100644 Binary files a/build/extraResources/mysql/data/pqs9100/sys_user_role.ibd and b/build/extraResources/mysql/data/pqs9100/sys_user_role.ibd differ diff --git a/build/extraResources/mysql/data/undo_001 b/build/extraResources/mysql/data/undo_001 index 2ced68b..5ce274e 100644 Binary files a/build/extraResources/mysql/data/undo_001 and b/build/extraResources/mysql/data/undo_001 differ diff --git a/build/extraResources/mysql/data/undo_002 b/build/extraResources/mysql/data/undo_002 index 9e1c997..9186b0b 100644 Binary files a/build/extraResources/mysql/data/undo_002 and b/build/extraResources/mysql/data/undo_002 differ diff --git a/frontend/.env.development b/frontend/.env.development index 618234b..72f9a40 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -20,9 +20,9 @@ VITE_COMPANY_WEBSITE=http://www.shining-electric.com/ # 开发环境跨域代理,支持配置多个 -VITE_PROXY=[["/api","http://127.0.0.1:18092/"]] +VITE_PROXY=[["/api","http://127.0.0.1:18093/"]] #VITE_PROXY=[["/api","http://192.168.1.124:18092/"]] #VITE_PROXY=[["/api","http://192.168.2.125:18092/"]] VITE_IS_SHOW_RAW_DATA=true # 开启激活验证 -VITE_ACTIVATE_OPEN=false \ No newline at end of file +VITE_ACTIVATE_OPEN=true \ No newline at end of file diff --git a/frontend/.env.production b/frontend/.env.production index cc031bf..c0ed398 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -23,8 +23,8 @@ VITE_PWA=true # 线上环境接口地址 #VITE_API_URL="/api" # 打包时用 -VITE_API_URL="http://127.0.0.1:18092/" +VITE_API_URL="http://127.0.0.1:18093/" VITE_COMPANY_WEBSITE=http://www.shining-electric.com/ VITE_IS_SHOW_RAW_DATA=true # 开启激活验证 -VITE_ACTIVATE_OPEN=false +VITE_ACTIVATE_OPEN=true diff --git a/frontend/src/utils/webSocketClient.ts b/frontend/src/utils/webSocketClient.ts index 3718e50..887ddfa 100644 --- a/frontend/src/utils/webSocketClient.ts +++ b/frontend/src/utils/webSocketClient.ts @@ -192,7 +192,7 @@ export default class SocketService { * WebSocket连接配置 */ private config: SocketConfig = { - url: `ws://127.0.0.1:7777/hello`, + url: `ws://127.0.0.1:7778/hello`, heartbeatInterval: 9000, // 9秒心跳间隔 reconnectDelay: 5000, // 5秒重连延迟 maxReconnectAttempts: 5, // 最多重连5次