anderx 3 years ago
parent
commit
14cf98caaa

+ 4 - 5
src/main/java/com/goafanti/common/model/TChangeTask.java

@@ -6,7 +6,7 @@ import java.util.Date;
 
 /**
  * t_change_task
- * @author 
+ * @author
  */
 public class TChangeTask implements Serializable {
     /**
@@ -60,7 +60,7 @@ public class TChangeTask implements Serializable {
     private String taskComment;
 
     /**
-     * 状态 0正常 1新增 2修改 3删除 
+     * 状态 0正常 1新增 2修改 3删除
      */
     private Integer type;
 
@@ -90,7 +90,7 @@ public class TChangeTask implements Serializable {
     private Integer officialCost;
 
     /**
-     * 费减 0否 1有 
+     * 费减 0否 1有
      */
     private Integer costReduction;
 
@@ -129,7 +129,6 @@ public class TChangeTask implements Serializable {
      */
     private Integer changeSplitSuper;
 
-    private static final long serialVersionUID = 1L;
 
     public Integer getId() {
         return id;
@@ -322,4 +321,4 @@ public class TChangeTask implements Serializable {
     public void setChangeSplitSuper(Integer changeSplitSuper) {
         this.changeSplitSuper = changeSplitSuper;
     }
-}
+}

+ 3 - 4
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -6,9 +6,9 @@ import java.util.Date;
 
 /**
  * t_order_new
- * @author 
+ * @author
  */
-public class TOrderNew implements Serializable {
+public class TOrderNew {
     /**
      * 订单编号
      */
@@ -239,7 +239,6 @@ public class TOrderNew implements Serializable {
      */
     private Integer userType;
 
-    private static final long serialVersionUID = 1L;
 
     public String getOrderNo() {
         return orderNo;
@@ -608,4 +607,4 @@ public class TOrderNew implements Serializable {
     public void setUserType(Integer userType) {
         this.userType = userType;
     }
-}
+}

+ 0 - 43
src/main/java/com/goafanti/core/auth/HttpComponentsClientHttpRequestFactoryDigestAuth.java

@@ -1,43 +0,0 @@
-package com.goafanti.core.auth;
-
-
-import java.net.URI;
-import org.apache.http.HttpHost;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.protocol.ClientContext;
-import org.apache.http.impl.auth.DigestScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
- 
-@SuppressWarnings("deprecation")
-public class HttpComponentsClientHttpRequestFactoryDigestAuth extends HttpComponentsClientHttpRequestFactory {
-	 
-	public HttpComponentsClientHttpRequestFactoryDigestAuth(HttpClient client) {
-        super(client);
-    }
- 
-    @Override
-    protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) {
-        return createHttpContext(uri);
-    }
- 
-    private HttpContext createHttpContext(URI uri) {
-        // Create AuthCache instance
-        AuthCache authCache = new BasicAuthCache();
-        // Generate DIGEST scheme object, initialize it and add it to the local auth cache
-        DigestScheme digestAuth = new DigestScheme();
-        // If we already know the realm name
-        digestAuth.overrideParamter("realm", "myrealm");
-        HttpHost targetHost = new HttpHost(uri.getHost(), uri.getPort());
-        authCache.put(targetHost, digestAuth);
- 
-        // Add AuthCache to the execution context
-        BasicHttpContext localcontext = new BasicHttpContext();
-        localcontext.setAttribute(ClientContext.AUTH_CACHE, authCache);
-        return localcontext;
-    }
-}

+ 0 - 41
src/main/java/com/goafanti/core/auth/RestClient.java

@@ -1,41 +0,0 @@
-package com.goafanti.core.auth;
-
-import java.util.Base64;
-
-
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-
-public class RestClient {
-	private final String BS_HOST= "http://localhost:8090/";
-	//@Test
-	public void whenSecuredRestApiIsConsumed_then200OK() {
-	    RestTemplate restTemplate = new RestTempleteConfig().getRestTemplate();
-	    ResponseEntity<String> entity = restTemplate.exchange(BS_HOST, HttpMethod.GET, null, String.class);
-	}
-	private HttpHeaders getHeaders(){
-		String plainCredentials="dev:123456";
-		String base64Credentials = Base64.getEncoder().encodeToString(plainCredentials.getBytes());
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Authorization", "Basic " + base64Credentials);
-		return headers;
-	}
-
-	public String sendToBs(String apiUrl,HttpMethod method,LinkedMultiValueMap<String, String> params) {
-		RestTemplate restTemplate = new RestTemplate();
-		HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<MultiValueMap<String, String>>(params,getHeaders());
-		ResponseEntity<String> response = restTemplate.exchange(BS_HOST + "/" + apiUrl, method,request, String.class);
-
-		return response.getBody();
-	}
-
-//	@Test
-	public void testLogin() {
-		System.out.println(sendToBs("login", HttpMethod.GET, null));
-	}
-}

+ 0 - 29
src/main/java/com/goafanti/core/auth/RestTempleteConfig.java

@@ -1,29 +0,0 @@
-package com.goafanti.core.auth;
-
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.springframework.web.client.RestTemplate;
-
-
-public class RestTempleteConfig {
-	public RestTemplate getRestTemplate() {
-		CloseableHttpClient client = HttpClientBuilder.create().setDefaultCredentialsProvider(provider())
-				.useSystemProperties().build();
-		HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactoryDigestAuth(
-				client);
- 
-		return new RestTemplate(requestFactory);
-	}
- 
-	private CredentialsProvider provider() {
-		CredentialsProvider provider = new BasicCredentialsProvider();
-		UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("dev", "123456");
-		provider.setCredentials(AuthScope.ANY, credentials);
-		return provider;
-	}
-}

+ 9 - 12
src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java

@@ -53,7 +53,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 根据Sql id 去查询 分页对象
-	 * 
+	 *
 	 * @param sqlId
 	 *            对应mapper.xml 里的Sql Id
 	 * @param params
@@ -120,7 +120,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 根据Sql ID 查询List,而不要查询分页的页码
-	 * 
+	 *
 	 * @param sqlId
 	 *            对应mapper.xml 里的Sql Id[主语句]
 	 * @param params
@@ -146,11 +146,10 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 当Sql ID 是 default findAll的情况下。
-	 * 
+	 *
 	 * @param params
 	 * @param pageNo
 	 * @param pageSize
-	 * @param requiredType
 	 *            返回的类型[可以不传参]
 	 * @return
 	 */
@@ -160,7 +159,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 分页
-	 * 
+	 *
 	 * @param sqlId
 	 *            主语句
 	 * @param countId
@@ -169,8 +168,6 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 	 *            参数
 	 * @param pageNo
 	 *            第几页
-	 * @param pageSize每页显示多少条
-	 * @param requiredType
 	 *            返回的类型[可以不传参]
 	 * @return
 	 */
@@ -178,7 +175,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 			Integer pageSize) {
 		pageNo = null == pageNo ? 1 : pageNo;
 		pageSize = null == pageSize ? 10 : pageSize;
-		Pagination<?> page = new Pagination<Object>();
+		Pagination<?> page = new Pagination<T>();
 		page.setPageNo(pageNo);
 		page.setPageSize(pageSize);
 		int offset = (page.getPageNo() - 1) * page.getPageSize();
@@ -188,7 +185,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
 
 		countId = String.format("%s.%s", NAMESPACE, countId);
-		
+
 		try {
 			List<?> resultList = this.getSqlSession().selectList(sqlId, params);
 
@@ -205,7 +202,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 重载减少参数DEFAULT_SQL_ID, "findCount"
-	 * 
+	 *
 	 * @param params
 	 * @param pageNo
 	 * @param pageSize
@@ -218,7 +215,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 组装
-	 * 
+	 *
 	 * @param sql
 	 * @param parameterMappingList
 	 * @param params
@@ -242,6 +239,6 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 	}
 
 
-	
+
 
 }

+ 3 - 3
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1864,7 +1864,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public List<LockingReleaseBo> selectWaitReleaseCustomer(String uid) {
-		List list = new ArrayList();
+		List<LockingReleaseBo> list = new ArrayList<>();
 		List<LockingReleaseBo> lockingReleaseBos = userLockReleaseMapper.selectWaitReleaseCustomer(uid);
 		for (LockingReleaseBo bo : lockingReleaseBos) {
 			if (bo.getChannelType()==null||bo.getChannelType()!=1){
@@ -2417,8 +2417,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		}
 		map.put("shiroType",in.getShiroType());
 
-		Pagination<OutUserMianProducts> p=(Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());
-		return p;
+		return (Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());
 	}
 
 	@Override
@@ -2487,6 +2486,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public Pagination<OutChannelListBo> channelUserList(InputChannelListBo in) {
 		Map<String, Object> params = new HashMap<>();
 		addParams(in, params);
+
 		Pagination<OutChannelListBo> p = (Pagination<OutChannelListBo>) findPage(
 				"channelUserList", "channelUserCout", params, in.getPageNo(),
 				in.getPageSize());

+ 8 - 5
src/main/java/com/goafanti/order/bo/InputTChangeTask.java

@@ -4,8 +4,11 @@ package com.goafanti.order.bo;
 
 import com.goafanti.common.model.TChangeTask;
 
-public class InputTChangeTask  extends TChangeTask{
-	
+
+public class InputTChangeTask  extends TChangeTask {
+
+
+
 	private Integer  splitStatus;
 
 	public Integer getSplitStatus() {
@@ -15,6 +18,6 @@ public class InputTChangeTask  extends TChangeTask{
 	public void setSplitStatus(Integer splitStatus) {
 		this.splitStatus = splitStatus;
 	}
-	
-	
-}
+
+
+}