hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
508 Commits 41 Branches 0 Tags 34 MiB
Commit Graph

335 Commits

Author SHA1 Message Date
xiang2lin 486ba7b0a8 cbs8接口 2024-06-20 13:51:22 +08:00
lvleigang 2adb827e0d Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 2024-06-20 08:43:44 +08:00
lvleigang 4e94526a30 主数据修改 2024-06-20 08:43:33 +08:00
xiang2lin b11be51018 增加达梦数据源 2024-06-19 17:55:32 +08:00
xiang2lin 026fcab189 去掉过滤条件 2024-06-19 17:51:28 +08:00
xiang2lin ed316c2cdc 增加达梦数据源 2024-06-19 17:48:14 +08:00
xiang2lin 50541f7ca5 Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-19 16:57:03 +08:00
xiang2lin f8238f9000 增加ds注解 2024-06-19 16:56:40 +08:00
yuqh c9cd5e817b Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-19 15:31:40 +08:00
yuqh a664a96cfe MDM公用文件 2024-06-19 15:31:31 +08:00
xiang2lin dd47f23b8b 代发代扣查询响应数据 2024-06-19 15:29:41 +08:00
hecan 4fefde38eb 调整金额字段 2024-06-19 15:18:53 +08:00
hecan f1fcd9658a 差旅费用报销单测试sql语句 2024-06-19 14:45:09 +08:00
xiang2lin 375e1619b0 去掉没用的引用 2024-06-19 14:36:58 +08:00
xiang2lin 442fbb602e cbs8接口 2024-06-19 13:58:05 +08:00
lvleigang 772a2e86f5 修改返回默认值 2024-06-19 11:56:42 +08:00
xiang2lin 004250f55d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-19 11:33:29 +08:00
476474485@qq.com 2b624f5813 調整Base64.getEncoder().encodeToString(encryptedData) 2024-06-19 11:31:30 +08:00
lvleigang b595bba61b 主数据下发，重新发送 2024-06-19 10:17:03 +08:00
lvleigang 0ba8aebf25 主数据下发，重新发送 2024-06-19 10:16:47 +08:00
xiang2lin 86a977160d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
# Conflicts:
#	buildpackage/src/test/java/com/hzya/frame/temButtom.java
#	pom.xml
#	service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java
#	webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java
 2024-06-19 10:15:33 +08:00
xiang2lin 5b19809ef0 cbs8 接口相关 2024-06-19 10:07:12 +08:00
xiang2lin 2f6f7e1755 cbs8接口 2024-06-19 10:06:03 +08:00
xiang2lin 351ed98ab4 cbs8接口 2024-06-19 10:05:15 +08:00
476474485@qq.com f645cb96db 增加byte数组参数 2024-06-19 10:03:46 +08:00
476474485@qq.com 7fa07577f0 增加转发接口支持byteBodys 2024-06-19 09:54:19 +08:00
476474485@qq.com b11706fb4e Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into guojh 2024-06-19 09:02:12 +08:00
xiang2lin bc2290c9a0 seeyon 2024-06-18 18:02:13 +08:00
lvleigang 2d4b3af64c 主数据下发，重新发送 2024-06-18 17:17:11 +08:00
lvleigang 70a7fe3ff2 Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
 2024-06-18 16:31:02 +08:00
lvleigang db50cf0c1a 主数据下发，重新发送 2024-06-18 16:29:47 +08:00
xiang2lin a60e6675b6 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-18 11:17:01 +08:00
476474485@qq.com 37d45b8ab0 添加脚本语言groovydemo 2024-06-18 11:08:43 +08:00
xiang2lin 3fffae8d3c 增加 apiUrl字段 2024-06-18 11:00:52 +08:00
xiang2lin e0efefc522 entity_get方法增加interfaceAddress字段 2024-06-18 10:21:52 +08:00
xiang2lin 6af94ef32c cbs8接口 2024-06-18 09:17:34 +08:00
476474485@qq.com 80d870073f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into guojh 
 Conflicts:
	service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
	service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
	service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
 2024-06-18 08:59:05 +08:00
