config: 更新项目配置文件

.gitignore

-/applogs/
+applogs/**
 *.logs
-/.idea/
+.idea/**
+.idea
+
 **/target/
+/build/*
+/derby.log

pom.xml

@@ -16,7 +16,8 @@
         <ruoshui.version>3.8.2</ruoshui.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <!--<java.version>1.8</java.version>-->
+        <java.version>11</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.8</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
@@ -70,8 +71,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.test.skip>false</maven.test.skip>
         <downloadSources>true</downloadSources>
-        <java_source_version>1.8</java_source_version>
-        <java_target_version>1.8</java_target_version>
+<!--        <java_source_version>1.8</java_source_version>-->
+<!--        <java_target_version>1.8</java_target_version>-->
         <file_encoding>UTF-8</file_encoding>
         <flink_streaming_version>1.4.0.RELEASE</flink_streaming_version>
         <flink.version>1.16.2</flink.version>

ruoshui-admin/pom.xml

@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <artifactId>ruoshui-admin</artifactId>
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
+<!--    <properties>-->
+<!--        <java.version>1.8</java.version>-->
+<!--    </properties>-->
     <description>
         web服务入口
     </description>

ruoshui-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://cluster03.toroidal.com:3306/bigdata?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: Mendale#2022
-                url: jdbc:mysql://127.0.0.1:3306/test_ruoshui_bigdata_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.100.40:3306/ruoshui_bigdata?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: Wxl@325Pa91
+#                url: jdbc:mysql://127.0.0.1:3306/test_ruoshui_bigdata_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -58,3 +58,46 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+
+
+
+# 日志配置
+logging:
+  level:
+    com.ruoshui: info
+    org.springframework: info
+    # MyBatis SQL打印配置
+    com.baomidou.mybatisplus: debug
+    com.ruoshui.**.mapper: debug
+
+# ... 其他配置 ...
+
+mybatis-plus:
+  # mapper.xml文件扫描
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  # 实体扫描，多个package用逗号或者分号分隔
+  type-aliases-package: com.ruoshui.**.domain
+  global-config:
+    # 数据库相关配置
+    db-config:
+      # 主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: AUTO
+      # 字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      # 驼峰下划线转换
+      column-underline: true
+      # 逻辑删除
+      logic-delete-value: 0
+      logic-not-delete-value: 1
+      # 数据库类型
+      db-type: mysql
+    banner: false
+  # mybatis原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
+    type-handlers-package: com.ruoshui.core.handler
+    # 配置SQL日志实现类，将SQL打印到控制台
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

ruoshui-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoshui:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoshui/uploadPath，Linux配置 /home/ruoshui/uploadPath）
-  profile: ./applogs/bigdata/uploadPath
+  profile: ./upload/ruoshui/
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

ruoshui-core/src/main/java/com/ruoshui/core/enums/glue/GlueTypeEnum.java

@@ -10,7 +10,8 @@ public enum GlueTypeEnum {
     BEAN("BEAN", false, null, null),
     GLUE_GROOVY("GLUE(Java)", false, null, null),
     GLUE_SHELL("GLUE(Shell)", true, "bash", ".sh"),
-    GLUE_PYTHON("GLUE(Python)", true, "python", ".py"),
+//    GLUE_PYTHON("GLUE(Python)", true, "python", ".py"),
+    GLUE_PYTHON("GLUE(Python)", true, "python3", ".py"),
     GLUE_PHP("GLUE(PHP)", true, "php", ".php"),
     GLUE_NODEJS("GLUE(Nodejs)", true, "node", ".js"),
     GLUE_POWERSHELL("GLUE(PowerShell)", true, "powershell", ".ps1");

ruoshui-core/src/main/java/com/ruoshui/core/enums/util/ScriptUtil.java

@@ -5,6 +5,7 @@ import com.ruoshui.core.enums.biz.model.HandleProcessCallbackParam;
 import com.ruoshui.core.enums.log.JobLogger;
 import com.ruoshui.core.enums.thread.ProcessCallbackThread;
 import com.ruoshui.core.util.ProcessUtil;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -21,6 +22,7 @@ import java.util.List;
  * <p>
  * Created by xuxueli on 17/2/25.
  */
