Started by user tophorsekj
Running as SYSTEM
Building in workspace /data/publish/jenkins-data/workspace/liuxingping_safeweb_prod
[liuxingping_safeweb_prod] $ /bin/sh -xe /data/setupfiles/tomcat7-8058-jdk1.8/temp/jenkins4389562573208503521.sh
+ python /data/scripts/release/liuxingping/safeweb.py '--verid=r1430 | 2023-05-16 11:02:39| mazekui | 源码版本:r14142 | 转换文件编码UTF8-BOM ' --shutdown=false
/usr/lib/python2.7/site-packages/paramiko/transport.py:33: CryptographyDeprecationWarning: Python 2 is no longer supported by the Python core team. Support for it is now deprecated in cryptography, and will be removed in the next release.
from cryptography.hazmat.backends import default_backend
Last login: Tue May 16 11:10:20 2023 from 123.207.175.190
Last login: Tue May 16 11:10:20 2023 from 123.207.175.190
-bash-4.2$
上一次登录：二 5月 16 11:10:20 CST 2023pts/1 上
上一次登录：二 5月 16 11:10:20 CST 2023pts/1 上
[root@VM-0-14-centos ~]#
outcmd:{export LANG='zh_CN.GBK'
[root@VM-0-14-centos ~]# }
outcmd:{ps aux|grep '/data/setupfiles/tomcat7-8180'|grep -v gre
p|awk '{print $2}'|xargs -r kill -9
[root@VM-0-14-centos ~]# }
outcmd:{svn cleanup /data/publish/safeweb
[root@VM-0-14-centos ~]# }
outcmd:{svn update /data/publish/safeweb --force --accept their
s-full -r r1430
正在升级 '/data/publish/safeweb':
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/EncrypPropertyPlaceholderConfigurer.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/attr/LongAttr.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/thread/OperatorListThread.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/controller/CommController.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/dao/AdminDao.class
U /data/publish/safeweb/WEB-INF/classes/backcode/MyException.class
U /data/publish/safeweb/WEB-INF/classes/backcode/NoLoginException.class
U /data/publish/safeweb/WEB-INF/classes/backcode/form/BaseEditForm.class
U /data/publish/safeweb/WEB-INF/classes/backcode/form/BaseForm.class
U /data/publish/safeweb/WEB-INF/classes/backcode/form/BaseListForm.class
U /data/publish/safeweb/WEB-INF/classes/backcode/form/WebService.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/annotion/AdminSessionCheck.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/annotion/TransDs1.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/annotion/TransDs2.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/annotion/WebOrAdminSessionCheck.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/annotion/WebSessionCheck.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/AppDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/HtmlDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/JsonDo$1.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/JsonDo$2.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/JsonDo$3.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/JsonDo$4.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/JsonDo$5.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/JsonDo$6.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/JsonDo$7.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/JsonDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/LogDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/Lunar.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/MybatisDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/OutDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/RedisDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/ThreadDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/XmlDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/DataSyn$RefreshConfigThread.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/attr/DoubleAttr.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/attr/StringAttr.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/thread/UserProductThread.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/controller/ServiceController.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/dao/BaseDao.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/PdfDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/SessionDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/common/VerifyCodeDo.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/DataCache.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/DataSyn.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/attr/IntegerAttr.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/config/thread/FeeAccountThread.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/controller/AdminController.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/controller/WebController.class
D /data/publish/safeweb/WEB-INF/classes/test/json.txt
U /data/publish/safeweb/WEB-INF/classes/com/scem/filter/BaseFilter.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/service/ServiceAspect.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/thread/ThreadManage.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/HttpClientUtil.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/MyX509TrustManager.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/XMLUtil.class
U /data/publish/safeweb/WEB-INF/classes/pages/yjzz/upload.class
C /data/publish/safeweb/WEB-INF/config/jdbc.properties
U /data/publish/safeweb/pages/help/101.htm
U /data/publish/safeweb/pages/help/111.htm
U /data/publish/safeweb/WEB-INF/classes/com/scem/dao/WebDao.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/service/CmmService.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/thread/MybatisThread.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/ConfigUtil.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/MD5Util.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/Test.class
U /data/publish/safeweb/WEB-INF/classes/pages/test/test_userinfo.class
U /data/publish/safeweb/WEB-INF/classes/xheditor/jsp/upload.class
U /data/publish/safeweb/pages/gywm.jsp
U /data/publish/safeweb/pages/help/109.htm
A /data/publish/safeweb/pages/help/114.htm
U /data/publish/safeweb/WEB-INF/classes/com/scem/dao/ConsoleDao.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/service/BaseService.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/thread/ChargeThread.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/CommonUtilPub.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/HttpUtil.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/QRCodeUtil.class
U /data/publish/safeweb/WEB-INF/classes/pages/test/test.class
U /data/publish/safeweb/WEB-INF/classes/test/Test2.class
U /data/publish/safeweb/pages/gxrz.jsp
U /data/publish/safeweb/pages/help/107.htm
U /data/publish/safeweb/pages/help/113.htm
A /data/publish/safeweb/pages/help/117.htm
U /data/publish/safeweb/WEB-INF/classes/com/scem/service/AdminService.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/service/WebService.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/ClientCustomSSL.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/HttpParam.class
U /data/publish/safeweb/WEB-INF/classes/com/scem/util/PayCommonUtil.class
U /data/publish/safeweb/WEB-INF/classes/pages/service/index.class
U /data/publish/safeweb/WEB-INF/classes/test/Test.class
U /data/publish/safeweb/pages/cjwt.jsp
U /data/publish/safeweb/pages/help/103.htm
U /data/publish/safeweb/pages/help/112.htm
A /data/publish/safeweb/pages/help/116.htm
A /data/publish/safeweb/pages/images/logo2.png
A /data/publish/safeweb/pages/help/115.htm
A /data/publish/safeweb/pages/images/nav24.png
U /data/publish/safeweb/pages/images/nav3.png
U /data/publish/safeweb/pages/index.css
A /data/publish/safeweb/pages/test/Home-Create-2.json
U /data/publish/safeweb/pages/images/nav2.png
U /data/publish/safeweb/pages/images/nav1.png
A /data/publish/safeweb/pages/images/zl3.png
A /data/publish/safeweb/pages/test/Home-Create-2-Window.json
U /data/publish/safeweb/pages/yhxy.jsp
A /data/publish/safeweb/pages/images/zl1.png
U /data/publish/safeweb/pages/index.jsp
U /data/publish/safeweb/pages/test/test.jsp
A /data/publish/safeweb/pages/images/zl2.png
A /data/publish/safeweb/pages/test/Home-Create-1.json
U /data/publish/safeweb/pages/top.jsp
更新到版本 1430。
“/data/publish/safeweb/WEB-INF/config/jdbc.properties”的冲突状态已解决
冲突概要：
Text conflicts: 0 remaining (and 1 already resolved)
[root@VM-0-14-centos ~]# }
outcmd:{find /data/publish/safeweb -name '*.jk1002'
/data/publish/safeweb/WEB-INF/config/jdbc.properties.jk1002
[root@VM-0-14-centos ~]# }
outcmd:{\cp -f /data/publish/safeweb/WEB-INF/config/jdbc.proper
ties.jk1002 /data/publish/safeweb/WEB-INF/config/jdbc.properties
[root@VM-0-14-centos ~]# }
outcmd:{sh /data/setupfiles/tomcat7-8180/bin/startup.sh
Using CATALINA_BASE: /data/setupfiles/tomcat7-8180
Using CATALINA_HOME: /data/setupfiles/tomcat7-8180
Using CATALINA_TMPDIR: /data/setupfiles/tomcat7-8180/temp
Using JRE_HOME: /data/setupfiles/jdk/jdk1.7.0_67/jre
Using CLASSPATH: /data/setupfiles/tomcat7-8180/bin/bootstrap.jar:/data/setupfiles/tomcat7-8180/bin/tomcat-juli.jar
[root@VM-0-14-centos ~]# }
Finished: SUCCESS
![[Jenkins]](/jenkins/static/4fc2e7a3/images/svgs/logo.svg){kind=logo}
