优化

src/main/java/cn/com/duiba/jdactivity/controller/AppController.java

@@ -47,43 +47,48 @@ public class AppController {
     public Result<JSONObject> login(
             String code,
             @RequestParam(required = false) String state) {
-        LOGGER.info("login,code={},state={}", code, state);
-        if (StringUtils.isAnyBlank(code)) {
-            return ResultBuilder.fail("参数缺失");
-        }
+        try {
+            LOGGER.info("login,code={},state={}", code, state);
+            if (StringUtils.isAnyBlank(code)) {
+                return ResultBuilder.fail("参数缺失");
+            }
 
-        // 获取appKey
-        String appKey = JdAppEnum.DUIBA.getAppKey();
-        if (StringUtils.isNotBlank(state)) {
-            JosParameters josParameters = LoginUtils.getStateParam(state);
-            if (josParameters != null) {
-                appKey = josParameters.getApp_key();
+            // 获取appKey
+            String appKey = JdAppEnum.DUIBA.getAppKey();
+            if (StringUtils.isNotBlank(state)) {
+                JosParameters josParameters = LoginUtils.getStateParam(state);
+                if (josParameters != null) {
+                    appKey = josParameters.getApp_key();
+                }
             }
-        }
 
-        JdAppEnum jdAppEnum = JdAppEnum.getAppByAppKey(appKey);
-        if (jdAppEnum == null) {
-            return ResultBuilder.fail("appKey参数不合法");
-        }
+            JdAppEnum jdAppEnum = JdAppEnum.getAppByAppKey(appKey);
+            if (jdAppEnum == null) {
+                return ResultBuilder.fail("appKey参数不合法");
+            }
 
-        JSONObject object = new JSONObject();
-        AccessTokenResponse accessTokenByCode = accessTokenUtils.getAccessTokenByCode(jdAppEnum, code);
-        if (accessTokenByCode != null && !accessTokenByCode.isOk()) {
-            object.put("accessToken", accessTokenByCode);
-            object.put("msg", "授权成功");
-            Result<ShopJosResult> shopJosResultResult = jdApiUtil.venderShopQuery(jdAppEnum, accessTokenByCode.getAccess_token());
-            if (shopJosResultResult.getSuccess()) {
-                ShopJosResult shopJosResult = shopJosResultResult.getData();
-                object.put("shop", shopJosResult);
+            JSONObject object = new JSONObject();
+            AccessTokenResponse accessTokenByCode = accessTokenUtils.getAccessTokenByCode(jdAppEnum, code);
+            if (accessTokenByCode != null && accessTokenByCode.isOk()) {
+                object.put("accessToken", accessTokenByCode);
+                object.put("msg", "授权成功");
+                Result<ShopJosResult> shopJosResultResult = jdApiUtil.venderShopQuery(jdAppEnum, accessTokenByCode.getAccess_token());
+                if (shopJosResultResult.getSuccess()) {
+                    ShopJosResult shopJosResult = shopJosResultResult.getData();
+                    object.put("shop", shopJosResult);
 
-                // 保存入库
-                Long id = accessTokenUtils.saveAccessToken(jdAppEnum, accessTokenByCode, shopJosResult);
+                    // 保存入库
+                    Long id = accessTokenUtils.saveAccessToken(jdAppEnum, accessTokenByCode, shopJosResult);
+                    if (id != null && id > 0) {
+                        object.put("id", accessTokenUtils.getAccessToken(shopJosResult.getVenderId(), shopJosResult.getShopId()).getShopId());
+                    }
+                }
             }
 
-
+            return ResultBuilder.success(object);
+        } catch (BizException e) {
+            return ResultBuilder.fail(e.getMessage());
         }
-
-        return ResultBuilder.success(object);
     }
 
 

src/main/resources/application.properties

@@ -15,5 +15,5 @@ mybatis.mapper-locations=classpath:mybatis/*/*.xml
 spring.mvc.view.suffix=.html
 spring.thymeleaf.prefix=classpath:templates/
 spring.thymeleaf.suffix=.html
-spring.thymeleaf.mode=LEGACYHTML5
+spring.thymeleaf.mode=HTML
 spring.thymeleaf.cache=false
\ No newline at end of file