caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

冲突处理

Browse Source
This commit is contained in:
Chopper711 2023-01-29 10:02:44 +08:00
parent cb3eca29d8
commit 8fc18458c2
4 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java
View File

@ -77,11 +77,7 @@ public class AuthConfig {
/** /**
* 针对国外服务可以单独设置代理 * 针对国外服务可以单独设置代理
* HttpConfig config = new HttpConfig(); * HttpConfig config = new HttpConfig();
<<<<<<< HEAD
* config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("106.124.130.167", 10080)));
=======
* config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 10080))); * config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 10080)));
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
* config.setTimeout(15000); * config.setTimeout(15000);
* *
* @since 1.15.5 * @since 1.15.5

4
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
View File

@ -257,10 +257,6 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
} }
/** /**
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> origin/master
* 更新秒杀活动时间 * 更新秒杀活动时间
* *
* @param seckill 秒杀活动 * @param seckill 秒杀活动

4
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
View File

@ -135,10 +135,6 @@ public class SeckillServiceImpl extends AbstractPromotionsServiceImpl<SeckillMap
} }
/** /**
* <<<<<<< HEAD
* =======
* <<<<<<< HEAD
* >>>>>>> origin/master
* 通用促销更新 * 通用促销更新
* 调用顺序: * 调用顺序:
* 1. checkStatus 检查促销状态 * 1. checkStatus 检查促销状态

36
xxl-job/XXLJOB-README.md
View File

@ -1,40 +1,4 @@
<<<<<<< HEAD
=======
<p align="center" >
<img src="https://www.xuxueli.com/doc/static/xxl-job/images/xxl-logo.jpg" width="150">
<h3 align="center">XXL-JOB</h3>
<p align="center">
XXL-JOB, a distributed task scheduling framework.
<br>
<a href="https://www.xuxueli.com/xxl-job/"><strong>-- Home Page --</strong></a>
<br>
<br>
<a href="https://github.com/xuxueli/xxl-job/actions">
<img src="https://github.com/xuxueli/xxl-job/workflows/Java%20CI/badge.svg" >
</a>
<a href="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/">
<img src="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg" >
</a>
<a href="https://github.com/xuxueli/xxl-job/releases">
<img src="https://img.shields.io/github/release/xuxueli/xxl-job.svg" >
</a>
<a href="https://github.com/xuxueli/xxl-job/">
<img src="https://img.shields.io/github/stars/xuxueli/xxl-job" >
</a>
<a href="https://hub.docker.com/r/xuxueli/xxl-job-admin/">
<img src="https://img.shields.io/docker/pulls/xuxueli/xxl-job-admin" >
</a>
<a href="http://www.gnu.org/licenses/gpl-3.0.html">
<img src="https://img.shields.io/badge/license-GPLv3-blue.svg" >
</a>
<a href="https://www.xuxueli.com/page/donate.html">
<img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat" >
</a>
</p>
</p>
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
## Introduction ## Introduction
XXL-JOB is a distributed task scheduling framework. XXL-JOB is a distributed task scheduling framework.
It's core design goal is to develop quickly and learn simple, lightweight, and easy to expand. It's core design goal is to develop quickly and learn simple, lightweight, and easy to expand.