diff --git a/op-modules/op-sap/install-sap-jar.bat b/op-modules/op-sap/install-sap-jar.bat index 9652b770..c213decf 100644 --- a/op-modules/op-sap/install-sap-jar.bat +++ b/op-modules/op-sap/install-sap-jar.bat @@ -1,2 +1,2 @@ -call mvn install:install-file -Dfile=sapjco3.jar -DgroupId=com.sap -DartifactId=sapjco3 -Dversion=1.0.0 -Dpackaging=jar +call mvn install:install-file -Dfile=sapjco-3.0.8.jar -DgroupId=com.sap.conn -DartifactId=sapjco -Dversion=3.0.8 -Dpackaging=jar @pause \ No newline at end of file diff --git a/op-modules/op-sap/install.bat b/op-modules/op-sap/install.bat new file mode 100644 index 00000000..95745d7f --- /dev/null +++ b/op-modules/op-sap/install.bat @@ -0,0 +1,5 @@ +@echo ----------------------------------------------------------------------------- +@echo 将工程打包 +@echo ----------------------------------------------------------------------------- +call mvn clean install -Dmaven.test.skip=true +@pause \ No newline at end of file diff --git a/op-modules/op-sap/pom.xml b/op-modules/op-sap/pom.xml index cec3f9b6..88c22724 100644 --- a/op-modules/op-sap/pom.xml +++ b/op-modules/op-sap/pom.xml @@ -90,12 +90,11 @@ - com.sap - sapjco3 - 1.0.0 - - - + com.sap.conn + sapjco + 3.0.8 + + junit junit diff --git a/op-modules/op-sap/push-sap.bat b/op-modules/op-sap/push-sap.bat index 81d7c058..020feba3 100644 --- a/op-modules/op-sap/push-sap.bat +++ b/op-modules/op-sap/push-sap.bat @@ -1,36 +1,33 @@ @echo off -echo --------------------------------×Ô¶¨Òå²ÎÊý£¬Æô¶¯Ç°ÏÈÐÞ¸Ä-------------------------------------- +echo --------------------------------�Զ������������ǰ���޸�-------------------------------------- set jarName=op-modules-sap.jar set profile=dev set imageURI=192.168.202.36:30002/op-lanju/op-sap -rem echo »ñÈ¡µ±Ç°ÈÕÆÚ×Ö·û´® +rem echo ��ȡ��ǰ�����ַ��� for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c -rem echo »ñÈ¡µ±Ç°Ê±¼ä×Ö·û´® +rem echo ��ȡ��ǰʱ���ַ��� for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b -rem echo È統ǰСʱСÓÚ10£¬½«¿Õ¸ñÌ滻Ϊ0 +rem echo �統ǰСʱС��10�����ո��滻Ϊ0 set T=%T: =0% -rem echo ÏÔʾÊä³öÈÕÆÚʱ¼ä×Ö·û´® +rem echo ��ʾ�������ʱ���ַ��� set imageVersion=%D%%T% -::Êä³ö·¢°æÐÅÏ¢ -echo jar°üÃû³Æ:%jarName% -echo Æô¶¯»·¾³:%profile% -echo ¾µÏñ¿âµØÖ·:%imageURI% -echo ¾µÏñ°æ±¾:%imageVersion% +::���������Ϣ +echo jar������:%jarName% +echo ��������:%profile% +echo ������ַ:%imageURI% +echo ����汾:%imageVersion% echo --------------------------------mvn package...-------------------------------- ::call mvn clean package -Dmaven.test.skip=true copy .\libsapjco3.so .\target\libsapjco3.so -copy .\sapjco3.jar .\target\sapjco3.jar cd .\target SET df=Dockerfile if exist %df% ( del /f /s /q .\Dockerfile ) -echo --------------------------------´´½¨Dockerfile-------------------------------- +echo --------------------------------����Dockerfile-------------------------------- echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile -::echo RUN apk add libuuid libuuid-devel >> Dockerfile echo ADD libsapjco3.so /usr/lib/libsapjco3.so >> Dockerfile -echo ADD sapjco3.jar /usr/lib/sapjco3.jar >> Dockerfile echo RUN chmod a+x -R /usr/lib/libsapjco3.so >> Dockerfile echo ENV LD_LIBRARY_PATH /usr/lib >> Dockerfile echo COPY %jarName% /application.jar >> Dockerfile diff --git a/op-modules/op-sap/sapjco-3.0.8.jar b/op-modules/op-sap/sapjco-3.0.8.jar new file mode 100644 index 00000000..5974792d Binary files /dev/null and b/op-modules/op-sap/sapjco-3.0.8.jar differ diff --git a/op-modules/op-sap/src/main/lib/sapjco3.jar b/op-modules/op-sap/src/main/lib/sapjco3.jar deleted file mode 100644 index 8f123918..00000000 Binary files a/op-modules/op-sap/src/main/lib/sapjco3.jar and /dev/null differ