Ver Fonte

powerjob适配人大金仓

zoro há 11 meses atrás
pai
commit
698a97bc96

+ 7 - 0
powerjob-server/pom.xml

@@ -30,6 +30,7 @@
 
 
         <!-- MySQL version that corresponds to spring-boot-dependencies version. -->
         <!-- MySQL version that corresponds to spring-boot-dependencies version. -->
         <mysql.version>8.0.33</mysql.version>
         <mysql.version>8.0.33</mysql.version>
+        <kingbase.version>8.6.0</kingbase.version>
         <ojdbc.version>19.7.0.0</ojdbc.version>
         <ojdbc.version>19.7.0.0</ojdbc.version>
         <mssql-jdbc.version>7.4.1.jre8</mssql-jdbc.version>
         <mssql-jdbc.version>7.4.1.jre8</mssql-jdbc.version>
         <db2-jdbc.version>11.5.0.0</db2-jdbc.version>
         <db2-jdbc.version>11.5.0.0</db2-jdbc.version>
@@ -157,6 +158,12 @@
             <artifactId>mysql-connector-java</artifactId>
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql.version}</version>
             <version>${mysql.version}</version>
         </dependency>
         </dependency>
+        <!-- kingbase -->
+        <dependency>
+            <groupId>cn.com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+            <version>${kingbase.version}</version>
+        </dependency>
         <!-- oracle -->
         <!-- oracle -->
         <dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
             <groupId>com.oracle.database.jdbc</groupId>

+ 29 - 0
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/dialect/AdpKingBaseSQLDialect.java

@@ -0,0 +1,29 @@
+package tech.powerjob.server.persistence.config.dialect;
+
+import org.hibernate.dialect.PostgreSQL9Dialect;
+import org.hibernate.type.descriptor.sql.LongVarbinaryTypeDescriptor;
+import org.hibernate.type.descriptor.sql.LongVarcharTypeDescriptor;
+import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
+
+import java.sql.Types;
+
+public class AdpKingBaseSQLDialect extends PostgreSQL9Dialect {
+    public AdpKingBaseSQLDialect(){
+        super();
+        registerColumnType(Types.BLOB,"bytea");
+        registerColumnType(Types.CLOB,"text");
+    }
+
+    @Override
+    public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor){
+        switch (sqlTypeDescriptor.getSqlType()){
+            case Types.CLOB:
+                return LongVarcharTypeDescriptor.INSTANCE;
+            case Types.BLOB:
+                return LongVarbinaryTypeDescriptor.INSTANCE;
+            case Types.NCLOB:
+                return LongVarbinaryTypeDescriptor.INSTANCE;
+        }
+        return super.remapSqlTypeDescriptor(sqlTypeDescriptor);
+    }
+}

+ 18 - 18
powerjob-server/powerjob-server-starter/src/main/resources/application-daily.properties

@@ -2,35 +2,35 @@ oms.env=DAILY
 logging.config=classpath:logback-dev.xml
 logging.config=classpath:logback-dev.xml
 
 
 ####### Database properties(Configure according to the the environment) #######
 ####### Database properties(Configure according to the the environment) #######
-spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.core.jdbc-url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.core.username=root
-spring.datasource.core.password=No1Bug2Please3!
+spring.datasource.core.driver-class-name=com.kingbase8.Driver
+spring.datasource.core.jdbc-url=jdbc:kingbase8://10.83.240.181:54322/kingbase
+spring.datasource.core.username=system
+spring.datasource.core.password=Ghzx2023!
 spring.datasource.core.maximum-pool-size=20
 spring.datasource.core.maximum-pool-size=20
 spring.datasource.core.minimum-idle=5
 spring.datasource.core.minimum-idle=5
 
 
 ####### Storage properties(Delete if not needed)  #######
 ####### Storage properties(Delete if not needed)  #######
 #oms.storage.dfs.mongodb.uri=mongodb+srv://zqq:No1Bug2Please3!@cluster0.wie54.gcp.mongodb.net/powerjob_daily?retryWrites=true&w=majority
 #oms.storage.dfs.mongodb.uri=mongodb+srv://zqq:No1Bug2Please3!@cluster0.wie54.gcp.mongodb.net/powerjob_daily?retryWrites=true&w=majority
-oms.storage.dfs.mysql_series.driver=com.mysql.cj.jdbc.Driver
-oms.storage.dfs.mysql_series.url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-oms.storage.dfs.mysql_series.username=root
-oms.storage.dfs.mysql_series.password=No1Bug2Please3!
-oms.storage.dfs.mysql_series.auto_create_table=true
+#oms.storage.dfs.mysql_series.driver=com.mysql.cj.jdbc.Driver
+#oms.storage.dfs.mysql_series.url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+#oms.storage.dfs.mysql_series.username=root
+#oms.storage.dfs.mysql_series.password=No1Bug2Please3!
+#oms.storage.dfs.mysql_series.auto_create_table=true
 
 
 ####### Email properties(Non-core configuration properties) #######
 ####### Email properties(Non-core configuration properties) #######
 ####### Delete the following code to disable the mail #######
 ####### Delete the following code to disable the mail #######
-spring.mail.host=smtp.163.com
-spring.mail.username=zqq@163.com
-spring.mail.password=GOFZPNARMVKCGONV
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true
+#spring.mail.host=smtp.163.com
+#spring.mail.username=zqq@163.com
+#spring.mail.password=GOFZPNARMVKCGONV
+#spring.mail.properties.mail.smtp.auth=true
+#spring.mail.properties.mail.smtp.starttls.enable=true
+#spring.mail.properties.mail.smtp.starttls.required=true
 
 
 ####### DingTalk properties(Non-core configuration properties) #######
 ####### DingTalk properties(Non-core configuration properties) #######
 ####### Delete the following code to disable the DingTalk #######
 ####### Delete the following code to disable the DingTalk #######
-oms.alarm.ding.app-key=dingauqwkvxxnqskknfv
-oms.alarm.ding.app-secret=XWrEPdAZMPgJeFtHuL0LH73LRj-74umF2_0BFcoXMfvnX0pCQvt0rpb1JOJU_HLl
-oms.alarm.ding.agent-id=847044348
+#oms.alarm.ding.app-key=dingauqwkvxxnqskknfv
+#oms.alarm.ding.app-secret=XWrEPdAZMPgJeFtHuL0LH73LRj-74umF2_0BFcoXMfvnX0pCQvt0rpb1JOJU_HLl
+#oms.alarm.ding.agent-id=847044348
 
 
 ####### Resource cleaning properties #######
 ####### Resource cleaning properties #######
 oms.instanceinfo.retention=1
 oms.instanceinfo.retention=1

+ 4 - 2
powerjob-server/powerjob-server-starter/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 # Http server port
 # Http server port
-server.port=7700
+server.port=9090
 
 
 spring.profiles.active=daily
 spring.profiles.active=daily
 spring.main.banner-mode=log
 spring.main.banner-mode=log
@@ -19,4 +19,6 @@ oms.transporter.main.protocol=HTTP
 oms.akka.port=10086
 oms.akka.port=10086
 oms.http.port=10010
 oms.http.port=10010
 # Prefix for all tables. Default empty string. Config if you have needs, i.e. pj_
 # Prefix for all tables. Default empty string. Config if you have needs, i.e. pj_
-oms.table-prefix=
+oms.table-prefix=
+
+spring.datasource.remote.hibernate.properties.hibernate.dialect=tech.powerjob.server.persistence.config.dialect.AdpKingBaseSQLDialect

+ 18 - 0
powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/TestPowJobDemo2.java

@@ -0,0 +1,18 @@
+package tech.powerjob.samples.processors;
+
+import lombok.extern.slf4j.Slf4j;
+import tech.powerjob.worker.core.processor.ProcessResult;
+import tech.powerjob.worker.core.processor.TaskContext;
+import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
+
+@Slf4j
+public class TestPowJobDemo2 implements BasicProcessor {
+
+    private Integer baseInteger = 1;
+    @Override
+    public ProcessResult process(TaskContext context) throws Exception {
+        baseInteger--;
+        System.out.println(baseInteger);
+        return new ProcessResult(true,baseInteger.toString());
+    }
+}

+ 3 - 3
powerjob-worker-samples/src/main/resources/application.properties

@@ -6,11 +6,11 @@ powerjob.worker.enabled=true
 # Turn on test mode and do not force the server connection to be verified
 # Turn on test mode and do not force the server connection to be verified
 powerjob.worker.allow-lazy-connect-server=false
 powerjob.worker.allow-lazy-connect-server=false
 # Transport port, default is 27777
 # Transport port, default is 27777
-powerjob.worker.port=27777
+powerjob.worker.port=27778
 # Application name, used for grouping applications. Recommend to set the same value as project name.
 # Application name, used for grouping applications. Recommend to set the same value as project name.
-powerjob.worker.app-name=powerjob-worker-samples
+powerjob.worker.app-name=admin
 # Address of PowerJob-server node(s). Ip:port or domain. Multiple addresses should be separated with comma.
 # Address of PowerJob-server node(s). Ip:port or domain. Multiple addresses should be separated with comma.
-powerjob.worker.server-address=127.0.0.1:7700,127.0.0.1:7701
+powerjob.worker.server-address=127.0.0.1:9090
 # transport protocol between server and worker
 # transport protocol between server and worker
 powerjob.worker.protocol=http
 powerjob.worker.protocol=http
 # Store strategy of H2 database. disk or memory. Default value is disk.
 # Store strategy of H2 database. disk or memory. Default value is disk.