Commit Graph

489 Commits

Author SHA1 Message Date
xiang2lin c89370ac0c cbs8接口 2024-06-17 13:40:41 +08:00
xiang2lin 5723dc440d cbs8插件spring配置文件 2024-06-17 13:40:11 +08:00
lvleigang f05114b79f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 2024-06-17 11:50:05 +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
13758950345 a7c2f0b8cb Merge pull request 'lvleigang' (#40) from lvleigang into dev
Reviewed-on: http://hzya.ufyct.com:9015/root/kangarooDataCenterV3/pulls/40
2024-06-17 10:34:22 +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 5017517684 cbs密钥 2024-06-14 11:22:13 +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 506833e262 项目档案和组织档案插件 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
lvleigang 3489a1e274 平台接口修改获取值 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 2aa03eda60 调整数据库连接地址 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 5aea5a5fd6 调整数据库地址 2024-06-13 10:58:43 +08:00
hecan 1b98e96aa5 调整日志输出路径 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
476474485@qq.com 54332d5fc2 删除积木报表依赖 2024-06-11 10:00:36 +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