代码修复提交

src/main/java/com/uas/eis/manager/AccessTokenManager.java

@@ -1,45 +0,0 @@
-package com.uas.eis.manager;
-
-
-import com.uas.eis.beans.CorpAccessToken;
-import com.uas.eis.exception.AccessTokenException;
-import com.uas.eis.exception.AppAccessTokenRequestException;
-
-/**
- * AccessToken缓存管理接口
- * @author gaoshengbo
- *
- */
-public interface AccessTokenManager {
-
-    /**
-     * 重置缓存中的AppAccessToken
-     *
-     * @throws AppAccessTokenRequestException
-     */
-    public void resetAppAccessToken() throws AppAccessTokenRequestException;
-
-    /**
-     * 重置缓存中的CorpAccessToken
-     *
-     * @throws AccessTokenException
-     */
-    public void resetCorpAccessToken() throws AccessTokenException;
-
-    /**
-     * AppAccessToken是企业应用的全局唯一票据，需要AppId和AppSecret来换取， 不同的AppSecret会返回不同的AppAccessToken。
-     * 正常情况下AppAccessToken有效期为2592000秒（30天）， 有效期内重复获取返回相同结果，并自动续期。 企业需要做适当缓存
-     *
-     * @return
-     */
-    public String getAppAccessToken() throws AppAccessTokenRequestException;
-
-    /**
-     * CorpAccessToken是企业应用访问相应公司数据的全局唯一票据， 拉取信息和发送消息的接口都需要携带CorpAccessToken和CorpId。
-     * 正常情况下CorpAccessToken的有效期为7200秒，有效期内重复获取返回相同结果，并自动续期。 企业需要做适当缓存
-     *
-     * @return
-     */
-    public CorpAccessToken getCorpAccessToken() throws AccessTokenException;
-
-}

src/main/java/com/uas/eis/manager/CommonManager.java

@@ -1,11 +0,0 @@
-package com.uas.eis.manager;
-
-import com.uas.eis.beans.result.CrmQueryResult;
-import com.uas.eis.exception.AccessTokenException;
-
-import java.util.List;
-
-public interface CommonManager {
-
-    public CrmQueryResult queryCommon(String field_name, List<String> field_values, String operator, String orderFieldName, Boolean orderAsc, int limit, String dataObjectApiName, Boolean isCustom) throws AccessTokenException;
-}

src/main/java/com/uas/eis/manager/CustomerManager.java

@@ -1,30 +0,0 @@
-package com.uas.eis.manager;
-
-
-import com.uas.eis.beans.result.BaseResult;
-import com.uas.eis.beans.result.CrmQueryResult;
-import com.uas.eis.beans.result.Customer;
-import com.uas.eis.exception.AccessTokenException;
-
-import java.util.List;
-
-/**
- *
- * 
- * @author
- * @date
- */
-public interface CustomerManager {
-
-    /**
-     * 添加商品
-     *
-     * @param
-     * @return
-     * @throws AccessTokenException
-     */
-    public CrmQueryResult queryCustomer(List<String> field_values) throws AccessTokenException;
-
-    public BaseResult updateCustomer(Customer customer) throws AccessTokenException;
-
-}

src/main/java/com/uas/eis/manager/OpenUserIdManager.java

@@ -1,15 +0,0 @@
-package com.uas.eis.manager;
-
-import com.uas.eis.beans.result.OpenUserIdResult;
-import com.uas.eis.exception.AccessTokenException;
-
-public interface OpenUserIdManager {
-
-    /**
-     * 根据code获取纷享开放平台openUserId
-     * @param code 纷享开放平台下发的员工身份临时票据，有效期为十分钟，有效期内使用一次后则会过期
-     * @return
-     * @throws AccessTokenException
-     */
-    public OpenUserIdResult getOpenUserId(String code) throws AccessTokenException;
-}

src/main/java/com/uas/eis/manager/ProductManager.java

