From 555a20bc7ff5933bde37f9b0660e9c610e85a514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E5=85=AB?= <jiqi.tjq@alibaba-inc.com>
Date: Sat, 1 Aug 2020 21:45:45 +0800
Subject: [PATCH] [dev] samples change to use powerjob-spring-boot-starter &
 change pom version to 3.2.2

---
 pom.xml                                       |  2 +-
 powerjob-client/pom.xml                       |  4 ++--
 powerjob-common/pom.xml                       |  2 +-
 powerjob-server/pom.xml                       |  4 ++--
 powerjob-worker-agent/pom.xml                 |  4 ++--
 powerjob-worker-samples/pom.xml               |  8 ++++----
 .../powerjob/samples/OhMySchedulerConfig.java | 19 +++++++------------
 .../src/main/resources/application.properties | 10 +++++++++-
 powerjob-worker-spring-boot-starter/pom.xml   |  4 ++--
 powerjob-worker/pom.xml                       |  4 ++--
 10 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae73497b..2a3fc49d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <version>2.0.0</version>
     <packaging>pom</packaging>
     <name>powerjob</name>
-    <url>https://github.com/KFCFans/PowerJob</url>
+    <url>http://www.powerjob.tech</url>
     <description>Distributed scheduling and execution framework</description>
     <licenses>
         <license>
diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml
index 83485c94..d464c9d4 100644
--- a/powerjob-client/pom.xml
+++ b/powerjob-client/pom.xml
@@ -10,11 +10,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-client</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>jar</packaging>
 
     <properties>
-        <powerjob.common.version>3.2.1</powerjob.common.version>
+        <powerjob.common.version>3.2.2</powerjob.common.version>
         <junit.version>5.6.1</junit.version>
     </properties>
 
diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml
index f0aadcfb..9aa123c9 100644
--- a/powerjob-common/pom.xml
+++ b/powerjob-common/pom.xml
@@ -10,7 +10,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-common</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml
index 0675761e..835d725b 100644
--- a/powerjob-server/pom.xml
+++ b/powerjob-server/pom.xml
@@ -10,13 +10,13 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-server</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>jar</packaging>
 
     <properties>
         <swagger.version>2.9.2</swagger.version>
         <springboot.version>2.2.6.RELEASE</springboot.version>
-        <powerjob.common.version>3.2.1</powerjob.common.version>
+        <powerjob.common.version>3.2.2</powerjob.common.version>
         <!-- 数据库驱动版本，使用的是spring-boot-dependencies管理的版本 -->
         <mysql.version>8.0.19</mysql.version>
         <ojdbc.version>19.7.0.0</ojdbc.version>
diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml
index b6a16adb..42d7ef9f 100644
--- a/powerjob-worker-agent/pom.xml
+++ b/powerjob-worker-agent/pom.xml
@@ -10,12 +10,12 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-worker-agent</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>jar</packaging>
 
 
     <properties>
-        <powerjob.worker.version>3.2.1</powerjob.worker.version>
+        <powerjob.worker.version>3.2.2</powerjob.worker.version>
         <logback.version>1.2.3</logback.version>
         <picocli.version>4.3.2</picocli.version>
 
diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml
index 071be86e..3b0f37e2 100644
--- a/powerjob-worker-samples/pom.xml
+++ b/powerjob-worker-samples/pom.xml
@@ -10,11 +10,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powerjob-worker-samples</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
 
     <properties>
         <springboot.version>2.2.6.RELEASE</springboot.version>
-        <powerjob.worker.version>3.2.1</powerjob.worker.version>
+        <powerjob.worker.starter.version>3.2.2</powerjob.worker.starter.version>
         <fastjson.version>1.2.68</fastjson.version>
 
         <!-- 部署时跳过该module -->
@@ -43,8 +43,8 @@
 
         <dependency>
             <groupId>com.github.kfcfans</groupId>
