chao 4 anni fa
parent
commit
70505ab1f3

+ 8 - 11
src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -4,11 +4,8 @@ import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.service.LoginService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ServerWebExchange;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 登录API
@@ -45,8 +42,8 @@ public class LoginApi {
      * @param iv            加密算法的初始向量
      */
     @PostMapping("/auth/applets")
-    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange) {
-        return loginService.appletsAuthorization(code, encryptedData, iv, serverWebExchange);
+    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, @RequestHeader HttpHeaders headers) {
+        return loginService.appletsAuthorization(code, encryptedData, iv, headers);
     }
 
     /**
@@ -72,8 +69,8 @@ public class LoginApi {
      * @param mode  1:静默授权,2:用户手动授权
      */
     @GetMapping("/auth/website")
-    public ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange) {
-        return loginService.websiteAuthorization(code, state, mode, serverWebExchange);
+    public ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, @RequestHeader HttpHeaders headers) {
+        return loginService.websiteAuthorization(code, state, mode, headers);
     }
 
     /**
@@ -85,8 +82,8 @@ public class LoginApi {
      * @param state     安全认证
      */
     @GetMapping("/auth/qrCode")
-    public void qrCodeAuthorization(String code, String state, ServerWebExchange serverWebExchange) {
-        loginService.qrCodeAuthorization(code, state, serverWebExchange);
+    public void qrCodeAuthorization(String code, String state) {
+        loginService.qrCodeAuthorization(code, state);
     }
 
 }

+ 16 - 1
src/main/resources/application.yml

@@ -10,7 +10,16 @@ spring:
     url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
     password: 05bZ/OxTB:X+yd%1
-
+    type: com.zaxxer.hikari.HikariDataSource
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 15
+      auto-commit: true
+      idle-timeout: 30000
+      pool-name: DatebookHikariCP
+      max-lifetime: 1800000
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
   redis:
     host: 119.29.0.46
     port: 6380
@@ -29,6 +38,12 @@ spring:
     #连接超时时间(毫秒)
     timeout: 5000
 
+#整合mybatis
+mybatis:
+  #加载Mybatis映射文件
+  mapper-locations:
+    - classpath:mapper/*.xml
+
 # 指定服务注册中心的地址
 eureka:
   instance: