Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/bin/deploy.sh

@@ -37,8 +37,10 @@ clear_deploy() {
   #清理后台自启服务
   rm -f ${SERVICE}
   #清理执行文件目录
-  writelog "mv ${EXECPATH} backup/${EXECPATH}"
-  mv ${EXECPATH} backup/${PROJECT_NAME}
+
+  # mv /home/publish/portal-manager /home/publish/backup/portal-manager
+  writelog "mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}"
+  mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}
   #rm -rf ${EXECPATH}
 }
 
@@ -46,7 +48,9 @@ clear_deploy() {
 clear_ui_deploy() {
   EXEC_UI_PATH=$1
   #rm -rf ${EXEC_UI_PATH}
-  mv ${EXEC_UI_PATH} backup/${PROJECT_NAME}
+  # mv /home/publish/portal-manager /home/publish/backup/portal-manager
+  writelog "mv ${PUBLISH_PATH}/${PROJECT_NAME}-ui ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui"
+  mv ${EXEC_UI_PATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui
   mkdir -p ${EXEC_UI_PATH}
 }
 

base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http

 
 ###站点业务列表
-POST {{baseUrl}}/site/business/list
+POST {{baseUrl}}/site/business/interlist
 Content-Type: application/json
 
 {
-  "idNotList": [11,18,17,14,27,28],
-   "siteId": 1,
-    "page":3,
-    "size":1
+
+   "siteId": 22
+
 }
 
 ###站点业务列表

portal-manager/src/main/bin/deploy.sh

@@ -37,8 +37,10 @@ clear_deploy() {
   #清理后台自启服务
   rm -f ${SERVICE}
   #清理执行文件目录
-  writelog "mv ${EXECPATH} backup/${EXECPATH}"
-  mv ${EXECPATH} backup/${PROJECT_NAME}
+
+  # mv /home/publish/portal-manager /home/publish/backup/portal-manager
+  writelog "mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}"
+  mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}
   #rm -rf ${EXECPATH}
 }
 
@@ -46,7 +48,9 @@ clear_deploy() {
 clear_ui_deploy() {
   EXEC_UI_PATH=$1
   #rm -rf ${EXEC_UI_PATH}
-  mv ${EXEC_UI_PATH} backup/${PROJECT_NAME}
+  # mv /home/publish/portal-manager /home/publish/backup/portal-manager
+  writelog "mv ${PUBLISH_PATH}/${PROJECT_NAME}-ui ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui"
+  mv ${EXEC_UI_PATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui
   mkdir -p ${EXEC_UI_PATH}
 }
 

smart-gateway/src/main/bin/deploy.sh

@@ -37,8 +37,10 @@ clear_deploy() {
   #清理后台自启服务
   rm -f ${SERVICE}
   #清理执行文件目录
-  writelog "mv ${EXECPATH} backup/${EXECPATH}"
-  mv ${EXECPATH} backup/${PROJECT_NAME}
+
+  # mv /home/publish/portal-manager /home/publish/backup/portal-manager
+  writelog "mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}"
+  mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}
   #rm -rf ${EXECPATH}
 }
 
@@ -46,7 +48,9 @@ clear_deploy() {
 clear_ui_deploy() {
   EXEC_UI_PATH=$1
   #rm -rf ${EXEC_UI_PATH}
-  mv ${EXEC_UI_PATH} backup/${PROJECT_NAME}
+  # mv /home/publish/portal-manager /home/publish/backup/portal-manager
+  writelog "mv ${PUBLISH_PATH}/${PROJECT_NAME}-ui ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui"
+  mv ${EXEC_UI_PATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui
   mkdir -p ${EXEC_UI_PATH}
 }