Commit Graph

239 Commits

Author SHA1 Message Date
0b40464ad3 基础服务注册xxl-job配置
All checks were successful
continuous-integration/drone Build is passing
2024-08-22 13:25:39 +08:00
311b44a5ec 环境修改 2024-08-22 10:17:27 +08:00
95efec4fb2 Merge pull request 'sjy' (#24) from sjy into master
Reviewed-on: #24
2024-08-22 10:09:18 +08:00
decde473dd 大屏未来三天天气接口 2024-08-22 09:59:39 +08:00
a8d4039fea 构建修改 2024-08-21 16:28:56 +08:00
98ba282fe4 基础服务修改mysql数据源地址 2024-08-20 13:31:42 +08:00
f5ea9be887 线上环境 2024-08-20 11:52:14 +08:00
986a6be07d 还原为本地环境 2024-08-19 23:33:14 +08:00
ad6d43fbfa 环境改为线上 2024-08-19 23:06:05 +08:00
a6c896dbb0 新增线上环境配置文件 2024-08-19 22:40:44 +08:00
ed4f07c886 新增线上环境配置文件 2024-08-19 22:29:00 +08:00
723585741c mysql数据源更换到crm服务器 2024-08-19 16:45:36 +08:00
fb04836336 开发时nacos环境使用本地 2024-08-19 09:44:08 +08:00
90ecdcfffe 票务mongodb抽数上个月到今天 2024-08-16 14:25:35 +08:00
ddb32da95a '本地nacos开发环境' 2024-08-15 09:24:16 +08:00
3ff87bfa3d 'build' 2024-08-15 09:15:08 +08:00
e024c3018c 配置文件中redis和nacos改为线上环境 2024-08-13 09:23:05 +08:00
ae89050d8d 抽数服务中大屏(mongodb)优化为批量查重和插入 2024-08-09 10:19:57 +08:00
42671a4074 基础模块中定时任务新增票务的数据源(mongodb和mysql)和写入功能,删除之前票务rpc调用配置 2024-08-07 12:00:59 +08:00
d87d9ba6b9 定时任务票务数据写入mongodb 2024-07-24 10:21:07 +08:00
a15ae2d648 抽数服务放入基础模块、票务服务修改名字 2024-07-18 13:00:48 +08:00
e9bca69a3a 使用sessionStorage和请求头验证拦截单点登录 2024-07-17 09:04:52 +08:00
0f93f5d2ab 调度中心API 2024-07-11 13:13:09 +08:00
5eff5433fe 调度中心API 2024-07-10 23:48:22 +08:00
f6e2f92352 调度中心API 2024-07-10 15:17:48 +08:00
d0c46176de 抽数模块和整合xxl-job 2024-07-08 20:11:39 +08:00
783bd5c892 xxl-job integration 2024-07-08 09:21:56 +08:00
3f4c483cd8 xxl-job integration 2024-07-05 17:11:08 +08:00
cd834112e2 ticket finish and sampling init 2024-07-04 11:50:11 +08:00
YunaiV
5c610b2df5 同步 HTTP 请求签名 2024-06-04 21:43:56 +08:00
YunaiV
0ee01346d0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/pom.xml
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
2024-06-04 21:34:48 +08:00
YunaiV
025857c9f2 【同步】对齐 boot 和 cloud 的逻辑 2024-06-04 19:23:20 +08:00
YunaiV
4ca583cbe8 【发版】全局:2.1.0 发版 2024-05-04 09:52:40 +08:00
YunaiV
2bd9fd97bb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
2024-05-04 09:48:50 +08:00
YunaiV
1e106844e8 【同步】boot 和 cloud 版本 2024-05-04 09:45:51 +08:00
YunaiV
1e23316fb1 【修复】MySQL jdbc 连接 5.7 示例不正确 2024-05-03 09:11:22 +08:00
YunaiV
9d8f924fec Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
2024-05-01 09:32:36 +08:00
YunaiV
6d40550bbf 【同步】对齐 boot 和 cloud 的逻辑 2024-05-01 09:30:22 +08:00
YunaiV
5e3e68f7f5 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
2024-04-24 09:40:05 +08:00
YunaiV
ddafd44114 【完善】代码生成对 DM 达梦数据的兼容性
【优化】新增 sslEnable 字段,支持 outlook 邮箱
2024-04-24 09:35:51 +08:00
芋道源码
ca93a858fd
!108 Infra模块>代码生成器>适配达梦数据库
Merge pull request !108 from 再见七月/infraBug-by-dm
2024-04-24 01:20:45 +00:00
YunaiV
96e2548240 【修复】解决视频地址在移动端播放的兼容性问题 2024-04-23 22:45:20 +08:00
YunaiV
8e17192ad1 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java
2024-04-23 22:42:53 +08:00
YunaiV
819ad49b08 【修复】解决视频地址在移动端播放的兼容性问题 2024-04-23 09:44:57 +08:00
YunaiV
9164fa0ffb bugfix:非 json 请求(文件上传)时,token 过期时,错误读取 request body 问题 2024-04-22 23:31:57 +08:00
YunaiV
38df9d3911 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordSaveVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/job/SchedulerManagerTest.java
#	yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/mq/RedisStreamTest.java
#	yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java
#	yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
2024-04-22 21:02:10 +08:00
YunaiV
feb742e084 【同步】与 yudao-boot 版本保持一致! 2024-04-22 21:01:30 +08:00
YunaiV
3af7097f17 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud 2024-04-11 23:42:45 +08:00
YunaiV
a5aeca4d49 【优化】将项目的 annotations 统一修改成 annotation 包 2024-04-11 23:42:22 +08:00
YunaiV
b90ea83d2c Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
2024-04-11 22:55:58 +08:00