Merge branch 'doudian' of http://git.semsx.com/zhangxiaoyu/baseJapi into doudian

 Conflicts:

	src/main/java/com/api/controller/ApiTestController.java

	src/main/resources/application-dev.yml

	src/main/resources/application.yml

src/main/java/com/api/config/DoudianConfig.java

@@ -0,0 +1,21 @@
+package com.api.config;
+
+import com.doudian.open.api.address_list.AddressListRequest;
+import com.doudian.open.core.GlobalConfig;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * 抖店config
+ */
+@Configuration
+public class DoudianConfig {
+    @Bean
+    public AddressListRequest addressListRequest() {
+        return new AddressListRequest();
+    }
+}

src/main/java/com/api/config/FilterConfig.java

@@ -9,6 +9,7 @@
 package com.api.config;
 
 import com.common.xss.XssFilter;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/api/config/InitDoudian.java

@@ -0,0 +1,20 @@
+package com.api.config;
+
+import com.doudian.open.core.GlobalConfig;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.PostConstruct;
+
+@Repository
+public class InitDoudian {
+    @Value("${doudian.app-key}")
+    private String appKey;
+    @Value("${doudian.app-secret}")
+    private String appSecret;
+    @PostConstruct
+    public void init() {
+        GlobalConfig.initAppKey(appKey);
+        GlobalConfig.initAppSecret(appSecret);
+    }
+}

src/main/java/com/api/controller/ApiTestController.java

@@ -9,7 +9,7 @@
 package com.api.controller;
 
 import com.api.dao.TokenDao;
-import com.api.service.TokenService;
+import com.api.service.DoudianTokenService;
 import com.common.utils.R;
 import com.api.annotation.Login;
 import com.api.annotation.LoginUser;
@@ -48,6 +48,8 @@ public class ApiTestController extends AbsctactController {
     TokenDao tokenDao;
     @Autowired
     TokenService tokenService;
+    @Autowired
+    DoudianTokenService doudianTokenService;
     @Login
     @GetMapping("userInfo")
     @ApiOperation(value="获取用户信息", response=UserEntity.class)
@@ -65,10 +67,7 @@ public class ApiTestController extends AbsctactController {
     @GetMapping("notToken")
     @ApiOperation("忽略Token验证测试")
     public R notToken(HttpServletRequest request, HttpSession httpSession){
-        GlobalConfig.initAppKey("7090080248619877901");
-        GlobalConfig.initAppSecret("a4d9d3e6-aa69-4f0c-bffa-be4039e74262");
         Object beanNamesForType = applicationContext.getBean(TokenDao.class);
-        TokenCreateRequest tokenCreateRequest = new TokenCreateRequest();
         TokenDao bean = beanFactory.getBean(TokenDao.class);
         TokenDao tokenDao = (TokenDao) beanNamesForType;
 //        return R.ok().put("msg", "无需token也能访问。。。");

src/main/java/com/api/service/DoudianTokenService.java

@@ -0,0 +1,9 @@
+package com.api.service;
+
+import com.doudian.open.api.address_list.AddressListResponse;
+import com.doudian.open.core.AccessToken;
+
+public interface DoudianTokenService {
+    AccessToken getShopAccessToken(Long shopId);
+    AddressListResponse getAddressList(Long shopId);
+}

src/main/java/com/api/service/impl/DoudianTokenServiceImpl.java

@@ -0,0 +1,40 @@
+package com.api.service.impl;
+
+import com.api.service.DoudianTokenService;
+import com.doudian.open.api.address_list.AddressListRequest;
+import com.doudian.open.api.address_list.AddressListResponse;
+import com.doudian.open.api.address_list.param.AddressListParam;
+import com.doudian.open.core.AccessToken;
+import com.doudian.open.core.AccessTokenBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+
+@Service
+public class DoudianTokenServiceImpl implements DoudianTokenService {
+    @Autowired
+    AddressListRequest addressListRequest;
+    private AccessToken accessToken;
+    // zxy测试预填入Token
+    @PostConstruct
+    public void initToken() {
+        accessToken = AccessTokenBuilder.refresh("3ce5a5db-bd29-471b-b7c1-1b277a760dbe");
+    }
+    @Override
+    public AccessToken getShopAccessToken(Long shopId) {
+        accessToken= AccessTokenBuilder.build(shopId);
+        return null;
+    }
+    @Override
+    public AddressListResponse getAddressList(Long shopId) {
+        AddressListParam param = addressListRequest.getParam();
+        param.setPageNo(1L);
+        param.setPageSize(10L);
+        param.setShopId(shopId);
+        param.setOrderBy("desc");
+        param.setOrderField("create_time");
+        AddressListResponse execute = addressListRequest.execute(accessToken);
+        return null;
+    }
+}

src/main/resources/application.yml

@@ -34,7 +34,9 @@ spring:
 renren:
   redis:
     open: false  # 是否开启redis缓存  true开启   false关闭
-
+doudian:
+  app-key: 7090080248619877901
+  app-secret : a4d9d3e6-aa69-4f0c-bffa-be4039e74262
 #mybatis
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/*.xml
@@ -58,7 +60,5 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
-    log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl
-