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

273 Commits

Author SHA1 Message Date
476474485@qq.com c2c3435967 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-26 09:08:24 +08:00
lvleigang 6250ce4a83 修改主数据 2024-06-25 17:20:07 +08:00
xiang2lin 5991883e53 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-25 16:46:46 +08:00
yuqh ef065c3f8c MDM公用文件 2024-06-25 14:08:07 +08:00
xiang2lin 1039fa7295 cbs 2024-06-24 18:52:24 +08:00
yuqh 2208514dc7 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	pom.xml
	service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
 2024-06-24 17:36:00 +08:00
xiang2lin 4d6c7f5d03 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 16:01:05 +08:00
yuqh aedf496c2a MDM公用文件 2024-06-24 16:00:45 +08:00
xiang2lin dce61d024b Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 15:42:47 +08:00
lvleigang 9c6996e0ca 数据源添加dm 2024-06-24 13:37:49 +08:00
yuqh 7b8ce8e35a MDM公用文件 2024-06-24 10:30:59 +08:00
yuqh 7b40d8c0dc MDM公用文件 2024-06-24 10:30:23 +08:00
xiang2lin 55161cad35 查询交易明细 2024-06-21 18:36:55 +08:00
yuqh 020c7645ca Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-21 17:06:17 +08:00
yuqh 0f8ba6400d OA单据、档案 同步BIP和主数据中心 2024-06-21 17:06:04 +08:00
lvleigang e694304837 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
 2024-06-21 17:02:07 +08:00
lvleigang 53000de5ae 主数据下发，重新发送 2024-06-21 17:01:11 +08:00
lvleigang 14d1532be3 主数据下发，重新发送 2024-06-21 16:47:04 +08:00
lvleigang 5840c6392b Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 16:46:19 +08:00
lvleigang 37cbcfb620 Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 16:45:59 +08:00
xiang2lin 9c0eabf938 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 15:03:02 +08:00
yuqh 6b0120eb23 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 14:01:51 +08:00
hecan e1adda59ae 客户档案插件以及明细插件 2024-06-21 13:59:12 +08:00
yuqh 0223fd56e5 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 09:31:37 +08:00
xiang2lin a4758ac2a4 cbs测试 2024-06-21 09:18:56 +08:00
xiang2lin 6b19e593f6 查询交易明细 2024-06-21 09:15:46 +08:00
xiang2lin 3cc0acb065 查询交易明细 2024-06-21 09:15:29 +08:00
lvleigang 977320833f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	buildpackage/src/main/resources/application-llg.yml
 2024-06-20 17:16:40 +08:00
lvleigang c6d4f8ad3a 修改澳星url的名称，所有项目都可以使用 2024-06-20 17:15:15 +08:00
lvleigang 8e042a925a 主数据修改 2024-06-20 17:12:16 +08:00
lvleigang c811eaa0e0 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
 2024-06-20 16:43:20 +08:00
lvleigang 353dd95a60 主数据修改 2024-06-20 16:30:37 +08:00
xiang2lin 70e3bdd4a6 插件测试 2024-06-20 14:38:38 +08:00
xiang2lin e699ffa37f 测试 2024-06-20 14:00:40 +08:00
xiang2lin 6a2691ff69 cbs8交易日志查询 2024-06-20 14:00:23 +08:00
xiang2lin 48186afb82 测试方法 2024-06-20 13:56:18 +08:00
xiang2lin 907a5f057f cbs8 插件 2024-06-20 13:51:04 +08:00
xiang2lin 89e2f4326c cbs8 插件 2024-06-20 09:07:18 +08:00
lvleigang 4e94526a30 主数据修改 2024-06-20 08:43:33 +08:00
xiang2lin 20091505d8 测试类 2024-06-19 17:52:32 +08:00
xiang2lin d2a97cd7ad 测试类 2024-06-19 17:02:09 +08:00
xiang2lin 0ca5c75a1a cbs8 插件 2024-06-19 17:01:54 +08:00
xiang2lin 642986b94a cbs8 插件 2024-06-19 16:56:21 +08:00
xiang2lin e4d0f19e02 cbs8插件 2024-06-19 13:47:44 +08:00
lvleigang 772a2e86f5 修改返回默认值 2024-06-19 11:56:42 +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 e64978e5e9 cbs8插件 2024-06-19 10:06:53 +08:00
lvleigang 2d4b3af64c 主数据下发，重新发送 2024-06-18 17:17:11 +08:00
lvleigang db50cf0c1a 主数据下发，重新发送 2024-06-18 16:29:47 +08:00
xiang2lin fccd328111 测试cbs接口 2024-06-18 10:35:55 +08:00
xiang2lin f0b53a019f cbs8 2024-06-18 10:35:30 +08:00
xiang2lin 82a4353949 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-18 10:17:22 +08:00
xiang2lin 54eb505bda 增加oa数据源编码配置 2024-06-18 09:43:43 +08:00
xiang2lin 444e034511 增加电子回单、交易明细查询配置 2024-06-18 09:17:01 +08:00
xiang2lin 29c560bcfe cbs8 2024-06-18 09:16:47 +08:00
xiang2lin 347eb4e89f 交易明细查询接口 2024-06-18 09:15:50 +08:00
xiang2lin df4f4f584b 电子回单 2024-06-18 09:15:01 +08:00
xiang2lin 74e0f8ae38 增加cbs8电子回单下载临时存放文件夹配置 2024-06-17 15:11:32 +08:00
hecan cbf2fff967 用户档案插件 2024-06-17 15:00:04 +08:00
hecan 92ff85498d 用户档案插件配置 2024-06-17 14:59:51 +08:00
yuqh 72b827fa11 越城公用配置文件 2024-06-17 14:24:03 +08:00
yuqh 4d26dfa435 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	buildpackage/src/main/resources/application-yc.yml
 2024-06-17 14:23:25 +08:00
