diff --git a/pom.xml b/pom.xml
index 1844054ec..c23d50805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
au.com.royalpay.payment
payment-parent
- 1.1.13
+ 2.1.4
4.0.0
manage
- 1.4.36
+ 2.1.2
UTF-8
1.8.0
@@ -37,6 +37,10 @@
au.com.royalpay.payment
hf-core
+
+ au.com.royalpay.payment
+ rppaymentsvc
+
au.com.royalpay.payment
jd-core
@@ -69,17 +73,11 @@
org.springframework.boot
spring-boot-starter-web
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
com.alibaba
fastjson
- 1.2.58
+ 1.2.62
org.springframework.boot
diff --git a/src/main/java/au/com/royalpay/payment/manage/ManagerPersistenceConfiguration.java b/src/main/java/au/com/royalpay/payment/manage/ManagerPersistenceConfiguration.java
new file mode 100644
index 000000000..fdf4efd7c
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/ManagerPersistenceConfiguration.java
@@ -0,0 +1,12 @@
+package au.com.royalpay.payment.manage;
+
+import com.yixsoft.support.mybatis.spring.annotation.MapperScanner;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Create by davep at 2020-03-17 16:53
+ */
+@Configuration
+@MapperScanner({".**.mapper", ".**.mappers"})
+public class ManagerPersistenceConfiguration {
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java b/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java
index d2ce602a1..3fcbe051a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java
+++ b/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java
@@ -27,9 +27,9 @@ import java.util.concurrent.ScheduledExecutorService;
* exclude = {DataSourceAutoConfiguration.class}
* 禁用springboot默认加载的application.properties单数据源配置
*/
-@SpringBootApplication(scanBasePackages = {"au.com.royalpay.payment", "cn.yixblog"},exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
@EnableScheduling
-@EnableCaching( proxyTargetClass=true )
+@EnableCaching(proxyTargetClass = true)
public class PaymentManageApplication {
public static void main(String[] args) {
@@ -48,7 +48,7 @@ public class PaymentManageApplication {
if (StringUtils.isNotEmpty(datFile) && new File(datFile).exists()) {
return new LookupService(datFile);
}
- }catch (IOException e){
+ } catch (IOException e) {
e.printStackTrace();
}
return new LookupService(geoCityFile.getFile());
diff --git a/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java b/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java
index cddb1584c..70ea18c86 100644
--- a/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java
+++ b/src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java
@@ -1,12 +1,6 @@
package au.com.royalpay.payment.manage;
import au.com.royalpay.payment.manage.permission.manager.ManagerUserInterceptor;
-import au.com.royalpay.payment.tools.permission.RequestInfoInterceptor;
-import au.com.royalpay.payment.tools.permission.alipay.AlipayUserInterceptor;
-import au.com.royalpay.payment.tools.permission.consumer.ConsumersInterceptor;
-import au.com.royalpay.payment.tools.permission.wechat.WechatUserInterceptor;
-import au.com.royalpay.payment.tools.secure.impls.ApplyFirewallCheckInterceptor;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -18,31 +12,13 @@ import javax.annotation.Resource;
*/
@Configuration
public class WebConfiguration implements WebMvcConfigurer {
- @Resource
- private RequestInfoInterceptor requestInfoInterceptor;
@Resource
private ManagerUserInterceptor managerUserInterceptor;
- @Resource
- private WechatUserInterceptor wechatUserInterceptor;
- @Resource
- private AlipayUserInterceptor alipayUserInterceptor;
- @Resource
- private ConsumersInterceptor consumersInterceptor;
@Override
public void addInterceptors(InterceptorRegistry registry) {
- registry.addInterceptor(requestInfoInterceptor);
- registry.addInterceptor(managerUserInterceptor);
- registry.addInterceptor(wechatUserInterceptor);
- registry.addInterceptor(alipayUserInterceptor);
- registry.addInterceptor(consumersInterceptor);
- registry.addInterceptor(applyFirewallCheckInterceptor());
- }
-
- @Bean
- public ApplyFirewallCheckInterceptor applyFirewallCheckInterceptor() {
- return new ApplyFirewallCheckInterceptor();
+ registry.addInterceptor(managerUserInterceptor).order(1);
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 5071c1b04..b4d267dec 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -527,7 +527,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
params.put("client_id",client.getIntValue("client_id"));
}
List records = transactionAnalysisMapper.getCustomersAndOrdersInDaysUseInScheduled(params);
- if (!records.isEmpty() && records.size()>0){
+ if (!records.isEmpty()){
JSONObject deleteParams = new JSONObject();
deleteParams.put("begin",params.getDate("begin"));
deleteParams.put("end",params.getDate("end"));
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java
index b705509f5..3ab55aaa0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java
@@ -1,6 +1,6 @@
package au.com.royalpay.payment.manage.analysis.mappers;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
import com.alibaba.fastjson.JSONObject;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
index a806cdc69..2a0978077 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
@@ -1,9 +1,9 @@
package au.com.royalpay.payment.manage.analysis.mappers;
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import org.apache.ibatis.annotations.Param;
@@ -32,7 +32,7 @@ public interface ClientAnalysisMapper {
// 统计一段时期新增的商户数
List listNewClients(JSONObject params);
- @AutoSql(type = SqlType.COUNT)
+ @AutoSql(SqlType.COUNT)
@AdvanceSelect(addonWhereClause = "sub_merchant_id is not null")
int countTotalPartners();
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java
index fa5a79a3c..bdc4efe2e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java
@@ -1,9 +1,9 @@
package au.com.royalpay.payment.manage.analysis.mappers;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
-import cn.yixblog.support.mybatis.paginator.annotations.CountRef;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.paginator.annotations.CountRef;
import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -16,7 +16,7 @@ import java.util.List;
*/
@AutoMapper(tablename = "statistics_customer_order", pkName = "id")
public interface CustomerAndOrdersStatisticsMapper {
- @AutoSql(type = SqlType.INSERT)
+ @AutoSql(SqlType.INSERT)
void save(JSONObject jsonObject);
List getCustomerAndOrderStatistics(JSONObject params);
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java
index 74a37d1a2..64871bf53 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java
@@ -1,8 +1,8 @@
package au.com.royalpay.payment.manage.analysis.mappers;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
import com.alibaba.fastjson.JSONObject;
import org.apache.ibatis.annotations.Param;
@@ -24,12 +24,12 @@ public interface EstimateAnalysisMapper {
JSONObject findClearAmountByDate(@Param("report_date") String report_date, @Param("client_list") List client_list);
- @AutoSql(type = SqlType.INSERT)
+ @AutoSql(SqlType.INSERT)
void save(JSONObject estimate);
JSONObject findByLogDate(@Param("date") String date, @Param("log_type") int log_type);
- @AutoSql(type = SqlType.UPDATE)
+ @AutoSql(SqlType.UPDATE)
void update(JSONObject estimate);
JSONObject getCleanAmount(@Param("start_date") String start_date, @Param("end") String end_date);
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java
index 0b3a84463..ba15b6022 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java
@@ -1,6 +1,6 @@
package au.com.royalpay.payment.manage.analysis.mappers;
-import cn.yixblog.support.mybatis.paginator.annotations.CountRef;
+import com.yixsoft.support.mybatis.paginator.annotations.CountRef;
import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import com.github.miemiedev.mybatis.paginator.domain.PageList;
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
index ec639acad..bb494a90e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
@@ -1,7 +1,7 @@
package au.com.royalpay.payment.manage.analysis.mappers;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.paginator.annotations.CountRef;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.paginator.annotations.CountRef;
import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import com.github.miemiedev.mybatis.paginator.domain.PageList;
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java
index d6af25de0..ef03f7e06 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java
@@ -9,7 +9,6 @@ import cn.yixblog.platform.http.HttpRequestGenerator;
import cn.yixblog.platform.http.HttpRequestResult;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import io.netty.util.internal.ConcurrentSet;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.util.UriComponentsBuilder;
import javax.annotation.Resource;
-import java.io.IOException;
import java.net.URISyntaxException;
import java.util.Date;
import java.util.List;
@@ -61,19 +59,16 @@ public class MerchantLocationServiceImpl implements MerchantLocationService {
public void initClientLocations() throws InterruptedException {
List