Skip to content

Commit c66062b

Browse files
drallieivdrallieiv
committed
misc
1 parent 6facc02 commit c66062b

File tree

3 files changed

+124
-125
lines changed

3 files changed

+124
-125
lines changed

‎KinanCity-captcha-server/pom.xml

+120-120
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,121 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>org.springframework.boot</groupId>
5-
<artifactId>spring-boot-starter-parent</artifactId>
6-
<version>2.4.0</version>
7-
</parent>
8-
9-
<artifactId>kinancity-captcha-server</artifactId>
10-
<version>2.1.15-SNAPSHOT</version>
11-
12-
<repositories>
13-
<repository>
14-
<id>jcenter-snapshots</id>
15-
<name>jcenter</name>
16-
<url>https://jcenter.bintray.com/</url>
17-
</repository>
18-
</repositories>
19-
20-
<distributionManagement>
21-
<repository>
22-
<id>github</id>
23-
<name>GitHub Packages</name>
24-
<url>https://maven.pkg.github.com/drallieiv/KinanCity</url>
25-
</repository>
26-
</distributionManagement>
27-
28-
<build>
29-
<plugins>
30-
<plugin>
31-
<groupId>org.springframework.boot</groupId>
32-
<artifactId>spring-boot-maven-plugin</artifactId>
33-
<configuration>
34-
<fork>true</fork>
35-
<mainClass>com.kinancity.captcha.server.CaptchaServer</mainClass>
36-
</configuration>
37-
<executions>
38-
<execution>
39-
<goals>
40-
<goal>repackage</goal>
41-
</goals>
42-
</execution>
43-
</executions>
44-
</plugin>
45-
</plugins>
46-
</build>
47-
48-
<dependencyManagement>
49-
<dependencies>
50-
<dependency>
51-
<groupId>io.springfox</groupId>
52-
<artifactId>springfox-boot-starter</artifactId>
53-
<version>3.0.0</version>
54-
</dependency>
55-
<dependency>
56-
<groupId>io.springfox</groupId>
57-
<artifactId>springfox-swagger2</artifactId>
58-
<version>3.0.0</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>io.springfox</groupId>
62-
<artifactId>springfox-swagger-ui</artifactId>
63-
<version>3.0.0</version>
64-
</dependency>
65-
</dependencies>
66-
</dependencyManagement>
67-
68-
<dependencies>
69-
<dependency>
70-
<groupId>org.springframework.boot</groupId>
71-
<artifactId>spring-boot-starter-web</artifactId>
72-
</dependency>
73-
74-
<dependency>
75-
<groupId>io.springfox</groupId>
76-
<artifactId>springfox-boot-starter</artifactId>
77-
</dependency>
78-
79-
<dependency>
80-
<groupId>io.springfox</groupId>
81-
<artifactId>springfox-swagger2</artifactId>
82-
</dependency>
83-
<dependency>
84-
<groupId>io.springfox</groupId>
85-
<artifactId>springfox-swagger-ui</artifactId>
86-
</dependency>
87-
88-
<dependency>
89-
<groupId>com.kinancity</groupId>
90-
<artifactId>kinancity-captcha-anticaptcha</artifactId>
91-
<version>2.1.17-SNAPSHOT</version>
92-
</dependency>
93-
94-
<!-- Lombok -->
95-
<dependency>
96-
<groupId>org.projectlombok</groupId>
97-
<artifactId>lombok</artifactId>
98-
<version>1.18.24</version>
99-
<scope>provided</scope>
100-
</dependency>
101-
102-
<dependency>
103-
<groupId>junit</groupId>
104-
<artifactId>junit</artifactId>
105-
<version>4.13.1</version>
106-
<scope>test</scope>
107-
</dependency>
108-
109-
<dependency>
110-
<groupId>org.assertj</groupId>
111-
<artifactId>assertj-core</artifactId>
112-
<version>3.6.2</version>
113-
<scope>test</scope>
114-
</dependency>
115-
116-
</dependencies>
117-
118-
<scm>
119-
<tag>v2.1.8</tag>
120-
</scm>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.springframework.boot</groupId>
6+
<artifactId>spring-boot-starter-parent</artifactId>
7+
<version>2.4.0</version>
8+
</parent>
9+
10+
<artifactId>kinancity-captcha-server</artifactId>
11+
<version>2.1.17-SNAPSHOT</version>
12+
13+
<repositories>
14+
<repository>
15+
<id>jcenter-snapshots</id>
16+
<name>jcenter</name>
17+
<url>https://jcenter.bintray.com/</url>
18+
</repository>
19+
</repositories>
20+
21+
<distributionManagement>
22+
<repository>
23+
<id>github</id>
24+
<name>GitHub Packages</name>
25+
<url>https://maven.pkg.github.com/drallieiv/KinanCity</url>
26+
</repository>
27+
</distributionManagement>
28+
29+
<build>
30+
<plugins>
31+
<plugin>
32+
<groupId>org.springframework.boot</groupId>
33+
<artifactId>spring-boot-maven-plugin</artifactId>
34+
<configuration>
35+
<fork>true</fork>
36+
<mainClass>com.kinancity.captcha.server.CaptchaServer</mainClass>
37+
</configuration>
38+
<executions>
39+
<execution>
40+
<goals>
41+
<goal>repackage</goal>
42+
</goals>
43+
</execution>
44+
</executions>
45+
</plugin>
46+
</plugins>
47+
</build>
48+
49+
<dependencyManagement>
50+
<dependencies>
51+
<dependency>
52+
<groupId>io.springfox</groupId>
53+
<artifactId>springfox-boot-starter</artifactId>
54+
<version>3.0.0</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>io.springfox</groupId>
58+
<artifactId>springfox-swagger2</artifactId>
59+
<version>3.0.0</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>io.springfox</groupId>
63+
<artifactId>springfox-swagger-ui</artifactId>
64+
<version>3.0.0</version>
65+
</dependency>
66+
</dependencies>
67+
</dependencyManagement>
68+
69+
<dependencies>
70+
<dependency>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-starter-web</artifactId>
73+
</dependency>
74+
75+
<dependency>
76+
<groupId>io.springfox</groupId>
77+
<artifactId>springfox-boot-starter</artifactId>
78+
</dependency>
79+
80+
<dependency>
81+
<groupId>io.springfox</groupId>
82+
<artifactId>springfox-swagger2</artifactId>
83+
</dependency>
84+
<dependency>
85+
<groupId>io.springfox</groupId>
86+
<artifactId>springfox-swagger-ui</artifactId>
87+
</dependency>
88+
89+
<dependency>
90+
<groupId>com.kinancity</groupId>
91+
<artifactId>kinancity-captcha-anticaptcha</artifactId>
92+
<version>2.1.17-SNAPSHOT</version>
93+
</dependency>
94+
95+
<!-- Lombok -->
96+
<dependency>
97+
<groupId>org.projectlombok</groupId>
98+
<artifactId>lombok</artifactId>
99+
<version>1.18.26</version>
100+
</dependency>
101+
102+
<dependency>
103+
<groupId>junit</groupId>
104+
<artifactId>junit</artifactId>
105+
<version>4.13.2</version>
106+
<scope>test</scope>
107+
</dependency>
108+
109+
<dependency>
110+
<groupId>org.assertj</groupId>
111+
<artifactId>assertj-core</artifactId>
112+
<version>3.24.2</version>
113+
<scope>test</scope>
114+
</dependency>
115+
116+
</dependencies>
117+
118+
<scm>
119+
<tag>v2.1.8</tag>
120+
</scm>
121121
</project>

