refactor: 移动core包到web包中

core/.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed 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.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

core/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

core/mvnw

@@ -1,310 +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.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   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 /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
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
-  [ -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 "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; 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="`which 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
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# 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/.."; pwd`
-    fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
-  fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-##########################################################################################
-# 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.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
-else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    fi
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-    if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
-    fi
-
-    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
-        else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
-        else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
-        fi
-
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaClass=`cygpath --path --windows "$javaClass"`
-        fi
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
-            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-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 "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -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
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

core/mvnw.cmd

@@ -1,182 +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 Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@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 userPO 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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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 DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_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 DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %DOWNLOAD_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('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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%
-
-exit /B %ERROR_CODE%

core/pom.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>seecoder-devcloud-core</artifactId>
-    <version>0.1.0</version>
-    <description>Demo project for Spring Boot</description>
-
-    <parent>
-        <artifactId>seecoder-devcloud-parent</artifactId>
-        <groupId>cn.seecoder</groupId>
-        <version>0.1.0</version>
-    </parent>
-
-    <properties>
-        <java.version>1.8</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>2.3.7.RELEASE</spring-boot.version>
-    </properties>
-
-
-    <dependencies>
-
-        <dependency>
-            <groupId>cn.seecoder</groupId>
-            <artifactId>seecoder-devcloud-api</artifactId>
-            <version>0.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.seecoder</groupId>
-            <artifactId>seecoder-devcloud-web</artifactId>
-            <version>0.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>

core/src/main/java/cn/seecoder/core/CoreApplication.java

@@ -1,28 +0,0 @@
-package cn.seecoder.core;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-import java.time.ZoneId;
-import java.util.TimeZone;
-
-/**
- * 测试用
- */
-@EnableScheduling
-@EnableAsync
-@SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
-        DataSourceTransactionManagerAutoConfiguration.class})
-public class CoreApplication {
-
-    public static void main(String[] args) {
-        // 强制写入默认时区
-        TimeZone.setDefault(TimeZone.getTimeZone(ZoneId.of("GMT+8")));
-        SpringApplication.run(CoreApplication.class, args);
-    }
-}

core/src/main/resources/application-local.yml

@@ -1,52 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://192.168.99.105:30006/devcloud?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
-    username: root
-    password: root
-
-  mail:
-    host: smtp.qq.com
-    username: 370774330@qq.com
-    password: qkoecnzivukvbibi
-    port: 465
-    protocol: smtp
-    properties:
-      mail:
-        smtp:
-          ssl:
-            enable: true
-          socketFactory.class: javax.net.ssl.SSLSocketFactory
-        debug: true
-server:
-  port: 8080
-
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-
-seecoder:
-  jwt:
-    secret: U0VFQy0xOTE5ODEwLU9JREMtMTE0NTE0
-  k8s:
-    api-server: https://192.168.99.105:8443
-    token: eyJhbGciOiJSUzI1NiIsImtpZCI6IjBmSXc4RlRjNUpBYVpGYWc4QzRDY1MzUWJad1JMdFhKcDI1cngzWGtiRlkifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJkZXZjbG91ZCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJkZWZhdWx0LXRva2VuLXNicXY4Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6ImRlZmF1bHQiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiI5NmIxNzU1ZS0zZjE3LTQ1ZTctODFmYi01MTRhODA3NDRhMzQiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6ZGV2Y2xvdWQ6ZGVmYXVsdCJ9.W0Y1lR6LBi1ZjylBx35YeqYuq2u2AqH-ayK4FD-LDfC26E89DanOwSv9XLrRMnnDBZFS_ZCRBumbnDeMiS5vw2x7-QnrDqj1M5u9FB2fIJsz2LyUkOhATZZmTzj_Uhewvvg09aDKh16ttj6ZX27m-KVk_6MP-VfiuvZnCVxDbqRkRjK-zsor4ty1CEATPyKK-tvugAwS0RFNHUL94DamfZAq_t1PSnH5ZtEHq0uEMZxY2c7j6u9d_aD9lphm_ZpCy_C8OCHfanM21CQPDHlcJTW_aiOO6bAp8qdc1egPO5uIamHl6Zm0N3RkcsRp4DGOHrltTV9y_cGZHXSWmRHfxw
-    debugging: true
-    ingressHostSuffix: .devcloud.seec.seecoder.cn
-  gitlab:
-    host: http://gitlab.192.168.99.105.nip.io
-    token: wXDeETv2Kmt-JhiApJ9H
-    webhook-proxy: test
-  mail:
-    from: 370774330@qq.com
-  git:
-    username: root
-    password: rootroot
-  docker:
-    host: https://192.168.99.105:2376
-    registry: 192.168.99.105:30060
-    registryUsername: admin
-    registryPassword: admin
-    tls: true
-
-
-