@@ -1,42 +0,0 @@
-package com.uas.eis.manager;
-
-
-import com.uas.eis.beans.result.*;
-import com.uas.eis.exception.AccessTokenException;
-
-/**
- *
- * 
- * @author
- * @date
- */
-public interface ProductManager {
-
-    /**
-     * 添加商品
-     *
-     * @param
-     * @return
-     * @throws AccessTokenException
-     */
-    public CrmAddResult addGoods(Goods goods) throws AccessTokenException;
-
-    /**
-     * 添加商品
-     *
-     * @param
-     * @return
-     * @throws AccessTokenException
-     */
-    public CrmAddResult addProducts(Product product) throws AccessTokenException;
-
-    /**
-     * 修改商品
-     *
-     * @param
-     * @return
-     * @throws AccessTokenException
-     */
-    public BaseResult updateGoods(Product product) throws AccessTokenException;
-
-}

src/main/java/com/uas/eis/manager/impl/AccessTokenManagerImpl.java

@@ -1,145 +0,0 @@
-package com.uas.eis.manager.impl;
-
-import com.google.common.collect.Maps;
-import com.uas.eis.beans.CorpAccessToken;
-import com.uas.eis.beans.req.AppTokenReq;
-import com.uas.eis.beans.req.CorpAccessTokenReq;
-import com.uas.eis.beans.result.AppTokenResult;
-import com.uas.eis.beans.result.CorpAccessTokenResult;
-import com.uas.eis.exception.AccessTokenException;
-import com.uas.eis.exception.AppAccessTokenRequestException;
-import com.uas.eis.exception.CorpAccessTokenRequestException;
-import com.uas.eis.manager.AccessTokenManager;
-import com.uas.eis.utils.Configuration;
-import com.uas.eis.utils.OpenAPIUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-
-@Service("accessTokenManager")
-public class AccessTokenManagerImpl implements AccessTokenManager {
-
-    private static final String KEY_EXPIRES_IN = "expiresIn";
-
-    private static final String KEY_TOKEN = "token";
-
-    private static final String APP_ACCESS_TOKEN_KEY_PREX = "appAccessToken_";
-
-    private static final String CORP_ACCESS_TOKEN_KEY_PREX = "corpAccessToken_";
-
-    @Resource(name = "configuration")
-    private Configuration configuration;
-
-    /**
-     * AppAccessToken、CorpAccessToken缓存
-     */
-    private static Map<String, Map<String, Object>> accessTokenMap = Maps.newConcurrentMap();
-
-    private static Map<String, Object> setCorpAccessToken(CorpAccessTokenResult result) {
-        CorpAccessToken corpAccessToken = new CorpAccessToken();
-        corpAccessToken.setCorpAccessToken(result.getCorpAccessToken());
-        corpAccessToken.setCorpId(result.getCorpId());
-
-        Map<String, Object> token = Maps.newHashMap();
-        // 减去3分钟，以免过时
-        token.put(KEY_EXPIRES_IN, (result.getExpiresIn() - 3 * 60) * 1000 + System.currentTimeMillis());
-        token.put(KEY_TOKEN, corpAccessToken);
-        return token;
-    }
-
-    @Override
-    public void resetAppAccessToken() throws AppAccessTokenRequestException {
-        accessTokenMap.remove(APP_ACCESS_TOKEN_KEY_PREX.concat(configuration.getAppId()));
-        getAppAccessToken();
-    }
-
-    @Override
-    public void resetCorpAccessToken() throws AccessTokenException {
-        accessTokenMap.remove(CORP_ACCESS_TOKEN_KEY_PREX.concat(configuration.getAppId()).concat(
-                configuration.getPermanentCode()));
-        getCorpAccessToken();
-    }
-
-    @Override
-    public String getAppAccessToken() throws AppAccessTokenRequestException {
-        String key = APP_ACCESS_TOKEN_KEY_PREX.concat(configuration.getAppId());
-        Map<String, Object> token = accessTokenMap.get(key);
-
-        if (token != null) {
-            long expiresIn = (Long) token.get(KEY_EXPIRES_IN);
-
-            if (System.currentTimeMillis() < expiresIn) {
-                return (String) token.get(KEY_TOKEN);
-            }
-            accessTokenMap.remove(key);
-        }
-
-        String appAccessToken = null;
-        synchronized (this) {
-            token = accessTokenMap.get(key);
-
-            // 多线程环境下，其他线程可能已经获得最新appAccessToken，直接返回
-            if (token != null) {
-                return (String) token.get(KEY_TOKEN);
-            }
-            AppTokenReq req = new AppTokenReq();
-            req.setAppId(configuration.getAppId());
-            req.setAppSecret(configuration.getAppSecret());
-            AppTokenResult result = OpenAPIUtils.getAppToken(req);
-            if (result.getErrorCode() != 0) {
-                throw new AppAccessTokenRequestException(result.getErrorCode(), result.getErrorMessage());
-            }
-            appAccessToken = result.getAppAccessToken();
-            token = Maps.newHashMap();
-            // 减去3分钟，以免过时
-            token.put(KEY_EXPIRES_IN, (result.getExpiresIn() - 3 * 60) * 1000 + System.currentTimeMillis());
-            token.put(KEY_TOKEN, appAccessToken);
-            accessTokenMap.put(key, token);
-            return appAccessToken;
-        }
-    }
-
-    @Override
-    public CorpAccessToken getCorpAccessToken() throws AccessTokenException {
-        String key =
-                CORP_ACCESS_TOKEN_KEY_PREX.concat(configuration.getAppId()).concat(configuration.getPermanentCode());
-        Map<String, Object> token = accessTokenMap.get(key);
-
-        if (token != null) {
-            long expiresIn = (Long) token.get(KEY_EXPIRES_IN);
-            if (System.currentTimeMillis() < expiresIn) {
-                return (CorpAccessToken) token.get(KEY_TOKEN);
-            }
-            accessTokenMap.remove(key);
-        }
-
-        synchronized (this) {
-            token = accessTokenMap.get(key);
-            // 多线程环境下，其他线程可能已经获得最新corpAccessToken，直接返回
-            if (token != null) {
-                return (CorpAccessToken) token.get(KEY_TOKEN);
-            }
-            
-            CorpAccessTokenReq req = new CorpAccessTokenReq();
-            req.setAppId(configuration.getAppId());
-            req.setAppSecret(configuration.getAppSecret());
-            req.setPermanentCode(configuration.getPermanentCode());
-            CorpAccessTokenResult corpAccessTokenResult =  OpenAPIUtils.getCorpToken(req);
-            if (corpAccessTokenResult != null && corpAccessTokenResult.getErrorCode() == 0) {
-                token = setCorpAccessToken(corpAccessTokenResult);
-            }
-
-            if (token == null) {
-                throw new CorpAccessTokenRequestException(corpAccessTokenResult.getErrorCode(),corpAccessTokenResult.getErrorMessage());
-            }
-            accessTokenMap.put(key, token);
-            CorpAccessToken corpAccessToken = (CorpAccessToken) token.get(KEY_TOKEN);
-            if (corpAccessToken == null) {
-                throw new CorpAccessTokenRequestException(corpAccessTokenResult.getErrorCode(),corpAccessTokenResult.getErrorMessage());
-            }
-            return corpAccessToken;
-        }
-    }
-}