‎KinanCity-core/src/main/java/com/kinancity/core/Configuration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void init() throws ConfigurationException {
152152

153153
if (PROVIDER_2CAPTCHA.equals(captchaProvider)) {
154154
// Add 2 captcha Provider
155-
TwoCaptchaProvider twocaptchaprovider = TwoCaptchaProvider.class.cast(TwoCaptchaProvider.getInstance(captchaQueue, captchaKey));
155+
TwoCaptchaProvider twocaptchaprovider = (TwoCaptchaProvider) TwoCaptchaProvider.getInstance(captchaQueue, captchaKey);
156156
if (customBatchMinTimeForRecovery != null) {
157157
twocaptchaprovider.setMinTimeForRecovery(customBatchMinTimeForRecovery);
158158
}
@@ -426,7 +426,7 @@ private ProxyPolicy getProxyPolicyInstance() {
426426
public void reloadProxyPolicy() {
427427
if (proxyManager != null) {
428428
ProxyPolicy policy = getProxyPolicyInstance();
429-
proxyManager.getProxies().stream().forEach(proxy -> proxy.setProxyPolicy(getProxyPolicyInstance()));
429+
proxyManager.getProxies().forEach(proxy -> proxy.setProxyPolicy(getProxyPolicyInstance()));
430430
logger.info("ProxyManager reloaded with {} policy ", policy);
431431
}
432432

‎pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<modules>
2424
<module>KinanCity-core</module>
2525
<module>KinanCity-mail</module>
26-
<!-- <module>KinanCity-server</module> -->
2726
<module>ptc-api</module>
2827
<module>KinanCity-utils</module>
2928
<module>KinanCity-captcha-ImageTypers</module>
@@ -71,12 +70,12 @@
7170
<dependency>
7271
<groupId>ch.qos.logback</groupId>
7372
<artifactId>logback-classic</artifactId>
74-
<version>1.2.2</version>
73+
<version>1.4.7</version>
7574
</dependency>
7675
<dependency>
7776
<groupId>org.slf4j</groupId>
7877
<artifactId>slf4j-api</artifactId>
79-
<version>1.7.25</version>
78+
<version>2.0.5</version>
8079
</dependency>
8180
</dependencies>
8281

0 commit comments

Comments
 (0)