ibizdev提交

config.xml

@@ -40,14 +40,14 @@
       mvn install
       cd ..
       mvn install
-      cd ps-app/ps-app-web
-      mvn clean package -Pprod
+      cd ps-boot
+      mvn clean package
       echo 'echo "$para1"' > apppasswd.sh
       chmod -R 777 *
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps-app-web.jar >>/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps_appps 应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps.jar root@172.16.102.61:/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps.jar >>/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps_apips 服务-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
       </command>
     </hudson.tasks.Shell>
   </builders>

ps-client/ps-client-htsc/src/main/java/com/ibiz/client/htsc/service/healthcheckClientServiceImpl.java

@@ -58,7 +58,7 @@ public class healthcheckClientServiceImpl implements IhealthcheckClientService {
                     .contract(contract)
                     .requestInterceptor(feignRequestInterceptor)
                     ;
-        	this.healthcheckFeignClient = nameBuilder.target(healthcheckFeignClient.class,"http://"+htscClientProperties.getServiceUrl()+"/") ;
+        	this.healthcheckFeignClient = nameBuilder.target(healthcheckFeignClient.class,htscClientProperties.getServiceUrl()) ;
 		}
     }
     @Override

ps-client/ps-client-im/src/main/java/com/ibiz/client/im/service/IMClientServiceImpl.java

@@ -58,7 +58,7 @@ public class IMClientServiceImpl implements IIMClientService {
                     .contract(contract)
                     .requestInterceptor(feignRequestInterceptor)
                     ;
-        	this.iMFeignClient = nameBuilder.target(IMFeignClient.class,"http://"+imClientProperties.getServiceUrl()+"/") ;
+        	this.iMFeignClient = nameBuilder.target(IMFeignClient.class,imClientProperties.getServiceUrl()) ;
 		}
     }
     @Override

ps-client/ps-client-org/src/main/java/com/ibiz/client/org/service/OrgClientServiceImpl.java

@@ -58,7 +58,7 @@ public class OrgClientServiceImpl implements IOrgClientService {
                     .contract(contract)
                     .requestInterceptor(feignRequestInterceptor)
                     ;
-        	this.orgFeignClient = nameBuilder.target(OrgFeignClient.class,"http://"+orgClientProperties.getServiceUrl()+"/") ;
+        	this.orgFeignClient = nameBuilder.target(OrgFeignClient.class,orgClientProperties.getServiceUrl()) ;
 		}
     }
     @Override

ps-client/ps-client-org/src/main/java/com/ibiz/client/org/service/OrgDeptClientServiceImpl.java

@@ -58,7 +58,7 @@ public class OrgDeptClientServiceImpl implements IOrgDeptClientService {
                     .contract(contract)
                     .requestInterceptor(feignRequestInterceptor)
                     ;
-        	this.orgDeptFeignClient = nameBuilder.target(OrgDeptFeignClient.class,"http://"+orgClientProperties.getServiceUrl()+"/") ;
+        	this.orgDeptFeignClient = nameBuilder.target(OrgDeptFeignClient.class,orgClientProperties.getServiceUrl()) ;
 		}
     }
     @Override

ps-client/ps-client-org/src/main/java/com/ibiz/client/org/service/OrgDeptUserClientServiceImpl.java

@@ -58,7 +58,7 @@ public class OrgDeptUserClientServiceImpl implements IOrgDeptUserClientService {
                     .contract(contract)
                     .requestInterceptor(feignRequestInterceptor)
                     ;
-        	this.orgDeptUserFeignClient = nameBuilder.target(OrgDeptUserFeignClient.class,"http://"+orgClientProperties.getServiceUrl()+"/") ;
+        	this.orgDeptUserFeignClient = nameBuilder.target(OrgDeptUserFeignClient.class,orgClientProperties.getServiceUrl()) ;
 		}
     }
     @Override

ps-client/ps-client-org/src/main/java/com/ibiz/client/org/service/OrgUserClientServiceImpl.java

@@ -58,7 +58,7 @@ public class OrgUserClientServiceImpl implements IOrgUserClientService {
                     .contract(contract)
                     .requestInterceptor(feignRequestInterceptor)
                     ;
-        	this.orgUserFeignClient = nameBuilder.target(OrgUserFeignClient.class,"http://"+orgClientProperties.getServiceUrl()+"/") ;
+        	this.orgUserFeignClient = nameBuilder.target(OrgUserFeignClient.class,orgClientProperties.getServiceUrl()) ;
 		}
     }
     @Override

ps-core/src/main/java/com/ibiz/core/module/service/logic/impl/PSCreateAndStartIMLogicImpl.java

@@ -46,7 +46,7 @@ public class PSCreateAndStartIMLogicImpl implements IPSCreateAndStartIMLogic{
            kieSession.startProcess("com.ibiz.core.module.service.logic.pscreateandstartim");
 
         }catch(Exception e){
-            System.out.println("执行[CreateAndStartIM]处理逻辑发生异常"+e);
+            throw new RuntimeException("执行[CreateAndStartIM]处理逻辑发生异常"+e);
         }finally {
             if(kieSession!=null)
             kieSession.destroy();

ps-core/src/main/java/com/ibiz/core/module/service/logic/impl/PSXDLogicImpl.java

@@ -43,7 +43,7 @@ public class PSXDLogicImpl implements IPSXDLogic{
            kieSession.startProcess("com.ibiz.core.module.service.logic.psxd");
 
         }catch(Exception e){
-            System.out.println("执行[下单]处理逻辑发生异常"+e);
+            throw new RuntimeException("执行[下单]处理逻辑发生异常"+e);
         }finally {
             if(kieSession!=null)
             kieSession.destroy();