From e40d41f1f97eb926fad9c81d6dccc967bcc7694c Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 13 Dec 2023 11:38:13 +0800 Subject: [PATCH] init --- Dockerfile | 2 +- build.sh | 6 +++--- docker_build.sh | 8 ++++---- {emis-server => emis-oms-server}/pom.xml | 4 ++-- {emis-server => emis-oms-server}/pom_proguard.xml | 0 {emis-server => emis-oms-server}/proguard.cfg | 0 .../main/java/com/xdadan/erp/LaunchApplication.java | 0 .../com/xdadan/erp/LaunchServletInitializer.java | 0 .../java/com/xdadan/erp/mq/nats/NatsConfig.java | 0 .../com/xdadan/erp/mq/nats/NatsMessageListener.java | 0 .../java/com/xdadan/erp/mq/nats/NatsProperties.java | 0 .../java/com/xdadan/erp/tst/TestController.java | 0 .../resources/META-INF/spring-devtools.properties | 0 .../src/main/resources/application_local.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/i18n/messages.properties | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/mybatis/mybatis-config.xml | 0 .../src/main/resources/static/images/slidepic_1.jpg | Bin .../src/main/resources/static/images/slidepic_2.jpg | Bin .../src/main/resources/static/images/slidepic_3.jpg | Bin .../src/main/resources/static/images/slidepic_4.jpg | Bin .../src/main/resources/static/images/slidepic_5.jpg | Bin .../src/main/resources/static/images/slidepic_6.jpg | Bin .../src/main/resources/static/images/slidepic_7.jpg | Bin pom.xml | 6 +++--- startup.sh | 8 ++++---- 27 files changed, 17 insertions(+), 17 deletions(-) rename {emis-server => emis-oms-server}/pom.xml (98%) rename {emis-server => emis-oms-server}/pom_proguard.xml (100%) rename {emis-server => emis-oms-server}/proguard.cfg (100%) rename {emis-server => emis-oms-server}/src/main/java/com/xdadan/erp/LaunchApplication.java (100%) rename {emis-server => emis-oms-server}/src/main/java/com/xdadan/erp/LaunchServletInitializer.java (100%) rename {emis-server => emis-oms-server}/src/main/java/com/xdadan/erp/mq/nats/NatsConfig.java (100%) rename {emis-server => emis-oms-server}/src/main/java/com/xdadan/erp/mq/nats/NatsMessageListener.java (100%) rename {emis-server => emis-oms-server}/src/main/java/com/xdadan/erp/mq/nats/NatsProperties.java (100%) rename {emis-server => emis-oms-server}/src/main/java/com/xdadan/erp/tst/TestController.java (100%) rename {emis-server => emis-oms-server}/src/main/resources/META-INF/spring-devtools.properties (100%) rename {emis-server => emis-oms-server}/src/main/resources/application_local.yml (100%) rename {emis-server => emis-oms-server}/src/main/resources/banner.txt (100%) rename {emis-server => emis-oms-server}/src/main/resources/i18n/messages.properties (100%) rename {emis-server => emis-oms-server}/src/main/resources/logback.xml (100%) rename {emis-server => emis-oms-server}/src/main/resources/mybatis/mybatis-config.xml (100%) rename {emis-server => emis-oms-server}/src/main/resources/static/images/slidepic_1.jpg (100%) rename {emis-server => emis-oms-server}/src/main/resources/static/images/slidepic_2.jpg (100%) rename {emis-server => emis-oms-server}/src/main/resources/static/images/slidepic_3.jpg (100%) rename {emis-server => emis-oms-server}/src/main/resources/static/images/slidepic_4.jpg (100%) rename {emis-server => emis-oms-server}/src/main/resources/static/images/slidepic_5.jpg (100%) rename {emis-server => emis-oms-server}/src/main/resources/static/images/slidepic_6.jpg (100%) rename {emis-server => emis-oms-server}/src/main/resources/static/images/slidepic_7.jpg (100%) diff --git a/Dockerfile b/Dockerfile index 56f5ddb..291aa2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ADD config/app.properties /opt/config/app.properties ADD config.properties /opt/config.properties ADD logback-spring.xml /opt/logback-spring.xml -ADD emis-server.jar /opt/app.jar +ADD emis-oms-server.jar /opt/app.jar WORKDIR /opt diff --git a/build.sh b/build.sh index 34936b6..ede361a 100644 --- a/build.sh +++ b/build.sh @@ -1,12 +1,12 @@ -rm -rf emis-server/pub -mkdir emis-server/pub +rm -rf emis-oms-server/pub +mkdir emis-oms-server/pub rm -rf pub mkdir pub mvn clean package -Dmaven.test.skip=true -cp -rf emis-server/pub/* ./pub/ +cp -rf emis-oms-server/pub/* ./pub/ # docker k8s cp Dockerfile ./pub/ diff --git a/docker_build.sh b/docker_build.sh index 27ee49b..9e3e8e0 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -1,14 +1,14 @@ PUB_VERSION=3.0.0 -docker build -t emis/emis-server:$PUB_VERSION . +docker build -t emis/emis-oms-server:$PUB_VERSION . -#docker run -it -d --name emis-server -p 19088:9088 emis/emis-server:latest +#docker run -it -d --name emis-oms-server -p 19088:9088 emis/emis-oms-server:latest # -- docker push to hub.k8s.loc -- -docker tag emis/emis-server:$PUB_VERSION hub.k8s.loc/emis/emis-server:latest +docker tag emis/emis-oms-server:$PUB_VERSION hub.k8s.loc/emis/emis-oms-server:latest #docker login hub.k8s.loc # admin 123456 -docker push hub.k8s.loc/emis/emis-server:latest +docker push hub.k8s.loc/emis/emis-oms-server:latest # -- k8s -- # kubectl apply -f k8s.yml diff --git a/emis-server/pom.xml b/emis-oms-server/pom.xml similarity index 98% rename from emis-server/pom.xml rename to emis-oms-server/pom.xml index 4392eb1..fc7bd08 100644 --- a/emis-server/pom.xml +++ b/emis-oms-server/pom.xml @@ -10,10 +10,10 @@ ../pom.xml jar - emis-server + emis-oms-server 1.0.0 - emis web 服务入口 + emis oms web 服务入口 8 diff --git a/emis-server/pom_proguard.xml b/emis-oms-server/pom_proguard.xml similarity index 100% rename from emis-server/pom_proguard.xml rename to emis-oms-server/pom_proguard.xml diff --git a/emis-server/proguard.cfg b/emis-oms-server/proguard.cfg similarity index 100% rename from emis-server/proguard.cfg rename to emis-oms-server/proguard.cfg diff --git a/emis-server/src/main/java/com/xdadan/erp/LaunchApplication.java b/emis-oms-server/src/main/java/com/xdadan/erp/LaunchApplication.java similarity index 100% rename from emis-server/src/main/java/com/xdadan/erp/LaunchApplication.java rename to emis-oms-server/src/main/java/com/xdadan/erp/LaunchApplication.java diff --git a/emis-server/src/main/java/com/xdadan/erp/LaunchServletInitializer.java b/emis-oms-server/src/main/java/com/xdadan/erp/LaunchServletInitializer.java similarity index 100% rename from emis-server/src/main/java/com/xdadan/erp/LaunchServletInitializer.java rename to emis-oms-server/src/main/java/com/xdadan/erp/LaunchServletInitializer.java diff --git a/emis-server/src/main/java/com/xdadan/erp/mq/nats/NatsConfig.java b/emis-oms-server/src/main/java/com/xdadan/erp/mq/nats/NatsConfig.java similarity index 100% rename from emis-server/src/main/java/com/xdadan/erp/mq/nats/NatsConfig.java rename to emis-oms-server/src/main/java/com/xdadan/erp/mq/nats/NatsConfig.java diff --git a/emis-server/src/main/java/com/xdadan/erp/mq/nats/NatsMessageListener.java b/emis-oms-server/src/main/java/com/xdadan/erp/mq/nats/NatsMessageListener.java similarity index 100% rename from emis-server/src/main/java/com/xdadan/erp/mq/nats/NatsMessageListener.java rename to emis-oms-server/src/main/java/com/xdadan/erp/mq/nats/NatsMessageListener.java diff --git a/emis-server/src/main/java/com/xdadan/erp/mq/nats/NatsProperties.java b/emis-oms-server/src/main/java/com/xdadan/erp/mq/nats/NatsProperties.java similarity index 100% rename from emis-server/src/main/java/com/xdadan/erp/mq/nats/NatsProperties.java rename to emis-oms-server/src/main/java/com/xdadan/erp/mq/nats/NatsProperties.java diff --git a/emis-server/src/main/java/com/xdadan/erp/tst/TestController.java b/emis-oms-server/src/main/java/com/xdadan/erp/tst/TestController.java similarity index 100% rename from emis-server/src/main/java/com/xdadan/erp/tst/TestController.java rename to emis-oms-server/src/main/java/com/xdadan/erp/tst/TestController.java diff --git a/emis-server/src/main/resources/META-INF/spring-devtools.properties b/emis-oms-server/src/main/resources/META-INF/spring-devtools.properties similarity index 100% rename from emis-server/src/main/resources/META-INF/spring-devtools.properties rename to emis-oms-server/src/main/resources/META-INF/spring-devtools.properties diff --git a/emis-server/src/main/resources/application_local.yml b/emis-oms-server/src/main/resources/application_local.yml similarity index 100% rename from emis-server/src/main/resources/application_local.yml rename to emis-oms-server/src/main/resources/application_local.yml diff --git a/emis-server/src/main/resources/banner.txt b/emis-oms-server/src/main/resources/banner.txt similarity index 100% rename from emis-server/src/main/resources/banner.txt rename to emis-oms-server/src/main/resources/banner.txt diff --git a/emis-server/src/main/resources/i18n/messages.properties b/emis-oms-server/src/main/resources/i18n/messages.properties similarity index 100% rename from emis-server/src/main/resources/i18n/messages.properties rename to emis-oms-server/src/main/resources/i18n/messages.properties diff --git a/emis-server/src/main/resources/logback.xml b/emis-oms-server/src/main/resources/logback.xml similarity index 100% rename from emis-server/src/main/resources/logback.xml rename to emis-oms-server/src/main/resources/logback.xml diff --git a/emis-server/src/main/resources/mybatis/mybatis-config.xml b/emis-oms-server/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from emis-server/src/main/resources/mybatis/mybatis-config.xml rename to emis-oms-server/src/main/resources/mybatis/mybatis-config.xml diff --git a/emis-server/src/main/resources/static/images/slidepic_1.jpg b/emis-oms-server/src/main/resources/static/images/slidepic_1.jpg similarity index 100% rename from emis-server/src/main/resources/static/images/slidepic_1.jpg rename to emis-oms-server/src/main/resources/static/images/slidepic_1.jpg diff --git a/emis-server/src/main/resources/static/images/slidepic_2.jpg b/emis-oms-server/src/main/resources/static/images/slidepic_2.jpg similarity index 100% rename from emis-server/src/main/resources/static/images/slidepic_2.jpg rename to emis-oms-server/src/main/resources/static/images/slidepic_2.jpg diff --git a/emis-server/src/main/resources/static/images/slidepic_3.jpg b/emis-oms-server/src/main/resources/static/images/slidepic_3.jpg similarity index 100% rename from emis-server/src/main/resources/static/images/slidepic_3.jpg rename to emis-oms-server/src/main/resources/static/images/slidepic_3.jpg diff --git a/emis-server/src/main/resources/static/images/slidepic_4.jpg b/emis-oms-server/src/main/resources/static/images/slidepic_4.jpg similarity index 100% rename from emis-server/src/main/resources/static/images/slidepic_4.jpg rename to emis-oms-server/src/main/resources/static/images/slidepic_4.jpg diff --git a/emis-server/src/main/resources/static/images/slidepic_5.jpg b/emis-oms-server/src/main/resources/static/images/slidepic_5.jpg similarity index 100% rename from emis-server/src/main/resources/static/images/slidepic_5.jpg rename to emis-oms-server/src/main/resources/static/images/slidepic_5.jpg diff --git a/emis-server/src/main/resources/static/images/slidepic_6.jpg b/emis-oms-server/src/main/resources/static/images/slidepic_6.jpg similarity index 100% rename from emis-server/src/main/resources/static/images/slidepic_6.jpg rename to emis-oms-server/src/main/resources/static/images/slidepic_6.jpg diff --git a/emis-server/src/main/resources/static/images/slidepic_7.jpg b/emis-oms-server/src/main/resources/static/images/slidepic_7.jpg similarity index 100% rename from emis-server/src/main/resources/static/images/slidepic_7.jpg rename to emis-oms-server/src/main/resources/static/images/slidepic_7.jpg diff --git a/pom.xml b/pom.xml index 392b95f..4c513a3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,9 +8,9 @@ emis 1.0.0 - emis-server + emis-oms-server http://www.tanex56.com - emis-server + emis-oms-server 1.0.0 @@ -37,7 +37,7 @@ - emis-server + emis-oms-server pom diff --git a/startup.sh b/startup.sh index 3def9eb..7f86f7c 100644 --- a/startup.sh +++ b/startup.sh @@ -2,21 +2,21 @@ mkdir logs -ps -ef | grep emis-server.jar | grep -v color | awk '{print $2}' | xargs kill -9 +ps -ef | grep emis-oms-server.jar | grep -v color | awk '{print $2}' | xargs kill -9 #JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m #--server.port=9080 -nohup java -jar emis-server.jar >> ./logs/output.log 2>&1 & +nohup java -jar emis-oms-server.jar >> ./logs/output.log 2>&1 & # jprofiler monitor # --------------------------- -# nohup java -jar emis-server.jar -agentlib:jprofilerti=port=8849 -Xbootclasspath/a:/app/jprofiler/jprofiler11/bin/agent.jar -agentpath:/app/jprofiler/jprofiler11/bin/linux-x64/libjprofilerti.so=port=8849,nowait & +# nohup java -jar emis-oms-server.jar -agentlib:jprofilerti=port=8849 -Xbootclasspath/a:/app/jprofiler/jprofiler11/bin/agent.jar -agentpath:/app/jprofiler/jprofiler11/bin/linux-x64/libjprofilerti.so=port=8849,nowait & # jpenable # jconsole or jvisualvm # --------------------------- -#java -jar -Djava.rmi.server.hostname=192.168.88.57 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=21099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false emis-server.jar & +#java -jar -Djava.rmi.server.hostname=192.168.88.57 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=21099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false emis-oms-server.jar &