Merge remote-tracking branch 'origin/master'

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

op-modules/op-sap/install.bat

@@ -0,0 +1,5 @@
+@echo -----------------------------------------------------------------------------
+@echo 将工程打包
+@echo -----------------------------------------------------------------------------
+call mvn clean install -Dmaven.test.skip=true
+@pause

op-modules/op-sap/pom.xml

@@ -90,12 +90,11 @@
         </dependency>
         <!-- SAP JOC 3 -->
         <dependency>
-            <groupId>com.sap</groupId>
+			<groupId>com.sap.conn</groupId>
-            <artifactId>sapjco3</artifactId>
+			<artifactId>sapjco</artifactId>
-            <version>1.0.0</version>
+			<version>3.0.8</version>
-            <!--            <scope>system</scope>-->
+		</dependency>
-            <!--            <systemPath>${project.basedir}/src/main/lib/sapjco3.jar</systemPath>-->
+		
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

op-modules/op-sap/push-sap.bat

@@ -1,36 +1,33 @@
 @echo off
-echo --------------------------------自定义参数，启动前先修改--------------------------------------
+echo --------------------------------<EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD>--------------------------------------
 set jarName=op-modules-sap.jar
 set profile=dev
 set imageURI=192.168.202.36:30002/op-lanju/op-sap
-rem echo 获取当前日期字符串
+rem echo <EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>
 for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
-rem echo 获取当前时间字符串
+rem echo <EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ǰʱ<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>
 for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
-rem echo 如当前小时小于10，将空格替换为0
+rem echo <EFBFBD>統ǰСʱС<EFBFBD><EFBFBD>10<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ո<EFBFBD><EFBFBD>滻Ϊ0
 set T=%T: =0%
-rem echo 显示输出日期时间字符串
+rem echo <EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>
 set imageVersion=%D%%T%
-::输出发版信息
+::<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
-echo jar包名称:%jarName%
+echo jar<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%jarName%
-echo 启动环境:%profile%
+echo <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%profile%
-echo 镜像库地址:%imageURI%
+echo <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%imageURI%
-echo 镜像版本:%imageVersion%
+echo <EFBFBD><EFBFBD><EFBFBD><EFBFBD>汾:%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 --------------------------------<EFBFBD><EFBFBD><EFBFBD><EFBFBD>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