全局替换 bnt 为 devops

.gitignore

@@ -6,5 +6,5 @@
 *.jar
 *.log*
 *git.properties*
-bnt_data/
+devops_data/
 dependency-reduced-pom.*

README.md

@@ -1 +1 @@
-# bnt
+# devops

agent/bin/restart.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='bnt-agent.jar'
+app_name='devops-agent.jar'
 
 pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
 echo "process id: "${pid}

agent/bin/shutdown.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-app_name='bnt-agent.jar'
+app_name='devops-agent.jar'
 
 pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
 echo "process id: "${pid}

agent/bin/start.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='bnt-agent.jar'
+app_name='devops-agent.jar'
 nohup java -jar ${app_dir}"/"${app_name} ${app_dir}/agent.json > console.log 2>&1 &

agent/pom.xml

@@ -29,7 +29,7 @@
     </dependencies>
 
     <build>
-        <finalName>bnt-${project.artifactId}</finalName>
+        <finalName>devops-${project.artifactId}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

agent/src/main/java/cn/reghao/devops/agent/AgentApp.java

@@ -85,7 +85,7 @@ public class AgentApp {
 		@Override
 		public void run() {
 			messageSender.close();
-			log.info("资源清理完成，结束 bnt-agent...");
+			log.info("资源清理完成，结束 devops-agent...");
 		}
 	}
 

common/src/main/java/cn/reghao/devops/common/docker/DockerImpl.java

@@ -87,7 +87,7 @@ public class DockerImpl implements Docker {
             textFile.write(dockerfile, dockerfileContent);
             String imageId = dockerClient.buildImageCmd()
                     .withDockerfile(dockerfile)
-                    // repoTag 格式为 docker.reghao.cn/bnt:12345678
+                    // repoTag 格式为 docker.reghao.cn/devops:12345678
                     .withTags(Set.of(repoTag))
                     .start()
                     .awaitImageId();

common/src/main/java/cn/reghao/devops/common/msg/MsgQueue.java

@@ -9,6 +9,6 @@ import cn.reghao.devops.common.msg.constant.AppId;
 @Deprecated
 public class MsgQueue {
     public static String managerTopic() {
-        return String.format("bnt.%s", AppId.manager.name());
+        return String.format("devops.%s", AppId.manager.name());
     }
 }

deployer/pom.xml

@@ -28,7 +28,7 @@
     </dependencies>
 
     <build>
-        <finalName>bnt-${project.artifactId}</finalName>
+        <finalName>devops-${project.artifactId}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

deployer/src/main/java/cn/reghao/devops/deployer/DeployApp.java

@@ -15,7 +15,7 @@ import java.util.List;
 public class DeployApp {
     public static void main(String[] args) {
         if (args.length != 4) {
-            log.error("usage: java -jar bnt-deployer ${app_name} ${local_dir} ${remote_dir} ${sever_file}");
+            log.error("usage: java -jar devops-deployer ${app_name} ${local_dir} ${remote_dir} ${sever_file}");
             return;
         }
 
@@ -35,7 +35,7 @@ public class DeployApp {
             return;
         }
 
-        log.info("start deploy bnt apps");
+        log.info("start deploy devops apps");
         Sftp sftp = new Sftp();
         List<RemoteHost> remoteHosts = sftp.getRemoteHost(serverFile);
         for (RemoteHost remoteHost : remoteHosts) {
@@ -47,6 +47,6 @@ public class DeployApp {
                 e.printStackTrace();
             }
         }
-        log.info("deploy bnt done");
+        log.info("deploy devops done");
     }
 }

logstash/pom.xml

@@ -28,7 +28,7 @@
     </dependencies>
 
     <build>
-        <finalName>bnt-${project.artifactId}</finalName>
+        <finalName>devops-${project.artifactId}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

logstash/src/main/java/cn/reghao/devops/logstash/LogStashApp.java

@@ -24,7 +24,7 @@ public class LogStashApp {
     static class ShutdownHook implements Runnable {
         @Override
         public void run() {
-            log.info("资源清理完成，结束 bnt-logstash...");
+            log.info("资源清理完成，结束 devops-logstash...");
         }
     }
 

web/Dockerfile

@@ -2,6 +2,6 @@ FROM adoptopenjdk/openjdk11:x86_64-debianslim-jdk-11.0.24_8-slim
 
 WORKDIR /app
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
-COPY bin/bnt-web.jar /app/bnt-web.jar
+COPY bin/devops-web.jar /app/devops-web.jar
 
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Djava.awt.headless=true","-jar","/app/bnt-web.jar"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Djava.awt.headless=true","-jar","/app/devops-web.jar"]

web/bin/restart.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='bnt-web.jar'
+app_name='devops-web.jar'
 
 pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
 echo "process id: "${pid}

web/bin/shutdown.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-app_name='bnt-web.jar'
+app_name='devops-web.jar'
 
 pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
 echo "process id: "${pid}

web/bin/start.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='bnt-web.jar'
+app_name='devops-web.jar'
 nohup java -jar ${app_dir}"/"${app_name} > console.log 2>&1 &

web/pom.xml

@@ -184,7 +184,7 @@
     </profiles>
 
     <build>
-        <finalName>bnt-${project.artifactId}</finalName>
+        <finalName>devops-${project.artifactId}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

web/src/main/java/cn/reghao/devops/web/WebApplication.java

@@ -4,18 +4,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
 @EnableJpaRepositories
-@EntityScan({"cn.reghao.bnt.web"})
-@ComponentScan(basePackages = {"cn.reghao.bnt.web", "cn.reghao.bnt.common"}
-		,excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX,
-		pattern = {"cn.reghao.bnt.web.admin.*", "cn.reghao.bnt.web.console.*",
-				"cn.reghao.bnt.web.parser.*", "org.springframework.data.mongodb.*"})
-)
-//@ConditionalOnProperty()
+@EntityScan({"cn.reghao.devops.web"})
+@ComponentScan(basePackages = {"cn.reghao.devops.web", "cn.reghao.devops.common"})
 public class WebApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(WebApplication.class, args);