yuqh 71c69c4c9c Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-17 14:17:18 +08:00
xiang2lin 6e380bb0d5 cbs8 相关 2024-06-17 13:54:31 +08:00
xiang2lin 673885c091 cbs8 sm2工具类、支付状态枚举类 2024-06-17 13:54:06 +08:00
xiang2lin 1b2c85402d 请求参数实体类 2024-06-17 13:52:55 +08:00
xiang2lin c767923d87 cbs8 工具类 2024-06-17 13:45:49 +08:00
xiang2lin 1f353a3405 cbs8 token工具类 2024-06-17 13:45:37 +08:00
xiang2lin 6c48ee967b oa集成cbs 2024-06-17 13:41:57 +08:00
lvleigang e753410b89 主数据修改,应用添加脚本类 2024-06-17 11:49:50 +08:00
yuqh 5b8c6087f2 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-17 11:24:45 +08:00
lvleigang ff5676689f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 2024-06-17 10:31:26 +08:00
lvleigang 4f30c7f8fb 主数据修改,数据源切换 2024-06-17 10:31:13 +08:00
xiang2lin 55f9afdf48 oa对接cbs 2024-06-14 16:49:04 +08:00
xiang2lin ae9eca4c92 去掉没用的引用 2024-06-14 14:03:57 +08:00
xiang2lin 3d74d52f11 bcprov包升级到1.7 2024-06-14 09:46:22 +08:00
xiang2lin 194872dba0 Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-14 09:34:07 +08:00
xiang2lin ecdcd51d75 bcprov-jdk15on-1.70.jar 2024-06-14 09:33:34 +08:00
lvleigang e223dbd22d 主数据修改 2024-06-13 11:01:35 +08:00
hecan 2f3480d256 调整包路径 2024-06-13 10:59:00 +08:00
hecan 75face51b2 增加api扩展方法，获取应用名称和应用编码 2024-06-13 10:59:00 +08:00
lvleigang 5f27f7d631 平台接口修改获取值 2024-06-13 10:59:00 +08:00
hecan e4d2e03fcf 操作日志 2024-06-13 10:59:00 +08:00
hecan 65aaa0878b 通用数据接口调整 2024-06-13 10:59:00 +08:00
hecan f379c3d821 增加插件编码属性 2024-06-13 10:59:00 +08:00
hecan 239e037d88 获取数据来源插件编码 2024-06-13 10:59:00 +08:00
hecan 875470a326 获取数据来源插件编码 2024-06-13 10:59:00 +08:00
hecan 3a9fcceb61 分组 2024-06-13 10:59:00 +08:00
lvleigang 9054c6b9ee 主数据修改 2024-06-13 10:59:00 +08:00
lvleigang 7b1a18747c 统一转发接口，如果api地址内包含 http 或者 https 直接使用api完整地址，否则使用 应用接口地址 +api地址 2024-06-13 10:59:00 +08:00
lvleigang 8b78ebd555 主数据修改 2024-06-13 10:59:00 +08:00
hecan b429c40153 调整通用数据 2024-06-13 10:58:59 +08:00
lvleigang 329dbe723d 主数据修改 2024-06-13 10:58:43 +08:00
hecan eb9b024b90 档案对照 2024-06-13 10:58:43 +08:00
hecan 7a6c3dab90 通用数据 2024-06-13 10:58:43 +08:00
hecan 53db9d524b 通用数据 2024-06-13 10:58:43 +08:00
hecan fcc4b15b2a 档案对照 2024-06-13 10:58:43 +08:00
hecan cfbda9907c 调整包路径 2024-06-13 10:08:56 +08:00
xiang2lin 1b3dd1392a 测试token 2024-06-13 08:33:45 +08:00
hecan fe32e653d8 增加api扩展方法，获取应用名称和应用编码 2024-06-11 14:27:42 +08:00
lvleigang f6c4497d68 平台接口修改获取值 2024-06-11 11:19:51 +08:00
yuqh 6032e90e25 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
 2024-06-11 10:49:28 +08:00
lvleigang 149a5da298 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 10:15:15 +08:00
hecan aa6da4bf77 操作日志 2024-06-11 10:14:38 +08:00
yuqh 564b7b6138 BIP单据与获取token公用方法编写 2024-06-11 10:10:37 +08:00
lvleigang 08994cefb1 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 10:05:33 +08:00
hecan e928c8de00 通用数据接口调整 2024-06-11 09:57:29 +08:00
lvleigang 22b32ce6dc Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 09:56:48 +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
yuqh cbbb2bdc35 BIP单据与获取token公用方法编写 2024-05-31 16:59:12 +08:00
lvleigang 303e4f1340 修改适配达梦数据源 2024-05-31 16:45:13 +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 22e1047fd9 修改主数据生成类 2024-05-31 15:26:15 +08:00
yuqh 6530caac60 BIP单点登录接口编写 2024-05-31 09:34:50 +08:00
yuqh 2864ee5fba Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-05-31 09:27:29 +08:00
yuqh 4ae596fc38 BIP单据与获取token公用方法编写 2024-05-31 09:27:20 +08:00
lvleigang e5de3e90fd Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-05-31 09:16:43 +08:00
lvleigang 4609a4c91d 修改主数据生成类 2024-05-31 09:16:27 +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
yuqh d4265e51ca BIP单据与获取token公用方法编写 2024-05-30 15:16:59 +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
yuqh a7f5182eec Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-05-29 10:17:55 +08:00
yuqh 55d9c798db BIP单据与获取token公用方法编写 2024-05-29 10:16:35 +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
yuqh 8895a75939 BIP单据与获取token公用方法编写 2024-05-29 08:44:11 +08:00
yuqh caf67bcaac BIP单据与获取token公用方法编写 2024-05-28 17:10:30 +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