+@Slf4j
 public class ScriptUtil {
 
     /**
@@ -71,13 +73,13 @@ public class ScriptUtil {
             if (params != null && params.length > 0) {
                 for (String param : params) {
                     cmdarray.add(param);
+                    log.info("1param:" + param);
                 }
             }
             String[] cmdarrayFinal = cmdarray.toArray(new String[cmdarray.size()]);
 
             // process-exec
             final Process process = Runtime.getRuntime().exec(cmdarrayFinal);
-
             String prcsId = ProcessUtil.getProcessId(process);
             JobLogger.log("------------------Process id: " + prcsId);
             //update task process id

ruoshui-core/src/main/java/com/ruoshui/core/glue/GlueTypeEnum.java

@@ -12,7 +12,8 @@ public enum GlueTypeEnum {
     BEAN("BEAN", false, null, null),
     GLUE_GROOVY("GLUE(Java)", false, null, null),
     GLUE_SHELL("GLUE(Shell)", true, "bash", ".sh"),
-    GLUE_PYTHON("GLUE(Python)", true, "python", ".py"),
+//    GLUE_PYTHON("GLUE(Python)", true, "python", ".py"),
+    GLUE_PYTHON("GLUE(Python)", true, "python3", ".py"),
     GLUE_PHP("GLUE(PHP)", true, "php", ".php"),
     GLUE_NODEJS("GLUE(Nodejs)", true, "node", ".js"),
     GLUE_POWERSHELL("GLUE(PowerShell)", true, "powershell", ".ps1");

ruoshui-core/src/main/java/com/ruoshui/core/util/ProcessUtil.java

@@ -45,7 +45,9 @@ public class ProcessUtil {
 //                field.setAccessible(true);
 //                pid = (Integer) field.get(process);
                 // 服务器上的jdk版本大于8 ，不兼容当前的模式
-                if (process.getClass().getName().equals("java.lang.UNIXProcess")) {
+                String processName = process.getClass().getName();
+                logger.info("processName: {}", processName);
+                if (processName.equals("java.lang.UNIXProcess")) {
                     try {
                         // 仅Java 8兼容：保留原逻辑（可选）
                         Field pidField = process.getClass().getDeclaredField("pid");

ruoshui-core/src/main/java/com/ruoshui/core/util/ScriptUtil.java

@@ -4,6 +4,7 @@ package com.ruoshui.core.util;
 import com.ruoshui.core.biz.model.HandleProcessCallbackParam;
 import com.ruoshui.core.log.JobLogger;
 import com.ruoshui.core.thread.ProcessCallbackThread;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -20,6 +21,7 @@ import java.util.List;
  * <p>
  * Created by xuxueli on 17/2/25.
  */
+@Slf4j
 public class ScriptUtil {
 
     /**
@@ -70,10 +72,12 @@ public class ScriptUtil {
             if (params != null && params.length > 0) {
                 for (String param : params) {
                     cmdarray.add(param);
+                    log.info("2param:" + param);
                 }
             }
             String[] cmdarrayFinal = cmdarray.toArray(new String[cmdarray.size()]);
 
+
             // process-exec
             final Process process = Runtime.getRuntime().exec(cmdarrayFinal);
 

ruoshui-datax-executor/src/main/java/executor/service/jobhandler/ExecutorJobHandler.java

@@ -50,6 +50,8 @@ public class ExecutorJobHandler extends IJobHandler {
 
         try {
             String[] cmdarrayFinal = BuildCommand.buildDataXExecutorCmd(trigger, tmpFilePath,dataXPyPath);
+
+            JobLogger.log("------------------DataX command: " + StringUtils.join(cmdarrayFinal, " "));
             final Process process = Runtime.getRuntime().exec(cmdarrayFinal);
             String prcsId = ProcessUtil.getProcessId(process);
             JobLogger.log("------------------DataX process id: " + prcsId);