web/src/main/java/cn/reghao/devops/web/config/AppLifecycle.java

@@ -59,13 +59,13 @@ public class AppLifecycle implements ApplicationRunner, DisposableBean {
     public void run(ApplicationArguments args) throws IOException {
         initSys();
         buildStat.resetState();
-        log.info("bnt-web started");
+        log.info("devops-web started");
     }
 
     @Override
     public void destroy() {
         machineService.shutdown();
-        log.info("bnt-web shutdown...");
+        log.info("devops-web shutdown...");
     }
 
     private void initSys() throws IOException {
@@ -82,20 +82,20 @@ public class AppLifecycle implements ApplicationRunner, DisposableBean {
         String baseDir = appProperties.getBaseDir();
         File dir = new File(baseDir);
         if (!dir.exists() && !dir.mkdirs()) {
-            log.error("创建本地构建目录 {} 失败，bnt-web 结束运行", baseDir);
+            log.error("创建本地构建目录 {} 失败，devops-web 结束运行", baseDir);
             System.exit(1);
         } else {
             try {
                 buildDirService.init(baseDir);
             } catch (Exception e) {
-                log.error("初始化本地构建目录失败: {}，bnt-web 结束运行", e.getMessage());
+                log.error("初始化本地构建目录失败: {}，devops-web 结束运行", e.getMessage());
                 System.exit(1);
             }
         }
     }
 
     private void initLogConfig() {
-        String app = "bnt-web";
+        String app = "devops-web";
         String host = "localhost";
         LoggerConfig.initLogger(List.of(
                 Appenders.pushAppender(app, host, logHandler),

web/src/main/java/cn/reghao/devops/web/config/SwaggerConfig.java

@@ -27,7 +27,7 @@ public class SwaggerConfig {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("cn.reghao.bnt.web.devops"))
+                .apis(RequestHandlerSelectors.basePackage("cn.reghao.devops.web.devops"))
                 //.apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 .build();

web/src/main/java/cn/reghao/devops/web/devops/app/model/dto/DeployConfigDto.java

@@ -26,7 +26,7 @@ public class DeployConfigDto implements Serializable {
     private String machineIpv4;
     @ValidEnum(value = PackType.class, message = "请选择正确的打包类型")
     private String packType;
-    // packType 是 docker 时 startScript 的内容是 cn.reghao.bnt.common.dockerc.pojo.Config 序列化为 JSON 后的字符串
+    // packType 是 docker 时 startScript 的内容是 cn.reghao.devops.common.dockerc.pojo.Config 序列化为 JSON 后的字符串
     // 具体参照 https://docs.docker.com/engine/api/v1.40/#operation/ContainerCreate 的 reqeust body
     private String startScript;
     private String unpackScript;

web/src/main/java/cn/reghao/devops/web/devops/app/model/po/config/AppDeployConfig.java

@@ -28,7 +28,7 @@ public class AppDeployConfig extends BaseEntity {
     @NotNull
     @OneToOne
     private MachineHost machineHost;
-    // packType 是 docker 时 startScript 的内容是 cn.reghao.bnt.common.dockerc.pojo.Config 序列化为 JSON 后的字符串
+    // packType 是 docker 时 startScript 的内容是 cn.reghao.devops.common.dockerc.pojo.Config 序列化为 JSON 后的字符串
     // 具体参照 https://docs.docker.com/engine/api/v1.40/#operation/ContainerCreate 的 reqeust body
     @Column(columnDefinition="text")
     @NotNull

web/src/main/java/cn/reghao/devops/web/devops/app/service/bd/webhook/WebhookService.java

@@ -61,7 +61,7 @@ public class WebhookService {
             String appId = appConfig.getAppId();
             notifyEvt(appId, buildParam.getBuildBy());
 
-            boolean deploy = !"bnt-web".equals(appId) && !"bnt-agent".equals(appId);
+            boolean deploy = !"devops-web".equals(appId) && !"devops-agent".equals(appId);
             String buildBy = buildParam.getBuildBy();
             buildApp.buildAndDeploy(appId, deploy);
         }

web/src/main/java/cn/reghao/devops/web/devops/build/model/AppDto.java

@@ -16,7 +16,7 @@ public class AppDto implements Serializable {
 
     private String appId;
     private String env;
-    // 仅在 cn.reghao.bnt.manager.build.tool.BuilderUtil 中使用
+    // 仅在 cn.reghao.devops.manager.build.tool.BuilderUtil 中使用
     @Deprecated
     private String appType;
     private String appRepo;

web/src/main/resources/application-dev.yml

@@ -2,6 +2,6 @@ spring:
   thymeleaf:
     cache: false
   datasource:
-    url: jdbc:mysql://localhost/reghao_bnt_rdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
+    url: jdbc:mysql://localhost/reghao_devops_rdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: dev
     password: Dev@123456

web/src/main/resources/application-test.yml

@@ -2,6 +2,6 @@ spring:
   thymeleaf:
     cache: true
   datasource:
-    url: jdbc:mysql://192.168.0.210/reghao_bnt_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
+    url: jdbc:mysql://192.168.0.210/reghao_devops_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: test
     password: Test@123456

web/src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
       persistent: true
 spring:
   application:
-    name: bnt-web
+    name: devops-web
   profiles:
     active: @profile.active@
   banner:
@@ -49,5 +49,5 @@ spring:
     servlet:
       content-type: text/html
 app:
-  baseDir: /opt/data/bntdata
+  baseDir: /opt/data/devopsdata
   storeDir: ${app.basedir}/file

web/src/main/resources/logback-spring.xml

@@ -19,7 +19,7 @@
         <!-- 滚动策略 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>
-                logs/bnt.%d.log
+                logs/devops.%d.log
             </fileNamePattern>
         </rollingPolicy>
     </appender>

web/src/main/resources/templates/common/template.html

@@ -3,7 +3,7 @@
 
 <head th:fragment="header(title, link, style)">
     <th:block th:if="${title == null}">
-        <title>bnt 系统</title>
+        <title>devops 系统</title>
     </th:block>
     <th:block th:if="${title != null}">
         <title th:replace="${title}">title</title>
@@ -13,8 +13,8 @@
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <meta name="description" content="bnt" />
-    <meta name="keywords" content="bnt, SpringBoot, Thymeleaf" />
+    <meta name="description" content="devops" />
+    <meta name="keywords" content="devops, SpringBoot, Thymeleaf" />
 
     <link rel="shortcut icon" th:href="@{/imgs/favicon.png}" type="image/x-icon">
     <link rel="stylesheet" th:href="@{/css/plugins/font-awesome-4.7.0/css/font-awesome.min.css}"  media="all">

web/src/main/resources/templates/home/index1.html

@@ -92,7 +92,7 @@
                         <tr>
                             <th>系统版本</th>
                             <td>
-                                <a th:text="${managerVersion}" target="_blank" th:href="@{'https://git.reghao.cn/reghao/bnt/commit/' + ${managerVersion}}"></a>
+                                <a th:text="${managerVersion}" target="_blank" th:href="@{'https://git.reghao.cn/reghao/devops/commit/' + ${managerVersion}}"></a>
                             </td>
                         </tr>
                         <tr>

web/src/main/resources/templates/login.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
-    <title>bnt 系统登录</title>
+    <title>devops 系统登录</title>
     <link rel="stylesheet" type="text/css" th:href="@{/css/login.css}">
 </head>
 <body class="layui-layout-login">

web/src/main/resources/templates/main.html

@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
-    <title>bnt 系统</title>
+    <title>devops 系统</title>
 </head>
 <body class="layui-layout-body">
 <div class="layui-layout layui-layout-admin">
     <!-- 导航栏 -->
     <div class="layui-header">
         <a href="#" class="layui-logo">
-            <span class="layui-logo-mini">bnt</span>
-            <span class="layui-logo-lg">bnt 系统</span>
+            <span class="layui-logo-mini">devops</span>
+            <span class="layui-logo-lg">devops 系统</span>
         </a>
         <a class="side-toggle layui-layout-left" href="#">
             <i class="layui-icon layui-icon-shrink-right"></i>
@@ -28,7 +28,7 @@
                 </a>
             </li>
             <li class="layui-nav-item timo-nav-user">
-                <a class="timo-header-screenName" th:text="${user.screenName}">bnt</a>
+                <a class="timo-header-screenName" th:text="${user.screenName}">devops</a>
                 <div class="layui-nav-child">
                     <div class="timo-nav-child-box">
                         <div>
@@ -54,7 +54,7 @@
             <div class="layui-side-user">
                 <img class="layui-side-user-avatar" th:src="@{${user.avatarUrl}}" alt="头像">
                 <div>
-                    <p class="layui-side-user-name" th:text="${user.screenName}">bnt</p>
+                    <p class="layui-side-user-name" th:text="${user.screenName}">devops</p>
                     <p class="layui-side-user-designation">在线</p>
                 </div>
             </div>

web/src/main/resources/templates/sys/rtlog.html

@@ -53,7 +53,7 @@
     function initWebSocket() {
         if ("WebSocket" in window) {
             var token = '0123456789'
-            var app = 'bnt-web'
+            var app = 'devops-web'
             var host = 'localhost'
             var params = 'token=' + token + '&app=' + app + '&host=' + host;
 

zzz/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd /home/reghao/code/java/bnt
+cd /home/reghao/code/java/devops
 mvn clean package -Dmaven.test.skip=true -Ptest
 
 #mvn clean package -Dmaven.test.skip=true -am -pl logstash

zzz/build1.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-cd /home/reghao/code/java/bnt
+cd /home/reghao/code/java/devops
 commit_id=`git rev-parse HEAD | cut -c 1-8`
 #docker_prefix='docker.reghao.cn/tnb'
-docker_prefix='registry.cn-chengdu.aliyuncs.com/reghao/bntweb'
+docker_prefix='registry.cn-chengdu.aliyuncs.com/reghao/devopsweb'
 
 mvn clean package -Dmaven.test.skip=true -am -pl web
 
-cd /home/reghao/code/java/bnt/web
+cd /home/reghao/code/java/devops/web
 docker build -t ${docker_prefix}:${commit_id} .
 docker push ${docker_prefix}:${commit_id}

zzz/deploy.sh

@@ -3,24 +3,24 @@
 set -e
 
 #cd /home/reghao/Downloads
-#git clone https://git.reghao.cn/reghao/bnt
+#git clone https://git.reghao.cn/reghao/devops
 
-base_dir='/home/reghao/Downloads/bnt'
-#base_dir='/home/reghao/code/java/bnt'
+base_dir='/home/reghao/Downloads/devops'
+#base_dir='/home/reghao/code/java/devops'
 cd ${base_dir}
 mvn clean package -Dmaven.test.skip=true -Ptest
 #
 cd ${base_dir}/deployer/bin
 
 manager_local_dir=${base_dir}'/manager/bin'
-manager_remote_dir='/opt/apps/bnt-web1'
+manager_remote_dir='/opt/apps/devops-web1'
 manager_server_file='/home/reghao/Downloads/servers1.csv'
-java -jar bnt-deployer.jar "bnt-web" ${manager_local_dir} ${manager_remote_dir} ${manager_server_file}
+java -jar devops-deployer.jar "devops-web" ${manager_local_dir} ${manager_remote_dir} ${manager_server_file}
 
 #agent_local_dir=${base_dir}'/agent/bin'
-#agent_remote_dir='/opt/apps/bnt-agent1'
+#agent_remote_dir='/opt/apps/devops-agent1'
 #agent_servers_file='/home/reghao/Downloads/servers3.csv'
-#java -jar bnt-deployer.jar "bnt-agent" ${agent_local_dir} ${agent_remote_dir} ${agent_servers_file}
+#java -jar devops-deployer.jar "devops-agent" ${agent_local_dir} ${agent_remote_dir} ${agent_servers_file}
 
 cd ${base_dir}
 #mvn clean