BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 6b42efd7863b3c947850ddf2cac46a6b76d463d7

Authored by 芋道源码
Committed by Gitee
2 parents 8d58b1e8 3e976837

!518 添加华为云 maven 升级依赖 

Merge pull request !518 from xingyu/feature/captcha
Inline Side-by-side
Showing 16 changed files with 76 additions and 66 deletions
README.md
  View file @6b42efd
... ... @@ -249,9 +249,9 @@ ps：核心功能已经实现，正在对接微信小程序中...
249 249  
250 250 | 框架 | 说明 | 版本 | 学习指南 |
251 251 |---------------------------------------------------------------------------------------------|------------------|-------------|----------------------------------------------------------------|
252   -| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.12 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
  252 +| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.13 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
253 253 | [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | |
254   -| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.16 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
  254 +| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.18 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
255 255 | [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.3.1 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) |
256 256 | [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.6.1 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
257 257 | [Redis](https://redis.io/) | key-value 数据库 | 5.0 / 6.0 | |
... ... @@ -267,7 +267,7 @@ ps：核心功能已经实现，正在对接微信小程序中...
267 267 | [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.7.10 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
268 268 | [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | |
269 269 | [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.5.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
270   -| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.26 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
  270 +| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.28 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
271 271 | [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - |
272 272 | [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.0 | - |
273 273  
... ...
... ... @@ -38,8 +38,8 @@
38 38 <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
39 39 <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
40 40 <!-- 看看咋放到 bom 里 -->
41   - <lombok.version>1.18.26</lombok.version>
42   - <spring.boot.version>2.7.12</spring.boot.version>
  41 + <lombok.version>1.18.28</lombok.version>
  42 + <spring.boot.version>2.7.13</spring.boot.version>
43 43 <mapstruct.version>1.5.5.Final</mapstruct.version>
44 44 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
45 45 </properties>
... ... @@ -96,9 +96,14 @@
96 96 </pluginManagement>
97 97 </build>
98 98  
99   - <!-- 使用 aliyun 的 Maven 源，提升下载速度 -->
  99 + <!-- 使用 huawei / aliyun 的 Maven 源，提升下载速度 -->
100 100 <repositories>
101 101 <repository>
  102 + <id>huaweicloud</id>
  103 + <name>huawei</name>
  104 + <url>https://mirrors.huaweicloud.com/repository/maven/</url>
  105 + </repository>
  106 + <repository>
102 107 <id>aliyunmaven</id>
103 108 <name>aliyun</name>
104 109 <url>https://maven.aliyun.com/repository/public</url>
... ...
yudao-dependencies/pom.xml
  View file @6b42efd
... ... @@ -16,17 +16,17 @@
16 16 <properties>
17 17 <revision>1.7.3-snapshot</revision>
18 18 <!-- 统一依赖管理 -->
19   - <spring.boot.version>2.7.12</spring.boot.version>
  19 + <spring.boot.version>2.7.13</spring.boot.version>
20 20 <!-- Web 相关 -->
21 21 <springdoc.version>1.6.15</springdoc.version>
22 22 <knife4j.version>4.1.0</knife4j.version>
23 23 <servlet.versoin>2.5</servlet.versoin>
24 24 <!-- DB 相关 -->
25   - <druid.version>1.2.16</druid.version>
  25 + <druid.version>1.2.18</druid.version>
26 26 <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
27 27 <mybatis-plus-generator.version>3.5.3.1</mybatis-plus-generator.version>
28 28 <dynamic-datasource.version>3.6.1</dynamic-datasource.version>
29   - <mybatis-plus-join-boot-starter.version>1.4.3.2</mybatis-plus-join-boot-starter.version>
  29 + <mybatis-plus-join-boot-starter.version>1.4.5</mybatis-plus-join-boot-starter.version>
30 30 <redisson.version>3.18.0</redisson.version>
31 31 <dm8.jdbc.version>8.1.2.141</dm8.jdbc.version>
32 32 <!-- 服务保障相关 -->
... ... @@ -43,16 +43,16 @@
43 43 <!-- Bpm 工作流相关 -->
44 44 <flowable.version>6.8.0</flowable.version>
45 45 <!-- 工具类相关 -->
46   - <captcha-plus.version>1.0.2</captcha-plus.version>
  46 + <captcha-plus.version>1.0.5</captcha-plus.version>
47 47 <jsoup.version>1.15.4</jsoup.version>
48   - <lombok.version>1.18.26</lombok.version>
  48 + <lombok.version>1.18.28</lombok.version>
49 49 <mapstruct.version>1.5.5.Final</mapstruct.version>
50   - <hutool.version>5.8.18</hutool.version>
51   - <easyexcel.verion>3.3.1</easyexcel.verion>
  50 + <hutool.version>5.8.20</hutool.version>
  51 + <easyexcel.verion>3.3.2</easyexcel.verion>
52 52 <velocity.version>2.3</velocity.version>
53 53 <screw.version>1.0.5</screw.version>
54 54 <fastjson.version>1.2.83</fastjson.version>
55   - <guava.version>32.0.0-jre</guava.version>
  55 + <guava.version>32.0.1-jre</guava.version>
56 56 <guice.version>5.1.0</guice.version>
57 57 <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
58 58 <commons-net.version>3.9.0</commons-net.version>
... ... @@ -64,14 +64,14 @@
64 64 <okio.version>3.0.0</okio.version>
65 65 <okhttp3.version>4.10.0</okhttp3.version>
66 66 <commons-io.version>2.11.0</commons-io.version>
67   - <minio.version>8.5.2</minio.version>
  67 + <minio.version>8.5.4</minio.version>
68 68 <aliyun-java-sdk-core.version>4.6.3</aliyun-java-sdk-core.version>
69 69 <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
70 70 <tencentcloud-sdk-java.version>3.1.758</tencentcloud-sdk-java.version>
71   - <justauth.version>1.4.0</justauth.version>
72   - <jimureport.version>1.5.6</jimureport.version>
  71 + <justauth.version>1.0.1</justauth.version>
  72 + <jimureport.version>1.5.8</jimureport.version>
73 73 <xercesImpl.version>2.12.2</xercesImpl.version>
74   - <wx-java-mp.version>4.3.0</wx-java-mp.version>
  74 + <wx-java-mp.version>4.5.0</wx-java-mp.version>
75 75 </properties>
76 76  
77 77 <dependencyManagement>
... ... @@ -589,8 +589,8 @@
589 589 <!-- SMS SDK end -->
590 590  
591 591 <dependency>
592   - <groupId>com.xkcoding.justauth</groupId>
593   - <artifactId>justauth-spring-boot-starter</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） -->
  592 + <groupId>com.xingyuv</groupId>
  593 + <artifactId>spring-boot-starter-justauth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） -->
594 594 <version>${justauth.version}</version>
595 595 </dependency>
596 596  
... ...
yudao-example/yudao-sso-demo-by-code/pom.xml
  View file @6b42efd
... ... @@ -21,7 +21,7 @@
21 21 <maven.compiler.target>8</maven.compiler.target>
22 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23 23 <!-- 统一依赖管理 -->
24   - <spring.boot.version>2.7.12</spring.boot.version>
  24 + <spring.boot.version>2.7.13</spring.boot.version>
25 25 </properties>
26 26  
27 27 <dependencyManagement>
... ... @@ -52,7 +52,7 @@
52 52 <dependency>
53 53 <groupId>cn.hutool</groupId>
54 54 <artifactId>hutool-all</artifactId>
55   - <version>5.8.18</version>
  55 + <version>5.8.20</version>
56 56 </dependency>
57 57  
58 58 <dependency>
... ...
yudao-example/yudao-sso-demo-by-password/pom.xml
  View file @6b42efd
... ... @@ -21,7 +21,7 @@
21 21 <maven.compiler.target>8</maven.compiler.target>
22 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23 23 <!-- 统一依赖管理 -->
24   - <spring.boot.version>2.7.12</spring.boot.version>
  24 + <spring.boot.version>2.7.13</spring.boot.version>
25 25 </properties>
26 26  
27 27 <dependencyManagement>
... ... @@ -52,7 +52,7 @@
52 52 <dependency>
53 53 <groupId>cn.hutool</groupId>
54 54 <artifactId>hutool-all</artifactId>
55   - <version>5.8.18</version>
  55 + <version>5.8.20</version>
56 56 </dependency>
57 57  
58 58 <dependency>
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
  View file @6b42efd
... ... @@ -63,7 +63,7 @@
63 63 <dependency>
64 64 <groupId>com.github.binarywang</groupId>
65 65 <artifactId>weixin-java-pay</artifactId>
66   - <version>4.4.0</version>
  66 + <version>4.5.0</version>
67 67 </dependency>
68 68 <!-- TODO 芋艿：清理 -->
69 69  
... ...
yudao-framework/yudao-spring-boot-starter-biz-social/pom.xml
  View file @6b42efd
... ... @@ -36,8 +36,8 @@
36 36 </dependency>
37 37 <!-- 三方云服务相关 -->
38 38 <dependency>
39   - <groupId>com.xkcoding.justauth</groupId>
40   - <artifactId>justauth-spring-boot-starter</artifactId>
  39 + <groupId>com.xingyuv</groupId>
  40 + <artifactId>spring-boot-starter-justauth</artifactId>
41 41 <exclusions>
42 42 <exclusion>
43 43 <groupId>cn.hutool</groupId>
... ...
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/config/YudaoSocialAutoConfiguration.java
  View file @6b42efd
1 1 package cn.iocoder.yudao.framework.social.config;
2 2  
3 3 import cn.iocoder.yudao.framework.social.core.YudaoAuthRequestFactory;
4   -import com.xkcoding.http.HttpUtil;
5   -import com.xkcoding.http.support.hutool.HutoolImpl;
6   -import com.xkcoding.justauth.autoconfigure.JustAuthProperties;
  4 +import com.xingyuv.http.HttpUtil;
  5 +import com.xingyuv.http.support.hutool.HutoolImpl;
  6 +import com.xingyuv.jushauth.cache.AuthStateCache;
  7 +import com.xingyuv.justauth.autoconfigure.JustAuthProperties;
7 8 import lombok.extern.slf4j.Slf4j;
8   -import me.zhyd.oauth.cache.AuthStateCache;
9 9 import org.springframework.boot.autoconfigure.AutoConfiguration;
10 10 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
11 11 import org.springframework.boot.context.properties.EnableConfigurationProperties;
... ...
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/YudaoAuthRequestFactory.java
  View file @6b42efd
... ... @@ -4,12 +4,12 @@ import cn.hutool.core.util.EnumUtil;
4 4 import cn.hutool.core.util.ReflectUtil;
5 5 import cn.iocoder.yudao.framework.social.core.enums.AuthExtendSource;
6 6 import cn.iocoder.yudao.framework.social.core.request.AuthWeChatMiniAppRequest;
7   -import com.xkcoding.justauth.AuthRequestFactory;
8   -import com.xkcoding.justauth.autoconfigure.JustAuthProperties;
9   -import me.zhyd.oauth.cache.AuthStateCache;
10   -import me.zhyd.oauth.config.AuthConfig;
11   -import me.zhyd.oauth.config.AuthSource;
12   -import me.zhyd.oauth.request.AuthRequest;
  7 +import com.xingyuv.jushauth.cache.AuthStateCache;
  8 +import com.xingyuv.jushauth.config.AuthConfig;
  9 +import com.xingyuv.jushauth.config.AuthSource;
  10 +import com.xingyuv.jushauth.request.AuthRequest;
  11 +import com.xingyuv.justauth.AuthRequestFactory;
  12 +import com.xingyuv.justauth.autoconfigure.JustAuthProperties;
13 13  
14 14 import java.lang.reflect.Method;
15 15  
... ...
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/enums/AuthExtendSource.java
  View file @6b42efd
1 1 package cn.iocoder.yudao.framework.social.core.enums;
2 2  
3   -import me.zhyd.oauth.config.AuthSource;
  3 +import com.xingyuv.jushauth.config.AuthSource;
  4 +import com.xingyuv.jushauth.request.AuthDefaultRequest;
4 5  
5 6 /**
6 7 * 拓展 JustAuth 各 api 需要的 url， 用枚举类分平台类型管理
7 8 *
8   - * 默认配置 {@link me.zhyd.oauth.config.AuthDefaultSource}
  9 + * 默认配置 {@link com.xingyuv.jushauth.config.AuthDefaultSource}
9 10 *
10 11 * @author timfruit
11 12 */
... ... @@ -34,6 +35,11 @@ public enum AuthExtendSource implements AuthSource {
34 35 // 参见 https://developers.weixin.qq.com/miniprogram/dev/api/open-api/user-info/wx.getUserProfile.html 文档
35 36 throw new UnsupportedOperationException("不支持获取用户信息 url，请使用小程序内置函数 wx.getUserProfile() 获取用户信息");
36 37 }
  38 +
  39 + @Override
  40 + public Class<? extends AuthDefaultRequest> getTargetClass() {
  41 + return null;
  42 + }
37 43 }
38 44  
39 45 }
... ...
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/request/AuthWeChatMiniAppRequest.java
  View file @6b42efd
... ... @@ -3,16 +3,16 @@ package cn.iocoder.yudao.framework.social.core.request;
3 3 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
4 4 import cn.iocoder.yudao.framework.social.core.enums.AuthExtendSource;
5 5 import com.fasterxml.jackson.annotation.JsonProperty;
  6 +import com.xingyuv.jushauth.cache.AuthStateCache;
  7 +import com.xingyuv.jushauth.config.AuthConfig;
  8 +import com.xingyuv.jushauth.exception.AuthException;
  9 +import com.xingyuv.jushauth.model.AuthCallback;
  10 +import com.xingyuv.jushauth.model.AuthToken;
  11 +import com.xingyuv.jushauth.model.AuthUser;
  12 +import com.xingyuv.jushauth.request.AuthDefaultRequest;
  13 +import com.xingyuv.jushauth.utils.HttpUtils;
  14 +import com.xingyuv.jushauth.utils.UrlBuilder;
6 15 import lombok.Data;
7   -import me.zhyd.oauth.cache.AuthStateCache;
8   -import me.zhyd.oauth.config.AuthConfig;
9   -import me.zhyd.oauth.exception.AuthException;
10   -import me.zhyd.oauth.model.AuthCallback;
11   -import me.zhyd.oauth.model.AuthToken;
12   -import me.zhyd.oauth.model.AuthUser;
13   -import me.zhyd.oauth.request.AuthDefaultRequest;
14   -import me.zhyd.oauth.utils.HttpUtils;
15   -import me.zhyd.oauth.utils.UrlBuilder;
16 16  
17 17 /**
18 18 * 微信小程序登陆 Request 请求
... ... @@ -32,7 +32,7 @@ public class AuthWeChatMiniAppRequest extends AuthDefaultRequest {
32 32 protected AuthToken getAccessToken(AuthCallback authCallback) {
33 33 // 参见 https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/login/auth.code2Session.html 文档
34 34 // 使用 code 获取对应的 openId、unionId 等字段
35   - String response = new HttpUtils(config.getHttpConfig()).get(accessTokenUrl(authCallback.getCode()));
  35 + String response = new HttpUtils(config.getHttpConfig()).get(accessTokenUrl(authCallback.getCode())).getBody();
36 36 JSCode2SessionResponse accessTokenObject = JsonUtils.parseObject(response, JSCode2SessionResponse.class);
37 37 assert accessTokenObject != null;
38 38 checkResponse(accessTokenObject);
... ... @@ -73,7 +73,7 @@ public class AuthWeChatMiniAppRequest extends AuthDefaultRequest {
73 73 return UrlBuilder.fromBaseUrl(source.accessToken())
74 74 .queryParam("appid", config.getClientId())
75 75 .queryParam("secret", config.getClientSecret())
76   - .queryParam("js_code", code) // 和父类不同，所以需要重写该方法
  76 + .queryParam("js_code", code)
77 77 .queryParam("grant_type", "authorization_code")
78 78 .build();
79 79 }
... ...
yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
  View file @6b42efd
... ... @@ -34,14 +34,13 @@
34 34 <!-- 三方云服务相关 -->
35 35 <dependency>
36 36 <groupId>com.github.binarywang</groupId>
37   -<!-- <artifactId>weixin-java-mp</artifactId>-->
38 37 <artifactId>wx-java-mp-spring-boot-starter</artifactId>
39   - <version>4.4.0</version>
  38 + <version>4.5.0</version>
40 39 </dependency>
41 40 <dependency>
42 41 <groupId>com.github.binarywang</groupId>
43 42 <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
44   - <version>4.4.0</version>
  43 + <version>4.5.0</version>
45 44 </dependency>
46 45 <!-- TODO 芋艿：清理 -->
47 46 </dependencies>
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
  View file @6b42efd
... ... @@ -127,7 +127,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
127 127 // 获得对应的手机号信息
128 128 WxMaPhoneNumberInfo phoneNumberInfo;
129 129 try {
130   - phoneNumberInfo = wxMaService.getUserService().getNewPhoneNoInfo(reqVO.getPhoneCode());
  130 + phoneNumberInfo = wxMaService.getUserService().getPhoneNoInfo(reqVO.getPhoneCode());
131 131 } catch (Exception exception) {
132 132 throw exception(AUTH_WEIXIN_MINI_APP_PHONE_CODE_ERROR);
133 133 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
  View file @6b42efd
... ... @@ -10,12 +10,12 @@ import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO;
10 10 import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserBindMapper;
11 11 import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserMapper;
12 12 import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum;
  13 +import com.xingyuv.jushauth.model.AuthCallback;
  14 +import com.xingyuv.jushauth.model.AuthResponse;
  15 +import com.xingyuv.jushauth.model.AuthUser;
  16 +import com.xingyuv.jushauth.request.AuthRequest;
  17 +import com.xingyuv.jushauth.utils.AuthStateUtils;
13 18 import lombok.extern.slf4j.Slf4j;
14   -import me.zhyd.oauth.model.AuthCallback;
15   -import me.zhyd.oauth.model.AuthResponse;
16   -import me.zhyd.oauth.model.AuthUser;
17   -import me.zhyd.oauth.request.AuthRequest;
18   -import me.zhyd.oauth.utils.AuthStateUtils;
19 19 import org.springframework.stereotype.Service;
20 20 import org.springframework.transaction.annotation.Transactional;
21 21 import org.springframework.validation.annotation.Validated;
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
  View file @6b42efd
... ... @@ -9,12 +9,12 @@ import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO;
9 9 import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserBindMapper;
10 10 import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserMapper;
11 11 import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum;
12   -import me.zhyd.oauth.enums.AuthResponseStatus;
13   -import me.zhyd.oauth.model.AuthCallback;
14   -import me.zhyd.oauth.model.AuthResponse;
15   -import me.zhyd.oauth.model.AuthUser;
16   -import me.zhyd.oauth.request.AuthRequest;
17   -import me.zhyd.oauth.utils.AuthStateUtils;
  12 +import com.xingyuv.jushauth.enums.AuthResponseStatus;
  13 +import com.xingyuv.jushauth.model.AuthCallback;
  14 +import com.xingyuv.jushauth.model.AuthResponse;
  15 +import com.xingyuv.jushauth.model.AuthUser;
  16 +import com.xingyuv.jushauth.request.AuthRequest;
  17 +import com.xingyuv.jushauth.utils.AuthStateUtils;
18 18 import org.junit.jupiter.api.Test;
19 19 import org.mockito.MockedStatic;
20 20 import org.springframework.boot.test.mock.mockito.MockBean;
... ...
yudao-server/pom.xml
  View file @6b42efd
... ... @@ -111,7 +111,7 @@
111 111 <plugin>
112 112 <groupId>org.springframework.boot</groupId>
113 113 <artifactId>spring-boot-maven-plugin</artifactId>
114   - <version>2.7.12</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 -->
  114 + <version>2.7.13</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 -->
115 115 <configuration>
116 116 <fork>true</fork>
117 117 </configuration>
... ...