From d737c89e19e739720b8cfcdad605d9dece5b39dd Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Wed, 2 Nov 2022 11:28:07 -0400 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=92=8C=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/docker-compose.yaml | 14 ++++++++++++++ deploy/site.yml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 deploy/docker-compose.yaml create mode 100644 deploy/site.yml diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml new file mode 100644 index 0000000..2df749f --- /dev/null +++ b/deploy/docker-compose.yaml @@ -0,0 +1,14 @@ +version: '3' +services: + web: + image: repo-docker.ossez.com/docker-hub/usvisartrackapi:0.0.2-snapshot + container_name: usvisatrackapi + restart: unless-stopped + ports: + - "8383:8282" + environment: + - APP_DATABASE_HOST=54.39.157.60 + - APP_DATABASE_PORT=3306 + - APP_DATABASE_NAME=usvisatrack + - APP_DATABASE_USERNAME=root + - APP_DATABASE_PASSWORD=ETNN0sqc1qMbgQaeGKWL \ No newline at end of file diff --git a/deploy/site.yml b/deploy/site.yml new file mode 100644 index 0000000..b3d8af7 --- /dev/null +++ b/deploy/site.yml @@ -0,0 +1,30 @@ +# This is your main playbook you will run with: +# ansible-playbook site.yml +# You can kick off everything from this playbook. +# Or, you can create separate playbooks in this directory for specific orchestration events. + +--- +- name: apply common configuration to all nodes + hosts: all +# user: root + + tasks: + - name: copy file at root dir of flash in slot 3 of sw1(ios) + ansible.builtin.copy: + src: docker-compose.yaml + dest: /home/app/usvisatrackapi/docker-compose.yaml + + - name: Docker Pull + ansible.builtin.shell: + cmd: sudo docker compose pull + chdir: /home/app/usvisatrackapi/ + + - name: Docker Remove Orphans + ansible.builtin.shell: + cmd: docker compose up -d --remove-orphans + chdir: /home/app/usvisatrackapi/ + +# - name: Docker Image Prune +# ansible.builtin.shell: +# cmd: docker image prune +# chdir: /home/app/usvisatrackapi/ \ No newline at end of file From 4297a5141f8a11c375ee8d8e9db0d81bd52e1732 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 3 Nov 2022 22:25:44 -0400 Subject: [PATCH 2/6] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=85=8D=E7=BD=AE=20Docker=20=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml index 2df749f..135cefb 100644 --- a/deploy/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: web: - image: repo-docker.ossez.com/docker-hub/usvisartrackapi:0.0.2-snapshot + image: repo-docker.ossez.com/docker-hub/usvisartrackapi:0.0.3-snapshot container_name: usvisatrackapi restart: unless-stopped ports: From 5e75195b7a07b196ccdeb470847ec09640c48a48 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 3 Nov 2022 22:27:33 -0400 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml index 135cefb..d5a02ca 100644 --- a/deploy/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: web: - image: repo-docker.ossez.com/docker-hub/usvisartrackapi:0.0.3-snapshot + image: repo-docker.ossez.com/docker-hub/usvisartrackapi:0.0.3-SNAPSHOT container_name: usvisatrackapi restart: unless-stopped ports: From 27529eaec34924906bad235c8c0608a05791068d Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 3 Nov 2022 23:46:55 -0400 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E9=83=A8=E7=BD=B2=E7=89=88=E6=9C=AC=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/application-prod.yaml b/src/main/resources/application-prod.yaml index c4e8b05..c929265 100644 --- a/src/main/resources/application-prod.yaml +++ b/src/main/resources/application-prod.yaml @@ -1,6 +1,6 @@ -server: - ssl: - key-store: classpath:keystore.p12 - key-store-password: 123456 - key-store-type: PKCS12 - key-alias: tomcat \ No newline at end of file +#server: +# ssl: +# key-store: classpath:keystore.p12 +# key-store-password: 123456 +# key-store-type: PKCS12 +# key-alias: tomcat \ No newline at end of file From 628d8e428e2f435e0ae42db2fbdd54e10aef67fc Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Fri, 4 Nov 2022 00:04:13 -0400 Subject: [PATCH 5/6] =?UTF-8?q?=E5=B0=86=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=A7=BB=E5=8A=A8=E5=88=B0=20Deploy=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index a2ee4a1..0000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# yaml 配置实例 -version: '3' -services: - web: - image: usvisartrackapi:0.0.2-snapshot - container_name: usvisatrackapi - restart: unless-stopped - ports: - - "8383:8282" - environment: - - APP_DATABASE_HOST=54.39.157.60 - - APP_DATABASE_PORT=3306 - - APP_DATABASE_NAME=usvisatrack - - APP_DATABASE_USERNAME=root - - APP_DATABASE_PASSWORD=ETNN0sqc1qMbgQaeGKWL - - CRAWL_USEPROXY=true - From 1c9bb043cfa78d8e875802cb72c71d9a63bca8ff Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Fri, 4 Nov 2022 00:08:56 -0400 Subject: [PATCH 6/6] =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=B5=8B=E8=AF=95=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=8A=8A=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=20Maven=20POM=20=E6=96=87=E4=BB=B6=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../northtecom/visatrack/api/config/SpringDocConfig.java | 8 ++++---- src/main/resources/application.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/northtecom/visatrack/api/config/SpringDocConfig.java b/src/main/java/com/northtecom/visatrack/api/config/SpringDocConfig.java index 5a242b3..c89a729 100644 --- a/src/main/java/com/northtecom/visatrack/api/config/SpringDocConfig.java +++ b/src/main/java/com/northtecom/visatrack/api/config/SpringDocConfig.java @@ -46,12 +46,12 @@ public class SpringDocConfig { return new OpenAPI().components(components) .info(new Info() .title(applicationTitle) - .description("Us Visa Track API") + .description("UsVisaTrack API") .version("v" + applicationVerison) - .license(new License().name("Apache 2.0").url("https://www.apache.org/licenses/LICENSE-2.0"))) + .license(new License().name("MIT License").url("https://opensource.org/licenses/mit-license.php"))) .externalDocs(new ExternalDocumentation() - .description("Us Visa Track API Documentation") - .url("https://about.gitlab.com/")) + .description("UsVisaTrack API Support and Documentation") + .url("https://www.visafn.com/")) .addSecurityItem(securityRequirement); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index aff0897..4373dce 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -30,8 +30,8 @@ spring: active: prod application: name: usvisatrack - title: Us Visa Track API - version: 1.1.7 + title: UsVisaTrack API + version: 0.0.3 jackson: mapper: accept-case-insensitive-properties: true