diff --git a/src/main/java/com/urpsys/baseapi/common/util/CommonUtil.java b/src/main/java/com/urpsys/baseapi/common/util/CommonUtil.java index 59af4274..15efd252 100644 --- a/src/main/java/com/urpsys/baseapi/common/util/CommonUtil.java +++ b/src/main/java/com/urpsys/baseapi/common/util/CommonUtil.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.springframework.http.HttpHeaders; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.jwt.Jwt; import org.springframework.security.jwt.JwtHelper; import org.springframework.security.oauth2.provider.token.RemoteTokenServices; @@ -28,6 +29,7 @@ import com.google.gson.GsonBuilder; import com.urpsys.baseapi.common.exception.CustomException; import com.urpsys.baseapi.domain.TokenInfo; + /** * 공통 유틸리티를 모아둔 클래스 * @@ -587,6 +589,7 @@ public class CommonUtil return sb.toString(); } + } diff --git a/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java b/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java index 0af54d9a..ffeaa366 100644 --- a/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java +++ b/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java @@ -65,6 +65,12 @@ public class urpBaseResourceApplication System.out.println("############# kic_rel Env ######################"); System.out.println("################################################"); } + else if(activeProfile.equals("keiti_prod")) + { + System.out.println("################################################"); + System.out.println("############# keiti_prod Env ###################"); + System.out.println("################################################"); + } else { System.out.println("################################################"); diff --git a/src/main/java/com/urpsys/itmsapi/sys/controller/UserManageController.java b/src/main/java/com/urpsys/itmsapi/sys/controller/UserManageController.java index fc166170..905833c0 100644 --- a/src/main/java/com/urpsys/itmsapi/sys/controller/UserManageController.java +++ b/src/main/java/com/urpsys/itmsapi/sys/controller/UserManageController.java @@ -152,7 +152,19 @@ public class UserManageController boolean isCorrectPassword = false; String resultMsg = ""; - if (passwordEncoder.matches(oldPassword, strDbPass)) + // 토큰정보 획득 + TokenInfo tokenInfo = CommonUtil.getAccessTokenInfo(request); + + // 2025.08.23 나혁제 관리자는 이전비밀번호 없이 수정가능 + if(tokenInfo.getAuthorities().indexOf("ROLE_ADMIN")>-1) + { + log.info("패스워드 일치"); + if (newPassword.equals(newPassword2)) + { + isCorrectPassword = true; + } + } + else if (passwordEncoder.matches(oldPassword, strDbPass)) { log.info("패스워드 일치"); if (newPassword.equals(newPassword2)) diff --git a/src/main/resources/application-keiti_prod.yml b/src/main/resources/application-keiti_prod.yml new file mode 100644 index 00000000..6a08ed33 --- /dev/null +++ b/src/main/resources/application-keiti_prod.yml @@ -0,0 +1,60 @@ + # Service port + server: + port: 11010 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true +# 인증서버에서 JWT 보안키 확인 + security: + oauth2: + resourceserver: + jwt: + jwk-set-uri: + http://localhost:11000/oauth/token_key + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://192.168.100.76:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false + + # custom 설정 + custom: + api_server : null + sendmail: + id: tW9kMpd3SiAnf3RQBOZapw== + password: Tkkj8p2PYfZ+AmpQMPLHF8ksj8vrtJouj6xczU8ShM8= + port: 587 + host: smtp.gmail.com + sendEmail: hhjj0701@gmail.com + senderName: 나혁제 + socketFactory-class: javax.net.ssl.SSLSocketFactory + supplier: gmail.com + front_host_info : http://192.168.100.76:11020 + client : keiti + \ No newline at end of file