diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class index 016a213..31fc5c5 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class differ diff --git a/main_vm/build/resources/main/application-local.yml b/main_vm/build/resources/main/application-local.yml index 2dc72ce..1a9e24b 100644 --- a/main_vm/build/resources/main/application-local.yml +++ b/main_vm/build/resources/main/application-local.yml @@ -29,8 +29,6 @@ spring: dialect: com.icomsys.main_vm.common.util.CustomDialect generate_statistics: true - jwt: - secret: f2d7e5002d67c8d118ebf800274b6a5c83ed7b3d3518b2cddcd7226f7484eb34 #https://docs.jboss.org/hibernate/orm/3.5/javadocs/org/hibernate/dialect/package-summary.html diff --git a/main_vm/build/resources/main/application.yml b/main_vm/build/resources/main/application.yml index a64cf27..66bc0e9 100644 --- a/main_vm/build/resources/main/application.yml +++ b/main_vm/build/resources/main/application.yml @@ -55,7 +55,8 @@ spring: cache: false template-resolver-order: 0 check-template-location: true - + jwt: + secret: f2d7e5002d67c8d118ebf800274b6a5c83ed7b3d3518b2cddcd7226f7484eb34 autoconfigure: # exclude: org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java index c499c5b..8c320fb 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java @@ -43,6 +43,7 @@ public class LoginController { public ModelAndView loginUsrView() { // loginService.Logout(); log.info("loginpage"); + return new ModelAndView("layout/signin"); } diff --git a/main_vm/src/main/resources/application-local.yml b/main_vm/src/main/resources/application-local.yml index 2dc72ce..1a9e24b 100644 --- a/main_vm/src/main/resources/application-local.yml +++ b/main_vm/src/main/resources/application-local.yml @@ -29,8 +29,6 @@ spring: dialect: com.icomsys.main_vm.common.util.CustomDialect generate_statistics: true - jwt: - secret: f2d7e5002d67c8d118ebf800274b6a5c83ed7b3d3518b2cddcd7226f7484eb34 #https://docs.jboss.org/hibernate/orm/3.5/javadocs/org/hibernate/dialect/package-summary.html diff --git a/main_vm/src/main/resources/application.yml b/main_vm/src/main/resources/application.yml index a64cf27..66bc0e9 100644 --- a/main_vm/src/main/resources/application.yml +++ b/main_vm/src/main/resources/application.yml @@ -55,7 +55,8 @@ spring: cache: false template-resolver-order: 0 check-template-location: true - + jwt: + secret: f2d7e5002d67c8d118ebf800274b6a5c83ed7b3d3518b2cddcd7226f7484eb34 autoconfigure: # exclude: org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration