[modify] fix the problem occured in renaming project to powerjob

others/script/build_docker.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 # -p：允许后面跟一个字符串作为提示 -r：保证读入的是原始内容，不会发生任何转义
 read -r -p "请输入Dockedr镜像版本:" version
-echo "即将构建的 server 镜像：oms-server:$version"
-echo "即将构建的 agent 镜像：oms-agent:$version"
+echo "即将构建的 server 镜像：powerjob-server:$version"
+echo "即将构建的 agent 镜像：powerjob-agent:$version"
 read -r -p "任意键继续:"
 
 # 一键部署脚本，请勿挪动脚本
@@ -12,40 +12,40 @@ read -r -p "是否进行maven构建（y/n）:" needmvn
 if [ "$needmvn" = "y" ] || [  "$needmvn" = "Y" ]; then
   echo "================== 构建 jar =================="
   # -U：强制检查snapshot库 -pl：指定需要构建的模块，多模块逗号分割 -am：同时构建依赖模块，一般与pl连用 -Pxxx：指定使用的配置文件
-  mvn clean package -Pdev -DskipTests -U -e -pl oh-my-scheduler-server,oh-my-scheduler-worker-agent -am
+  mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am
   echo "================== 拷贝 jar =================="
-  /bin/cp -rf oh-my-scheduler-server/target/*.jar oh-my-scheduler-server/docker/oms-server.jar
-  /bin/cp -rf oh-my-scheduler-worker-agent/target/*.jar oh-my-scheduler-worker-agent/oms-agent.jar
-  ls -l oh-my-scheduler-server/docker/oms-server.jar
-  ls -l oh-my-scheduler-worker-agent/oms-agent.jar
+  /bin/cp -rf powerjob-server/target/*.jar powerjob-server/docker/powerjob-server.jar
+  /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar
+  ls -l powerjob-server/docker/powerjob-server.jar
+  ls -l powerjob-worker-agent/powerjob-agent.jar
 fi
 
 echo "================== 关闭老应用 =================="
-docker stop oms-server
-docker stop oms-agent
-docker stop oms-agent2
+docker stop powerjob-server
+docker stop powerjob-agent
+docker stop powerjob-agent2
 echo "================== 删除老容器 =================="
-docker container rm oms-server
-docker container rm oms-agent
-docker container rm oms-agent2
+docker container rm powerjob-server
+docker container rm powerjob-agent
+docker container rm powerjob-agent2
 read -r -p "是否重新构建镜像（y/n）:" rebuild
 if [ "$rebuild" = "y" ] || [  "$rebuild" = "Y" ]; then
   echo "================== 删除旧镜像 =================="
-  docker rmi -f tjqq/oms-server:$version
-  docker rmi -f tjqq/oms-agent:$version
-  echo "================== 构建 oms-server 镜像 =================="
-  docker build -t tjqq/oms-server:$version oh-my-scheduler-server/docker/. || exit
-  echo "================== 构建 oms-agent 镜像 =================="
-  docker build -t tjqq/oms-agent:$version oh-my-scheduler-worker-agent/. || exit
+  docker rmi -f tjqq/powerjob-server:$version
+  docker rmi -f tjqq/powerjob-agent:$version
+  echo "================== 构建 powerjob-server 镜像 =================="
+  docker build -t tjqq/powerjob-server:$version powerjob-server/docker/. || exit
+  echo "================== 构建 powerjob-agent 镜像 =================="
+  docker build -t tjqq/powerjob-agent:$version powerjob-worker-agent/. || exit
 
   read -r -p "是否正式发布该镜像（y/n）:" needrelease
   if [ "$needrelease" = "y" ] || [  "$needrelease" = "Y" ]; then
     read -r -p "三思！请确保当前处于已发布的Master分支！（y/n）:" needrelease
     if [ "$needrelease" = "y" ] || [  "$needrelease" = "Y" ]; then
       echo "================== 正在推送 server 镜像到中央仓库 =================="
-      docker push tjqq/oms-server:$version
+      docker push tjqq/powerjob-server:$version
       echo "================== 正在推送 agent 镜像到中央仓库 =================="
-      docker push tjqq/oms-agent:$version
+      docker push tjqq/powerjob-agent:$version
     fi
   fi
 fi
@@ -59,23 +59,23 @@ if [ "$startup" = "y" ] || [  "$startup" = "Y" ]; then
   ## --name：指定容器名称
   ## -v（--volume）：挂载目录，宿主机目录：docker内目录，写入docker内路径的数据会被直接写到宿主机上，常用于日志文件
   ## --net=host：容器和宿主机共享网络（容器直接使用宿主机IP，性能最好，但网络隔离较差）
-  echo "================== 准备启动 oms-server =================="
+  echo "================== 准备启动 powerjob-server =================="
   docker run -d \
-         --name oms-server \
+         --name powerjob-server \
          -p 7700:7700 -p 10086:10086 \
          -e PARAMS="--spring.profiles.active=pre" \
-         -v ~/docker/oms-server:/root/oms-server -v ~/.m2:/root/.m2 \
-         tjqq/oms-server:$version
+         -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \
+         tjqq/powerjob-server:$version
   sleep 1
 #  tail -f -n 1000 ~/docker/oms-server/logs/oms-server-application.log
 
   sleep 30
-  echo "================== 准备启动 oms-client =================="
-  serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' oms-server)
+  echo "================== 准备启动 powerjob-client =================="
+  serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' powerjob-server)
   serverAddress="$serverIP:7700"
   echo "使用的Server地址：$serverAddress"
-  docker run -d -e PARAMS="--app oms-agent-test --server $serverAddress" -p 27777:27777 --name oms-agent -v ~/docker/oms-agent:/root tjqq/oms-agent:$version
-  docker run -d -e PARAMS="--app oms-agent-test --server $serverAddress" -p 27778:27777 --name oms-agent2 -v ~/docker/oms-agent2:/root tjqq/oms-agent:$version
+  docker run -d -e PARAMS="--app powerjob-agent-test --server $serverAddress" -p 27777:27777 --name powerjob-agent -v ~/docker/powerjob-agent:/root tjqq/powerjob-agent:$version
+  docker run -d -e PARAMS="--app powerjob-agent-test --server $serverAddress" -p 27778:27777 --name powerjob-agent2 -v ~/docker/powerjob-agent2:/root tjqq/powerjob-agent:$version
 
-  tail -f -n 100 ~/docker/oms-agent/oms/logs/oms-agent-application.log
+  tail -f -n 100 ~/docker/powerjob-agent/powerjob/logs/oms-agent-application.log
 fi

powerjob-server/docker/Dockerfile

@@ -4,27 +4,27 @@ FROM openjdk:8
 MAINTAINER tengjiqi@gmail.com
 # 下载并安装 maven
 RUN curl -O https://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
-RUN tar -zxvf apache-maven-3.6.3-bin.tar.gz && mv apache-maven-3.6.3 /opt/oms-maven && rm -rf apache-maven-3.6.3-bin.tar.gz
+RUN tar -zxvf apache-maven-3.6.3-bin.tar.gz && mv apache-maven-3.6.3 /opt/powerjob-maven && rm -rf apache-maven-3.6.3-bin.tar.gz
 # 替换 maven 配置文件
-RUN rm -rf /opt/oms-maven/conf/settings.xml
-COPY settings.xml /opt/oms-maven/conf/settings.xml
+RUN rm -rf /opt/powerjob-maven/conf/settings.xml
+COPY settings.xml /opt/powerjob-maven/conf/settings.xml
 # 设置 maven 环境变量（maven invoker 读取该变量调用 maven）
-ENV M2_HOME=/opt/oms-maven
+ENV M2_HOME=/opt/powerjob-maven
 
 # 设置时区（Debian专用方法）
 ENV TZ=Asia/Shanghai
 
 # 设置其他环境变量
-ENV APP_NAME=oh-my-scheduler-server
+ENV APP_NAME=powerjob-server
 # 传递 SpringBoot 启动参数
 ENV PARAMS=""
 # 将应用 jar 包拷入 docker
-COPY oms-server.jar /oms-server.jar
+COPY powerjob-server.jar /powerjob-server.jar
 # 暴露端口（HTTP + AKKA）
 EXPOSE 7700 10086
 # 创建 docker 文件目录（盲猜这是用户目录）
-RUN mkdir -p /root/oms-server
+RUN mkdir -p /root/powerjob-server
 # 挂载数据卷，将文件直接输出到宿主机（注意，此处挂载的是匿名卷，即在宿主机位置随机）
-VOLUME /root/oms-server
+VOLUME /root/powerjob-server
 # 启动应用
-ENTRYPOINT ["sh","-c","java -jar /oms-server.jar $PARAMS"]
+ENTRYPOINT ["sh","-c","java -jar /powerjob-server.jar $PARAMS"]

powerjob-server/src/main/resources/logback-product.xml

@@ -6,13 +6,13 @@
         日志路径，注意权限问题，否则无法打印日志。
         大坑记录：`~/logs`不会在用户目录下创建文件夹，而是在项目目录下创建名为~的文件夹
      -->
-    <property name="LOG_PATH" value="${user.home}/oms-server/logs"/>
+    <property name="LOG_PATH" value="${user.home}/powerjob-server/logs"/>
 
     <!-- 系统所有异常日志（ERROR）双写 start -->
     <appender name="ERROR_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/oms-server-error.log</file>
+        <file>${LOG_PATH}/powerjob-server-error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_PATH}/oms-server-error.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${LOG_PATH}/powerjob-server-error.%d{yyyy-MM-dd}.log</FileNamePattern>
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -29,9 +29,9 @@
 
     <!-- web 访问日志 start -->
     <appender name="WEB_LOG_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/oms-server-web.log</file>
+        <file>${LOG_PATH}/powerjob-server-web.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_PATH}/oms-server-web.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${LOG_PATH}/powerjob-server-web.%d{yyyy-MM-dd}.log</FileNamePattern>
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -47,9 +47,9 @@
 
     <!-- 系统主日志 start -->
     <appender name="DEFAULT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/oms-server-application.log</file>
+        <file>${LOG_PATH}/powerjob-server-application.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_PATH}/oms-server-application.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${LOG_PATH}/powerjob-server-application.%d{yyyy-MM-dd}.log</FileNamePattern>
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

powerjob-worker-agent/Dockerfile

@@ -4,13 +4,13 @@ MAINTAINER tengjiqi@gmail.com
 # 设置时区
 ENV TZ=Asia/Shanghai
 
-ENV APP_NAME=oh-my-scheduler-worker-agent
+ENV APP_NAME=powerjob-worker-agent
 ENV PARAMS=""
 
-COPY oms-agent.jar /oms-agent.jar
+COPY powerjob-agent.jar /powerjob-agent.jar
 # 暴露端口（AKKA-Client）
 EXPOSE 27777
 # 挂载数据卷，将文件直接输出到宿主机（注意，此处挂载的是匿名卷，即在宿主机位置随机）
 VOLUME /root
 # 启动应用
-ENTRYPOINT ["sh","-c","java -jar /oms-agent.jar $PARAMS"]
+ENTRYPOINT ["sh","-c","java -jar /powerjob-agent.jar $PARAMS"]

powerjob-worker-agent/src/main/resources/logback.xml

@@ -6,7 +6,7 @@
         日志路径，注意权限问题，否则无法打印日志。
         大坑记录：`~/logs`不会在用户目录下创建文件夹，而是在项目目录下创建名为~的文件夹
      -->
-    <property name="LOG_PATH" value="${user.home}/oms/logs"/>
+    <property name="LOG_PATH" value="${user.home}/powerjob/logs"/>
 
     <property name="CONSOLE_LOG_PATTERN"
               value="%yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%blue(%thread) |%blue(%file:%line) |%green(%logger) |%cyan(%msg%n)"/>

powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/ConnectionFactory.java

@@ -19,8 +19,8 @@ public class ConnectionFactory {
 
     private static volatile DataSource dataSource;
 
-    private static final String DISK_JDBC_URL = "jdbc:h2:file:~/oms/h2/oms_worker_db";
-    private static final String MEMORY_JDBC_URL = "jdbc:h2:mem:~/oms/h2/oms_worker_db";
+    private static final String DISK_JDBC_URL = "jdbc:h2:file:~/powerjob/h2/oms_worker_db";
+    private static final String MEMORY_JDBC_URL = "jdbc:h2:mem:~/powerjob/h2/oms_worker_db";
 
     public static Connection getConnection() throws SQLException {
         return getDataSource().getConnection();