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/feign/healthcheckFeignClient.java

@@ -16,43 +16,43 @@ import com.ibiz.util.SearchContext;
  */
 public interface healthcheckFeignClient {
 
-    @RequestMapping(method = RequestMethod.GET, value = "/htsc-pos-nms/api/healthchecks/select")
+    @RequestMapping(method = RequestMethod.GET, value = "/htsc-pos-nms/api2/healthchecks/select")
     public Page<healthcheckImpl> select();
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/htsc-pos-nms/api/healthchecks/{healthcheckid}/getdraft")
+    @RequestMapping(method = RequestMethod.GET, value = "/htsc-pos-nms/api2/healthchecks/{healthcheckid}/getdraft")
     public healthcheckImpl getDraft(@PathVariable("healthcheckid") String healthcheckid,@RequestBody healthcheckImpl healthcheck);
 
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/htsc-pos-nms/api/healthchecks/{healthcheckid}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/htsc-pos-nms/api2/healthchecks/{healthcheckid}")
     public Boolean remove(@PathVariable("healthcheckid") String healthcheckid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/htsc-pos-nms/api/healthchecks/{healthcheckid}/checkkey")
+    @RequestMapping(method = RequestMethod.POST, value = "/htsc-pos-nms/api2/healthchecks/{healthcheckid}/checkkey")
     public healthcheckImpl checkKey(@PathVariable("healthcheckid") String healthcheckid,@RequestBody healthcheckImpl healthcheck);
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/htsc-pos-nms/api/healthchecks/{healthcheckid}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/htsc-pos-nms/api2/healthchecks/{healthcheckid}")
     public healthcheckImpl update(@PathVariable("healthcheckid") String healthcheckid,@RequestBody healthcheckImpl healthcheck);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/htsc-pos-nms/api/healthchecks")
+    @RequestMapping(method = RequestMethod.POST, value = "/htsc-pos-nms/api2/healthchecks")
     public healthcheckImpl create(@RequestBody healthcheckImpl healthcheck);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/htsc-pos-nms/api/healthchecks/{healthcheckid}/test")
+    @RequestMapping(method = RequestMethod.POST, value = "/htsc-pos-nms/api2/healthchecks/{healthcheckid}/test")
     public healthcheckImpl test(@PathVariable("healthcheckid") String healthcheckid,@RequestBody healthcheckImpl healthcheck);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/htsc-pos-nms/api/healthchecks/{healthcheckid}")
+    @RequestMapping(method = RequestMethod.GET, value = "/htsc-pos-nms/api2/healthchecks/{healthcheckid}")
     public healthcheckImpl get(@PathVariable("healthcheckid") String healthcheckid);
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/htsc-pos-nms/api/healthchecks/{healthcheckid}/save")
+    @RequestMapping(method = RequestMethod.POST, value = "/htsc-pos-nms/api2/healthchecks/{healthcheckid}/save")
     public healthcheckImpl save(@PathVariable("healthcheckid") String healthcheckid,@RequestBody healthcheckImpl healthcheck);
 
 
-    @RequestMapping(method = RequestMethod.GET, value = "/htsc-pos-nms/api/healthchecks/fetchdefault")
+    @RequestMapping(method = RequestMethod.GET, value = "/htsc-pos-nms/api2/healthchecks/fetchdefault")
     public Page<healthcheckImpl> fetchDefault(SearchContext context);