Commit bee10e50 authored by 赵啸非's avatar 赵啸非

添加产品资源枚举类

parent cabc49f4
...@@ -186,7 +186,6 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec ...@@ -186,7 +186,6 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
throw new AppException("请上传项目工程文件!"); throw new AppException("请上传项目工程文件!");
} }
InputStream inputStream = FileUtil.getInputStream(file); InputStream inputStream = FileUtil.getInputStream(file);
//获取zip的编码 //获取zip的编码
try { try {
ZipUtil.unzip(inputStream, destDir, Charset.defaultCharset()); ZipUtil.unzip(inputStream, destDir, Charset.defaultCharset());
...@@ -194,10 +193,8 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec ...@@ -194,10 +193,8 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
log.error("zip文件编码异常,尝试使用GBK编码,异常:{}",e.getMessage()); log.error("zip文件编码异常,尝试使用GBK编码,异常:{}",e.getMessage());
inputStream = FileUtil.getInputStream(file); inputStream = FileUtil.getInputStream(file);
ZipUtil.unzip(inputStream, destDir, Charset.forName("GBK")); ZipUtil.unzip(inputStream, destDir, Charset.forName("GBK"));
} }
String publicPath = setupProjectEntity.getProjectPath() + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getValue(); String publicPath = setupProjectEntity.getProjectPath() + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getValue();
File sqlPath = new File(publicPath + "/base.sql"); File sqlPath = new File(publicPath + "/base.sql");
if (sqlPath.exists()) { if (sqlPath.exists()) {
...@@ -220,6 +217,16 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec ...@@ -220,6 +217,16 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
setupProjectEntity.setProjectStatus(ProjectStatusEnum.已部署.getValue()); setupProjectEntity.setProjectStatus(ProjectStatusEnum.已部署.getValue());
this.update(setupProjectEntity); this.update(setupProjectEntity);
//判断当前系统类型,执行不同shell 或者 bat脚本
if (SystemUtil.getOsInfo().isLinux()) {
//todo 执行部署脚本
//后端服务,创建service 启动服务
callScript("project_deploy.sh", "4", publicPath + "/");
} else if (SystemUtil.getOsInfo().isWindows()) {
//todo
}
} }
return Rest.ok(); return Rest.ok();
......
...@@ -80,6 +80,13 @@ SETUP_PROJECT_PLATFORM_FILENAME_UI="${SETUP_PROJECT_PLATFORM}-ui.tar.gz" ...@@ -80,6 +80,13 @@ SETUP_PROJECT_PLATFORM_FILENAME_UI="${SETUP_PROJECT_PLATFORM}-ui.tar.gz"
SETUP_PROJECT_PLATFORM_SERVICE="${SERVICE_PATH}/${SETUP_PROJECT_PLATFORM}.service" SETUP_PROJECT_PLATFORM_SERVICE="${SERVICE_PATH}/${SETUP_PROJECT_PLATFORM}.service"
SETUP_PROJECT_PLATFORM_EXECPATH="${PUBLISH_PATH}/${SETUP_PROJECT_PLATFORM}" SETUP_PROJECT_PLATFORM_EXECPATH="${PUBLISH_PATH}/${SETUP_PROJECT_PLATFORM}"
# docker相关
DOCKER="docker"
DOCKER_HOST="127.0.0.1"
DOCKER_FILENAME="docker-20.10.9.tar"
DOCKER_SERVICE="${SERVICE_PATH}/${DOCKER}.service"
DOCKER_EXECPATH="${OPT_PATH}/${DOCKER}"
#加锁 #加锁
shell_lock() { shell_lock() {
touch ${LOCK_FILE} touch ${LOCK_FILE}
...@@ -277,6 +284,26 @@ WantedBy=multi-user.target ...@@ -277,6 +284,26 @@ WantedBy=multi-user.target
} }
setup_rabbitmq() { setup_rabbitmq() {
writelog "docker 安装rabbitmq。。。。"
writelog "检测是否安装docker 如果没有安装 则提示先安装docker "#todo
docker=$(docker --version | grep "Docker" | awk '{print $1}')
if [ "$docker" != "Docker" ]; then
writelog "未安装docker 请先安装docker"
return 1
fi
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 "初始化插件"
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" writelog "setup rabbitmq"
mkdir -p ${RABBITMQ_CONF_PATH} mkdir -p ${RABBITMQ_CONF_PATH}
...@@ -366,11 +393,43 @@ setup_font() { ...@@ -366,11 +393,43 @@ setup_font() {
} }
setup_font() { setup_docker() {
writelog "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
systemctl stop docker
rm -rf /var/lib/docker
yum remove docker-ce
rm -f /usr/bin/docker
rm -f /etc/docker/daemon.json
rm -rf /var/lib/docker
writelog "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/
systemctl enable ${DOCKER}
systemctl daemon-reload
systemctl start ${DOCKER}
writelog "docker安装完成" writelog "docker安装完成"
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镜像完成"
} }
clear_deploy() { clear_deploy() {
...@@ -637,6 +696,7 @@ program_deploy() { ...@@ -637,6 +696,7 @@ program_deploy() {
setup_nginx setup_nginx
setup_redis setup_redis
setup_font setup_font
setup_docker
setup_rabbitmq setup_rabbitmq
writelog "system setup finish" writelog "system setup finish"
} }
...@@ -645,7 +705,7 @@ project_deploy() { ...@@ -645,7 +705,7 @@ project_deploy() {
#init_deploy #初始化文件目录部分 #init_deploy #初始化文件目录部分
#nacos_deploy #nacos部署 #nacos_deploy #nacos部署
#setup_project_deploy #项目部署平台 #setup_project_deploy #项目部署平台
project_ui_deploy #项目部署平台ui project_ui_deploy #项目部署平台ui
} }
function menu() { #显示菜单 function menu() { #显示菜单
...@@ -753,7 +813,11 @@ function subnum() { #选项 ...@@ -753,7 +813,11 @@ function subnum() { #选项
;; ;;
4) 4)
#rabbitmq #rabbitmq
setup_rabbitmq result=$(setup_rabbitmq)
if [ "$result" = "1" ]; then
#提示安装失败
read -p "安装rabbitmq请先安装docker!"
fi
;; ;;
5) 5)
#nginx #nginx
...@@ -763,7 +827,7 @@ function subnum() { #选项 ...@@ -763,7 +827,7 @@ function subnum() { #选项
setup_font setup_font
;; ;;
7) 7)
docker_deploy setup_docker
;; ;;
8) 8)
program_deploy program_deploy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment