diff --git a/Dockerfile b/Dockerfile index b57515fc2b08959a9ec250c9558e95bdf59b8f93..6a89df5dbdef9dd847924f8793286efa88d16a2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,17 +38,13 @@ ENV WORKSPACE=/home/easysoftware WORKDIR ${WORKSPACE} -COPY --chown=easysoftware --from=Builder /EasySoftware/target ${WORKSPACE}/target +COPY --chown=easysoftware --from=Builder /EasySoftware/target/easysoftware-0.0.1-SNAPSHOT.jar ${WORKSPACE}/target/easysoftware-0.0.1-SNAPSHOT.jar RUN echo "umask 027" >> /home/easysoftware/.bashrc \ && echo "umask 027" >> /root/.bashrc \ && source /home/easysoftware/.bashrc \ - && mkdir -p /home/easysoftware/tomcat/log \ - && chmod 550 -R /home/easysoftware \ - && chown -R easysoftware:easysoftware /home/easysoftware/tomcat/ \ - && chmod 700 -R /home/easysoftware/tomcat \ - && echo "set +o history" >> /etc/bashrc \ - && echo "set +o history" >> /home/easysoftware/bashrc \ + && echo "set +o history" >> /etc/bashrc \ + && echo "set +o history" >> /home/easysoftware/.bashrc \ && sed -i "s|HISTSIZE=1000|HISTSIZE=0|" /etc/profile \ && sed -i "s|PASS_MAX_DAYS[ \t]*99999|PASS_MAX_DAYS 30|" /etc/login.defs @@ -62,7 +58,8 @@ RUN passwd -l easysoftware \ RUN dnf install -y wget \ && wget https://mirrors.tuna.tsinghua.edu.cn/Adoptium/17/jre/x64/linux/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz \ && tar -zxvf OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz \ - && rm OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz + && rm OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz \ + && chown -R easysoftware:easysoftware jdk-17.0.11+9-jre RUN rm -rf `find / -iname "*tcpdump*"` \ && rm -rf `find / -iname "*sniffer*"` \ @@ -83,7 +80,8 @@ RUN rm -rf /usr/bin/gdb* \ && rm -rf /usr/share/gdb \ && rm -rf /usr/share/gcc-10.3.1 \ && yum remove gdb-gdbserver findutils passwd shadow -y \ - && yum clean all + && yum clean all \ + && chmod 500 -R /home/easysoftware ENV JAVA_HOME=${WORKSPACE}/jdk-17.0.11+9-jre ENV PATH=${JAVA_HOME}/bin:$PATH diff --git a/mvnw b/mvnw deleted file mode 100644 index 66df2854281f4cb6869e4830dd1a7abd1e946c18..0000000000000000000000000000000000000000 --- a/mvnw +++ /dev/null @@ -1,308 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" - fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) - fi - # end of workaround - done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi -} - -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" -else - log "Couldn't find $wrapperJarPath, downloading it ..." - - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi - - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi -fi - -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100644 index 95ba6f54ac526de46248af840bab26f33f946b93..0000000000000000000000000000000000000000 --- a/mvnw.cmd +++ /dev/null @@ -1,205 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 509b378c3864d212461adfc8c682a64cc3a7e36d..42445f6342f309eab80d48ba7bc5c52ce4104352 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.2 + 3.3.0 com @@ -51,8 +51,6 @@ 5.0.2 - - org.springframework.boot spring-boot-starter-web @@ -147,12 +145,6 @@ bcprov-jdk18on 1.78.1 - - - org.apache.kafka - kafka-clients - 3.7.0 - @@ -168,8 +160,9 @@ - org.springframework.kafka - spring-kafka + commons-codec + commons-codec + 1.15 diff --git a/src/main/java/com/easysoftware/EasysoftwareApplication.java b/src/main/java/com/easysoftware/EasysoftwareApplication.java index 9960813e38489dbaf9b72bf7636ea45165d5582b..75b0bf198b0332c1dd59638161bb1c0fc9695791 100644 --- a/src/main/java/com/easysoftware/EasysoftwareApplication.java +++ b/src/main/java/com/easysoftware/EasysoftwareApplication.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware; import com.baomidou.mybatisplus.autoconfigure.DdlApplicationRunner; diff --git a/src/main/java/com/easysoftware/adapter/execute/ApplicationPackageExecuteAdapter.java b/src/main/java/com/easysoftware/adapter/execute/ApplicationPackageExecuteAdapter.java deleted file mode 100644 index e3b713c4088fd41442c056feb5b46fc45a1c8e55..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/execute/ApplicationPackageExecuteAdapter.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.easysoftware.adapter.execute; - -import com.easysoftware.application.applicationpackage.ApplicationPackageService; -import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/apppkg") -public class ApplicationPackageExecuteAdapter { - - /** - * Autowired instance of ApplicationPackageService for handling application package operations. - */ - @Autowired - private ApplicationPackageService appPkgService; - - /** - * Insert AppPkg info. - * - * @param inputAppPackage AppPkg information entity class. - * @return ResponseEntity. - */ - @PostMapping - public ResponseEntity insertAppPkg(@Valid @RequestBody final InputApplicationPackage inputAppPackage) { - return appPkgService.insertAppPkg(inputAppPackage); - } - - /** - * Update AppPkg info. - * - * @param inputAppPackage AppPkg information entity class. - * @return ResponseEntity. - */ - @PutMapping - public ResponseEntity updateAppPkg(@Valid @RequestBody final InputApplicationPackage inputAppPackage) { - return appPkgService.updateAppPkg(inputAppPackage); - } - - /** - * Delete AppPkg info. - * - * @param names AppPkg name collection. - * @return ResponseEntity. - */ - @DeleteMapping(value = "/{names}") - public ResponseEntity deleteAppPkg(@PathVariable final List names) { - return appPkgService.deleteAppPkg(names); - } -} diff --git a/src/main/java/com/easysoftware/adapter/execute/ApplicationVersionExecuteAdapter.java b/src/main/java/com/easysoftware/adapter/execute/ApplicationVersionExecuteAdapter.java deleted file mode 100644 index 9be1d9816088e508e7fffdfe58bf3fefc675033d..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/execute/ApplicationVersionExecuteAdapter.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.easysoftware.adapter.execute; - -import com.easysoftware.application.applicationversion.ApplicationVersionService; -import com.easysoftware.application.applicationversion.dto.InputApplicationVersion; -import com.easysoftware.common.aop.LimitRequest; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/appVersion") -public class ApplicationVersionExecuteAdapter { - - /** - *Autowired instance of ApplicationVersionService for handling application package operations. - */ - @Autowired - private ApplicationVersionService appVersionService; - - /** - * Inserts a new application version. - * - * @param inputAppVersion The input data for the new application version. - * @return ResponseEntity. - */ - @PostMapping - @LimitRequest - public ResponseEntity insertAppVersion(@Valid @RequestBody final InputApplicationVersion inputAppVersion) { - return appVersionService.insertAppVersion(inputAppVersion); - } - - - /** - * Updates an existing application version with the provided input data. - * - * @param inputAppVersion The input data for updating the application version. - * @return ResponseEntity. - */ - @PutMapping - @LimitRequest - public ResponseEntity updateAppVersion(@Valid @RequestBody final InputApplicationVersion inputAppVersion) { - return appVersionService.updateAppVersion(inputAppVersion); - } - - /** - * Deletes application versions based on the provided list of names. - * - * @param names names List of names of application versions to be deleted. - * @return ResponseEntity. - */ - @DeleteMapping(value = "/{names}") - @LimitRequest - public ResponseEntity deleteAppVersion(@PathVariable final List names) { - return appVersionService.deleteAppVersion(names); - } -} diff --git a/src/main/java/com/easysoftware/adapter/execute/EPKGPackageExecuteAdapter.java b/src/main/java/com/easysoftware/adapter/execute/EPKGPackageExecuteAdapter.java deleted file mode 100644 index d451cdeddf6e6693b3fa98363f2d157452c993a9..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/execute/EPKGPackageExecuteAdapter.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.easysoftware.adapter.execute; - -import com.easysoftware.application.epkgpackage.EPKGPackageService; -import com.easysoftware.application.epkgpackage.dto.InputEPKGPackage; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/epkgpkg") -public class EPKGPackageExecuteAdapter { - - /** - * Autowired instance of EPKGPackageService for handling application package operations. - */ - @Autowired - private EPKGPackageService epkgPackageService; - - /** - * insert EPKG Package. - * - * @param inputEPKGPackage The input EPKG Package details to be inserted. - * @return ResponseEntity. - */ - @PostMapping - public ResponseEntity insertEPKGPkg(@Valid @RequestBody final InputEPKGPackage inputEPKGPackage) { - return epkgPackageService.insertEPKGPkg(inputEPKGPackage); - } - - /** - * update EPKG Package. - * - * @param inputEPKGPackage The input EPKG Package details to be updated. - * @return ResponseEntity. - */ - @PutMapping - public ResponseEntity updateEPKGPkg(@Valid @RequestBody final InputEPKGPackage inputEPKGPackage) { - return epkgPackageService.updateEPKGPkg(inputEPKGPackage); - } - - /** - * delete EPKG Packages by their Ids. - * - * @param ids List of IDs of the EPKG Packages to be deleted. - * @return ResponseEntity. - */ - @DeleteMapping(value = "/{ids}") - public ResponseEntity deleteEPKGPkg(@PathVariable final List ids) { - return epkgPackageService.deleteEPKGPkg(ids); - } -} diff --git a/src/main/java/com/easysoftware/adapter/execute/ExternalOsExecuteAdapter.java b/src/main/java/com/easysoftware/adapter/execute/ExternalOsExecuteAdapter.java deleted file mode 100644 index 5104f4d784542cac05370ec46e182e3893612877..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/execute/ExternalOsExecuteAdapter.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.easysoftware.adapter.execute; - -import com.easysoftware.application.externalos.ExternalOsService; -import com.easysoftware.application.externalos.dto.InputExternalOs; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/externalos") -public class ExternalOsExecuteAdapter { - - - /** - * Autowired service responsible for handling External OS related operations. - */ - @Autowired - private ExternalOsService externalOsService; - - /** - * Endpoint to insert a new package mapping. - * - * @param input The input data for creating a new package mapping. - * @return ResponseEntity. - */ - @PostMapping("") - public ResponseEntity insertPkgMap(@Valid @RequestBody final InputExternalOs input) { - return externalOsService.insertPkgMap(input); - } - - /** - * Endpoint to update an existing package mapping. - * - * @param input The input data for updating an existing package mapping. - * @return ResponseEntity. - */ - @PutMapping() - public ResponseEntity updatePkgMap(@Valid @RequestBody final InputExternalOs input) { - return externalOsService.updatePkgMap(input); - } - - /** - * Endpoint to delete package mappings associated with specified IDs. - * - * @param ids List of IDs of package mappings to be deleted. - * @return ResponseEntity. - */ - @DeleteMapping(value = "/{ids}") - public ResponseEntity deletePkgMap(@PathVariable final List ids) { - return externalOsService.deletePkgMap(ids); - } -} diff --git a/src/main/java/com/easysoftware/adapter/execute/OperationConfigExecuteAdapter.java b/src/main/java/com/easysoftware/adapter/execute/OperationConfigExecuteAdapter.java deleted file mode 100644 index 6b403d0036473f34cea68e1a932e1eb562993a7a..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/execute/OperationConfigExecuteAdapter.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.easysoftware.adapter.execute; - -import com.easysoftware.application.operationconfig.OperationConfigService; -import com.easysoftware.application.operationconfig.dto.InputOperationConfig; -import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.utils.ResultUtil; -import jakarta.validation.Valid; -import jakarta.validation.constraints.Size; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/operationconfig") -public class OperationConfigExecuteAdapter { - - - /** - * Autowired service for handling operation configurations. - */ - @Autowired - private OperationConfigService service; - - - /** - * Endpoint to insert a new operation configuration. - * - * @param input The input data for creating a new operation configuration. - * @return ResponseEntity. - */ - @PostMapping("") - public ResponseEntity insertOperationConfig(@Valid @RequestBody final InputOperationConfig input) { - boolean succeed = service.insertOperationConfig(input); - if (succeed) { - return ResultUtil.success(HttpStatus.OK); - } - return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0006); - } - - /** - * Endpoint to delete operation configurations by type. - * - * @param type Type of operation configuration to be deleted. - * @return ResponseEntity. - */ - @DeleteMapping("/{type}") - public ResponseEntity deleteByType(@Size(max = 255) @PathVariable final String type) { - boolean succeed = service.deleteByType(type); - if (succeed) { - return ResultUtil.success(HttpStatus.OK); - } - return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0005); - } -} diff --git a/src/main/java/com/easysoftware/adapter/execute/RPMPackageExecuteAdapter.java b/src/main/java/com/easysoftware/adapter/execute/RPMPackageExecuteAdapter.java deleted file mode 100644 index fd3ac1e0602978c3fbcdef441a1179da25dae41e..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/execute/RPMPackageExecuteAdapter.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.easysoftware.adapter.execute; - -import com.easysoftware.application.rpmpackage.RPMPackageService; -import com.easysoftware.application.rpmpackage.dto.InputRPMPackage; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/rpmpkg") -public class RPMPackageExecuteAdapter { - - /** - * Autowired service for handling RPM package operations. - */ - @Autowired - private RPMPackageService rPMPkgService; - - /** - * Endpoint to insert a new RPM package. - * - * @param inputrPMPackage The input data for inserting a new RPM package. - * @return ResponseEntity. - */ - @PostMapping("") - public ResponseEntity insertRPMPkg(@Valid @RequestBody final InputRPMPackage inputrPMPackage) { - return rPMPkgService.insertRPMPkg(inputrPMPackage); - } - - - /** - * Endpoint to insert a new RPM package. - * - * @param inputrPMPackage The input data for inserting a new RPM package. - * @return ResponseEntity. - */ - @PutMapping() - public ResponseEntity updateRPMPkg(@Valid @RequestBody final InputRPMPackage inputrPMPackage) { - return rPMPkgService.updateRPMPkg(inputrPMPackage); - } - - - /** - * Endpoint to delete RPM packages associated with specified IDs. - * - * @param ids List of IDs of RPM packages to be deleted. - * @return ResponseEntity. - */ - @DeleteMapping(value = "/{ids}") - public ResponseEntity deleteRPMPkg(@PathVariable final List ids) { - return rPMPkgService.deleteRPMPkg(ids); - } -} diff --git a/src/main/java/com/easysoftware/adapter/execute/RedisExecuteAdapter.java b/src/main/java/com/easysoftware/adapter/execute/RedisExecuteAdapter.java deleted file mode 100644 index e8efbb0d556b4c0876ba82d048b7e774d3d7a9e2..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/execute/RedisExecuteAdapter.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.easysoftware.adapter.execute; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import com.easysoftware.redis.RedisService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - - -@RestController -@RequestMapping("/redis") -public class RedisExecuteAdapter { - - /** - * Autowired service for interacting with Redis. - */ - @Autowired - private RedisService redisService; - - /** - * Endpoint to update Redis cache by namespace, updating all pages under the specified namespace. - * - * @param namespace The namespace for which cache needs to be updated. - * @return ResponseEntity. - */ - // key更新操作，传入namespace更新namespace下所有页面缓存 - @GetMapping("/update") - public ResponseEntity updateRedisByNameSapce(@RequestParam final String namespace) { - return redisService.updateRedisByNameSapce(namespace); - } -} diff --git a/src/main/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapter.java b/src/main/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapter.java index a9702596e731fb81937779adfb50bc61a151a5ef..a01052d6f7a479f092076e3080a4ae8bccdc3e3e 100644 --- a/src/main/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapter.java +++ b/src/main/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapter.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import org.springframework.beans.factory.annotation.Autowired; @@ -6,6 +17,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.easysoftware.application.applicationpackage.ApplicationPackageService; +import com.easysoftware.application.applicationpackage.dto.ApplicationPackageNameSearchCondition; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.common.aop.RequestLimitRedis; @@ -41,7 +53,7 @@ public class ApplicationPackageQueryAdapter { */ @GetMapping("/tags") @RequestLimitRedis() - public ResponseEntity queryByTags(@Valid final ApplicationPackageSearchCondition condition) { + public ResponseEntity queryByTags(@Valid final ApplicationPackageNameSearchCondition condition) { return appPkgService.queryPkgByTags(condition); } @@ -55,21 +67,8 @@ public class ApplicationPackageQueryAdapter { */ @GetMapping("/eulerver") @RequestLimitRedis() - public ResponseEntity queryEulerVersionsByName(@Valid final ApplicationPackageSearchCondition condition) { + public ResponseEntity queryEulerVersionsByName( + @Valid final ApplicationPackageNameSearchCondition condition) { return appPkgService.queryEulerVersionsByName(condition); } - - /** - * Endpoint to query for all avalaible openEuler arch of application packages - * based - * on the provided search condition. - * - * @param condition The search condition for querying application packages. - * @return ResponseEntity. - */ - @GetMapping("/eulerarch") - @RequestLimitRedis() - public ResponseEntity queryEulerArchsByName(@Valid final ApplicationPackageSearchCondition condition) { - return appPkgService.queryEulerArchsByName(condition); - } } diff --git a/src/main/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapter.java b/src/main/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapter.java index 8ca7c5f4de24181a1d505b5ebc473c0328c4b25c..fae4df846f5a1f67f0b1e19e03c34d58b97880c5 100644 --- a/src/main/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapter.java +++ b/src/main/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapter.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import org.springframework.beans.factory.annotation.Autowired; @@ -5,17 +16,16 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - import com.easysoftware.application.applicationversion.ApplicationVersionService; +import com.easysoftware.application.applicationversion.dto.ApplicationColumnSearchCondition; import com.easysoftware.application.applicationversion.dto.ApplicationVersionSearchCondition; -import com.easysoftware.common.aop.LimitRequest; +import com.easysoftware.common.aop.RequestLimitRedis; import jakarta.validation.Valid; @RestController @RequestMapping("/appVersion") public class ApplicationVersionQueryAdapter { - /** * Autowired service for handling application version-related operations. */ @@ -23,31 +33,28 @@ public class ApplicationVersionQueryAdapter { private ApplicationVersionService appVersionService; /** - * Endpoint to search for application versions based on the provided search condition. + * Endpoint to search for application versions based on the provided search + * condition. * * @param condition The search condition for querying application versions. * @return ResponseEntity. */ @GetMapping() - @LimitRequest() - // @OneidToken - // @CompatibleToken + @RequestLimitRedis() public ResponseEntity searchAppVersion(@Valid final ApplicationVersionSearchCondition condition) { return appVersionService.searchAppVersion(condition); } /** - * Endpoint to search for application versions based on the provided search condition. + * Endpoint to search for application versions based on the provided search + * condition. * * @param condition The search condition for querying application versions. * @return ResponseEntity. */ @GetMapping("/column") - @LimitRequest() - // @OneidToken - // @CompatibleToken - public ResponseEntity searchAppVerColumn(@Valid final ApplicationVersionSearchCondition condition) { + @RequestLimitRedis() + public ResponseEntity searchAppVerColumn(@Valid final ApplicationColumnSearchCondition condition) { return appVersionService.searchAppVerColumn(condition); } - } diff --git a/src/main/java/com/easysoftware/adapter/query/DomainPackageQueryAdapter.java b/src/main/java/com/easysoftware/adapter/query/DomainPackageQueryAdapter.java deleted file mode 100644 index 3e33f244367340ea31cc62abf90ab948dd86ab11..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/query/DomainPackageQueryAdapter.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.easysoftware.adapter.query; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.easysoftware.application.domainpackage.DomainPackageService; -import com.easysoftware.application.domainpackage.dto.DomainColumnCondition; -import com.easysoftware.application.domainpackage.dto.DomainDetailSearchCondition; -import com.easysoftware.application.domainpackage.dto.DomainSearchCondition; -import com.easysoftware.common.aop.RequestLimitRedis; -import jakarta.validation.Valid; - -@RestController -@RequestMapping("/domain") -public class DomainPackageQueryAdapter { - - /** - * Autowired service for managing domain packages. - */ - @Autowired - private DomainPackageService domainService; - - /** - * Endpoint to query domains by name. - * - * @param condition The search condition for querying domains. - * @return ResponseEntity. - */ - @GetMapping() - @RequestLimitRedis() - public ResponseEntity queryByName(@Valid final DomainSearchCondition condition) { - return domainService.searchDomain(condition); - } - - /** - * Endpoint to query detailed information about a domain. - * - * @param condition The search condition for querying domain details. - * @return ResponseEntity. - */ - @GetMapping("/detail") - @RequestLimitRedis() - public ResponseEntity queryDomainDetail(@Valid final DomainDetailSearchCondition condition) { - return domainService.searchDomainDetail(condition); - } - - /** - * Endpoint to query domain columns. - * - * @param condition The search condition for querying domain columns. - * @return ResponseEntity. - */ - @GetMapping("/column") - @RequestLimitRedis() - public ResponseEntity queryColumn(@Valid final DomainColumnCondition condition) { - return domainService.searchColumn(condition); - } - - /** - * Endpoint to query domain statistics. - * - * @return ResponseEntity. - */ - @GetMapping("/stat") - @RequestLimitRedis() - public ResponseEntity queryStat() { - return domainService.queryStat(); - } - - -} diff --git a/src/main/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapter.java b/src/main/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapter.java index fb3035563a1c1f29cc85c06e53eccbd7977ec457..514dc779a4935bc94d887be3db1269ed1129f21b 100644 --- a/src/main/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapter.java +++ b/src/main/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapter.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import org.springframework.beans.factory.annotation.Autowired; @@ -7,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.easysoftware.application.epkgpackage.EPKGPackageService; +import com.easysoftware.application.epkgpackage.dto.EPKGPackageNameSearchCondition; import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; import com.easysoftware.common.aop.RequestLimitRedis; @@ -43,20 +55,7 @@ public class EPKGPackageQueryAdapter { */ @GetMapping("/eulerver") @RequestLimitRedis() - public ResponseEntity queryEulerVersionsByName(@Valid final EPKGPackageSearchCondition condition) { + public ResponseEntity queryEulerVersionsByName(@Valid final EPKGPackageNameSearchCondition condition) { return ePKGPackageService.queryEulerVersionsByName(condition); } - - /** - * Endpoint to query for all avalaible openEuler arch of epkg packages based - * on the provided search condition. - * - * @param condition The search condition for querying epkg packages. - * @return ResponseEntity. - */ - @GetMapping("/eulerarch") - @RequestLimitRedis() - public ResponseEntity queryEulerArchsByName(@Valid final EPKGPackageSearchCondition condition) { - return ePKGPackageService.queryEulerArchsByName(condition); - } } diff --git a/src/main/java/com/easysoftware/adapter/query/ExternalOsQueryAdapter.java b/src/main/java/com/easysoftware/adapter/query/ExternalOsQueryAdapter.java deleted file mode 100644 index c36c414df5ee8726da54c8795f85a2e714efe568..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/adapter/query/ExternalOsQueryAdapter.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.easysoftware.adapter.query; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.easysoftware.application.externalos.ExternalOsService; -import com.easysoftware.application.externalos.dto.ExternalOsSearchCondiiton; -import com.easysoftware.common.aop.RequestLimitRedis; - -import jakarta.validation.Valid; - -@RestController -@RequestMapping("/externalos") -public class ExternalOsQueryAdapter { - - /** - * Autowired service for interacting with external operating systems. - */ - @Autowired - private ExternalOsService externalOsService; - - - /** - * Handles a request to search package mappings in the external operating system. - * - * @param condition The search condition for querying package mappings. - * @return ResponseEntity. - */ - @GetMapping() - @RequestLimitRedis() - public ResponseEntity searchPkgMap(@Valid final ExternalOsSearchCondiiton condition) { - return externalOsService.searchPkgMap(condition); - } -} diff --git a/src/main/java/com/easysoftware/adapter/query/FieldApplicationQueryAdapter.java b/src/main/java/com/easysoftware/adapter/query/FieldApplicationQueryAdapter.java index 09a67b106bd1095fe9c468ab7f564b56936e4c7f..e5818adf6b54d40d7e6896e591b886177f39842f 100644 --- a/src/main/java/com/easysoftware/adapter/query/FieldApplicationQueryAdapter.java +++ b/src/main/java/com/easysoftware/adapter/query/FieldApplicationQueryAdapter.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import org.springframework.beans.factory.annotation.Autowired; @@ -17,11 +28,6 @@ import jakarta.validation.Valid; @RestController @RequestMapping("/field") public class FieldApplicationQueryAdapter { - /** - * Health status. - */ - private static final String HEALTH_STATUS = "health"; - /** * Autowired service for handling field application-related operations. */ @@ -74,15 +80,4 @@ public class FieldApplicationQueryAdapter { public ResponseEntity searchStat() { return service.queryStat(); } - - /** - * Endpoint to health check. - * - * @return ResponseEntity. - */ - @GetMapping("/health") - @RequestLimitRedis() - public String checkHealth() { - return HEALTH_STATUS; - } } diff --git a/src/main/java/com/easysoftware/adapter/query/RPMPackageQueryAdapter.java b/src/main/java/com/easysoftware/adapter/query/RPMPackageQueryAdapter.java index 9cc7aeda1f0df0c2e22424e65975b7cadd200141..93bc33f4841ba84530670854ba44261c95cee0ba 100644 --- a/src/main/java/com/easysoftware/adapter/query/RPMPackageQueryAdapter.java +++ b/src/main/java/com/easysoftware/adapter/query/RPMPackageQueryAdapter.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import org.springframework.beans.factory.annotation.Autowired; @@ -6,6 +17,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.easysoftware.application.rpmpackage.RPMPackageService; +import com.easysoftware.application.rpmpackage.dto.RPMPackageNameSearchCondition; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.common.aop.RequestLimitRedis; @@ -42,20 +54,21 @@ public class RPMPackageQueryAdapter { */ @GetMapping("/eulerver") @RequestLimitRedis() - public ResponseEntity queryEulerVersionsByName(@Valid final RPMPackageSearchCondition condition) { + public ResponseEntity queryEulerVersionsByName(@Valid final RPMPackageNameSearchCondition condition) { return rPMPkgService.queryEulerVersionsByName(condition); } /** - * Endpoint to query for all avalaible openEuler arch of RPM packages based + * Endpoint to query for all newst version of RPM packages based * on the provided search condition. * - * @param condition The search condition for querying RPM packages. + * @param condition The search condition for querying versions of RPM packages. * @return ResponseEntity. */ - @GetMapping("/eulerarch") + @GetMapping("/rpmver") @RequestLimitRedis() - public ResponseEntity queryEulerArchsByName(@Valid final RPMPackageSearchCondition condition) { - return rPMPkgService.queryEulerArchsByName(condition); + public ResponseEntity queryNewstRpmVersion(@Valid final RPMPackageNameSearchCondition condition) { + return rPMPkgService.queryNewstRpmVersion(condition); } + } diff --git a/src/main/java/com/easysoftware/application/BaseIService.java b/src/main/java/com/easysoftware/application/BaseIService.java index 3daa850f6e6432884bc6c1b803880d2ff1272ee6..ef0948eba41f2b6346489b0cc0636a5c9cc88355 100644 --- a/src/main/java/com/easysoftware/application/BaseIService.java +++ b/src/main/java/com/easysoftware/application/BaseIService.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/easysoftware/application/ServiceMap.java b/src/main/java/com/easysoftware/application/ServiceMap.java index 444909225cb4dd69f1483f5ba2592c193faafe0e..013a713fd5dba48fe3e5a203b1f0aa1d5f96cfe7 100644 --- a/src/main/java/com/easysoftware/application/ServiceMap.java +++ b/src/main/java/com/easysoftware/application/ServiceMap.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageService.java b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageService.java index 6133335ce924bde50384a8e3a92c6e594779af2a..ba60844fa3f41df7380a2449b7c130280d75bda1 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageService.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageService.java @@ -1,37 +1,24 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationpackage; +import com.easysoftware.application.applicationpackage.dto.ApplicationPackageNameSearchCondition; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; -import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; import org.springframework.http.ResponseEntity; import java.util.List; public interface ApplicationPackageService { - /** - * Insert a new application package. - * - * @param listApp The input application package to be inserted. - * @return ResponseEntity. - */ - ResponseEntity insertAppPkg(InputApplicationPackage listApp); - - /** - * Update an existing application package. - * - * @param inputAppPackage The input application package for updating. - * @return ResponseEntity. - */ - ResponseEntity updateAppPkg(InputApplicationPackage inputAppPackage); - - /** - * Delete application packages by their names. - * - * @param names List of names of the application packages to be deleted. - * @return ResponseEntity. - */ - ResponseEntity deleteAppPkg(List names); - /** * Search for application packages based on the provided search condition. * @@ -56,7 +43,7 @@ public interface ApplicationPackageService { * application packages. * @return ResponseEntity. */ - ResponseEntity queryPkgByTags(ApplicationPackageSearchCondition condition); + ResponseEntity queryPkgByTags(ApplicationPackageNameSearchCondition condition); /** * Queries available openEuler version of application package. @@ -64,13 +51,5 @@ public interface ApplicationPackageService { * @param condition The search condition. * @return Map containing the openEuler versions. */ - ResponseEntity queryEulerVersionsByName(ApplicationPackageSearchCondition condition); - - /** - * Queries available openEuler archs of application package. - * - * @param condition The search condition. - * @return Map containing the openEuler versions. - */ - ResponseEntity queryEulerArchsByName(ApplicationPackageSearchCondition condition); + ResponseEntity queryEulerVersionsByName(ApplicationPackageNameSearchCondition condition); } diff --git a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java index fa3a84930a76674dc003d492a57a632f7904cd82..276f9bfd2e1ce6027bb671c8206ba3fab3e6f2f9 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java @@ -1,22 +1,32 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationpackage; +import com.easysoftware.application.applicationpackage.dto.ApplicationPackageNameSearchCondition; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; -import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; +import com.easysoftware.application.applicationpackage.vo.ApplicationPackageDetailVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; -import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.obs.ObsService; +import com.easysoftware.application.applicationpackage.vo.ApplicationPackageTagsVo; +import com.easysoftware.common.exception.NoneResException; +import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ResultUtil; -import com.easysoftware.domain.applicationpackage.ApplicationPackage; import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; import jakarta.annotation.Resource; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; + +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; - -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -29,12 +39,6 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService @Resource private ApplicationPackageGateway appPkgGateway; - /** - * Autowired service for interacting with Object Storage Service (OBS). - */ - @Autowired - private ObsService obsService; - /** * Value injection for the repoMaintainerApi configuration property. */ @@ -67,66 +71,14 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService * @return ResponseEntity. */ @Override - public ResponseEntity queryPkgByTags(final ApplicationPackageSearchCondition condition) { + public ResponseEntity queryPkgByTags(final ApplicationPackageNameSearchCondition condition) { Map res = appPkgGateway.queryTagsByName(condition); - return ResultUtil.success(HttpStatus.OK, res); - } - - /** - * Insert a new application package. - * - * @param inputAppPkg The input application package to be inserted. - * @return ResponseEntity. - */ - @Override - public ResponseEntity insertAppPkg(final InputApplicationPackage inputAppPkg) { - ApplicationPackage appPkg = new ApplicationPackage(); - BeanUtils.copyProperties(inputAppPkg, appPkg); - boolean succeed = appPkgGateway.save(appPkg); - return succeed ? ResultUtil.success(HttpStatus.OK) - : ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0006); - } - - /** - * Update an existing application package. - * - * @param inputAppPkg The input application package for updating. - * @return ResponseEntity. - */ - @Override - public ResponseEntity updateAppPkg(final InputApplicationPackage inputAppPkg) { - // 数据库中是否已存在该包 - ApplicationPackage appPkg = new ApplicationPackage(); - BeanUtils.copyProperties(inputAppPkg, appPkg); - boolean succeed = appPkgGateway.update(appPkg); - return succeed ? ResultUtil.success(HttpStatus.OK) - : ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0004); - } - - /** - * Delete application packages by their names. - * - * @param names List of names of the application packages to be deleted. - * @return ResponseEntity. - */ - @Override - public ResponseEntity deleteAppPkg(final List names) { - List existedNames = new ArrayList<>(); - for (String name : names) { - if (appPkgGateway.existApp(name)) { - existedNames.add(name); - } + Long total = (Long) res.get("total"); + List list = (List) res.get("list"); + if (total == 0 || list.size() == 0) { + throw new ParamErrorException("the tag does not exist"); } - List deletedNames = new ArrayList<>(); - for (String name : existedNames) { - if (appPkgGateway.delete(name)) { - deletedNames.add(name); - } - } - - String msg = String.format("请求删除的数据: %s, 在数据库中的数据: %s, 成功删除的数据: %s", - names, existedNames, deletedNames); - return ResultUtil.success(HttpStatus.OK); + return ResultUtil.success(HttpStatus.OK, res); } /** @@ -138,7 +90,16 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService @Override public ResponseEntity searchAppPkg(final ApplicationPackageSearchCondition condition) { condition.setTimeOrder(""); + if (StringUtils.isBlank(condition.getPkgId())) { + throw new ParamErrorException("the pkgid can not be null"); + } + Map res = appPkgGateway.queryDetailByName(condition); + Long total = (Long) res.get("total"); + List list = (List) res.get("list"); + if (total == 0 || list.size() == 0) { + throw new ParamErrorException("the image pkg does not exist"); + } return ResultUtil.success(HttpStatus.OK, res); } @@ -152,7 +113,12 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService @Override public List queryPkgMenuList(final ApplicationPackageSearchCondition condition) { Map map = appPkgGateway.queryMenuByName(condition); - return (List) map.get("list"); + Long total = (Long) map.get("total"); + List menus = (List) map.get("list"); + if (total == 0 || menus.size() == 0) { + throw new NoneResException("the image package does not exist"); + } + return menus; } /** @@ -162,20 +128,8 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService * @return Map containing the epkg package menu. */ @Override - public ResponseEntity queryEulerVersionsByName(ApplicationPackageSearchCondition condition) { + public ResponseEntity queryEulerVersionsByName(ApplicationPackageNameSearchCondition condition) { Map res = appPkgGateway.queryEulerVersionByName(condition); return ResultUtil.success(HttpStatus.OK, res); } - - /** - * Queries all available openEuler archs of application package. - * - * @param condition The search condition. - * @return Map containing the epkg package menu. - */ - @Override - public ResponseEntity queryEulerArchsByName(ApplicationPackageSearchCondition condition) { - Map res = appPkgGateway.queryEulerArchsByName(condition); - return ResultUtil.success(HttpStatus.OK, res); - } } diff --git a/src/main/java/com/easysoftware/application/applicationpackage/dto/ApplicationPackageNameSearchCondition.java b/src/main/java/com/easysoftware/application/applicationpackage/dto/ApplicationPackageNameSearchCondition.java new file mode 100644 index 0000000000000000000000000000000000000000..1282b92dd76fe12dddd6306f6cfa0c5ae7d383a8 --- /dev/null +++ b/src/main/java/com/easysoftware/application/applicationpackage/dto/ApplicationPackageNameSearchCondition.java @@ -0,0 +1,35 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.application.applicationpackage.dto; + +import com.easysoftware.common.constant.PackageConstant; + +import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ApplicationPackageNameSearchCondition { + /** + * Field name with a maximum length of PackageConstant.MAX_FIELD_LENGTH. + */ + @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) + @NotNull + private String name; + +} diff --git a/src/main/java/com/easysoftware/application/applicationpackage/dto/ApplicationPackageSearchCondition.java b/src/main/java/com/easysoftware/application/applicationpackage/dto/ApplicationPackageSearchCondition.java index 0a0fae58d521cda1aef72ff94aa0ba51604accbc..63b3480bae5e43ef198cd43f206b221652e30235 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/dto/ApplicationPackageSearchCondition.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/dto/ApplicationPackageSearchCondition.java @@ -1,8 +1,22 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationpackage.dto; import org.hibernate.validator.constraints.Range; import com.easysoftware.common.constant.PackageConstant; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -17,18 +31,21 @@ public class ApplicationPackageSearchCondition { * Field name with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String name; /** * Package ID with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String pkgId; /** * Subpath with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String subPath; /** @@ -36,6 +53,7 @@ public class ApplicationPackageSearchCondition { * MAX_PAGE_NUM, default value is 1. */ @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) + @NotNull private Integer pageNum = 1; /** @@ -43,48 +61,56 @@ public class ApplicationPackageSearchCondition { * MAX_PAGE_SIZE, default value is 10. */ @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) + @NotNull private Integer pageSize = 10; /** * Version number with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String version; /** * Operating system with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String os; /** * Architecture with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String arch; /** * Category with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String category; /** * Application update time with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String appUpdateAt; /** * Time order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String timeOrder; /** * Name order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String nameOrder; } diff --git a/src/main/java/com/easysoftware/application/applicationpackage/dto/InputApplicationPackage.java b/src/main/java/com/easysoftware/application/applicationpackage/dto/InputApplicationPackage.java deleted file mode 100644 index 97b4b7538189582d7562bf5a1812033715fe3742..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/applicationpackage/dto/InputApplicationPackage.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.easysoftware.application.applicationpackage.dto; - -import org.hibernate.validator.constraints.URL; - -import com.easysoftware.common.exception.enumvalid.AppCategoryEnum; -import com.easysoftware.common.exception.enumvalid.EnumValue; - -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class InputApplicationPackage { - /** - * Description with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of description can not exceed 10000") - private String description; - - /** - * Name cannot be null and must have a maximum length of 255 characters. - */ - @NotBlank(message = "name can not be null") - @Size(max = 255, message = "the length of name can not exceed 255") - private String name; - - /** - * License with a maximum length of 1000 characters. - */ - @Size(max = 1000, message = "the length of arch can not exceed 5000") - private String license; - /** - * download with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of download can not exceed 10000") - private String download; - /** - * environment with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of environment can not exceed 10000") - private String environment; - /** - * installation with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of installation can not exceed 10000") - private String installation; - - /** - * Similar packages with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of similarPkgs can not exceed 10000") - private String similarPkgs; - - /** - * Dependency packages with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of dependencyPkgs can not exceed 10000") - private String dependencyPkgs; - - /** - * Category validated using the AppCategoryEnum class's isValidCategory method. - */ - @EnumValue(enumClass = AppCategoryEnum.class, enumMethod = "isValidCategory") - private String category; - - /** - * type with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of type can not exceed 100") - private String type; - - /** - * iconUrl with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of iconUrl can not exceed 100") - private String iconUrl; - /** - * appVer with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of appVer can not exceed 100") - private String appVer; - /** - * osSupport with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of osSupport can not exceed 100") - private String osSupport; - /** - * os with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of os can not exceed 100") - private String os; - /** - * arch with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of arch can not exceed 100") - private String arch; - /** - * maintainerId with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of maintainerId can not exceed 100") - private String maintainerId; - /** - * maintainerEmail with a maximum length of 100 characters. - */ - @Email - @Size(max = 100, message = "the length of maintainerEmail can not exceed 100") - private String maintainerEmail; - /** - * maintainerGiteeId with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of maintainerGiteeId can not exceed 100") - private String maintainerGiteeId; - /** - * maintainerUpdateAt with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of maintainerUpdateAt can not exceed 100") - private String maintainerUpdateAt; - /** - * securityLevel with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of securityLevel can not exceed 100") - private String securityLevel; - /** - * safeLabel with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of safeLabel can not exceed 100") - private String safeLabel; - /** - * downloadCount with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of downloadCount can not exceed 100") - private String downloadCount; - /** - * appSize with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of appSize can not exceed 100") - private String appSize; - /** - * srcRepo with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of srcRepo can not exceed 100") - private String srcRepo; - /** - * srcDownloadUrl with a maximum length of 200 characters. - */ - @URL - @Size(max = 200, message = "the length of srcDownloadUrl can not exceed 200") - private String srcDownloadUrl; - /** - * binDownloadUrl with a maximum length of 200 characters. - */ - @URL - @Size(max = 200, message = "the length of binDownloadUrl can not exceed 200") - private String binDownloadUrl; - /** - * pkgId with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of pkgId can not exceed 100") - private String pkgId; - /** - * imageTags with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of tags can not exceed 10000") - private String imageTags; - /** - * imageUsage with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of usage can not exceed 10000") - private String imageUsage; -/** - * imageUsage with a maximum length of 10000 characters. - */ - @Size(max = 50, message = "the length of latestOsSupport can not exceed 50") - private String latestOsSupport; -} diff --git a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageDetailVo.java b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageDetailVo.java index a47d8fbdad62476982d976e6b6680ed6cc5f5f29..86b874923ee73c41bf3976dc82836c3b47e62ad8 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageDetailVo.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageDetailVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageEulerArchsVo.java b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageEulerArchsVo.java deleted file mode 100644 index 596c6f7a18814944274fc53d209158f8eb4688ee..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageEulerArchsVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.easysoftware.application.applicationpackage.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class ApplicationPackageEulerArchsVo { - /** - * OpenEuler arch of the package. - */ - private String arch; -} diff --git a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageEulerVersionVo.java b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageEulerVersionVo.java index 275d9c46d088cc051b033b16da4a9fa549a1cb40..fe12285551bd4c9211db92c6b4a5bfe71418765e 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageEulerVersionVo.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageEulerVersionVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageMenuVo.java b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageMenuVo.java index b45b0816fe82e5e9b880db541335258c94974bbd..d17be5f013fd010038d810885fc9ea26764192e3 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageMenuVo.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageMenuVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageTagsVo.java b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageTagsVo.java index 7e651fe15723012e9b97da794b13c24cc3006163..03d11e9178a85284b2c3b40e2bfa60419630a719 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageTagsVo.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/vo/ApplicationPackageTagsVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionService.java b/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionService.java index d43b30a21850c7df456660d852ce7a51cfa122bd..ab73ef3b6104f86f5a45453151322ba179aadefc 100644 --- a/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionService.java +++ b/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionService.java @@ -1,38 +1,23 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationversion; import com.easysoftware.application.BaseIService; +import com.easysoftware.application.applicationversion.dto.ApplicationColumnSearchCondition; import com.easysoftware.application.applicationversion.dto.ApplicationVersionSearchCondition; -import com.easysoftware.application.applicationversion.dto.InputApplicationVersion; import com.easysoftware.infrastructure.applicationversion.gatewayimpl.dataobject.ApplicationVersionDO; import org.springframework.http.ResponseEntity; -import java.util.List; - public interface ApplicationVersionService extends BaseIService { - /** - * Inserts a new application version based on the provided input. - * - * @param listApp The input application version to be inserted. - * @return ResponseEntity. - */ - ResponseEntity insertAppVersion(InputApplicationVersion listApp); - - /** - * Updates an existing application version using the provided input. - * - * @param inputAppVersion The updated application version information. - * @return ResponseEntity. - */ - ResponseEntity updateAppVersion(InputApplicationVersion inputAppVersion); - - /** - * Deletes application versions based on the provided list of names. - * - * @param names List of names of application versions to be deleted. - * @return ResponseEntity. - */ - ResponseEntity deleteAppVersion(List names); - /** * Searches for application versions based on the specified search conditions. * @@ -47,5 +32,5 @@ public interface ApplicationVersionService extends BaseIService. */ - ResponseEntity searchAppVerColumn(ApplicationVersionSearchCondition condition); + ResponseEntity searchAppVerColumn(ApplicationColumnSearchCondition condition); } diff --git a/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java b/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java index 5814261fb7038943996588af4a5418651bbdaa1a..763ef0cb7d8e0e4f0b6800d0ef68425942862f66 100644 --- a/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java +++ b/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java @@ -1,44 +1,36 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationversion; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.easysoftware.application.applicationversion.dto.ApplicationColumnSearchCondition; import com.easysoftware.application.applicationversion.dto.ApplicationVersionSearchCondition; -import com.easysoftware.application.applicationversion.dto.InputApplicationVersion; -import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.utils.QueryWrapperUtil; import com.easysoftware.common.utils.ResultUtil; -import com.easysoftware.domain.applicationversion.ApplicationVersion; import com.easysoftware.domain.applicationversion.gateway.ApplicationVersionGateway; import com.easysoftware.infrastructure.applicationversion.gatewayimpl.dataobject.ApplicationVersionDO; import com.easysoftware.infrastructure.mapper.ApplicationVersionDOMapper; -import com.easysoftware.kafka.Producer; import jakarta.annotation.Resource; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; - -import java.util.ArrayList; import java.util.List; +import java.util.ArrayList; import java.util.Map; @Service("ApplicationVersionService") -public class ApplicationVersionServiceImpl extends ServiceImpl implements ApplicationVersionService { - - /** - * Autowired Kafka producer for sending messages. - */ - @Autowired - private Producer kafkaProducer; - - /** - * Topic name for the Kafka producer related to application versions. - */ - @Value("${producer.topic}") - private String topicAppVersion; - +public class ApplicationVersionServiceImpl extends ServiceImpl + implements ApplicationVersionService { /** * API endpoint for repository information. */ @@ -51,22 +43,6 @@ public class ApplicationVersionServiceImpl extends ServiceImpl. - */ - @Override - public ResponseEntity insertAppVersion(final InputApplicationVersion inputAppVersion) { - ApplicationVersion appVersion = new ApplicationVersion(); - BeanUtils.copyProperties(inputAppVersion, appVersion); - boolean success = appVersionGateway.save(appVersion); - return success ? ResultUtil.success(HttpStatus.OK) - : ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0006); - } - /** * Searches for application versions based on the specified search conditions. * @@ -79,37 +55,6 @@ public class ApplicationVersionServiceImpl extends ServiceImpl. - */ - @Override - public ResponseEntity updateAppVersion(final InputApplicationVersion inputAppVersion) { - ApplicationVersion appVersion = new ApplicationVersion(); - BeanUtils.copyProperties(inputAppVersion, appVersion); - - boolean succeed = appVersionGateway.update(appVersion); - return succeed ? ResultUtil.success(HttpStatus.OK) - : ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0004); - } - - /** - * Deletes application versions based on the provided list of names. - * - * @param names List of names of application versions to be deleted. - * @return ResponseEntity. - */ - @Override - public ResponseEntity deleteAppVersion(final List names) { - List existedNames = names.stream().filter(appVersionGateway::existApp).toList(); - List deletedNames = existedNames.stream().filter(appVersionGateway::delete).toList(); - String msg = String.format("请求删除的数据: %s, 在数据库中的数据: %s, 成功删除的数据: %s", - names, existedNames, deletedNames); - return ResultUtil.success(HttpStatus.OK, msg); - } - /** * Saves a batch of data objects. * @@ -117,7 +62,7 @@ public class ApplicationVersionServiceImpl extends ServiceImpl dataObject) { - saveOrUpdateBatch(appVersionGateway.convertBatch(dataObject)); + return; } /** @@ -126,7 +71,7 @@ public class ApplicationVersionServiceImpl extends ServiceImpl searchAppVerColumn(ApplicationVersionSearchCondition condition) { + public ResponseEntity searchAppVerColumn(ApplicationColumnSearchCondition condition) { List columns = QueryWrapperUtil.splitStr(condition.getColumn()); Map> res = appVersionGateway.queryColumn(columns); return ResultUtil.success(HttpStatus.OK, res); diff --git a/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationColumnSearchCondition.java b/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationColumnSearchCondition.java new file mode 100644 index 0000000000000000000000000000000000000000..8cf14c4ec8bf4d25b7f8285b52f50d96bc9beaf2 --- /dev/null +++ b/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationColumnSearchCondition.java @@ -0,0 +1,32 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.application.applicationversion.dto; + +import com.easysoftware.common.constant.PackageConstant; + +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ApplicationColumnSearchCondition { + /** + * column. + */ + @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) + private String column; +} diff --git a/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationVersionSearchCondition.java b/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationVersionSearchCondition.java index 04496565e64c626bf74d6f7c851f300d5dc444e6..4b903ac1c2adb76921193fc5aa601eaf19a8cc20 100644 --- a/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationVersionSearchCondition.java +++ b/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationVersionSearchCondition.java @@ -1,9 +1,21 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.applicationversion.dto; import org.hibernate.validator.constraints.Range; import com.easysoftware.common.constant.PackageConstant; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Getter; @@ -16,38 +28,42 @@ public class ApplicationVersionSearchCondition { * Name of the package. Restricted by length and character pattern. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) - @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_ ]+$", - message = "Include only letters, digits, and special characters(_-()$.)") + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String name; /** * Page number within the allowable range. */ @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) + @NotNull private Integer pageNum = 1; /** * Page size within the allowable range. */ @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) + @NotNull private Integer pageSize = 10; /** * eulerOSVersion. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String eulerOsVersion; /** * column. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String column; /** * Name order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String nameOrder; } diff --git a/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java b/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java deleted file mode 100644 index d4ff86ff86aad7dc293aca55b970805c2698be43..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.easysoftware.application.applicationversion.dto; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class InputApplicationVersion { - /** - * Name of the software. Restricted by length and character pattern. - */ - @NotBlank(message = "name can not be null") - @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_:/ ]+$", - message = "Include only letters, digits, and special characters(_-()$.)") - @Size(max = 45, message = "the length of name can not exceed 45") - private String name; - - /** - * Homepage URL with length restriction and character pattern. - */ - @Size(max = 255, message = "the length of homepage can not exceed 255") - @Pattern(regexp = "^[A-Za-z0-9.()\\-_:/ ]+$", - message = "Include only letters, digits, and special characters(_-()$.)") - private String eulerHomepage; - - /** - * Upstream homepage URL with length restriction and character pattern. - */ - @Size(max = 255, message = "the length of homepage can not exceed 255") - @Pattern(regexp = "^[A-Za-z0-9.()\\-_:/ ]+$", - message = "Include only letters, digits, and special characters(_-()$.)") - private String upHomepage; - - /** - * Backend information with length restriction and character pattern. - */ - @Size(max = 45, message = "the length of backend can not exceed 45") - @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_:/ ]+$", - message = "Include only letters, digits, and special characters(_-()$.)") - private String backend; - - /** - * Status information with length restriction. - */ - @Size(max = 45, message = "the length of status can not exceed 45") - private String status; - - /** - * Upstream version with length restriction. - */ - @Size(max = 45, message = "the length of upstreamVersion can not exceed 45") - private String upstreamVersion; - - /** - * OpenEuler version with length restriction. - */ - @Size(max = 45, message = "the length of compatibleVersion can not exceed 45") - private String openeulerVersion; - - /** - * Continuous Integration (CI) version with length restriction. - */ - @Size(max = 45, message = "the length of compatibleVersion can not exceed 45") - private String ciVersion; - - /** - * Version of openEuler os: openEuler-22.03. - */ - @Size(max = 45, message = "the length of compatibleVersion can not exceed 45") - private String eulerOsVersion; -} diff --git a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageService.java b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageService.java deleted file mode 100644 index edfe98682e3dc355d6ea0e5072680edb7795edd8..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.easysoftware.application.domainpackage; - -import org.springframework.http.ResponseEntity; - -import com.easysoftware.application.domainpackage.dto.DomainColumnCondition; -import com.easysoftware.application.domainpackage.dto.DomainDetailSearchCondition; -import com.easysoftware.application.domainpackage.dto.DomainSearchCondition; - -public interface DomainPackageService { - /** - * Search for domains based on the provided search condition. - * - * @param condition The DomainSearchCondition for searching. - * @return ResponseEntity. - */ - ResponseEntity searchDomain(DomainSearchCondition condition); - - /** - * Search for domain details based on the provided search condition. - * - * @param condition The DomainDetailSearchCondition for searching. - * @return ResponseEntity. - */ - ResponseEntity searchDomainDetail(DomainDetailSearchCondition condition); - - /** - * Search for columns based on the provided condition. - * - * @param condition The DomainColumnCondition for searching. - * @return ResponseEntity. - */ - ResponseEntity searchColumn(DomainColumnCondition condition); - - /** - * Query statistics. - * - * @return ResponseEntity. - */ - ResponseEntity queryStat(); - -} diff --git a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java deleted file mode 100644 index 30b6fe7d4c384edd1dac9d85632947665e14cf8b..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java +++ /dev/null @@ -1,479 +0,0 @@ -package com.easysoftware.application.domainpackage; - -import com.easysoftware.application.applicationpackage.ApplicationPackageService; -import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; -import com.easysoftware.application.applicationpackage.vo.ApplicationPackageDetailVo; -import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; -import com.easysoftware.application.domainpackage.converter.DomainPackageConverter; -import com.easysoftware.application.domainpackage.dto.DomainColumnCondition; -import com.easysoftware.application.domainpackage.dto.DomainDetailSearchCondition; -import com.easysoftware.application.domainpackage.dto.DomainSearchCondition; -import com.easysoftware.application.domainpackage.vo.DomainPackageMenuVo; -import com.easysoftware.application.epkgpackage.EPKGPackageService; -import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; -import com.easysoftware.application.epkgpackage.vo.EPKGPackageDetailVo; -import com.easysoftware.application.epkgpackage.vo.EPKGPackageMenuVo; -import com.easysoftware.application.rpmpackage.RPMPackageService; -import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; -import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; -import com.easysoftware.application.rpmpackage.vo.RPMPackageDomainVo; -import com.easysoftware.application.rpmpackage.vo.RPMPackageMenuVo; -import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.exception.ParamErrorException; -import com.easysoftware.common.exception.enumvalid.AppCategoryEnum; -import com.easysoftware.common.utils.QueryWrapperUtil; -import com.easysoftware.common.utils.ResultUtil; -import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; -import com.easysoftware.domain.epkgpackage.gateway.EPKGPackageGateway; -import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; -import com.easysoftware.ranking.Ranker; -import com.easysoftware.redis.RedisGateway; -import com.easysoftware.redis.RedisUtil; -import jakarta.annotation.Resource; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -@Service -public class DomainPackageServiceImpl implements DomainPackageService { - - /** - * Logger for DomainPackageServiceImpl class. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(DomainPackageServiceImpl.class); - - /** - * Resource injection for the ApplicationPackageService. - */ - @Resource - private ApplicationPackageService appPkgService; - - /** - * Resource injection for the RPMPackageService. - */ - @Resource - private RPMPackageService rPMPkgService; - - /** - * Resource injection for the EPKGPackageService. - */ - @Resource - private EPKGPackageService epkgPackageService; - - /** - * Resource injection for the RPMPackageGateway. - */ - @Resource - private RPMPackageGateway rpmPackageGateway; - - /** - * Resource injection for the EPKGPackageGateway. - */ - @Resource - private EPKGPackageGateway epkgPackageGateway; - - /** - * Resource injection for the ApplicationPackageGateway. - */ - @Resource - private ApplicationPackageGateway applicationPackageGateway; - - /** - * Resource injection for the RedisGateway. - */ - @Resource - private RedisGateway redisGateway; - - /** - * Resource injection for the Ranker. - */ - @Resource - private Ranker ranker; - - /** - * Timeout value for Redis global expiration. - */ - @Value("${redis-global.expiration}") - private int timeOut; - - /** - * Search for domains based on the provided search condition. - * - * @param condition The DomainSearchCondition for searching. - * @return ResponseEntity. - */ - @Override - public ResponseEntity searchDomain(final DomainSearchCondition condition) { - String name = condition.getName(); - String entity = condition.getEntity(); - - // 搜索domain页面多个软件包 - if (StringUtils.isBlank(entity) && StringUtils.isNotBlank(name)) { - return searchDomainPage(condition); - // 搜索domain页面单个软件包 - } else if (StringUtils.isBlank(name) && StringUtils.isNotBlank(entity)) { - return searchDomainEntity(condition); - } else { - throw new ParamErrorException("unspecified param: name, entity"); - } - } - - /** - * Search domain entity based on the provided search condition. - * - * @param condition The DomainSearchCondition for searching. - * @return ResponseEntity. - */ - private ResponseEntity searchDomainEntity(final DomainSearchCondition condition) { - String entity = condition.getEntity(); - DomainPackageMenuVo domain = new DomainPackageMenuVo(); - domain.setName(entity); - extendIds(domain); - Map res = Map.ofEntries( - Map.entry("total", "-1"), - Map.entry("list", domain)); - return ResultUtil.success(HttpStatus.OK, res); - } - - /** - * Search for a domain page based on the provided search condition. - * - * @param condition The DomainSearchCondition for searching. - * @return ResponseEntity containing the search results. - */ - private ResponseEntity searchDomainPage(final DomainSearchCondition condition) { - // 展示精品应用 - if ("apppkg".equals(condition.getName())) { - Map res = searchAppPkgPage(condition); - return ResultUtil.success(HttpStatus.OK, res); - // 展示rpm软件包 - } else if ("rpmpkg".equals(condition.getName())) { - RPMPackageSearchCondition rpmCon = DomainPackageConverter.toRpm(condition); - Map rpmMenuList = rPMPkgService.queryAllRPMPkgMenu(rpmCon); - return ResultUtil.success(HttpStatus.OK, rpmMenuList); - // 展示epkg软件包 - } else if ("epkgpkg".equals(condition.getName())) { - EPKGPackageSearchCondition epkgCon = DomainPackageConverter.toEpkg(condition); - Map epkgMenu = epkgPackageService.queryAllEPKGPkgMenu(epkgCon); - return ResultUtil.success(HttpStatus.OK, epkgMenu); - // 展示领域应用 - } else if ("all".equals(condition.getName())) { - return searchAllEntity(condition); - } else { - throw new ParamErrorException("unsupported param"); - } - } - - /** - * Search application package page based on the provided search condition. - * - * @param condition The DomainSearchCondition for searching. - * @return A Map containing the search results. - */ - private Map searchAppPkgPage(final DomainSearchCondition condition) { - ApplicationPackageSearchCondition appCon = DomainPackageConverter.toApp(condition); - return applicationPackageGateway.queryMenuByName(appCon); - } - - /** - * Search all entities based on the provided search condition. - * - * @param condition The DomainSearchCondition for searching. - * @return ResponseEntity containing the search results. - */ - private ResponseEntity searchAllEntity(final DomainSearchCondition condition) { - // 根据请求参数生成唯一redis key - String redisKeyStr = RedisUtil.objectToString(condition); - String redisKeyFormat = "domainPage_%s"; - String redisKey = String.format(redisKeyFormat, DigestUtils.sha256Hex(redisKeyStr)); - try { - // 结果未过期，直接返回 - if (redisGateway.hasKey(redisKey)) { - String resJson = redisGateway.get(redisKey); - Object res = RedisUtil.convertToObject(resJson); - return ResultUtil.success(HttpStatus.OK, res); - } - } catch (Exception e) { - LOGGER.info(MessageCode.EC00015.getMsgEn()); - } - - ApplicationPackageSearchCondition appCon = DomainPackageConverter.toApp(condition); - appCon.setPageSize(Integer.MAX_VALUE); - List appMenus = appPkgService.queryPkgMenuList(appCon); - - RPMPackageSearchCondition rpmCon = DomainPackageConverter.toRpm(condition); - rpmCon.setPageSize(Integer.MAX_VALUE); - rpmCon.setTimeOrder(""); - List rpmMenus = rPMPkgService.queryPartAppPkgMenu(rpmCon); - - List domainMenus = mergeMenuVOs(appMenus, rpmMenus); - // 对 domainMenus 中的每个菜单调用 extendIds 方法。 - domainMenus.forEach(this::extendIds); - Map> cateMap = getCategorys(); - // 对 domainMenus 中的每个菜单，将其添加到 cateMap 中对应类别的列表中。 - domainMenus.forEach(menu -> cateMap.get(menu.getCategory()).add(menu)); - List> mapList = assembleMap(cateMap); - List> rankedMapList = ranker.rankingDomainPageByOperationConfig(mapList); - Map res = Map.ofEntries( - Map.entry("total", domainMenus.size()), - Map.entry("list", rankedMapList)); - try { - // 结果转json - String resJson = RedisUtil.convertToJson(res); - // 设置超时时间 配置默认超时时间 - redisGateway.setWithExpire(redisKey, resJson, timeOut, TimeUnit.HOURS); - } catch (Exception e) { - LOGGER.info(MessageCode.EC00015.getMsgEn()); - } - return ResultUtil.success(HttpStatus.OK, res); - } - - /** - * Extend IDs for a DomainPackageMenuVo object. - * - * @param domain The DomainPackageMenuVo to extend IDs for. - */ - private void extendIds(final DomainPackageMenuVo domain) { - String name = domain.getName(); - Set tags = domain.getTags(); - - ApplicationPackageMenuVo app = applicationPackageGateway.selectOne(name); - if (StringUtils.isNotBlank(app.getPkgId())) { - tags.add("IMAGE"); - domain.getPkgIds().put("IMAGE", app.getPkgId()); - } - - RPMPackageMenuVo rpm = rpmPackageGateway.selectOne(name); - if (StringUtils.isNotBlank(rpm.getPkgId())) { - tags.add("RPM"); - domain.getPkgIds().put("RPM", rpm.getPkgId()); - } - - EPKGPackageMenuVo epkg = epkgPackageGateway.selectOne(name); - if (StringUtils.isNotBlank(epkg.getPkgId())) { - tags.add("EPKG"); - domain.getPkgIds().put("EPKG", epkg.getPkgId()); - } - - } - - /** - * Merge menu VOs from ApplicationPackageMenuVo and RPMPackageDomainVo. - * - * @param appMenus List of ApplicationPackageMenuVo instances. - * @param rpmMenus List of RPMPackageDomainVo instances. - * @return List of merged DomainPackageMenuVo instances. - */ - private List mergeMenuVOs(final List appMenus, - final List rpmMenus) { - Map domainMap = new HashMap<>(); - // 遍历 appMenus 列表 - appMenus.forEach(app -> { - // 创建新的 DomainPackageMenuVo 对象，复制属性并设置标签和包 ID，然后将其放入 domainMap 中 - DomainPackageMenuVo domain = new DomainPackageMenuVo(); - BeanUtils.copyProperties(app, domain); - domain.getTags().add("IMAGE"); - domain.getPkgIds().put("IMAGE", app.getPkgId()); - domainMap.put(app.getName(), domain); - }); - - // 遍历 rpmMenus 列表 - rpmMenus.forEach(rpm -> { - String name = rpm.getName(); - // 如果 domainMap 包含名称，则将 "RPM" 添加到标签中并继续下一个循环 - if (domainMap.containsKey(name)) { - domainMap.get(name).getTags().add("RPM"); - return; - } - // 创建新的 DomainPackageMenuVo 对象，复制属性并设置标签和包 ID，然后将其放入 domainMap 中 - DomainPackageMenuVo domain = new DomainPackageMenuVo(); - BeanUtils.copyProperties(rpm, domain); - domain.getTags().add("RPM"); - domain.getPkgIds().put("RPM", rpm.getPkgId()); - domainMap.put(name, domain); - }); - - return new ArrayList<>(domainMap.values()); - } - - /** - * Get categories with corresponding objects. - * - * @return A Map containing category names as keys and lists of objects as - * values. - */ - private Map> getCategorys() { - Map> map = new HashMap<>(); - // 使用流遍历所有的 AppCategoryEnum 值，将别名映射为新的 ArrayList 放入 map 中。 - Arrays.stream(AppCategoryEnum.values()) - .map(AppCategoryEnum::getAlias) - .forEach(category -> map.put(category, new ArrayList<>())); - return map; - } - - /** - * Assemble a list of maps from a map of objects. - * - * @param mapObj The map of objects to assemble. - * @return A list of maps containing the assembled data. - */ - private List> assembleMap(final Map> mapObj) { - List> res = new ArrayList<>(); - mapObj.forEach((category, list) -> { - // 为支持排序需求，修改为可变map - Map map = new HashMap<>(); - map.put("name", category); - map.put("children", list); - res.add(map); - }); - return res; - } - - /** - * Search for columns based on the provided condition. - * - * @param condition The DomainColumnCondition for searching. - * @return ResponseEntity. - */ - @Override - public ResponseEntity searchColumn(final DomainColumnCondition condition) { - List columns = QueryWrapperUtil.splitStr(condition.getColumn()); - if ("rpmpkg".equals(condition.getName())) { - try { - Map> res = rpmPackageGateway.queryColumn(columns); - return ResultUtil.success(HttpStatus.OK, res); - } catch (ParamErrorException e) { - return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0002); - } - } else if ("epkgpkg".equals(condition.getName())) { - try { - Map> res = epkgPackageGateway.queryColumn(columns); - return ResultUtil.success(HttpStatus.OK, res); - } catch (ParamErrorException e) { - return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0002); - } - } else if ("apppkg".equals(condition.getName())) { - try { - Map> res = applicationPackageGateway.queryColumn(columns); - return ResultUtil.success(HttpStatus.OK, res); - } catch (ParamErrorException e) { - return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0002); - } - - } else { - throw new ParamErrorException("unsupported param"); - } - } - - /** - * Query statistics. - * - * @return ResponseEntity. - */ - @Override - public ResponseEntity queryStat() { - long rpmNum = rpmPackageGateway.queryTableLength(); - Long appNum = applicationPackageGateway.queryTableLength(); - long epkgNum = epkgPackageGateway.queryTableLength(); - - Map res = Map.ofEntries( - Map.entry("apppkg", appNum), - Map.entry("total", Math.addExact(rpmNum, epkgNum))); - return ResultUtil.success(HttpStatus.OK, res); - } - - /** - * Search for domain details based on the provided search condition. - * - * @param condition The DomainDetailSearchCondition for searching. - * @return ResponseEntity. - */ - @Override - public ResponseEntity searchDomainDetail(final DomainDetailSearchCondition condition) { - Map res = new HashMap<>(); - Set tags = new HashSet<>(); - - String appPkgId = condition.getAppPkgId(); - if (StringUtils.isNotBlank(appPkgId)) { - ApplicationPackageDetailVo app = searchAppDetail(appPkgId); - res.put("IMAGE", app); - tags.add("IMAGE"); - } - - String rpmPkgId = condition.getRpmPkgId(); - if (StringUtils.isNotBlank(rpmPkgId)) { - RPMPackageDetailVo rpm = searchRpmDetail(rpmPkgId); - res.put("RPM", rpm); - tags.add("RPM"); - } - - String epkgPkgId = condition.getEpkgPkgId(); - if (StringUtils.isNotBlank(epkgPkgId)) { - EPKGPackageDetailVo epkg = searchEpkgDetail(epkgPkgId); - res.put("EPKG", epkg); - tags.add("EPKG"); - } - - res.put("tags", tags); - return ResultUtil.success(HttpStatus.OK, res); - - } - - /** - * Search for EPKG package detail based on the provided EPKG package ID. - * - * @param epkgPkgId The EPKG package ID to search for. - * @return An EPKGPackageDetailVo object containing the details. - */ - private EPKGPackageDetailVo searchEpkgDetail(final String epkgPkgId) { - List epkgList = epkgPackageGateway.queryDetailByPkgId(epkgPkgId); - if (epkgList.size() != 1) { - throw new ParamErrorException(String.format(MessageCode.EC00014.getMsgEn(), "epkgPkgId")); - } - return epkgList.get(0); - } - - /** - * Search for application package detail based on the provided application - * package ID. - * - * @param appPkgId The application package ID to search for. - * @return An ApplicationPackageDetailVo object containing the details. - */ - private ApplicationPackageDetailVo searchAppDetail(final String appPkgId) { - List appList = applicationPackageGateway.queryDetailByPkgId(appPkgId); - if (appList.size() != 1) { - throw new ParamErrorException(String.format(MessageCode.EC00014.getMsgEn(), "appPkgId")); - } - return appList.get(0); - } - - /** - * Search for RPM package detail based on the provided RPM package ID. - * - * @param rpmPkgId The RPM package ID to search for. - * @return An RPMPackageDetailVo object containing the details. - */ - private RPMPackageDetailVo searchRpmDetail(final String rpmPkgId) { - List rpmList = rpmPackageGateway.queryDetailByPkgId(rpmPkgId); - if (rpmList.size() != 1) { - throw new ParamErrorException(String.format(MessageCode.EC00014.getMsgEn(), "rpmPkgId")); - } - return rpmList.get(0); - } -} diff --git a/src/main/java/com/easysoftware/application/domainpackage/converter/DomainPackageConverter.java b/src/main/java/com/easysoftware/application/domainpackage/converter/DomainPackageConverter.java deleted file mode 100644 index e510f67c0dd8029b5bc2bdf976694025e03b8556..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/domainpackage/converter/DomainPackageConverter.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.easysoftware.application.domainpackage.converter; - -import org.springframework.beans.BeanUtils; - -import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; -import com.easysoftware.application.domainpackage.dto.DomainSearchCondition; -import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; -import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; - -public final class DomainPackageConverter { - - // Private constructor to prevent instantiation of the utility class - private DomainPackageConverter() { - // private constructor to hide the implicit public one - throw new AssertionError("Cannot instantiate DomainPackageConverter class"); - } - - /** - * Converts a DomainSearchCondition object to an ApplicationPackageSearchCondition object. - * - * @param con The DomainSearchCondition to convert. - * @return An ApplicationPackageSearchCondition object. - */ - public static ApplicationPackageSearchCondition toApp(final DomainSearchCondition con) { - ApplicationPackageSearchCondition appCon = new ApplicationPackageSearchCondition(); - BeanUtils.copyProperties(con, appCon); - appCon.setName(""); - appCon.setTimeOrder(""); - return appCon; - } - - /** - * Converts a DomainSearchCondition object to an RPMPackageSearchCondition object. - * - * @param con The DomainSearchCondition to convert. - * @return An RPMPackageSearchCondition object. - */ - public static RPMPackageSearchCondition toRpm(final DomainSearchCondition con) { - RPMPackageSearchCondition rPMCon = new RPMPackageSearchCondition(); - BeanUtils.copyProperties(con, rPMCon); - rPMCon.setName(""); - return rPMCon; - } - - /** - * Converts a DomainSearchCondition object to an EPKGPackageSearchCondition object. - * - * @param con The DomainSearchCondition to convert. - * @return An EPKGPackageSearchCondition object. - */ - public static EPKGPackageSearchCondition toEpkg(final DomainSearchCondition con) { - EPKGPackageSearchCondition eCon = new EPKGPackageSearchCondition(); - BeanUtils.copyProperties(con, eCon); - eCon.setName(""); - return eCon; - } - -} diff --git a/src/main/java/com/easysoftware/application/domainpackage/dto/DomainColumnCondition.java b/src/main/java/com/easysoftware/application/domainpackage/dto/DomainColumnCondition.java deleted file mode 100644 index 8a2bf03c92f516dc8b49c7d4e42d909181c4b0a7..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/domainpackage/dto/DomainColumnCondition.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.easysoftware.application.domainpackage.dto; - -import org.hibernate.validator.constraints.Range; - -import com.easysoftware.common.constant.PackageConstant; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class DomainColumnCondition { - /** - * Page number within the range of PackageConstant.MIN_PAGE_NUM and PackageConstant.MAX_PAGE_NUM. - */ - @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) - private Integer pageNum = 1; - - /** - * Page size within the range of PackageConstant.MIN_PAGE_SIZE and PackageConstant.MAX_PAGE_SIZE. - */ - @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) - private Integer pageSize = 10; - - /** - * Name with a maximum size of 50 characters and must not be blank. - */ - @Size(max = 50) - @NotBlank - private String name; - - /** - * Column with a maximum size of 50 characters and must not be blank. - */ - @Size(max = 50) - @NotBlank - private String column; - -} diff --git a/src/main/java/com/easysoftware/application/domainpackage/dto/DomainDetailSearchCondition.java b/src/main/java/com/easysoftware/application/domainpackage/dto/DomainDetailSearchCondition.java deleted file mode 100644 index fbf933412aafddc31e2de00226c9441d6f7b6043..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/domainpackage/dto/DomainDetailSearchCondition.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.easysoftware.application.domainpackage.dto; - -import com.easysoftware.common.constant.PackageConstant; - -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class DomainDetailSearchCondition { - /** - * RPM package ID with a maximum length of PackageConstant.MAX_FIELD_LENGTH. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String rpmPkgId; - - /** - * EPKG package ID with a maximum length of PackageConstant.MAX_FIELD_LENGTH. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String epkgPkgId; - - /** - * Application package ID with a maximum length of PackageConstant.MAX_FIELD_LENGTH. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String appPkgId; - -} diff --git a/src/main/java/com/easysoftware/application/domainpackage/dto/DomainSearchCondition.java b/src/main/java/com/easysoftware/application/domainpackage/dto/DomainSearchCondition.java deleted file mode 100644 index 5e62419bc88cf09655166e6306838a670e46999e..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/domainpackage/dto/DomainSearchCondition.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.easysoftware.application.domainpackage.dto; - -import org.hibernate.validator.constraints.Range; -import com.easysoftware.common.constant.PackageConstant; -import com.easysoftware.common.exception.enumvalid.DomainNameEnum; -import com.easysoftware.common.exception.enumvalid.EnumValue; -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class DomainSearchCondition { - /** - * Domain name with an enum value from DomainNameEnum.isValidCategory. - */ - @EnumValue(enumClass = DomainNameEnum.class, enumMethod = "isValidCategory") - private String name; - - /** - * Software package entity with a maximum length of PackageConstant.MAX_FIELD_LENGTH. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - // 软件包名称 - private String entity; - - /** - * Operating system with a maximum length of PackageConstant.MAX_FIELD_LENGTH. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String os; - - /** - * Architecture with a maximum length of PackageConstant.MAX_FIELD_LENGTH. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String arch; - - /** - * Category with a maximum length of PackageConstant.MAX_FIELD_LENGTH. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String category; - - /** - * Version with a maximum length of PackageConstant.MAX_FIELD_LENGTH. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String version; - - /** - * Time order. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String timeOrder; - - /** - * Page number within the range of PackageConstant.MIN_PAGE_NUM and PackageConstant.MAX_PAGE_NUM. - */ - @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) - private Integer pageNum = 1; - - /** - * Page size within the range of PackageConstant.MIN_PAGE_SIZE and PackageConstant.MAX_PAGE_SIZE. - */ - @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) - private Integer pageSize = 10; - - /** - * Name order. - */ - @Size(max = PackageConstant.MAX_FIELD_LENGTH) - private String nameOrder; - -} - diff --git a/src/main/java/com/easysoftware/application/domainpackage/dto/InputDomainPackage.java b/src/main/java/com/easysoftware/application/domainpackage/dto/InputDomainPackage.java deleted file mode 100644 index 4b5da603efd4f145e5d6b7fe8cc2771b5775f17b..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/domainpackage/dto/InputDomainPackage.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.easysoftware.application.domainpackage.dto; - -import org.hibernate.validator.constraints.URL; - -import com.easysoftware.common.exception.enumvalid.AppCategoryEnum; -import com.easysoftware.common.exception.enumvalid.EnumValue; - -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class InputDomainPackage { - /** - * Description with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of description can not exceed 10000") - private String description; - - /** - * Name that cannot be null and has a maximum length of 255 characters. - */ - @NotBlank(message = "name can not be null") - @Size(max = 255, message = "the length of name can not exceed 255") - private String name; - - /** - * Description with a license length of 10000 characters. - */ - @Size(max = 1000, message = "the length of arch can not exceed 1000") - private String license; - - /** - * Download information with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of download can not exceed 10000") - private String download; - - /** - * Environment details with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of environment can not exceed 10000") - private String environment; - - /** - * Installation instructions with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of installation can not exceed 10000") - private String installation; - - /** - * Similar packages information with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of similarPkgs can not exceed 10000") - private String similarPkgs; - - /** - * Dependency packages information with a maximum length of 10000 characters. - */ - @Size(max = 10000, message = "the length of dependencyPkgs can not exceed 10000") - private String dependencyPkgs; - - /** - * Category with validation against AppCategoryEnum's valid categories. - */ - @EnumValue(enumClass = AppCategoryEnum.class, enumMethod = "isValidCategory") - private String category; - - /** - * Type with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of type can not exceed 100") - private String type; - - - /** - * URL to the icon of maximum length 100 characters. - */ - @Size(max = 100, message = "the length of iconUrl can not exceed 100") - private String iconUrl; - - /** - * Application version with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of appVer can not exceed 100") - private String appVer; - - /** - * Operating system support information with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of osSupport can not exceed 100") - private String osSupport; - - /** - * Operating system details with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of os can not exceed 100") - private String os; - - /** - * Architecture details with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of arch can not exceed 100") - private String arch; - - /** - * Maintainer ID with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of maintainerId can not exceed 100") - private String maintainerId; - - /** - * Email address of the maintainer with a maximum length of 100 characters. - */ - @Email - @Size(max = 100, message = "the length of maintainerEmail can not exceed 100") - private String maintainerEmail; - - /** - * Gitee ID of the maintainer with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of maintainerGiteeId can not exceed 100") - private String maintainerGiteeId; - - /** - * Last update timestamp for the maintainer with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of maintainerUpdateAt can not exceed 100") - private String maintainerUpdateAt; - - /** - * Security level information with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of securityLevel can not exceed 100") - private String securityLevel; - - /** - * Safe label information with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of safeLabel can not exceed 100") - private String safeLabel; - - /** - * Download count information with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of downloadCount can not exceed 100") - private String downloadCount; - - /** - * Application size information with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of appSize can not exceed 100") - private String appSize; - - /** - * Source repository URL with a maximum length of 100 characters. - */ - @Size(max = 100, message = "the length of srcRepo can not exceed 100") - private String srcRepo; - - /** - * URL for downloading the source code with a maximum length of 200 characters. - */ - @URL - @Size(max = 200, message = "the length of srcDownloadUrl can not exceed 200") - private String srcDownloadUrl; - - /** - * URL for downloading the binary with a maximum length of 200 characters. - */ - @URL - @Size(max = 200, message = "the length of binDownloadUrl can not exceed 200") - private String binDownloadUrl; - -} diff --git a/src/main/java/com/easysoftware/application/domainpackage/vo/DomainPackageMenuVo.java b/src/main/java/com/easysoftware/application/domainpackage/vo/DomainPackageMenuVo.java deleted file mode 100644 index 44ee81052ed97a1b689bf126bdd604dc6207952e..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/domainpackage/vo/DomainPackageMenuVo.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.easysoftware.application.domainpackage.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -@Data -@AllArgsConstructor -public class DomainPackageMenuVo { - /** - * Category of the package. - */ - private String category; - - /** - * Name of the package. - */ - private String name; - - /** - * Description of the package. - */ - private String description; - - /** - * URL to the icon of the package. - */ - private String iconUrl; - - /** - * Set of tags associated with the package. - */ - private Set tags; - - /** - * Map of package IDs where the key is the ID and the value is additional information. - */ - private Map pkgIds; - - - /** - * Constructor for DomainPackageMenuVo class. - * Initializes tags as a new HashSet and pkgIds as a new HashMap with default values. - */ - public DomainPackageMenuVo() { - this.tags = new HashSet<>(); - this.pkgIds = new HashMap<>(); - this.pkgIds.put("RPM", ""); - this.pkgIds.put("EPKG", ""); - this.pkgIds.put("IMAGE", ""); - } -} diff --git a/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageService.java b/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageService.java index 9b3f31108d13aa355752143129af9a2c074451cc..9e919d0bfac88cee9a7be94be9f6be9e385a4194 100644 --- a/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageService.java +++ b/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageService.java @@ -1,40 +1,23 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.epkgpackage; import com.easysoftware.application.BaseIService; +import com.easysoftware.application.epkgpackage.dto.EPKGPackageNameSearchCondition; import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; -import com.easysoftware.application.epkgpackage.dto.InputEPKGPackage; import com.easysoftware.infrastructure.epkgpackage.gatewayimpl.dataobject.EPKGPackageDO; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - public interface EPKGPackageService extends BaseIService { - /** - * Inserts an EPKG package. - * - * @param inputrPMPackage InputEPKGPackage object. - * @return ResponseEntity. - */ - ResponseEntity insertEPKGPkg(InputEPKGPackage inputrPMPackage); - - /** - * Updates an EPKG package. - * - * @param inputrPMPackage InputEPKGPackage object. - * @return ResponseEntity. - */ - ResponseEntity updateEPKGPkg(InputEPKGPackage inputrPMPackage); - - /** - * Deletes EPKG packages by their names. - * - * @param names List of package names to delete. - * @return ResponseEntity. - */ - ResponseEntity deleteEPKGPkg(List names); - /** * Searches for EPKG packages based on search conditions. * @@ -43,50 +26,11 @@ public interface EPKGPackageService extends BaseIService { */ ResponseEntity searchEPKGPkg(EPKGPackageSearchCondition condition); - /** - * Queries all EPKG package menus based on search conditions. - * - * @param condition EPKGPackageSearchCondition object. - * @return Map containing the menu data. - */ - Map queryAllEPKGPkgMenu(EPKGPackageSearchCondition condition); - - /** - * Checks if an application with a given name exists. - * - * @param name Name of the application. - * @return boolean indicating if the application exists. - */ - boolean existApp(String name); - - /** - * Saves a single data object. - * - * @param dataObject Data object to save. - */ - void saveDataObject(String dataObject); - - /** - * Saves a batch of data objects. - * - * @param dataObject ArrayList of data objects to save. - */ - void saveDataObjectBatch(ArrayList dataObject); - /** * Queries available openEuler version of epkg package. * * @param condition The search condition. * @return Map containing the openEuler versions. */ - ResponseEntity queryEulerVersionsByName(EPKGPackageSearchCondition condition); - - /** - * Queries available openEuler archs of epkg package. - * - * @param condition The search condition. - * @return Map containing the openEuler versions. - */ - ResponseEntity queryEulerArchsByName(EPKGPackageSearchCondition condition); - + ResponseEntity queryEulerVersionsByName(EPKGPackageNameSearchCondition condition); } diff --git a/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageServiceImpl.java b/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageServiceImpl.java index ffcfde107eabf06c98d07641b2c7e300ffa81a5c..857fca2d5cc6cc28764ad55600244b4e367e79e2 100644 --- a/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageServiceImpl.java @@ -1,23 +1,28 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.epkgpackage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.easysoftware.application.epkgpackage.dto.EPKGPackageNameSearchCondition; import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; -import com.easysoftware.application.epkgpackage.dto.InputEPKGPackage; import com.easysoftware.application.epkgpackage.vo.EPKGPackageDetailVo; -import com.easysoftware.common.utils.ObjectMapperUtil; +import com.easysoftware.common.exception.NoneResException; +import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ResultUtil; -import com.easysoftware.common.utils.UuidUtil; -import com.easysoftware.domain.epkgpackage.EPKGPackage; -import com.easysoftware.domain.epkgpackage.EPKGPackageUnique; import com.easysoftware.domain.epkgpackage.gateway.EPKGPackageGateway; import com.easysoftware.infrastructure.epkgpackage.gatewayimpl.dataobject.EPKGPackageDO; import com.easysoftware.infrastructure.mapper.EPKGPackageDOMapper; -import com.easysoftware.kafka.Producer; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -35,73 +40,6 @@ public class EPKGPackageServiceImpl extends @Resource private EPKGPackageGateway ePKGPackageGateway; - /** - * Kafka producer for messaging. - */ - @Autowired - private Producer kafkaProducer; - - /** - * API endpoint for repository maintainers. - */ - @Value("${api.repoMaintainer}") - private String repoMaintainerApi; - - /** - * API endpoint for repository signatures. - */ - @Value("${api.repoSig}") - private String repoSigApi; - - /** - * Kafka topic for application version messages. - */ - @Value("${producer.topic}") - private String topicAppVersion; - - /** - * Deletes EPKG packages by their names. - * - * @param ids List of package names to delete. - * @return ResponseEntity. - */ - @Override - public ResponseEntity deleteEPKGPkg(final List ids) { - int mark = ePKGPackageGateway.delete(ids); - String msg = String.format("the number of deleted : %d", mark); - return ResultUtil.success(HttpStatus.OK, msg); - } - - /** - * Inserts an EPKG package. - * - * @param inputEPKGPackage InputEPKGPackage object. - * @return ResponseEntity. - */ - @Override - public ResponseEntity insertEPKGPkg(final InputEPKGPackage inputEPKGPackage) { - EPKGPackage epkgPkg = new EPKGPackage(); - BeanUtils.copyProperties(inputEPKGPackage, epkgPkg); - - Map kafkaMsg = ObjectMapperUtil.jsonToMap(inputEPKGPackage); - kafkaMsg.put("table", "EPKGPackage"); - kafkaProducer.sendMess(topicAppVersion + "_epkg", UuidUtil.getUUID32(), - ObjectMapperUtil.writeValueAsString(kafkaMsg)); - - return ResultUtil.success(HttpStatus.OK); - } - - /** - * Queries all EPKG package menus based on search conditions. - * - * @param condition EPKGPackageSearchCondition object. - * @return Map containing the menu data. - */ - @Override - public Map queryAllEPKGPkgMenu(final EPKGPackageSearchCondition condition) { - return ePKGPackageGateway.queryMenuByName(condition); - } - /** * Searches for EPKG packages based on search conditions. * @@ -110,48 +48,21 @@ public class EPKGPackageServiceImpl extends */ @Override public ResponseEntity searchEPKGPkg(final EPKGPackageSearchCondition condition) { - String os = StringUtils.trimToEmpty(condition.getOs()); - String subPath = StringUtils.trimToEmpty(condition.getSubPath()); - String name = StringUtils.trimToEmpty(condition.getName()); - String version = StringUtils.trimToEmpty(condition.getVersion()); - String arch = StringUtils.trimToEmpty(condition.getArch()); - - StringBuilder cSb = new StringBuilder(); - cSb.append(os); - cSb.append(subPath); - cSb.append(name); - cSb.append(version); - cSb.append(arch); - String pkgId = cSb.toString(); - - List epkgList = ePKGPackageGateway.queryDetailByPkgId(pkgId); + if (StringUtils.isBlank(condition.getPkgId())) { + throw new ParamErrorException("the pkgid can not be null"); + } - if (!epkgList.isEmpty()) { - Map res = Map.ofEntries( - Map.entry("total", epkgList.size()), - Map.entry("list", epkgList)); - return ResultUtil.success(HttpStatus.OK, res); + List epkgList = ePKGPackageGateway.queryDetailByPkgId(condition.getPkgId()); + if (epkgList.isEmpty()) { + throw new NoneResException("the epkg package does not exist"); } - Map res = ePKGPackageGateway.queryDetailByName(condition); + Map res = Map.ofEntries( + Map.entry("total", epkgList.size()), + Map.entry("list", epkgList)); return ResultUtil.success(HttpStatus.OK, res); } - /** - * Updates an EPKG package. - * - * @param inputEPKGPackage InputEPKGPackage object. - * @return ResponseEntity. - */ - @Override - public ResponseEntity updateEPKGPkg(final InputEPKGPackage inputEPKGPackage) { - EPKGPackage epkgPkg = new EPKGPackage(); - BeanUtils.copyProperties(inputEPKGPackage, epkgPkg); - int mark = ePKGPackageGateway.update(epkgPkg); - String msg = String.format("the number of updated : %d", mark); - return ResultUtil.success(HttpStatus.OK, msg); - } - /** * Saves a batch of data objects. * @@ -159,28 +70,7 @@ public class EPKGPackageServiceImpl extends */ @Override public void saveDataObjectBatch(final ArrayList dataObject) { - saveOrUpdateBatch(ePKGPackageGateway.convertBatch(dataObject)); - } - - /** - * Checks if an application with a given name exists. - * - * @param unique unique of the application. - * @return boolean indicating if the application exists. - */ - @Override - public boolean existApp(final String unique) { - EPKGPackageUnique uniquePkg = ObjectMapperUtil.jsonToObject(unique, EPKGPackageUnique.class); - return ePKGPackageGateway.existEPKG(uniquePkg); - } - - /** - * Saves a single data object. - * - * @param dataObject Data object to save. - */ - @Override - public void saveDataObject(final String dataObject) { + return; } /** @@ -190,21 +80,8 @@ public class EPKGPackageServiceImpl extends * @return Map containing the epkg package menu. */ @Override - public ResponseEntity queryEulerVersionsByName(EPKGPackageSearchCondition condition) { + public ResponseEntity queryEulerVersionsByName(EPKGPackageNameSearchCondition condition) { Map res = ePKGPackageGateway.queryEulerVersionByName(condition); return ResultUtil.success(HttpStatus.OK, res); } - - /** - * Queries all available openEuler archs of epkg package. - * - * @param condition The search condition. - * @return Map containing the epkg package menu. - */ - @Override - public ResponseEntity queryEulerArchsByName(EPKGPackageSearchCondition condition) { - Map res = ePKGPackageGateway.queryEulerArchsByName(condition); - return ResultUtil.success(HttpStatus.OK, res); - } - } diff --git a/src/main/java/com/easysoftware/application/epkgpackage/dto/EPKGPackageNameSearchCondition.java b/src/main/java/com/easysoftware/application/epkgpackage/dto/EPKGPackageNameSearchCondition.java new file mode 100644 index 0000000000000000000000000000000000000000..dc299433a3654f0127e0d9d279e4aa5dd3bcf4e3 --- /dev/null +++ b/src/main/java/com/easysoftware/application/epkgpackage/dto/EPKGPackageNameSearchCondition.java @@ -0,0 +1,33 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.application.epkgpackage.dto; + +import com.easysoftware.common.constant.PackageConstant; + +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class EPKGPackageNameSearchCondition { + /** + * Name field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. + */ + @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) + private String name; + +} diff --git a/src/main/java/com/easysoftware/application/epkgpackage/dto/EPKGPackageSearchCondition.java b/src/main/java/com/easysoftware/application/epkgpackage/dto/EPKGPackageSearchCondition.java index 623f7c2b8a42442cf7fe4419f7765301dd4c488b..e04150123fc6b32640f66ffe278f742f3bc42114 100644 --- a/src/main/java/com/easysoftware/application/epkgpackage/dto/EPKGPackageSearchCondition.java +++ b/src/main/java/com/easysoftware/application/epkgpackage/dto/EPKGPackageSearchCondition.java @@ -1,9 +1,22 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.epkgpackage.dto; import org.hibernate.validator.constraints.Range; import com.easysoftware.common.constant.PackageConstant; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -17,78 +30,91 @@ public class EPKGPackageSearchCondition { * Name field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String name; /** * ID field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String id; /** * Package ID field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String pkgId; /** * Page number within the specified range defined by PackageConstant.MIN_PAGE_NUM and PackageConstant.MAX_PAGE_NUM. */ @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) + @NotNull private Integer pageNum = 1; /** * Page size within the specified range defined by PackageConstant.MIN_PAGE_SIZE and PackageConstant.MAX_PAGE_SIZE. */ @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) + @NotNull private Integer pageSize = 10; /** * Version field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String version; /** * Operating system field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String os; /** * Subpath field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String subPath; /** * Architecture field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String arch; /** * Category field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String category; /** * EPKG update timestamp field with a maximum length defined by PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String epkgUpdateAt; /** * Time order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String timeOrder; /** * Name order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String nameOrder; } diff --git a/src/main/java/com/easysoftware/application/epkgpackage/dto/InputEPKGPackage.java b/src/main/java/com/easysoftware/application/epkgpackage/dto/InputEPKGPackage.java deleted file mode 100644 index 799eadb186a62cabc96cb2ff9bd6bd1848176ef6..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/epkgpackage/dto/InputEPKGPackage.java +++ /dev/null @@ -1,216 +0,0 @@ -package com.easysoftware.application.epkgpackage.dto; - -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class InputEPKGPackage { - /** - * Name of the package. - */ - @Size(max = 255, message = "the length of name cannot exceed 255") - private String name; - - /** - * Unique identifier for the package. - */ - @Size(max = 255, message = "the length of id cannot exceed 255") - private String id; - - /** - * Version of the package. - */ - @Size(max = 255, message = "the length of version cannot exceed 255") - private String version; - - /** - * Operating system compatibility. - */ - @Size(max = 255, message = "the length of os cannot exceed 255") - private String os; - - /** - * Architecture type required by the package. - */ - @Size(max = 255, message = "the length of arch cannot exceed 255") - private String arch; - - /** - * Category of the package. - */ - @Size(max = 255, message = "the length of category cannot exceed 255") - private String category; - - /** - * Update timestamp for the package. - */ - @Size(max = 255, message = "the length of epkgUpdateAt cannot exceed 255") - private String epkgUpdateAt; - - /** - * Source repository URL. - */ - @Size(max = 255, message = "the length of srcRepo cannot exceed 255") - private String srcRepo; - - /** - * Size of the package. - */ - @Size(max = 255, message = "the length of epkgSize cannot exceed 255") - private String epkgSize; - - /** - * Binary download URL. - */ - @Size(max = 255, message = "the length of binDownloadUrl cannot exceed 255") - private String binDownloadUrl; - - /** - * Source code download URL. - */ - @Size(max = 255, message = "the length of srcDownloadUrl cannot exceed 255") - private String srcDownloadUrl; - - /** - * Brief summary of the package. - */ - @Size(max = 255, message = "the length of summary cannot exceed 255") - private String summary; - - /** - * Supported operating systems. - */ - @Size(max = 255, message = "the length of osSupport cannot exceed 255") - private String osSupport; - - /** - * Repository URL. - */ - @Size(max = 255, message = "the length of repo cannot exceed 255") - private String repo; - - /** - * Type of repository. - */ - @Size(max = 255, message = "the length of repoType cannot exceed 255") - private String repoType; - - /** - * Installation instructions. - */ - @Size(max = 10000, message = "the length of installation cannot exceed 10000") - private String installation; - - /** - * Detailed description of the package. - */ - @Size(max = 10000, message = "the length of description cannot exceed 10000") - private String description; - - /** - * Dependencies required by the package. - */ - @Size(max = 100_0000, message = "the length of requires can not exceed 100_0000") - private String requires; - - /** - * Features provided by the package. - */ - @Size(max = 100_0000, message = "the length of provides can not exceed 100_0000") - private String provides; - - /** - * Conflicting packages. - */ - @Size(max = 100_0000, message = "the length of conflicts can not exceed 100_0000") - private String conflicts; - - /** - * Changelog for the package. - */ - @Size(max = 100_0000, message = "the length of changeLog can not exceed 100_0000") - private String changeLog; - - /** - * Path to package files. - */ - @Size(max = 100_0000, message = "the length of path can not exceed 100_0000") - private String files; - - /** - * Maintainer's unique identifier. - */ - @Size(max = 255, message = "the length of maintainerId cannot exceed 255") - private String maintainerId; - - /** - * Maintainer's email address. - */ - @Size(max = 255, message = "the length of maintainerEmail cannot exceed 255") - private String maintainerEmail; - - /** - * Maintainer's Gitee ID. - */ - @Size(max = 255, message = "the length of maintainerGiteeId cannot exceed 255") - private String maintainerGiteeId; - - /** - * Update timestamp for the maintainer. - */ - @Size(max = 255, message = "the length of maintainerUpdateAt cannot exceed 255") - private String maintainerUpdateAt; - - /** - * Status of the maintainer. - */ - @Size(max = 255, message = "the length of maintainerStatus cannot exceed 255") - private String maintainerStatus; - - /** - * Upstream source information. - */ - @Size(max = 255, message = "the length of upStream cannot exceed 255") - private String upStream; - - /** - * Security-related information. - */ - @Size(max = 255, message = "the length of security cannot exceed 255") - private String security; - - /** - * List of similar packages. - */ - @Size(max = 1000, message = "the length of similarPkgs cannot exceed 1000") - private String similarPkgs; - - /** - * Download count for the package. - */ - @Size(max = 255, message = "the length of downloadCount cannot exceed 255") - private String downloadCount; - - /** - * Unique identifier for the package. - */ - @Size(max = 255, message = "the length of pkgId cannot exceed 255") - private String pkgId; - - /** - * Subpath information. - */ - @Size(max = 255, message = "the length of subPath cannot exceed 255") - private String subPath; - - /** - * License. - */ - @Size(max = 10_000, message = "the length of license cannot exceed 10000") - private String license; - -} diff --git a/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageDetailVo.java b/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageDetailVo.java index 2faa4f43725a82f4684ee2c2e7062fbd67168e82..cdec4ee12b4df87b04206b3d1c44e9f138fa87c5 100644 --- a/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageDetailVo.java +++ b/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageDetailVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.epkgpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageEulerArchsVo.java b/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageEulerArchsVo.java deleted file mode 100644 index 485b042ac97348c08f2820ae29813e0f4c9ecd5f..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageEulerArchsVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.easysoftware.application.epkgpackage.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class EPKGPackageEulerArchsVo { - /** - * OpenEuler arch of the package. - */ - private String arch; -} diff --git a/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageEulerVersionVo.java b/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageEulerVersionVo.java index 01e01184f33cb11d09e8b1bfecccb4e0fb35f38b..3cf3dce0444eb78617aa61a9d4d79c0458d27b6a 100644 --- a/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageEulerVersionVo.java +++ b/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageEulerVersionVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.epkgpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageMenuVo.java b/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageMenuVo.java index 54cac305054c91b348845add757d8347f4ff1e41..f2209c42a0527b2352942e755c2027924514b07b 100644 --- a/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageMenuVo.java +++ b/src/main/java/com/easysoftware/application/epkgpackage/vo/EPKGPackageMenuVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.epkgpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/externalos/ExternalOsService.java b/src/main/java/com/easysoftware/application/externalos/ExternalOsService.java deleted file mode 100644 index 8501e1a8eb29c97e2c28a2fffc4f72e52d0b4fa8..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/externalos/ExternalOsService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.easysoftware.application.externalos; - -import com.easysoftware.application.externalos.dto.ExternalOsSearchCondiiton; -import com.easysoftware.application.externalos.dto.InputExternalOs; -import org.springframework.http.ResponseEntity; - -import java.util.List; - -public interface ExternalOsService { - - /** - * Search for package mappings based on the specified search conditions. - * - * @param condition The search conditions to filter package mappings. - * @return ResponseEntity. - */ - ResponseEntity searchPkgMap(ExternalOsSearchCondiiton condition); - - /** - * Insert a new package mapping using the provided input data. - * - * @param input The input data for creating a new package mapping. - * @return ResponseEntity. - */ - ResponseEntity insertPkgMap(InputExternalOs input); - - /** - * Update an existing package mapping with the provided input data. - * - * @param input The input data for updating an existing package mapping. - * @return ResponseEntity. - */ - ResponseEntity updatePkgMap(InputExternalOs input); - - /** - * Delete package mappings associated with the specified list of IDs. - * - * @param ids List of IDs of package mappings to be deleted. - * @return ResponseEntity. - */ - ResponseEntity deletePkgMap(List ids); - - -} diff --git a/src/main/java/com/easysoftware/application/externalos/ExternalOsServiceImpl.java b/src/main/java/com/easysoftware/application/externalos/ExternalOsServiceImpl.java deleted file mode 100644 index 7c3b31165f26cb76254b4886a96b202f14916926..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/externalos/ExternalOsServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.easysoftware.application.externalos; - -import com.easysoftware.application.externalos.dto.ExternalOsSearchCondiiton; -import com.easysoftware.application.externalos.dto.InputExternalOs; -import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.utils.ResultUtil; -import com.easysoftware.domain.externalos.ExternalOs; -import com.easysoftware.domain.externalos.gateway.ExternalOsGateway; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -@Service -public class ExternalOsServiceImpl implements ExternalOsService { - /** - * Gateway for external operating system operations. - */ - @Resource - private ExternalOsGateway externalOsGateway; - - /** - * Search for package mappings based on the specified search conditions. - * - * @param condition The search conditions to filter package mappings. - * @return ResponseEntity. - */ - @Override - public ResponseEntity searchPkgMap(final ExternalOsSearchCondiiton condition) { - Map res = externalOsGateway.queryPkgMap(condition); - return ResultUtil.success(HttpStatus.OK, res); - } - - /** - * Delete package mappings associated with the specified list of IDs. - * - * @param ids List of IDs of package mappings to be deleted. - * @return ResponseEntity. - */ - @Override - public ResponseEntity deletePkgMap(final List ids) { - int mark = externalOsGateway.delete(ids); - String msg = String.format("the number of deleted : %d", mark); - return ResultUtil.success(HttpStatus.OK, msg); - } - - /** - * Insert a new package mapping using the provided input data. - * - * @param input The input data for creating a new package mapping. - * @return ResponseEntity. - */ - @Override - public ResponseEntity insertPkgMap(final InputExternalOs input) { - // 若数据库中已经存在该数据，则请求失败 - if (StringUtils.isNotBlank(input.getId())) { - return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0002); - } - - ExternalOs ex = new ExternalOs(); - BeanUtils.copyProperties(input, ex); - - boolean succeed = externalOsGateway.save(ex); - return succeed ? ResultUtil.success(HttpStatus.OK) - : ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0006); - } - - /** - * Update an existing package mapping with the provided input data. - * - * @param input The input data for updating an existing package mapping. - * @return ResponseEntity. - */ - @Override - public ResponseEntity updatePkgMap(final InputExternalOs input) { - ExternalOs ex = new ExternalOs(); - BeanUtils.copyProperties(input, ex); - - int mark = externalOsGateway.update(ex); - String msg = String.format("the number of updated : %d", mark); - return ResultUtil.success(HttpStatus.OK, msg); - } - -} diff --git a/src/main/java/com/easysoftware/application/externalos/dto/ExternalOsSearchCondiiton.java b/src/main/java/com/easysoftware/application/externalos/dto/ExternalOsSearchCondiiton.java deleted file mode 100644 index 9bea6f10326b02a564bee467942f34936f6a6e29..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/externalos/dto/ExternalOsSearchCondiiton.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.easysoftware.application.externalos.dto; - -import org.hibernate.validator.constraints.Range; - -import com.easysoftware.common.constant.PackageConstant; - -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class ExternalOsSearchCondiiton { - /** - * Page number within the specified range. - */ - @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) - private Integer pageNum = 1; - - /** - * Page size within the specified range. - */ - @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) - private Integer pageSize = 10; - - /** - * Name of the original operating system (maximum 50 characters). - */ - @Size(max = 50) - private String originOsName; - - /** - * Version of the original operating system (maximum 50 characters). - */ - @Size(max = 50) - private String originOsVer; - - /** - * Name of the original package (maximum 50 characters). - */ - @Size(max = 50) - private String originPkg; - - /** - * Name of the target operating system (maximum 50 characters). - */ - @Size(max = 50) - private String targetOsName; - - /** - * Version of the target operating system (maximum 50 characters). - */ - @Size(max = 50) - private String targetOsVer; - - /** - * Name of the target package (maximum 50 characters). - */ - @Size(max = 50) - private String targetPkg; - -} diff --git a/src/main/java/com/easysoftware/application/externalos/dto/InputExternalOs.java b/src/main/java/com/easysoftware/application/externalos/dto/InputExternalOs.java deleted file mode 100644 index 3aa201a94bbadd2f0585e3322b8a0134076d1d03..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/externalos/dto/InputExternalOs.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.easysoftware.application.externalos.dto; - -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class InputExternalOs { - /** - * Name (maximum length: 255 characters). - */ - @Size(max = 255, message = "the length of name cannot exceed 255") - private String name; - - /** - * Identifier (maximum length: 255 characters). - */ - @Size(max = 255, message = "the length of id cannot exceed 255") - private String id; - - /** - * Original operating system name (maximum length: 255 characters). - */ - @Size(max = 255, message = "the length of originOsName cannot exceed 255") - private String originOsName; - - /** - * Original operating system version (maximum length: 255 characters). - */ - @Size(max = 255, message = "the length of originOsVer cannot exceed 255") - private String originOsVer; - - /** - * Original package name (maximum length: 255 characters). - */ - @Size(max = 255, message = "the length of originPkg cannot exceed 255") - private String originPkg; - - /** - * Target operating system name (maximum length: 255 characters). - */ - @Size(max = 255, message = "the length of targetOsName cannot exceed 255") - private String targetOsName; - - /** - * Target operating system version (maximum length: 255 characters). - */ - @Size(max = 255, message = "the length of targetOsVer cannot exceed 255") - private String targetOsVer; - - /** - * Target package name (maximum length: 255 characters). - */ - @Size(max = 255, message = "the length of targetPkg cannot exceed 255") - private String targetPkg; - - -} diff --git a/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgColumnSearchCondition.java b/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgColumnSearchCondition.java index eefb000dd38d5e0e7235a771431e29081e7b35ba..d9ea415b716dea77012f8a49589ca0b5de00f9e6 100644 --- a/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgColumnSearchCondition.java +++ b/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgColumnSearchCondition.java @@ -1,5 +1,19 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.fieldpkg.dto; +import com.easysoftware.common.constant.PackageConstant; + +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -13,11 +27,13 @@ public class FieldPkgColumnSearchCondition { * Column (maximum length: 50). */ @Size(max = 50) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String column; /** * Name (maximum length: 50). */ @Size(max = 50) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String name; } diff --git a/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgDetailSearchCondition.java b/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgDetailSearchCondition.java index 88b474ae691b5dd450a8d3742c5673d1e7826f5f..029ae162afa1a255031c0fad8d10f2748e1c2268 100644 --- a/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgDetailSearchCondition.java +++ b/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgDetailSearchCondition.java @@ -1,7 +1,19 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.fieldpkg.dto; import com.easysoftware.common.constant.PackageConstant; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -15,17 +27,20 @@ public class FieldPkgDetailSearchCondition { * RPM package ID (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String rpmPkgId; /** * EPKG package ID (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String epkgPkgId; /** * Application package ID (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String appPkgId; } diff --git a/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgSearchCondition.java b/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgSearchCondition.java index abfd754e47f363af4d346b24ea90f15901f667b8..42c94d9acd5d21154b45799be8f86b5219827ae5 100644 --- a/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgSearchCondition.java +++ b/src/main/java/com/easysoftware/application/fieldpkg/dto/FieldPkgSearchCondition.java @@ -1,9 +1,21 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.fieldpkg.dto; import org.hibernate.validator.constraints.Range; import com.easysoftware.common.constant.PackageConstant; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -17,12 +29,14 @@ public class FieldPkgSearchCondition { * Page number within the specified range. */ @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) + @NotNull private Integer pageNum = 1; /** * Page size within the specified range. */ @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) + @NotNull private Integer pageSize = 10; /** diff --git a/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java b/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java index 4284403587356f1d31dc409ce9cf894cb0f9efcd..397e25fb2e9d9aa396df1a6eb93711eea593c490 100644 --- a/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java +++ b/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java @@ -1,7 +1,18 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.fieldpkg.vo; +import java.util.List; import java.util.Map; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; @@ -42,9 +53,9 @@ public class FieldPkgVo { private String iconUrl; /** - * Set of tags. + * List of tags. */ - private Set tags; + private List tags; /** * Map of package IDs. diff --git a/src/main/java/com/easysoftware/application/filedapplication/FieldApplicationService.java b/src/main/java/com/easysoftware/application/filedapplication/FieldApplicationService.java index 864d086742efc0f3c8282e733ab0f06379bc7c69..4f1348d97cde920ab13418ea2d052dec1fef6078 100644 --- a/src/main/java/com/easysoftware/application/filedapplication/FieldApplicationService.java +++ b/src/main/java/com/easysoftware/application/filedapplication/FieldApplicationService.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.filedapplication; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/easysoftware/application/filedapplication/FieldApplicationServiceImpl.java b/src/main/java/com/easysoftware/application/filedapplication/FieldApplicationServiceImpl.java index 5690314bbf645ca210d9f787c8a4bd0cba05e769..33488824a44c1a6210c0875887448cda9687d229 100644 --- a/src/main/java/com/easysoftware/application/filedapplication/FieldApplicationServiceImpl.java +++ b/src/main/java/com/easysoftware/application/filedapplication/FieldApplicationServiceImpl.java @@ -1,11 +1,25 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.filedapplication; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageDetailVo; +import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; import com.easysoftware.application.epkgpackage.EPKGPackageService; import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; import com.easysoftware.application.epkgpackage.vo.EPKGPackageDetailVo; +import com.easysoftware.application.epkgpackage.vo.EPKGPackageMenuVo; import com.easysoftware.application.fieldpkg.dto.FieldPkgSearchCondition; +import com.easysoftware.application.fieldpkg.vo.FieldPkgVo; import com.easysoftware.application.filedapplication.dto.FieldColumnSearchCondition; import com.easysoftware.application.filedapplication.dto.FieldDetailSearchCondition; import com.easysoftware.application.filedapplication.dto.FiledApplicationSerachCondition; @@ -13,11 +27,14 @@ import com.easysoftware.application.filedapplication.vo.FiledApplicationVo; import com.easysoftware.application.rpmpackage.RPMPackageService; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; +import com.easysoftware.application.rpmpackage.vo.RPMPackageMenuVo; import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.exception.NoneResException; import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.exception.enumvalid.AppCategoryEnum; import com.easysoftware.common.utils.QueryWrapperUtil; import com.easysoftware.common.utils.ResultUtil; +import com.easysoftware.common.utils.SortUtil; import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; import com.easysoftware.domain.epkgpackage.gateway.EPKGPackageGateway; import com.easysoftware.domain.fieldapplication.gateway.FieldapplicationGateway; @@ -39,6 +56,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -122,7 +140,7 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { List> cateMap = searchMainPage(); return ResultUtil.success(HttpStatus.OK, cateMap); } else { - throw new ParamErrorException("unsupported param"); + throw new ParamErrorException("the value of parameter name: apppkg, rpmpkg, epkgpkg, all"); } } @@ -140,7 +158,11 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { } List> mList = assembleMainPage(cateMap); - return ranker.rankingDomainPageByOperationConfig(mList); + List> rList = ranker.rankingDomainPageByOperationConfig(mList); + if (rList.size() == 0) { + throw new NoneResException("the mainpage package does not exist"); + } + return rList; } /** @@ -184,7 +206,14 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { */ private Map searchDomainMenu(FiledApplicationSerachCondition condition) { FieldPkgSearchCondition con = FieldApplicationConverter.toFieldPkg(condition); - return fieldPkgGateway.queryMenuByPage(con); + Map map = fieldPkgGateway.queryMenuByPage(con); + + Long total = (Long) map.get("total"); + List list = (List) map.get("list"); + if (total == 0 || list.size() == 0) { + throw new NoneResException("the domain package does not exist"); + } + return map; } /** @@ -196,7 +225,14 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { */ private Map searchEpkgMenu(final FiledApplicationSerachCondition condition) { EPKGPackageSearchCondition epkg = FieldApplicationConverter.toEpkg(condition); - return epkgService.queryAllEPKGPkgMenu(epkg); + Map map = epkgGateway.queryMenuByName(epkg); + + Long total = (Long) map.get("total"); + List list = (List) map.get("list"); + if (total == 0 || list.size() == 0) { + throw new NoneResException("the epkg package does not exist"); + } + return map; } /** @@ -208,7 +244,15 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { */ private Map searchRpmMenu(final FiledApplicationSerachCondition condition) { RPMPackageSearchCondition rpm = FieldApplicationConverter.toRpm(condition); - return rpmService.queryAllRPMPkgMenu(rpm); + Map map = rpmGateway.queryMenuByName(rpm); + + Long total = (Long) map.get("total"); + List list = (List) map.get("list"); + + if (total == 0 || list.size() == 0) { + throw new NoneResException("the rpm package does not exist"); + } + return map; } /** @@ -220,7 +264,14 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { */ private Map searchAppMenu(final FiledApplicationSerachCondition condition) { ApplicationPackageSearchCondition app = FieldApplicationConverter.toApp(condition); - return appGateway.queryMenuByName(app); + Map map = appGateway.queryMenuByName(app); + + Long total = (Long) map.get("total"); + List list = (List) map.get("list"); + if (total == 0 || list.size() == 0) { + throw new NoneResException("the image package does not exist"); + } + return map; } /** @@ -247,7 +298,7 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { Map> res = fieldPkgGateway.queryColumn(columns); return ResultUtil.success(HttpStatus.OK, res); } else { - throw new ParamErrorException("unsupported param"); + throw new ParamErrorException("the value of parameter name: apppkg, rpmpkg, epkgpkg, all"); } } @@ -284,7 +335,8 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { tags.add("EPKG"); } - res.put("tags", tags); + List sortedTags = SortUtil.sortTags(tags); + res.put("tags", sortedTags); return ResultUtil.success(HttpStatus.OK, res); } @@ -296,11 +348,15 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { * package. */ private EPKGPackageDetailVo searchEpkgDetail(final String epkgPkgId) { + if (StringUtils.isBlank(epkgPkgId)) { + return null; + } + List pkgList = epkgGateway.queryDetailByPkgId(epkgPkgId); if (pkgList.size() >= 1) { return pkgList.get(0); } - LOGGER.error(String.format(MessageCode.EC00014.getMsgEn(), "epkgPkgId")); + LOGGER.error(String.format(Locale.ROOT, MessageCode.EC00014.getMsgEn(), "epkgPkgId")); return null; } @@ -312,11 +368,15 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { * package. */ private RPMPackageDetailVo searchRpmDetail(final String rpmPkgId) { + if (StringUtils.isBlank(rpmPkgId)) { + return null; + } + List pkgList = rpmGateway.queryDetailByPkgId(rpmPkgId); if (pkgList.size() >= 1) { return pkgList.get(0); } - LOGGER.error(String.format(MessageCode.EC00014.getMsgEn(), "rpmPkgId")); + LOGGER.error(String.format(Locale.ROOT, MessageCode.EC00014.getMsgEn(), "rpmPkgId")); return null; } @@ -328,11 +388,15 @@ public class FieldApplicationServiceImpl implements FieldApplicationService { * application package. */ private ApplicationPackageDetailVo searchAppDetail(final String appPkgId) { + if (StringUtils.isBlank(appPkgId)) { + return null; + } + List pkgList = appGateway.queryDetailByPkgId(appPkgId); if (pkgList.size() >= 1) { return pkgList.get(0); } - LOGGER.error(String.format(MessageCode.EC00014.getMsgEn(), "appPkgId")); + LOGGER.error(String.format(Locale.ROOT, MessageCode.EC00014.getMsgEn(), "appPkgId")); return null; } diff --git a/src/main/java/com/easysoftware/application/filedapplication/dto/FieldColumnSearchCondition.java b/src/main/java/com/easysoftware/application/filedapplication/dto/FieldColumnSearchCondition.java index 4a8ac7a67124ebbc067a785fd8a8dd2b2a1ecd78..b05ca90f0c0bfa81622844992d579a45a933b249 100644 --- a/src/main/java/com/easysoftware/application/filedapplication/dto/FieldColumnSearchCondition.java +++ b/src/main/java/com/easysoftware/application/filedapplication/dto/FieldColumnSearchCondition.java @@ -1,5 +1,19 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.filedapplication.dto; +import com.easysoftware.common.constant.PackageConstant; + +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -13,12 +27,14 @@ public class FieldColumnSearchCondition { * Column (maximum length: 50). */ @Size(max = 50) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String column; /** * Name (maximum length: 50). */ @Size(max = 50) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String name; } diff --git a/src/main/java/com/easysoftware/application/filedapplication/dto/FieldDetailSearchCondition.java b/src/main/java/com/easysoftware/application/filedapplication/dto/FieldDetailSearchCondition.java index c49cbf605a6a912e30c2440f649e7b3dcc31393b..127e0210551eb1da89c720e9eb203d89f263aa56 100644 --- a/src/main/java/com/easysoftware/application/filedapplication/dto/FieldDetailSearchCondition.java +++ b/src/main/java/com/easysoftware/application/filedapplication/dto/FieldDetailSearchCondition.java @@ -1,7 +1,19 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.filedapplication.dto; import com.easysoftware.common.constant.PackageConstant; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -15,18 +27,21 @@ public class FieldDetailSearchCondition { * RPM package ID (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String rpmPkgId; /** * EPKG package ID (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String epkgPkgId; /** * Application package ID (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String appPkgId; } diff --git a/src/main/java/com/easysoftware/application/filedapplication/dto/FiledApplicationSerachCondition.java b/src/main/java/com/easysoftware/application/filedapplication/dto/FiledApplicationSerachCondition.java index 91b01952904dc0d721c9fbfaff0c81a85a27b4fc..38377edc0a598977a1f5f1fbd4858f06c29d975d 100644 --- a/src/main/java/com/easysoftware/application/filedapplication/dto/FiledApplicationSerachCondition.java +++ b/src/main/java/com/easysoftware/application/filedapplication/dto/FiledApplicationSerachCondition.java @@ -1,9 +1,22 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.filedapplication.dto; import org.hibernate.validator.constraints.Range; import com.easysoftware.common.constant.PackageConstant; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,47 +29,55 @@ public class FiledApplicationSerachCondition { * Page number within the specified range. */ @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) + @NotNull private Integer pageNum = 1; /** * Page size within the specified range. */ @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) + @NotNull private Integer pageSize = 10; /** * Operating system (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String os; /** * Architecture (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String arch; /** * Category (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String category; /** * Name (maximum length: PackageConstant.MAX_FIELD_LENGTH). */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String name; /** * Time order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String timeOrder; /** * Name order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String nameOrder; } diff --git a/src/main/java/com/easysoftware/application/filedapplication/dto/InputFiledApplication.java b/src/main/java/com/easysoftware/application/filedapplication/dto/InputFiledApplication.java deleted file mode 100644 index e9cc80175707d6fde37e14c737324da904f24b32..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/filedapplication/dto/InputFiledApplication.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.easysoftware.application.filedapplication.dto; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Map; -import java.util.Set; - - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class InputFiledApplication { - /** - * Operating system. - */ - private String os; - - /** - * Architecture. - */ - private String arch; - - /** - * Name. - */ - private String name; - - /** - * Version. - */ - private String version; - - /** - * Category. - */ - private String category; - - /** - * Icon URL. - */ - private String iconUrl; - - /** - * Set of tags. - */ - private Set tags; - - /** - * Map of package IDs. - */ - private Map pkgIds; - - /** - * Description. - */ - private String description; - -} diff --git a/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java b/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java index 097117c7aed034c2164ae8845a20cd5393d1ce29..f54d74e8cbf53533a4caca185350de774ef3361d 100644 --- a/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java +++ b/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java @@ -1,10 +1,21 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.filedapplication.vo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Set; +import java.util.List; import java.util.Map; @Data @@ -42,9 +53,9 @@ public class FiledApplicationVo { private String iconUrl; /** - * Set of tags. + * List of tags. */ - private Set tags; + private List tags; /** * Map of package IDs. diff --git a/src/main/java/com/easysoftware/application/operationconfig/OperationConfigService.java b/src/main/java/com/easysoftware/application/operationconfig/OperationConfigService.java index 985c2762f53211e1192790d335cfd26fadef9bb5..5f1ce99fe829727fc76143f2161e875e8d75ab64 100644 --- a/src/main/java/com/easysoftware/application/operationconfig/OperationConfigService.java +++ b/src/main/java/com/easysoftware/application/operationconfig/OperationConfigService.java @@ -1,22 +1,15 @@ -package com.easysoftware.application.operationconfig; +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ -import com.easysoftware.application.operationconfig.dto.InputOperationConfig; +package com.easysoftware.application.operationconfig; public interface OperationConfigService { - /** - * Inserts an operation configuration based on the input. - * - * @param input The input operation configuration to insert. - * @return True if the operation configuration was successfully inserted, false otherwise. - */ - boolean insertOperationConfig(InputOperationConfig input); - - /** - * Deletes operation configurations by type. - * - * @param type The type of operation configurations to delete. - * @return True if the operation configurations were successfully deleted, false otherwise. - */ - boolean deleteByType(String type); - } diff --git a/src/main/java/com/easysoftware/application/operationconfig/OperationConfigServiceImpl.java b/src/main/java/com/easysoftware/application/operationconfig/OperationConfigServiceImpl.java index d88ac10b5e0635e3e395d287d47d03b4dc7763a4..b3fe6fb227e0df344e6a055845952f5766f4b7f7 100644 --- a/src/main/java/com/easysoftware/application/operationconfig/OperationConfigServiceImpl.java +++ b/src/main/java/com/easysoftware/application/operationconfig/OperationConfigServiceImpl.java @@ -1,9 +1,19 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.operationconfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.easysoftware.application.operationconfig.dto.InputOperationConfig; import com.easysoftware.domain.operationconfig.gateway.OperationConfigGateway; @Service @@ -14,29 +24,4 @@ public class OperationConfigServiceImpl implements OperationConfigService { */ @Autowired private OperationConfigGateway gateway; - - /** - * Inserts an operation configuration based on the input. - * - * @param input The input operation configuration to insert. - * @return True if the operation configuration was successfully inserted, false otherwise. - */ - @Override - public boolean insertOperationConfig(final InputOperationConfig input) { - // boolean - return gateway.insertOperationConfig(input); - } - - /** - * Deletes operation configurations by type. - * - * @param type The type of operation configurations to delete. - * @return True if the operation configurations were successfully deleted, false otherwise. - */ - @Override - public boolean deleteByType(final String type) { - return gateway.deleteByType(type); - } - - } diff --git a/src/main/java/com/easysoftware/application/operationconfig/dto/InputOperationConfig.java b/src/main/java/com/easysoftware/application/operationconfig/dto/InputOperationConfig.java deleted file mode 100644 index feee03ffe516ec5645f1a677b673275da46f800a..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/operationconfig/dto/InputOperationConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.easysoftware.application.operationconfig.dto; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class InputOperationConfig { - /** - * Categories. - */ - private String categorys; - - /** - * Order index. - */ - private String orderIndex; - - /** - * Recommendation status. - */ - private String recommend; - - /** - * Type. - */ - private String type; - -} diff --git a/src/main/java/com/easysoftware/application/operationconfig/vo/OperationConfigVo.java b/src/main/java/com/easysoftware/application/operationconfig/vo/OperationConfigVo.java index 9676bba945f79991087c4d06a1a2e2384489e373..51d074e571229f92508379b8f168e0ca65da0e3d 100644 --- a/src/main/java/com/easysoftware/application/operationconfig/vo/OperationConfigVo.java +++ b/src/main/java/com/easysoftware/application/operationconfig/vo/OperationConfigVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.operationconfig.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageService.java b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageService.java index d9fc294b0defed0ffb0d50d4b45692fe2616a8c6..72fa7dbe39dbe070132bae5764f05be999635323 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageService.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageService.java @@ -1,41 +1,26 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.rpmpackage; import com.easysoftware.application.BaseIService; -import com.easysoftware.application.rpmpackage.dto.InputRPMPackage; +import com.easysoftware.application.rpmpackage.dto.RPMPackageNameSearchCondition; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.application.rpmpackage.vo.RPMPackageDomainVo; import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject.RPMPackageDO; import org.springframework.http.ResponseEntity; - -import java.util.ArrayList; import java.util.List; import java.util.Map; public interface RPMPackageService extends BaseIService { - /** - * Inserts an RPM package. - * - * @param inputrPMPackage The input RPM package. - * @return ResponseEntity with the result of the operation. - */ - ResponseEntity insertRPMPkg(InputRPMPackage inputrPMPackage); - - /** - * Updates an RPM package. - * - * @param inputrPMPackage The input RPM package. - * @return ResponseEntity with the result of the operation. - */ - ResponseEntity updateRPMPkg(InputRPMPackage inputrPMPackage); - - /** - * Deletes RPM packages. - * - * @param names List of names of RPM packages to delete. - * @return ResponseEntity with the result of the operation. - */ - ResponseEntity deleteRPMPkg(List names); - /** * Searches for RPM packages. * @@ -58,37 +43,15 @@ public interface RPMPackageService extends BaseIService { * @param condition The search condition. * @return Map containing the openEuler versions. */ - ResponseEntity queryEulerVersionsByName(RPMPackageSearchCondition condition); - - /** - * Queries available openEuler archs of RPM package. - * - * @param condition The search condition. - * @return Map containing the openEuler versions. - */ - ResponseEntity queryEulerArchsByName(RPMPackageSearchCondition condition); - - /** - * Checks if an application exists. - * - * @param name The name of the application. - * @return true if the application exists, false otherwise. - */ - boolean existApp(String name); - - /** - * Saves a data object. - * - * @param dataObject The data object to save. - */ - void saveDataObject(String dataObject); + ResponseEntity queryEulerVersionsByName(RPMPackageNameSearchCondition condition); /** - * Saves a batch of data objects. + * Query the RPM newest version based on the provided search condition. * - * @param dataObject List of data objects to save. + * @param condition The search condition for querying RPM newest version + * @return A map containing RPM newest version */ - void saveDataObjectBatch(ArrayList dataObject); + ResponseEntity queryNewstRpmVersion(RPMPackageNameSearchCondition condition); /** * Queries part of the application package menu. diff --git a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java index 6a950aed40e9e69d026786be16c1f5dc0b8ac5e3..04404a0a2ea4fe8a1a2f47c1bb3afda9c361ddbe 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java @@ -1,26 +1,30 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.rpmpackage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.easysoftware.application.rpmpackage.dto.InputRPMPackage; +import com.easysoftware.application.rpmpackage.dto.RPMPackageNameSearchCondition; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageDomainVo; -import com.easysoftware.common.constant.MapConstant; -import com.easysoftware.common.utils.ApiUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; +import com.easysoftware.common.exception.NoneResException; +import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ResultUtil; -import com.easysoftware.common.utils.UuidUtil; -import com.easysoftware.domain.rpmpackage.RPMPackage; -import com.easysoftware.domain.rpmpackage.RPMPackageUnique; import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; import com.easysoftware.infrastructure.mapper.RPMPackageDOMapper; import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject.RPMPackageDO; -import com.easysoftware.kafka.Producer; import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Primary; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -34,18 +38,11 @@ import java.util.Map; @Primary @Service("RPMPackageService") public class RPMPackageServiceImpl extends ServiceImpl implements RPMPackageService { - /** - * Autowired Kafka producer. - */ - @Autowired - private Producer kafkaProducer; - /** * Resource for RPM Package Gateway. */ @Resource private RPMPackageGateway rPMPkgGateway; - /** * Value for Repository Maintainer API. */ @@ -88,54 +85,23 @@ public class RPMPackageServiceImpl extends ServiceImpl queryEulerVersionsByName(RPMPackageSearchCondition condition) { + public ResponseEntity queryEulerVersionsByName(RPMPackageNameSearchCondition condition) { Map res = rPMPkgGateway.queryEulerVersionByName(condition); return ResultUtil.success(HttpStatus.OK, res); } /** - * Queries all available openEuler archs of RPM package. + * Queries newest version of RPM package. * * @param condition The search condition. * @return Map containing the RPM package menu. */ @Override - public ResponseEntity queryEulerArchsByName(RPMPackageSearchCondition condition) { - Map res = rPMPkgGateway.queryEulerArchsByName(condition); + public ResponseEntity queryNewstRpmVersion(RPMPackageNameSearchCondition condition) { + Map res = rPMPkgGateway.queryNewstRpmVersion(condition); return ResultUtil.success(HttpStatus.OK, res); } - /** - * Deletes RPM packages. - * - * @param ids List of names of RPM packages to delete. - * @return ResponseEntity with the result of the operation. - */ - @Override - public ResponseEntity deleteRPMPkg(final List ids) { - int mark = rPMPkgGateway.delete(ids); - String msg = String.format("the number of deleted : %d", mark); - return ResultUtil.success(HttpStatus.OK, msg); - } - - /** - * Inserts an RPM package. - * - * @param inputrPMPackage The input RPM package. - * @return ResponseEntity with the result of the operation. - */ - @Override - public ResponseEntity insertRPMPkg(final InputRPMPackage inputrPMPackage) { - - RPMPackage rPMPkg = new RPMPackage(); - BeanUtils.copyProperties(inputrPMPackage, rPMPkg); - Map kafkaMsg = ObjectMapperUtil.jsonToMap(inputrPMPackage); - kafkaMsg.put("table", "RPMPackage"); - kafkaProducer.sendMess(topicAppVersion + "_rpm", - UuidUtil.getUUID32(), ObjectMapperUtil.writeValueAsString(kafkaMsg)); - return ResultUtil.success(HttpStatus.OK); - } - /** * Searches for RPM packages. * @@ -144,81 +110,20 @@ public class RPMPackageServiceImpl extends ServiceImpl searchRPMPkg(final RPMPackageSearchCondition condition) { - String pkgId = assemblePkgId(condition); - - List rpmList = rPMPkgGateway.queryDetailByPkgId(pkgId); - if (!rpmList.isEmpty()) { - Map res = Map.ofEntries( - Map.entry("total", rpmList.size()), - Map.entry("list", rpmList)); - return ResultUtil.success(HttpStatus.OK, res); + if (StringUtils.isBlank(condition.getPkgId())) { + throw new ParamErrorException("the pkgid can not be null"); } - Map res = rPMPkgGateway.queryDetailByName(condition); + List rpmList = rPMPkgGateway.queryDetailByPkgId(condition.getPkgId()); + if (rpmList.isEmpty()) { + throw new NoneResException("the rpm package does not exist"); + } + Map res = Map.ofEntries( + Map.entry("total", rpmList.size()), + Map.entry("list", rpmList)); return ResultUtil.success(HttpStatus.OK, res); } - /** - * Assembles the package ID based on the RPM Package search condition. - * - * @param condition The RPM Package search condition. - * @return The assembled package ID as a String. - */ - private String assemblePkgId(final RPMPackageSearchCondition condition) { - String os = StringUtils.trimToEmpty(condition.getOs()); - String subPath = StringUtils.trimToEmpty(condition.getSubPath()); - String name = StringUtils.trimToEmpty(condition.getName()); - String version = StringUtils.trimToEmpty(condition.getVersion()); - String arch = StringUtils.trimToEmpty(condition.getArch()); - - StringBuilder cSb = new StringBuilder(); - cSb.append(os); - cSb.append(subPath); - cSb.append(name); - cSb.append(version); - cSb.append(arch); - String pkgId = cSb.toString(); - return pkgId; - } - - /** - * Updates an RPM package. - * - * @param inputrPMPackage The input RPM package. - * @return ResponseEntity with the result of the operation. - */ - @Override - public ResponseEntity updateRPMPkg(final InputRPMPackage inputrPMPackage) { - RPMPackage rPMPkg = new RPMPackage(); - BeanUtils.copyProperties(inputrPMPackage, rPMPkg); - int mark = rPMPkgGateway.update(rPMPkg); - String msg = String.format("the number of updated : %d", mark); - return ResultUtil.success(HttpStatus.OK, msg); - } - - /** - * Checks if an application exists. - * - * @param unique The name of the application. - * @return true if the application exists, false otherwise. - */ - @Override - public boolean existApp(final String unique) { - RPMPackageUnique uniquePkg = ObjectMapperUtil.jsonToObject(unique, RPMPackageUnique.class); - return rPMPkgGateway.existRPM(uniquePkg); - } - - /** - * Saves a data object. - * - * @param dataObject The data object to save. - */ - @Override - public void saveDataObject(final String dataObject) { - RPMPackage appVer = ObjectMapperUtil.jsonToObject(dataObject, RPMPackage.class); - rPMPkgGateway.save(appVer); - } - /** * Saves a batch of data objects. * @@ -227,50 +132,7 @@ public class RPMPackageServiceImpl extends ServiceImpl dataObject) { - saveOrUpdateBatch(rPMPkgGateway.convertBatch(dataObject)); - } - - /** - * Adds RPM package maintainer information to the given RPM package. - * - * @param rPMPkg The RPM package to which maintainer info will be added. - * @return Updated RPM package with maintainer information. - */ - public RPMPackage addRPMPkgMaintainerInfo(final RPMPackage rPMPkg) { - Map maintainer = ApiUtil.getApiResponseMaintainer( - String.format(repoMaintainerApi, rPMPkg.getName())); - rPMPkg.setMaintainerGiteeId(maintainer.get(MapConstant.MAINTAINER_GITEE_ID)); - rPMPkg.setMaintainerId(maintainer.get(MapConstant.MAINTAINER_ID)); - rPMPkg.setMaintainerEmail(maintainer.get(MapConstant.MAINTAINER_EMAIL)); - return rPMPkg; - } - - /** - * Adds repository signature information to the given RPM package. - * - * @param rPMPkg The RPM package to which repository signature will be added. - * @return Updated RPM package with repository signature. - */ - public RPMPackage addRPMPkgRepoSig(final RPMPackage rPMPkg) { - String resp = ApiUtil.getApiResponseData(String.format(repoSigApi, rPMPkg.getName())); - String category = (resp != null && MapConstant.CATEGORY_MAP.containsKey(resp)) - ? MapConstant.CATEGORY_MAP.get(resp) - : MapConstant.CATEGORY_MAP.get(MapConstant.CATEGORY_OTHER); - rPMPkg.setCategory(category); - return rPMPkg; - } - - /** - * Adds repository download information to the given RPM package. - * - * @param rPMPkg The RPM package to which repository download information will - * be added. - * @return Updated RPM package with repository download information. - */ - public RPMPackage addRPMPkgRepoDownload(final RPMPackage rPMPkg) { - String resp = ApiUtil.getApiResponseData(String.format(repoDownloadApi, rPMPkg.getName())); - rPMPkg.setDownloadCount(resp); - return rPMPkg; + return; } /** diff --git a/src/main/java/com/easysoftware/application/rpmpackage/dto/InputRPMPackage.java b/src/main/java/com/easysoftware/application/rpmpackage/dto/InputRPMPackage.java deleted file mode 100644 index 1b4a9e88ad6af6dda7a4d34111656dee0ccbd66f..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/rpmpackage/dto/InputRPMPackage.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.easysoftware.application.rpmpackage.dto; - -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class InputRPMPackage { - /** - * The length of the name should not exceed 255 characters. - */ - @Size(max = 255, message = "the length of name can not exceed 255") - private String name; - - /** - * The length of the id should not exceed 255 characters. - */ - @Size(max = 255, message = "the length of id can not exceed 255") - private String id; - - /** - * The length of version can not exceed 255. - */ - @Size(max = 255, message = "the length of version can not exceed 255") - private String version; - - /** - * The length of os can not exceed 255. - */ - @Size(max = 255, message = "the length of os can not exceed 255") - private String os; - - /** - * The length of arch can not exceed 255. - */ - @Size(max = 255, message = "the length of arch can not exceed 255") - private String arch; - - /** - * The length of rpmCategory can not exceed 255. - */ - @Size(max = 255, message = "the length of rpmCategory can not exceed 255") - private String category; - - /** - * The length of rpmUpdateAt can not exceed 255. - */ - @Size(max = 255, message = "the length of rpmUpdateAt can not exceed 255") - private String rpmUpdateAt; - - /** - * The length of srcRepo can not exceed 255. - */ - @Size(max = 255, message = "the length of srcRepo can not exceed 255") - private String srcRepo; - - /** - * The length of rpmSize can not exceed 255. - */ - @Size(max = 255, message = "the length of rpmSize can not exceed 255") - private String rpmSize; - - /** - * The length of binDownloadUrl can not exceed 255. - */ - @Size(max = 255, message = "the length of binDownloadUrl can not exceed 255") - private String binDownloadUrl; - - /** - * The length of srcDownloadUrl can not exceed 255. - */ - @Size(max = 255, message = "the length of srcDownloadUrl can not exceed 255") - private String srcDownloadUrl; - - /** - * The length of summary can not exceed 255. - */ - @Size(max = 255, message = "the length of summary can not exceed 255") - private String summary; - - /** - * The length of osSupport can not exceed 255. - */ - @Size(max = 255, message = "the length of osSupport can not exceed 255") - private String osSupport; - - /** - * The length of repo can not exceed 255. - */ - @Size(max = 255, message = "the length of repo can not exceed 255") - private String repo; - - /** - * The length of repoType can not exceed 255. - */ - @Size(max = 255, message = "the length of repoType can not exceed 255") - private String repoType; - - /** - * The length of installation can not exceed 10000. - */ - @Size(max = 10000, message = "the length of installation can not exceed 10000") - private String installation; - - /** - * The length of description can not exceed 10000. - */ - @Size(max = 10000, message = "the length of description can not exceed 10000") - private String description; - /** - * The length of requires can not exceed 100_0000. - */ - @Size(max = 100_0000, message = "the length of requires can not exceed 100_0000") - private String requires; - - /** - * The length of provides can not exceed 100_0000. - */ - @Size(max = 100_0000, message = "the length of provides can not exceed 100_0000") - private String provides; - - /** - * The length of conflicts can not exceed 100_0000. - */ - @Size(max = 100_0000, message = "the length of conflicts can not exceed 100_0000") - private String conflicts; - - /** - * The length of changeLog can not exceed 100_0000. - */ - @Size(max = 100_0000, message = "the length of changeLog can not exceed 100_0000") - private String changeLog; - - /** - * The length of maintainerId can not exceed 255. - */ - @Size(max = 255, message = "the length of maintainerId can not exceed 255") - private String maintainerId; - - /** - * The length of maintainerEmail can not exceed 255. - */ - @Size(max = 255, message = "the length of maintainerEmail can not exceed 255") - private String maintainerEmail; - - /** - * The length of maintainerGiteeId can not exceed 255. - */ - @Size(max = 255, message = "the length of maintainerGiteeId can not exceed 255") - private String maintainerGiteeId; - - /** - * The length of maintainerUpdateAt can not exceed 255. - */ - @Size(max = 255, message = "the length of maintainerUpdateAt can not exceed 255") - private String maintainerUpdateAt; - - /** - * The length of maintainerStatus can not exceed 255. - */ - @Size(max = 255, message = "the length of maintainerStatus can not exceed 255") - private String maintainerStatus; - - /** - * The length of upStream can not exceed 255. - */ - @Size(max = 255, message = "the length of upStream can not exceed 255") - private String upStream; - - /** - * The length of security can not exceed 255. - */ - @Size(max = 255, message = "the length of security can not exceed 255") - private String security; - - /** - * The length of similarPkgs can not exceed 1000. - */ - @Size(max = 1000, message = "the length of similarPkgs can not exceed 1000") - private String similarPkgs; - - /** - * The length of downloadCount can not exceed 100. - */ - @Size(max = 100, message = "the length of downloadCount can not exceed 100") - private String downloadCount; - - /** - * The length of pkgId can not exceed 255. - */ - @Size(max = 255, message = "the length of pkgId can not exceed 255") - private String pkgId; - - /** - * The length of subPath can not exceed 255. - */ - @Size(max = 255, message = "the length of subPath can not exceed 255") - private String subPath; - - /** - * License. - */ - @Size(max = 10_000, message = "the length of license can not exceed 10000") - private String license; - -} diff --git a/src/main/java/com/easysoftware/application/rpmpackage/dto/RPMPackageNameSearchCondition.java b/src/main/java/com/easysoftware/application/rpmpackage/dto/RPMPackageNameSearchCondition.java new file mode 100644 index 0000000000000000000000000000000000000000..e4ef6b0a98405c4b0d0ebdd061352ffe7fae7701 --- /dev/null +++ b/src/main/java/com/easysoftware/application/rpmpackage/dto/RPMPackageNameSearchCondition.java @@ -0,0 +1,32 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.application.rpmpackage.dto; + +import com.easysoftware.common.constant.PackageConstant; + +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RPMPackageNameSearchCondition { + /** + * Field for name with a maximum length of PackageConstant.MAX_FIELD_LENGTH. + */ + @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) + private String name; +} diff --git a/src/main/java/com/easysoftware/application/rpmpackage/dto/RPMPackageSearchCondition.java b/src/main/java/com/easysoftware/application/rpmpackage/dto/RPMPackageSearchCondition.java index fe1a4a5d0912c05750986d4a9c0079e02db92286..d74ca150bb261333d4d9d82b414da7c05a3b872b 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/dto/RPMPackageSearchCondition.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/dto/RPMPackageSearchCondition.java @@ -1,9 +1,22 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.rpmpackage.dto; import org.hibernate.validator.constraints.Range; import com.easysoftware.common.constant.PackageConstant; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -17,18 +30,21 @@ public class RPMPackageSearchCondition { * Field for name with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String name; /** * Field for pkgId with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String pkgId; /** * Field for subPath with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String subPath; /** @@ -36,6 +52,7 @@ public class RPMPackageSearchCondition { * Default value is 1. */ @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) + @NotNull private Integer pageNum = 1; /** @@ -43,47 +60,55 @@ public class RPMPackageSearchCondition { * Default value is 10. */ @Range(min = PackageConstant.MIN_PAGE_SIZE, max = PackageConstant.MAX_PAGE_SIZE) + @NotNull private Integer pageSize = 10; /** * Field for version with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String version; /** * Field for os with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String os; /** * Field for arch with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String arch; /** * Field for category with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String category; /** * Field for rpmUpdateAt with a maximum length of PackageConstant.MAX_FIELD_LENGTH. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String rpmUpdateAt; /** * Time order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String timeOrder; /** * Name order. */ @Size(max = PackageConstant.MAX_FIELD_LENGTH) + @Pattern(regexp = PackageConstant.VALID_STR_REG, message = PackageConstant.VALID_MESSAGE) private String nameOrder; } diff --git a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageDetailVo.java b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageDetailVo.java index 27a280be798af47a0afb82019701381df1ebc706..e0a1bef90b97c79634c13e2665d3260a968a09d1 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageDetailVo.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageDetailVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.rpmpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageDomainVo.java b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageDomainVo.java index d0b444fb541778327bd3a87faa85d3d0a6d17f08..afb6a8d8e84afaf18934ddb62cdf640efed18ad3 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageDomainVo.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageDomainVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.rpmpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageEulerArchsVo.java b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageEulerArchsVo.java deleted file mode 100644 index 63be73eeef09fd25fc069e5c76d590c3d92d68e6..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageEulerArchsVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.easysoftware.application.rpmpackage.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class RPMPackageEulerArchsVo { - /** - * OpenEuler versions of the package. - */ - private String arch; -} diff --git a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageEulerVersionVo.java b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageEulerVersionVo.java index b681030229a0c3b85a128b81322dde2813cb4f95..9fc6caa3910e29aa8ba7d93321b5148a67bf4eac 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageEulerVersionVo.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageEulerVersionVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.rpmpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageMenuVo.java b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageMenuVo.java index 4617f70d1287f1f067705f126267a731c7d00e9c..31fc2b7b5eb016bb716b89a682b8883aa06ffdba 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageMenuVo.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageMenuVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.application.rpmpackage.vo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageNewestVersionVo.java b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageNewestVersionVo.java new file mode 100644 index 0000000000000000000000000000000000000000..a750c8e80e1da9bcff4bef4269c4a6b8267ce889 --- /dev/null +++ b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackageNewestVersionVo.java @@ -0,0 +1,30 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ +package com.easysoftware.application.rpmpackage.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RPMPackageNewestVersionVo { + /** + * Newest versions of the rpm package. + */ + private String newestVersion; + + /** + * The coresspond euler versions of the rpm package. + */ + private String os; +} diff --git a/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackgeVersionVo.java b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackgeVersionVo.java new file mode 100644 index 0000000000000000000000000000000000000000..07caa7f691835c38901b4428a3b0669a3a61430b --- /dev/null +++ b/src/main/java/com/easysoftware/application/rpmpackage/vo/RPMPackgeVersionVo.java @@ -0,0 +1,30 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ +package com.easysoftware.application.rpmpackage.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RPMPackgeVersionVo { + /** + * versions of the rpm package. + */ + private String version; + + /** + * OpenEuler versions of the package. + */ + private String os; +} diff --git a/src/main/java/com/easysoftware/common/aop/CallMark.java b/src/main/java/com/easysoftware/common/aop/CallMark.java index d9cd24bea9cd8c4c4e08a13ec082709cd78947d6..57753963c1bd2c80632b9137bdfa9f4f5a86e0f6 100644 --- a/src/main/java/com/easysoftware/common/aop/CallMark.java +++ b/src/main/java/com/easysoftware/common/aop/CallMark.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.aop; import lombok.Data; diff --git a/src/main/java/com/easysoftware/common/aop/LimitRequest.java b/src/main/java/com/easysoftware/common/aop/LimitRequest.java index 05aef4eb6c6c8376ccc3bd22430dd61f90b7cf0b..c1ce2db984c93d7367ad47f804d60ade227f64f9 100644 --- a/src/main/java/com/easysoftware/common/aop/LimitRequest.java +++ b/src/main/java/com/easysoftware/common/aop/LimitRequest.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.aop; import java.lang.annotation.Documented; diff --git a/src/main/java/com/easysoftware/common/aop/LimitRequestAspect.java b/src/main/java/com/easysoftware/common/aop/LimitRequestAspect.java index 2f5634411e124746512aada586e634c32494fc06..6f16e8bcfae99d790567a22ed420c4702725f054 100644 --- a/src/main/java/com/easysoftware/common/aop/LimitRequestAspect.java +++ b/src/main/java/com/easysoftware/common/aop/LimitRequestAspect.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.aop; import com.easysoftware.common.entity.MessageCode; diff --git a/src/main/java/com/easysoftware/common/aop/ManagementLog.java b/src/main/java/com/easysoftware/common/aop/ManagementLog.java index b14cde04d93645186d9607b96916cf34bff20e4e..b2a10a6bd886bc4faf81e7c8a5c56312812ead1a 100644 --- a/src/main/java/com/easysoftware/common/aop/ManagementLog.java +++ b/src/main/java/com/easysoftware/common/aop/ManagementLog.java @@ -1,20 +1,22 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.aop; import lombok.Getter; import lombok.Setter; -import java.io.Serial; -import java.io.Serializable; - @Getter @Setter -public class ManagementLog implements Serializable { - /** - * Unique identifier for serialization purposes. - */ - @Serial - private static final long serialVersionUID = 1L; - +public class ManagementLog { /** * Type of the log event. */ diff --git a/src/main/java/com/easysoftware/common/aop/ManagementLogAOP.java b/src/main/java/com/easysoftware/common/aop/ManagementLogAOP.java index eb8df97ba39e7e2d529c20fb574ee1357ae78096..ae5d0777a82acc83ec85606420eb45202fb24991 100644 --- a/src/main/java/com/easysoftware/common/aop/ManagementLogAOP.java +++ b/src/main/java/com/easysoftware/common/aop/ManagementLogAOP.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.aop; import org.aspectj.lang.JoinPoint; @@ -32,7 +43,7 @@ public class ManagementLogAOP { * Defines the pointcut for methods in specific packages. */ @Pointcut("execution(* com.easysoftware.adapter.query.*.*(..)) " - + "|| execution(* com.easysoftware.adapter.execute.*.*(..))") + + "|| execution(* com.easysoftware.common.exception.GlobalExceptionHandler.*(..))") public void pointcut() { } diff --git a/src/main/java/com/easysoftware/common/aop/RequestLimitRedis.java b/src/main/java/com/easysoftware/common/aop/RequestLimitRedis.java index eddaf666183d057f028cead8377f416640ff97ff..74b851cc01051bef5cfc4cffbbeb4529dac4cb77 100644 --- a/src/main/java/com/easysoftware/common/aop/RequestLimitRedis.java +++ b/src/main/java/com/easysoftware/common/aop/RequestLimitRedis.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.aop; import java.lang.annotation.Documented; diff --git a/src/main/java/com/easysoftware/common/aop/RequestLimitRedisAspect.java b/src/main/java/com/easysoftware/common/aop/RequestLimitRedisAspect.java index 8aa729c1569256f65b80f0d260c01ddd9e9829ab..d0a5fe25d69ce5feba68ff2e75d45da8e41fe09d 100644 --- a/src/main/java/com/easysoftware/common/aop/RequestLimitRedisAspect.java +++ b/src/main/java/com/easysoftware/common/aop/RequestLimitRedisAspect.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.aop; import org.aspectj.lang.ProceedingJoinPoint; @@ -16,6 +27,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.utils.ClientUtil; +import com.easysoftware.common.utils.LogUtil; import com.easysoftware.common.utils.ResultUtil; import jakarta.servlet.http.HttpServletRequest; @@ -53,7 +65,8 @@ public class RequestLimitRedisAspect { private long rejectCount; /** - * Pointcut method to define where the aspect applies based on the RequestLimitRedis annotation. + * Pointcut method to define where the aspect applies based on the + * RequestLimitRedis annotation. * * @param requestLimit The RequestLimitRedis annotation. */ @@ -62,10 +75,13 @@ public class RequestLimitRedisAspect { } /** - * Advice method that intercepts the method calls annotated with RequestLimitRedis and enforces request limiting. + * Advice method that intercepts the method calls annotated with + * RequestLimitRedis and enforces request limiting. * - * @param joinPoint The ProceedingJoinPoint representing the intercepted method. - * @param requestLimit The RequestLimitRedis annotation containing request limiting criteria. + * @param joinPoint The ProceedingJoinPoint representing the intercepted + * method. + * @param requestLimit The RequestLimitRedis annotation containing request + * limiting criteria. * @return The result of the intercepted method execution. * @throws Throwable if an error occurs during method execution. */ @@ -75,21 +91,23 @@ public class RequestLimitRedisAspect { long period = rejectPeriod; long limitCount = rejectCount; - HttpServletRequest request = ((ServletRequestAttributes) - RequestContextHolder.getRequestAttributes()).getRequest(); + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = (attributes != null) ? attributes.getRequest() : null; + if (request == null) { + LOGGER.error("Failed to obtain HttpServletRequest in the current context."); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0001); + } // 获取url String ip = ClientUtil.getClientIpAddress(request); String uri = request.getRequestURI(); String key = "req_limit:".concat(uri).concat(ip); - ZSetOperations zSetOperations = redisTemplate.opsForZSet(); long currentMs = System.currentTimeMillis(); zSetOperations.add(key, currentMs, currentMs); - redisTemplate.expire(key, period, TimeUnit.SECONDS); // remove the value that out of current window @@ -98,15 +116,14 @@ public class RequestLimitRedisAspect { // 检查访问次数 Long count = zSetOperations.zCard(key); - if (count > limitCount) { + if (count != null && count > limitCount) { // 审计日志 - LOGGER.error("接口拦截：{}，请求超过限制频率【{}次/{}s】,IP：{}", uri, limitCount, period, ip); + LOGGER.error("the current uri is{}，the request frequency of uri exceeds the limited frequency: " + + "{} times/{}s ,IP：{},type: GET", LogUtil.formatCodeString(uri), limitCount, period, ip); return ResultUtil.fail(HttpStatus.TOO_MANY_REQUESTS, MessageCode.EC00010); } - return joinPoint.proceed(); } } - diff --git a/src/main/java/com/easysoftware/common/config/KafkaConsumerConfig.java b/src/main/java/com/easysoftware/common/config/KafkaConsumerConfig.java deleted file mode 100644 index 802ad701fc21f32c1237c8314fbb0ab3ed26d260..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/config/KafkaConsumerConfig.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.easysoftware.common.config; - -import org.apache.kafka.clients.CommonClientConfigs; -import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.common.config.SaslConfigs; -import org.apache.kafka.common.config.SslConfigs; -import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.serialization.StringDeserializer; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.kafka.annotation.EnableKafka; -import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; -import org.springframework.kafka.core.ConsumerFactory; -import org.springframework.kafka.core.DefaultKafkaConsumerFactory; - -import java.util.HashMap; -import java.util.Map; - -@Configuration -@EnableKafka -public class KafkaConsumerConfig { - - /** - * Bootstrap servers for Kafka connection. - */ - @Value("${bootstrap.servers}") - private String bootstrapServers; - - /** - * Consumer group ID for Kafka consumer. - */ - @Value("${consumer.groupId}") - private String groupId; - - /** - * SASL JAAS configuration for authentication. - */ - @Value("${spring.kafka.properties.sasl.jaas.config}") - private String authConfig; - - /** - * SASL mechanism for authentication. - */ - @Value("${spring.kafka.properties.sasl.mechanism}") - private String mechanism; - - /** - * Location of the SSL trust store. - */ - @Value("${spring.kafka.properties.ssl.truststore.location}") - private String trustStoreLocation; - - - /** - * Configures a ConsumerFactory for processing Kafka messages with String key and value types. - * - * @return The configured ConsumerFactory. - */ - @Bean - public ConsumerFactory consumerFactory() { - Map configProps = new HashMap<>(); - configProps.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); - configProps.put(ConsumerConfig.GROUP_ID_CONFIG, groupId); - configProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()); - configProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()); - - // add SASL_SSL config - configProps.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, SecurityProtocol.SASL_SSL.name); - configProps.put(SaslConfigs.SASL_MECHANISM, mechanism); - configProps.put(SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG, ""); - configProps.put(SaslConfigs.SASL_JAAS_CONFIG, authConfig); - configProps.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, trustStoreLocation); - - return new DefaultKafkaConsumerFactory<>(configProps); - } - - /** - * Configures a Kafka listener container factory for processing Kafka messages. - * - * @return The ConcurrentKafkaListenerContainerFactory for String key and value types. - */ - @Bean - public ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory() { - ConcurrentKafkaListenerContainerFactory factory - = new ConcurrentKafkaListenerContainerFactory<>(); - factory.setConsumerFactory(consumerFactory()); - factory.setBatchListener(true); - return factory; - } -} diff --git a/src/main/java/com/easysoftware/common/config/MybatisPlusConfig.java b/src/main/java/com/easysoftware/common/config/MybatisPlusConfig.java index d4a62bf34a4eb61390cb6ea8e7a6567bac9a1d99..9c680cf1e3d0430c7c69341aa56557babe64d83c 100644 --- a/src/main/java/com/easysoftware/common/config/MybatisPlusConfig.java +++ b/src/main/java/com/easysoftware/common/config/MybatisPlusConfig.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.config; import org.springframework.context.annotation.Bean; @@ -23,7 +34,7 @@ public class MybatisPlusConfig { PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); paginationInnerInterceptor.setOptimizeJoin(true); paginationInnerInterceptor.setDbType(DbType.MYSQL); - paginationInnerInterceptor.setOverflow(true); + paginationInnerInterceptor.setOverflow(false); interceptor.addInnerInterceptor(paginationInnerInterceptor); OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor = new OptimisticLockerInnerInterceptor(); interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor); diff --git a/src/main/java/com/easysoftware/common/config/OneidInterceptorConfig.java b/src/main/java/com/easysoftware/common/config/OneidInterceptorConfig.java deleted file mode 100644 index e56b968a8ce6bf8160bb5402a1318dba7d90b55e..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/config/OneidInterceptorConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.easysoftware.common.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import com.easysoftware.common.interceptor.OneidInterceptor; - -@Configuration -public class OneidInterceptorConfig implements WebMvcConfigurer { - - /** - * Add interceptors to the InterceptorRegistry. - * - * @param registry The InterceptorRegistry used to register interceptors. - */ - @Override - public void addInterceptors(final InterceptorRegistry registry) { - registry.addInterceptor(oneidInterceptor()) - .addPathPatterns("/appVersion/**"); - } - - /** - * Configures a OneidInterceptor bean. - * - * @return The configured OneidInterceptor bean. - */ - @Bean - public OneidInterceptor oneidInterceptor() { - return new OneidInterceptor(); - } -} diff --git a/src/main/java/com/easysoftware/common/config/RedisConfiguration.java b/src/main/java/com/easysoftware/common/config/RedisConfiguration.java index 2ea803ee74d2aaf856ed871ee5e4e3092c9ffa30..41e73c1313db4ec5241a3621b2f49512ff3fcccd 100644 --- a/src/main/java/com/easysoftware/common/config/RedisConfiguration.java +++ b/src/main/java/com/easysoftware/common/config/RedisConfiguration.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.config; diff --git a/src/main/java/com/easysoftware/common/constant/HttpConstant.java b/src/main/java/com/easysoftware/common/constant/HttpConstant.java deleted file mode 100644 index 15777014a689b6410d09f3d5b5593deab8a7a0cb..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/constant/HttpConstant.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.easysoftware.common.constant; - -public final class HttpConstant { - - // Private constructor to prevent instantiation of the HttpConstant class - private HttpConstant() { - // private constructor to hide the implicit public one - throw new AssertionError("HttpConstant class cannot be instantiated."); - } - - /** - * Timeout duration in milliseconds. - */ - public static final int TIME_OUT = 5000; - - /** - * HTTP GET method. - */ - public static final String GET = "GET"; - - /** - * HTTP POST method. - */ - public static final String POST = "POST"; - - /** - * Token key. - */ - public static final String TOKEN = "token"; - - /** - * Cookie key. - */ - public static final String COOKIE = "Cookie"; - - /** - * User token key. - */ - public static final String USER_TOKEN = "user-token"; - - /** - * Content type key. - */ - public static final String CONTENT_TYPE = "Content-Type"; - -} diff --git a/src/main/java/com/easysoftware/common/constant/MapConstant.java b/src/main/java/com/easysoftware/common/constant/MapConstant.java deleted file mode 100644 index 5e1a8aabe2fb94f4126ab3aa224c145d676ff945..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/constant/MapConstant.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.easysoftware.common.constant; - -import java.util.Map; - -public final class MapConstant { - - // Private constructor to prevent instantiation of the MapConstant class - private MapConstant() { - // private constructor to hide the implicit public one - throw new AssertionError("MapConstant class cannot be instantiated."); - } - - /** - * Category constant for Big Data. - */ - public static final String CATEGORY_BIGDATA = "bigdata"; - - /** - * Category constant for Artificial Intelligence. - */ - public static final String CATEGORY_AI = "ai"; - - /** - * Category constant for Storage. - */ - public static final String CATEGORY_STORAGE = "Storage"; - - /** - * Category constant for Cloud Native. - */ - public static final String CATEGORY_CLOUD_NATIVE = "sig-CloudNative"; - - /** - * Category constant for High Performance Computing (HPC). - */ - public static final String CATEGORY_HPC = "sig-HPC"; - - /** - * Category constant for Other. - */ - public static final String CATEGORY_OTHER = "Other"; - - /** - * Maintainer ID key. - */ - public static final String MAINTAINER_ID = "id"; - - /** - * Maintainer email key. - */ - public static final String MAINTAINER_EMAIL = "email"; - - /** - * Maintainer Gitee ID key. - */ - public static final String MAINTAINER_GITEE_ID = "gitee_id"; - - /** - * Map of category mappings. - */ - public static final Map CATEGORY_MAP = Map.of( - CATEGORY_BIGDATA, "大数据", - CATEGORY_AI, "AI", - CATEGORY_STORAGE, "分布式存储", - CATEGORY_CLOUD_NATIVE, "云服务", - CATEGORY_HPC, "HPC", - CATEGORY_OTHER, "其他" - ); - - /** - * Map of maintainer information. - */ - public static final Map MAINTAINER = Map.of( - MAINTAINER_ID, "openEuler Community", - MAINTAINER_EMAIL, "contact@openeuler.io", - MAINTAINER_GITEE_ID, "openeuler-ci-bot" - ); - -} diff --git a/src/main/java/com/easysoftware/common/constant/PackageConstant.java b/src/main/java/com/easysoftware/common/constant/PackageConstant.java index 8292cfba7c0ba66fdf5343c33c4ee3e5c97d7a5d..f1b132b10815c6db67740de82ef1632d983d0c63 100644 --- a/src/main/java/com/easysoftware/common/constant/PackageConstant.java +++ b/src/main/java/com/easysoftware/common/constant/PackageConstant.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.constant; public final class PackageConstant { @@ -31,6 +42,17 @@ public final class PackageConstant { /** * Maximum field length allowed. */ - public static final int MAX_FIELD_LENGTH = 255; + public static final int MAX_FIELD_LENGTH = 1000; + + /** + * VALID_STR_REG used to match input string. + */ + public static final String VALID_STR_REG = "^$|^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_+, ]+$"; + + /** + * VALID_MESSAGE, error message. + */ + public static final String VALID_MESSAGE = "Null or string. String includes only letters, digits, and special " + + "characters(_-+()$.,)"; } diff --git a/src/main/java/com/easysoftware/common/entity/MessageCode.java b/src/main/java/com/easysoftware/common/entity/MessageCode.java index d794e4e5292f6f9b059b34a754e6be307284a646..0941fc4dd059c667f76eb5b20867bee81de5295d 100644 --- a/src/main/java/com/easysoftware/common/entity/MessageCode.java +++ b/src/main/java/com/easysoftware/common/entity/MessageCode.java @@ -1,12 +1,12 @@ -/* This project is licensed under the Mulan PSL v2. +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR - PURPOSE. + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. - Create: 2024 */ package com.easysoftware.common.entity; diff --git a/src/main/java/com/easysoftware/common/entity/ResultMsgVo.java b/src/main/java/com/easysoftware/common/entity/ResultMsgVo.java index 3230f2e3d941bc2cd0147e6804c21950723441d5..09ce38d39d140ad7efe8cbae9c88d8d13e23c740 100644 --- a/src/main/java/com/easysoftware/common/entity/ResultMsgVo.java +++ b/src/main/java/com/easysoftware/common/entity/ResultMsgVo.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.entity; import com.fasterxml.jackson.annotation.JsonInclude; @@ -5,12 +16,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.experimental.Accessors; -import java.io.Serializable; - @Data @Accessors(chain = true) @JsonInclude(JsonInclude.Include.NON_NULL) -public class ResultMsgVo implements Serializable { +public class ResultMsgVo { /** * Error code. */ diff --git a/src/main/java/com/easysoftware/common/entity/ResultVo.java b/src/main/java/com/easysoftware/common/entity/ResultVo.java index b8faea690e6de3b2621c6191559b39bfa52c2b43..f1ecc18ddd50dc99185e97b279ae5ebe59a5926b 100644 --- a/src/main/java/com/easysoftware/common/entity/ResultVo.java +++ b/src/main/java/com/easysoftware/common/entity/ResultVo.java @@ -1,15 +1,24 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.entity; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import lombok.experimental.Accessors; -import java.io.Serializable; - @Data @Accessors(chain = true) @JsonInclude(JsonInclude.Include.NON_NULL) -public class ResultVo implements Serializable { +public class ResultVo { /** * Error code. */ diff --git a/src/main/java/com/easysoftware/common/exception/AppPkgIconException.java b/src/main/java/com/easysoftware/common/exception/AppPkgIconException.java index f25206caf74aa4c37a42faf3587bf36ed8414a55..7565645a0f465da97b2b7ccfe776f709c6da1103 100644 --- a/src/main/java/com/easysoftware/common/exception/AppPkgIconException.java +++ b/src/main/java/com/easysoftware/common/exception/AppPkgIconException.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception; import java.io.Serial; diff --git a/src/main/java/com/easysoftware/common/exception/AuthException.java b/src/main/java/com/easysoftware/common/exception/AuthException.java deleted file mode 100644 index 7b1ff640d0576e03b73287ad6af928626a3482bb..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/exception/AuthException.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.easysoftware.common.exception; - -import java.io.Serial; - -public class AuthException extends RuntimeException { - /** - * Serial version UID for serialization. - */ - @Serial - private static final long serialVersionUID = 1L; - - /** - * Constructor for AuthException with a message. - * - * @param message The exception message - */ - public AuthException(final String message) { - super(message); - } - - /** - * Default constructor for AuthException. - */ - public AuthException() { - } - -} diff --git a/src/main/java/com/easysoftware/common/exception/Base64Exception.java b/src/main/java/com/easysoftware/common/exception/Base64Exception.java deleted file mode 100644 index 6481fe6f9fa4cba1d8bbd264b0c630d08dc33784..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/exception/Base64Exception.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.easysoftware.common.exception; - -import java.io.Serial; - -public class Base64Exception extends RuntimeException { - /** - * Serial version UID for serialization. - */ - @Serial - private static final long serialVersionUID = 1L; - - /** - * Constructor for Base64Exception with a message. - * - * @param message The exception message - */ - public Base64Exception(final String message) { - super(message); - } - - /** - * Default constructor for Base64Exception. - */ - public Base64Exception() { - } - -} diff --git a/src/main/java/com/easysoftware/common/exception/EnumValidException.java b/src/main/java/com/easysoftware/common/exception/EnumValidException.java index 98b1534ca3572059a8156004a6976c522c31ee51..546e9f0b5ed86d174a2147d13a8b35f894f50126 100644 --- a/src/main/java/com/easysoftware/common/exception/EnumValidException.java +++ b/src/main/java/com/easysoftware/common/exception/EnumValidException.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception; import java.io.Serial; diff --git a/src/main/java/com/easysoftware/common/exception/GlobalExceptionHandler.java b/src/main/java/com/easysoftware/common/exception/GlobalExceptionHandler.java index 9ab2f0eafbf8fbd18376c591a491c189e3242aa6..8972bd55c6148e3bc4eeab3512a42edeef596f18 100644 --- a/src/main/java/com/easysoftware/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/easysoftware/common/exception/GlobalExceptionHandler.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -13,7 +24,6 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; - @RestControllerAdvice public class GlobalExceptionHandler { /** @@ -44,7 +54,7 @@ public class GlobalExceptionHandler { @ResponseStatus(HttpStatus.BAD_REQUEST) public ResponseEntity exception(final ParamErrorException e) { LOGGER.error(e.getMessage()); - return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0002, e.getMessage()); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0002); } /** @@ -60,6 +70,19 @@ public class GlobalExceptionHandler { return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0002); } + /** + * Handles exceptions of type EnumValidException. + * + * @param e The EnumValidException to handle + * @return ResponseEntity containing details about the exception + */ + @ExceptionHandler(NoneResException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + public ResponseEntity exception(final NoneResException e) { + LOGGER.error(MessageCode.EC0002.getMsgEn()); + return ResultUtil.fail(HttpStatus.NOT_FOUND, MessageCode.EC0009.getMsgEn()); + } + /** * Handles exceptions of type AppPkgIconException. * @@ -73,19 +96,6 @@ public class GlobalExceptionHandler { return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0009); } - /** - * Handles exceptions of type AuthException. - * - * @param e The AuthException to handle - * @return ResponseEntity containing details about the exception - */ - @ExceptionHandler(AuthException.class) - @ResponseStatus(HttpStatus.UNAUTHORIZED) - public ResponseEntity exception(final AuthException e) { - LOGGER.error(e.getMessage()); - return ResultUtil.fail(HttpStatus.UNAUTHORIZED, MessageCode.EC00012, e.getMessage()); - } - /** * Handles general exceptions. * @@ -108,6 +118,6 @@ public class GlobalExceptionHandler { @ExceptionHandler(RuntimeException.class) @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) public ResponseEntity exception(final RuntimeException e) { - return ResultUtil.fail(HttpStatus.INTERNAL_SERVER_ERROR, MessageCode.ES0001, e.getMessage()); + return ResultUtil.fail(HttpStatus.INTERNAL_SERVER_ERROR, MessageCode.ES0001); } } diff --git a/src/main/java/com/easysoftware/common/exception/MyJacksonException.java b/src/main/java/com/easysoftware/common/exception/MyJacksonException.java index c90755459b825da408a76327d6f68ab6a9e86aae..733be0cd4c0ba9041b854ec927f0b64dafae09b0 100644 --- a/src/main/java/com/easysoftware/common/exception/MyJacksonException.java +++ b/src/main/java/com/easysoftware/common/exception/MyJacksonException.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception; import java.io.Serial; diff --git a/src/main/java/com/easysoftware/common/exception/NoneResException.java b/src/main/java/com/easysoftware/common/exception/NoneResException.java new file mode 100644 index 0000000000000000000000000000000000000000..ef64fab5de901f30098a0c0314d89bda16a29bbf --- /dev/null +++ b/src/main/java/com/easysoftware/common/exception/NoneResException.java @@ -0,0 +1,41 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.common.exception; + +import java.io.Serial; + +public class NoneResException extends RuntimeException { + /** + * Serial version UID for serialization. + */ + @Serial + private static final long serialVersionUID = 1L; + + /** + * Constructor for NoneResException with a message. + * + * @param message The exception message + */ + public NoneResException(final String message) { + super(message); + } + + /** + * Retrieves the exception message. + * + * @return The exception message + */ + @Override + public String getMessage() { + return super.getMessage(); + } +} diff --git a/src/main/java/com/easysoftware/common/exception/ParamErrorException.java b/src/main/java/com/easysoftware/common/exception/ParamErrorException.java index 8ad905296546c96637acc3d572b3244b158d5314..15694f73f5a40fc4beed63c44b083a6df55656dd 100644 --- a/src/main/java/com/easysoftware/common/exception/ParamErrorException.java +++ b/src/main/java/com/easysoftware/common/exception/ParamErrorException.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception; import java.io.Serial; diff --git a/src/main/java/com/easysoftware/common/exception/enumvalid/AppCategoryEnum.java b/src/main/java/com/easysoftware/common/exception/enumvalid/AppCategoryEnum.java index 602436dfc407d53cee04a30983199e0125ee6fd2..bae6343c53402001f5a03538dc1381fcea6420c6 100644 --- a/src/main/java/com/easysoftware/common/exception/enumvalid/AppCategoryEnum.java +++ b/src/main/java/com/easysoftware/common/exception/enumvalid/AppCategoryEnum.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception.enumvalid; public enum AppCategoryEnum { diff --git a/src/main/java/com/easysoftware/common/exception/enumvalid/DomainNameEnum.java b/src/main/java/com/easysoftware/common/exception/enumvalid/DomainNameEnum.java index 3eebfda5cbb05a0987dc01b7378cd05d779314c3..fcefdc848d2cd17e671b67a67113c8ef303f344b 100644 --- a/src/main/java/com/easysoftware/common/exception/enumvalid/DomainNameEnum.java +++ b/src/main/java/com/easysoftware/common/exception/enumvalid/DomainNameEnum.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception.enumvalid; public enum DomainNameEnum { diff --git a/src/main/java/com/easysoftware/common/exception/enumvalid/DomainTypeEnum.java b/src/main/java/com/easysoftware/common/exception/enumvalid/DomainTypeEnum.java index 0015919a47a9b6e81435910a540e9eb849cccefe..22a3d4c08df2e2d80211a8863096a5ef7b19bfbb 100644 --- a/src/main/java/com/easysoftware/common/exception/enumvalid/DomainTypeEnum.java +++ b/src/main/java/com/easysoftware/common/exception/enumvalid/DomainTypeEnum.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception.enumvalid; public enum DomainTypeEnum { diff --git a/src/main/java/com/easysoftware/common/exception/enumvalid/EnumValue.java b/src/main/java/com/easysoftware/common/exception/enumvalid/EnumValue.java index 26f2f5887912daae3e08b31ad7572a42f1f23ffb..3332421b9f3bce7741c11475f8ff5aa0aac1b49c 100644 --- a/src/main/java/com/easysoftware/common/exception/enumvalid/EnumValue.java +++ b/src/main/java/com/easysoftware/common/exception/enumvalid/EnumValue.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception.enumvalid; import com.easysoftware.common.exception.EnumValidException; @@ -10,6 +21,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -107,8 +119,8 @@ public @interface EnumValue { } Boolean result = (Boolean) method.invoke(null, value); - return result == null ? false : result; - } catch (Exception e) { + return result != null && result; + } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) { throw new EnumValidException(); } } diff --git a/src/main/java/com/easysoftware/common/exception/enumvalid/TimeOrderEnum.java b/src/main/java/com/easysoftware/common/exception/enumvalid/TimeOrderEnum.java index a583ae962a2974e62faa734414ac369d83151ac7..b0a7a2586ca190b557853955722d715e4715baaf 100644 --- a/src/main/java/com/easysoftware/common/exception/enumvalid/TimeOrderEnum.java +++ b/src/main/java/com/easysoftware/common/exception/enumvalid/TimeOrderEnum.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.exception.enumvalid; public enum TimeOrderEnum { diff --git a/src/main/java/com/easysoftware/common/filter/FilterConfig.java b/src/main/java/com/easysoftware/common/filter/FilterConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..883e748e1c6c7a6dc68f8b97b8fad1ed21aa0241 --- /dev/null +++ b/src/main/java/com/easysoftware/common/filter/FilterConfig.java @@ -0,0 +1,79 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.common.filter; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.filter.CharacterEncodingFilter; + +/** + * 加载所有的filter并指定filter顺序. + */ +@Slf4j +@Configuration +public class FilterConfig { + /** + * Referer pass domain. + */ + @Value("${cookie.token.domains}") + private String allowDomains; + + /** + * 编码过滤器. + * + * @return filterRegistrationBean + */ + @Bean + public FilterRegistrationBean encodingFilter() { + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); + CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter(); + characterEncodingFilter.setEncoding("UTF-8"); + filterRegistrationBean.setFilter(characterEncodingFilter); + // 顺序 + filterRegistrationBean.setOrder(1); + filterRegistrationBean.addUrlPatterns("/*"); + return filterRegistrationBean; + } + + /** + * 请求头拦截器. + * + * @return filterRegistrationBean + */ + @Bean + public FilterRegistrationBean requestHeaderFilter() { + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); + RequestHeaderFilter requestHeaderFilter = new RequestHeaderFilter(allowDomains); + filterRegistrationBean.setFilter(requestHeaderFilter); + filterRegistrationBean.setOrder(2); + filterRegistrationBean.addUrlPatterns("/*"); + return filterRegistrationBean; + } + + /** + * 响应请求头设置过滤器. + * + * @return filterRegistrationBean + */ + @Bean + public FilterRegistrationBean responseHeaderFilter() { + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); + ResponseHeaderFilter crossFilter = new ResponseHeaderFilter(); + filterRegistrationBean.setFilter(crossFilter); + filterRegistrationBean.setOrder(3); + filterRegistrationBean.addUrlPatterns("/*"); + return filterRegistrationBean; + } +} diff --git a/src/main/java/com/easysoftware/common/filter/RequestHeaderFilter.java b/src/main/java/com/easysoftware/common/filter/RequestHeaderFilter.java new file mode 100644 index 0000000000000000000000000000000000000000..f8f5a8f0f3539d8d70354e9ada116de50d685755 --- /dev/null +++ b/src/main/java/com/easysoftware/common/filter/RequestHeaderFilter.java @@ -0,0 +1,101 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.common.filter; + +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; + +/** + * 请求头拦截器. + */ +@Slf4j +public class RequestHeaderFilter implements Filter { + /** + * Referer pass domain. + */ + private String allowDomains; + + /** + * check header. + * + * @param servletRequest The request. + * @param servletResponse The response. + * @param filterChain The filterChain. + */ + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) + throws IOException, ServletException { + HttpServletRequest request = (HttpServletRequest) servletRequest; + HttpServletResponse response = (HttpServletResponse) servletResponse; + String referer = request.getHeader("Referer"); + String[] domains = allowDomains.split(";"); + boolean checkReferer = checkDomain(domains, referer); + if (!checkReferer) { + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + return; + } + filterChain.doFilter(request, response); + } + + @Override + public void destroy() { + + } + + /** + * check header. + * + * @param domains configdomain. + * @param input input. + * @return boolean. + */ + private boolean checkDomain(String[] domains, String input) { + if (StringUtils.isBlank(input)) { + return true; + } + int fromIndex; + int endIndex; + if (input.startsWith("http://")) { + fromIndex = 7; + endIndex = input.indexOf(":", fromIndex); + } else { + fromIndex = 8; + endIndex = input.indexOf("/", fromIndex); + endIndex = endIndex == -1 ? input.length() : endIndex; + } + String substring = input.substring(0, endIndex); + for (String domain : domains) { + if (substring.endsWith(domain)) { + return true; + } + } + return false; + } + + /** + * constructor. + * + * @param allowDomains configdomain. + */ + public RequestHeaderFilter(String allowDomains) { + this.allowDomains = allowDomains; + } +} diff --git a/src/main/java/com/easysoftware/common/filter/ResponseHeaderFilter.java b/src/main/java/com/easysoftware/common/filter/ResponseHeaderFilter.java new file mode 100644 index 0000000000000000000000000000000000000000..4077f38deab9775cf42145cc3cdfe03558854285 --- /dev/null +++ b/src/main/java/com/easysoftware/common/filter/ResponseHeaderFilter.java @@ -0,0 +1,55 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.common.filter; + + +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; + + +import java.io.IOException; + +/** + * 响应请求头设置过滤器. + */ +@Slf4j +public class ResponseHeaderFilter implements Filter { + /** + * Set header. + * + * @param servletRequest The request. + * @param servletResponse The response. + * @param filterChain The filterChain. + */ + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) + throws IOException, ServletException { + HttpServletRequest request = (HttpServletRequest) servletRequest; + request.getSession(false); + HttpServletResponse response = (HttpServletResponse) servletResponse; + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Cache-Control", "no-store"); + response.setHeader("Pragma", "no-cache"); + filterChain.doFilter(request, response); + } + + @Override + public void destroy() { + } + +} diff --git a/src/main/java/com/easysoftware/common/interceptor/CompatibleToken.java b/src/main/java/com/easysoftware/common/interceptor/CompatibleToken.java deleted file mode 100644 index d8a63bc32263cceec377f6505a39d77ff0e5ae04..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/interceptor/CompatibleToken.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.easysoftware.common.interceptor; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.METHOD, ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -public @interface CompatibleToken { - /** - * Indicates whether the element is required. - * - * @return True if the element is required, false otherwise - */ - boolean required() default true; -} diff --git a/src/main/java/com/easysoftware/common/interceptor/OneidInterceptor.java b/src/main/java/com/easysoftware/common/interceptor/OneidInterceptor.java deleted file mode 100644 index 12ed24a8c157df8aa8f36e954be81d07a69e318a..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/interceptor/OneidInterceptor.java +++ /dev/null @@ -1,220 +0,0 @@ -package com.easysoftware.common.interceptor; - -import com.easysoftware.common.constant.HttpConstant; -import com.easysoftware.common.exception.AuthException; -import com.easysoftware.common.utils.HttpClientUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.fasterxml.jackson.databind.JsonNode; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.SneakyThrows; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Optional; - -public class OneidInterceptor implements HandlerInterceptor { - - /** - * Value injected for the cookie token name. - */ - @Value("${cookie.token.name}") - private String cookieTokenName; - - /** - * Value injected for the permission API. - */ - @Value("${oneid.permissionApi}") - private String permissionApi; - - /** - * Value injected for the manage API body. - */ - @Value("${oneid.manage.apiBody}") - private String manageApiBody; - - /** - * Value injected for the manage token API. - */ - @Value("${oneid.manage.tokenApi}") - private String manageTokenApi; - - /** - * Logger instance for OneidInterceptor. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(OneidInterceptor.class); - - - /** - * Method invoked before the actual handler is executed. - * - * @param httpServletRequest The request being handled - * @param httpServletResponse The response being generated - * @param object The handler object to handle - * @return True if the execution chain should proceed with the next interceptor or the handler itself; - * false if the interceptor has already taken care of the response itself - * @throws Exception in case of errors - */ - @Override - public boolean preHandle(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse, - final Object object) throws Exception { - if (!(object instanceof HandlerMethod)) { - return true; - } - - // 检查是否有用户权限的注解 - HandlerMethod handlerMethod = (HandlerMethod) object; - Method method = handlerMethod.getMethod(); - if (!method.isAnnotationPresent(OneidToken.class) && !method.isAnnotationPresent(CompatibleToken.class)) { - return true; - } - OneidToken oneidToken = method.getAnnotation(OneidToken.class); - CompatibleToken compatibleToken = method.getAnnotation(CompatibleToken.class); - if ((oneidToken == null || !oneidToken.required()) - && (compatibleToken == null || !compatibleToken.required())) { - return true; - } - - // 校验cookie - Cookie tokenCookie = verifyCookie(httpServletRequest); - if (tokenCookie == null) { - throw new AuthException("unauthorized, missing cookie"); - } - - String userToken = httpServletRequest.getHeader(HttpConstant.TOKEN); - if (userToken == null) { - throw new AuthException("unauthorized, missing token"); - } - - // 校验查看版本兼容页面的权限 - if (compatibleToken != null && compatibleToken.required()) { - String verifyUserMsg = verifyUser(compatibleToken, httpServletRequest, tokenCookie, userToken); - if (!verifyUserMsg.equals("success")) { - throw new AuthException(verifyUserMsg); - } - } - - return true; - } - - /** - * Method called after the handler is executed. - * - * @param httpServletRequest The request being handled - * @param httpServletResponse The response being generated - * @param o The handler object that was used - * @param modelAndView The ModelAndView object that was returned by the handler - * @throws Exception in case of errors - */ - @Override - public void postHandle(final HttpServletRequest httpServletRequest, - final HttpServletResponse httpServletResponse, - final Object o, final ModelAndView modelAndView) throws Exception { - - } - - /** - * Method called after the complete request has finished being handled. - * - * @param httpServletRequest The request being handled - * @param httpServletResponse The response being generated - * @param o The handler object that was used - * @param e Exception thrown during handler execution, if any - * @throws Exception in case of errors - */ - @Override - public void afterCompletion(final HttpServletRequest httpServletRequest, - final HttpServletResponse httpServletResponse, - final Object o, final Exception e) throws Exception { - } - - /** - * Verifies the user by checking the provided token. - * - * @param compatibleToken The compatible token object - * @param httpServletRequest The HTTP servlet request - * @param tokenCookie The token cookie - * @param userToken The user token to verify - * @return A string representing the verification status - */ - private String verifyUser(final CompatibleToken compatibleToken, final HttpServletRequest httpServletRequest, - final Cookie tokenCookie, final String userToken) { - if (compatibleToken != null && compatibleToken.required()) { - List pers = getUserPermission(httpServletRequest, tokenCookie, userToken); - for (String per : pers) { - if (per.equalsIgnoreCase("easysoftwareread")) { - return "success"; - } - } - } - return "No permission"; - } - - /** - * Retrieves the user permissions based on the provided token and request information. - * - * @param httpServletRequest The HTTP servlet request - * @param tokenCookie The token cookie - * @param userToken The user token - * @return A list of user permissions - */ - @SneakyThrows - private List getUserPermission(final HttpServletRequest httpServletRequest, - final Cookie tokenCookie, final String userToken) { - String token = getManageToken(); - String tokenCookieValue = tokenCookie.getValue(); - String response = HttpClientUtil.getHttpClient(permissionApi, token, userToken, tokenCookieValue); - JsonNode resJson = ObjectMapperUtil.toJsonNode(response); - if (!resJson.has("data")) { - throw new AuthException(resJson.get("message").asText()); - } - JsonNode permissions = resJson.get("data").get("permissions"); - List list = new ArrayList<>(); - for (JsonNode per : permissions) { - list.add(per.asText()); - } - return list; - } - - /** - * Retrieves the management token. - * - * @return The management token - */ - @SneakyThrows - private String getManageToken() { - String response = HttpClientUtil.postHttpClient(manageTokenApi, manageApiBody); - JsonNode resJson = ObjectMapperUtil.toJsonNode(response); - return resJson.get("token").asText(); - } - - /** - * Verifies and retrieves a cookie from the HttpServletRequest. - * - * @param httpServletRequest The HTTP servlet request - * @return The verified Cookie object - */ - private Cookie verifyCookie(final HttpServletRequest httpServletRequest) { - Cookie[] cookies = httpServletRequest.getCookies(); - Cookie cookie = null; - if (cookies != null) { - // 获取cookie中的token - Optional first = Arrays.stream(cookies).filter(c -> cookieTokenName.equals(c.getName())) - .findFirst(); - if (first.isPresent()) { - cookie = first.get(); - } - } - return cookie; - } - -} diff --git a/src/main/java/com/easysoftware/common/interceptor/OneidToken.java b/src/main/java/com/easysoftware/common/interceptor/OneidToken.java deleted file mode 100644 index b2195edd944766ba3e7b7ed501b998eb4cda5ed4..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/interceptor/OneidToken.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.easysoftware.common.interceptor; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.METHOD, ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -public @interface OneidToken { - /** - * Indicates whether the field is required. - * - * @return true if the field is required, false otherwise. - */ - boolean required() default true; -} diff --git a/src/main/java/com/easysoftware/common/obs/ObsService.java b/src/main/java/com/easysoftware/common/obs/ObsService.java deleted file mode 100644 index 25914f717401988b1c65e230dfd8939353ce7bf1..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/obs/ObsService.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.easysoftware.common.obs; - -import com.obs.services.ObsClient; -import com.obs.services.model.PutObjectRequest; -import jakarta.annotation.PostConstruct; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.io.File; - -@Service -public class ObsService { - - /** - * Value injected for the OBS endpoint. - */ - @Value("${obs.endpoint}") - private String obsEndpoint; - - /** - * Value injected for the OBS bucket name. - */ - @Value("${obs.bucket}") - private String obsBucketName; - - /** - * Value injected for the OBS Access Key (AK). - */ - @Value("${obs.ak}") - private String obsAk; - - /** - * Value injected for the OBS Secret Key (SK). - */ - @Value("${obs.sk}") - private String obsSk; - - /** - * Logger instance for ObsService. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(ObsService.class); - - /** - * Static ObsClient instance for interacting with OBS. - */ - private static ObsClient obsClient; - - - /** - * Method annotated with @PostConstruct to initialize resources. - */ - @PostConstruct - public void init() { - obsClient = new ObsClient(obsAk, obsSk, obsEndpoint); - } - - /** - * Uploads data to OBS with the specified object key and file path. - * - * @param objectKey The key of the object in OBS - * @param filePath The local file path to upload - */ - public void putData(final String objectKey, final String filePath) { - PutObjectRequest request = new PutObjectRequest(); - request.setBucketName(obsBucketName); - request.setObjectKey(objectKey); - request.setFile(new File(filePath)); - obsClient.putObject(request); - } - - /** - * Generates a URL based on the provided name. - * - * @param name The name used to generate the URL - * @return The generated URL - */ - public String generateUrl(final String name) { - String objectKey = name + ".png"; - if (!obsClient.doesObjectExist(obsBucketName, objectKey)) { - objectKey = "logo.png"; - } - return "https://" + obsBucketName + "." + obsEndpoint + "/" + objectKey; - } -} diff --git a/src/main/java/com/easysoftware/common/utils/ApiUtil.java b/src/main/java/com/easysoftware/common/utils/ApiUtil.java deleted file mode 100644 index 6cf5a9df694ab99c56a20132b192f5d65751cc00..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/utils/ApiUtil.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.easysoftware.common.utils; - -import com.easysoftware.common.constant.MapConstant; -import com.fasterxml.jackson.databind.JsonNode; - -import java.util.HashMap; -import java.util.Map; - -public final class ApiUtil { - - // Private constructor to prevent instantiation of the utility class - private ApiUtil() { - // private constructor to hide the implicit public one - throw new AssertionError("ApiUtil class cannot be instantiated."); - } - - /** - * Fetches and returns an API response map based on the provided URL. - * - * @param url The URL to fetch the API response from - * @return A map containing the API response data - */ - public static Map getApiResponseMap(final String url) { - Map res = new HashMap<>(); - String response = HttpClientUtil.getHttpClient(url, null, null, null); - if (response != null) { - JsonNode info = ObjectMapperUtil.toJsonNode(response); - if (info.get("code").asInt() == 200 && !info.get("data").isNull()) { - JsonNode infoData = info.get("data"); - res = ObjectMapperUtil.jsonToMap(infoData); - } - } - return res; - } - - /** - * Fetches and returns an API response map for a maintainer based on the provided URL. - * - * @param url The URL to fetch the API response from - * @return A map containing the maintainer's API response data - */ - public static Map getApiResponseMaintainer(final String url) { - //创建一个新的可修改的 Map，并将不可修改的 Map 中的所有元素复制到其中 - Map maintainer = new HashMap<>(MapConstant.MAINTAINER); - String response = HttpClientUtil.getHttpClient(url, null, null, null); - if (response != null) { - JsonNode info = ObjectMapperUtil.toJsonNode(response); - if (info.get("code").asInt() == 200 && !info.get("data").isNull()) { - JsonNode infoData = info.get("data"); - maintainer = ObjectMapperUtil.jsonToMap(infoData); - maintainer.put(MapConstant.MAINTAINER_ID, maintainer.get(MapConstant.MAINTAINER_GITEE_ID)); - } - } - return maintainer; - } - - /** - * Fetches and returns the API response data based on the provided URL. - * - * @param url The URL to fetch the API response from - * @return The API response data as a string - */ - public static String getApiResponseData(final String url) { - String response = HttpClientUtil.getHttpClient(url, null, null, null); - JsonNode info = ObjectMapperUtil.toJsonNode(response); - if (info.get("code").asInt() == 200 && !info.get("data").isNull()) { - return info.get("data").asText(); - } - return null; - } - -} diff --git a/src/main/java/com/easysoftware/common/utils/ClassField.java b/src/main/java/com/easysoftware/common/utils/ClassField.java index 31d064935c63efe150201f9ef9d85ad41d080423..df0616d845be64626fc28d0f4d1d4614854fa4a5 100644 --- a/src/main/java/com/easysoftware/common/utils/ClassField.java +++ b/src/main/java/com/easysoftware/common/utils/ClassField.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.utils; import java.lang.reflect.Field; diff --git a/src/main/java/com/easysoftware/common/utils/ClientUtil.java b/src/main/java/com/easysoftware/common/utils/ClientUtil.java index 28f8a153e137f4c789e126c314b01309f885f2f1..1c3d4235d6ecac922a0beebcf8314ac64e4e5535 100644 --- a/src/main/java/com/easysoftware/common/utils/ClientUtil.java +++ b/src/main/java/com/easysoftware/common/utils/ClientUtil.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.utils; import org.slf4j.Logger; @@ -64,11 +75,12 @@ public final class ClientUtil { // 127.0.0.1 ipv4, 0:0:0:0:0:0:0:1 ipv6 if ("127.0.0.1".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { // 根据网卡取本机配置的IP - InetAddress inet = null; + InetAddress inet; try { inet = InetAddress.getLocalHost(); } catch (UnknownHostException e) { LOGGER.error("get local host error: " + e.getMessage()); + return ip; } ip = inet.getHostAddress(); } diff --git a/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java b/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java deleted file mode 100644 index 3570209e68a552a04b1f5f9c8df53026bf4b2d59..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/utils/HttpClientUtil.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.easysoftware.common.utils; - -import com.easysoftware.common.constant.HttpConstant; -import com.easysoftware.common.entity.MessageCode; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.charset.StandardCharsets; - -public final class HttpClientUtil { - - - // Private constructor to prevent instantiation of the utility class - private HttpClientUtil() { - // private constructor to hide the implicit public one - throw new AssertionError("HttpClientUtil class cannot be instantiated."); - } - - /** - * Logger for HttpClientUtil. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(HttpClientUtil.class); - - /** - * Request configuration with timeout settings. - */ - private static final RequestConfig REQUEST_CONFIG = RequestConfig.custom() - .setConnectTimeout(HttpConstant.TIME_OUT) - .setSocketTimeout(HttpConstant.TIME_OUT).build(); - - /** - * Send a GET request to the specified URL and retrieve the response as a string. - * - * @param urlStr The URL to send the GET request to. - * @return The response from the GET request as a string. - */ - public static String getRequest(final String urlStr) { - try { - URL url = new URL(urlStr); - - if (!sercuritySSRFUrlCheck(url)) { - throw new IllegalArgumentException("URL is vulnerable to SSRF attacks"); - } - - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod(HttpConstant.GET); - connection.setConnectTimeout(HttpConstant.TIME_OUT); // 设置连接超时，单位毫秒 - connection.setReadTimeout(HttpConstant.TIME_OUT); // 设置读取超时，单位毫秒 - int responseCode = connection.getResponseCode(); - - if (responseCode != HttpURLConnection.HTTP_OK) { - throw new IOException("HTTP error code: " + responseCode); - } - try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), - StandardCharsets.UTF_8))) { - String line; - StringBuilder response = new StringBuilder(); - while ((line = reader.readLine()) != null) { - response.append(line); - } - return response.toString(); - } - } catch (Exception e) { - LOGGER.error(MessageCode.EC0001.getMsgEn(), e); - } - return null; - } - - /** - * Send a POST request to the specified URL with a given request body and retrieve the response as a string. - * - * @param urlStr The URL to send the POST request to. - * @param body The request body for the POST request. - * @return The response from the POST request as a string. - */ - public static String postRequest(final String urlStr, final String body) { - try { - URL url = new URL(urlStr); - - if (!sercuritySSRFUrlCheck(url)) { - throw new IllegalArgumentException("URL is vulnerable to SSRF attacks"); - } - - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - - connection.setRequestMethod(HttpConstant.POST); - connection.setConnectTimeout(HttpConstant.TIME_OUT); - connection.setReadTimeout(HttpConstant.TIME_OUT); - connection.setRequestProperty(HttpConstant.CONTENT_TYPE, "application/json"); - connection.setDoOutput(true); - - int responseCode = connection.getResponseCode(); - if (responseCode != HttpURLConnection.HTTP_OK) { - throw new IOException("HTTP error code: " + responseCode); - } - - try (OutputStream outputStream = connection.getOutputStream()) { - outputStream.write(body.getBytes()); - } - try (InputStream inputStream = connection.getInputStream(); - InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); - BufferedReader reader = new BufferedReader(inputStreamReader)) { - String line; - StringBuilder response = new StringBuilder(); - while ((line = reader.readLine()) != null) { - response.append(line); - } - return response.toString(); - } - } catch (Exception e) { - LOGGER.error(MessageCode.EC0001.getMsgEn(), e); - } - return null; - } - - /** - * Get an HTTP client with specified parameters. - * - * @param uri The URI for the HTTP client. - * @param token The token to include in the request. - * @param userToken The user token to include in the request. - * @param cookie The cookie value to include in the request. - * @return The HTTP client as a string. - */ - public static String getHttpClient(final String uri, final String token, - final String userToken, final String cookie) { - HttpClient httpClient = HttpClients.createDefault(); - HttpGet httpGet = new HttpGet(uri); - httpGet.setConfig(REQUEST_CONFIG); - - if (token != null) { - httpGet.addHeader(HttpConstant.TOKEN, token); - } - if (userToken != null) { - httpGet.addHeader(HttpConstant.USER_TOKEN, userToken); - } - if (cookie != null) { - httpGet.addHeader(HttpConstant.COOKIE, "_Y_G_=" + cookie); - } - - try { - HttpResponse response = httpClient.execute(httpGet); - return EntityUtils.toString(response.getEntity()); - } catch (Exception e) { - throw new RuntimeException(MessageCode.EC0001.getMsgEn()); - } - } - - /** - * Send a POST request using an HTTP client to the specified URI with the given request body. - * - * @param uri The URI for the POST request. - * @param requestBody The body of the POST request. - * @return The response from the POST request as a string. - */ - public static String postHttpClient(final String uri, final String requestBody) { - HttpClient httpClient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost(uri); - httpPost.setConfig(REQUEST_CONFIG); - try { - httpPost.setHeader(HttpConstant.CONTENT_TYPE, "application/json"); - StringEntity stringEntity = new StringEntity(requestBody); - httpPost.setEntity(stringEntity); - HttpResponse response = httpClient.execute(httpPost); - return EntityUtils.toString(response.getEntity()); - } catch (Exception e) { - throw new RuntimeException(MessageCode.EC0001.getMsgEn()); - } - } - - /** - * Perform a security check for SSRF on the provided URL. - * - * @param url The URL to check for SSRF. - * @return Boolean value indicating the SSRF security check result. - */ - // ssrf检查，whitelist todo - private static Boolean sercuritySSRFUrlCheck(final URL url) { - return url.getProtocol().startsWith("http") || url.getProtocol().startsWith("https"); - } -} diff --git a/src/main/java/com/easysoftware/common/utils/LogUtil.java b/src/main/java/com/easysoftware/common/utils/LogUtil.java index 1de880bc1a2d3b020d39db49c22cc4588a41cbf5..14e382c75bd9411b317b00e3347a22c5e3fd0390 100644 --- a/src/main/java/com/easysoftware/common/utils/LogUtil.java +++ b/src/main/java/com/easysoftware/common/utils/LogUtil.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.utils; import com.easysoftware.common.aop.ManagementLog; @@ -15,10 +26,10 @@ import lombok.SneakyThrows; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.Locale; public final class LogUtil { - // Private constructor to prevent instantiation of the utility class private LogUtil() { // private constructor to hide the implicit public one @@ -44,9 +55,9 @@ public final class LogUtil { */ @SneakyThrows public static void managementOperate(final JoinPoint joinPoint, - final HttpServletRequest request, - final HttpServletResponse response, - final Object returnObject) { + final HttpServletRequest request, + final HttpServletResponse response, + final Object returnObject) { ManagementLog log = new ManagementLog(); log.setType("OmOperate"); @@ -54,7 +65,7 @@ public final class LogUtil { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); log.setTime(dateTime.format(formatter)); - log.setFunc(String.format("%s.%s", joinPoint.getSignature().getDeclaringTypeName(), + log.setFunc(String.format(Locale.ROOT, "%s.%s", joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName())); log.setRequestUrl(request.getRequestURI()); @@ -65,8 +76,7 @@ public final class LogUtil { if (returnObject instanceof ResponseEntity) { ResponseEntity responseEntity = (ResponseEntity) returnObject; log.setStatus(responseEntity.getStatusCode().value()); - if (responseEntity.getBody() instanceof ResultVo) { - ResultVo body = (ResultVo) responseEntity.getBody(); + if (responseEntity.getBody() instanceof ResultVo body) { Object msg = body.getMsg(); log.setMessage((msg == null) ? "" : msg.toString()); } @@ -77,4 +87,24 @@ public final class LogUtil { LOGGER.info("operationLog:{}", jsonLog); } + /** + * format logging parameter. + * + * @param input The input pramater + * @return formatedOutput The safe output logging parmeter + */ + + public static String formatCodeString(String input) { + if (input == null) { + return input; + } + + String formatedOutput = input.replace("\r", "\\r").replace("\n", "\\n").replace("\u0008", "\\u0008") + .replace("\u000B", "\\u000B") + .replace("\u000C", "\\u000C") + .replace("\u007F", "\\u007F") + .replace("\u0009", "\\u0009"); + + return formatedOutput; + } } diff --git a/src/main/java/com/easysoftware/common/utils/ObjectMapperUtil.java b/src/main/java/com/easysoftware/common/utils/ObjectMapperUtil.java index c3b169ac91cbb6d7be5370e9d84efebed3590fad..412bebb71644eadfbda42d85ad3fb03d5255aa7d 100644 --- a/src/main/java/com/easysoftware/common/utils/ObjectMapperUtil.java +++ b/src/main/java/com/easysoftware/common/utils/ObjectMapperUtil.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.utils; import com.easysoftware.common.exception.MyJacksonException; @@ -61,7 +72,6 @@ public final class ObjectMapperUtil { javaTimeModule.addSerializer( LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm:ss"))); objectMapper.setSerializationInclusion(Include.NON_NULL); - // objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); objectMapper.registerModule(javaTimeModule); // 设置时区 objectMapper.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); diff --git a/src/main/java/com/easysoftware/common/utils/QueryWrapperUtil.java b/src/main/java/com/easysoftware/common/utils/QueryWrapperUtil.java index 36d9054fc0a0cf4300f27f33549f86998859d53c..fed2863d15065cc32dbcea8a357d3856f141a16d 100644 --- a/src/main/java/com/easysoftware/common/utils/QueryWrapperUtil.java +++ b/src/main/java/com/easysoftware/common/utils/QueryWrapperUtil.java @@ -1,7 +1,19 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.utils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.exception.enumvalid.TimeOrderEnum; import com.power.common.util.StringUtil; import org.apache.commons.lang3.StringUtils; @@ -45,7 +57,7 @@ public final class QueryWrapperUtil { try { value = field.get(u); } catch (Exception e) { - LOGGER.error(MessageCode.EC00011.getMsgEn(), e); + LOGGER.error(MessageCode.EC00011.getMsgEn(), e.getMessage()); } if (!(value instanceof String)) { return ""; @@ -59,15 +71,20 @@ public final class QueryWrapperUtil { * setColumnOrder. * * @param wrapper The wrapper - * @param column The column - * @param vStr the vStr + * @param column The column + * @param vStr The vStr + * @param orderName The orderName * @param the type of array elements */ - private static void setColumnOrder(QueryWrapper wrapper, String column, String vStr) { - if (TimeOrderEnum.DESC.getAlias().equals(vStr)) { + private static void setColumnOrder(QueryWrapper wrapper, String column, String vStr, String orderName) { + if (StringUtils.isBlank(vStr)) { + return; + } else if (TimeOrderEnum.DESC.getAlias().equals(vStr)) { wrapper.orderByDesc(column); } else if (TimeOrderEnum.ASC.getAlias().equals(vStr)) { wrapper.orderByAsc(column); + } else { + throw new ParamErrorException("the value of " + orderName + "can be one of: asc, desc"); } } @@ -89,12 +106,12 @@ public final class QueryWrapperUtil { String vStr = getFieldValue(field, u); if ("timeOrder".equals(field.getName())) { - setColumnOrder(wrapper, updateAt, vStr); + setColumnOrder(wrapper, updateAt, vStr, "timeOrder"); continue; } if ("nameOrder".equals(field.getName())) { - setColumnOrder(wrapper, "name", vStr); + setColumnOrder(wrapper, "name", vStr, "nameOrder"); continue; } diff --git a/src/main/java/com/easysoftware/common/utils/ResultUtil.java b/src/main/java/com/easysoftware/common/utils/ResultUtil.java index 14483cfab750a8d54e55ef5452f32267a88102f4..f03e2e203b15b9037acf150450a9df4b87b70722 100644 --- a/src/main/java/com/easysoftware/common/utils/ResultUtil.java +++ b/src/main/java/com/easysoftware/common/utils/ResultUtil.java @@ -1,12 +1,12 @@ -/* This project is licensed under the Mulan PSL v2. +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR - PURPOSE. + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. - Create: 2024 */ package com.easysoftware.common.utils; @@ -89,6 +89,21 @@ public final class ResultUtil { * Create a ResponseEntity representing a failure response with the specified HTTP status and message code. * * @param status The HTTP status for the response + * @param msg The msg + * @return A ResponseEntity object representing failure + */ + public static ResponseEntity fail(HttpStatus status, String msg) { + ResultVo res = new ResultVo() + .setCode(status.value()) + .setMsg(status.getReasonPhrase()) + .setError(msg); + return new ResponseEntity<>(res, status); + } + + /** + * Create a ResponseEntity representing a failure response with the specified HTTP status and message code. + * + * @param status The HTTP status for the response * @param msgCode The message code associated with the failure response * @return A ResponseEntity object representing failure */ @@ -174,20 +189,4 @@ public final class ResultUtil { } return new ResponseEntity<>(res, status); } - -/* public static ResponseEntity paramError(HttpStatus status, MessageCode msgCode, String parameter) { - ResultEntity res = new ResultEntity() - .setCode(status.value()) - .setMsg(new ResultMsgEntity() - .setCode(msgCode.getCode()) - .setMsgEn(msgCode.getMsgEn()) - .setMsgZh(msgCode.getMsgZh())) - .setError(); - return new ResponseEntity<>(res, status); - }*/ - - /*public static ResponseEntity paramError(String parameter) { - String error = MessageCode.EC0004.getMsgEn() + ": " + parameter; - return fail(HttpStatus.BAD_REQUEST, MessageCode.EC0004, error); - }*/ } diff --git a/src/main/java/com/easysoftware/common/utils/SortUtil.java b/src/main/java/com/easysoftware/common/utils/SortUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..e910e558666dac82ce86845c72459c49f0135956 --- /dev/null +++ b/src/main/java/com/easysoftware/common/utils/SortUtil.java @@ -0,0 +1,49 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + +package com.easysoftware.common.utils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +public final class SortUtil { + // Private constructor to prevent instantiation of the utility class + private SortUtil() { + // private constructor to hide the implicit public one + throw new AssertionError("QueryWrapperUtil class cannot be instantiated."); + } + + /** + * The order of tags. + */ + private static final List ORDERS = List.of("RPM", "IMAGE", "EPKG"); + + /** + * sort the tags. + * + * @param tags The origin tags + * @return A list sorted + */ + public static List sortTags(Collection tags) { + List list = new ArrayList<>(tags); + Comparator listCompare = (s1, s2) -> { + Integer i1 = ORDERS.indexOf(s1); + Integer i2 = ORDERS.indexOf(s2); + return i1.compareTo(i2); + }; + + Collections.sort(list, listCompare); + return list; + } +} diff --git a/src/main/java/com/easysoftware/common/utils/UuidUtil.java b/src/main/java/com/easysoftware/common/utils/UuidUtil.java deleted file mode 100644 index b3930b354c2d4d58e9dd29cb89114d34205f719c..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/common/utils/UuidUtil.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.easysoftware.common.utils; - -import java.util.UUID; - -public final class UuidUtil { - - // Private constructor to prevent instantiation of the utility class - private UuidUtil() { - // private constructor to hide the implicit public one - throw new AssertionError("UuidUtil class cannot be instantiated."); - } - - /** - * Generate a UUID with 32 characters. - * - * @return A UUID string of length 32 - */ - public static String getUUID32() { - return UUID.randomUUID().toString().replace("-", "").toLowerCase(); - } - -} diff --git a/src/main/java/com/easysoftware/domain/applicationpackage/ApplicationPackage.java b/src/main/java/com/easysoftware/domain/applicationpackage/ApplicationPackage.java index 29db88880c4d18f2858a616f3c4cb151a4119fe5..c9fe6cca884ee398b3780a21039568b21363029d 100644 --- a/src/main/java/com/easysoftware/domain/applicationpackage/ApplicationPackage.java +++ b/src/main/java/com/easysoftware/domain/applicationpackage/ApplicationPackage.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.applicationpackage; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/domain/applicationpackage/gateway/ApplicationPackageGateway.java b/src/main/java/com/easysoftware/domain/applicationpackage/gateway/ApplicationPackageGateway.java index f2d87060b5d430c8b41f9c7ea2c8cc0c1104ac75..a7efbf9b3d97bf07065c130eee57bfd7ab744e12 100644 --- a/src/main/java/com/easysoftware/domain/applicationpackage/gateway/ApplicationPackageGateway.java +++ b/src/main/java/com/easysoftware/domain/applicationpackage/gateway/ApplicationPackageGateway.java @@ -1,45 +1,25 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.applicationpackage.gateway; +import com.easysoftware.application.applicationpackage.dto.ApplicationPackageNameSearchCondition; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageDetailVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; -import com.easysoftware.domain.applicationpackage.ApplicationPackage; import java.util.List; import java.util.Map; public interface ApplicationPackageGateway { - /** - * Check if an application exists based on its name. - * - * @param name The name of the application - * @return true if the application exists, false otherwise - */ - boolean existApp(String name); - - /** - * Save an ApplicationPackage object. - * - * @param appPkg The ApplicationPackage object to save - * @return true if the save operation was successful, false otherwise - */ - boolean save(ApplicationPackage appPkg); - - /** - * Update an existing ApplicationPackage object. - * - * @param appPkg The ApplicationPackage object to update - * @return true if the update operation was successful, false otherwise - */ - boolean update(ApplicationPackage appPkg); - - /** - * Delete an application by name. - * - * @param name The name of the application to delete - * @return true if the delete operation was successful, false otherwise - */ - boolean delete(String name); /** * Query menu items based on the provided search condition. @@ -94,7 +74,7 @@ public interface ApplicationPackageGateway { * @param condition The search condition for querying tags * @return A map containing tags information */ - Map queryTagsByName(ApplicationPackageSearchCondition condition); + Map queryTagsByName(ApplicationPackageNameSearchCondition condition); /** * Query Euler Version based on the provided search condition. @@ -102,14 +82,5 @@ public interface ApplicationPackageGateway { * @param condition The search condition for querying EulerVersion * @return A map containing tags information */ - Map queryEulerVersionByName(ApplicationPackageSearchCondition condition); - - /** - * Query Euler archs based on the provided search condition. - * - * @param condition The search condition for querying EulerVersion - * @return A map containing tags information - */ - Map queryEulerArchsByName(ApplicationPackageSearchCondition condition); - + Map queryEulerVersionByName(ApplicationPackageNameSearchCondition condition); } diff --git a/src/main/java/com/easysoftware/domain/applicationversion/ApplicationVersion.java b/src/main/java/com/easysoftware/domain/applicationversion/ApplicationVersion.java index 19ab24c9962053c195480f5b56e039e22a03c9d3..d038855ed65b5ef32cf6b3c0468a122e35980922 100644 --- a/src/main/java/com/easysoftware/domain/applicationversion/ApplicationVersion.java +++ b/src/main/java/com/easysoftware/domain/applicationversion/ApplicationVersion.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.applicationversion; import lombok.Getter; diff --git a/src/main/java/com/easysoftware/domain/applicationversion/gateway/ApplicationVersionGateway.java b/src/main/java/com/easysoftware/domain/applicationversion/gateway/ApplicationVersionGateway.java index 336a3addad70d10f45fecb5127eed832839b67e0..4a30e1797376e37cdf0bb2588d75e56ab41aac11 100644 --- a/src/main/java/com/easysoftware/domain/applicationversion/gateway/ApplicationVersionGateway.java +++ b/src/main/java/com/easysoftware/domain/applicationversion/gateway/ApplicationVersionGateway.java @@ -1,46 +1,21 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.applicationversion.gateway; import com.easysoftware.application.applicationversion.dto.ApplicationVersionSearchCondition; -import com.easysoftware.domain.applicationversion.ApplicationVersion; -import com.easysoftware.infrastructure.applicationversion.gatewayimpl.dataobject.ApplicationVersionDO; - -import java.util.Collection; import java.util.List; import java.util.Map; - public interface ApplicationVersionGateway { - /** - * Check if an application exists based on its name. - * - * @param name The name of the application - * @return true if the application exists, false otherwise - */ - boolean existApp(String name); - - /** - * Save an ApplicationVersion object. - * - * @param appVersion The ApplicationVersion object to save - * @return true if the save operation was successful, false otherwise - */ - boolean save(ApplicationVersion appVersion); - - /** - * Update an existing ApplicationVersion object. - * - * @param appVersion The ApplicationVersion object to update - * @return true if the update operation was successful, false otherwise - */ - boolean update(ApplicationVersion appVersion); - - /** - * Delete an application by name. - * - * @param name The name of the application to delete - * @return true if the delete operation was successful, false otherwise - */ - boolean delete(String name); /** * Query information based on the provided search condition. @@ -58,14 +33,6 @@ public interface ApplicationVersionGateway { */ Map queryByEulerOsVersion(ApplicationVersionSearchCondition condition); - /** - * Convert a batch of data objects to ApplicationVersionDO objects. - * - * @param dataObject A collection of data objects to convert - * @return A collection of ApplicationVersionDO objects - */ - Collection convertBatch(Collection dataObject); - /** * Search column. * @@ -74,4 +41,3 @@ public interface ApplicationVersionGateway { */ Map> queryColumn(List columns); } - diff --git a/src/main/java/com/easysoftware/domain/epkgpackage/EPKGPackage.java b/src/main/java/com/easysoftware/domain/epkgpackage/EPKGPackage.java index f1519c47d580192c50893ee7b3b655b0db26d142..3d43139dae7e434719531ec04a741ea9dff0bff2 100644 --- a/src/main/java/com/easysoftware/domain/epkgpackage/EPKGPackage.java +++ b/src/main/java/com/easysoftware/domain/epkgpackage/EPKGPackage.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.epkgpackage; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/domain/epkgpackage/EPKGPackageUnique.java b/src/main/java/com/easysoftware/domain/epkgpackage/EPKGPackageUnique.java index 196433908ed3d30896703a20994fff4958f07974..bfd88dd1e6bb76bb5039717600770135f93c02b4 100644 --- a/src/main/java/com/easysoftware/domain/epkgpackage/EPKGPackageUnique.java +++ b/src/main/java/com/easysoftware/domain/epkgpackage/EPKGPackageUnique.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.epkgpackage; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/domain/epkgpackage/gateway/EPKGPackageGateway.java b/src/main/java/com/easysoftware/domain/epkgpackage/gateway/EPKGPackageGateway.java index 80b9b1848196d5e9554ff5e56bcf2eef6d630fe6..7a2357ce4b52e6d5881b4f468c4202738b182b7d 100644 --- a/src/main/java/com/easysoftware/domain/epkgpackage/gateway/EPKGPackageGateway.java +++ b/src/main/java/com/easysoftware/domain/epkgpackage/gateway/EPKGPackageGateway.java @@ -1,57 +1,24 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.epkgpackage.gateway; +import com.easysoftware.application.epkgpackage.dto.EPKGPackageNameSearchCondition; import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; import com.easysoftware.application.epkgpackage.vo.EPKGPackageDetailVo; import com.easysoftware.application.epkgpackage.vo.EPKGPackageMenuVo; -import com.easysoftware.domain.epkgpackage.EPKGPackage; -import com.easysoftware.domain.epkgpackage.EPKGPackageUnique; -import com.easysoftware.infrastructure.epkgpackage.gatewayimpl.dataobject.EPKGPackageDO; - -import java.util.Collection; import java.util.List; import java.util.Map; public interface EPKGPackageGateway { - /** - * Check if an EPKG package exists based on its unique identifier. - * - * @param unique The unique identifier of the EPKG package - * @return true if the EPKG package exists, false otherwise - */ - boolean existEPKG(EPKGPackageUnique unique); - - /** - * Check if an EPKG package exists based on its ID. - * - * @param id The ID of the EPKG package - * @return true if the EPKG package exists, false otherwise - */ - boolean existEPKG(String id); - - /** - * Save an EPKGPackage object. - * - * @param appPkg The EPKGPackage object to save - * @return true if the save operation was successful, false otherwise - */ - boolean save(EPKGPackage appPkg); - - /** - * Update an existing EPKGPackage object. - * - * @param appPkg The EPKGPackage object to update - * @return the number of rows affected by the update operation - */ - int update(EPKGPackage appPkg); - - /** - * Delete EPKG packages by their IDs. - * - * @param id A list of IDs of EPKG packages to delete - * @return the number of rows deleted - */ - int delete(List id); - /** * Query detailed information based on the provided search condition. * @@ -99,27 +66,11 @@ public interface EPKGPackageGateway { */ EPKGPackageMenuVo selectOne(String name); - /** - * Convert a batch of data objects to EPKGPackageDO objects. - * - * @param dataObject A collection of data objects to convert - * @return A collection of EPKGPackageDO objects - */ - Collection convertBatch(Collection dataObject); - /** * Query Euler Version based on the provided search condition. * * @param condition The search condition for querying EulerVersion * @return A map containing tags information */ - Map queryEulerVersionByName(EPKGPackageSearchCondition condition); - - /** - * Query Euler archs based on the provided search condition. - * - * @param condition The search condition for querying EulerVersion - * @return A map containing tags information - */ - Map queryEulerArchsByName(EPKGPackageSearchCondition condition); + Map queryEulerVersionByName(EPKGPackageNameSearchCondition condition); } diff --git a/src/main/java/com/easysoftware/domain/externalos/ExternalOs.java b/src/main/java/com/easysoftware/domain/externalos/ExternalOs.java deleted file mode 100644 index d78884635922df92aae0dbf9493ba1502ac439c7..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/domain/externalos/ExternalOs.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.easysoftware.domain.externalos; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; - - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ExternalOs { - /** - * Class representing a mapping between packages in different operating systems. - */ - @Serial - private static final long serialVersionUID = 1L; - - /** - * Identifier of the package mapping. - */ - private String id; - - /** - * Name of the originating operating system. - */ - private String originOsName; - - /** - * Version of the originating operating system. - */ - private String originOsVer; - - /** - * Name of the package in the originating operating system. - */ - private String originPkg; - - /** - * Name of the target operating system. - */ - private String targetOsName; - - /** - * Version of the target operating system. - */ - private String targetOsVer; - - /** - * Name of the package in the target operating system. - */ - private String targetPkg; - -} diff --git a/src/main/java/com/easysoftware/domain/externalos/ExternalOsUnique.java b/src/main/java/com/easysoftware/domain/externalos/ExternalOsUnique.java deleted file mode 100644 index 4b4bdcb63ac7ef6e6f3af2c052a818ee2141f81f..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/domain/externalos/ExternalOsUnique.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.easysoftware.domain.externalos; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ExternalOsUnique { - /** - * Name of the originating operating system. - */ - private String originOsName; - - /** - * Version of the originating operating system. - */ - private String originOsVer; - - /** - * Name of the package in the originating operating system. - */ - private String originPkg; - - /** - * Name of the target operating system. - */ - private String targetOsName; - - /** - * Version of the target operating system. - */ - private String targetOsVer; - - /** - * Name of the package in the target operating system. - */ - private String targetPkg; - -} diff --git a/src/main/java/com/easysoftware/domain/externalos/gateway/ExternalOsGateway.java b/src/main/java/com/easysoftware/domain/externalos/gateway/ExternalOsGateway.java deleted file mode 100644 index 4bf59cb43716ebde4f1788ee73c42ef2a1460e81..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/domain/externalos/gateway/ExternalOsGateway.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.easysoftware.domain.externalos.gateway; - -import com.easysoftware.application.externalos.dto.ExternalOsSearchCondiiton; -import com.easysoftware.domain.externalos.ExternalOs; -import com.easysoftware.domain.externalos.ExternalOsUnique; - -import java.util.List; -import java.util.Map; - -public interface ExternalOsGateway { - /** - * Query package mapping based on the provided search condition. - * - * @param condition The search condition for querying package mappings - * @return A map containing relevant information - */ - Map queryPkgMap(ExternalOsSearchCondiiton condition); - - /** - * Check if an external operating system exists based on its ID. - * - * @param id The ID of the external operating system - * @return true if the external operating system exists, false otherwise - */ - boolean existExternalOs(String id); - - /** - * Delete external operating systems by their IDs. - * - * @param ids A list of IDs of external operating systems to delete - * @return the number of rows deleted - */ - int delete(List ids); - - /** - * Check if an external operating system exists based on its unique identifier. - * - * @param uni The unique identifier of the external operating system - * @return true if the external operating system exists, false otherwise - */ - boolean existExternalOs(ExternalOsUnique uni); - - /** - * Save an ExternalOs object. - * - * @param ex The ExternalOs object to save - * @return true if the save operation was successful, false otherwise - */ - boolean save(ExternalOs ex); - - /** - * Update an existing ExternalOs object. - * - * @param ex The ExternalOs object to update - * @return the number of rows affected by the update operation - */ - int update(ExternalOs ex); - -} diff --git a/src/main/java/com/easysoftware/domain/fieldapplication/gateway/FieldapplicationGateway.java b/src/main/java/com/easysoftware/domain/fieldapplication/gateway/FieldapplicationGateway.java index 63eb9acd0e845810e9106ce8b12b6ab5d4046f52..548c98d649c1d0230a90161274e5849fd40aa98d 100644 --- a/src/main/java/com/easysoftware/domain/fieldapplication/gateway/FieldapplicationGateway.java +++ b/src/main/java/com/easysoftware/domain/fieldapplication/gateway/FieldapplicationGateway.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.fieldapplication.gateway; diff --git a/src/main/java/com/easysoftware/domain/fieldpkg/gateway/FieldPkgGateway.java b/src/main/java/com/easysoftware/domain/fieldpkg/gateway/FieldPkgGateway.java index e7e614547d344d37acbc62f6df58192da0e7f45f..bc8d264000c5f3f60aecc4372793174ccd02f86c 100644 --- a/src/main/java/com/easysoftware/domain/fieldpkg/gateway/FieldPkgGateway.java +++ b/src/main/java/com/easysoftware/domain/fieldpkg/gateway/FieldPkgGateway.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.fieldpkg.gateway; import java.util.List; diff --git a/src/main/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGateway.java b/src/main/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGateway.java index 443ffa8df4c1b003c8a9cc0a0e32f6f4dc50666a..9c8f44b2d2fac50d59f9df8feb2e8b568e7ab9d9 100644 --- a/src/main/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGateway.java +++ b/src/main/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGateway.java @@ -1,27 +1,21 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.operationconfig.gateway; -import com.easysoftware.application.operationconfig.dto.InputOperationConfig; import com.easysoftware.application.operationconfig.vo.OperationConfigVo; import java.util.List; public interface OperationConfigGateway { - /** - * Insert an operation configuration based on the input. - * - * @param input The input operation configuration to insert - * @return true if the insertion was successful, false otherwise - */ - boolean insertOperationConfig(InputOperationConfig input); - - /** - * Delete operation configurations by type. - * - * @param type The type of operation configurations to delete - * @return true if the deletion was successful, false otherwise - */ - boolean deleteByType(String type); - /** * Select all operation configurations and return them as a list of OperationConfigVo objects. * diff --git a/src/main/java/com/easysoftware/domain/rpmpackage/RPMPackage.java b/src/main/java/com/easysoftware/domain/rpmpackage/RPMPackage.java index 69645258abd2f04fc7316e2a90bb45080ff90da6..5aa9dc8282f4392b68672f377eb0e49a62e4048d 100644 --- a/src/main/java/com/easysoftware/domain/rpmpackage/RPMPackage.java +++ b/src/main/java/com/easysoftware/domain/rpmpackage/RPMPackage.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.rpmpackage; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/domain/rpmpackage/RPMPackageUnique.java b/src/main/java/com/easysoftware/domain/rpmpackage/RPMPackageUnique.java index bfaa08be2333ed48a1a26cbbb254f4f330d1e063..03ff3c94cca5f9fea2e1fd623ce759b101c4c4a7 100644 --- a/src/main/java/com/easysoftware/domain/rpmpackage/RPMPackageUnique.java +++ b/src/main/java/com/easysoftware/domain/rpmpackage/RPMPackageUnique.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.rpmpackage; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/easysoftware/domain/rpmpackage/gateway/RPMPackageGateway.java b/src/main/java/com/easysoftware/domain/rpmpackage/gateway/RPMPackageGateway.java index 2a5f74281e9ee1a68a76a86040375ad98cad0014..2a6a20a8fe753fe5d01ab090b8be908fdd931c76 100644 --- a/src/main/java/com/easysoftware/domain/rpmpackage/gateway/RPMPackageGateway.java +++ b/src/main/java/com/easysoftware/domain/rpmpackage/gateway/RPMPackageGateway.java @@ -1,56 +1,24 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.rpmpackage.gateway; +import com.easysoftware.application.rpmpackage.dto.RPMPackageNameSearchCondition; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageMenuVo; -import com.easysoftware.domain.rpmpackage.RPMPackage; -import com.easysoftware.domain.rpmpackage.RPMPackageUnique; -import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject.RPMPackageDO; - -import java.util.Collection; import java.util.List; import java.util.Map; public interface RPMPackageGateway { - /** - * Check if an RPM package exists based on its unique identifier. - * - * @param unique The unique identifier of the RPM package - * @return true if the RPM package exists, false otherwise - */ - boolean existRPM(RPMPackageUnique unique); - - /** - * Check if an RPM package exists based on its ID. - * - * @param id The ID of the RPM package - * @return true if the RPM package exists, false otherwise - */ - boolean existRPM(String id); - - /** - * Save an RPMPackage object. - * - * @param appPkg The RPMPackage object to save - * @return true if the save operation was successful, false otherwise - */ - boolean save(RPMPackage appPkg); - - /** - * Update an existing RPMPackage object. - * - * @param appPkg The RPMPackage object to update - * @return the number of rows affected by the update operation - */ - int update(RPMPackage appPkg); - - /** - * Delete RPM packages by their IDs. - * - * @param id A list of IDs of RPM packages to delete - * @return the number of rows deleted - */ - int delete(List id); /** * Query detailed information based on the provided search condition for RPM @@ -92,14 +60,6 @@ public interface RPMPackageGateway { */ long queryTableLength(); - /** - * Convert a batch of data objects to RPMPackageDO objects. - * - * @param dataObject A collection of data objects to convert - * @return A collection of RPMPackageDO objects - */ - Collection convertBatch(Collection dataObject); - /** * Query part of the RPM package menu based on the provided search condition. * @@ -123,14 +83,13 @@ public interface RPMPackageGateway { * @param condition The search condition for querying EulerVersion * @return A map containing tags information */ - Map queryEulerVersionByName(RPMPackageSearchCondition condition); + Map queryEulerVersionByName(RPMPackageNameSearchCondition condition); /** - * Query Euler archs based on the provided search condition. + * Query the RPM newest version based on the provided search condition. * - * @param condition The search condition for querying EulerVersion - * @return A map containing tags information + * @param condition The search condition for querying RPM newest version + * @return A map containing RPM newest version */ - Map queryEulerArchsByName(RPMPackageSearchCondition condition); - + Map queryNewstRpmVersion(RPMPackageNameSearchCondition condition); } diff --git a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java index fc44a4e6d53b82c9b30f9ce8506ed14d4a743ff4..76687a3675d996eec1b4564ca5641e133cafa106 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java @@ -1,19 +1,28 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.applicationpackage.gatewayimpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.easysoftware.application.applicationpackage.dto.ApplicationPackageNameSearchCondition; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageDetailVo; -import com.easysoftware.application.applicationpackage.vo.ApplicationPackageEulerArchsVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageEulerVersionVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageTagsVo; import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ClassField; import com.easysoftware.common.utils.QueryWrapperUtil; -import com.easysoftware.domain.applicationpackage.ApplicationPackage; import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; import com.easysoftware.infrastructure.applicationpackage.gatewayimpl.converter.ApplicationPackageConverter; import com.easysoftware.infrastructure.applicationpackage.gatewayimpl.dataobject.ApplicationPackageDO; @@ -24,7 +33,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -44,63 +52,6 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway @Value("${apppkg.icon.path}") private String apppkgIconPath; - /** - * Delete an application by name. - * - * @param name The name of the application to delete - * @return true if the delete operation was successful, false otherwise - */ - @Override - public boolean delete(final String name) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("name", name); - int mark = appPkgMapper.delete(wrapper); - return mark == 1; - } - - /** - * Check if an application exists based on its name. - * - * @param name The name of the application - * @return true if the application exists, false otherwise - */ - @Override - public boolean existApp(final String name) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("name", name); - return appPkgMapper.exists(wrapper); - } - - /** - * Save an ApplicationPackage object. - * - * @param appPkg The ApplicationPackage object to save - * @return true if the save operation was successful, false otherwise - */ - @Override - public boolean save(final ApplicationPackage appPkg) { - ApplicationPackageDO appPkgDO = ApplicationPackageConverter.toDataObjectForCreate(appPkg); - int mark = appPkgMapper.insert(appPkgDO); - return mark == 1; - } - - /** - * Update an existing ApplicationPackage object. - * - * @param appPkg The ApplicationPackage object to update - * @return true if the update operation was successful, false otherwise - */ - @Override - public boolean update(final ApplicationPackage appPkg) { - ApplicationPackageDO appPkgDO = ApplicationPackageConverter.toDataObjectForUpdate(appPkg); - - UpdateWrapper wrapper = new UpdateWrapper<>(); - wrapper.eq("name", appPkg.getName()); - - int mark = appPkgMapper.update(appPkgDO, wrapper); - return mark == 1; - } - /** * Query menu items based on the provided search condition. * @@ -120,8 +71,8 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway wrapper.select(columns); IPage resPage = appPkgMapper.selectPage(page, wrapper); - List appDOs = resPage.getRecords(); long total = resPage.getTotal(); + List appDOs = resPage.getRecords(); List menus = ApplicationPackageConverter.toMenu(appDOs); Map res = new HashMap<>(); @@ -137,12 +88,10 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway * @return A map containing tags information */ @Override - public Map queryTagsByName(final ApplicationPackageSearchCondition condition) { - Page page = createPage(condition); + public Map queryTagsByName(final ApplicationPackageNameSearchCondition condition) { QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new ApplicationPackageDO(), condition, null); - IPage resPage = appPkgMapper.selectPage(page, wrapper); - List appDOs = resPage.getRecords(); + List appDOs = appPkgMapper.selectList(wrapper); List aggregatePkgs = ApplicationPackageConverter.aggregateByTags(appDOs); long total = aggregatePkgs.size(); @@ -209,7 +158,9 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway public ApplicationPackageMenuVo selectOne(final String name) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("pkg_id"); - wrapper.eq("name", name); + if (name != null) { + wrapper.eq("name", name); + } wrapper.last("limit 1"); List appList = appPkgMapper.selectList(wrapper); if (appList.size() == 0) { @@ -227,7 +178,9 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway @Override public List queryDetailByPkgId(final String pkgId) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("pkg_id", pkgId); + if (pkgId != null) { + wrapper.eq("pkg_id", pkgId); + } List appList = appPkgMapper.selectList(wrapper); return ApplicationPackageConverter.toDetail(appList); } @@ -266,17 +219,17 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway List allowedColumns = Arrays.asList("category", "os", "arch"); if (!allowedColumns.contains(column)) { - throw new ParamErrorException("Unsupported column"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } QueryWrapper wrapper = new QueryWrapper<>(); // 安全地选择列，列名已经通过白名单验证 wrapper.select("distinct " + column); - List rpmColumn = new ArrayList<>(); + List rpmColumn; try { rpmColumn = appPkgMapper.selectList(wrapper); } catch (BadSqlGrammarException e) { - throw new ParamErrorException("unsupported param"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } String underlineToCamelColumn = StringUtil.underlineToCamel(column); @@ -292,43 +245,20 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway * @return A map containing relevant information */ @Override - public Map queryEulerVersionByName(final ApplicationPackageSearchCondition condition) { + public Map queryEulerVersionByName(final ApplicationPackageNameSearchCondition condition) { QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new ApplicationPackageDO(), condition, ""); ApplicationPackageEulerVersionVo pkgVo = new ApplicationPackageEulerVersionVo(); List columns = ClassField.getFieldNames(pkgVo); - wrapper.eq("name", condition.getName()) - .select(columns) - .groupBy("os", "arch"); + if (condition.getName() != null) { + wrapper.eq("name", condition.getName()); + } + wrapper.select(columns); + wrapper.groupBy("os", "arch"); List appkgList = appPkgMapper.selectList(wrapper); List versions = ApplicationPackageConverter.toVersion(appkgList); - Map res = Map.ofEntries( - Map.entry("total", versions.size()), - Map.entry("list", versions)); - return res; - } - - /** - * Query the Euler archs based on the provided search condition. - * - * @param condition The search condition for querying a part of the appkg Euler - * archs - * @return A map containing relevant information - */ - @Override - public Map queryEulerArchsByName(final ApplicationPackageSearchCondition condition) { - QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new ApplicationPackageDO(), - condition, ""); - ApplicationPackageEulerArchsVo pkgVo = new ApplicationPackageEulerArchsVo(); - List columns = ClassField.getFieldNames(pkgVo); - wrapper.eq("name", condition.getName()) - .select(columns) - .groupBy("arch"); - List appkgList = appPkgMapper.selectList(wrapper); - List versions = ApplicationPackageConverter.toArchs(appkgList); - Map res = Map.ofEntries( + return Map.ofEntries( Map.entry("total", versions.size()), Map.entry("list", versions)); - return res; } } diff --git a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/converter/ApplicationPackageConverter.java b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/converter/ApplicationPackageConverter.java index 7f3c2f71c80f185fdd84e9a6685f61859989168b..3934546cf625092ce23e1aae599204ade14da99f 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/converter/ApplicationPackageConverter.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/converter/ApplicationPackageConverter.java @@ -1,13 +1,21 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.applicationpackage.gatewayimpl.converter; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageDetailVo; -import com.easysoftware.application.applicationpackage.vo.ApplicationPackageEulerArchsVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageEulerVersionVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageTagsVo; -import com.easysoftware.application.domainpackage.vo.DomainPackageMenuVo; import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.utils.UuidUtil; import com.easysoftware.domain.applicationpackage.ApplicationPackage; import com.easysoftware.infrastructure.applicationpackage.gatewayimpl.dataobject.ApplicationPackageDO; import org.apache.commons.lang3.StringUtils; @@ -16,7 +24,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import java.lang.reflect.Field; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -68,25 +75,6 @@ public final class ApplicationPackageConverter { return res; } - /** - * Converts a list of ApplicationPackageDO objects to a list of - * ApplicationPackageEulerArchsVo - * view - * objects. - * - * @param appkgDOs The list of ApplicationPackageDO objects to convert. - * @return A list of ApplicationPackageEulerArchsVo view objects. - */ - public static List toArchs(final List appkgDOs) { - List res = new ArrayList<>(); - for (ApplicationPackageDO appkg : appkgDOs) { - ApplicationPackageEulerArchsVo archs = new ApplicationPackageEulerArchsVo(); - archs.setArch(appkg.getArch()); - res.add(archs); - } - return res; - } - /** * Convert a list of ApplicationPackageDO objects to a list of * ApplicationPackageDetailVo objects. @@ -204,83 +192,6 @@ public final class ApplicationPackageConverter { return res; } - /** - * Convert an ApplicationPackage entity to an ApplicationPackageDO data object. - * - * @param appPkg The ApplicationPackage entity to convert - * @return An ApplicationPackageDO data object - */ - public static ApplicationPackageDO toDataObject(final ApplicationPackage appPkg) { - ApplicationPackageDO appPkgDO = new ApplicationPackageDO(); - BeanUtils.copyProperties(appPkg, appPkgDO); - return appPkgDO; - } - - /** - * Convert an ApplicationPackage entity to an ApplicationPackageDO data object - * specifically for creation. - * - * @param appPkg The ApplicationPackage entity to convert - * @return An ApplicationPackageDO data object tailored for creation - */ - public static ApplicationPackageDO toDataObjectForCreate(final ApplicationPackage appPkg) { - ApplicationPackageDO appPkgDO = toDataObject(appPkg); - - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - String id = UuidUtil.getUUID32(); - appPkgDO.setCreateAt(currentTime); - appPkgDO.setUpdateAt(currentTime); - appPkgDO.setId(id); - - return appPkgDO; - } - - /** - * Convert an ApplicationPackage entity to an ApplicationPackageDO data object - * specifically for update. - * - * @param appPkg The ApplicationPackage entity to convert - * @return An ApplicationPackageDO data object tailored for update - */ - public static ApplicationPackageDO toDataObjectForUpdate(final ApplicationPackage appPkg) { - ApplicationPackageDO appPkgDO = toDataObject(appPkg); - - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - appPkgDO.setUpdateAt(currentTime); - - return appPkgDO; - } - - /** - * Convert a list of ApplicationPackageMenuVo objects to a list of - * DomainPackageMenuVo objects. - * - * @param appList The list of ApplicationPackageMenuVo objects to convert - * @return A list of DomainPackageMenuVo objects - */ - public static List toDomainPackageMenuVo(final List appList) { - List menuList = new ArrayList<>(); - for (ApplicationPackageMenuVo app : appList) { - DomainPackageMenuVo menu = toDomainPackageMenuVo(app); - menuList.add(menu); - } - return menuList; - } - - /** - * Convert an ApplicationPackageMenuVo object to a DomainPackageMenuVo object. - * - * @param app The ApplicationPackageMenuVo object to convert - * @return A DomainPackageMenuVo object - */ - public static DomainPackageMenuVo toDomainPackageMenuVo(final ApplicationPackageMenuVo app) { - DomainPackageMenuVo menu = new DomainPackageMenuVo(); - BeanUtils.copyProperties(app, menu); - menu.getPkgIds().put("IMAGE", app.getPkgId()); - menu.getTags().add("IMAGE"); - return menu; - } - /** * Extract a specific column from a list of ApplicationPackageDO objects * and return the results as a list of strings. @@ -299,6 +210,12 @@ public final class ApplicationPackageConverter { continue; } Object obj = field.get(appDo); + + if (obj == null) { + LOGGER.warn("Field value is null for appDo: {}", appDo); + continue; + } + if (!(obj instanceof String)) { continue; } @@ -306,10 +223,9 @@ public final class ApplicationPackageConverter { if (StringUtils.isNotBlank(value)) { res.add(value); } - } } catch (Exception e) { - LOGGER.error(MessageCode.EC00011.getMsgEn(), e); + LOGGER.error(MessageCode.EC00011.getMsgEn(), e.getMessage()); } return res; } diff --git a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/dataobject/ApplicationPackageDO.java b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/dataobject/ApplicationPackageDO.java index 0c3e1f456bd4f6ad44a6b8ff2d008e70a2aefbb7..f70a5687a964e3a9cc7e4cf62e6c49c6f6f02292 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/dataobject/ApplicationPackageDO.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/dataobject/ApplicationPackageDO.java @@ -1,16 +1,24 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.applicationpackage.gatewayimpl.dataobject; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; + import java.io.Serial; import java.sql.Timestamp; @Data -@AllArgsConstructor -@NoArgsConstructor @TableName("application_package") public class ApplicationPackageDO { /** @@ -183,4 +191,56 @@ public class ApplicationPackageDO { * latestOsSupport. */ private String latestOsSupport; + + /** + * get an ApplicationPackageDO entity createAt field value. + * + * @return An Timestamp entity + */ + public Timestamp getCreateAt() { + if (this.createAt != null) { + return (Timestamp) this.createAt.clone(); + } else { + return null; + } + } + + /** + * get an ApplicationPackageDO entity updateAt field value. + * + * @return An Timestamp entity + */ + public Timestamp getUpdateAt() { + if (this.updateAt != null) { + return (Timestamp) this.updateAt.clone(); + } else { + return null; + } + } + + /** + * set an ApplicationPackageDO entity createAt field value. + * + * @param createAt The ApplicationPackageDO entity createAt field for set + */ + public void setCreateAt(Timestamp createAt) { + if (this.createAt != null) { + this.createAt = (Timestamp) createAt.clone(); + } else { + this.createAt = null; + } + } + + /** + * set an ApplicationPackageDO entity updateAt field value. + * + * @param updateAt The ApplicationPackageDO entity updateAt field for set + */ + public void setUpdateAt(Timestamp updateAt) { + if (this.updateAt != null) { + this.updateAt = (Timestamp) updateAt.clone(); + } else { + this.updateAt = null; + } + } } diff --git a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/ApplicationVersionGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/ApplicationVersionGatewayImpl.java index 140828b72bb202d2e7a5b4b30cc2341a410c6f59..02df5fee3bfba3630646185a5310a7400b740beb 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/ApplicationVersionGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/ApplicationVersionGatewayImpl.java @@ -1,11 +1,20 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.applicationversion.gatewayimpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easysoftware.application.applicationversion.dto.ApplicationVersionSearchCondition; import com.easysoftware.common.exception.ParamErrorException; -import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.QueryWrapperUtil; import com.easysoftware.domain.applicationversion.ApplicationVersion; import com.easysoftware.domain.applicationversion.gateway.ApplicationVersionGateway; @@ -13,14 +22,11 @@ import com.easysoftware.infrastructure.applicationversion.gatewayimpl.converter. import com.easysoftware.infrastructure.applicationversion.gatewayimpl.dataobject.ApplicationVersionDO; import com.easysoftware.infrastructure.mapper.ApplicationVersionDOMapper; import com.power.common.util.StringUtil; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -34,63 +40,6 @@ public class ApplicationVersionGatewayImpl implements ApplicationVersionGateway @Autowired private ApplicationVersionDOMapper appVersionMapper; - /** - * Delete an application by name. - * - * @param name The name of the application to delete - * @return true if the delete operation was successful, false otherwise - */ - @Override - public boolean delete(final String name) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.in("name", name); - int mark = appVersionMapper.delete(wrapper); - return mark == 1; - } - - /** - * Check if an application exists based on its name. - * - * @param name The name of the application - * @return true if the application exists, false otherwise - */ - @Override - public boolean existApp(final String name) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("name", name); - return appVersionMapper.exists(wrapper); - } - - /** - * Save an ApplicationVersion object. - * - * @param appVersion The ApplicationVersion object to save - * @return true if the save operation was successful, false otherwise - */ - @Override - public boolean save(final ApplicationVersion appVersion) { - ApplicationVersionDO appVersionDO = ApplicationVersionConvertor.toDataObjectForCreate(appVersion); - int mark = appVersionMapper.insert(appVersionDO); - return mark == 1; - } - - /** - * Update an existing ApplicationVersion object. - * - * @param appVersion The ApplicationVersion object to update - * @return true if the update operation was successful, false otherwise - */ - @Override - public boolean update(final ApplicationVersion appVersion) { - ApplicationVersionDO appVersionDO = ApplicationVersionConvertor.toDataObjectForUpdate(appVersion); - - UpdateWrapper wrapper = new UpdateWrapper<>(); - wrapper.eq("name", appVersion.getName()); - - int mark = appVersionMapper.update(appVersionDO, wrapper); - return mark == 1; - } - /** * Query information based on the provided search condition. * @@ -106,8 +55,9 @@ public class ApplicationVersionGatewayImpl implements ApplicationVersionGateway Page page = new Page<>(pageNum, pageSize); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper = name == null ? null : wrapper.eq("name", name); - + if (name != null) { + wrapper.eq("name", name); + } Page resPage = appVersionMapper.selectPage(page, wrapper); List appDOs = resPage.getRecords(); List appDetails = ApplicationVersionConvertor.toEntity(appDOs); @@ -119,23 +69,6 @@ public class ApplicationVersionGatewayImpl implements ApplicationVersionGateway return res; } - /** - * Convert a batch of data objects to ApplicationVersionDO objects. - * - * @param dataObject A collection of data objects to convert - * @return A collection of ApplicationVersionDO objects - */ - @Override - public Collection convertBatch(final Collection dataObject) { - Collection objList = new ArrayList<>(); - for (String obj : dataObject) { - ApplicationVersion appVer = ObjectMapperUtil.jsonToObject(obj, ApplicationVersion.class); - ApplicationVersionDO appVersionDO = ApplicationVersionConvertor.toDataObjectForCreate(appVer); - objList.add(appVersionDO); - } - return objList; - } - /** * Query information based on the provided search condition. * @@ -185,16 +118,16 @@ public class ApplicationVersionGatewayImpl implements ApplicationVersionGateway private List queryColumn(String column) { List allowedColumns = Arrays.asList("eulerOsVersion"); if (!allowedColumns.contains(column)) { - throw new ParamErrorException("Unsupported column"); + throw new ParamErrorException("the value of parameter column: eulerOsVersion"); } QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("distinct " + StringUtil.camelToUnderline(column)); - List columnList = new ArrayList<>(); + List columnList; try { columnList = appVersionMapper.selectList(wrapper); } catch (BadSqlGrammarException e) { - throw new ParamErrorException("unsupported param"); + throw new ParamErrorException("the value of parameter column: eulerOsVersion"); } String underlineToCamelColumn = StringUtil.underlineToCamel(column); diff --git a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/converter/ApplicationVersionConvertor.java b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/converter/ApplicationVersionConvertor.java index 0c701697381d97d0a8ee2c85246c2780b1f7505f..17ecbc2d98f984d27c7d117c5adf956ce61e6959 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/converter/ApplicationVersionConvertor.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/converter/ApplicationVersionConvertor.java @@ -1,7 +1,17 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.applicationversion.gatewayimpl.converter; import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.utils.UuidUtil; import com.easysoftware.domain.applicationversion.ApplicationVersion; import com.easysoftware.infrastructure.applicationversion.gatewayimpl.dataobject.ApplicationVersionDO; @@ -10,7 +20,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import java.lang.reflect.Field; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -39,7 +48,8 @@ public final class ApplicationVersionConvertor { } /** - * Convert a list of ApplicationVersionDO objects to a list of ApplicationVersion entities. + * Convert a list of ApplicationVersionDO objects to a list of + * ApplicationVersion entities. * * @param appDOs The list of ApplicationVersionDO objects to convert * @return A list of ApplicationVersion entities @@ -54,55 +64,11 @@ public final class ApplicationVersionConvertor { } /** - * Convert an ApplicationVersion entity to an ApplicationVersionDO data object. - * - * @param appVersion The ApplicationVersion entity to convert - * @return An ApplicationVersionDO data object - */ - public static ApplicationVersionDO toDataObject(final ApplicationVersion appVersion) { - ApplicationVersionDO appVersionDO = new ApplicationVersionDO(); - BeanUtils.copyProperties(appVersion, appVersionDO); - return appVersionDO; - } - - /** - * Convert an ApplicationVersion entity to an ApplicationVersionDO data object for creation. - * - * @param appVersion The ApplicationVersion entity to convert - * @return An ApplicationVersionDO data object for creation - */ - public static ApplicationVersionDO toDataObjectForCreate(final ApplicationVersion appVersion) { - ApplicationVersionDO appVersionDO = toDataObject(appVersion); - - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - String id = UuidUtil.getUUID32(); - appVersionDO.setCreatedAt(currentTime); - appVersionDO.setUpdateAt(currentTime); - appVersionDO.setId(id); - - return appVersionDO; - } - - /** - * Convert an ApplicationVersion entity to an ApplicationVersionDO data object for update. - * - * @param appVersion The ApplicationVersion entity to convert - * @return An ApplicationVersionDO data object for update - */ - public static ApplicationVersionDO toDataObjectForUpdate(final ApplicationVersion appVersion) { - ApplicationVersionDO appVersionDO = toDataObject(appVersion); - - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - appVersionDO.setUpdateAt(currentTime); - - return appVersionDO; - } - - /** - * Extracts a specific column from a list of RPMPackageDO objects and returns it as a list of strings. + * Extracts a specific column from a list of RPMPackageDO objects and returns it + * as a list of strings. * * @param columnList The list of ApplicationVersionDO objects. - * @param column The name of the column to extract. + * @param column The name of the column to extract. * @return A list of strings representing the extracted column values. */ public static List toColumn(final List columnList, final String column) { @@ -115,6 +81,12 @@ public final class ApplicationVersionConvertor { continue; } Object obj = field.get(rPMPkgDO); + + if (obj == null) { + LOGGER.warn("Field value is null for rPMPkgDO: {}", rPMPkgDO); + continue; + } + if (!(obj instanceof String)) { continue; } @@ -122,9 +94,8 @@ public final class ApplicationVersionConvertor { res.add(value); } } catch (Exception e) { - LOGGER.error(MessageCode.EC00011.getMsgEn(), e); + LOGGER.error(MessageCode.EC00011.getMsgEn(), e.getMessage()); } return res; } } - diff --git a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/dataobject/ApplicationVersionDO.java b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/dataobject/ApplicationVersionDO.java index 44022ba6f90bb1462c56939dab945db4e48b117e..abc4b02179f61c2f0badb58172cdbb931a1e2b02 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/dataobject/ApplicationVersionDO.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/dataobject/ApplicationVersionDO.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.applicationversion.gatewayimpl.dataobject; import com.baomidou.mybatisplus.annotation.TableId; @@ -78,4 +89,56 @@ public class ApplicationVersionDO { * Version of openEuler os: openEuler-22.03. */ private String eulerOsVersion; + + /** + * get an ApplicationVersionDO entity createdAt field value. + * + * @return An Timestamp entity + */ + public Timestamp getCreatedAt() { + if (this.createdAt != null) { + return (Timestamp) this.createdAt.clone(); + } else { + return null; + } + } + + /** + * get an ApplicationVersionDO entity updateAt field value. + * + * @return An Timestamp entity + */ + public Timestamp getUpdateAt() { + if (this.updateAt != null) { + return (Timestamp) this.updateAt.clone(); + } else { + return null; + } + } + + /** + * set an ApplicationVersionDO entity createAt field value. + * + * @param createAt The ApplicationPackageDO entity createAt field for set + */ + public void setCreatedAt(Timestamp createAt) { + if (this.createdAt != null) { + this.createdAt = (Timestamp) createAt.clone(); + } else { + this.createdAt = null; + } + } + + /** + * set an ApplicationVersionDO entity createAt field value. + * + * @param updateAt The ApplicationPackageDO entity createAt field for set + */ + public void setUpdateAt(Timestamp updateAt) { + if (this.updateAt != null) { + this.updateAt = (Timestamp) updateAt.clone(); + } else { + this.updateAt = null; + } + } } diff --git a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java index d2d7f26bbd397eb0caa67b548dddf1174aafa176..f875e85ae2bcae1e35a160b8db5e45268e1b2b94 100644 --- a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java @@ -1,36 +1,38 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.epkgpackage.gatewayimpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.easysoftware.application.epkgpackage.dto.EPKGPackageNameSearchCondition; import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; import com.easysoftware.application.epkgpackage.vo.EPKGPackageDetailVo; -import com.easysoftware.application.epkgpackage.vo.EPKGPackageEulerArchsVo; import com.easysoftware.application.epkgpackage.vo.EPKGPackageEulerVersionVo; import com.easysoftware.application.epkgpackage.vo.EPKGPackageMenuVo; +import com.easysoftware.common.exception.NoneResException; import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ClassField; -import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.QueryWrapperUtil; -import com.easysoftware.domain.epkgpackage.EPKGPackage; -import com.easysoftware.domain.epkgpackage.EPKGPackageUnique; import com.easysoftware.domain.epkgpackage.gateway.EPKGPackageGateway; import com.easysoftware.infrastructure.epkgpackage.gatewayimpl.converter.EPKGPackageConverter; import com.easysoftware.infrastructure.epkgpackage.gatewayimpl.dataobject.EPKGPackageDO; import com.easysoftware.infrastructure.mapper.EPKGPackageDOMapper; -import com.fasterxml.jackson.databind.ObjectMapper; import com.power.common.util.StringUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -38,71 +40,12 @@ import java.util.Map; @Component public class EPKGPackageGatewayImpl implements EPKGPackageGateway { - /** - * Logger instance for EPKGPackageGatewayImpl. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(EPKGPackageGatewayImpl.class); - /** * Autowired EPKGPackageDOMapper for database operations. */ @Autowired private EPKGPackageDOMapper ePKGPkgMapper; - /** - * Autowired ObjectMapper for JSON serialization/deserialization. - */ - @Autowired - private ObjectMapper objectMapper; - - /** - * Delete EPKG packages by their IDs. - * - * @param ids A list of IDs of EPKG packages to delete - * @return the number of rows deleted - */ - @Override - public int delete(final List ids) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.in("pkg_id", ids); - return ePKGPkgMapper.delete(wrapper); - } - - /** - * Check if an EPKG package exists based on its unique identifier. - * - * @param unique The unique identifier of the EPKG package - * @return true if the EPKG package exists, false otherwise - */ - @Override - public boolean existEPKG(final EPKGPackageUnique unique) { - Map map = objectMapper.convertValue(unique, HashMap.class); - - Map underlineMap = new HashMap<>(); - for (String key : map.keySet()) { - String underlineKey = StringUtil.camelToUnderline(key); - underlineMap.put(underlineKey, map.get(key)); - } - - QueryWrapper wrapper = Wrappers.query(); - wrapper.setEntityClass(EPKGPackageDO.class); - wrapper.allEq(underlineMap, false); - return ePKGPkgMapper.exists(wrapper); - } - - /** - * Check if an EPKG package exists based on its ID. - * - * @param id The ID of the EPKG package - * @return true if the EPKG package exists, false otherwise - */ - @Override - public boolean existEPKG(final String id) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - return ePKGPkgMapper.exists(wrapper); - } - /** * Query detailed information based on the provided search condition. * @@ -119,6 +62,10 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { List rPMDetails = EPKGPackageConverter.toDetail(rPMDOs); long total = resPage.getTotal(); + if (total == 0 || rPMDetails.size() == 0) { + throw new NoneResException("the epkg package does not exist"); + } + Map res = Map.ofEntries( Map.entry("total", total), Map.entry("list", rPMDetails)); @@ -151,35 +98,6 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { return res; } - /** - * Save an EPKGPackage object. - * - * @param epkg The EPKGPackage object to save - * @return true if the save operation was successful, false otherwise - */ - @Override - public boolean save(final EPKGPackage epkg) { - EPKGPackageDO epkgPackageDO = EPKGPackageConverter.toDataObjectForCreate(epkg); - int mark = ePKGPkgMapper.insert(epkgPackageDO); - return mark == 1; - } - - /** - * Update an existing EPKGPackage object. - * - * @param epkg The EPKGPackage object to update - * @return the number of rows affected by the update operation - */ - @Override - public int update(final EPKGPackage epkg) { - EPKGPackageDO epkgPackageDO = EPKGPackageConverter.toDataObjectForUpdate(epkg); - - UpdateWrapper wrapper = new UpdateWrapper<>(); - wrapper.eq("pkg_id", epkg.getPkgId()); - - return ePKGPkgMapper.update(epkgPackageDO, wrapper); - } - /** * Creates a Page of EPKGPackageDO based on the provided search condition. * @@ -227,17 +145,17 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { List allowedColumns = Arrays.asList("category", "os", "arch"); if (!allowedColumns.contains(column)) { - throw new ParamErrorException("Unsupported column"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } QueryWrapper wrapper = new QueryWrapper<>(); // 安全地选择列，列名已经通过白名单验证 wrapper.select("distinct " + column); - List rpmColumn = new ArrayList<>(); + List rpmColumn; try { rpmColumn = ePKGPkgMapper.selectList(wrapper); } catch (BadSqlGrammarException e) { - throw new ParamErrorException("unsupported param"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } String underlineToCamelColumn = StringUtil.underlineToCamel(column); @@ -264,7 +182,9 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { public EPKGPackageMenuVo selectOne(final String name) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("pkg_id"); - wrapper.eq("name", name); + if (name != null) { + wrapper.eq("name", name); + } wrapper.last("order by epkg_update_at desc limit 1"); List epkgList = ePKGPkgMapper.selectList(wrapper); if (epkgList.size() == 0) { @@ -273,24 +193,6 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { return EPKGPackageConverter.toMenu(epkgList.get(0)); } - /** - * Convert a batch of data objects to EPKGPackageDO objects. - * - * @param dataObject A collection of data objects to convert - * @return A collection of EPKGPackageDO objects - */ - @Override - public Collection convertBatch(final Collection dataObject) { - Collection objList = new ArrayList<>(); - for (String obj : dataObject) { - EPKGPackage epkg = ObjectMapperUtil.jsonToObject(obj, EPKGPackage.class); - EPKGPackageDO epkgDO = EPKGPackageConverter.toDataObjectForCreate(epkg); - LOGGER.info("convert pkgId: {}", epkgDO.getPkgId()); - objList.add(epkgDO); - } - return objList; - } - /** * Query detailed information by package ID. * @@ -313,14 +215,16 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { * @return A map containing relevant information */ @Override - public Map queryEulerVersionByName(final EPKGPackageSearchCondition condition) { + public Map queryEulerVersionByName(final EPKGPackageNameSearchCondition condition) { QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new EPKGPackageDO(), condition, ""); EPKGPackageEulerVersionVo pkgVo = new EPKGPackageEulerVersionVo(); List columns = ClassField.getFieldNames(pkgVo); - wrapper.eq("name", condition.getName()) - .select(columns) - .groupBy("os", "arch"); + if (condition.getName() != null) { + wrapper.eq("name", condition.getName()); + } + wrapper.select(columns); + wrapper.groupBy("os", "arch"); List epkgList = ePKGPkgMapper.selectList(wrapper); List versions = EPKGPackageConverter.toVersion(epkgList); Map res = Map.ofEntries( @@ -329,28 +233,4 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { return res; } - /** - * Query the Euler archs based on the provided search condition. - * - * @param condition The search condition for querying a part of the epkg Euler - * archs - * @return A map containing relevant information - */ - @Override - public Map queryEulerArchsByName(final EPKGPackageSearchCondition condition) { - QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new EPKGPackageDO(), - condition, ""); - EPKGPackageEulerArchsVo pkgVo = new EPKGPackageEulerArchsVo(); - List columns = ClassField.getFieldNames(pkgVo); - wrapper.eq("name", condition.getName()) - .select(columns) - .groupBy("arch"); - List epkgList = ePKGPkgMapper.selectList(wrapper); - List versions = EPKGPackageConverter.toArchs(epkgList); - Map res = Map.ofEntries( - Map.entry("total", versions.size()), - Map.entry("list", versions)); - return res; - } - } diff --git a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/converter/EPKGPackageConverter.java b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/converter/EPKGPackageConverter.java index 0ac3b6287c95da024ea823b5f28a306971a7a6ee..deee9a6834f8d34d3d218db6b657b59747750de2 100644 --- a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/converter/EPKGPackageConverter.java +++ b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/converter/EPKGPackageConverter.java @@ -1,11 +1,20 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.epkgpackage.gatewayimpl.converter; import com.easysoftware.application.epkgpackage.vo.EPKGPackageDetailVo; -import com.easysoftware.application.epkgpackage.vo.EPKGPackageEulerArchsVo; import com.easysoftware.application.epkgpackage.vo.EPKGPackageEulerVersionVo; import com.easysoftware.application.epkgpackage.vo.EPKGPackageMenuVo; import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.utils.UuidUtil; import com.easysoftware.domain.epkgpackage.EPKGPackage; import com.easysoftware.infrastructure.epkgpackage.gatewayimpl.dataobject.EPKGPackageDO; import org.slf4j.Logger; @@ -13,7 +22,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import java.lang.reflect.Field; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -79,24 +87,6 @@ public final class EPKGPackageConverter { return res; } - /** - * Converts a list of EPKGPackageDO objects to a list of EPKGPackageEulerArchsVo - * view - * objects. - * - * @param epkgDOs The list of EPKGPackageDO objects to convert. - * @return A list of EPKGPackageEulerArchsVo view objects. - */ - public static List toArchs(final List epkgDOs) { - List res = new ArrayList<>(); - for (EPKGPackageDO epkg : epkgDOs) { - EPKGPackageEulerArchsVo archs = new EPKGPackageEulerArchsVo(); - archs.setArch(epkg.getArch()); - res.add(archs); - } - return res; - } - /** * Extract a specific column values from a list of EPKGPackageDO objects. * @@ -114,6 +104,12 @@ public final class EPKGPackageConverter { continue; } Object obj = field.get(epkgDO); + + if (obj == null) { + LOGGER.warn("Field value is null for epkgDO: {}", epkgDO); + continue; + } + if (!(obj instanceof String)) { continue; } @@ -121,7 +117,7 @@ public final class EPKGPackageConverter { res.add(value); } } catch (Exception e) { - LOGGER.error(MessageCode.EC00011.getMsgEn(), e); + LOGGER.error(MessageCode.EC00011.getMsgEn(), e.getMessage()); } return res; } @@ -154,37 +150,4 @@ public final class EPKGPackageConverter { BeanUtils.copyProperties(epkg, epkgPackageDO); return epkgPackageDO; } - - /** - * Convert an EPKGPackage entity to an EPKGPackageDO data object for creation. - * - * @param epkg The EPKGPackage entity to convert - * @return An EPKGPackageDO data object for creation - */ - public static EPKGPackageDO toDataObjectForCreate(final EPKGPackage epkg) { - EPKGPackageDO epkgPackageDO = toDataObject(epkg); - - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - String id = UuidUtil.getUUID32(); - epkgPackageDO.setCreateAt(currentTime); - epkgPackageDO.setUpdateAt(currentTime); - epkgPackageDO.setId(id); - - return epkgPackageDO; - } - - /** - * Convert an EPKGPackage entity to an EPKGPackageDO data object for update. - * - * @param rPMPkg The EPKGPackage entity to convert - * @return An EPKGPackageDO data object for update - */ - public static EPKGPackageDO toDataObjectForUpdate(final EPKGPackage rPMPkg) { - EPKGPackageDO rPMPkgDO = toDataObject(rPMPkg); - - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - rPMPkgDO.setUpdateAt(currentTime); - - return rPMPkgDO; - } } diff --git a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/dataobject/EPKGPackageDO.java b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/dataobject/EPKGPackageDO.java index 4842fbf35b058b49680e9afd857fc4aeb508d059..47754b02562540c846ca33800922991a405379c4 100644 --- a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/dataobject/EPKGPackageDO.java +++ b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/dataobject/EPKGPackageDO.java @@ -1,17 +1,24 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.epkgpackage.gatewayimpl.dataobject; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serial; import java.sql.Timestamp; @Data -@AllArgsConstructor -@NoArgsConstructor @TableName("epkg_pkg") public class EPKGPackageDO { /** @@ -201,4 +208,56 @@ public class EPKGPackageDO { * License. */ private String license; + + /** + * get an EPKGPackageDO entity updateAt field value. + * + * @return An Timestamp entity + */ + public Timestamp getUpdateAt() { + if (this.updateAt != null) { + return (Timestamp) this.updateAt.clone(); + } else { + return null; + } + } + + /** + * get an EPKGPackageDO entity createAt field value. + * + * @return An Timestamp entity + */ + public Timestamp getCreateAt() { + if (this.createAt != null) { + return (Timestamp) this.createAt.clone(); + } else { + return null; + } + } + + /** + * set an EPKGPackageDO entity createAt field value. + * + * @param createAt The EPKGPackageDO entity createAt field for set + */ + public void setCreateAt(Timestamp createAt) { + if (this.createAt != null) { + this.createAt = (Timestamp) createAt.clone(); + } else { + this.createAt = null; + } + } + + /** + * set an EPKGPackageDO entity updateAt field value. + * + * @param updateAt The EPKGPackageDO entity updateAt field for set + */ + public void setUpdateAt(Timestamp updateAt) { + if (this.updateAt != null) { + this.updateAt = (Timestamp) updateAt.clone(); + } else { + this.updateAt = null; + } + } } diff --git a/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/ExternalOsGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/ExternalOsGatewayImpl.java deleted file mode 100644 index 57e7e11e848761c064e919d52fa2da1d8e47fff3..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/ExternalOsGatewayImpl.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.easysoftware.infrastructure.externalos.gatewayimpl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.easysoftware.application.externalos.dto.ExternalOsSearchCondiiton; -import com.easysoftware.common.utils.QueryWrapperUtil; -import com.easysoftware.domain.externalos.ExternalOs; -import com.easysoftware.domain.externalos.ExternalOsUnique; -import com.easysoftware.domain.externalos.gateway.ExternalOsGateway; -import com.easysoftware.infrastructure.externalos.gatewayimpl.converter.ExternalOsConverter; -import com.easysoftware.infrastructure.externalos.gatewayimpl.dataobject.ExternalOsDO; -import com.easysoftware.infrastructure.mapper.ExternalOsDOMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - -@Component -public class ExternalOsGatewayImpl implements ExternalOsGateway { - - /** - * Autowired ExternalOsDOMapper for database operations. - */ - @Autowired - private ExternalOsDOMapper externalOsDOMapper; - - /** - * Query package mapping based on the provided search condition. - * - * @param condition The search condition for querying package mappings - * @return A map containing relevant information - */ - @Override - public Map queryPkgMap(final ExternalOsSearchCondiiton condition) { - Page page = createPage(condition); - QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new ExternalOsDO(), condition, ""); - IPage resPage = externalOsDOMapper.selectPage(page, wrapper); - List resList = resPage.getRecords(); - List exs = ExternalOsConverter.toEntity(resList); - long total = resPage.getTotal(); - - Map res = Map.ofEntries( - Map.entry("total", total), - Map.entry("list", exs) - ); - return res; - } - - - /** - * Creates a Page of ExternalOsDO based on the provided search condition. - * - * @param condition The ExternalOsSearchCondition object to create the page from. - * @return A Page of ExternalOsDO entities. - */ - private Page createPage(final ExternalOsSearchCondiiton condition) { - int pageNum = condition.getPageNum(); - int pageSize = condition.getPageSize(); - Page page = new Page<>(pageNum, pageSize); - return page; - } - - /** - * Delete external operating systems by their IDs. - * - * @param ids A list of IDs of external operating systems to delete - * @return the number of rows deleted - */ - @Override - public int delete(final List ids) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.in("id", ids); - int mark = externalOsDOMapper.delete(wrapper); - return mark; - } - - - /** - * Check if an external operating system exists based on its unique identifier. - * - * @param uni The unique identifier of the external operating system - * @return true if the external operating system exists, false otherwise - */ - @Override - public boolean existExternalOs(final ExternalOsUnique uni) { - QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new ExternalOsDO(), uni, ""); - return externalOsDOMapper.exists(wrapper); - } - - - /** - * Check if an external operating system exists based on its ID. - * - * @param id The ID of the external operating system - * @return true if the external operating system exists, false otherwise - */ - @Override - public boolean existExternalOs(final String id) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - return externalOsDOMapper.exists(wrapper); - } - - /** - * Save an ExternalOs object. - * - * @param ex The ExternalOs object to save - * @return true if the save operation was successful, false otherwise - */ - @Override - public boolean save(final ExternalOs ex) { - ExternalOsDO exDO = ExternalOsConverter.toDataObjectForCreate(ex); - int mark = externalOsDOMapper.insert(exDO); - return mark == 1; - } - - - /** - * Update an existing ExternalOs object. - * - * @param ex The ExternalOs object to update - * @return the number of rows affected by the update operation - */ - @Override - public int update(final ExternalOs ex) { - ExternalOsDO exDO = ExternalOsConverter.toDataObjectForUpdate(ex); - UpdateWrapper wrapper = new UpdateWrapper<>(); - wrapper.eq("id", ex.getId()); - return externalOsDOMapper.update(exDO, wrapper); - } -} diff --git a/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/converter/ExternalOsConverter.java b/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/converter/ExternalOsConverter.java deleted file mode 100644 index 167d0b501ad3e1f285454343d5e063057fd66a1c..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/converter/ExternalOsConverter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.easysoftware.infrastructure.externalos.gatewayimpl.converter; - -import com.easysoftware.common.utils.UuidUtil; -import com.easysoftware.domain.externalos.ExternalOs; -import com.easysoftware.infrastructure.externalos.gatewayimpl.dataobject.ExternalOsDO; -import org.springframework.beans.BeanUtils; - -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; - -public final class ExternalOsConverter { - - // Private constructor to prevent instantiation of the MapConstant class - private ExternalOsConverter() { - // private constructor to hide the implicit public one - throw new AssertionError("ExternalOsConverter class cannot be instantiated."); - } - - /** - * Converts an ExternalOsDO object to an ExternalOs entity. - * - * @param externalOsDO The ExternalOsDO object to convert. - * @return The converted ExternalOs entity. - */ - public static ExternalOs toEntity(final ExternalOsDO externalOsDO) { - ExternalOs externalOs = new ExternalOs(); - BeanUtils.copyProperties(externalOsDO, externalOs); - return externalOs; - } - - /** - * Converts a list of ExternalOsDO objects to a list of ExternalOs entities. - * - * @param exs The list of ExternalOsDO objects to convert. - * @return A list of ExternalOs entities. - */ - public static List toEntity(final List exs) { - List res = new ArrayList<>(); - for (ExternalOsDO ex : exs) { - ExternalOs e = toEntity(ex); - res.add(e); - } - return res; - } - - /** - * Converts an ExternalOs entity to an ExternalOsDO data object for creation. - * - * @param ex The ExternalOs entity to convert. - * @return The converted ExternalOsDO data object for creation. - */ - public static ExternalOsDO toDataObjectForCreate(final ExternalOs ex) { - ExternalOsDO exDO = toDataObject(ex); - - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - String id = UuidUtil.getUUID32(); - exDO.setCreateAt(currentTime); - exDO.setUpdateAt(currentTime); - exDO.setId(id); - - return exDO; - } - - /** - * Converts an ExternalOs entity to an ExternalOsDO data object for update. - * - * @param ex The ExternalOs entity to convert. - * @return The converted ExternalOsDO data object for update. - */ - public static ExternalOsDO toDataObjectForUpdate(final ExternalOs ex) { - ExternalOsDO exDO = toDataObject(ex); - - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - exDO.setUpdateAt(currentTime); - - return exDO; - } - - /** - * Converts an ExternalOs entity to an ExternalOsDO data object. - * - * @param ex The ExternalOs entity to convert. - * @return The converted ExternalOsDO data object. - */ - public static ExternalOsDO toDataObject(final ExternalOs ex) { - ExternalOsDO exDO = new ExternalOsDO(); - BeanUtils.copyProperties(ex, exDO); - return exDO; - } - -} diff --git a/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/dataobject/ExternalOsDO.java b/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/dataobject/ExternalOsDO.java deleted file mode 100644 index 1fe54974af70e0abfaab8b31309490fc45a0b2b9..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/infrastructure/externalos/gatewayimpl/dataobject/ExternalOsDO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.easysoftware.infrastructure.externalos.gatewayimpl.dataobject; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.sql.Timestamp; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@TableName("external_os") -public class ExternalOsDO { - /** - * Serializable class with a defined serial version UID. - */ - @Serial - private String id; - - /** - * Timestamp for creation. - */ - private Timestamp createAt; - - /** - * Timestamp for last update. - */ - private Timestamp updateAt; - - /** - * Original operating system name. - */ - private String originOsName; - - /** - * Original operating system version. - */ - private String originOsVer; - - /** - * Original package information. - */ - private String originPkg; - - /** - * Target operating system name. - */ - private String targetOsName; - - /** - * Target operating system version. - */ - private String targetOsVer; - - /** - * Target package information. - */ - private String targetPkg; - -} diff --git a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/FieldApplicationGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/FieldApplicationGatewayImpl.java index 0f3b62e3af41838b38f9ace1f183dd43b004e96f..4b959531d4342bd020115fd24d295bbfe54888e4 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/FieldApplicationGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/FieldApplicationGatewayImpl.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.fieldapplication.gatewayimpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -101,17 +111,17 @@ public class FieldApplicationGatewayImpl implements FieldapplicationGateway { List allowedColumns = Arrays.asList("category", "os", "arch"); if (!allowedColumns.contains(column)) { - throw new ParamErrorException("Unsupported column"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } QueryWrapper wrapper = new QueryWrapper<>(); // 安全地选择列，列名已经通过白名单验证 wrapper.select("distinct " + column); - List columnList = new ArrayList<>(); + List columnList; try { columnList = fieldAppMapper.selectList(wrapper); } catch (BadSqlGrammarException e) { - throw new ParamErrorException("unsupported param"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } String underlineToCamelColumn = StringUtil.underlineToCamel(column); diff --git a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/converter/FieldApplicationConverter.java b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/converter/FieldApplicationConverter.java index 816bdf2cd5b587f305d30911446fb0ace976190c..1d21c16ea01b7f446c3b8984111286dca0d61d03 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/converter/FieldApplicationConverter.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/converter/FieldApplicationConverter.java @@ -1,15 +1,25 @@ -package com.easysoftware.infrastructure.fieldapplication.gatewayimpl.converter; +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ +package com.easysoftware.infrastructure.fieldapplication.gatewayimpl.converter; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; import com.easysoftware.application.fieldpkg.dto.FieldPkgSearchCondition; import com.easysoftware.application.filedapplication.dto.FiledApplicationSerachCondition; -import com.easysoftware.application.filedapplication.dto.InputFiledApplication; import com.easysoftware.application.filedapplication.vo.FiledApplicationVo; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.utils.ObjectMapperUtil; +import com.easysoftware.common.utils.SortUtil; import com.easysoftware.infrastructure.fieldapplication.gatewayimpl.dataobject.FieldApplicationDO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,11 +28,8 @@ import org.springframework.beans.BeanUtils; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; - public final class FieldApplicationConverter { @@ -37,21 +44,9 @@ public final class FieldApplicationConverter { */ private static final Logger LOGGER = LoggerFactory.getLogger(FieldApplicationConverter.class); - /** - * Converts an InputFieldApplication object to a FieldApplicationDO data object. - * - * @param input The InputFieldApplication object to convert. - * @return The converted FieldApplicationDO data object. - */ - public static FieldApplicationDO toDataObject(final InputFiledApplication input) { - FieldApplicationDO fieldApplicationDO = new FieldApplicationDO(); - BeanUtils.copyProperties(input, fieldApplicationDO); - return fieldApplicationDO; - } - - /** - * Converts a list of FieldApplicationDO objects to a list of FieldApplicationVo view objects. + * Converts a list of FieldApplicationDO objects to a list of FieldApplicationVo + * view objects. * * @param doList The list of FieldApplicationDO objects to convert. * @return A list of FieldApplicationVo view objects. @@ -74,13 +69,11 @@ public final class FieldApplicationConverter { public static FiledApplicationVo toVo(final FieldApplicationDO opDo) { FiledApplicationVo opVo = new FiledApplicationVo(); BeanUtils.copyProperties(opDo, opVo); - opDo.getTags(); List tags = ObjectMapperUtil.toObjectList(String.class, opDo.getTags()); Map pkgIds = ObjectMapperUtil.toMap(opDo.getPkgIds()); - Set tagsSet = new HashSet<>(); - tagsSet.addAll(tags); - opVo.setTags(tagsSet); + List sortedTags = SortUtil.sortTags(tags); + opVo.setTags(sortedTags); Map pkgIdsMap = new HashMap<>(); for (Map.Entry pkgId : pkgIds.entrySet()) { @@ -93,7 +86,8 @@ public final class FieldApplicationConverter { } /** - * Extracts a specific column from a list of FieldApplicationDO objects and returns it as a list of strings. + * Extracts a specific column from a list of FieldApplicationDO objects and + * returns it as a list of strings. * * @param columnList The list of FieldApplicationDO objects. * @param column The name of the column to extract. @@ -109,6 +103,12 @@ public final class FieldApplicationConverter { continue; } Object obj = field.get(pkg); + + if (obj == null) { + LOGGER.warn("Field value is null for pkg: {}", pkg); + continue; + } + if (!(obj instanceof String)) { continue; } @@ -116,13 +116,14 @@ public final class FieldApplicationConverter { res.add(value); } } catch (Exception e) { - LOGGER.error(MessageCode.EC00011.getMsgEn(), e); + LOGGER.error(MessageCode.EC00011.getMsgEn(), e.getMessage()); } return res; } /** - * Converts a FiledApplicationSearchCondition object to an ApplicationPackageSearchCondition object. + * Converts a FiledApplicationSearchCondition object to an + * ApplicationPackageSearchCondition object. * * @param con The FiledApplicationSearchCondition object to convert. * @return The converted ApplicationPackageSearchCondition object. @@ -136,7 +137,8 @@ public final class FieldApplicationConverter { } /** - * Converts a FieldApplicationSearchCondition object to an RPMPackageSearchCondition object. + * Converts a FieldApplicationSearchCondition object to an + * RPMPackageSearchCondition object. * * @param con The FieldApplicationSearchCondition object to convert. * @return The converted RPMPackageSearchCondition object. @@ -149,7 +151,8 @@ public final class FieldApplicationConverter { } /** - * Converts a FieldApplicationSearchCondition object to an EPKGPackageSearchCondition object. + * Converts a FieldApplicationSearchCondition object to an + * EPKGPackageSearchCondition object. * * @param con The FieldApplicationSearchCondition object to convert. * @return The converted EPKGPackageSearchCondition object. @@ -162,7 +165,8 @@ public final class FieldApplicationConverter { } /** - * Converts a FieldApplicationSearchCondition object to an FieldPkgSearchCondition object. + * Converts a FieldApplicationSearchCondition object to an + * FieldPkgSearchCondition object. * * @param con The FiledApplicationSerachCondition object to convert. * @return The converted FieldPkgSearchCondition object. diff --git a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/dataobject/FieldApplicationDO.java b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/dataobject/FieldApplicationDO.java index ee73d93a85a065c7d112ef26fb27b1b0e789a087..f096cc7142c99ab118579862c8464fb0fe09bc6b 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/dataobject/FieldApplicationDO.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/dataobject/FieldApplicationDO.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.fieldapplication.gatewayimpl.dataobject; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java index 290d6bc75181f1f5923eb047e322351e1865ffcf..ef61b103ed8ab9a8b12b39eac394f4b932b14d2b 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java @@ -1,14 +1,15 @@ -package com.easysoftware.infrastructure.fieldpkg; +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.BadSqlGrammarException; -import org.springframework.stereotype.Component; +package com.easysoftware.infrastructure.fieldpkg; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,6 +23,14 @@ import com.easysoftware.infrastructure.fieldpkg.converter.FieldPkgConverter; import com.easysoftware.infrastructure.fieldpkg.dataobject.FieldPkgDO; import com.easysoftware.infrastructure.mapper.FieldPkgDOMapper; import com.power.common.util.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.BadSqlGrammarException; +import org.springframework.stereotype.Component; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Component public class FieldPkgGatewayImpl implements FieldPkgGateway { @@ -99,17 +108,17 @@ public class FieldPkgGatewayImpl implements FieldPkgGateway { List allowedColumns = Arrays.asList("category", "os", "arch"); if (!allowedColumns.contains(column)) { - throw new ParamErrorException("Unsupported column"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } QueryWrapper wrapper = new QueryWrapper<>(); // 安全地选择列，列名已经通过白名单验证 wrapper.select("distinct " + column); - List columnList = new ArrayList<>(); + List columnList; try { columnList = mapper.selectList(wrapper); } catch (BadSqlGrammarException e) { - throw new ParamErrorException("unsupported param"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } String underlineToCamelColumn = StringUtil.underlineToCamel(column); diff --git a/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java b/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java index 297ab1b1ecc77aed5e1e62af5ea0409712f74b7d..72719a1362ff0ebacf0483f30a3b5f9c88ce1b0f 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java @@ -1,21 +1,30 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.fieldpkg.converter; +import com.easysoftware.application.fieldpkg.vo.FieldPkgVo; +import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.utils.ObjectMapperUtil; +import com.easysoftware.common.utils.SortUtil; +import com.easysoftware.infrastructure.fieldpkg.dataobject.FieldPkgDO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; - -import com.easysoftware.application.fieldpkg.vo.FieldPkgVo; -import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.easysoftware.infrastructure.fieldpkg.dataobject.FieldPkgDO; public final class FieldPkgConverter { // Private constructor to prevent instantiation of the utility class @@ -53,26 +62,21 @@ public final class FieldPkgConverter { public static FieldPkgVo toVo(final FieldPkgDO opDo) { FieldPkgVo opVo = new FieldPkgVo(); BeanUtils.copyProperties(opDo, opVo); - opDo.getTags(); List tags = ObjectMapperUtil.toObjectList(String.class, opDo.getTags()); Map pkgIds = ObjectMapperUtil.toMap(opDo.getPkgIds()); - Set tagsSet = new HashSet<>(); - tagsSet.addAll(tags); - opVo.setTags(tagsSet); + List sortedTags = SortUtil.sortTags(tags); + opVo.setTags(sortedTags); Map pkgIdsMap = new HashMap<>(); - for (Map.Entry pkgId : pkgIds.entrySet()) { - String key = pkgId.getKey(); - String value = (String) pkgId.getValue(); - pkgIdsMap.put(key, value); - } + pkgIds.forEach((key, value) -> pkgIdsMap.put(key, String.valueOf(value))); opVo.setPkgIds(pkgIdsMap); return opVo; } /** - * Extracts a specific column from a list of FieldApplicationDO objects and returns it as a list of strings. + * Extracts a specific column from a list of FieldApplicationDO objects and + * returns it as a list of strings. * * @param columnList The list of FieldApplicationDO objects. * @param column The name of the column to extract. @@ -88,6 +92,12 @@ public final class FieldPkgConverter { continue; } Object obj = field.get(pkg); + + if (obj == null) { + LOGGER.warn("Field value is null for pkg: {}", pkg); + continue; + } + if (!(obj instanceof String)) { continue; } @@ -95,7 +105,7 @@ public final class FieldPkgConverter { res.add(value); } } catch (Exception e) { - LOGGER.error(MessageCode.EC00011.getMsgEn(), e); + LOGGER.error(MessageCode.EC00011.getMsgEn(), e.getMessage()); } return res; } diff --git a/src/main/java/com/easysoftware/infrastructure/fieldpkg/dataobject/FieldPkgDO.java b/src/main/java/com/easysoftware/infrastructure/fieldpkg/dataobject/FieldPkgDO.java index a65f3e2191cd053058ba51f796ba0e6c8703f613..953793348f427f22aa40895f4d9a86face5ce04d 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldpkg/dataobject/FieldPkgDO.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldpkg/dataobject/FieldPkgDO.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.fieldpkg.dataobject; import java.io.Serial; diff --git a/src/main/java/com/easysoftware/infrastructure/mapper/ApplicationPackageDOMapper.java b/src/main/java/com/easysoftware/infrastructure/mapper/ApplicationPackageDOMapper.java index 0b985d82ed38e60d56574e7753d3069599cc00ce..a5ea783ee764ec835179f14637506cf19e3b2658 100644 --- a/src/main/java/com/easysoftware/infrastructure/mapper/ApplicationPackageDOMapper.java +++ b/src/main/java/com/easysoftware/infrastructure/mapper/ApplicationPackageDOMapper.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/easysoftware/infrastructure/mapper/ApplicationVersionDOMapper.java b/src/main/java/com/easysoftware/infrastructure/mapper/ApplicationVersionDOMapper.java index 146034bf747e0f995a5ee321cbe06510c2925887..26dc680bf37e25b21370f0e716537b3918ef727b 100644 --- a/src/main/java/com/easysoftware/infrastructure/mapper/ApplicationVersionDOMapper.java +++ b/src/main/java/com/easysoftware/infrastructure/mapper/ApplicationVersionDOMapper.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/easysoftware/infrastructure/mapper/EPKGPackageDOMapper.java b/src/main/java/com/easysoftware/infrastructure/mapper/EPKGPackageDOMapper.java index 1c8f9230cd49337c28bc0f480e07e778e9666515..ff9fe49bc74f87c68ddd27c41b1bf9706dd40e71 100644 --- a/src/main/java/com/easysoftware/infrastructure/mapper/EPKGPackageDOMapper.java +++ b/src/main/java/com/easysoftware/infrastructure/mapper/EPKGPackageDOMapper.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/easysoftware/infrastructure/mapper/ExternalOsDOMapper.java b/src/main/java/com/easysoftware/infrastructure/mapper/ExternalOsDOMapper.java deleted file mode 100644 index bbb491005ec5d38215f4d82a88c7abef3ba8a1cd..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/infrastructure/mapper/ExternalOsDOMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.easysoftware.infrastructure.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.easysoftware.infrastructure.externalos.gatewayimpl.dataobject.ExternalOsDO; - -public interface ExternalOsDOMapper extends BaseMapper { - -} diff --git a/src/main/java/com/easysoftware/infrastructure/mapper/FieldApplicationDOMapper.java b/src/main/java/com/easysoftware/infrastructure/mapper/FieldApplicationDOMapper.java index 4c3ab9702d6a913f595ca257ec32deb4b75e9208..bd82200b6dfa944a202bd067a4b37c463b487ea7 100644 --- a/src/main/java/com/easysoftware/infrastructure/mapper/FieldApplicationDOMapper.java +++ b/src/main/java/com/easysoftware/infrastructure/mapper/FieldApplicationDOMapper.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/easysoftware/infrastructure/mapper/FieldPkgDOMapper.java b/src/main/java/com/easysoftware/infrastructure/mapper/FieldPkgDOMapper.java index e911fe3fb99d2d28a9fd0b37d5b41dcff6a60f14..ae7e15a100bfa97f47d5ba7ccb4d92e3eb9a82d5 100644 --- a/src/main/java/com/easysoftware/infrastructure/mapper/FieldPkgDOMapper.java +++ b/src/main/java/com/easysoftware/infrastructure/mapper/FieldPkgDOMapper.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/easysoftware/infrastructure/mapper/OperationConfigDOMapper.java b/src/main/java/com/easysoftware/infrastructure/mapper/OperationConfigDOMapper.java index 3fc2b22a60a3138e80c098cd00f8d21a327112f0..3056f93e2ce8a81d2abd789b132b536fd69477cf 100644 --- a/src/main/java/com/easysoftware/infrastructure/mapper/OperationConfigDOMapper.java +++ b/src/main/java/com/easysoftware/infrastructure/mapper/OperationConfigDOMapper.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/easysoftware/infrastructure/mapper/RPMPackageDOMapper.java b/src/main/java/com/easysoftware/infrastructure/mapper/RPMPackageDOMapper.java index 6a0d23809a5250c02e19a63d0455365cca18da7b..fd57f6af62eeb4a7852a13ebd5deaf94868650b2 100644 --- a/src/main/java/com/easysoftware/infrastructure/mapper/RPMPackageDOMapper.java +++ b/src/main/java/com/easysoftware/infrastructure/mapper/RPMPackageDOMapper.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/OperationConfigGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/OperationConfigGatewayImpl.java index 584520d54f19d5ae175ebba0e5dc91c0901a3711..6747fded444d03d36f66fefb3e39e9f7e583dc31 100644 --- a/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/OperationConfigGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/OperationConfigGatewayImpl.java @@ -1,7 +1,16 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.operationconfig.gatewayimpl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.easysoftware.application.operationconfig.dto.InputOperationConfig; import com.easysoftware.application.operationconfig.vo.OperationConfigVo; import com.easysoftware.domain.operationconfig.gateway.OperationConfigGateway; import com.easysoftware.infrastructure.mapper.OperationConfigDOMapper; @@ -14,8 +23,6 @@ import java.util.List; @Service public class OperationConfigGatewayImpl implements OperationConfigGateway { - - /** * Autowired OperationConfigDOMapper for database operations. */ @@ -23,35 +30,11 @@ public class OperationConfigGatewayImpl implements OperationConfigGateway { private OperationConfigDOMapper mapper; /** - * Insert an operation configuration based on the input. - * - * @param input The input operation configuration to insert - * @return true if the insertion was successful, false otherwise - */ - public boolean insertOperationConfig(final InputOperationConfig input) { - OperationConfigDO operationConfigDO = OperationConfigConverter.toDataObject(input); - int mark = mapper.insert(operationConfigDO); - return mark == 1; - } - - /** - * Delete operation configurations by type. - * - * @param type The type of operation configurations to delete - * @return true if the deletion was successful, false otherwise - */ - @Override - public boolean deleteByType(final String type) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("type", type); - mapper.delete(wrapper); - return true; - } - - /** - * Select all operation configurations and return them as a list of OperationConfigVo objects. + * Select all operation configurations and return them as a list of + * OperationConfigVo objects. * - * @return A list of OperationConfigVo objects containing all operation configurations + * @return A list of OperationConfigVo objects containing all operation + * configurations */ @Override public List selectAll() { diff --git a/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/converter/OperationConfigConverter.java b/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/converter/OperationConfigConverter.java index b3ca9d8d1f7d277051a15a39913eda474d734af5..7289ea6cb57fc76cb79968a74ae4f567442f968c 100644 --- a/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/converter/OperationConfigConverter.java +++ b/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/converter/OperationConfigConverter.java @@ -1,6 +1,16 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.operationconfig.gatewayimpl.converter; -import com.easysoftware.application.operationconfig.dto.InputOperationConfig; import com.easysoftware.application.operationconfig.vo.OperationConfigVo; import com.easysoftware.infrastructure.operationconfig.gatewayimpl.dataobject.OperationConfigDO; import org.springframework.beans.BeanUtils; @@ -9,25 +19,12 @@ import java.util.ArrayList; import java.util.List; public final class OperationConfigConverter { - // Private constructor to prevent instantiation of the PackageConstant class private OperationConfigConverter() { // private constructor to hide the implicit public one throw new AssertionError("OperationConfigConverter class cannot be instantiated."); } - /** - * Converts an InputOperationConfig object to an OperationConfigDO data object. - * - * @param input The InputOperationConfig object to convert. - * @return The converted OperationConfigDO data object. - */ - public static OperationConfigDO toDataObject(final InputOperationConfig input) { - OperationConfigDO operationConfigDO = new OperationConfigDO(); - BeanUtils.copyProperties(input, operationConfigDO); - return operationConfigDO; - } - /** * Converts a list of OperationConfigDO objects to a list of OperationConfigVo view objects. * diff --git a/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/dataobject/OperationConfigDO.java b/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/dataobject/OperationConfigDO.java index 9555b77c8f1f9192cc91b25148e7b6f87f566e4a..bacf18419bfc82d22cf0523748c4b2cb2bd3ae32 100644 --- a/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/dataobject/OperationConfigDO.java +++ b/src/main/java/com/easysoftware/infrastructure/operationconfig/gatewayimpl/dataobject/OperationConfigDO.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.operationconfig.gatewayimpl.dataobject; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java index 3f0530d99747c2950daef8fbcc61162cbdce66ac..fa11258a495efb8fa633b1e2fc663d6bf87f0080 100644 --- a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java @@ -1,44 +1,45 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.rpmpackage.gatewayimpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.easysoftware.application.rpmpackage.dto.RPMPackageNameSearchCondition; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageDomainVo; -import com.easysoftware.application.rpmpackage.vo.RPMPackageEulerArchsVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageEulerVersionVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageMenuVo; +import com.easysoftware.application.rpmpackage.vo.RPMPackageNewestVersionVo; +import com.easysoftware.application.rpmpackage.vo.RPMPackgeVersionVo; import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ClassField; -import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.QueryWrapperUtil; -import com.easysoftware.domain.rpmpackage.RPMPackage; -import com.easysoftware.domain.rpmpackage.RPMPackageUnique; import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; import com.easysoftware.infrastructure.mapper.RPMPackageDOMapper; import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.converter.RPMPackageConverter; import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject.RPMPackageDO; -import com.fasterxml.jackson.databind.ObjectMapper; import com.power.common.util.StringUtil; -import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @Component -@Slf4j public class RPMPackageGatewayImpl implements RPMPackageGateway { /** @@ -47,52 +48,6 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { @Autowired private RPMPackageDOMapper rPMPkgMapper; - /** - * Autowired ObjectMapper for JSON processing. - */ - @Autowired - private ObjectMapper objectMapper; - - /** - * Logger for RPMPackageGatewayImpl class. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(RPMPackageGatewayImpl.class); - - /** - * Delete RPM packages by their IDs. - * - * @param id A list of IDs of RPM packages to delete - * @return the number of rows deleted - */ - @Override - public int delete(final List id) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.in("pkg_id", id); - return rPMPkgMapper.delete(wrapper); - } - - /** - * Check if an RPM package exists based on its unique identifier. - * - * @param unique The unique identifier of the RPM package - * @return true if the RPM package exists, false otherwise - */ - @Override - public boolean existRPM(final RPMPackageUnique unique) { - Map map = objectMapper.convertValue(unique, HashMap.class); - - Map underlineMap = new HashMap<>(); - for (String key : map.keySet()) { - String underlineKey = StringUtil.camelToUnderline(key); - underlineMap.put(underlineKey, map.get(key)); - } - - QueryWrapper wrapper = Wrappers.query(); - wrapper.setEntityClass(RPMPackageDO.class); - wrapper.allEq(underlineMap, false); - return rPMPkgMapper.exists(wrapper); - } - /** * Query detailed information based on the provided search condition for RPM * packages. @@ -117,48 +72,6 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { return res; } - /** - * Save an RPMPackage object. - * - * @param rPMPkg The RPMPackage object to save - * @return true if the save operation was successful, false otherwise - */ - @Override - public boolean save(final RPMPackage rPMPkg) { - RPMPackageDO rPMPkgDO = RPMPackageConverter.toDataObjectForCreate(rPMPkg); - int mark = rPMPkgMapper.insert(rPMPkgDO); - return mark == 1; - } - - /** - * Update an existing RPMPackage object. - * - * @param rPMPkg The RPMPackage object to update - * @return the number of rows affected by the update operation - */ - @Override - public int update(final RPMPackage rPMPkg) { - RPMPackageDO rPMPkgDO = RPMPackageConverter.toDataObjectForUpdate(rPMPkg); - - UpdateWrapper wrapper = new UpdateWrapper<>(); - wrapper.eq("pkg_id", rPMPkg.getPkgId()); - - return rPMPkgMapper.update(rPMPkgDO, wrapper); - } - - /** - * Check if an RPM package exists based on its ID. - * - * @param id The ID of the RPM package - * @return true if the RPM package exists, false otherwise - */ - @Override - public boolean existRPM(final String id) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - return rPMPkgMapper.exists(wrapper); - } - /** * Query menu items based on the provided search condition for RPM packages. * @@ -230,17 +143,17 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { List allowedColumns = Arrays.asList("category", "os", "arch"); if (!allowedColumns.contains(column)) { - throw new ParamErrorException("Unsupported column"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } QueryWrapper wrapper = new QueryWrapper<>(); // 安全地选择列，列名已经通过白名单验证 wrapper.select("distinct " + column); - List rpmColumn = new ArrayList<>(); + List rpmColumn; try { rpmColumn = rPMPkgMapper.selectList(wrapper); } catch (BadSqlGrammarException e) { - throw new ParamErrorException("unsupported param"); + throw new ParamErrorException("the value of parameter column: category, os, arch"); } String underlineToCamelColumn = StringUtil.underlineToCamel(column); @@ -258,28 +171,6 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { return rPMPkgMapper.selectCount(null); } - /** - * Convert a batch of data objects to RPMPackageDO objects. - * - * @param dataObject A collection of data objects to convert - * @return A collection of RPMPackageDO objects - */ - @Override - public Collection convertBatch(final Collection dataObject) { - long startTime = System.nanoTime(); - Collection objList = new ArrayList<>(); - for (String obj : dataObject) { - RPMPackage rpmPackage = ObjectMapperUtil.jsonToObject(obj, RPMPackage.class); - RPMPackageDO rpmDO = RPMPackageConverter.toDataObjectForCreate(rpmPackage); - log.info("convert pkgId: {}", rpmDO.getPkgId()); - objList.add(rpmDO); - } - long endTime1 = System.nanoTime(); - long duration = (endTime1 - startTime) / 1000000; - LOGGER.info("转换时间： " + duration + " 毫秒，" + "数据量：" + dataObject.size()); - return objList; - } - /** * Query part of the RPM package menu based on the provided search condition. * @@ -311,14 +202,16 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { * @return A map containing relevant information */ @Override - public Map queryEulerVersionByName(final RPMPackageSearchCondition condition) { + public Map queryEulerVersionByName(final RPMPackageNameSearchCondition condition) { QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new RPMPackageDO(), condition, ""); RPMPackageEulerVersionVo pkgVo = new RPMPackageEulerVersionVo(); List columns = ClassField.getFieldNames(pkgVo); - wrapper.eq("name", condition.getName()) - .select(columns) - .groupBy("os", "arch"); + if (condition.getName() != null) { + wrapper.eq("name", condition.getName()); + } + wrapper.select(columns); + wrapper.groupBy("os", "arch"); List rpmList = rPMPkgMapper.selectList(wrapper); List versions = RPMPackageConverter.toVersion(rpmList); Map res = Map.ofEntries( @@ -328,23 +221,24 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { } /** - * Query the Euler archs based on the provided search condition. + * Query the RPM newest version based on the provided search condition. * - * @param condition The search condition for querying a part of the RPM Euler - * archs + * @param condition The search condition for querying a part of the RPM + * newest version * @return A map containing relevant information */ @Override - public Map queryEulerArchsByName(final RPMPackageSearchCondition condition) { + public Map queryNewstRpmVersion(final RPMPackageNameSearchCondition condition) { QueryWrapper wrapper = QueryWrapperUtil.createQueryWrapper(new RPMPackageDO(), condition, ""); - RPMPackageEulerArchsVo pkgVo = new RPMPackageEulerArchsVo(); + RPMPackgeVersionVo pkgVo = new RPMPackgeVersionVo(); List columns = ClassField.getFieldNames(pkgVo); - wrapper.eq("name", condition.getName()) - .select(columns) - .groupBy("arch"); + if (condition.getName() != null) { + wrapper.eq("name", condition.getName()); + } + wrapper.select(columns); List rpmList = rPMPkgMapper.selectList(wrapper); - List versions = RPMPackageConverter.toArchs(rpmList); + List versions = RPMPackageConverter.toRPMVersion(rpmList); Map res = Map.ofEntries( Map.entry("total", versions.size()), Map.entry("list", versions)); @@ -360,7 +254,9 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { @Override public RPMPackageMenuVo selectOne(final String name) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("name", name); + if (name != null) { + wrapper.eq("name", name); + } wrapper.select("pkg_id"); wrapper.last("order by rpm_update_at desc limit 1"); List rpmList = rPMPkgMapper.selectList(wrapper); @@ -379,7 +275,9 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { @Override public List queryDetailByPkgId(final String pkgId) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("pkg_id", pkgId); + if (pkgId != null) { + wrapper.eq("pkg_id", pkgId); + } List rpmList = rPMPkgMapper.selectList(wrapper); return RPMPackageConverter.toDetail(rpmList); } diff --git a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/converter/RPMPackageConverter.java b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/converter/RPMPackageConverter.java index 0ee264e46be48f0a8f33ab2d052ca1f833228217..93d9e1eb8aa4415869ae39a25486ac2f1ad86f50 100644 --- a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/converter/RPMPackageConverter.java +++ b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/converter/RPMPackageConverter.java @@ -1,12 +1,22 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.rpmpackage.gatewayimpl.converter; import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageDomainVo; -import com.easysoftware.application.rpmpackage.vo.RPMPackageEulerArchsVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageEulerVersionVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageMenuVo; +import com.easysoftware.application.rpmpackage.vo.RPMPackageNewestVersionVo; import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.utils.UuidUtil; import com.easysoftware.domain.rpmpackage.RPMPackage; import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject.RPMPackageDO; import org.slf4j.Logger; @@ -14,7 +24,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import java.lang.reflect.Field; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -61,6 +70,12 @@ public final class RPMPackageConverter { continue; } Object obj = field.get(rPMPkgDO); + + if (obj == null) { + LOGGER.warn("Field value is null for pkg: {}", rPMPkgDO); + continue; + } + if (!(obj instanceof String)) { continue; } @@ -68,7 +83,7 @@ public final class RPMPackageConverter { res.add(value); } } catch (Exception e) { - LOGGER.error(MessageCode.EC00011.getMsgEn(), e); + LOGGER.error(MessageCode.EC00011.getMsgEn(), e.getMessage()); } return res; } @@ -176,64 +191,34 @@ public final class RPMPackageConverter { } /** - * Converts a list of RPMPackageDO objects to a list of RPMPackageEulerArchsVo + * Converts a list of RPMPackageDO objects to a list of + * RPMPackageNewestVersionVo * view * objects. * * @param rpmPkgDOs The list of RPMPackageDO objects to convert. - * @return A list of RPMPackageEulerArchsVo view objects. - */ - public static List toArchs(final List rpmPkgDOs) { - List res = new ArrayList<>(); - for (RPMPackageDO rpm : rpmPkgDOs) { - RPMPackageEulerArchsVo archs = new RPMPackageEulerArchsVo(); - archs.setArch(rpm.getArch()); - res.add(archs); - } - return res; - } - - /** - * Converts an RPMPackage entity to an RPMPackageDO data object. - * - * @param rPMPkg The RPMPackage entity to convert. - * @return The converted RPMPackageDO data object. - */ - public static RPMPackageDO toDataObject(final RPMPackage rPMPkg) { - RPMPackageDO rPMPkgDO = new RPMPackageDO(); - BeanUtils.copyProperties(rPMPkg, rPMPkgDO); - return rPMPkgDO; - } - - /** - * Converts an RPMPackage entity to an RPMPackageDO data object for creation. - * - * @param rPMPkg The RPMPackage entity to convert. - * @return The converted RPMPackageDO data object for creation. + * @return A list of RPMPackageNewestVersionVo view objects. */ - public static RPMPackageDO toDataObjectForCreate(final RPMPackage rPMPkg) { - RPMPackageDO rPMPkgDO = toDataObject(rPMPkg); + public static List toRPMVersion(final List rpmPkgDOs) { + List res = new ArrayList<>(); + String newestVersion = ""; + String os = ""; - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - String id = UuidUtil.getUUID32(); - rPMPkgDO.setCreateAt(currentTime); - rPMPkgDO.setUpdateAt(currentTime); - rPMPkgDO.setId(id); - - return rPMPkgDO; - } + if (rpmPkgDOs.size() > 0) { + newestVersion = rpmPkgDOs.get(0).getVersion(); + } - /** - * Converts an RPMPackage entity to an RPMPackageDO data object for update. - * - * @param rPMPkg The RPMPackage entity to convert. - * @return The converted RPMPackageDO data object for update. - */ - public static RPMPackageDO toDataObjectForUpdate(final RPMPackage rPMPkg) { - RPMPackageDO rPMPkgDO = toDataObject(rPMPkg); + for (RPMPackageDO rpm : rpmPkgDOs) { + if (newestVersion.compareTo(rpm.getVersion()) <= 0) { + newestVersion = rpm.getVersion(); + os = rpm.getOs(); + } + } - Timestamp currentTime = new Timestamp(System.currentTimeMillis()); - rPMPkgDO.setUpdateAt(currentTime); - return rPMPkgDO; + RPMPackageNewestVersionVo version = new RPMPackageNewestVersionVo(); + version.setNewestVersion(newestVersion); + version.setOs(os); + res.add(version); + return res; } } diff --git a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/dataobject/RPMPackageDO.java b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/dataobject/RPMPackageDO.java index c94d9edfdea701d60eb300524f4cc20ba396696e..81b822e5de6f21fba1872b4a12a71392714104d1 100644 --- a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/dataobject/RPMPackageDO.java +++ b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/dataobject/RPMPackageDO.java @@ -1,17 +1,24 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serial; import java.sql.Timestamp; @Data -@AllArgsConstructor -@NoArgsConstructor @TableName("rpm_pkg_base") public class RPMPackageDO { /** @@ -192,4 +199,55 @@ public class RPMPackageDO { */ private String license; + /** + * get an RPMPackageDO entity createAt field value. + * + * @return An Timestamp entity + */ + public Timestamp getCreateAt() { + if (this.createAt != null) { + return (Timestamp) this.createAt.clone(); + } else { + return null; + } + } + + /** + * get an RPMPackageDO entity updateAt field value. + * + * @return An Timestamp entity + */ + public Timestamp getUpdateAt() { + if (this.updateAt != null) { + return (Timestamp) this.updateAt.clone(); + } else { + return null; + } + } + + /** + * set an RPMPackageDO entity createAt field value. + * + * @param createAt The RPMPackageDO entity createAt field for set + */ + public void setCreateAt(Timestamp createAt) { + if (this.createAt != null) { + this.createAt = (Timestamp) createAt.clone(); + } else { + this.createAt = null; + } + } + + /** + * set an RPMPackageDO entity updateAt field value. + * + * @param updateAt The RPMPackageDO entity updateAt field for set + */ + public void setUpdateAt(Timestamp updateAt) { + if (this.updateAt != null) { + this.updateAt = (Timestamp) updateAt.clone(); + } else { + this.updateAt = null; + } + } } diff --git a/src/main/java/com/easysoftware/init/ApplicationRunnerStart.java b/src/main/java/com/easysoftware/init/ApplicationRunnerStart.java index 49011c80555f23116507e6e44b4c52e124278f65..8dfcab09dfeb5e281c1f22ad6c81c2c28740bec4 100644 --- a/src/main/java/com/easysoftware/init/ApplicationRunnerStart.java +++ b/src/main/java/com/easysoftware/init/ApplicationRunnerStart.java @@ -1,12 +1,24 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.init; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; + import java.io.File; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; @Component public class ApplicationRunnerStart implements ApplicationRunner { @@ -40,15 +52,22 @@ public class ApplicationRunnerStart implements ApplicationRunner { } File[] listFiles = secretsDir.listFiles(); - for (File file : listFiles) { - if (file.delete()) { - LOGGER.info("File deleted successfully." + file.getName()); - } else { - LOGGER.info("Delete file failed"); + if (listFiles != null) { + for (File file : listFiles) { + if (file.delete()) { + LOGGER.info( + "ID:easysoftware " + "Client Ip: localhost " + "Type: Delete " + " Resource:" + + file.getAbsolutePath() + + " Result: success."); + } else { + LOGGER.error( + "ID:easysoftware " + "Client Ip: localhost " + "Type: Delete " + " Resource:" + + file.getAbsolutePath() + + " Result: failed."); + } } + } else { + LOGGER.warn("No files found in the directory or an error occurred while listing files."); } - - return; } - } diff --git a/src/main/java/com/easysoftware/kafka/AppPkgConsumer.java b/src/main/java/com/easysoftware/kafka/AppPkgConsumer.java deleted file mode 100644 index 6efbe8aba16874fb6ca37107d605664a9eaff7ce..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/kafka/AppPkgConsumer.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.easysoftware.kafka; - -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Service; - -@Service -public class AppPkgConsumer extends BaseConsumer { - - /** - * Listens for and processes ConsumerRecords of type . - * - * @param records The ConsumerRecords to process. - */ - @KafkaListener(topics = "software_test_app") - public void listen(final ConsumerRecords records) { - dealDataToTableByBatch(records); - } -} diff --git a/src/main/java/com/easysoftware/kafka/BaseConsumer.java b/src/main/java/com/easysoftware/kafka/BaseConsumer.java deleted file mode 100644 index 3d2dff9c0686e6645e5fd17137a9077e98de0c3f..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/kafka/BaseConsumer.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.easysoftware.kafka; - -import com.easysoftware.application.BaseIService; -import com.easysoftware.application.ServiceMap; -import com.easysoftware.common.utils.ObjectMapperUtil; -import lombok.Generated; -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -public class BaseConsumer { - - /** - * Autowired ServiceMap instance. - */ - @Autowired - private ServiceMap serviceMap; - - /** - * Logger for BaseConsumer class. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(BaseConsumer.class); - - /** - * List to hold KafkaConsumer instances for String keys and values. - */ - private final ArrayList> kafkaConsumerList = new ArrayList<>(); - - - /** - * Custom tasks method to perform Kafka to MySQL data transfer. - */ - // @Scheduled(fixedRate = 5000) - @Generated - public void tasks() { - kafkaToMysql(); - } - - /** - * Method to transfer data from Kafka to MySQL by processing ConsumerRecords. - */ - @Generated - public void kafkaToMysql() { - while (true) { - for (KafkaConsumer customer : kafkaConsumerList) { - ConsumerRecords poll = customer.poll(Duration.ofSeconds(5)); - dealDataToTableByBatch(poll); - customer.commitAsync(); - } - } - } - - /** - * Processes ConsumerRecords in batches and deals with the data to insert into a table. - * - * @param records The ConsumerRecords to process. - */ - // The data of a topic can only be written to the same table - public void dealDataToTableByBatch(final ConsumerRecords records) { - ArrayList appList = new ArrayList<>(); - BaseIService baseIService = null; - int partition = 0; - long offset = 0; - long startTime = System.nanoTime(); - for (ConsumerRecord record : records) { - String value = record.value(); - try { - Map dtoMap = ObjectMapperUtil.toMap(value); - String table = dtoMap.get("table").toString(); - baseIService = serviceMap.getIService(table + "Service"); - appList.add(value); - partition = record.partition(); - offset = record.offset(); - } catch (Exception e) { - LOGGER.error(e.getMessage() + ":" + value, e); - } - } - long endTime1 = System.nanoTime(); - long duration = (endTime1 - startTime) / 1000000; - LOGGER.info("处理records用时： " + duration + " 毫秒，" + "数据量：" + appList.size()); - if (!appList.isEmpty()) { - LOGGER.info("partation: " + partition + ", offset: " + offset); - baseIService.saveDataObjectBatch(appList); - } - long endTime2 = System.nanoTime(); - duration = (endTime2 - endTime1) / 1000000; - LOGGER.info("写入数据库用时： " + duration + " 毫秒，" + "数据量：" + appList.size()); - } - - /** - * Processes ConsumerRecords and deals with the data to insert into multiple tables. - * - * @param records The ConsumerRecords to process. - */ - // The data of a topic may be written to multiple tables - @Generated - public void dealDataToMultipleTables(final ConsumerRecords records) { - Map> resMap = new HashMap<>(); - int partition = 0; - long offset = 0; - - for (ConsumerRecord record : records) { - String value = record.value(); - try { - Map dtoMap = ObjectMapperUtil.toMap(value); - String table = dtoMap.get("table").toString(); - - if (!resMap.containsKey(table)) { - resMap.put(table, new ArrayList<>()); - } - - ArrayList tmp = resMap.get(table); - tmp.add(value); - resMap.put(table, tmp); - - partition = record.partition(); - offset = record.offset(); - } catch (Exception e) { - LOGGER.error(e.getMessage() + ": " + value, e); - } - } - resMap.forEach((table, values) -> { - if (!values.isEmpty()) { - serviceMap.getIService(table + "Service").saveDataObjectBatch(values); - } - }); - LOGGER.info("Partition: " + partition + ", Offset: " + offset); - } - -} diff --git a/src/main/java/com/easysoftware/kafka/EpkgConsumer.java b/src/main/java/com/easysoftware/kafka/EpkgConsumer.java deleted file mode 100644 index 224ceca698aa6cbb9550e015c2bc732dd9e47fd3..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/kafka/EpkgConsumer.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.easysoftware.kafka; - -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Service; - -@Service -public class EpkgConsumer extends BaseConsumer { - // @Value("${consumer.topic.name}") - // String topicName; - - // @Value("${consumer.topic.offset}") - // String topicOffset; - - /** - * Listens for and processes ConsumerRecords of type . - * - * @param records The ConsumerRecords to process. - */ - @KafkaListener(topics = "software_test_epkg", concurrency = "3") - public void listen(final ConsumerRecords records) { - dealDataToTableByBatch(records); - } -} diff --git a/src/main/java/com/easysoftware/kafka/Producer.java b/src/main/java/com/easysoftware/kafka/Producer.java deleted file mode 100644 index a0910668cab177c4142c1046ba1d93c841cce9ad..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/kafka/Producer.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.easysoftware.kafka; - -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.kafka.core.KafkaTemplate; -import org.springframework.stereotype.Component; - -@Component -public class Producer { - - /** - * Autowired KafkaTemplate for producing messages. - */ - @Autowired - private KafkaTemplate kafkaTemplate; - - /** - * Static KafkaProducer for handling Kafka operations. - */ - private static KafkaProducer producer; - - /** - * Sends a message with the specified topic, key, and value. - * - * @param topic The Kafka topic to send the message to. - * @param key The key associated with the message. - * @param value The value of the message. - */ - public void sendMess(final String topic, final String key, final String value) { - ProducerRecord mess = new ProducerRecord(topic, key, value); - kafkaTemplate.send(mess); - } - -} diff --git a/src/main/java/com/easysoftware/kafka/RpmConsumer.java b/src/main/java/com/easysoftware/kafka/RpmConsumer.java deleted file mode 100644 index 8bce16d608d94b0e81460cc37e92a4ea3171a2ef..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/kafka/RpmConsumer.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.easysoftware.kafka; - -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Service; - -@Service -public class RpmConsumer extends BaseConsumer { - /** - * Value for the Kafka consumer topic name. - */ - @Value("${consumer.topic.name}") - private String topicName; - - /** - * Value for the Kafka consumer topic offset. - */ - @Value("${consumer.topic.offset}") - private String topicOffset; - - /** - * Kafka listener method that listens to the "software_test_rpm" topic with concurrency set to 3. - * - * @param records The ConsumerRecords to process. - */ - @KafkaListener(topics = "software_test_rpm", concurrency = "3") - public void listen(final ConsumerRecords records) { - dealDataToTableByBatch(records); - } - -} diff --git a/src/main/java/com/easysoftware/kafka/VersionConsumer.java b/src/main/java/com/easysoftware/kafka/VersionConsumer.java deleted file mode 100644 index a02633d012b53cbe7d4ca4c2f4256b4c3dc91fc6..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/kafka/VersionConsumer.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.easysoftware.kafka; - -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Service; - -@Service -public class VersionConsumer extends BaseConsumer { - - /** - * Listens for and processes ConsumerRecords of type . - * - * @param records The ConsumerRecords to process. - */ - @KafkaListener(topics = "software_test_version") - public void listen(final ConsumerRecords records) { - dealDataToTableByBatch(records); - } -} diff --git a/src/main/java/com/easysoftware/ranking/Ranker.java b/src/main/java/com/easysoftware/ranking/Ranker.java index 72d8a6eba7f26423a18cc47c49be4550b433b61e..cc5bf1c88a4b4378faed5ffefeb874b5527726fc 100644 --- a/src/main/java/com/easysoftware/ranking/Ranker.java +++ b/src/main/java/com/easysoftware/ranking/Ranker.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.ranking; import java.util.Map; diff --git a/src/main/java/com/easysoftware/ranking/RankerImpl.java b/src/main/java/com/easysoftware/ranking/RankerImpl.java index ac1a64484e2f84e3af8d8b39310f49f4bf3f332e..7abd28427cd34500a0505aedd804bd7a668b107d 100644 --- a/src/main/java/com/easysoftware/ranking/RankerImpl.java +++ b/src/main/java/com/easysoftware/ranking/RankerImpl.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.ranking; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/easysoftware/redis/JasonResponse.java b/src/main/java/com/easysoftware/redis/JasonResponse.java deleted file mode 100644 index 08ce5ede8d27b6ed667ffe9ba654bbf4ff3bdd87..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/redis/JasonResponse.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.easysoftware.redis; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.List; -import java.util.Map; - -public class JasonResponse { - /** - * Total count. - */ - private int total; - - /** - * List of Category objects. - */ - private List list; - - - /** - * Get the total count. - * - * @return The total count. - */ - @JsonProperty("total") - public int getTotal() { - return total; - } - - /** - * Set the total count. - * - * @param total The total count to set. - */ - public void setTotal(final int total) { - this.total = total; - } - - /** - * Get the list of Category objects. - * - * @return The list of Category objects. - */ - @JsonProperty("list") - public List getList() { - return list; - } - - /** - * Set the list of Category objects. - * - * @param list The list of Category objects to set. - */ - public void setList(final List list) { - this.list = list; - } - - - // Inner class for each item in the list - public static class Category { - /** - * List of Child objects. - */ - private List children; - - /** - * Name string. - */ - private String name; - - - // Getter and setter methods - - /** - * Get the list of Child objects. - * - * @return The list of Child objects. - */ - @JsonProperty("children") - public List getChildren() { - return children; - } - - /** - * Set the list of Child objects. - * - * @param children The list of Child objects to set. - */ - public void setChildren(final List children) { - this.children = children; - } - - /** - * Get the name string. - * - * @return The name string. - */ - @JsonProperty("name") - public String getName() { - return name; - } - - /** - * Set the name string. - * - * @param name The name string to set. - */ - public void setName(final String name) { - this.name = name; - } - - } - - // Inner class for each child in the children list - public static class Child { - /** - * Category string. - */ - private String category; - - /** - * Name string. - */ - private String name; - - /** - * Description string. - */ - private String description; - - /** - * URL for the icon. - */ - private String iconUrl; - - /** - * List of tags. - */ - private List tags; - - /** - * Map of package IDs. - */ - private Map pkgIds; - - - // Getter and setter methods - - /** - * Get the category string. - * - * @return The category string. - */ - @JsonProperty("category") - public String getCategory() { - return category; - } - - /** - * Set the category string. - * - * @param category The category string to set. - */ - public void setCategory(final String category) { - this.category = category; - } - - /** - * Get the name string. - * - * @return The name string. - */ - @JsonProperty("name") - public String getName() { - return name; - } - - /** - * Set the name string. - * - * @param name The name string to set. - */ - public void setName(final String name) { - this.name = name; - } - - /** - * Get the description string. - * - * @return The description string. - */ - @JsonProperty("description") - public String getDescription() { - return description; - } - - /** - * Set the description string. - * - * @param description The description string to set. - */ - public void setDescription(final String description) { - this.description = description; - } - - /** - * Get the icon URL. - * - * @return The icon URL. - */ - @JsonProperty("iconUrl") - public String getIconUrl() { - return iconUrl; - } - - /** - * Set the icon URL. - * - * @param iconUrl The icon URL to set. - */ - public void setIconUrl(final String iconUrl) { - this.iconUrl = iconUrl; - } - - /** - * Get the list of tags. - * - * @return The list of tags. - */ - @JsonProperty("tags") - public List getTags() { - return tags; - } - - /** - * Set the list of tags. - * - * @param tags The list of tags to set. - */ - public void setTags(final List tags) { - this.tags = tags; - } - - /** - * Get the package IDs map. - * - * @return The package IDs map. - */ - @JsonProperty("pkgIds") - public Map getPkgIds() { - return pkgIds; - } - - /** - * Set the package IDs map. - * - * @param pkgIds The package IDs map to set. - */ - public void setPkgIds(final Map pkgIds) { - this.pkgIds = pkgIds; - } - - } -} diff --git a/src/main/java/com/easysoftware/redis/RedisGateway.java b/src/main/java/com/easysoftware/redis/RedisGateway.java index ac11be0a05f123ab6f94547a709b8ce6701eea78..aeef2da56205bd2d57944fb8275b80df3c2ab33a 100644 --- a/src/main/java/com/easysoftware/redis/RedisGateway.java +++ b/src/main/java/com/easysoftware/redis/RedisGateway.java @@ -1,13 +1,19 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.redis; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.Cursor; -import org.springframework.data.redis.core.ScanOptions; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.TimeUnit; @Component @@ -60,48 +66,4 @@ public class RedisGateway { public boolean hasKey(final String key) { return Boolean.TRUE.equals(stringRedisTemplate.hasKey(key)); } - - /** - * Delete a key from Redis. - * - * @param key The key to delete. - * @return True if the key was deleted successfully, false otherwise. - */ - public boolean delteKey(final String key) { - return Boolean.TRUE.equals(stringRedisTemplate.delete(key)); - } - - - /** - * Scan keys in Redis based on a namespace. - * - * @param namespace The namespace to scan keys for. - * @return A list of keys that match the namespace. - */ - public List scanKey(final String namespace) { - - String query = wildCard(namespace); - List listKeys = new ArrayList<>(); - ScanOptions options = ScanOptions.scanOptions().match(query).build(); - Cursor curosr = stringRedisTemplate.scan(options); - - while (curosr.hasNext()) { - String key = curosr.next(); - listKeys.add(key); - } - // 关闭cursor - curosr.close(); - - return listKeys; - } - - /** - * Apply wildcard to a string. - * - * @param str The string to apply the wildcard to. - * @return The string with wildcard applied. - */ - private String wildCard(final String str) { - return String.format("%s*", str); - } } diff --git a/src/main/java/com/easysoftware/redis/RedisService.java b/src/main/java/com/easysoftware/redis/RedisService.java index 3636eed6f08b2e6fb19ba3df54b6af7c820bf267..b65d3b6ecb90be36f915b173b89f23334dc0fb0e 100644 --- a/src/main/java/com/easysoftware/redis/RedisService.java +++ b/src/main/java/com/easysoftware/redis/RedisService.java @@ -1,10 +1,20 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.redis; import org.springframework.http.ResponseEntity; import java.util.concurrent.TimeUnit; - public interface RedisService { /** * Set a key-value pair in Redis. @@ -41,29 +51,4 @@ public interface RedisService { * @return ResponseEntity with the result of the operation. */ ResponseEntity hasKey(String key); - - /** - * Delete a key from Redis. - * - * @param key The key to delete. - * @return ResponseEntity with the result of the operation. - */ - ResponseEntity deleteKey(String key); - - /** - * Scan keys in Redis based on a namespace. - * - * @param namespace The namespace to scan keys for. - * @return ResponseEntity with the result of the operation. - */ - ResponseEntity scanKeyByNameSpace(String namespace); - - /** - * Update Redis based on a namespace. - * - * @param namespace The namespace to update in Redis. - * @return ResponseEntity with the result of the operation. - */ - ResponseEntity updateRedisByNameSapce(String namespace); - } diff --git a/src/main/java/com/easysoftware/redis/RedisServiceImpl.java b/src/main/java/com/easysoftware/redis/RedisServiceImpl.java index 96f00c63e8ed80020b782b63eb29ac90ec3830cc..ec802f3eaa1a6099a6eb5df29126f7ce753c6749 100644 --- a/src/main/java/com/easysoftware/redis/RedisServiceImpl.java +++ b/src/main/java/com/easysoftware/redis/RedisServiceImpl.java @@ -1,15 +1,23 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.redis; -import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.utils.ResultUtil; import jakarta.annotation.Resource; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -35,8 +43,7 @@ public class RedisServiceImpl implements RedisService { Map res = Map.ofEntries( Map.entry("key", key), - Map.entry("msg", "Successfully set the key") - ); + Map.entry("msg", "Successfully set the key")); return ResultUtil.success(HttpStatus.OK, res); } @@ -52,8 +59,7 @@ public class RedisServiceImpl implements RedisService { Map res = Map.ofEntries( Map.entry("key", key), - Map.entry("value", value) - ); + Map.entry("value", value)); return ResultUtil.success(HttpStatus.OK, res); } @@ -69,14 +75,13 @@ public class RedisServiceImpl implements RedisService { */ @Override public ResponseEntity setKeyWithExpire(final String key, final String value, - final long timeout, final TimeUnit unit) { + final long timeout, final TimeUnit unit) { redisGateway.setWithExpire(key, value, timeout, unit); Map res = Map.ofEntries( Map.entry("key", key), Map.entry("timeout", timeout), - Map.entry("msg", "Successfully set the key with expiration") - ); + Map.entry("msg", "Successfully set the key with expiration")); return ResultUtil.success(HttpStatus.OK, res); } @@ -91,93 +96,8 @@ public class RedisServiceImpl implements RedisService { boolean keyExsit = redisGateway.hasKey(key); Map res = Map.ofEntries( Map.entry("key", key), - Map.entry("keyExsit", keyExsit) - ); - - return ResultUtil.success(HttpStatus.OK, res); - } - - - /** - * Delete a key from Redis. - * - * @param key The key to delete. - * @return ResponseEntity with the result of the operation. - */ - @Override - public ResponseEntity deleteKey(final String key) { - boolean keyExsit = redisGateway.hasKey(key); - // key检查 不存在key直接返回 - if (!keyExsit) { - Map res = Map.ofEntries( - Map.entry("key", key), - Map.entry("msg", MessageCode.EC00016.getMsgZh()) - ); - return ResultUtil.success(HttpStatus.OK, res); - } - - // key存在时执行删除 - boolean keyDelte = redisGateway.delteKey(key); - if (!keyDelte) { - Map res = Map.ofEntries( - Map.entry("key", key), - Map.entry("msg", MessageCode.EC00017.getMsgZh()) - ); - return ResultUtil.success(HttpStatus.OK, res); - } - - String msg = String.format("成功删除key %s", key); - return ResultUtil.success(HttpStatus.OK, msg); - } - - /** - * Scan keys in Redis based on a namespace. - * - * @param namespace The namespace to scan keys for. - * @return ResponseEntity with the result of the operation. - */ - @Override - public ResponseEntity scanKeyByNameSpace(final String namespace) { - - List resKeys = redisGateway.scanKey(namespace); - - Map res = Map.ofEntries( - Map.entry("total", resKeys.size()), - Map.entry("keys", resKeys) - ); + Map.entry("keyExsit", keyExsit)); return ResultUtil.success(HttpStatus.OK, res); } - - - /** - * Update Redis based on a namespace. - * - * @param namespace The namespace to update in Redis. - * @return ResponseEntity with the result of the operation. - */ - @Override - public ResponseEntity updateRedisByNameSapce(final String namespace) { - List resKeys = redisGateway.scanKey(namespace); - - Map resMap = new HashMap<>(); - - for (String key : resKeys) { - // key 检查 key不存在直接返回 - boolean keyExsit = redisGateway.hasKey(key); - if (!keyExsit) { - resMap.put(key, "key does't exsit"); - continue; - } - - boolean isSuccess = redisGateway.delteKey(key); - if (!isSuccess) { - resMap.put(key, "key delete failed"); - } else { - resMap.put(key, "key delete success"); - } - } - - return ResultUtil.success(HttpStatus.OK, resMap); - } } diff --git a/src/main/java/com/easysoftware/redis/RedisUtil.java b/src/main/java/com/easysoftware/redis/RedisUtil.java deleted file mode 100644 index ff32a19b343fa01ee9752e16595a3ee4a8ed2526..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/redis/RedisUtil.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.easysoftware.redis; - -import com.easysoftware.common.entity.MessageCode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public final class RedisUtil { - - - // Private constructor to prevent instantiation of the MapConstant class - private RedisUtil() { - // private constructor to hide the implicit public one - throw new AssertionError("RedisUtil class cannot be instantiated."); - } - - /** - * Logger instance for RedisUtil class. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(RedisUtil.class); - - /** - * Convert an object to its string representation. - * - * @param obj The object to convert to a string. - * @return The string representation of the object. - */ - public static String objectToString(final Object obj) { - if (obj == null) { - return "null"; - } - - StringBuilder sb = new StringBuilder(); - Class clazz = obj.getClass(); - List fields = getAllFields(clazz); - - for (Field field : fields) { - try { - field.setAccessible(true); // 允许访问私有字段 - Object value = field.get(obj); - String fieldName = field.getName(); - String fieldValue = String.valueOf(value); - sb.append(fieldName).append(":").append(fieldValue).append("_"); - } catch (IllegalAccessException e) { - LOGGER.error(MessageCode.EC0001.getMsgEn(), e); - } - } - - // 移除最后的逗号 - if (sb.length() > 0) { - sb.setLength(sb.length() - 2); - } - - return sb.toString(); - } - - /** - * Get all fields of a class, including inherited fields. - * - * @param clazz The class to retrieve fields for. - * @return List of all fields in the class. - */ - private static List getAllFields(final Class clazz) { - List fieldList = new ArrayList<>(); - Class superClass = clazz.getSuperclass(); - if (superClass != null) { - fieldList.addAll(getAllFields(superClass)); - } - Field[] declaredFields = clazz.getDeclaredFields(); - for (Field field : declaredFields) { - if (!java.lang.reflect.Modifier.isStatic(field.getModifiers()) - && !java.lang.reflect.Modifier.isTransient(field.getModifiers())) { - fieldList.add(field); - } - } - return fieldList; - } - - /** - * Convert a JSON string to an Object. - * - * @param json The JSON string to convert. - * @return The Object converted from the JSON string. - */ - public static Object convertToObject(final String json) { - try { - // 创建ObjectMapper实例 - ObjectMapper objectMapper = new ObjectMapper(); - - // 将JSON字符串转换为JsonResponse对象 - - return objectMapper.readValue(json, JasonResponse.class); - } catch (IOException e) { - LOGGER.error(MessageCode.EC0001.getMsgEn(), e); - return null; - } - } - - /** - * Convert a Map to a JSON string. - * - * @param res The Map to convert to JSON. - * @return The JSON string representation of the Map. - */ - public static String convertToJson(final Map res) { - try { - // 创建ObjectMapper实例 - ObjectMapper objectMapper = new ObjectMapper(); - // 序列化为JSON字符串 - String json = objectMapper.writeValueAsString(res); - - return json; - } catch (IOException e) { - LOGGER.error(MessageCode.EC0001.getMsgEn(), e); - return null; - } - } -} - diff --git a/src/test/java/com/easysoftware/EasysoftwareApplicationTests.java b/src/test/java/com/easysoftware/EasysoftwareApplicationTests.java index 0602822173a12a62052fe56f684dd6fd7f21bbbf..ef59fc7e94889b20d320a8a2a7ca7e9ca7169d0f 100644 --- a/src/test/java/com/easysoftware/EasysoftwareApplicationTests.java +++ b/src/test/java/com/easysoftware/EasysoftwareApplicationTests.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/easysoftware/adapter/common/DatabaseExceptionTest.java b/src/test/java/com/easysoftware/adapter/common/DatabaseExceptionTest.java index bfb4d22f36ad3989efed9f68bbab8317e51ba958..ce5c3a1df996ad791a50359f1b11f71fe19d9749 100644 --- a/src/test/java/com/easysoftware/adapter/common/DatabaseExceptionTest.java +++ b/src/test/java/com/easysoftware/adapter/common/DatabaseExceptionTest.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.common; import static org.junit.Assert.assertThrows; diff --git a/src/test/java/com/easysoftware/adapter/common/InputPkgTest.java b/src/test/java/com/easysoftware/adapter/common/InputPkgTest.java deleted file mode 100644 index 01e3a0cc70e9db43b8c507dd9dbadfd66ac657c2..0000000000000000000000000000000000000000 --- a/src/test/java/com/easysoftware/adapter/common/InputPkgTest.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.easysoftware.adapter.common; - -import static org.mockito.Mockito.when; - -import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.http.HttpStatus; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; - -import com.easysoftware.application.applicationpackage.ApplicationPackageService; -import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; -import com.easysoftware.application.epkgpackage.EPKGPackageService; -import com.easysoftware.application.rpmpackage.RPMPackageService; -import com.easysoftware.application.rpmpackage.dto.InputRPMPackage; -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.easysoftware.common.utils.ResultUtil; - -import lombok.extern.slf4j.Slf4j; - -@SpringBootTest -@AutoConfigureMockMvc -@Slf4j -public class InputPkgTest { - @Autowired - private WebApplicationContext webApplicationContext; - - private MockMvc mockMvc; - - @MockBean - private ApplicationPackageService appService; - - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - void test_input_app_pkg() throws Exception { - // 正常情况 - InputApplicationPackage input = new InputApplicationPackage(); - input.setName("xx"); - input.setCategory("大数据"); - input.setMaintainerEmail("username@domain.com"); - input.setSrcDownloadUrl("https://www.baidu.com"); - when(appService.insertAppPkg(input)).thenReturn(ResultUtil.success(HttpStatus.OK)); - ResultVo res = CommonUtil.executePost(mockMvc, "/apppkg", ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - // 不满足@Size - input = new InputApplicationPackage(); - input.setName(StringUtils.repeat("x", 256)); - input.setCategory("大数据"); - when(appService.insertAppPkg(input)).thenReturn(ResultUtil.success(HttpStatus.OK)); - res = CommonUtil.executePost(mockMvc, "/apppkg", ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assert400(res); - - // 不满足EnumValue - input = new InputApplicationPackage(); - input.setName("xx"); - input.setCategory("test"); - when(appService.insertAppPkg(input)).thenReturn(ResultUtil.success(HttpStatus.OK)); - res = CommonUtil.executePost(mockMvc, "/apppkg", ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assert400(res); - - // 不满足@Email - input = new InputApplicationPackage(); - input.setName("xx"); - input.setCategory("大数据"); - input.setMaintainerEmail("username@@domain.com"); - when(appService.insertAppPkg(input)).thenReturn(ResultUtil.success(HttpStatus.OK)); - res = CommonUtil.executePost(mockMvc, "/apppkg", ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assert400(res); - - // 不满足@URL - input = new InputApplicationPackage(); - input.setName("xx"); - input.setCategory("大数据"); - input.setMaintainerEmail("username@@domain.com"); - input.setSrcDownloadUrl("wwwxxx.swww"); - when(appService.insertAppPkg(input)).thenReturn(ResultUtil.success(HttpStatus.OK)); - res = CommonUtil.executePost(mockMvc, "/apppkg", ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assert400(res); - } -} diff --git a/src/test/java/com/easysoftware/adapter/common/RequestFilterTest.java b/src/test/java/com/easysoftware/adapter/common/RequestFilterTest.java new file mode 100644 index 0000000000000000000000000000000000000000..5f3052de7fcdda358409f2ab22a671f39231bd38 --- /dev/null +++ b/src/test/java/com/easysoftware/adapter/common/RequestFilterTest.java @@ -0,0 +1,100 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + + +package com.easysoftware.adapter.common; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import com.easysoftware.common.filter.RequestHeaderFilter; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + + + +@SpringBootTest +public class RequestFilterTest { + + @Test + public void testCheckDomain_NormalCase() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + String allDomains = "test.com;test.cn"; + String[] domains = {"test.com", "test.cn"}; + RequestHeaderFilter filterConfig = new RequestHeaderFilter(allDomains); + + // 获取私有方法 + Method method = RequestHeaderFilter.class.getDeclaredMethod("checkDomain", + String[].class, String.class); + method.setAccessible(true); // 设置可访问私有方法 + + + // 以正常域名结尾 + assertTrue((boolean) method.invoke(filterConfig, domains, "www.test.com/")); + + // 以正常域名结尾并且带路径 + assertTrue((boolean) method.invoke(filterConfig, domains, "sub.test.cn/path")); + + // 以正常域名结尾并且带参数 + assertTrue((boolean) method.invoke(filterConfig, domains, "sub.test.cn/path?test=xx")); + + // 不以 http:// 开头 + assertFalse((boolean) method.invoke(filterConfig, domains, "www.test_error.com")); + + // 未匹配任何域名 + assertFalse((boolean) method.invoke(filterConfig, domains, "www.invalid.com")); + + // 空输入应返回 true + assertTrue((boolean) method.invoke(filterConfig, domains, "")); + } + + @Test + public void testCheckDomain_NullDomains() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + RequestHeaderFilter filterConfig = new RequestHeaderFilter(null); + + // 获取私有方法 + Method method = RequestHeaderFilter.class.getDeclaredMethod("checkDomain", + String[].class, String.class); + method.setAccessible(true); // 设置可访问私有方法 + + assertFalse((boolean) method.invoke(filterConfig, new String[]{}, "www.test.com")); + } + + @Test + public void testCheckDomain_EmptyDomains() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + String allDomains = ""; + RequestHeaderFilter filterConfig = new RequestHeaderFilter(allDomains); + + // 获取私有方法 + Method method = RequestHeaderFilter.class.getDeclaredMethod("checkDomain", + String[].class, String.class); + method.setAccessible(true); // 设置可访问私有方法 + + assertFalse((boolean) method.invoke(filterConfig, new String[]{}, "www.example.com")); + } + + @Test + public void testCheckDomain_ExceptionCase() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + String allDomains = "test.com;test.cn"; + String[] domains = {"test.com", "test.cn"}; + RequestHeaderFilter filterConfig = new RequestHeaderFilter(allDomains); + + Method method = RequestHeaderFilter.class.getDeclaredMethod("checkDomain", String[].class, String.class); + method.setAccessible(true); + + boolean result1 = (boolean) method.invoke(filterConfig, domains, "test.com"); + boolean result2 = (boolean) method.invoke(filterConfig, domains, "example.com"); + + assertTrue(result1); // 应该返回true + assertFalse(result2); // 应该返回false + } +} diff --git a/src/test/java/com/easysoftware/adapter/execute/ApplicationPackageExecuteAdatperTest.java b/src/test/java/com/easysoftware/adapter/execute/ApplicationPackageExecuteAdatperTest.java deleted file mode 100644 index b11f6c54c6aaa4bf026d5b12b128ca87ed5f59f5..0000000000000000000000000000000000000000 --- a/src/test/java/com/easysoftware/adapter/execute/ApplicationPackageExecuteAdatperTest.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.easysoftware.adapter.execute; - -import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; - -import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; -import com.easysoftware.common.constant.PackageConstant; -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; - -import lombok.extern.slf4j.Slf4j; - -@SpringBootTest -@AutoConfigureMockMvc -@Slf4j -public class ApplicationPackageExecuteAdatperTest { - private static final String REQUEST_MAPPING = "/apppkg"; - @Autowired - private WebApplicationContext webApplicationContext; - - private MockMvc mockMvc; - - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - public void test_insert() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - - // test insert - InputApplicationPackage input = new InputApplicationPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - ResultVo res = CommonUtil.executePost(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - // test update - input.setArch("tetarch"); - log.info("input: {}", ObjectMapperUtil.writeValueAsString(input)); - res = CommonUtil.executePut(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - // test delete - res = CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - CommonUtil.assertOk(res); - } - - @Test - public void test_insert_exception() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - InputApplicationPackage input = new InputApplicationPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - ResultVo res = CommonUtil.executePost(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - - // 重复写入 - input = new InputApplicationPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - res = CommonUtil.executePost(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assert400(res); - - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - } -} diff --git a/src/test/java/com/easysoftware/adapter/execute/EPKGPackageExecuteAdapterTest.java b/src/test/java/com/easysoftware/adapter/execute/EPKGPackageExecuteAdapterTest.java deleted file mode 100644 index 424a1e2c9323946de3ffb52349f553d5843a056b..0000000000000000000000000000000000000000 --- a/src/test/java/com/easysoftware/adapter/execute/EPKGPackageExecuteAdapterTest.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.easysoftware.adapter.execute; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.dao.DuplicateKeyException; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; - -import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; -import com.easysoftware.application.epkgpackage.EPKGPackageService; -import com.easysoftware.application.epkgpackage.dto.InputEPKGPackage; -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.easysoftware.domain.epkgpackage.EPKGPackage; -import com.easysoftware.domain.epkgpackage.gateway.EPKGPackageGateway; -import com.easysoftware.infrastructure.epkgpackage.gatewayimpl.dataobject.EPKGPackageDO; -import com.easysoftware.infrastructure.mapper.EPKGPackageDOMapper; - -import lombok.extern.slf4j.Slf4j; - -@SpringBootTest -@AutoConfigureMockMvc -@Slf4j -public class EPKGPackageExecuteAdapterTest { - private static final String REQUEST_MAPPING = "/epkgpkg"; - @Autowired - private WebApplicationContext webApplicationContext; - - @Autowired - private EPKGPackageService service; - - private MockMvc mockMvc; - - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - public void test_insert() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - - // test insert - InputEPKGPackage input = new InputEPKGPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - String body = ObjectMapperUtil.writeValueAsString(input); - ArrayList list = new ArrayList<>(); - list.add(body); - service.saveDataObjectBatch(list); - - // test update - input.setArch("testarch"); - ResultVo res = CommonUtil.executePut(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - // test delete - res = CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - CommonUtil.assertOk(res); - } - - @Test - public void test_insert_exception() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - - // test insert - InputEPKGPackage input = new InputEPKGPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - String body = ObjectMapperUtil.writeValueAsString(input); - ArrayList list = new ArrayList<>(); - list.add(body); - service.saveDataObjectBatch(list); - - // 重复写入 - input = new InputEPKGPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - body = ObjectMapperUtil.writeValueAsString(input); - list = new ArrayList<>(); - list.add(body); - - final ArrayList fList = list; - assertThrows(DuplicateKeyException.class, () -> { - service.saveDataObjectBatch(fList); - }); - } -} diff --git a/src/test/java/com/easysoftware/adapter/execute/ExternalOsExecuteAdapterTest.java b/src/test/java/com/easysoftware/adapter/execute/ExternalOsExecuteAdapterTest.java deleted file mode 100644 index 8fd8bff52361a854273622f31f121eaf50af6203..0000000000000000000000000000000000000000 --- a/src/test/java/com/easysoftware/adapter/execute/ExternalOsExecuteAdapterTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.easysoftware.adapter.execute; - -import static org.junit.jupiter.api.DynamicTest.stream; - -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; - -import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; -import com.easysoftware.application.epkgpackage.EPKGPackageService; -import com.easysoftware.application.externalos.dto.ExternalOsSearchCondiiton; -import com.easysoftware.application.externalos.dto.InputExternalOs; -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.power.common.constants.BaseErrorCode.Common; - -import lombok.extern.slf4j.Slf4j; - -@SpringBootTest -@AutoConfigureMockMvc -@Slf4j -public class ExternalOsExecuteAdapterTest { - private static final String REQUEST_MAPPING = "/externalos"; - @Autowired - private WebApplicationContext webApplicationContext; - - @Autowired - private EPKGPackageService service; - - private MockMvc mockMvc; - - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - public void test_insert() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - - // test insert - InputExternalOs input = new InputExternalOs(); - input.setOriginOsName("test--originosname"); - input.setOriginOsVer("test--originosver"); - input.setOriginPkg("test--originpkg"); - input.setTargetOsName("test--targetosname"); - input.setTargetOsVer("test--targetosver"); - input.setTargetPkg("test--targetpkg"); - ResultVo res = CommonUtil.executePost(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - // test update - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - paramMap.add("originOsName", "test--originosname"); - res = CommonUtil.executeGet(mockMvc, REQUEST_MAPPING, paramMap); - - CommonUtil.assertList(res); - List> list = CommonUtil.getList(res); - String id = list.get(0).get("id"); - input = new InputExternalOs(); - input.setOriginOsName("test--update--oriignosname"); - input.setId(id); - res = CommonUtil.executePut(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - // test delete - res = CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/" + id, null); - CommonUtil.assertOk(res); - } - - -} diff --git a/src/test/java/com/easysoftware/adapter/execute/OperationConfigExecuteAdapterTest.java b/src/test/java/com/easysoftware/adapter/execute/OperationConfigExecuteAdapterTest.java deleted file mode 100644 index c796c277ae848be7c533b33c30df0a46a520a89b..0000000000000000000000000000000000000000 --- a/src/test/java/com/easysoftware/adapter/execute/OperationConfigExecuteAdapterTest.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.easysoftware.adapter.execute; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; - -import com.easysoftware.application.epkgpackage.EPKGPackageService; -import com.easysoftware.application.operationconfig.dto.InputOperationConfig; -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; - -import lombok.extern.slf4j.Slf4j; - -@SpringBootTest -@AutoConfigureMockMvc -@Slf4j -public class OperationConfigExecuteAdapterTest { - private static final String REQUEST_MAPPING = "/operationconfig"; - @Autowired - private WebApplicationContext webApplicationContext; - - @Autowired - private EPKGPackageService service; - - private MockMvc mockMvc; - - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - void test_insert() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/domainPage", null); - InputOperationConfig input = new InputOperationConfig(); - input.setCategorys("大数据"); - input.setOrderIndex("1"); - input.setRecommend("kafka, redis"); - input.setType("domainPage"); - ResultVo res = CommonUtil.executePost(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - res = CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/domainPage", null); - CommonUtil.assertOk(res); - } -} diff --git a/src/test/java/com/easysoftware/adapter/execute/RPMPackageExecuteAdapterTest.java b/src/test/java/com/easysoftware/adapter/execute/RPMPackageExecuteAdapterTest.java deleted file mode 100644 index 17bc12f317d4f7fd71d6adc020f39c86fd79d064..0000000000000000000000000000000000000000 --- a/src/test/java/com/easysoftware/adapter/execute/RPMPackageExecuteAdapterTest.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.easysoftware.adapter.execute; - -import static org.junit.Assert.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.dao.DuplicateKeyException; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; - -import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; -import com.easysoftware.application.epkgpackage.EPKGPackageService; -import com.easysoftware.application.epkgpackage.dto.InputEPKGPackage; -import com.easysoftware.application.rpmpackage.RPMPackageService; -import com.easysoftware.application.rpmpackage.dto.InputRPMPackage; -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.easysoftware.domain.epkgpackage.EPKGPackage; -import com.easysoftware.domain.epkgpackage.gateway.EPKGPackageGateway; -import com.easysoftware.infrastructure.epkgpackage.gatewayimpl.dataobject.EPKGPackageDO; -import com.easysoftware.infrastructure.mapper.EPKGPackageDOMapper; - -import lombok.extern.slf4j.Slf4j; - -@SpringBootTest -@AutoConfigureMockMvc -@Slf4j -public class RPMPackageExecuteAdapterTest { - private static final String REQUEST_MAPPING = "/rpmpkg"; - @Autowired - private WebApplicationContext webApplicationContext; - - @Autowired - private RPMPackageService service; - - private MockMvc mockMvc; - - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - public void test_insert() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - - // test insert - InputRPMPackage input = new InputRPMPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - String body = ObjectMapperUtil.writeValueAsString(input); - ArrayList list = new ArrayList<>(); - list.add(body); - service.saveDataObjectBatch(list); - - // test update - input.setArch("testarch"); - log.info("in: {}", ObjectMapperUtil.writeValueAsString(input)); - ResultVo res = CommonUtil.executePut(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - // test delete - res = CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - CommonUtil.assertOk(res); - } - - @Test - public void test_insert_exception() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - - // test insert - InputRPMPackage input = new InputRPMPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - String body = ObjectMapperUtil.writeValueAsString(input); - ArrayList list = new ArrayList<>(); - list.add(body); - service.saveDataObjectBatch(list); - - // 重复写入 - input = new InputRPMPackage(); - input.setPkgId("testfortest"); - input.setName("testfortest"); - body = ObjectMapperUtil.writeValueAsString(input); - list = new ArrayList<>(); - list.add(body); - - final ArrayList fList = list; - assertThrows(DuplicateKeyException.class, () -> { - service.saveDataObjectBatch(fList); - }); - } -} diff --git a/src/test/java/com/easysoftware/adapter/execute/RedisExecuteAdapterTest.java b/src/test/java/com/easysoftware/adapter/execute/RedisExecuteAdapterTest.java index 3eca42e594246634ae292381db6417a4731dbeed..71eaa27b568533a1fda1678ffc0560fb8bd890fa 100644 --- a/src/test/java/com/easysoftware/adapter/execute/RedisExecuteAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/execute/RedisExecuteAdapterTest.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.execute; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapterTest.java index ed5ccc027c2842ab927cf67f4034d270563b43e0..6d1a56143044cd7d67c7b1624e11e1702644f6c6 100644 --- a/src/test/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapterTest.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapterTest.java index 63f3f9b4875bf6728420c56e34be2e7188d2233c..f7d017b69adeb974173cc6a020fd154f87bc4340 100644 --- a/src/test/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapterTest.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import java.util.ArrayList; @@ -14,7 +25,6 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.context.WebApplicationContext; import com.easysoftware.application.applicationversion.ApplicationVersionService; -import com.easysoftware.application.applicationversion.dto.InputApplicationVersion; import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.entity.ResultVo; import com.easysoftware.common.utils.CommonUtil; @@ -55,80 +65,4 @@ public class ApplicationVersionQueryAdapterTest { ResultVo res = CommonUtil.executeGet(mockMvc, "/appVersion", paramMap); CommonUtil.assertList(res); } - - @Test - void testInsertAppVersion() throws Exception { - ArrayList appList = new ArrayList<>(); - InputApplicationVersion app = new InputApplicationVersion(); - - // test case1: not exist - app.setName("redis--test--not--exist"); - app.setOpeneulerVersion("7.2.4"); - app.setUpstreamVersion("7.2.4"); - app.setStatus("OK"); - app.setCiVersion("7.2.4"); - app.setEulerHomepage("https://hub.docker.com/r/openeuler/redis"); - app.setUpHomepage("https://github.com/redis/redis"); - String jsonBody = ObjectMapperUtil.writeValueAsString(app); - ResultVo res = CommonUtil.executePost(mockMvc, "/appVersion", jsonBody); - CommonUtil.assertOk(res); - String appStr = ObjectMapperUtil.writeValueAsString(app); - appList.add(appStr); - - // test case2: exist - app.setName("httpd"); - app.setOpeneulerVersion("2.4.58"); - app.setUpstreamVersion("2.4.58"); - app.setEulerHomepage("https://hub.docker.com/r/openeuler/httpd"); - app.setUpHomepage("https://github.com/apache/httpd"); - app.setStatus("OK"); - jsonBody = ObjectMapperUtil.writeValueAsString(app); - res = CommonUtil.executePost(mockMvc, "/appVersion", jsonBody); - CommonUtil.assertMsg(res, MessageCode.EC0008); - appStr = ObjectMapperUtil.writeValueAsString(app); - appList.add(appStr); - - applicationVersionService.saveDataObjectBatch(appList); - } - - @Test - void testUpdateAppVersion() throws Exception { - InputApplicationVersion app = new InputApplicationVersion(); - - // test case1: not exist - app.setName("redis--test"); - app.setBackend("docker"); - app.setOpeneulerVersion("7.2.4"); - app.setUpstreamVersion("7.2.4"); - app.setStatus("OK"); - app.setCiVersion("7.2.4"); - app.setEulerHomepage("https://hub.docker.com/r/openeuler/redis"); - app.setUpHomepage("https://github.com/redis/redis"); - String jsonBody = ObjectMapperUtil.writeValueAsString(app); - ResultVo res = CommonUtil.executePut(mockMvc, "/appVersion", jsonBody); - CommonUtil.assertMsg(res, MessageCode.EC0009); - - // test case2: exist - app.setName("loki"); - app.setOpeneulerVersion("2.9.6"); - app.setUpstreamVersion("2.9.6"); - app.setEulerHomepage("https://hub.docker.com/r/openeuler/loki"); - app.setUpHomepage("https://github.com/grafana/loki"); - app.setStatus("OK"); - jsonBody = ObjectMapperUtil.writeValueAsString(app); - res = CommonUtil.executePut(mockMvc, "/appVersion", jsonBody); - CommonUtil.assertOk(res); - } - - @Test - void testDeleteAppVersion() throws Exception { - // test case1: not exist - String url = "/appVersion/Prometheus-test-delete"; - ResultVo res = CommonUtil.executeDelete(mockMvc, url); - - // test case2: exist - url = "/appVersion/Prometheus13"; - res = CommonUtil.executeDelete(mockMvc, url); - CommonUtil.assertOk(res); - } } diff --git a/src/test/java/com/easysoftware/adapter/query/DomainPackageQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/DomainPackageQueryAdapterTest.java index c087d2482726e34f7bef00ace8d7f190fc33a4c8..311361e4d7599a3809c8717069e03b26d3d60bd2 100644 --- a/src/test/java/com/easysoftware/adapter/query/DomainPackageQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/DomainPackageQueryAdapterTest.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import static org.junit.Assert.assertThat; diff --git a/src/test/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapterTest.java index db8273f0ae6e1d0781ffdd1683307a2f62e8a695..0359c4acd715f6c3936e9fae14f4cd53a7c3432d 100644 --- a/src/test/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapterTest.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.adapter.query; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/easysoftware/adapter/query/ExternalOsQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/ExternalOsQueryAdapterTest.java deleted file mode 100644 index b6a8a02228aa27a61fe4df498baf7f0a182b88e4..0000000000000000000000000000000000000000 --- a/src/test/java/com/easysoftware/adapter/query/ExternalOsQueryAdapterTest.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.easysoftware.adapter.query; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; - -import com.easysoftware.application.externalos.dto.ExternalOsSearchCondiiton; -import com.easysoftware.application.externalos.dto.InputExternalOs; -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; - -import lombok.extern.slf4j.Slf4j; - -@SpringBootTest -@AutoConfigureMockMvc -@Slf4j -public class ExternalOsQueryAdapterTest { - private static final String REQUEST_MAPPING = "/externalos"; - - @Autowired - private WebApplicationContext webApplicationContext; - private MockMvc mockMvc; - - @MockBean - private RPMPackageGateway gateway; - - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - void test_search() throws Exception { - CommonUtil.executeDelete(mockMvc, REQUEST_MAPPING + "/testfortest", null); - - // test insert - InputExternalOs input = new InputExternalOs(); - input.setOriginOsName("test--originosname"); - input.setOriginOsVer("test--originosver"); - input.setOriginPkg("test--originpkg"); - input.setTargetOsName("test--targetosname"); - input.setTargetOsVer("test--targetosver"); - input.setTargetPkg("test--targetpkg"); - ResultVo res = CommonUtil.executePost(mockMvc, REQUEST_MAPPING, ObjectMapperUtil.writeValueAsString(input)); - CommonUtil.assertOk(res); - - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - paramMap.add("originOsName", "test--originosname"); - res = CommonUtil.executeGet(mockMvc, REQUEST_MAPPING, paramMap); - CommonUtil.assertOk(res); - } -} diff --git a/src/test/java/com/easysoftware/adapter/query/RPMPackageQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/RPMPackageQueryAdapterTest.java index bb1de7910c1672d29229e67d9a962865737ff0de..80725d225edee902bb8158743782d1866209f1bb 100644 --- a/src/test/java/com/easysoftware/adapter/query/RPMPackageQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/RPMPackageQueryAdapterTest.java @@ -1,50 +1,31 @@ -package com.easysoftware.adapter.query; - -import static org.junit.Assert.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ -import java.lang.reflect.Field; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +package com.easysoftware.adapter.query; -import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.context.WebApplicationContext; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.easysoftware.application.rpmpackage.RPMPackageService; -import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; -import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; -import com.easysoftware.common.constant.PackageConstant; import com.easysoftware.common.entity.ResultVo; import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.easysoftware.domain.rpmpackage.RPMPackage; import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; -import com.easysoftware.infrastructure.mapper.RPMPackageDOMapper; -import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.RPMPackageGatewayImpl; -import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject.RPMPackageDO; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @SpringBootTest @AutoConfigureMockMvc @@ -56,7 +37,7 @@ public class RPMPackageQueryAdapterTest { @MockBean private RPMPackageGateway gateway; - + @BeforeEach public void setUp() throws Exception { mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); @@ -73,11 +54,25 @@ public class RPMPackageQueryAdapterTest { } @Test - void test_rpm_exception() throws Exception { + void test_rpm_version() throws Exception { MultiValueMap paramMap = new LinkedMultiValueMap<>(); paramMap.add("name", "error"); paramMap.add("os", "openEuler-20.03-LTS-SP1"); ResultVo res = CommonUtil.executeGet(mockMvc, "/rpmpkg", paramMap); CommonUtil.assertList(res); } + + @Test + void test_rpm_exception() throws Exception { + MultiValueMap paramMap = new LinkedMultiValueMap<>(); + // test case1 : + paramMap.add("name", "test"); + ResultVo comres = CommonUtil.executeGet(mockMvc, "/rpmpkg/rpmver", paramMap); + CommonUtil.assertList(comres); + + // test case2 : + paramMap.add("name", ""); + ResultVo res = CommonUtil.executeGet(mockMvc, "/rpmpkg/rpmver", paramMap); + CommonUtil.assertList(res); + } } diff --git a/src/test/java/com/easysoftware/common/utils/CommonUtil.java b/src/test/java/com/easysoftware/common/utils/CommonUtil.java index 18379678c04d3e9880a8faa2444571c157233a84..a114c5c711249367ce2c23c880a6fdb568cfecf7 100644 --- a/src/test/java/com/easysoftware/common/utils/CommonUtil.java +++ b/src/test/java/com/easysoftware/common/utils/CommonUtil.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.common.utils; import static org.junit.Assert.assertNotNull; @@ -35,55 +46,6 @@ public class CommonUtil { return res; } - public static ResultVo executePost(MockMvc mockMvc, String url, String jsonRequest) throws Exception { - String content = mockMvc.perform(MockMvcRequestBuilders.post(url) - .content(jsonRequest) - .contentType(MediaType.APPLICATION_JSON)) - .andReturn().getResponse() - .getContentAsString(StandardCharsets.UTF_8); - - ResultVo res = ObjectMapperUtil.toObject(ResultVo.class, content); - return res; - } - - public static ResultVo executePut(MockMvc mockMvc, String url, String jsonRequest) throws Exception { - String content = mockMvc.perform(MockMvcRequestBuilders.put(url) - .content(jsonRequest) - .contentType(MediaType.APPLICATION_JSON)) - .andReturn().getResponse() - .getContentAsString(StandardCharsets.UTF_8); - - ResultVo res = ObjectMapperUtil.toObject(ResultVo.class, content); - return res; - } - - public static ResultVo executeDelete(MockMvc mockMvc, String url) throws Exception { - String content = mockMvc.perform(MockMvcRequestBuilders.delete(url) - .contentType(MediaType.APPLICATION_JSON)) - .andReturn().getResponse() - .getContentAsString(StandardCharsets.UTF_8); - - ResultVo res = ObjectMapperUtil.toObject(ResultVo.class, content); - return res; - } - - public static ResultVo executeDelete(MockMvc mockMvc, String url, MultiValueMap paramMap) - throws Exception { - String content = ""; - if (null == paramMap) { - content = mockMvc.perform(MockMvcRequestBuilders.delete(url) - .accept(MediaType.APPLICATION_JSON)) - .andReturn().getResponse().getContentAsString(StandardCharsets.UTF_8); - } else { - content = mockMvc.perform(MockMvcRequestBuilders.delete(url) - .params(paramMap) - .accept(MediaType.APPLICATION_JSON)) - .andReturn().getResponse().getContentAsString(StandardCharsets.UTF_8); - } - ResultVo res = ObjectMapperUtil.toObject(ResultVo.class, content); - return res; - } - public static void assertOk(ResultVo res) { assertEquals(res.getCode(), HttpStatus.OK.value()); assertEquals(res.getMsg(), HttpStatus.OK.getReasonPhrase()); diff --git a/src/test/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGatewayTest.java b/src/test/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGatewayTest.java index 0e253d223a5e0fecf876454f7cf6f45ab9018984..e4cedcec2726eb5bd5214072b8d48b1668cc6083 100644 --- a/src/test/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGatewayTest.java +++ b/src/test/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGatewayTest.java @@ -1,3 +1,14 @@ +/* Copyright (c) 2024 openEuler Community + EasySoftware is licensed under the Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. +*/ + package com.easysoftware.domain.operationconfig.gateway; import static org.junit.Assert.assertTrue;