Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from luoye663:master #6

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Mar 13, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

luoye663 and others added 30 commits September 4, 2020 17:17
…ector-java-8.0.16

Bump mysql-connector-java from 5.1.21 to 8.0.16
增加配置:
announcement=classpath:announcement.txt
user.admin.debug.passwd=123456
# Conflicts:
#	.gitignore
#	README.md
#	pom.xml
#	src/main/java/io/qyi/e5/config/rabbitMQ/RabbitMQConfig.java
#	src/main/java/io/qyi/e5/config/security/UrlInvocationSecurityMetadataSourceService.java
#	src/main/java/io/qyi/e5/config/security/filter/GithubLoginAuthenticationFilter.java
#	src/main/java/io/qyi/e5/config/security/filter/LinkTokenAuthenticationFilter.java
#	src/main/java/io/qyi/e5/controller/admin/AdminController.java
#	src/main/java/io/qyi/e5/controller/web/WebController.java
#	src/main/java/io/qyi/e5/github/service/impl/GithubServiceImpl.java
#	src/main/java/io/qyi/e5/outlook/service/IOutlookService.java
#	src/main/java/io/qyi/e5/outlook/service/impl/OutlookServiceImpl.java
#	src/main/java/io/qyi/e5/outlook_log/controller/OutlookLogController.java
#	src/main/java/io/qyi/e5/service/rabbitMQ/impl/ListenerImpl.java
#	src/main/java/io/qyi/e5/service/task/impl/TaskImpl.java
#	src/main/java/io/qyi/e5/util/StringUtil.java
#	src/main/java/io/qyi/e5/util/netRequest/OkHttpClientUtil.java
#	src/main/java/io/qyi/e5/util/redis/RedisUtil.java
#	src/main/resources/application.properties
2、修改调试模式
3、允许增加多个api列表
4、修改保存key逻辑
5、修改前端为Angular,与当前前端不兼容,等待程序中......
# Conflicts:
#	src/main/java/io/qyi/e5/outlook/bean/OutlookVo.java
#	src/main/java/io/qyi/e5/outlook/bean/bo/SaveRandomBo.java
#	src/main/java/io/qyi/e5/outlook/controller/OutlookController.java
#	src/main/java/io/qyi/e5/outlook/entity/Outlook.java
#	src/main/java/io/qyi/e5/outlook/service/IOutlookService.java
#	src/main/java/io/qyi/e5/outlook/service/impl/OutlookServiceImpl.java
#	src/main/resources/application.properties
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant