修改部署脚本

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

@@ -48,11 +48,13 @@ public class SetupDbServiceImpl implements SetupDbService {
             druidDataSource.setPassword(dbSetupEntity.getPassword());
 
             DruidPooledConnection connection = druidDataSource.getConnection();
-            createDatabase(connection, dbSetupEntity.getDbName());
-            connection.setCatalog(dbSetupEntity.getDbName());
-            FileSystemResource rc = new FileSystemResource(uploadService.getFilePath(dbSetupEntity.getDbFilePath()));
-            EncodedResource er = new EncodedResource(rc, "UTF-8");
-            ScriptUtils.executeSqlScript(connection, er);
+            boolean database = createDatabase(connection, dbSetupEntity.getDbName());
+            if(database){
+                connection.setCatalog(dbSetupEntity.getDbName());
+                FileSystemResource rc = new FileSystemResource(uploadService.getFilePath(dbSetupEntity.getDbFilePath()));
+                EncodedResource er = new EncodedResource(rc, "UTF-8");
+                ScriptUtils.executeSqlScript(connection, er);
+            }
 
         } catch (Exception e) {
             log.error("初始化数据库异常", e);

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

@@ -53,7 +53,6 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
     @Autowired
     private UploadService uploadService;
 
-
     @Autowired
     private SetupDbService setupDbService;
 
@@ -102,6 +101,7 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
                 dbSetupEntity.setUserName(setupProjectEntity.getDbUser());
                 dbSetupEntity.setPassword(setupProjectEntity.getDbPassword());
                 dbSetupEntity.setDbFilePath(publicPath + "/db/base.sql");
+                log.info("数据库db路径！{}", dbSetupEntity.getDbFilePath());
                 Rest<String> dbRest = setupDbService.initDb(dbSetupEntity);
                 if (YesNoEnum.YES.getValue() != dbRest.getCode()) {
                     log.info("数据库初始化成功！");
@@ -113,13 +113,13 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
 
                 //判断当前系统类型，执行不同shell 或者 bat脚本
 
-                if(SystemUtil.getOsInfo().isLinux()){
+                if (SystemUtil.getOsInfo().isLinux()) {
                     //todo 执行部署脚本
 
                     //RuntimeUtil.exec()
                     log.info("执行deploy shell 脚本 或者构造文件");
-                   // callScript("deploy.sh","4",publicPath+"/bin/");
-                }else if(SystemUtil.getOsInfo().isWindows()){
+                    // callScript("deploy.sh","4",publicPath+"/bin/");
+                } else if (SystemUtil.getOsInfo().isWindows()) {
                     //todo
                 }
 
@@ -217,12 +217,12 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
     }
 
 
-    private void callScript(String script, String args, String... workspace){
+    private void callScript(String script, String args, String... workspace) {
         try {
             String cmd = "sh " + script + " " + args;
 //        	String[] cmd = {"sh", script, "4"};
             File dir = null;
-            if(workspace[0] != null){
+            if (workspace[0] != null) {
                 dir = new File(workspace[0]);
                 System.out.println(workspace[0]);
             }
@@ -235,14 +235,12 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
                 log.info(line);
             }
             input.close();
-        }
-        catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
 
-
     public static void main(String[] args) {
         System.out.println(FileUtil.getSuffix("test.tar.gz"));
 

product-deploy.sh → setup.sh

@@ -322,7 +322,6 @@ setup_nginx() {
 
 }
 
-
 setup_font() {
   writelog "字体安装..."
   yum install -y fontconfig mkfontscale
@@ -477,12 +476,19 @@ nacos_deploy() {
     #todo 添加nginx 针对当前ip的sql stream代理
   fi
   #查看进程是否存在，如果存在 则不安装
-  project_status=$(systemctl status "${NACOS}" | grep Active | awk '{print $2}')
-  if [ -n "$project_status" ]; then
-    echo "NACOS项目已经安装,状态: $project_status"
+
+  #查看文件夹是否存在
+  if [ -d ${NACOS_EXECPATH} ]; then
+    writelog "NACOS项目已经安装!"
     return
   fi
 
+  #project_status=$(systemctl status "${NACOS}" | grep Active | awk '{print $2}')
+  #  if [ -n "$project_status" ]; then
+  #    echo "NACOS项目已经安装,状态: $project_status"
+  #    return
+  #  fi
+
   rm -rf ${NACOS_SERVICE}
   rm -rf ${NACOS_EXECPATH}
   mkdir -p ${NACOS_EXECPATH}
@@ -527,9 +533,14 @@ setup_project_deploy() {
     build_nginx_mysql_stream $NGINX_CONF_PATH/mysql_stream.stream
   fi
 
-  project_status=$(systemctl status "${SETUP_PROJECT_PLATFORM}" | grep Active | awk '{print $2}')
-  if [ -n "$project_status" ]; then
-    writelog "工程已经安装,状态: $project_status"
+  #  project_status=$(systemctl status "${SETUP_PROJECT_PLATFORM}" | grep Active | awk '{print $2}')
+  #  if [ -n "$project_status" ]; then
+  #    writelog "工程已经安装,状态: $project_status"
+  #    return
+  #  fi
+
+  if [ -d ${SETUP_PROJECT_PLATFORM_EXECPATH} ]; then
+    writelog "项目部署工程已经安装!"
     return
   fi