2.0

5 years ago · bffc5b7e00
parent 9caf70e267
commit bffc5b7e00
34 changed files with 5 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -66,13 +66,14 @@ SOP封装了开放平台大部分功能包括：签名验证、统一异常处
 > 运行环境：JDK8，Maven3，[Nacos](https://nacos.io/zh-cn/docs/what-is-nacos.html)

 - doc：开发文档
- sop-admin：后台管理
- sop-gateway：网关，统一访问入口，Spring Cloud Zuul实现，可切换成Spring Cloud Gateway
 - sop-common：公共模块，封装常用功能，包含签名校验、错误处理、限流等功能
+- sop-gateway：网关，统一访问入口，Spring Cloud Zuul实现，可切换成Spring Cloud Gateway
 - sop-example：微服务示例，含springboot,springmvc示例
+- sop-website：开放平台对应网站，提供文档API、沙箱测试等内容
+- sop-auth：应用授权服务
+- sop-admin：后台管理
 - sop-sdk：基础sdk，含Java、C#版本
 - sop-test：接口调用测试用例
- sop-website：开放平台对应网站，提供文档API、沙箱测试等内容

 ## 分支说明

--- a/pom.xml
+++ b/pom.xml
@ -13,6 +13,7 @@
 	<modules>
 		<module>doc</module>
 		<module>sop-common</module>
+		<module>sop-auth</module>
 		<module>sop-example</module>
 		<module>sop-admin</module>
 		<module>sop-gateway</module>
--- a/sop-example/sop-auth/.gitignore
+++ b/sop-example/sop-auth/.gitignore
--- a/sop-example/sop-auth/pom.xml
+++ b/sop-example/sop-auth/pom.xml
--- a/sop-example/sop-auth/readme.md
+++ b/sop-example/sop-auth/readme.md
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/SopAuthApplication.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/SopAuthApplication.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/AccessToken.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/AccessToken.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/AppIdManager.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/AppIdManager.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/FetchTokenParam.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/FetchTokenParam.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/FetchTokenResult.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/FetchTokenResult.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/OAuth2Config.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/OAuth2Config.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/OAuth2Manager.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/OAuth2Manager.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/OAuth2Service.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/OAuth2Service.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/OpenUser.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/OpenUser.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/RefreshToken.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/RefreshToken.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/TokenPair.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/TokenPair.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/exception/LoginErrorException.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/exception/LoginErrorException.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/impl/AppIdManagerImpl.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/impl/AppIdManagerImpl.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/impl/OAuth2ManagerCache.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/impl/OAuth2ManagerCache.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/impl/OAuth2ManagerRedis.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/impl/OAuth2ManagerRedis.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/impl/OAuth2ServiceImpl.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/auth/impl/OAuth2ServiceImpl.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/config/OpenServiceConfig.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/config/OpenServiceConfig.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/controller/CallbackController.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/controller/CallbackController.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/controller/OAuth2Controller.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/controller/OAuth2Controller.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/entity/IsvInfo.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/entity/IsvInfo.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/entity/UserInfo.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/entity/UserInfo.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/mapper/IsvInfoMapper.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/mapper/IsvInfoMapper.java
--- a/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/mapper/UserInfoMapper.java
+++ b/sop-example/sop-auth/src/main/java/com/gitee/sop/sopauth/mapper/UserInfoMapper.java
--- a/sop-example/sop-auth/src/main/resources/application-dev.yml
+++ b/sop-example/sop-auth/src/main/resources/application-dev.yml
--- a/sop-example/sop-auth/src/main/resources/application.yml
+++ b/sop-example/sop-auth/src/main/resources/application.yml
--- a/sop-example/sop-auth/src/main/resources/templates/oauth2login.html
+++ b/sop-example/sop-auth/src/main/resources/templates/oauth2login.html
--- a/sop-example/sop-auth/src/test/java/com/gitee/sop/sopauth/RefreshTokenTest.java
+++ b/sop-example/sop-auth/src/test/java/com/gitee/sop/sopauth/RefreshTokenTest.java
--- a/sop-example/sop-auth/src/test/java/com/gitee/sop/sopauth/SopAuthApplicationTests.java
+++ b/sop-example/sop-auth/src/test/java/com/gitee/sop/sopauth/SopAuthApplicationTests.java
--- a/sop-example/pom.xml
+++ b/sop-example/pom.xml
@ -9,7 +9,6 @@
    <packaging>pom</packaging>

    <modules>
-        <module>sop-auth</module>
        <module>sop-story</module>
        <module>sop-book</module>
 		<module>sop-easyopen</module>