ecology
/
ebu_ecology_dev1
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity
386 Commits
6 Branches
3 Tags
638 MiB
Commit Graph

349 Commits (ef4d57f1d0c21519d43784a145cb2aae2fd54b4f)

Author SHA1 Message Date
youhong.ai 99ee2d2245 解析 2023-07-06 09:56:25 +08:00
youhong.ai a6b7892dd6 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并修改
 2023-07-05 23:31:58 +08:00
youhong.ai 96aa323751 修改 2023-07-05 23:31:54 +08:00
ic_excellent 839505b9bb Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-07-05 23:30:58 +08:00
ic_excellent 585c1ba700 响应结果处理 2023-07-05 23:30:08 +08:00
youhong.ai 3c3382f1d2 自动打包工具拓展自动打jar包 2023-07-04 18:59:32 +08:00
youhong.ai c95e6e41e8 自动打包工具拓展自动打jar包 2023-07-04 17:53:59 +08:00
youhong.ai ff69438198 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并黑名单配置
 2023-07-04 16:31:18 +08:00
youhong.ai 6593b3b59a 自动打包工具添加黑名单配置 2023-07-04 16:31:08 +08:00
wangxuanran 6651f788e1 团校密码修改后下发队列,全局token缓存 2023-07-04 15:17:42 +08:00
youhong.ai ed0263178f Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并打包系统添加黑名单
 2023-07-04 14:51:30 +08:00
youhong.ai a8326dda48 自动打包工具添加黑名单文件 2023-07-04 14:51:24 +08:00
ic_excellent e43060ac2b Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-07-04 13:09:23 +08:00
ic_excellent 8257f56316 功能修改 2023-07-04 13:08:54 +08:00
youhong.ai 0b0002076d 自动打包工具 2023-07-04 12:46:45 +08:00
youhong.ai b8800d70f2 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并自动打包工具
 2023-07-04 12:31:02 +08:00
youhong.ai ef336b906d 自动打包工具 2023-07-04 12:30:53 +08:00
ic_excellent 2ce07ae713 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-07-03 13:46:07 +08:00
ic_excellent bf14d9baa3 功能提交 2023-07-03 13:43:58 +08:00
youhong.ai 7143747a25 测试 2023-07-03 13:01:19 +08:00
wangxuanran 7b3bc4bcf0 提交报错文件依赖 2023-07-03 12:57:57 +08:00
wangxuanran cdc579284c cus_getlog 2023-07-03 12:56:24 +08:00
youhong.ai a036219c8d Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并测试apijson解析
 2023-07-03 12:51:44 +08:00
youhong.ai 6546fc05f5 测试 2023-07-03 12:51:33 +08:00
wangxuanran 3819487589 安永数据同步优化 cus_get_log service编写 2023-07-01 15:43:13 +08:00
youhong.ai 0042972aa5 下载文件 2023-07-01 13:33:05 +08:00
youhong.ai 85c08ee18a Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
hebin 保时捷文件名下载乱码，mapper更新null会变为空字符串处理
 2023-06-30 15:17:52 +08:00
youhong.ai 2450a8348e 保时捷文件下载文件名乱码处理 2023-06-30 15:17:44 +08:00
wangxuanran a461733216 解决map中值为null转成''的问题 2023-06-30 15:15:43 +08:00
youhong.ai d5d32720b9 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并
·
 2023-06-29 14:57:28 +08:00
youhong.ai 47c31b05b5 保时捷提供文件下载接口，修改请求工具方法public 2023-06-29 14:57:22 +08:00
jingwei.tao a9835d1cdf 添加文件 2023-06-28 17:42:23 +08:00
jingwei.tao 9ad2ce7943 shanchu time util 2023-06-28 17:41:19 +08:00
youhong.ai 2c3fcb7ac4 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并远程分支，保时捷流程数据推送，api创建流程，ihg用户信息元素后段
 2023-06-26 10:26:46 +08:00
