From 91ba67514f8031e5f7cf10d59f94f8652e7e9eb3 Mon Sep 17 00:00:00 2001
From: Sola <dev@sola.love>
Date: Wed, 19 Oct 2016 18:01:35 +0800
Subject: [PATCH] remove converter

---
 .../sola/netsupport/api/user/Register.java    | 41 -------------------
 .../wechat/handler/SubscribeHandler.java      |  3 --
 2 files changed, 44 deletions(-)

diff --git a/src/main/java/love/sola/netsupport/api/user/Register.java b/src/main/java/love/sola/netsupport/api/user/Register.java
index 7b60935..3cc338c 100644
--- a/src/main/java/love/sola/netsupport/api/user/Register.java
+++ b/src/main/java/love/sola/netsupport/api/user/Register.java
@@ -94,48 +94,7 @@ public class Register extends API {
 			String dupKey = e.getConstraintName();
 			return Error.INVALID_PARAMETER.withMsg("Duplicated_" + dupKey.toUpperCase()); // PHONE ACCOUNT WECHAT
 		}
-		// FIXME: 2015/12/30 Temporary converter
-		converterWithRetry(user);
 		return Error.OK;
 	}
 
-	public static void converterWithRetry(User u) {
-		Throwable last = null;
-		for (int i = 0; i < 3; i++) {
-			try {
-				converter(u);
-				return;
-			} catch (WxErrorException | SQLException e) {
-				last = e;
-			}
-		}
-		last.printStackTrace();
-		try {
-			WxMpServlet.instance.wxMpService.customMessageSend(WxMpCustomMessage.TEXT().toUser(u.getWechatId()).content("数据转换失败").build());
-		} catch (WxErrorException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static void converter(User u) throws WxErrorException, SQLException {
-		try (Connection conn = SQLCore.ds.getConnection()) {
-			PreparedStatement ps = conn.prepareStatement("SELECT wechat FROM `convert` WHERE id=?");
-			ps.setLong(1, u.getId());
-			ResultSet rs = ps.executeQuery();
-			if (rs.next()) {
-				WxMpServlet.instance.wxMpService
-						.userUpdateGroup(u.getWechatId(), 100L);
-				String old = rs.getString(1);
-				ps = conn.prepareStatement("UPDATE `operators` SET wechat=? WHERE wechat=?");
-				ps.setString(1, u.getWechatId());
-				ps.setString(2, old);
-				if (ps.executeUpdate() == 1) {
-					WxMpServlet.instance.wxMpService.customMessageSend(WxMpCustomMessage.TEXT().toUser(u.getWechatId()).content("数据转换成功").build());
-				} else {
-					WxMpServlet.instance.wxMpService.customMessageSend(WxMpCustomMessage.TEXT().toUser(u.getWechatId()).content("已进行过数据转换").build());
-				}
-			}
-		}
-	}
-
 }
diff --git a/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java
index b03741f..0252c13 100644
--- a/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java
+++ b/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java
@@ -17,7 +17,6 @@
 
 package love.sola.netsupport.wechat.handler;
 
-import love.sola.netsupport.api.user.Register;
 import love.sola.netsupport.enums.Attribute;
 import love.sola.netsupport.pojo.Operator;
 import love.sola.netsupport.pojo.User;
@@ -58,8 +57,6 @@ public class SubscribeHandler implements WxMpMessageHandler {
 			Operator op = TableOperator.get(fromUser);
 			if (op != null) {
 				wxMpService.userUpdateGroup(fromUser, 100L);
-			} else {
-				Register.converterWithRetry(u); //TODO remove me
 			}
 		} else {
 			session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER);