浏览代码

UploadToOssUtil ,登录

lyhzzz 3 年之前
父节点
当前提交
10faa9954b

+ 9 - 11
src/main/java/com/cdf/service/impl/FdkkSceneService.java

@@ -41,18 +41,16 @@ public class FdkkSceneService {
         if(fdkkResponse.getCode() == 0){
             return fdkkUser.getToken();
         }
-        if(fdkkUser.getToken() == null){
-            String fdPassword = Base64Converter.getEncode(Base64Converter.encode(fdkkUser.getPassword()));
-            FdkkLoginRequest fdkkLoginRequest = new FdkkLoginRequest(fdkkUser.getUserName(), fdPassword);
-            fdkkResponse = fdkkClient.fdkkLogin(fdkkLoginRequest);
-            if(fdkkResponse.getCode() != 0){
-                throw new BusinessException(fdkkResponse.getCode(), fdkkResponse.getMsg());
-            }
-            log.info("调用四维看看登录结果为:{}", fdkkResponse);
-            Object data = fdkkResponse.getData();
-            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
-            fdkkUser.setToken(jsonObject.getString("token"));
+        String fdPassword = Base64Converter.getEncode(Base64Converter.encode(fdkkUser.getPassword()));
+        FdkkLoginRequest fdkkLoginRequest = new FdkkLoginRequest(fdkkUser.getUserName(), fdPassword);
+        fdkkResponse = fdkkClient.fdkkLogin(fdkkLoginRequest);
+        if(fdkkResponse.getCode() != 0){
+            throw new BusinessException(fdkkResponse.getCode(), fdkkResponse.getMsg());
         }
+        log.info("调用四维看看登录结果为:{}", fdkkResponse);
+        Object data = fdkkResponse.getData();
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
+        fdkkUser.setToken(jsonObject.getString("token"));
         fdkkUserService.updateById(fdkkUser);
         return fdkkUser.getToken();
     }

+ 1 - 1
src/main/resources/application-dev.yaml

@@ -15,7 +15,7 @@ mybatis-plus:
 
 fdkk:
   login-path: http://eur.4dkankan.com
-  scene-path: http://v4-test.4dkankan.com
+  scene-path: http://eur.4dkankan.com
   hot-path: scene_view_data/%s/user/hot.json
   hot-cdf-path: cdf/hot/%s/hot.json
   hot-local-path: /home/cdf/fdkk/%s/hot.json

+ 1 - 1
src/main/resources/application-prod.yaml

@@ -15,7 +15,7 @@ mybatis-plus:
 
 fdkk:
   login-path: http://eur.4dkankan.com
-  scene-path: http://v4-test.4dkankan.com
+  scene-path: http://eur.4dkankan.com
   hot-path: scene_view_data/%s/user/hot.json
   hot-cdf-path: cdf/hot/%s/hot.json
   hot-local-path: /home/fdkk/temp/%s/hot.json