src/main/java/com/uas/eis/manager/impl/CommonManagerImpl.java

@@ -1,76 +0,0 @@
-package com.uas.eis.manager.impl;
-
-import com.uas.eis.beans.CorpAccessToken;
-import com.uas.eis.beans.req.CrmQueryReq;
-import com.uas.eis.beans.result.CrmQueryResult;
-import com.uas.eis.exception.AccessTokenException;
-import com.uas.eis.manager.AccessTokenManager;
-import com.uas.eis.manager.CommonManager;
-import com.uas.eis.utils.Configuration;
-import com.uas.eis.utils.OpenAPIUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("commonManager")
-public class CommonManagerImpl implements CommonManager {
-
-    private final AccessTokenManager accessTokenManager;
-
-    @Resource(name = "configuration")
-    private Configuration configuration;
-
-    public CommonManagerImpl(AccessTokenManager accessTokenManager) {
-        this.accessTokenManager = accessTokenManager;
-    }
-
-    @Override
-    public CrmQueryResult queryCommon(String field_name, List<String> field_values, String operator, String orderFieldName, Boolean orderAsc, int limit, String dataObjectApiName, Boolean isCustom) throws AccessTokenException {
-        CrmQueryResult crmQueryResult = new CrmQueryResult();
-
-        CorpAccessToken token = accessTokenManager.getCorpAccessToken();
-        String openUserId = configuration.getOpenUserId();
-
-        List<CrmQueryReq.Filters> filtersList = new ArrayList<>();
-
-        CrmQueryReq.Filters filters = new CrmQueryReq.Filters();
-        filters.setField_name(field_name);
-        filters.setField_values(field_values);
-        filters.setOperator(operator);
-
-        filtersList.add(filters);
-
-        List<CrmQueryReq.Order> orderList = new ArrayList<>();
-        CrmQueryReq.Order order = new CrmQueryReq.Order();
-        order.setAsc(orderAsc);
-        order.setFieldName(orderFieldName);
-        orderList.add(order);
-
-        CrmQueryReq.SearchQuery searchQuery = new CrmQueryReq.SearchQuery();
-        searchQuery.setFilters(filtersList);
-        searchQuery.setLimit(limit);
-        searchQuery.setOrders(orderList);
-
-        CrmQueryReq.DataApiName dataApiName = new CrmQueryReq.DataApiName();
-        dataApiName.setDataObjectApiName(dataObjectApiName);
-        dataApiName.setSearch_query_info(searchQuery);
-
-        CrmQueryReq crmQueryReq = new CrmQueryReq();
-        crmQueryReq.setCorpAccessToken(token.getCorpAccessToken());
-        crmQueryReq.setCorpId(token.getCorpId());
-        crmQueryReq.setCurrentOpenUserId(openUserId);
-        crmQueryReq.setDataApiName(dataApiName);
-        try {
-            if(isCustom){
-                crmQueryResult = OpenAPIUtils.queryCrmCustomData(crmQueryReq);
-            }else{
-                crmQueryResult = OpenAPIUtils.queryCrmData(crmQueryReq);
-            }
-        }catch (Exception e) {
-            e.printStackTrace();
-        }
-        return crmQueryResult;
-    }
-}

