添加产品资源枚举类

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java

@@ -221,6 +221,7 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
             if (SystemUtil.getOsInfo().isLinux()) {
                 //todo 执行部署脚本
                 //后端服务，创建service  启动服务
+                callScript("chmod -R 755 "+destDir, "4");
                 callScript("project_deploy.sh", "4", publicPath);
             } else if (SystemUtil.getOsInfo().isWindows()) {
                 //todo

setup.sh

@@ -285,24 +285,26 @@ WantedBy=multi-user.target
 
 setup_rabbitmq() {
   writelog "docker 安装rabbitmq。。。。"
-  writelog "检测是否安装docker 如果没有安装 则提示先安装docker "#todo
-
-  docker=$(docker --version  | grep "Docker" | awk '{print $1}')
-
+  docker=$(docker --version | grep "Docker" | awk '{print $1}')
   if [ "$docker" != "Docker" ]; then
     writelog "未安装docker 请先安装docker"
     return 1
   fi
 
+  #删除容器与镜像
+  writelog "docker 卸载rabbitmq。。。。"
+  docker stop rabbitmq
+  docker rm rabbitmq
+  docker rmi rabbitmq:v3.10
+  writelog "docker 加载rabbitmq镜像中。。。。"
   docker load <${BASEDIR}/soft/${RABBITMQ}/rabbitmq.tar
-  writelog "创建容器并启动"
-  docker run -d --restart=always --name rabbitmq -p 5672:5672 -p 15674:15674 -p 15672:15672   rabbitmq:v3.10
-  writelog "初始化插件"
+  writelog "创建容器并启动中。。。"
+  docker run -d --restart=always --name rabbitmq -p 5672:5672 -p 15674:15674 -p 15672:15672 rabbitmq:v3.10
+  writelog "容器启动都完成，初始化插件"
   docker exec -i rabbitmq /bin/bash -c 'rabbitmq-plugins enable rabbitmq_management&&rabbitmq-plugins enable rabbitmq_web_stomp rabbitmq_web_stomp_examples&&rabbitmqctl add_user taxi_mq admin@2020&&rabbitmqctl set_user_tags taxi_mq administrator&&rabbitmqctl set_permissions -p / taxi_mq ".*" ".*" ".*"'
   writelog "rabbitmq 安装完成!"
 }
 
-
 setup_rabbitmq_bak() {
   writelog "setup rabbitmq"
   mkdir -p ${RABBITMQ_CONF_PATH}
@@ -399,37 +401,29 @@ setup_docker() {
   docker stop $(docker ps -aq)
   docker rm $(docker ps -aq)
   docker rmi $(docker images -q)
-  yum remove docker docker-client docker-client-latest docker-common docker-latest docker-latest-logrotate docker-logrotate docker-engine
+  #yum remove docker docker-client docker-client-latest docker-common docker-latest docker-latest-logrotate docker-logrotate docker-engine
   systemctl stop docker
   rm -rf /var/lib/docker
-  yum remove docker-ce
+  #yum remove docker-ce
   rm -f /usr/bin/docker
   rm -f /etc/docker/daemon.json
   rm -rf /var/lib/docker
   writelog "docker安装..."
-
   tar -zvxf ${BASEDIR}/soft/${DOCKER}/${DOCKER_FILENAME} -C "/usr/bin/" --strip-components 1
-
   /bin/cp -arf ${BASEDIR}/release/conf/${DOCKER}.service ${SERVICE_PATH}/
   /bin/cp -arf ${BASEDIR}/release/conf/daemon.json /etc/docker/
+  /bin/cp -arf ${BASEDIR}/release/conf/nginx /home/docker/
+  /bin/cp -arf ${BASEDIR}/release/conf/php /home/docker/
+  chmod -R 755 /home/docker
 
   systemctl enable ${DOCKER}
   systemctl daemon-reload
   systemctl start ${DOCKER}
-
   writelog "docker安装完成"
-
-  writelog "docker安装nginx-php镜像开始"
-
+  writelog "docker安装nginx-php镜像开始..."
   docker load <${BASEDIR}/soft/${DOCKER}/webdevops-php-nginx.tar
   systemctl restart docker
-  writelog "docker安装nginx-php镜像完成,启动镜像..."
-
-  writelog "docker安装rabbitmq镜像开始"
-  #docker load <${BASEDIR}/soft/${RABBITMQ}/rabbitmq.3.10.tar
-  #docker tag 4ec067de45e0 rabbitmq:3.10
-  writelog "docker安装rabbitmq镜像完成"
-
+  writelog "docker安装nginx-php镜像完成！"
 }
 
 clear_deploy() {
@@ -816,7 +810,7 @@ function subnum() { #选项
     result=$(setup_rabbitmq)
     if [ "$result" = "1" ]; then
       #提示安装失败
-       read -p "安装rabbitmq请先安装docker!"
+      read -p "安装rabbitmq请先安装docker!"
     fi
     ;;
   5)