leeheejo 5 jaren geleden
bovenliggende
commit
a041ff52b8

+ 13 - 7
java/com/icontrols/oauth/controller/OAuthController.java

@@ -343,12 +343,12 @@ public class OAuthController {
 				logger.info(isValidToken);
 				JSONObject isValidTokenJson = new JSONObject(isValidToken);
 				logger.info(isValidTokenJson.toString());
-				
+
 				if (!isValidTokenJson.get("result").toString().equalsIgnoreCase("success")) {
-					
-					if (isValidTokenJson.getJSONObject("error").getInt("code") == -200) //서버에러인경우 
+
+					if (isValidTokenJson.getJSONObject("error").getInt("code") == -200) // 서버에러인경우
 						throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR);
-					
+
 					response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 					logger.info(isValidTokenJson.get("result").toString());
 					JSONObject error = new JSONObject();
@@ -381,10 +381,10 @@ public class OAuthController {
 			JSONObject obj = new JSONObject(answer);
 			logger.info(obj.get("result").toString());
 			if (!obj.get("result").toString().equalsIgnoreCase("success")) {
-				
-				if (obj.getJSONObject("error").getInt("code") == -200) //서버에러인경우 
+
+				if (obj.getJSONObject("error").getInt("code") == -200) // 서버에러인경우
 					throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR);
-				
+
 				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 				JSONObject error = new JSONObject();
 				error.put("error", "invalid_grant");
@@ -450,4 +450,10 @@ public class OAuthController {
 
 	}
 
+	@RequestMapping(value = "/aws/healthcheck", method = RequestMethod.GET)
+	public void healthCheck(HttpEntity<String> httpEntity) {
+
+		return;
+	}
+
 }

+ 22 - 0
pom.xml

@@ -101,6 +101,28 @@
 			<artifactId>httpclient</artifactId>
 			<version>4.5.6</version>
 		</dependency>
+
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>5.2.3.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.web</groupId>
+			<artifactId>el-impl</artifactId>
+			<version>2.2</version>
+		</dependency>
 	</dependencies>
 
 	<build>

+ 10 - 6
src/main/resources/application.properties

@@ -10,14 +10,18 @@ spring.redis.lettuce.pool.min-idle=2
 spring.redis.port=6379
 spring.redis.host=127.0.0.1
 
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.url=jdbc:mariadb://127.0.0.1:3306/oauth?useUnicode=true&charaterEncoding=utf-8
+#spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+#spring.datasource.url=jdbc:mariadb://127.0.0.1:3306/oauth?useUnicode=true&charaterEncoding=utf-8
+#
+#spring.datasource.username=admin
+#spring.datasource.password = hdci12#$
+spring.datasource.driverClassName=org.mariadb.jdbc.Driver
+spring.datasource.url=jdbc:mariadb://hdc-iot-dbinstance.c7ozgzzifmtz.ap-northeast-2.rds.amazonaws.com:3306/oauth?useUnicode=true&characterEncoding=utf-8
+spring.datasource.username=root
+spring.datasource.password=HDCiot2019()
+
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.generate-ddl=true
-spring.datasource.username=admin
-spring.datasource.password = hdci12#$
-#spring.datasource.username=root
-#spring.datasource.password = 2072712l^^
 #
 server.ssl.key-store=classpath:tomcat.jks
 server.ssl.key-store-password=hdci12#$

+ 3 - 2
src/main/webapp/WEB-INF/jsp/InsertCode.jsp

@@ -119,8 +119,9 @@ img {
 							console.log(data);
 							if (data == true) {
 								//window.location.href = 'http://127.0.0.1:8003/api/oauth2/code/generate';
-								//window.location.href = 'https://telproxy.hdc-smart.com/api/oauth2/code/generate';
-								window.location.href = 'https://teldev.hdc-smart.com/api/oauth2/code/generate';
+								window.location.href = 'https://telproxy.hdc-smart.com/api/oauth2/code/generate';
+								//window.location.href = 'https://proxy.hdc-smart.com/api/oauth2/code/generate';
+								//window.location.href = 'https://teldev.hdc-smart.com/api/oauth2/code/generate';
 							} else {
 								alert("인증 실패");
 							}