src/main/java/com/uas/eis/manager/impl/CustomerManagerImpl.java

@@ -1,102 +0,0 @@
-package com.uas.eis.manager.impl;
-
-import com.uas.eis.beans.CorpAccessToken;
-import com.uas.eis.beans.req.CrmQueryReq;
-import com.uas.eis.beans.req.CrmUpdateReq;
-import com.uas.eis.beans.result.BaseResult;
-import com.uas.eis.beans.result.CrmQueryResult;
-import com.uas.eis.beans.result.Customer;
-import com.uas.eis.exception.AccessTokenException;
-import com.uas.eis.manager.AccessTokenManager;
-import com.uas.eis.manager.CustomerManager;
-import com.uas.eis.manager.OpenUserIdManager;
-import com.uas.eis.utils.Configuration;
-import com.uas.eis.utils.OpenAPIUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service("customerManager")
-public class CustomerManagerImpl implements CustomerManager {
-
-    private final AccessTokenManager accessTokenManager;
-
-    public CustomerManagerImpl(AccessTokenManager accessTokenManager, OpenUserIdManager openUserIdManager) {
-        this.accessTokenManager = accessTokenManager;
-        this.openUserIdManager = openUserIdManager;
-    }
-
-    private final OpenUserIdManager openUserIdManager;
-
-    @Resource(name = "configuration")
-    private Configuration configuration;
-
-    @Override
-    public CrmQueryResult queryCustomer(List<String> field_values) throws AccessTokenException {
-        CrmQueryResult crmQueryResult = new CrmQueryResult();
-
-        CorpAccessToken token = accessTokenManager.getCorpAccessToken();
-        String openUserId = configuration.getOpenUserId();
-
-        List<CrmQueryReq.Filters> filtersList = new ArrayList<>();
-
-        CrmQueryReq.Filters filters = new CrmQueryReq.Filters();
-        filters.setField_name("create_time");
-        filters.setField_values(field_values);
-        filters.setOperator("GT");
-
-        filtersList.add(filters);
-
-        List<CrmQueryReq.Order> orderList = new ArrayList<>();
-        CrmQueryReq.Order order = new CrmQueryReq.Order();
-        order.setAsc(true);
-        order.setFieldName("create_time");
-        orderList.add(order);
-
-        CrmQueryReq.SearchQuery searchQuery = new CrmQueryReq.SearchQuery();
-        searchQuery.setFilters(filtersList);
-        searchQuery.setLimit(100);
-        searchQuery.setOrders(orderList);
-
-        CrmQueryReq.DataApiName dataApiName = new CrmQueryReq.DataApiName();
-        dataApiName.setDataObjectApiName("AccountObj");
-        dataApiName.setSearch_query_info(searchQuery);
-
-        CrmQueryReq crmQueryReq = new CrmQueryReq();
-        crmQueryReq.setCorpAccessToken(token.getCorpAccessToken());
-        crmQueryReq.setCorpId(token.getCorpId());
-        crmQueryReq.setCurrentOpenUserId(openUserId);
-        crmQueryReq.setDataApiName(dataApiName);
-        try {
-            crmQueryResult = OpenAPIUtils.queryCrmData(crmQueryReq);
-        }catch (Exception e) {
-            e.printStackTrace();
-        }
-        return crmQueryResult;
-    }
-
-    @Override
-    public BaseResult updateCustomer(Customer customer) throws AccessTokenException {
-        BaseResult baseResult = new BaseResult();
-
-        CorpAccessToken token = accessTokenManager.getCorpAccessToken();
-        String openUserId = configuration.getOpenUserId();
-        Map<String, Object> object_data = new HashMap<>();
-        object_data.put("object_data",customer);
-        CrmUpdateReq crmUpdateReq = new CrmUpdateReq();
-        crmUpdateReq.setCorpAccessToken(token.getCorpAccessToken());
-        crmUpdateReq.setCorpId(token.getCorpId());
-        crmUpdateReq.setCurrentOpenUserId(openUserId);
-        crmUpdateReq.setData(object_data);
-        try {
-            baseResult = OpenAPIUtils.updateCrmData(crmUpdateReq);
-        }catch (Exception e) {
-            e.printStackTrace();
-        }
-        return baseResult;
-    }
-}

