提交 0999cd92 authored 作者: Whispa's avatar Whispa

commit commit

上级 1488d01b
...@@ -232,7 +232,6 @@ public class AuthController extends Controller { ...@@ -232,7 +232,6 @@ public class AuthController extends Controller {
// Check if firebase token is valid // Check if firebase token is valid
boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken()); boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
boolean gotFromOld = false;
String firebaseUid = user.getFirebaseUid(); String firebaseUid = user.getFirebaseUid();
...@@ -254,7 +253,7 @@ public class AuthController extends Controller { ...@@ -254,7 +253,7 @@ public class AuthController extends Controller {
String userid = IdUtil.createIdbyUUID(); String userid = IdUtil.createIdbyUUID();
user.setPassword(encoder.encode(firebaseUid)); // user.setPassword(encoder.encode(firebaseUid));
user.setUserId(userid); user.setUserId(userid);
fillUserNecessayInfo(user); fillUserNecessayInfo(user);
......
...@@ -31,7 +31,7 @@ public class SimpleCORSFilter implements Filter { ...@@ -31,7 +31,7 @@ public class SimpleCORSFilter implements Filter {
response.setHeader("Access-Control-Allow-Credentials", "true"); response.setHeader("Access-Control-Allow-Credentials", "true");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT"); response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
response.setHeader("Access-Control-Max-Age", "3600"); response.setHeader("Access-Control-Max-Age", "3600");
response.setHeader("Access-Control-Allow-Headers", "*"); response.setHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With, remember-me, Authorization");
chain.doFilter(req, res); chain.doFilter(req, res);
} }
......
...@@ -3,7 +3,7 @@ spring.jpa.hibernate.ddl-auto=update ...@@ -3,7 +3,7 @@ spring.jpa.hibernate.ddl-auto=update
server.port = 7000 server.port = 7000
spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/chinafrica_ref?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/chinafrica_ref?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Diaoyunnuli.8 spring.datasource.password=clement123
spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
spring.datasource.connectionInitSql: SET NAMES 'utf8mb4' spring.datasource.connectionInitSql: SET NAMES 'utf8mb4'
#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论