youhong.ai 4c2dbb9efd 保时捷流程参数校验，ihg用户信息元素 2023-06-26 10:26:39 +08:00
wangxuanran 0540f6b72e 解决读取配置文件中文乱码问题 2023-06-26 10:18:01 +08:00
wangxuanran 3333e103f4 vms调整 2023-06-20 23:47:33 +08:00
ic_excellent 40b268455b Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
。
 2023-06-16 18:14:11 +08:00
youhong.ai e2e0ae2c0b 合并 2023-06-16 18:13:01 +08:00
ic_excellent e4787fc0c6 动态生成class 2023-06-16 18:12:23 +08:00
youhong.ai da145d2d32 保时捷关键字定位aciton，流程参数检查 2023-06-16 18:09:12 +08:00
jingwei.tao 6cb70e7305 计算工作日方法 2023-06-15 21:12:47 +08:00
wangxuanran 3fe12ad347 合并分支 2023-06-15 14:14:25 +08:00
wangxuanran 8f2c58978e 柏美问题修复 2023-06-15 14:05:53 +08:00
youhong.ai 3f96ed75bc Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
次账号支持保时捷组织架构图
 2023-06-15 00:53:22 +08:00
youhong.ai 78bcb2ef1a 添加洲际酒店元素开发，保时捷组织架构图次账号支持 2023-06-15 00:53:18 +08:00
wangxuanran 36ed42ce30 上海大数据中心统一待办加字段 2023-06-14 19:37:35 +08:00
chaoyang.he b49b18e9d2 航天科技项目组----合同台账上传接口代码优化----20230612 2023-06-12 10:38:40 +08:00
jingwei.tao 620013139e 删除无用代码 2023-06-10 18:53:23 +08:00
jingwei.tao a047818ae1 建模工具方法提交 2023-06-10 18:51:42 +08:00
jingwei.tao f2c3c58303 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-06-10 18:20:20 +08:00
jingwei.tao da4fa0aaa9 初来乍到 请多关照 2023-06-10 18:19:02 +08:00
youhong.ai 4cc7722283 极兔日志代码上柴 2023-06-10 17:49:37 +08:00
youhong.ai 00b7d994b6 添加注释 2023-06-10 16:14:29 +08:00
wangxuanran cdda440ef2 安永数据同步 2023-06-10 16:09:18 +08:00
ic_excellent 04095b3bbd 部门，分部自定义 2023-06-09 17:33:57 +08:00
youhong.ai 1c4fe8709d 修改获取cus日志修改 2023-06-09 17:03:23 +08:00
wangxuanran cf0af8919e gu ji shi ge shi hua de wen ti 2023-06-07 11:46:25 +08:00
wangxuanran 777ab4ac11 xiugai 2023-06-07 11:41:08 +08:00
youhong.ai 8af8697194 修改sql文件 2023-06-07 11:33:54 +08:00
youhong.ai 78de340044 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并
 2023-06-02 11:29:29 +08:00
youhong.ai 17ba40eee8 修改关键字定位方式 2023-06-02 11:29:18 +08:00
ic_excellent a470f368cb 修复collection bug 2023-06-02 11:04:26 +08:00
ic_excellent 2af595ad81 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并
 2023-06-02 11:00:28 +08:00
ic_excellent 2dbea71ba0 上传文件 2023-06-02 11:00:00 +08:00
wangxuanran 685240f2f8 极兔ncc 自定义sql用{mainTable}代替当前表名代码同步 2023-05-31 10:07:27 +08:00
youhong.ai 7e6fa007e0 fix deal whti maping bug rs 大小写 2023-05-31 09:40:59 +08:00
youhong.ai bbcd42e79f fix rs 初始化失败 2023-05-30 11:50:41 +08:00
youhong.ai a4f9ded450 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并
 2023-05-23 14:45:32 +08:00
youhong.ai 04a019b5ce 修改 2023-05-23 14:45:23 +08:00
chaoyang.he cc015d6098 航天科技-台账同步 2023-05-21 20:20:30 +08:00
chaoyang.he 0e2e6325f3 文件备份---何朝阳 2023-05-17 10:29:15 +08:00
ic_excellent 3b00297fef Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并冲突
 2023-05-16 14:54:01 +08:00
ic_excellent a45c94e1ee 保时捷开发 2023-05-16 14:51:30 +08:00
chaoyang.he f2b938e668 Merge remote-tracking branch 'origin/dev' into dev 2023-05-15 17:58:59 +08:00
chaoyang.he 0284f4c70b 文件备份---何朝阳 2023-05-15 17:58:42 +08:00
youhong.ai 402082f038 mapper拼接类 2023-05-12 21:17:28 +08:00
youhong.ai ad6c60dc9f mapper拼接类 2023-05-12 21:14:04 +08:00
youhong.ai 8b8ab74483 mapper拼接类 2023-05-12 21:12:06 +08:00
wangxuanran ce90fa1def 修复自定义sql方法bug 2023-05-12 15:55:33 +08:00
wangxuanran a0bc9c30b9 建模生成json类日志文件修改 2023-05-12 13:42:20 +08:00
youhong.ai b5d95fb201 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
修复dealwith bug、洲际酒店任务元素开发
 2023-05-12 11:15:41 +08:00
youhong.ai 0cc0b9889a 洲际酒店任务元素开发、delwithbug修复 2023-05-12 11:15:29 +08:00
wangxuanran cb02ca6184 中船流程推送cms系统 2023-05-11 15:25:53 +08:00
youhong.ai daaefd64c2 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并远程分支
 2023-05-10 14:15:35 +08:00
youhong.ai 7772b404dc 雅诗兰黛拆单报表、洲际酒店任务元素 2023-05-10 14:15:05 +08:00
ic_excellent a66422b667 解决冲突 2023-05-06 15:21:42 +08:00
ic_excellent 3ed657ebec 修改文件 2023-05-06 15:17:47 +08:00
ic_excellent a5f477ad9d 修改 2023-05-06 15:15:28 +08:00
ic_excellent e3a1a7060e Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-05-06 13:51:48 +08:00
ic_excellent 78140f7c35 提交 2023-05-06 13:51:21 +08:00
wangxuanran d78176c580 代码备份提交 2023-05-04 14:34:40 +08:00
youHong.ai edb807e430 添加老项目代码，雅诗兰黛代码初始化 2023-04-25 10:20:19 +08:00
youHong.ai c69aeb13bf 修改dealWithMapping的默认值空指针异常bug修改 2023-04-24 13:52:16 +08:00
youHong.ai e23fc2161e 邮箱黑名单 2023-04-21 15:28:34 +08:00
youHong.ai 1aac6f6cc4 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
float精度修复
 2023-04-20 15:19:57 +08:00
youHong.ai 01c6cf1cdc 修改float精度问题 2023-04-20 15:19:49 +08:00
ic_excellent 0e77a487d8 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-04-20 14:18:43 +08:00
ic_excellent c9aee48ecd 信银知识产权局 2023-04-20 14:18:27 +08:00
youHong.ai a691c6def9 签字意见 2023-04-17 22:47:28 +08:00
youHong.ai abf48d1d7d 冲突解决 2023-04-14 10:19:25 +08:00
youHong.ai aeb04f41d4 修改文件 2023-04-14 10:16:48 +08:00
王宣然 7717781676 2023-04-09 上海大数据中心统一待办 2023-04-09 21:15:39 +08:00
王宣然 9275631cd8 解决double超出精度转成科学记数法的问题 2023-04-04 17:15:00 +08:00
yushun.ding ee64140219 金额类型字段 + - * / 处理 2023-03-27 13:03:45 +08:00
yushun.ding 3c49ade7b4 方法补充static 2023-03-25 21:12:22 +08:00
yushun.ding 4615e23317 新增多语言处理方法 2023-03-25 00:26:00 +08:00
youHong.ai 1dcce55d72 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
修改登录名生成逻辑
 2023-03-23 16:15:43 +08:00