-            <artifactId>powerjob-worker</artifactId>
-            <version>${powerjob.worker.version}</version>
+            <artifactId>powerjob-worker-spring-boot-starter</artifactId>
+            <version>${powerjob.worker.starter.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
         <dependency>
diff --git a/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/OhMySchedulerConfig.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/OhMySchedulerConfig.java
index b4316a36..74b9defc 100644
--- a/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/OhMySchedulerConfig.java
+++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/OhMySchedulerConfig.java
@@ -1,17 +1,10 @@
 package com.github.kfcfans.powerjob.samples;
 
-import com.github.kfcfans.powerjob.worker.OhMyWorker;
-import com.github.kfcfans.powerjob.worker.common.OhMyConfig;
-import com.github.kfcfans.powerjob.worker.common.constants.StoreStrategy;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.List;
-
 /**
- * OMS-Worker 配置
+ * powerjob-worker 配置
+ * 代码配置示例，SpringBoot 项目支持使用 starter，只需要在 application.properties 中完成配置即可
  *
  * @author tjq
  * @since 2020/4/17
@@ -19,8 +12,7 @@ import java.util.List;
 @Configuration
 public class OhMySchedulerConfig {
 
-    @Value("${powerjob.akka.port}")
-    private int port;
+    /*
 
     @Bean
     public OhMyWorker initOMS() throws Exception {
@@ -30,7 +22,7 @@ public class OhMySchedulerConfig {
 
         // 1. 创建配置文件
         OhMyConfig config = new OhMyConfig();
-        config.setPort(port);
+        config.setPort(27777);
         config.setAppName("powerjob-agent-test");
         config.setServerAddress(serverAddress);
         // 如果没有大型 Map/MapReduce 的需求，建议使用内存来加速计算
@@ -40,5 +32,8 @@ public class OhMySchedulerConfig {
         OhMyWorker ohMyWorker = new OhMyWorker();
         ohMyWorker.setConfig(config);
         return ohMyWorker;
+
     }
+
+     */
 }
diff --git a/powerjob-worker-samples/src/main/resources/application.properties b/powerjob-worker-samples/src/main/resources/application.properties
index 7d804f17..ef35ebd2 100644
--- a/powerjob-worker-samples/src/main/resources/application.properties
+++ b/powerjob-worker-samples/src/main/resources/application.properties
@@ -2,4 +2,12 @@ server.port=8081
 
 spring.jpa.open-in-view=false
 
-powerjob.akka.port=27777
\ No newline at end of file
+########### powerjob-worker 配置 ###########
+# akka 工作端口，可选，默认 27777
+powerjob.akka-port=27777
+# 接入应用名称，用于分组隔离，推荐填写 本 Java 项目名称
+powerjob.app-name=powerjob-agent-test
+# 调度服务器地址，IP:Port 或 域名，多值逗号分隔
+powerjob.server-address=127.0.0.1:7700,127.0.0.1:7701
+# 持久化方式，可选，默认 disk
+powerjob.store-strategy=disk
\ No newline at end of file
diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml
index 73c237bf..d778229d 100644
--- a/powerjob-worker-spring-boot-starter/pom.xml
+++ b/powerjob-worker-spring-boot-starter/pom.xml
@@ -10,11 +10,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-worker-spring-boot-starter</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>jar</packaging>
 
     <properties>
-        <powerjob.worker.version>3.2.1</powerjob.worker.version>
+        <powerjob.worker.version>3.2.2</powerjob.worker.version>
         <springboot.version>2.2.6.RELEASE</springboot.version>
     </properties>
 
diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml
index 7fb3fd36..9aee1ae2 100644
--- a/powerjob-worker/pom.xml
+++ b/powerjob-worker/pom.xml
@@ -10,12 +10,12 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-worker</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>jar</packaging>
 
     <properties>
         <spring.version>5.2.4.RELEASE</spring.version>
-        <powerjob.common.version>3.2.1</powerjob.common.version>
+        <powerjob.common.version>3.2.2</powerjob.common.version>
         <h2.db.version>1.4.200</h2.db.version>
         <hikaricp.version>3.4.2</hikaricp.version>
         <junit.version>5.6.1</junit.version>