Commit Graph

194 Commits

Author SHA1 Message Date
hecan cfbda9907c 调整包路径 2024-06-13 10:08:56 +08:00
hecan fe32e653d8 增加api扩展方法,获取应用名称和应用编码 2024-06-11 14:27:42 +08:00
lvleigang f6c4497d68 平台接口修改获取值 2024-06-11 11:19:51 +08:00
hecan aa6da4bf77 操作日志 2024-06-11 10:14:38 +08:00
hecan e928c8de00 通用数据接口调整 2024-06-11 09:57:29 +08:00
hecan 7998823e69 增加插件编码属性 2024-06-11 09:56:39 +08:00
hecan fa81637f50 获取数据来源插件编码 2024-06-11 09:55:44 +08:00
hecan 603d7331b8 获取数据来源插件编码 2024-06-11 09:00:19 +08:00
hecan d2e75c67c0 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-06-07 11:27:27 +08:00
hecan 5fb8613936 分组 2024-06-07 11:26:18 +08:00
lvleigang 17d406b880 Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 2024-06-07 11:20:11 +08:00
lvleigang ffd75fa893 主数据修改 2024-06-07 11:19:57 +08:00
476474485@qq.com a18e5e5179 添加一个u8c堆栈信息打印参数 2024-06-06 14:13:44 +08:00
hecan 2bbfc519b5 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-06-06 10:37:15 +08:00
lvleigang 3ddfc211e3 统一转发接口,如果api地址内包含 http 或者 https 直接使用api完整地址,否则使用 应用接口地址 +api地址 2024-06-06 08:43:01 +08:00
lvleigang df988e6a12 主数据修改 2024-06-06 08:31:59 +08:00
hecan e94581d805 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan
# Conflicts:
#	service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
2024-06-05 11:49:25 +08:00
hecan 42a6ed3086 调整通用数据 2024-06-05 11:46:51 +08:00
lvleigang ce8f2063b2 主数据修改 2024-06-05 11:43:40 +08:00
476474485@qq.com 0cc7c4bafb 删除达梦引用包 2024-06-05 11:41:59 +08:00
lvleigang 860a8336b5 用户密码修改 2024-06-05 10:13:47 +08:00
lvleigang 57afb4fdbf 用户密码修改 2024-06-05 09:47:47 +08:00
lvleigang 64d53eecf9 主数据修改 2024-06-05 08:47:46 +08:00
lvleigang 25a5c388ce 主数据新建类 2024-06-04 12:12:46 +08:00
lvleigang 64f15e4361 主数据新建类 2024-06-04 09:08:43 +08:00
lvleigang 270d0dc510 主数据新建类 2024-06-03 13:39:57 +08:00
lvleigang 9aceb2f78b 主数据新建类 2024-06-03 13:39:48 +08:00
lvleigang 2741e28ba1 主数据新建类 2024-06-03 08:49:43 +08:00
lvleigang 4d9fdcae7a 修改排序顺序 2024-06-03 08:45:36 +08:00
lvleigang 479cfce7ff Merge branch 'lvleigang' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-31 15:26:45 +08:00
lvleigang 478211ad96 修改主数据生成类 2024-05-31 09:12:40 +08:00
xiang2lin 21a81cde5e Merge remote-tracking branch 'origin/lvleigang' into lvleigang 2024-05-30 15:21:21 +08:00
xiang2lin e13746b313 修改扩展方法 2024-05-30 15:13:54 +08:00
hecan ed73b0fbf0 档案对照 2024-05-29 17:21:42 +08:00
hecan 38b8be2709 通用数据 2024-05-29 17:21:14 +08:00
lvleigang 8fa52f957b 修改查询日志顺序 2024-05-29 11:34:34 +08:00
lvleigang e90dc00c12 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-29 10:01:13 +08:00
lvleigang fd681a1a9e 主数据修改字段不会修改问题查找 2024-05-29 10:01:04 +08:00
lvleigang cb3117d5ca 修改接口返回的编码格式 2024-05-28 16:15:09 +08:00
lvleigang a826c4c3e8 修改登录判断空 2024-05-28 15:57:43 +08:00
lvleigang 80a1d2bf11 修改应用缓存 2024-05-28 15:25:30 +08:00
lvleigang db41cff8d2 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-28 11:25:44 +08:00
lvleigang c709069318 修改header先后顺序 2024-05-28 11:21:42 +08:00
lvleigang 1a3e4ea999 修改header先后顺序 2024-05-28 10:56:04 +08:00
lvleigang de0396ea3b 数据源表添加数据源状态字段,删除统一接口权限认证 2024-05-28 10:54:35 +08:00
lvleigang f9f5f5e23f 数据源表添加数据源状态字段,删除统一接口权限认证 2024-05-27 14:21:42 +08:00
lvleigang 09fea1c14c 数据源表添加数据源状态字段,删除统一接口权限认证 2024-05-27 14:11:25 +08:00
hecan 587c969243 通用数据 2024-05-27 11:22:38 +08:00
hecan 96dc367b37 档案对照 2024-05-27 11:21:21 +08:00
lvleigang bde253bf45 数据库版本研究配置 2024-05-23 15:33:25 +08:00
lvleigang 6b422b6e13 统一转发接口,添加日志记录 2024-05-21 14:39:28 +08:00
lvleigang 3826d2a967 修改登录时候校验接口是否授权,修改任务的缓存方法 2024-05-21 11:01:21 +08:00
lvleigang 33b08d475b 主数据上传 2024-05-20 09:02:56 +08:00
xiang2lin 73afa6e056 删除没用的import 2024-05-17 08:41:02 +08:00
lvleigang 4ec6c8dd67 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-16 16:53:18 +08:00
lvleigang 0c52e6337c 主数据上传 2024-05-16 16:53:09 +08:00
相二林 9e66ce7f7e Merge pull request '删除无用的文件' (#33) from yingdesai into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/33
2024-05-16 14:39:34 +08:00
xiang2lin d35f1026fa 删除无用的文件 2024-05-16 14:37:39 +08:00
xiaoguo001 945ddc0ea8 Merge pull request 'yingdesai' (#31) from yingdesai into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/31
2024-05-16 14:32:12 +08:00
476474485@qq.com 9445cf1a46 新增groovy执行方法demo 2024-05-16 14:27:58 +08:00
xiang2lin 92a1f8bed7 seeyonExt OA同步U8 2024-05-16 14:18:21 +08:00
lvleigang 6cded58a35 Merge branches 'dev' and 'lvleigang' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-16 11:03:51 +08:00
xiang2lin e7127e581e Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-16 10:13:09 +08:00
yuqh 72ca970078 Merge pull request '日志明细公用接口调整' (#30) from yuqh into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/30
2024-05-16 10:10:09 +08:00
yuqh 5f25e6e3d5 日志明细公用接口调整 2024-05-16 10:09:31 +08:00
yuqh 4d810e29b0 Merge pull request '日志明细公用接口调整' (#29) from yuqh into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/29
2024-05-16 10:07:47 +08:00
yuqh 8997c78cff 日志明细公用接口调整 2024-05-16 10:06:57 +08:00
yuqh aad900a250 Merge pull request 'yuqh' (#28) from yuqh into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/28
2024-05-16 09:44:56 +08:00
yuqh fcec924c63 日志明细公用接口调整 2024-05-16 09:43:50 +08:00
xiang2lin 0f2e8fb7b7 增加hzyaExtData字段 存放业务自定义字段 2024-05-16 08:58:25 +08:00
xiang2lin 1dec709122 日志处理 2024-05-16 08:44:50 +08:00
lvleigang 5cda40a03b 主数据上传 2024-05-16 08:43:54 +08:00
yuqh c64b37ac9c 日志明细公用接口编写 2024-05-16 08:43:26 +08:00
xiang2lin 18d4c449a9 增加hzyaExtData字段 存放业务自定义字段 2024-05-16 08:38:24 +08:00
xiang2lin 7de7fbfd71 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 16:46:13 +08:00
yuqh cceb06ceb3 日志明细公用接口编写 2024-05-15 16:40:41 +08:00
xiang2lin 9da0eee1d2 日志status枚举 2024-05-15 16:09:25 +08:00
xiang2lin ebea538f59 日志status枚举类 2024-05-15 16:01:59 +08:00
xiang2lin 8659484e9d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 14:51:54 +08:00
lvleigang 561e69b6f5 修改表名及引用地方 2024-05-15 14:49:56 +08:00
lvleigang a201e2193a Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-15 14:46:14 +08:00
lvleigang 1f9b91cac2 修改表名及引用地方 2024-05-15 14:46:05 +08:00
xiang2lin f53def54fc Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 14:37:31 +08:00
yuqh 6eba9c09f8 代码生成 2024-05-15 14:35:18 +08:00
xiang2lin de0e98f55f Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 14:34:56 +08:00
lvleigang 74b7005879 修改表名及引用地方 2024-05-15 14:33:29 +08:00
lvleigang c227e0cae5 修改表名及引用地方 2024-05-15 14:31:08 +08:00
xiang2lin 34a736dce3 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 14:22:22 +08:00
yuqh 7e6d74cf91 代码生成 2024-05-15 14:19:09 +08:00
yuqh 22defdd0a2 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuqh
 Conflicts:
	buildpackage/pom.xml
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java
2024-05-15 14:17:09 +08:00
yuqh 6b67dd8a0d 代码生成 2024-05-15 14:15:04 +08:00
yuqh 3391274c9e 代码生成 2024-05-15 14:10:52 +08:00
xiang2lin 6b50b8295c Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 11:47:02 +08:00
xiang2lin 6b94b68d24 暂存 2024-05-15 11:41:21 +08:00
xiang2lin 717ad1417c 获取token接口 2024-05-15 11:39:41 +08:00
lvleigang ccfa93488c 修改表名及引用地方 2024-05-15 11:36:40 +08:00
lvleigang 9d264af585 Merge branch 'lvleigang' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into dev 2024-05-15 11:32:39 +08:00
lvleigang 9733882fab 修改表名及引用地方 2024-05-15 11:31:44 +08:00
lvleigang bd44a4d16a 修改主数据页面查询功能 2024-05-15 11:12:53 +08:00
lvleigang af9702e58b 表结构生成 2024-05-15 10:16:45 +08:00