diff --git a/build/extraResources/mysql/data/#ib_16384_0.dblwr b/build/extraResources/mysql/data/#ib_16384_0.dblwr index 0808144..a8376e9 100644 Binary files a/build/extraResources/mysql/data/#ib_16384_0.dblwr and b/build/extraResources/mysql/data/#ib_16384_0.dblwr differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo34 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo34 index fb978c5..19d6a12 100644 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo34 and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo34 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo35 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo35 new file mode 100644 index 0000000..7e2214f Binary files /dev/null and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo35 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo35_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo35_tmp deleted file mode 100644 index 1ff1962..0000000 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo35_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 8688fcd..19fe819 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 5ee5449..1493f0f 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 8bab181..15993d2 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 147e467..7fc764f 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 455c7bb..0082a6c 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 7755fd0..979cc55 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 6e4d420..dd1b8e2 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 6403228..0e5d505 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 3e0e100..8f164d3 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 2e7b652..6c0fe30 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 79bddab..58709cd 100644 --- a/build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid +++ b/build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid @@ -1 +1 @@ -34820 +74476 diff --git a/build/extraResources/mysql/data/binlog.000030 b/build/extraResources/mysql/data/binlog.000030 index b5affb4..417e1bc 100644 Binary files a/build/extraResources/mysql/data/binlog.000030 and b/build/extraResources/mysql/data/binlog.000030 differ diff --git a/build/extraResources/mysql/data/binlog.000031 b/build/extraResources/mysql/data/binlog.000031 new file mode 100644 index 0000000..503dc2c Binary files /dev/null and b/build/extraResources/mysql/data/binlog.000031 differ diff --git a/build/extraResources/mysql/data/binlog.index b/build/extraResources/mysql/data/binlog.index index 70a9a16..8fc1c3a 100644 --- a/build/extraResources/mysql/data/binlog.index +++ b/build/extraResources/mysql/data/binlog.index @@ -6,3 +6,4 @@ .\binlog.000028 .\binlog.000029 .\binlog.000030 +.\binlog.000031 diff --git a/build/extraResources/mysql/data/ibdata1 b/build/extraResources/mysql/data/ibdata1 index 2421aa9..d43e59a 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 543c099..506dc6c 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 7a4ff07..e95d8b8 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 95e5ed5..e0286a6 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 e47f28f..34aaaeb 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 3a0cdbf..0fbbae3 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 850b39b..ced7cd8 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 e7a51d7..913ad1f 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 7bbd30c..1fd0f62 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_sub.ibd b/build/extraResources/mysql/data/pqs9100/pq_dev_sub.ibd index 2dae7f4..77bd826 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 b3d2339..47c6928 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 bd198b6..1e61d36 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 af0a923..8df588a 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_icd_path.ibd b/build/extraResources/mysql/data/pqs9100/pq_icd_path.ibd index a624c34..9b7b99d 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 6c442b9..3749fc1 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_report.ibd b/build/extraResources/mysql/data/pqs9100/pq_report.ibd index 6d8bf86..8940b85 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 5672128..1de0b93 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 6590705..334f54a 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 3570502..54081b8 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 e88aa4f..961c56c 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 b61d8e2..be045b3 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 new file mode 100644 index 0000000..099e996 Binary files /dev/null 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 new file mode 100644 index 0000000..88f055a Binary files /dev/null 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 7342c59..d2f401c 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 e22d560..a16992a 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 2a8c3ec..dbd7b95 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 c57b675..259bd91 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 8547f24..063ac49 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 0c7631a..7198552 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 4c802e7..271ce95 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 0bf4970..78d6bac 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_role.ibd b/build/extraResources/mysql/data/pqs9100/sys_role.ibd index af35355..0bc3429 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 0fbead9..71e9927 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 9271b08..db96844 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 c90990a..d88c825 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 299484e..52ca499 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 a5faa96..7272212 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 e3c65b1..5525640 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 1c76ecd..16098f7 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -19,9 +19,9 @@ VITE_API_URL=/api # 开发环境跨域代理,支持配置多个 -#VITE_PROXY=[["/api","http://127.0.0.1:18092/"]] +VITE_PROXY=[["/api","http://127.0.0.1:18092/"]] #VITE_PROXY=[["/api","http://192.168.1.124:18092/"]] -VITE_PROXY=[["/api","http://192.168.2.125:18092/"]] +#VITE_PROXY=[["/api","http://192.168.2.125:18092/"]] # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文 # 开启激活验证 VITE_ACTIVATE_OPEN=false \ No newline at end of file diff --git a/frontend/.env.production b/frontend/.env.production index af9d60b..0d6f9c7 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -23,6 +23,6 @@ VITE_PWA=true # 线上环境接口地址 #VITE_API_URL="/api" # 打包时用 -VITE_API_URL="http://127.0.0.1:18093/" +VITE_API_URL="http://127.0.0.1:18092/" # 开启激活验证 -VITE_ACTIVATE_OPEN=true \ No newline at end of file +VITE_ACTIVATE_OPEN=false \ No newline at end of file diff --git a/scripts/config-generator.js b/scripts/config-generator.js index 1027932..02e7e7f 100644 --- a/scripts/config-generator.js +++ b/scripts/config-generator.js @@ -75,7 +75,7 @@ class ConfigGenerator { // 替换 WebSocket 端口 if (options.websocketPort) { - template = template.replace(/port:\s*7778/g, `port: ${options.websocketPort}`); + template = template.replace(/port:\s*7777/g, `port: ${options.websocketPort}`); } // 写入配置文件