core/src/main/resources/application.yml

@@ -1,4 +0,0 @@
-spring:
-  profiles:
-    active: local
-

core/src/test/java/cn/seecoder/core/CoreApplicationTests.java

@@ -1,220 +0,0 @@
-package cn.seecoder.core;
-
-import cn.seecoder.api.ApplicationProperties;
-import cn.seecoder.api.k8s.DeploymentApi;
-import cn.seecoder.api.k8s.IngressApi;
-import cn.seecoder.api.k8s.ServiceApi;
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.PipelineException;
-import cn.seecoder.core.pipeline.config.HandlerConfigTable;
-import cn.seecoder.core.pipeline.handler.*;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.File;
-import java.nio.file.Paths;
-import java.util.List;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-class CoreApplicationTests {
-
-    @Autowired
-    private ApplicationProperties properties;
-
-    @Autowired
-    private DeploymentApi deploymentApi;
-
-    @Autowired
-    private ServiceApi serviceApi;
-
-    @Autowired
-    private IngressApi ingressApi;
-
-    private Context context;
-
-
-    @BeforeEach
-    void setUp() {
-        mockContext();
-    }
-
-    @Test
-    void k8sDeployment() {
-
-        K8sDeploymentHandler handler = new K8sDeploymentHandler();
-        context.getConfigs().put("imageName","seecoder-devcloud-g-p");
-        context.getConfigs().put("imageTag","1616447743417");
-        context.getConfigs().put("port","8081");
-        try {
-            handler.process(context);
-        } catch (PipelineException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Test
-    void k8sNamespace() {
-
-        K8sNamespaceHandler k8sNamespaceHandler = new K8sNamespaceHandler();
-        try {
-            k8sNamespaceHandler.process(context);
-        } catch (PipelineException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-
-    @Test
-    void k8sService() {
-        context.getConfigs().put("port","8081");
-        K8sServiceHandler k8sServiceHandler = new K8sServiceHandler();
-        try {
-            k8sServiceHandler.process(context);
-        } catch (PipelineException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    void k8sIngress() {
-        context.getConfigs().put("servicePort","8081");
-        K8sIngressHandler ingressHandler = new K8sIngressHandler();
-        try {
-            ingressHandler.process(context);
-        } catch (PipelineException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    void k8sImageBackendBuild() {
-        context.setDeployName("pb");
-        JavaImageBuildHandler javaImageBuildHandler = new JavaImageBuildHandler();
-        javaImageBuildHandler.setRepoUrl("http://gitlab.192.168.99.105.nip.io/root/imagebuildetest.git");
-        javaImageBuildHandler.setBranchName("master");
-        try {
-            javaImageBuildHandler.process(context);
-        } catch (PipelineException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    void k8sImageFrontendBuild() {
-        context.setDeployName("pf");
-        NodeImageBuildHandler nodeImageBuildHandler = new NodeImageBuildHandler();
-        nodeImageBuildHandler.setRepoUrl("http://gitlab.192.168.99.105.nip.io/root/frontendimage.git");
-        nodeImageBuildHandler.setBranchName("master");
-        try {
-            nodeImageBuildHandler.process(context);
-        } catch (PipelineException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    @Test
-    void jsonTrans(){
-        ObjectMapper mapper = new ObjectMapper();
-        List<ObjectNode> handlerConfigs = null;
-        String configJson = "[\n" +
-                "  {\n" +
-                "    \"name\": \"java-image-build\",\n" +
-                "    \"configs\": {\n" +
-                "      \"repoUrl\": \"#todo\",\n" +
-                "      \"branchName\": \"#todo\",\n" +
-                "      \"env\" : {\n" +
-                "        \"username\" : \"root\",\n" +
-                "        \"password\" : \"root\"\n" +
-                "      }\n" +
-                "\n" +
-                "    }\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"name\": \"k8s-namespace\",\n" +
-                "    \"configs\": {\n" +
-                "    }\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"name\": \"k8s-deployment\",\n" +
-                "    \"configs\": {\n" +
-                "      \"port\": \"#todo\"\n" +
-                "    }\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"name\": \"k8s-service\",\n" +
-                "    \"configs\": {\n" +
-                "    }\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"name\": \"k8s-ingress\",\n" +
-                "    \"configs\": {\n" +
-                "    }\n" +
-                "  }\n" +
-                "]";
-
-        try {
-            handlerConfigs = mapper.readValue(configJson, new TypeReference<List<ObjectNode>>() {
-            });
-            for (ObjectNode node : handlerConfigs){
-                String name = node.get("name").toString().replaceAll("\"","");
-                JsonNode configs = node.get("configs");
-                HandlerConfigTable.transToHandler(name,configs);
-            }
-            System.out.println(handlerConfigs);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Test
-    void pomReader(){
-
-        File fXmlFile = Paths.get("C:\\Users\\deponia\\AppData\\Local\\Temp\\seecoder-devcloud-956573437311297579","pom.xml").toFile();
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder = null;
-        Document doc = null;
-        try {
-            dBuilder = dbFactory.newDocumentBuilder();
-            doc = dBuilder.parse(fXmlFile);
-            doc.getDocumentElement().normalize();
-            NodeList nodes = doc.getChildNodes().item(0).getChildNodes();
-            for (int i = 0; i < 20; i++){
-                System.out.println("dododo: ");
-                System.out.println(nodes.item(i).getNodeName());
-                System.out.println("gogogo: ");
-                System.out.println(nodes.item(i).getNodeValue());
-                System.out.println(nodes.item(i).getTextContent());
-            }
-            System.out.println("Root element :" + doc.getDocumentElement().getNodeName());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    private void mockContext(){
-        this.context = Context.builder()
-                .namespace("g")
-                .deployName("p")
-                .pipelineId(1)
-                .applicationProperties(properties)
-                .build();
-    }
-}

core/src/main/java/cn/seecoder/core/commit/CommitResolver.java → web/src/main/java/cn/seecoder/web/commit/CommitResolver.java

@@ -1,4 +1,4 @@
-package cn.seecoder.core.commit;
+package cn.seecoder.web.commit;
 
 /**
  * @author PuHong Weng

core/src/main/java/cn/seecoder/core/commit/CommitRule.java → web/src/main/java/cn/seecoder/web/commit/CommitRule.java

@@ -1,4 +1,4 @@
-package cn.seecoder.core.commit;
+package cn.seecoder.web.commit;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

core/src/main/java/cn/seecoder/core/commit/CommitState.java → web/src/main/java/cn/seecoder/web/commit/CommitState.java

@@ -1,4 +1,4 @@
-package cn.seecoder.core.commit;
+package cn.seecoder.web.commit;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

core/src/main/java/cn/seecoder/core/commit/CommitType.java → web/src/main/java/cn/seecoder/web/commit/CommitType.java

@@ -1,4 +1,4 @@
-package cn.seecoder.core.commit;
+package cn.seecoder.web.commit;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

web/src/main/java/cn/seecoder/web/controller/gitlab/HookController.java

@@ -1,8 +1,8 @@
 package cn.seecoder.web.controller.gitlab;
 
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.core.commit.CommitResolver;
-import cn.seecoder.core.commit.CommitRule;
+import cn.seecoder.web.commit.CommitResolver;
+import cn.seecoder.web.commit.CommitRule;
 import cn.seecoder.web.model.enums.CommitRelatedType;
 import cn.seecoder.web.model.po.project.CommitPO;
 import cn.seecoder.web.model.vo.GitWebHookVO;

core/src/main/java/cn/seecoder/core/pipeline/Context.java → web/src/main/java/cn/seecoder/web/pipeline/Context.java

@@ -1,4 +1,4 @@
-package cn.seecoder.core.pipeline;
+package cn.seecoder.web.pipeline;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

core/src/main/java/cn/seecoder/core/pipeline/Handler.java → web/src/main/java/cn/seecoder/web/pipeline/Handler.java

@@ -1,4 +1,4 @@
-package cn.seecoder.core.pipeline;
+package cn.seecoder.web.pipeline;
 
 /**
  * @author PuHong Weng

core/src/main/java/cn/seecoder/core/pipeline/Pipeline.java → web/src/main/java/cn/seecoder/web/pipeline/Pipeline.java

@@ -1,4 +1,4 @@
-package cn.seecoder.core.pipeline;
+package cn.seecoder.web.pipeline;
 
 /**
  * @author PuHong Weng

core/src/main/java/cn/seecoder/core/pipeline/PipelineException.java → web/src/main/java/cn/seecoder/web/pipeline/PipelineException.java

@@ -1,4 +1,4 @@
-package cn.seecoder.core.pipeline;
+package cn.seecoder.web.pipeline;
 
 /**
  * @author PuHong Weng

core/src/main/java/cn/seecoder/core/pipeline/PipelineFactory.java → web/src/main/java/cn/seecoder/web/pipeline/PipelineFactory.java

@@ -1,13 +1,13 @@
-package cn.seecoder.core.pipeline;
+package cn.seecoder.web.pipeline;
 
-import cn.seecoder.core.pipeline.handler.AbstractHandler;
+import cn.seecoder.web.pipeline.handler.AbstractHandler;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.http.HttpStatus;
-import cn.seecoder.core.pipeline.config.HandlerConfigTable;
-import cn.seecoder.core.pipeline.pipeline.PipelineImpl;
+import cn.seecoder.web.pipeline.config.HandlerConfigTable;
+import cn.seecoder.web.pipeline.pipeline.PipelineImpl;
 
 import java.util.List;
 

core/src/main/java/cn/seecoder/core/pipeline/config/HandlerConfigTable.java → web/src/main/java/cn/seecoder/web/pipeline/config/HandlerConfigTable.java

@@ -1,8 +1,8 @@
-package cn.seecoder.core.pipeline.config;
+package cn.seecoder.web.pipeline.config;
 
-import cn.seecoder.core.pipeline.Handler;
-import cn.seecoder.core.pipeline.PipelineException;
-import cn.seecoder.core.pipeline.handler.*;
+import cn.seecoder.web.pipeline.Handler;
+import cn.seecoder.web.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.handler.*;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;

core/src/main/java/cn/seecoder/core/pipeline/handler/AbstractHandler.java → web/src/main/java/cn/seecoder/web/pipeline/handler/AbstractHandler.java

@@ -1,9 +1,9 @@
-package cn.seecoder.core.pipeline.handler;
+package cn.seecoder.web.pipeline.handler;
 
 import lombok.Data;
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.Handler;
-import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.Handler;
+import cn.seecoder.web.pipeline.PipelineException;
 
 /**
  * @author PuHong Weng

core/src/main/java/cn/seecoder/core/pipeline/handler/ApiTestHandler.java → web/src/main/java/cn/seecoder/web/pipeline/handler/ApiTestHandler.java

@@ -1,8 +1,8 @@
-package cn.seecoder.core.pipeline.handler;
+package cn.seecoder.web.pipeline.handler;
 
 import cn.seecoder.common.util.SpringUtil;
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.PipelineException;
 import cn.seecoder.web.service.APITest.APITestService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -14,7 +14,7 @@ import org.apache.http.HttpStatus;
 
 import java.util.List;
 
-import static cn.seecoder.core.pipeline.PipelineException.API_TEST_ID_RESOLVE_ERROR;
+import static cn.seecoder.web.pipeline.PipelineException.API_TEST_ID_RESOLVE_ERROR;
 
 /**
  * @author PuHong Weng

core/src/main/java/cn/seecoder/core/pipeline/handler/JavaImageBuildHandler.java → web/src/main/java/cn/seecoder/web/pipeline/handler/JavaImageBuildHandler.java

@@ -1,8 +1,8 @@
-package cn.seecoder.core.pipeline.handler;
+package cn.seecoder.web.pipeline.handler;
 
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.PipelineException;
-import cn.seecoder.core.pipeline.template.PipelineTemplateTable;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.template.PipelineTemplateTable;
 import com.spotify.docker.client.ProgressHandler;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.messages.ProgressMessage;

core/src/main/java/cn/seecoder/core/pipeline/handler/K8sDeploymentHandler.java → web/src/main/java/cn/seecoder/web/pipeline/handler/K8sDeploymentHandler.java

@@ -1,7 +1,7 @@
-package cn.seecoder.core.pipeline.handler;
+package cn.seecoder.web.pipeline.handler;
 
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.PipelineException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
 import cn.seecoder.api.ApplicationProperties;

core/src/main/java/cn/seecoder/core/pipeline/handler/K8sIngressHandler.java → web/src/main/java/cn/seecoder/web/pipeline/handler/K8sIngressHandler.java

@@ -1,7 +1,7 @@
-package cn.seecoder.core.pipeline.handler;
+package cn.seecoder.web.pipeline.handler;
 
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.PipelineException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
 import cn.seecoder.api.ApplicationProperties;

core/src/main/java/cn/seecoder/core/pipeline/handler/K8sNamespaceHandler.java → web/src/main/java/cn/seecoder/web/pipeline/handler/K8sNamespaceHandler.java

@@ -1,7 +1,7 @@
-package cn.seecoder.core.pipeline.handler;
+package cn.seecoder.web.pipeline.handler;
 
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.PipelineException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
 import cn.seecoder.api.k8s.NamespaceApi;

core/src/main/java/cn/seecoder/core/pipeline/handler/K8sServiceHandler.java → web/src/main/java/cn/seecoder/web/pipeline/handler/K8sServiceHandler.java

@@ -1,7 +1,7 @@
-package cn.seecoder.core.pipeline.handler;
+package cn.seecoder.web.pipeline.handler;
 
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.PipelineException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
 import cn.seecoder.api.k8s.K8sConstants;

core/src/main/java/cn/seecoder/core/pipeline/handler/NodeImageBuildHandler.java → web/src/main/java/cn/seecoder/web/pipeline/handler/NodeImageBuildHandler.java

@@ -1,8 +1,8 @@
-package cn.seecoder.core.pipeline.handler;
+package cn.seecoder.web.pipeline.handler;
 
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.PipelineException;
-import cn.seecoder.core.pipeline.template.PipelineTemplateTable;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.template.PipelineTemplateTable;
 import com.spotify.docker.client.ProgressHandler;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.messages.ProgressMessage;

core/src/main/java/cn/seecoder/core/pipeline/inspector/PipelineInspector.java → web/src/main/java/cn/seecoder/web/pipeline/inspector/PipelineInspector.java

@@ -1,8 +1,8 @@
-package cn.seecoder.core.pipeline.inspector;
+package cn.seecoder.web.pipeline.inspector;
 
 import cn.seecoder.api.k8s.*;
 import cn.seecoder.api.k8s.model.*;
-import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.web.pipeline.Context;
 import io.kubernetes.client.openapi.models.V1DeploymentStatus;
 import cn.seecoder.common.util.SpringUtil;
 

core/src/main/java/cn/seecoder/core/pipeline/inspector/PipelineInspectorFactory.java → web/src/main/java/cn/seecoder/web/pipeline/inspector/PipelineInspectorFactory.java

@@ -1,6 +1,6 @@
-package cn.seecoder.core.pipeline.inspector;
+package cn.seecoder.web.pipeline.inspector;
 
-import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.web.pipeline.Context;
 
 /**
  * @author PuHong Weng

core/src/main/java/cn/seecoder/core/pipeline/pipeline/PipelineImpl.java → web/src/main/java/cn/seecoder/web/pipeline/pipeline/PipelineImpl.java

@@ -1,9 +1,9 @@
-package cn.seecoder.core.pipeline.pipeline;
+package cn.seecoder.web.pipeline.pipeline;
 
-import cn.seecoder.core.pipeline.Context;
-import cn.seecoder.core.pipeline.Pipeline;
-import cn.seecoder.core.pipeline.Handler;
-import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.Context;
+import cn.seecoder.web.pipeline.Pipeline;
+import cn.seecoder.web.pipeline.Handler;
+import cn.seecoder.web.pipeline.PipelineException;
 
 /**
  * @author PuHong Weng

core/src/main/java/cn/seecoder/core/pipeline/template/PipelineTemplateTable.java → web/src/main/java/cn/seecoder/web/pipeline/template/PipelineTemplateTable.java

@@ -1,9 +1,9 @@
-package cn.seecoder.core.pipeline.template;
+package cn.seecoder.web.pipeline.template;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.core.io.ClassPathResource;
-import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.PipelineException;
 
 import java.io.IOException;
 import java.nio.file.Files;

web/src/main/java/cn/seecoder/web/service/impl/pipeline/DeploymentServiceImpl.java

@@ -16,11 +16,11 @@ import org.springframework.stereotype.Service;
 import cn.seecoder.api.ApplicationProperties;
 import cn.seecoder.common.exceptions.AccessDeniedException;
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.core.pipeline.Pipeline;
-import cn.seecoder.core.pipeline.PipelineException;
-import cn.seecoder.core.pipeline.PipelineFactory;
-import cn.seecoder.core.pipeline.inspector.PipelineInspector;
-import cn.seecoder.core.pipeline.inspector.PipelineInspectorFactory;
+import cn.seecoder.web.pipeline.Pipeline;
+import cn.seecoder.web.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.PipelineFactory;
+import cn.seecoder.web.pipeline.inspector.PipelineInspector;
+import cn.seecoder.web.pipeline.inspector.PipelineInspectorFactory;
 import cn.seecoder.web.model.vo.pipeline.DeploymentInfoVO;
 import cn.seecoder.web.service.pipeline.DeploymentService;
 

web/src/main/java/cn/seecoder/web/service/impl/pipeline/PipelineServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.seecoder.web.service.impl.pipeline;
 
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.core.pipeline.PipelineException;
-import cn.seecoder.core.pipeline.template.PipelineTemplateTable;
+import cn.seecoder.web.pipeline.PipelineException;
+import cn.seecoder.web.pipeline.template.PipelineTemplateTable;
 import cn.seecoder.web.dao.pipeline.PipelineHistoryMapper;
 import cn.seecoder.web.dao.pipeline.PipelineMapper;
 import cn.seecoder.web.dao.user.UserMapper;

web/src/main/java/cn/seecoder/web/service/impl/project/BugListServiceImpl.java

@@ -7,7 +7,7 @@ import cn.seecoder.web.service.project.BugListService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.core.commit.CommitState;
+import cn.seecoder.web.commit.CommitState;
 import cn.seecoder.web.dao.project.CommitMapper;
 import cn.seecoder.web.dao.user.UserMapper;
 import cn.seecoder.web.model.po.project.BugListPO;

web/src/main/java/cn/seecoder/web/service/impl/tree/TreeNodeServiceImpl.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.common.util.DateUtil;
-import cn.seecoder.core.commit.CommitState;
+import cn.seecoder.web.commit.CommitState;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;

web/src/main/java/cn/seecoder/web/service/project/BugListService.java

@@ -1,6 +1,6 @@
 package cn.seecoder.web.service.project;
 
-import cn.seecoder.core.commit.CommitState;
+import cn.seecoder.web.commit.CommitState;
 import cn.seecoder.web.model.vo.project.BugListCreateVO;
 import cn.seecoder.web.model.vo.project.BugListUpdateBasicVO;
 import cn.seecoder.web.model.vo.project.BugListVO;

web/src/main/java/cn/seecoder/web/service/tree/TreeNodeService.java

@@ -7,7 +7,7 @@ import cn.seecoder.web.model.vo.tree.TreeNodeCreateVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeUpdateBasicVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeVO;
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.core.commit.CommitState;
+import cn.seecoder.web.commit.CommitState;
 
 import java.util.List;
 

web/src/test/java/cn/seecoder/web/dao/pipeline/PipelineMapperTest.java

@@ -6,7 +6,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import cn.seecoder.core.pipeline.template.PipelineTemplateTable;
+import cn.seecoder.web.pipeline.template.PipelineTemplateTable;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
 
 /**