youHong.ai e22366fdc5 修改分部名称生成登录名逻辑 2023-03-23 16:15:32 +08:00
ic_excellent ed3b04b6d5 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-23 13:24:08 +08:00
ic_excellent a7b324ce6c 新弘农业报表需求 2023-03-23 13:23:58 +08:00
youHong.ai 228ed443a1 添加智己水印图片添加，德尔格隐私签字意见功能 2023-03-23 10:28:39 +08:00
youHong.ai f79891d95f 支持批量参数传递名称 2023-03-20 14:41:44 +08:00
youHong.ai 2ea391e814 支持批量参数传递名称 2023-03-20 14:40:59 +08:00
youHong.ai d776524824 修改getLogger lombook无法覆盖get方法 2023-03-18 04:19:51 +08:00
youHong.ai a62038fda8 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-18 04:18:14 +08:00
youHong.ai ab52c273f9 修改getLogger lombook无法覆盖get方法 2023-03-18 04:18:09 +08:00
ic_excellent 50b8582287 报表 2023-03-18 04:16:38 +08:00
youHong.ai 7bd5d5b782 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-17 23:07:46 +08:00
youHong.ai 5e3c18b8bb mymapper 完善，但是没有测试 2023-03-17 23:07:37 +08:00
ic_excellent f71d0dbe18 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-15 16:14:48 +08:00
ic_excellent 950b68a796 请求配置-修复自定义表无法查询数据的问题 2023-03-15 16:14:21 +08:00
youHong.ai 9399401fb7 bind命令、choose命令以及其他东西 2023-03-15 14:00:40 +08:00
youHong.ai 7f67f4a8ac Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
添加bind、choose指令
 2023-03-15 13:57:05 +08:00
youHong.ai 0d252c6452 bind命令、choose命令以及其他东西 2023-03-15 13:56:53 +08:00
王宣然 af939631b4 2023-03-15 团校mq代码 2023-03-15 13:50:48 +08:00
youHong.ai 8b16f9ca57 好多东西添加 2023-03-14 15:12:53 +08:00
youHong.ai 7489f8d291 添加trim指令 2023-03-05 21:54:09 +08:00
youHong.ai d9d6b77a93 添加if指令 2023-03-04 16:04:39 +08:00
youHong.ai 2bbac377aa 添加jexl依赖，添加脚本执行器 2023-03-04 00:48:34 +08:00
youHong.ai 8c84a01a69 fix \ to double 2023-03-03 18:08:39 +08:00
youHong.ai 86b6dc1ef6 for - map 2023-03-03 17:40:03 +08:00
youHong.ai 08a396fe40 常量抽离 2023-03-03 17:32:32 +08:00
youHong.ai e5f001cd9e 动态sql解析 2023-03-03 17:28:38 +08:00
ic_excellent 680e4b9343 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-03 16:27:10 +08:00
ic_excellent 0f54e90b33 万象报表开发 2023-03-03 16:26:53 +08:00
youHong.ai 4a54e7f5c7 极兔登录消息查询、mapper修改 2023-02-27 11:55:12 +08:00
ic_excellent 80d9200fdf Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-02-27 11:25:22 +08:00
ic_excellent 7d005de99a mapper支持Double 2023-02-27 11:24:02 +08:00
youHong.ai 12870f6339 单点登录、修改线程池 2023-02-24 15:28:54 +08:00
youHong.ai 09ea2f1bdb Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并修改https
 2023-02-22 17:02:04 +08:00
youHong.ai 5216cfecd1 附件赋值，生成loginID，修复httpUtils set方法 2023-02-22 17:01:58 +08:00
ic_excellent 28464f4c8d Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-02-20 16:15:56 +08:00
ic_excellent f407d83354 电装相关开发 2023-02-20 16:15:34 +08:00
youHong.ai 63bf2a1642 mapper优化，流程条件赋值action 2023-02-20 16:10:24 +08:00
youHong.ai e9fedf8b8f Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 
合并修改ssl绕过的方式
 2023-02-16 19:00:42 +08:00
youHong.ai 2857d0a3df ssl测试 2023-02-16 19:00:32 +08:00
ic_excellent 01a21547d8 保时捷年终总结 2023-02-16 14:56:06 +08:00
ic_excellent e6a67339a9 克来机电 - 流程编号生成规则自定义 2023-02-13 12:11:16 +08:00
youHong.ai 9dacdd2751 修改dealwithmapping获取字段数据bug 2023-02-12 22:17:44 +08:00