From 31ab3ee863f5a243f24274c63fe06b1c27f96309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E9=B8=A3?= <wangyiming@zhehekeji.com>
Date: Thu, 20 Aug 2020 17:56:55 +0800
Subject: [PATCH] init

---
 .idea/.name                                   |  1 -
 .idea/compiler.xml                            | 21 -------------------
 .idea/encodings.xml                           |  4 ----
 .../roles/springbootstart-test/tasks/main.yml | 12 +++++------
 playbook/test-hosts                           |  2 +-
 playbook/test.yml                             |  2 +-
 6 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/compiler.xml

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 465eca3..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-springbootstart
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 1c7d7c9..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="common" />
-        <module name="filter" />
-        <module name="springbootstart-web" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="filter" options="-parameters" />
-      <module name="springbootstart-web" options="-parameters" />
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index c8ff0fb..e79da7e 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,9 +2,5 @@
 <project version="4">
   <component name="Encoding" addBOMForNewFiles="with NO BOM">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/modules" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/modules/common" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/modules/filter" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/web" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/playbook/roles/springbootstart-test/tasks/main.yml b/playbook/roles/springbootstart-test/tasks/main.yml
index d4ec19b..bec9ce0 100644
--- a/playbook/roles/springbootstart-test/tasks/main.yml
+++ b/playbook/roles/springbootstart-test/tasks/main.yml
@@ -1,22 +1,22 @@
 ---
-- name: Ensures /home/work/springbootstart/springbootstart_backend_test dir exists
-  file: path=/home/work/springbootstart/springbootstart_backend_test state=directory
+- name: Ensures /home/work/lia/duoji_test dir exists
+  file: path=/home/work/lipo/duoji_test state=directory
 
 - name: stop admin Service
-  shell: docker-compose -f /home/work/springbootstart/springbootstart_backend_test/docker-compose.yml down
+  shell: docker-compose -f /home/work/lia/duoji_test/docker-compose.yml down
   ignore_errors: True
 
 - name: copy admin docker-compose.yml
   copy:
     src: docker-compose.yml
-    dest: /home/work/springbootstart/springbootstart_backend_test/docker-compose.yml
+    dest: /home/work/lia/duoji_test/docker-compose.yml
     backup: yes
 
 - name: docker-pull
   shell: docker pull {{ DOCKER_REPO }}/{{ IMAGE }} && docker tag {{ DOCKER_REPO }}/{{ IMAGE }} {{ IMAGE }} && docker rmi {{ DOCKER_REPO }}/{{ IMAGE }}
 
 - name: modify docker-compose.yml
-  shell: cd /home/work/springbootstart/springbootstart_backend_test && sed -i "s/springbootstart:1.0.0/{{ IMAGE }}/g" docker-compose.yml
+  shell: cd /home/work/lia/duoji_test && sed -i "s/springbootstart:1.0.0/{{ IMAGE }}/g" docker-compose.yml
 
 - name: start Service
-  shell: docker-compose -f /home/work/springbootstart/springbootstart_backend_test/docker-compose.yml up -d
+  shell: docker-compose -f /home/work/lia/duoji_test/docker-compose.yml up -d
diff --git a/playbook/test-hosts b/playbook/test-hosts
index cb9b43a..3a97d0f 100644
--- a/playbook/test-hosts
+++ b/playbook/test-hosts
@@ -1 +1 @@
-192.168.1.232
\ No newline at end of file
+192.168.26.214
diff --git a/playbook/test.yml b/playbook/test.yml
index 4b90468..3159f60 100644
--- a/playbook/test.yml
+++ b/playbook/test.yml
@@ -1,6 +1,6 @@
 ---
 - name: deploy springbootstart
   hosts: all
-  remote_user: work
+  remote_user: root
   roles:
   - springbootstart-test