lyhzzz %!s(int64=2) %!d(string=hai) anos
pai
achega
7e10f5e34d

+ 22 - 0
src/main/java/com/fdkankan/ucenter/httpClient/address/FdkkAddressSource.java

@@ -0,0 +1,22 @@
+package com.fdkankan.ucenter.httpClient.address;
+
+import com.dtflys.forest.callback.AddressSource;
+import com.dtflys.forest.http.ForestAddress;
+import com.dtflys.forest.http.ForestRequest;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class FdkkAddressSource implements AddressSource {
+
+    @Value("${4dkk.fdService.basePath}")
+    private String basePath;
+
+    @Value("${4dkk.fdService.port}")
+    private String port;
+
+    @Override
+    public ForestAddress getAddress(ForestRequest forestRequest) {
+        return new ForestAddress("","",Integer.valueOf(port),basePath);
+    }
+}

+ 26 - 0
src/main/java/com/fdkankan/ucenter/httpClient/client/FdkkClient.java

@@ -0,0 +1,26 @@
+package com.fdkankan.ucenter.httpClient.client;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.annotation.*;
+import com.fdkankan.ucenter.httpClient.address.FdkkAddressSource;
+import com.fdkankan.ucenter.vo.request.LoginParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 获取四维看看相关数据
+ */
+public interface FdkkClient {
+
+    /**
+     * 登录
+     */
+    @Post("/api/sso/user/login")
+    @Address(source = FdkkAddressSource.class)
+    JSONObject fdkkLogin(@JSONBody LoginParam fdkkLoginRequest);
+
+
+}

+ 13 - 2
src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -20,6 +20,7 @@ import com.fdkankan.ucenter.constant.QrCodeFilePath;
 import com.fdkankan.ucenter.entity.Camera;
 import com.fdkankan.ucenter.entity.CameraDetail;
 import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.httpClient.client.FdkkClient;
 import com.fdkankan.ucenter.service.ICameraDetailService;
 import com.fdkankan.ucenter.service.ICameraService;
 import com.fdkankan.ucenter.service.IUserService;
@@ -34,6 +35,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 @Service
 public class LoginService {
 
@@ -52,7 +55,15 @@ public class LoginService {
     @Value("${main.url}")
     private String mainUrl;
 
-    public LoginVo login(LoginParam param) {
+    @Value("${spring.profiles.active}")
+    private String environment;
+    @Resource
+    private FdkkClient fdkkClient;
+
+    public Object login(LoginParam param) {
+        if(environment.equals("test")){
+            return fdkkClient.fdkkLogin(param);
+        }
         if (StringUtils.isEmpty(param.getPassword()) || StringUtils.isEmpty(param.getPhoneNum())){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
@@ -278,7 +289,7 @@ public class LoginService {
         }
     }
 
-    public LoginVo loginClear(LoginParam param) {
+    public Object loginClear(LoginParam param) {
         param.setClear("YES");  //明文登录
         return login(param);
     }

+ 1 - 1
src/main/resources/bootstrap-test.yml

@@ -16,7 +16,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-redis-config.yaml
+          - data-id: common-redis-config-52.yaml
             group: DEFAULT_GROUP
             refresh: true