Selaa lähdekoodia

210604 최신버전

leeheejo 3 vuotta sitten
vanhempi
commit
d876cb307a

+ 0 - 1
java/com/icontrols/oauth/controller/OAuthController.java

@@ -106,7 +106,6 @@ public class OAuthController {
 				httpSession.setAttribute("redirectUri", redirectUri);
 				httpSession.setAttribute("state", state);
 
-				// TODO
 //				if (scope != null)
 //					httpSession.setAttribute("scope", scope);
 

+ 1 - 1
java/com/icontrols/oauth/model/Token.java

@@ -57,7 +57,7 @@ public class Token {
 
 	public Token() {
 		super();
-		// TODO Auto-generated constructor stub
+		 
 	}
 
 	@Override

+ 2 - 0
java/com/icontrols/oauth/repo/ComplexInfoRepository.java

@@ -3,9 +3,11 @@ package com.icontrols.oauth.repo;
 import java.util.List;
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
 import com.icontrols.oauth.model.ComplexInfo;
 
+@Repository
 public interface ComplexInfoRepository extends CrudRepository<ComplexInfo, Long> {
 
 	List<ComplexInfo> findAll();

+ 9 - 9
src/main/resources/application.properties

@@ -10,15 +10,15 @@ 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.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.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

BIN
src/main/resources/tomcat.jks


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

@@ -119,9 +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://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';
+								window.location.href = 'https://teldev.hdc-smart.com/api/oauth2/code/generate';
 							} else {
 								alert("인증 실패");
 							}