From 0a3f2e91ad29090ba22a4f74964e34b32a11e491 Mon Sep 17 00:00:00 2001 From: tndev Date: Fri, 2 Aug 2024 02:40:50 +0800 Subject: [PATCH 1/6] md --- build_local.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 build_local.sh diff --git a/build_local.sh b/build_local.sh new file mode 100644 index 0000000..750510f --- /dev/null +++ b/build_local.sh @@ -0,0 +1,4 @@ +git pull +mvn clean package -Dmaven.test.skip=true +#mvn clean deploy -DskipTests -Dmaven.test.skip=true +mvn install From 6ba128a8998301297f8120488e66203e87864ea7 Mon Sep 17 00:00:00 2001 From: tndev Date: Fri, 2 Aug 2024 02:44:33 +0800 Subject: [PATCH 2/6] md --- build_local.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_local.sh b/build_local.sh index 750510f..1f75be9 100644 --- a/build_local.sh +++ b/build_local.sh @@ -1,4 +1,5 @@ git pull +mkdir -p emis-server/pub mvn clean package -Dmaven.test.skip=true #mvn clean deploy -DskipTests -Dmaven.test.skip=true mvn install From ba48c60fefa0cce68f0b2e888f05d9f220f670c3 Mon Sep 17 00:00:00 2001 From: tndev Date: Fri, 2 Aug 2024 02:45:21 +0800 Subject: [PATCH 3/6] md --- build_local.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/build_local.sh b/build_local.sh index 1f75be9..34936b6 100644 --- a/build_local.sh +++ b/build_local.sh @@ -1,5 +1,13 @@ -git pull -mkdir -p emis-server/pub +rm -rf emis-server/pub +mkdir emis-server/pub + +rm -rf pub +mkdir pub + mvn clean package -Dmaven.test.skip=true -#mvn clean deploy -DskipTests -Dmaven.test.skip=true -mvn install + +cp -rf emis-server/pub/* ./pub/ + +# docker k8s +cp Dockerfile ./pub/ +cp docker_build.sh ./pub/ From 867137f9913dc4b49f2730bbe320477962bc0861 Mon Sep 17 00:00:00 2001 From: tndev Date: Fri, 2 Aug 2024 03:35:19 +0800 Subject: [PATCH 4/6] md --- config/app.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/app.properties b/config/app.properties index 19b9e6d..c2f06ae 100644 --- a/config/app.properties +++ b/config/app.properties @@ -19,7 +19,8 @@ server.undertow.threads.worker=258 #DataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://192.168.88.23:31306/tnemis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +#spring.datasource.url=jdbc:mysql://192.168.88.23:31306/tnemis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +spring.datasource.url=jdbc:mysql://rm-uf61f7vi74nqis6q6fo.mysql.rds.aliyuncs.com:3306/tnemis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 spring.datasource.username=tnemis spring.datasource.password=Tne2780)*&@ From 2f4c11ca8f8a1f1e252b052f368831e1367e3c6e Mon Sep 17 00:00:00 2001 From: tndev Date: Fri, 2 Aug 2024 03:36:51 +0800 Subject: [PATCH 5/6] md --- config/app.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.properties b/config/app.properties index c2f06ae..986468c 100644 --- a/config/app.properties +++ b/config/app.properties @@ -19,8 +19,8 @@ server.undertow.threads.worker=258 #DataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.url=jdbc:mysql://192.168.88.23:31306/tnemis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -spring.datasource.url=jdbc:mysql://rm-uf61f7vi74nqis6q6fo.mysql.rds.aliyuncs.com:3306/tnemis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +spring.datasource.url=jdbc:mysql://192.168.88.23:31306/tnemis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +#spring.datasource.url=jdbc:mysql://rm-uf61f7vi74nqis6q6fo.mysql.rds.aliyuncs.com:3306/tnemis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 spring.datasource.username=tnemis spring.datasource.password=Tne2780)*&@ From 7694497c1e18fbeca70136596d8c012c1513078d Mon Sep 17 00:00:00 2001 From: tndev Date: Fri, 2 Aug 2024 04:10:59 +0800 Subject: [PATCH 6/6] md --- docker_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_build.sh b/docker_build.sh index 27ee49b..5ac81d9 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -2,7 +2,7 @@ PUB_VERSION=3.0.0 docker build -t emis/emis-server:$PUB_VERSION . -#docker run -it -d --name emis-server -p 19088:9088 emis/emis-server:latest +#docker run -it -d --network=host --name emis-server -p 19088:9088 emis/emis-server:latest # -- docker push to hub.k8s.loc -- docker tag emis/emis-server:$PUB_VERSION hub.k8s.loc/emis/emis-server:latest