src/main/java/com/uas/eis/manager/impl/OpenUserIdManagerImpl.java

@@ -1,28 +0,0 @@
-package com.uas.eis.manager.impl;
-
-import com.uas.eis.beans.req.OpenUserIdReq;
-import com.uas.eis.beans.result.OpenUserIdResult;
-import com.uas.eis.exception.AccessTokenException;
-import com.uas.eis.manager.AccessTokenManager;
-import com.uas.eis.manager.OpenUserIdManager;
-import com.uas.eis.utils.OpenAPIUtils;
-import org.springframework.stereotype.Service;
-
-@Service("openUserIdManager")
-public class OpenUserIdManagerImpl implements OpenUserIdManager {
-
-    private final AccessTokenManager accessTokenManager;
-
-    public OpenUserIdManagerImpl(AccessTokenManager accessTokenManager) {
-        this.accessTokenManager = accessTokenManager;
-    }
-
-    @Override
-    public OpenUserIdResult getOpenUserId(String code) throws AccessTokenException {
-        OpenUserIdReq req = new OpenUserIdReq();
-        req.setCode(code);
-        req.setAppAccessToken(accessTokenManager.getAppAccessToken());
-
-        return OpenAPIUtils.getOpenUserId(req);
-    }
-}

src/main/java/com/uas/eis/manager/impl/ProductManagerImpl.java

