CodeCow/datax-web
1
0
Fork 0
mirror of https://github.com/WeiYe-Jing/datax-web.git synced 2026-07-03 21:08:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
410 Commits 6 Branches 6 Tags 292 MiB
fbb2edfdf9
Commit Graph

133 Commits

Author SHA1 Message Date
凌云
47c6cca28a 1、优化用户交互 
2、新增增量时间格式选择
3、分离不同环境配置
4、增加systemctl启动命令
 2020-04-16 16:03:06 +08:00
WeiYe
d6e9b4a9ca
Revert "Feature#61" 2020-03-30 09:44:00 +08:00
water
d9f0c7bb0e merge 2020-03-28 23:12:16 +08:00
water
2ed42b7d93 fix:java.security.InvalidKeyException: Illegal key size 2020-03-27 17:56:08 +08:00
weiye
13e9d250e5 Merge branch 'v2.1.1' into dev 2020-03-27 13:20:10 +08:00
weiye
61b9e18179 #69 修复 2020-03-27 13:15:36 +08:00
weiye
b56f4ac32b Merge branch 'v2.1.1' into dev 2020-03-26 20:25:17 +08:00
weiye
e031913131 mongodb，hbase连接创建优化 2020-03-26 20:24:23 +08:00
weiye
4cb9e19190 #67 修复 2020-03-26 12:00:31 +08:00
water
1faa5cc2ae update:优化代码 2020-03-26 11:55:06 +08:00
water
60ced18885 update:优化代码 2020-03-26 11:50:41 +08:00
weiye
3af40151a5 Merge branch 'v2.1.1' into dev 2020-03-25 15:26:50 +08:00
weiye
cf5a1de21c #66 2020-03-25 15:23:21 +08:00
weiye
1568976c89 #66 2020-03-25 15:21:16 +08:00
weiye
34044f52a4 用户权限代码恢复 2020-03-25 14:18:18 +08:00
weiye
e3b8ae8031 Merge branch 'master' into dev 
# Conflicts:
#	doc/db/2.1.2预留.sql
#	doc/db/datax_web.sql
 2020-03-25 14:08:14 +08:00
water
00f3b5d472
Merge pull request #64 from waterWang/feature#62 
Feature#62
 2020-03-25 12:40:32 +08:00
water
bac25aa1f3
Merge pull request #63 from waterWang/feature#62 
Feature#62
 2020-03-25 12:38:19 +08:00
water
289b566404 #62 2020-03-25 11:19:41 +08:00
weiye
ae50e82119 #60 2020-03-24 18:22:40 +08:00
weiye
39cd3ca3fa #60 2020-03-24 18:19:11 +08:00
weiye
7bce036997 修复权限修改异常问题 2020-03-24 11:13:24 +08:00
weiye
f4751f21ac 更新密码sql修改 2020-03-24 10:47:01 +08:00
water
e5b1e40747
Merge pull request #12 from WeiYe-Jing/dev 
Dev
 2020-03-23 22:12:23 +08:00
weiye
a6275ff95d AESUtil log输出优化 2020-03-23 19:56:24 +08:00
weiye
7e2e599722 注解AESUtil log输出 2020-03-23 19:43:19 +08:00
weiye
e51130f9e8 2.1.1版本提交 2020-03-23 18:52:29 +08:00
water
c1c08345b2 update:优化代码 2020-03-23 14:35:38 +08:00
weiye
c05b17a924 Merge branch 'dev' into v2.1.1 
# Conflicts:
#	datax-admin/src/main/java/com/wugui/datax/admin/config/SecurityConfig.java
#	datax-admin/src/main/java/com/wugui/datax/admin/controller/JobInfoController.java
#	datax-admin/src/main/java/com/wugui/datax/admin/exception/JWTAuthenticationEntryPoint.java
#	datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobJdbcDatasourceMapper.java
#	datax-admin/src/main/java/com/wugui/datax/admin/service/IJobJdbcDatasourceService.java
#	datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobJdbcDatasourceServiceImpl.java
#	datax-admin/src/main/java/com/wugui/datax/admin/service/impl/LoginService.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/BaseReaderPlugin.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/BaseWriterPlugin.java
 2020-03-23 13:41:08 +08:00
weiye
98f9070f2d mongodb json 构建更新 2020-03-23 13:28:48 +08:00
water
8d498c5ca8 test 2020-03-22 23:39:43 +08:00
walkerJing
ed87072703 mongodb数据源测试更新 2020-03-22 22:38:59 +08:00
walkerJing
d0b2a74adc 更新mongodb构建json 2020-03-22 12:37:39 +08:00
walkerJing
29b3defbad 更新mongodb构建json 2020-03-22 12:15:23 +08:00
walkerJing
532ccf701c 更新mongodb构建json 2020-03-22 12:10:18 +08:00
water
0492cb42ae update 2020-03-21 23:28:34 +08:00
weiye
6a588b6141 mongodb json 构建更新 2020-03-21 12:28:03 +08:00
water
f0ce59f136 1，添加功能：按照流程构建datax json时候将json中的账密进行加密，在执行同步任务的时候解密。这样保证用户在任务地方看到的数据库连接信息都是密文； 2020-03-20 20:11:24 +08:00
weiye
8d8ceb93c3 #57功能优化 2020-03-20 19:27:17 +08:00
water
3bd95eae34 #54 2020-03-20 15:25:08 +08:00
water
4e2e035e21 #54 2020-03-20 13:44:15 +08:00
weiye
392d22d45b 删除弃用代码 2020-03-19 22:59:46 +08:00
weiye
d93cb82606 Merge branch 'dev' into v2.1.1 
# Conflicts:
#	datax-admin/pom.xml
#	datax-admin/src/main/java/com/wugui/datax/admin/util/JasyptUtil.java
 2020-03-19 20:31:22 +08:00
weiye
2747f94689 删除弃用代码 2020-03-19 20:26:57 +08:00
water
56ca50a6e1 Merge branch 'feature#55' of https://github.com/waterWang/datax-web into feature#54 2020-03-19 19:58:31 +08:00
water
7ec39d0186 delï¼元数据加密 2020-03-19 19:51:55 +08:00
water
4664f1f679 #55 2020-03-19 19:42:42 +08:00
weiye
15f6ab30a5 合并dev分支 2020-03-19 15:03:10 +08:00
weiye
3090e02c19 Merge branch 'dev' into v2.1.1 
# Conflicts:
#	.gitignore
#	datax-admin/src/main/java/com/wugui/datax/admin/controller/JobDatasourceController.java
#	datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobGroupMapper.java
#	datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JdbcDatasourceQueryServiceImpl.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/DataxJsonHelper.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/BaseReaderPlugin.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/BaseWriterPlugin.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/query/BaseQueryTool.java
#	datax-executor/src/main/java/com/wugui/datax/executor/service/jobhandler/ExecutorJobHandler.java
 2020-03-19 10:08:46 +08:00
weiye
3d68cef3d7 Merge branch 'master' into v2.1.1 
# Conflicts:
#	README.md
#	pom.xml
 2020-03-19 09:24:49 +08:00