|
|
986a6be07d
|
还原为本地环境
|
2024-08-19 23:33:14 +08:00 |
|
|
|
ad6d43fbfa
|
环境改为线上
|
2024-08-19 23:06:05 +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 |
|
|
|
76d6ed8a44
|
Merge pull request 'xinwei' (#3) from xinwei into master
Reviewed-on: #3
|
2024-08-15 09:53:30 +08:00 |
|
|
|
ddb32da95a
|
'本地nacos开发环境'
|
2024-08-15 09:24:16 +08:00 |
|
|
|
3ff87bfa3d
|
'build'
|
2024-08-15 09:15:08 +08:00 |
|
|
|
bce224c222
|
'build
continuous-integration/drone Build is failing
|
2024-08-14 09:23:39 +08:00 |
|
|
|
ac128049f8
|
'init'
continuous-integration/drone/tag Build is failing
|
2024-08-13 17:43:05 +08:00 |
|
|
|
14ff25d4e6
|
'build'
|
2024-08-13 14:36:48 +08:00 |
|
|
|
33c021cedc
|
'init'
|
2024-08-13 09:34:20 +08:00 |
|
|
|
e024c3018c
|
配置文件中redis和nacos改为线上环境
|
2024-08-13 09:23:05 +08:00 |
|
|
|
a04ca1f359
|
Merge remote-tracking branch 'origin/zsq' into xinwei
# Conflicts:
# pom.xml
|
2024-07-22 14:04:51 +08:00 |
|
zsq
|
c5942eb785
|
停车场
|
2024-07-19 23:52:11 +08:00 |
|
|
|
e9bca69a3a
|
使用sessionStorage和请求头验证拦截单点登录
|
2024-07-17 09:04:52 +08:00 |
|
|
|
cd834112e2
|
ticket finish and sampling init
|
2024-07-04 11:50:11 +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
|
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
|
74bc3b3fd2
|
【同步】对齐 boot 和 cloud 的逻辑
|
2024-05-01 09:36:34 +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
|
a015b1e539
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-05-01 00:38:22 +08:00 |
|
YunaiV
|
f7b0618216
|
【修复】短信模板中关于 type 字段的描述
|
2024-04-29 20:51:46 +08:00 |
|
YunaiV
|
59dd0a3f5c
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
|
2024-04-24 20:55:04 +08:00 |
|
YunaiV
|
e618f833fd
|
【修复】部分菜单，确实 menu.sql 配置的权限标识
|
2024-04-24 20:11:19 +08:00 |
|
YunaiV
|
59178eca49
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
|
2024-04-24 09:45:10 +08:00 |
|
YunaiV
|
44055ba53f
|
【优化】新增 sslEnable 字段，支持 outlook 邮箱
|
2024-04-24 09:44:38 +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
|
b150605da9
|
【修复】角色管理页面-查询未按照排序字段排序的问题
|
2024-04-24 09:38:14 +08:00 |
|
芋道源码
|
961e3210c7
|
!112 bugfix：修复角色管理页面-查询未按照排序字段排序的问题
Merge pull request !112 from limz/bugfix-pull
|
2024-04-24 01:36:21 +00:00 |
|
YunaiV
|
ddafd44114
|
【完善】代码生成对 DM 达梦数据的兼容性
【优化】新增 sslEnable 字段，支持 outlook 邮箱
|
2024-04-24 09:35:51 +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
|
9164fa0ffb
|
bugfix：非 json 请求（文件上传）时，token 过期时，错误读取 request body 问题
|
2024-04-22 23:31:57 +08:00 |
|
YunaiV
|
ea4db88dab
|
Merge remote-tracking branch 'origin/master'
|
2024-04-22 21:10:49 +08:00 |
|
YunaiV
|
ce74fbca98
|
【同步】与 yudao-boot 版本保持一致！
|
2024-04-22 21:10:22 +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 |
|
limingz
|
4d069460cd
|
bugfix：修复角色管理页面-查询未按照排序字段排序的问题
|
2024-04-18 15:22:32 +08:00 |
|
lihaiyang
|
0703c8d154
|
bugfix：修复获取登录用户的权限信息接口在没有授权角色时，没有菜单列表导致报错的问题
|
2024-04-13 23:36:01 +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 |
|
YunaiV
|
bb5966f1b6
|
【新增】RateLimiter 限流器，支持全局、用户、IP 等级别的限流
|
2024-04-11 22:53:36 +08:00 |
|
YunaiV
|
3aa8d41fcd
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 20:02:22 +08:00 |
|
YunaiV
|
be6aaec818
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
|
2024-04-07 19:53:25 +08:00 |
|
YunaiV
|
e2c1c7d380
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 19:51:24 +08:00 |
|