@@ -1,114 +0,0 @@
-package com.uas.eis.manager.impl;
-
-import com.uas.eis.beans.CorpAccessToken;
-import com.uas.eis.beans.req.CrmAddReq;
-import com.uas.eis.beans.req.CrmUpdateReq;
-import com.uas.eis.beans.result.BaseResult;
-import com.uas.eis.beans.result.CrmAddResult;
-import com.uas.eis.beans.result.Goods;
-import com.uas.eis.beans.result.Product;
-import com.uas.eis.exception.AccessTokenException;
-import com.uas.eis.manager.AccessTokenManager;
-import com.uas.eis.manager.OpenUserIdManager;
-import com.uas.eis.manager.ProductManager;
-import com.uas.eis.utils.Configuration;
-import com.uas.eis.utils.OpenAPIUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service("productManager")
-public class ProductManagerImpl implements ProductManager {
-
-    private final AccessTokenManager accessTokenManager;
-
-    public ProductManagerImpl(AccessTokenManager accessTokenManager, OpenUserIdManager openUserIdManager) {
-        this.accessTokenManager = accessTokenManager;
-        this.openUserIdManager = openUserIdManager;
-    }
-
-    private final OpenUserIdManager openUserIdManager;
-
-    @Resource(name = "configuration")
-    private Configuration configuration;
-
-    @Override
-    public CrmAddResult addGoods(Goods goods) throws AccessTokenException {
-        CrmAddResult crmAddResult = new CrmAddResult();
-
-        CorpAccessToken token = accessTokenManager.getCorpAccessToken();
-
-        String openUserId = configuration.getOpenUserId();
-        //object_data里赋值openUserId
-        List<String> owner = new ArrayList<>();
-        owner.add(openUserId);
-        goods.setOwner(owner);
-
-        Map<String, Object> object_data = new HashMap<>();
-        object_data.put("object_data",goods);
-
-        CrmAddReq crmAddReq = new CrmAddReq();
-        crmAddReq.setCorpAccessToken(token.getCorpAccessToken());
-        crmAddReq.setCorpId(token.getCorpId());
-        crmAddReq.setCurrentOpenUserId(openUserId);
-        crmAddReq.setData(object_data);
-        try {
-            crmAddResult = OpenAPIUtils.createCrmData(crmAddReq);
-        }catch (Exception e) {
-            e.printStackTrace();
-        }
-        return crmAddResult;
-    }
-
-    @Override
-    public CrmAddResult addProducts(Product product) throws AccessTokenException {
-        CrmAddResult crmAddResult = new CrmAddResult();
-
-        CorpAccessToken token = accessTokenManager.getCorpAccessToken();
-
-        String openUserId = configuration.getOpenUserId();
-        //object_data里赋值openUserId
-        List<String> owner = new ArrayList<>();
-        owner.add(openUserId);
-
-        Map<String, Object> object_data = new HashMap<>();
-        object_data.put("object_data",product);
-
-        CrmAddReq crmAddReq = new CrmAddReq();
-        crmAddReq.setCorpAccessToken(token.getCorpAccessToken());
-        crmAddReq.setCorpId(token.getCorpId());
-        crmAddReq.setCurrentOpenUserId(openUserId);
-        crmAddReq.setData(object_data);
-        try {
-            crmAddResult = OpenAPIUtils.createCrmData(crmAddReq);
-        }catch (Exception e) {
-            e.printStackTrace();
-        }
-        return crmAddResult;
-    }
-
-    @Override
-    public BaseResult updateGoods(Product product) throws AccessTokenException {
-        BaseResult baseResult = new BaseResult();
-
-        CorpAccessToken token = accessTokenManager.getCorpAccessToken();
-        String openUserId = configuration.getOpenUserId();
-        Map<String, Object> object_data = new HashMap<>();
-        object_data.put("object_data",product);
-        CrmUpdateReq crmUpdateReq = new CrmUpdateReq();
-        crmUpdateReq.setCorpAccessToken(token.getCorpAccessToken());
-        crmUpdateReq.setCorpId(token.getCorpId());
-        crmUpdateReq.setCurrentOpenUserId(openUserId);
-        crmUpdateReq.setData(object_data);
-        try {
-            baseResult = OpenAPIUtils.updateCrmData(crmUpdateReq);
-        }catch (Exception e) {
-            e.printStackTrace();
-        }
-        return baseResult;
-    }
-}

src/main/java/com/uas/eis/task/ProductMITask.java

@@ -2,11 +2,9 @@ package com.uas.eis.task;
 
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.dao.SqlRowList;
-import com.uas.eis.manager.ProductManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.support.rowset.SqlRowSet;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;

src/main/java/com/uas/eis/utils/Configuration.java

