From fd1bf720fc7bd0e4ebcc58b53c17bd1b18d50c1d Mon Sep 17 00:00:00 2001
From: yinhao <yinhao@tuhu.cn>
Date: Tue, 12 Jul 2022 08:38:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 backend-src/pom.xml                           | 24 +++++++++++++++++++
 .../src/main/resources/application.yaml       |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9bdd3ba..dbf41b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,3 +113,4 @@ backend-src/src/main/resources/static/
 front-src/*
 admin/build
 /backend-src/docker.iml
+/backend-src/src/main/resources/application-local.yaml
diff --git a/backend-src/pom.xml b/backend-src/pom.xml
index c005fde..ecf9920 100644
--- a/backend-src/pom.xml
+++ b/backend-src/pom.xml
@@ -160,6 +160,30 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>local</id>
+            <properties>
+                <profile.active>local</profile.active>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profile.active>dev</profile.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profile.active>prod</profile.active>
+            </properties>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>
diff --git a/backend-src/src/main/resources/application.yaml b/backend-src/src/main/resources/application.yaml
index caf4dfc..d769067 100644
--- a/backend-src/src/main/resources/application.yaml
+++ b/backend-src/src/main/resources/application.yaml
@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
\ No newline at end of file
+    active: @profile.active@
\ No newline at end of file
-- 
Gitee


From c855045c1c5bae88c2c4618f8dca9f5b4be7b06d Mon Sep 17 00:00:00 2001
From: yinhao <yinhao@tuhu.cn>
Date: Tue, 12 Jul 2022 08:42:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4.idea=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend-src/.gitignore          | 104 ++++++++++++++++
 backend-src/.idea/workspace.xml | 208 --------------------------------
 2 files changed, 104 insertions(+), 208 deletions(-)
 create mode 100644 backend-src/.gitignore
 delete mode 100644 backend-src/.idea/workspace.xml

diff --git a/backend-src/.gitignore b/backend-src/.gitignore
new file mode 100644
index 0000000..87159db
--- /dev/null
+++ b/backend-src/.gitignore
@@ -0,0 +1,104 @@
+# Created by .ignore support plugin (hsz.mobi)
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+**/.idea
+**/target
diff --git a/backend-src/.idea/workspace.xml b/backend-src/.idea/workspace.xml
deleted file mode 100644
index fde92d4..0000000
--- a/backend-src/.idea/workspace.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="8e8f7444-9d77-4729-a0d5-d770e2d44d0d" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/simpleDocker.iml" beforeDir="false" afterPath="$PROJECT_DIR$/simpleDocker.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/simpledocker/config/DockerClientFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/simpledocker/config/DockerClientFactory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/simpledocker/config/WebSocketConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/simpledocker/config/WebSocketConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/simpledocker/ws/ContainerTerminalWebSocket.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/simpledocker/ws/ContainerTerminalWebSocket.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/simpledocker/ws/ImagePullWebSocket.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/simpledocker/ws/ImagePullWebSocket.java" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CodeInsightWorkspaceSettings">
-    <option name="optimizeImportsOnTheFly" value="true" />
-  </component>
-  <component name="CodeStyleSettingsInfer">
-    <option name="done" value="true" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Interface" />
-        <option value="Enum" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="GitSEFilterConfiguration">
-    <file-type-list>
-      <filtered-out-file-type name="LOCAL_BRANCH" />
-      <filtered-out-file-type name="REMOTE_BRANCH" />
-      <filtered-out-file-type name="TAG" />
-      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
-    </file-type-list>
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="jar://$MAVEN_REPOSITORY$/com/github/docker-java/docker-java-api/3.2.12/docker-java-api-3.2.12-sources.jar!/com/github/dockerjava/api/command/SyncDockerCmd.java" root0="SKIP_INSPECTION" />
-    <setting file="jar://$MAVEN_REPOSITORY$/com/github/docker-java/docker-java-transport-httpclient5/3.2.12/docker-java-transport-httpclient5-3.2.12.jar!/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.class" root0="SKIP_INSPECTION" />
-    <setting file="jar://$USER_HOME$/Library/Java/JavaVirtualMachines/openjdk-17.0.1/Contents/Home/lib/src.zip!/java.base/java/io/PipedOutputStream.java" root0="SKIP_INSPECTION" />
-    <setting file="jar://$MAVEN_REPOSITORY$/com/github/docker-java/docker-java-api/3.2.12/docker-java-api-3.2.12-sources.jar!/com/github/dockerjava/api/command/LogContainerCmd.java" root0="SKIP_INSPECTION" />
-    <setting file="jar://$USER_HOME$/Library/Java/JavaVirtualMachines/openjdk-17.0.1/Contents/Home/lib/src.zip!/java.base/sun/nio/ch/SocketChannelImpl.java" root0="SKIP_INSPECTION" />
-    <setting file="jar://$MAVEN_REPOSITORY$/com/github/docker-java/docker-java-transport-httpclient5/3.2.12/docker-java-transport-httpclient5-3.2.12.jar!/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.class" root0="SKIP_INSPECTION" />
-    <setting file="jar://$MAVEN_REPOSITORY$/com/github/docker-java/docker-java-transport/3.2.12/docker-java-transport-3.2.12.jar!/com/github/dockerjava/transport/DockerHttpClient.class" root0="SKIP_INSPECTION" />
-    <setting file="jar://$MAVEN_REPOSITORY$/com/github/docker-java/docker-java-transport-httpclient5/3.2.12/docker-java-transport-httpclient5-3.2.12.jar!/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.class" root0="SKIP_INSPECTION" />
-  </component>
-  <component name="ProjectCodeStyleSettingsMigration">
-    <option name="version" value="1" />
-  </component>
-  <component name="ProjectId" id="21pIV8JJK2uCTDTTuZRdBucX0iQ" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="autoscrollFromSource" value="true" />
-    <option name="autoscrollToSource" value="true" />
-    <option name="showLibraryContents" value="true" />
-    <option name="showModules" value="false" />
-    <option name="showVisibilityIcons" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="add_unversioned_files" value="$PROJECT_DIR$/src/main/java/com/example/simpledocker/SimpleDockerApplication.java&#10;/Users/eleme/Workspace/code/GoPath/SimpleDocker/back-src/src/main/java/com/example/simpledocker/config/DockerContext.java&#10;/Users/eleme/Workspace/code/GoPath/SimpleDocker/back-src/src/main/java/com/example/simpledocker/controller/InfoController.java&#10;/Users/eleme/Workspace/code/GoPath/SimpleDocker/back-src/src/main/java/com/example/simpledocker/config/SpringConfig.java&#10;/Users/eleme/Workspace/code/GoPath/SimpleDocker/back-src/src/main/java/com/example/simpledocker/config/DockerClientFactory.java&#10;/Users/eleme/Workspace/code/GoPath/SimpleDocker/back-src/src/main/java/com/example/simpledocker/controller/ImageControllerController.java&#10;/Users/eleme/Workspace/code/GoPath/SimpleDocker/back-src/src/main/java/com/example/simpledocker/config/WebSocketConfig.java&#10;/Users/eleme/Workspace/code/GoPath/SimpleDocker/back-src/src/main/java/com/example/simpledocker/ws/ContainerTerminalWebSocket.java" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="go.import.settings.migrated" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.091575086" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/main/resources/static" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="" />
-      <recent name="com.example.simpledocker.controller" />
-      <recent name="com.example.simpledocker.ws" />
-      <recent name="com.example.simpledocker.controller.image" />
-      <recent name="com.example.simpledocker.config" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Application.WebSocketConfig">
-    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Main" />
-      <module name="simpleDocker" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="Main2" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Main2" />
-      <module name="simpleDocker" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="WebSocketConfig" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.example.simpledocker.config.WebSocketConfig" />
-      <module name="simpleDocker" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.example.simpledocker.config.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="SimpleDockerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true">
-      <module name="simpleDocker" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.example.simpledocker.SimpleDockerApplication" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.WebSocketConfig" />
-        <item itemvalue="Spring Boot.SimpleDockerApplication" />
-        <item itemvalue="Application.Main2" />
-        <item itemvalue="Application.Main" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="8e8f7444-9d77-4729-a0d5-d770e2d44d0d" name="Default Changelist" comment="" />
-      <created>1638631623644</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1638631623644</updated>
-      <workItem from="1638631625084" duration="7427000" />
-      <workItem from="1638640370204" duration="5733000" />
-      <workItem from="1638672303471" duration="360000" />
-      <workItem from="1638686796452" duration="481000" />
-      <workItem from="1638687482748" duration="5025000" />
-      <workItem from="1638714000547" duration="28252000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="LIMIT_HISTORY" value="false" />
-    <ignored-roots>
-      <path value="$PROJECT_DIR$" />
-    </ignored-roots>
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/example/simpledocker/ws/ContainerTerminalWebSocket.java</url>
-          <line>100</line>
-          <option name="timeStamp" value="32" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>
\ No newline at end of file
-- 
Gitee