'commit'

dsData/datax-web/datax-admin/src/main/resources/application.yml

@@ -1,15 +1,11 @@
 server:
-  #port: 8080
+  port: 8080
-  port: ${server.port}
 spring:
   #数据源
   datasource:
-    #    username: root
+    username: ylt
-    #password: root
+    password: Ycharge666
-    #url: jdbc:mysql://localhost:3306/datax_web?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://10.10.14.210:22066/datax_web?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8
-    password: ${DB_PASSWORD:password}
-    username: ${DB_USERNAME:username}
-    url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_DATABASE:dataxweb}?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8
     driver-class-name: com.mysql.jdbc.Driver
 
 
@@ -30,10 +26,8 @@ spring:
   mail:
     host: smtp.qq.com
     port: 25
-    #username: xxx@qq.com
+    username: 10402852@qq.com
-    #password: xxx
+    password: jfdbifdxsahlbjjf
-    username: ${mail.username}
-    password: ${mail.password}
     properties:
       mail:
         smtp:
@@ -83,12 +77,9 @@ mybatis-plus:
 
 # 配置mybatis-plus打印sql日志
 logging:
-  #level:
-  #  com.wugui.datax.admin.mapper: info
-#path: ./data/applogs/admin
   level:
-    com.wugui.datax.admin.mapper: error
+    com.wugui.datax.admin.mapper: info
-    path: ${data.path}/applogs/admin
+    path: ./data/applogs/admin
 
 
 

dsData/datax-web/datax-executor/src/main/resources/application.yml

@@ -1,36 +1,30 @@
 # web port
 server:
-  port: ${server.port}
+  port: 8081
-  #port: 8081
 
 # log config
 logging:
   config: classpath:logback.xml
-  path: ${data.path}/applogs/executor/jobhandler
+  path: ./data/applogs/executor/jobhandler
-  #path: ./data/applogs/executor/jobhandler
 
 datax:
   job:
     admin:
       ### datax admin address list, such as "http://address" or "http://address01,http://address02"
-      #addresses: http://127.0.0.1:8080
+      addresses: http://127.0.0.1:8080
-      addresses: http://127.0.0.1:${datax.admin.port}
     executor:
       appname: datax-executor
       ip:
-      #port: 9999
+      port: 9999
-      port: ${executor.port:9999}
       ### job log path
-      #logpath: ./data/applogs/executor/jobhandler
+      logpath: ./data/applogs/executor/jobhandler
-      logpath: ${data.path}/applogs/executor/jobhandler
       ### job log retention days
       logretentiondays: 30
     ### job, access token
     accessToken:
 
   executor:
-    #jsonpath: D:\\temp\\executor\\json\\
+    # 这里需要填写什么？
-    jsonpath: ${json.path}
+    jsonpath: D:\\temp\\executor\\json\\
 
-  #pypath: F:\tools\datax\bin\datax.py
+  pypath: /usr/local/datax/core/src/main/bin/datax.py
-  pypath: ${python.path}

dsData/文档.md

@@ -89,4 +89,24 @@ https://github.com/WeiYe-Jing/datax-web.git
 https://github.com/WeiYe-Jing/datax-web/blob/master/userGuid.md
 ```
 
-<font color='red' size='4px'>**注意：因为项目依赖的SpringBoot版本较老，阿里云镜像中已经找不到这个版本，还用阿里云镜像加速下载会出现找不到JAR的问题，一定要保证 $Maven$的设置中去掉阿里云的镜像服务!**</font>
+<font color='red' size='4px'>**注意：因为项目依赖的SpringBoot版本较老，阿里云镜像中已经找不到这个版本，还用阿里云镜像加速下载会出现找不到JAR的问题，一定要保证 $Maven$的设置中去掉阿里云的镜像服务!**</font>
+
+
+
+下载Hadoop插件
+
+```sh
+https://github.com/steveloughran/winutils
+
+# 配置Hadoop目录
+D:\dsWork\dsProject\dsData\hadoop
+
+# 添加系统变量
+HADOOP_HOME = D:\dsWork\dsProject\dsData\hadoop
+编辑Path变量 → 新增条目：%HADOOP_HOME%\bin
+
+# 验证
+winutils version  # 应显示版本信息
+hadoop fs -ls /   # 测试HDFS命令是否报错
+```
+