@@ -1,101 +0,0 @@
-package com.uas.eis.utils;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Service;
-
-/**
- * 读取Properties配置信息的类
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-@Service("configuration")
-public class Configuration {
-
-    /**
-     * 应用Id
-     */
-    @Value("${fs.appId}")
-    private String appId;
-
-    /**
-     * 应用秘钥
-     */
-    @Value("${fs.appSecret}")
-    private String appSecret;
-
-    /**
-     * 永久授权码
-     */
-    @Value("${fs.permanentCode}")
-    private String permanentCode;
-
-    /**
-     * App 约定加密Key
-     */
-    @Value("${fs.token}")
-    private String token;
-
-    /**
-     * App 约定加密AesKey
-     */
-    @Value("${fs.encodingAesKey}")
-    private String encodingAesKey;
-
-    /**
-     * 绑定请求uri
-     */
-    @Value("${fs.authorize.url}")
-    private String fsAuthorizeUrl;
-
-    /**
-     * openUserId
-     */
-    @Value("${fs.openUserId}")
-    private String openUserId;
-
-    @Value("${spring.datasource.username}")
-    private String username;
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public String getAppSecret() {
-        return appSecret;
-    }
-
-    public String getPermanentCode() {
-        return permanentCode;
-    }
-
-    public void setPermanentCode(String permanentCode) {
-        this.permanentCode = permanentCode;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public String getEncodingAesKey() {
-        return encodingAesKey;
-    }
-
-    public String getFsAuthorizeUrl() {
-        return fsAuthorizeUrl;
-    }
-
-    public String getOpenUserId() {
-        return openUserId;
-    }
-
-}

src/main/resources/application-prod.yml

@@ -4,7 +4,7 @@ spring:
         driverClassName: oracle.jdbc.OracleDriver
         username: DATACENTER_KX
         password: select!#%*(
-        url: jdbc:oracle:thin:@10.100.100.25:1521:orcl
+        url: jdbc:oracle:thin:@usoft.f3322.net:11624:orcl
 server:
     tomcat:
         uri_encoding: UTF-8

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -1,75 +1,23 @@
 package com.uas.eis;
 
 import com.uas.eis.beans.result.CrmQueryResult;
-import com.uas.eis.beans.result.Goods;
-import com.uas.eis.exception.AccessTokenException;
 import com.uas.eis.listener.UasProdInOutListener;
-import com.uas.eis.manager.CustomerManager;
-import com.uas.eis.manager.ProductManager;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {UasEisApplication.class})
 public class UasEisApplicationTests {
 	@Autowired
 	private UasProdInOutListener uasProdInOutListener;
 
-	@Autowired
-	private ProductManager productManager;
-
-	@Autowired
-	private CustomerManager customerManager;
 
 	@Test
 	public void Test() {
 
-		//客户下载
-		List<String> field_values = new ArrayList<>();
-        field_values.add("1641895200000");
-
-		//商品新增
-		/*List<Map<String,Object>> sku = new ArrayList<>();
-		Map<String,Object> map = new HashMap<>();
-		List spec_and_value = new ArrayList();
-		map.put("spec_and_value",spec_and_value);
-		map.put("product_status","1");
-		map.put("unit","PCS");
-		sku.add(map);
-		Goods goods = new Goods();
-		goods.setDataObjectApiName("SPUObj");
-		goods.setUnit("PCS");
-		goods.setIs_spec(false);
-		goods.setStandard_price(2.26);
-		goods.setProduct_line("1");
-		goods.setName("测试新增202201210077");
-		goods.setCategory("6");
-		//新增时
-		//goods.setSku(sku);*/
 
-		//修改时必要参数
-		//goods.set_id("61ea66a4f6c2910001540093");
-		try {
-			CrmQueryResult crmQueryResult = customerManager.queryCustomer(field_values);
-			Map<String, Object> data = crmQueryResult.getData();
-			List<Map<String,Object>> dataList = (List<Map<String,Object>>) data.get("dataList");
-			Object name = dataList.get(0).get("name");
-			Object id = dataList.get(0).get("_id");
-			System.out.println(name);
-			System.out.println(id);
-			//productManager.addGoods(goods);
-			//productManager.updateGoods(goods);
-		}catch (Exception e) {
-			e.printStackTrace();
-		}
 	}
 
 }