From 7d7d2e41373f0228bbdc0029c69611395ce66dd6 Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 14 Dec 2021 17:36:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E9=92=A5=E7=A7=81?= =?UTF-8?q?=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/baiye/config/ConfigurerAdapter.java | 2 +- .../com/baiye/{ => config}/properties/ElAdminProperties.java | 2 +- .../com/baiye/{ => config}/properties/FileProperties.java | 2 +- .../java/com/baiye/{ => config}/properties/RsaProperties.java | 2 +- .../baiye/modules/security/config/SpringSecurityConfig.java | 2 -- .../baiye/modules/security/rest/AuthorizationController.java | 3 +-- .../java/com/baiye/modules/system/rest/UserController.java | 2 +- .../baiye/modules/system/service/impl/UserServiceImpl.java | 2 +- .../src/main/java/com/baiye/util/StringUtils.java | 2 +- .../src/main/resources/config/application.yml | 2 +- services/ad-platform-source/pom.xml | 4 +++- 11 files changed, 12 insertions(+), 13 deletions(-) rename manage/ad-platform-management/src/main/java/com/baiye/{ => config}/properties/ElAdminProperties.java (96%) rename manage/ad-platform-management/src/main/java/com/baiye/{ => config}/properties/FileProperties.java (97%) rename manage/ad-platform-management/src/main/java/com/baiye/{ => config}/properties/RsaProperties.java (96%) diff --git a/manage/ad-platform-management/src/main/java/com/baiye/config/ConfigurerAdapter.java b/manage/ad-platform-management/src/main/java/com/baiye/config/ConfigurerAdapter.java index afff5988..dbd60dd8 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/config/ConfigurerAdapter.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/config/ConfigurerAdapter.java @@ -15,7 +15,7 @@ */ package com.baiye.config; -import com.baiye.properties.FileProperties; +import com.baiye.config.properties.FileProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/properties/ElAdminProperties.java b/manage/ad-platform-management/src/main/java/com/baiye/config/properties/ElAdminProperties.java similarity index 96% rename from manage/ad-platform-management/src/main/java/com/baiye/properties/ElAdminProperties.java rename to manage/ad-platform-management/src/main/java/com/baiye/config/properties/ElAdminProperties.java index 96f6e553..fedd3528 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/properties/ElAdminProperties.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/config/properties/ElAdminProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.baiye.properties; +package com.baiye.config.properties; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/properties/FileProperties.java b/manage/ad-platform-management/src/main/java/com/baiye/config/properties/FileProperties.java similarity index 97% rename from manage/ad-platform-management/src/main/java/com/baiye/properties/FileProperties.java rename to manage/ad-platform-management/src/main/java/com/baiye/config/properties/FileProperties.java index c90378b2..21132e3b 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/properties/FileProperties.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/config/properties/FileProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.baiye.properties; +package com.baiye.config.properties; import com.baiye.constant.ElAdminConstant; import lombok.Data; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/properties/RsaProperties.java b/manage/ad-platform-management/src/main/java/com/baiye/config/properties/RsaProperties.java similarity index 96% rename from manage/ad-platform-management/src/main/java/com/baiye/properties/RsaProperties.java rename to manage/ad-platform-management/src/main/java/com/baiye/config/properties/RsaProperties.java index f6d34815..23d74262 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/properties/RsaProperties.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/config/properties/RsaProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.baiye.properties; +package com.baiye.config.properties; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/security/config/SpringSecurityConfig.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/security/config/SpringSecurityConfig.java index 3c72ff18..5a779c8e 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/security/config/SpringSecurityConfig.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/security/config/SpringSecurityConfig.java @@ -122,8 +122,6 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/file/**").permitAll() // 阿里巴巴 druid .antMatchers("/druid/**").permitAll() - // TODO Change the url - .antMatchers("/test/**").permitAll() // 放行OPTIONS请求 .antMatchers(HttpMethod.OPTIONS, "/**").permitAll() // 自定义匿名访问所有url放行：允许匿名和带Token访问，细腻化到每个 Request 类型 diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/security/rest/AuthorizationController.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/security/rest/AuthorizationController.java index a41747a4..c27026e8 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/security/rest/AuthorizationController.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/security/rest/AuthorizationController.java @@ -19,7 +19,7 @@ import cn.hutool.core.util.IdUtil; import com.baiye.annotation.rest.AnonymousDeleteMapping; import com.baiye.annotation.rest.AnonymousGetMapping; import com.baiye.annotation.rest.AnonymousPostMapping; -import com.baiye.properties.RsaProperties; +import com.baiye.config.properties.RsaProperties; import com.baiye.exception.BadRequestException; import com.baiye.modules.security.config.bean.LoginCodeEnum; import com.baiye.modules.security.config.bean.LoginProperties; @@ -53,7 +53,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/UserController.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/UserController.java index f39e478b..911957bf 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/UserController.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/UserController.java @@ -16,7 +16,7 @@ package com.baiye.modules.system.rest; import cn.hutool.core.collection.CollectionUtil; -import com.baiye.properties.RsaProperties; +import com.baiye.config.properties.RsaProperties; import com.baiye.exception.BadRequestException; import com.baiye.modules.system.domain.Dept; import com.baiye.modules.system.domain.User; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index c0f12daa..2b64aa1b 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -15,7 +15,7 @@ */ package com.baiye.modules.system.service.impl; -import com.baiye.properties.FileProperties; +import com.baiye.config.properties.FileProperties; import com.baiye.exception.BadRequestException; import com.baiye.exception.EntityExistException; import com.baiye.exception.EntityNotFoundException; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/util/StringUtils.java b/manage/ad-platform-management/src/main/java/com/baiye/util/StringUtils.java index 270f62fb..d7299640 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/util/StringUtils.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/util/StringUtils.java @@ -18,7 +18,7 @@ package com.baiye.util; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.baiye.properties.ElAdminProperties; +import com.baiye.config.properties.ElAdminProperties; import com.baiye.constant.ElAdminConstant; import lombok.extern.slf4j.Slf4j; import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; diff --git a/manage/ad-platform-management/src/main/resources/config/application.yml b/manage/ad-platform-management/src/main/resources/config/application.yml index 9bbe78f7..7b2005a7 100644 --- a/manage/ad-platform-management/src/main/resources/config/application.yml +++ b/manage/ad-platform-management/src/main/resources/config/application.yml @@ -51,4 +51,4 @@ code: #密码加密传输，前端公钥加密，后端私钥解密 rsa: - private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== + private_key: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKLhn7fPqFSK9z3Ao4yFFisDO8YV1dOn1I3wpwj1IIu3Z7vkaHyynBf7eF8fo86EQRvnJIo3jVO2jUw5Lor2OYcZVK72oxD5LIULVYI/eXJogzd1C+tJ5IHC7dmTJ37qfjP9VV3mDWlsRusdCoVPE2xUI13H4bPOCE4DyyeldXlFAgMBAAECgYBakWx3D5+AyvipPKl0JDhsWFLvVQrdss+M0Uh/wZWEOsoSfvHejI4hA7It6nDyDzYI5uC5fiQ2bSZqQM1xdXIMmq4F0WM2+ni4Q/bYbaLt9UDGs6GXwHcg3gOTBJoSJq0SZxBpflxbfVOj63ITehTl51q0FvaedxWl63hf6bikQQJBANT3s1usMZmubYxQPLrBeK1mcXG1JxwKDK6n7bJnlBeZy1GCUZ7bwBgr32gRvUXtgqrzT3IyZlld5cUScX601TUCQQDDyxVAPExwbpxD0Ao7CZE9LRYC8YaMQ46NENqaIhnmhMa4vqoTky8t2nLZITmk0EqecTBt/Io+37+X/KCHD+XRAkAraGmIb+qUNndhuCEIt9KPFWheEtxr3KiFGPlb+by3qsNEU9mrFYNr6dVZcvQvQp/1lC5HSnqOEJN6va2gc99ZAkEAnYtF+EAMydNXDgHSmZqjMXSb55Zsy2R4ye2r2KZj7Ocd9/4DYGjoZ58FFs3zUjkAMemmLHouy1TDGAsBKGyUYQJBAJ1io1DxuejCE+sN/bu4Y2S7oQ2Mpfjh7jRYGruDzhdqVnnLxf0spaqJZ5HekQz3uMpkQQGkcN1MZZcRpoWJ7XU= diff --git a/services/ad-platform-source/pom.xml b/services/ad-platform-source/pom.xml index 40399c08..e893000c 100644 --- a/services/ad-platform-source/pom.xml +++ b/services/ad-platform-source/pom.xml @@ -29,6 +29,8 @@ ad-platform-pojo 1.0-SNAPSHOT + + - \ No newline at end of file +