From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index bcf883a..f99b69a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -1117,7 +1117,8 @@
@RequestMapping(value = "downAutoExtractTxt")
public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) {
try {
- List<String> list = extractService.getAutoExtractOpenIds();
+ //List<String> list = extractService.getAutoExtractOpenIds();
+ List<String> list = extractService.getAutoExtractOpenIdsTo1212();
if (list == null || list.size() <= 1) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
return;
@@ -1195,7 +1196,8 @@
@RequestMapping(value = "preAutoUser")
public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) {
try {
- List<UserInfo> list = extractService.preAutoUser();
+ //List<UserInfo> list = extractService.preAutoUser();
+ List<UserInfo> list = extractService.preAutoUserTo1212();
if (list == null || list.isEmpty()) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
return;
--
Gitblit v1.8.0