xiang2lin 4b2a51cb04 越城区配置 2024-06-17 14:21:57 +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
hecan 315dc6582a 增加组织和项目插件配置 2024-06-17 14:16:14 +08:00
xiang2lin c89370ac0c cbs8接口 2024-06-17 13:40:41 +08:00
xiang2lin 5723dc440d cbs8插件spring配置文件 2024-06-17 13:40:11 +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
xiang2lin 5017517684 cbs密钥 2024-06-14 11:22:13 +08:00
hecan cfbda9907c 调整包路径 2024-06-13 10:08:56 +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
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
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 64f8a58ff8 项目档案和组织档案插件 2024-06-11 09:56:18 +08:00
xiang2lin c7c6ab1c4e 越城区配置 2024-06-07 16:12:01 +08:00
xiang2lin fa1e399968 越城区配置 2024-06-07 16:11:17 +08:00
xiang2lin ab2d1b9fc4 越城区配置 2024-06-07 16:08:03 +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
lvleigang 03e4172120 修改适配达梦数据源 2024-05-31 16:48:13 +08:00
lvleigang 303e4f1340 修改适配达梦数据源 2024-05-31 16:45:13 +08:00
lvleigang 22e1047fd9 修改主数据生成类 2024-05-31 15:26:15 +08:00
lvleigang 478211ad96 修改主数据生成类 2024-05-31 09:12:40 +08:00
hecan d6f4e5febb 调整数据库连接地址 2024-05-29 17:20:12 +08:00
yuqh 77ea42d08e BIP单据与获取token公用方法编写 2024-05-29 10:17:40 +08:00
yuqh 314316824c BIP单据与获取token公用方法编写 2024-05-29 10:17:28 +08:00
lvleigang f9f5f5e23f 数据源表添加数据源状态字段，删除统一接口权限认证 2024-05-27 14:21:42 +08:00
lvleigang 09fea1c14c 数据源表添加数据源状态字段，删除统一接口权限认证 2024-05-27 14:11:25 +08:00
hecan 36284043bf 调整数据库地址 2024-05-27 10:46:36 +08:00
lvleigang 8d9c6e3f73 数据库版本研究配置 2024-05-23 16:09:49 +08:00
lvleigang bde253bf45 数据库版本研究配置 2024-05-23 15:33:25 +08:00
xiang2lin 4f76511392 取数修改，不从jsonStr里取 2024-05-17 09:57:58 +08:00
xiang2lin cbe3294e02 修改注释 2024-05-16 16:02:21 +08:00
xiang2lin d33cff5e43 seeyonExt重试插件 2024-05-16 14:13:56 +08:00
xiang2lin 10f26f27fa 增加ax.url配置 2024-05-15 14:58:47 +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 fe4aea7112 代码生成 2024-05-15 14:15:26 +08:00
476474485@qq.com fd094d7374 新增积木报表包扫描 2024-05-15 13:40:18 +08:00
476474485@qq.com f148832b67 增加积木报表配置 2024-05-15 11:55:08 +08:00
lvleigang 7ea7351c33 Merge branch 'yingdesai' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
 2024-05-15 08:36:59 +08:00
xiang2lin 5b507de06d 主配置文件 增加ax.url配置 2024-05-14 11:22:16 +08:00
lvleigang 1b653ff985 首页代码拷贝到V3 2024-05-13 16:55:28 +08:00
xiang2lin 442a5bccf5 个人配置 2024-05-13 16:45:03 +08:00
476474485@qq.com 5f04f9da66 调整日志级别，放生产服务器的时候级别调整成error，控制台不打印，只记录文件 2024-05-11 14:16:58 +08:00
lvleigang b7c9ddd1b7 重写任务方法，修改统一接口,修改项目启动，任务初始化方法 2024-05-08 14:47:11 +08:00
hecan c3384fdb38 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-05-07 09:29:51 +08:00
lvleigang 52bc8c26ae 重写任务方法，修改统一接口 2024-05-07 09:26:06 +08:00
hecan 0889fe0d30 调整日志输出路径 2024-05-07 09:04:40 +08:00
hecan eb781a0db1 新增配置文件 2024-05-06 15:19:33 +08:00
476474485@qq.com e846a892d8 调整框架兼容mybatis-plus 2024-04-29 16:14:45 +08:00
lvleigang 845f6b93f2 澳星档案新增 2024-04-28 10:38:58 +08:00
lvleigang 822de45128 澳星档案新增 2024-04-25 13:39:17 +08:00
lvleigang ed310c5802 澳星环境配置 2024-04-25 08:49:15 +08:00
lvleigang d4f6096104 修改请求打包文件名称 2024-04-24 11:14:26 +08:00
476474485@qq.com 63c28ad91b 修复lib内空的jar包导致tomcat启动失败错误 2024-04-22 16:42:56 +08:00
lvleigang 07edf76a7c 修改应用功能的文件位置 2024-04-17 15:09:02 +08:00
lvleigang b3d95b57bd 修改日志文件大小 2024-04-15 09:03:15 +08:00
lvleigang 0487a71ed3 修改数据源位置 2024-04-12 11:59:01 +08:00
lvleigang 4821868a8a 日志输出修改 2024-04-12 11:55:48 +08:00
lvleigang 0bf189797a 数据源初始化修改，日志修改 2024-04-11 14:13:03 +08:00
lvleigang a4ff79ce37 系统代码上传 2024-04-03 17:02:08 +08:00
lvleigang d57dad9774 项目提交 2024-03-26 13:34:31 +08:00