Browse Source

210604 master 병합용 커밋

leeheejo 3 years ago
parent
commit
78cda9676c

+ 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

+ 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("인증 실패");
 							}