diff --git a/build/extraResources/java/entrance.jar b/build/extraResources/java/entrance.jar index e4150cd..c2e8030 100644 Binary files a/build/extraResources/java/entrance.jar and b/build/extraResources/java/entrance.jar differ diff --git a/build/extraResources/mysql/data/#ib_16384_0.dblwr b/build/extraResources/mysql/data/#ib_16384_0.dblwr index a8376e9..88991db 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 deleted file mode 100644 index 19d6a12..0000000 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo34 and /dev/null differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo35 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo35 index 7e2214f..832f637 100644 Binary files a/build/extraResources/mysql/data/#innodb_redo/#ib_redo35 and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo35 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo36 b/build/extraResources/mysql/data/#innodb_redo/#ib_redo36 new file mode 100644 index 0000000..0db6353 Binary files /dev/null and b/build/extraResources/mysql/data/#innodb_redo/#ib_redo36 differ diff --git a/build/extraResources/mysql/data/#innodb_redo/#ib_redo36_tmp b/build/extraResources/mysql/data/#innodb_redo/#ib_redo66_tmp similarity index 100% rename from build/extraResources/mysql/data/#innodb_redo/#ib_redo36_tmp rename to build/extraResources/mysql/data/#innodb_redo/#ib_redo66_tmp diff --git a/build/extraResources/mysql/data/#innodb_temp/temp_1.ibt b/build/extraResources/mysql/data/#innodb_temp/temp_1.ibt index 19fe819..b7b04ba 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 1493f0f..9317c5f 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 15993d2..501c059 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 7fc764f..513dc9d 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 0082a6c..991dea2 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 979cc55..cbb7a51 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 dd1b8e2..d359e88 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 0e5d505..57c34d9 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 8f164d3..4e89130 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 6c0fe30..65d7428 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 58709cd..97b215a 100644 --- a/build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid +++ b/build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid @@ -1 +1 @@ -74476 +30796 diff --git a/build/extraResources/mysql/data/binlog.000031 b/build/extraResources/mysql/data/binlog.000031 index 503dc2c..2c802b9 100644 Binary files a/build/extraResources/mysql/data/binlog.000031 and b/build/extraResources/mysql/data/binlog.000031 differ diff --git a/build/extraResources/mysql/data/binlog.000032 b/build/extraResources/mysql/data/binlog.000032 new file mode 100644 index 0000000..27cd007 Binary files /dev/null and b/build/extraResources/mysql/data/binlog.000032 differ diff --git a/build/extraResources/mysql/data/binlog.000033 b/build/extraResources/mysql/data/binlog.000033 new file mode 100644 index 0000000..7a50413 Binary files /dev/null and b/build/extraResources/mysql/data/binlog.000033 differ diff --git a/build/extraResources/mysql/data/binlog.index b/build/extraResources/mysql/data/binlog.index index 8fc1c3a..de335f0 100644 --- a/build/extraResources/mysql/data/binlog.index +++ b/build/extraResources/mysql/data/binlog.index @@ -7,3 +7,5 @@ .\binlog.000029 .\binlog.000030 .\binlog.000031 +.\binlog.000032 +.\binlog.000033 diff --git a/build/extraResources/mysql/data/ibdata1 b/build/extraResources/mysql/data/ibdata1 index d43e59a..d069f7d 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 506dc6c..5006284 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 e95d8b8..a0a1c54 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 e0286a6..7a80279 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 34aaaeb..6920804 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 0fbbae3..4f43b78 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 ced7cd8..0a1aa61 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 913ad1f..89cd684 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 1fd0f62..defec02 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 77bd826..16001c0 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 47c6928..1f91293 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 1e61d36..d5b7f3d 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 8df588a..2b0339b 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 9b7b99d..c78ef96 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 3749fc1..a10f986 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 8940b85..a1f1850 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 1de0b93..1513beb 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 334f54a..62aae88 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 54081b8..b81de39 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 961c56c..b1d29d0 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 be045b3..e00e758 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 099e996..f7cf2fd 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 88f055a..1ca6ce4 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 d2f401c..6ea7de1 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 a16992a..9a84988 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 dbd7b95..59a49bf 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 259bd91..d1f7f99 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 063ac49..3cf05bb 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 7198552..dd52eff 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 271ce95..c1ea181 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 78d6bac..4574ced 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 0bc3429..04c9af2 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 71e9927..61bb0b8 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 db96844..6554ee1 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 d88c825..3af42fa 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 52ca499..436415f 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 7272212..30d45d3 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 5525640..a16cc07 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 16098f7..bd4ab4a 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:18093/"]] #VITE_PROXY=[["/api","http://192.168.1.124: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 +VITE_ACTIVATE_OPEN=true \ No newline at end of file diff --git a/frontend/.env.production b/frontend/.env.production index 0d6f9c7..af9d60b 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:18092/" +VITE_API_URL="http://127.0.0.1:18093/" # 开启激活验证 -VITE_ACTIVATE_OPEN=false \ No newline at end of file +VITE_ACTIVATE_OPEN=true \ No newline at end of file