diff options
| author | shizhendong <[email protected]> | 2023-08-18 09:54:48 +0800 |
|---|---|---|
| committer | shizhendong <[email protected]> | 2023-08-18 09:54:48 +0800 |
| commit | 37a7029cb92b730ea75401b4e071a36cfc8bd237 (patch) | |
| tree | c68e8e7b44f76f2c7a9af047160b480367e7e6d0 | |
| parent | 0a66a5e68beb8807b75620e11add2aeee22901e9 (diff) | |
| parent | 4e84183f93ae674c0664945259666ba69b0744e3 (diff) | |
Merge remote-tracking branch 'origin/dev-3.7' into dev-3.8
3 files changed, 1 insertions, 30 deletions
diff --git a/nz-admin/src/main/java/com/nis/common/update/v3_0_to_3_2/service/V3_2_DataFormatConversionService.java b/nz-admin/src/main/java/com/nis/common/update/v3_0_to_3_2/service/V3_2_DataFormatConversionService.java index fcfb2e4d..4b507754 100644 --- a/nz-admin/src/main/java/com/nis/common/update/v3_0_to_3_2/service/V3_2_DataFormatConversionService.java +++ b/nz-admin/src/main/java/com/nis/common/update/v3_0_to_3_2/service/V3_2_DataFormatConversionService.java @@ -141,7 +141,7 @@ public class V3_2_DataFormatConversionService implements DataFormatConversionInt private void conversionVisualChartData() throws SQLException { log.info("[conversionVisualChartData] [begin]"); - List<Entity> backUpChartList = SqlExecutor.query(this.connection, "SELECT * FROM visual_chart_v3_2 ORDER BY panel_id, group_id, weight", new EntityListHandler()); + List<Entity> backUpChartList = SqlExecutor.query(this.connection, "SELECT * FROM visual_chart_v3_2 ORDER BY panel_id, group_id, weight, id", new EntityListHandler()); log.info("[conversionVisualChartData] [conversion size: {}]", backUpChartList.size()); // query element list. name has been processed diff --git a/nz-admin/src/main/resources/install/install-agent.sh.template b/nz-admin/src/main/resources/install/install-agent.sh.template index 46ad1f01..a4cd1ab2 100644 --- a/nz-admin/src/main/resources/install/install-agent.sh.template +++ b/nz-admin/src/main/resources/install/install-agent.sh.template @@ -1,19 +1,5 @@ #!/bin/bash { # this ensures the entire script is downloaded # -# Find Java -if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then - JAVA_EXE="$JAVA_HOME/bin/java" -elif type -p java > /dev/null 2>&1; then - JAVA_EXE=$(type -p java) -elif [[ -x "/usr/bin/java" ]]; then - JAVA_EXE="/usr/bin/java" -else - echo -e "\e[1;31mUnable to find Java\e[0m" - exit 1 -fi - -echo "java: $JAVA_EXE" - #auto replace parameter start WEB_TOKEN=${webToken} diff --git a/nz-admin/src/main/resources/install/install-talon.sh.template b/nz-admin/src/main/resources/install/install-talon.sh.template index c97797c7..644e6df9 100644 --- a/nz-admin/src/main/resources/install/install-talon.sh.template +++ b/nz-admin/src/main/resources/install/install-talon.sh.template @@ -1,20 +1,5 @@ #!/bin/bash { # this ensures the entire script is downloaded # -# Find Java -if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then - JAVA_EXE="$JAVA_HOME/bin/java" -elif type -p java > /dev/null 2>&1; then - JAVA_EXE=$(type -p java) -elif [[ -x "/usr/bin/java" ]]; then - JAVA_EXE="/usr/bin/java" -else - echo -e "\e[1;31mUnable to find Java\e[0m" - exit 1 -fi - -echo "java: $JAVA_EXE" - - #auto replace parameter start WEB_TOKEN=${webToken} |