--- a/src/goodjava/mail/Message.java	Sun Mar 07 02:22:09 2021 -0700
+++ b/src/goodjava/mail/Message.java	Thu Mar 11 01:22:20 2021 -0700
@@ -1,76 +1,70 @@
 package goodjava.mail;
 
 import java.util.Map;
-import java.util.LinkedHashMap;
+import java.util.Base64;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 import goodjava.util.GoodUtils;
 
-import java.net.Socket;
-
 
 public class Message {
-	public final Map<String,String> headers = new LinkedHashMap<String,String>();
-	public final String content;
-	public final String contentType;
+	public final Map<String,String> headers;
+	public final Object content;
 	private static Pattern line = Pattern.compile("(?m)^.*$");
 
-	public Message(String content) {
-		this(content,"text/plain");
+	public Message(Map<String,String> headers,Object content) {
+		this.headers = headers;
+		this.content = content;
 	}
 
-	public Message(String content,String contentType) {
-		this.content = content;
-		this.contentType = contentType;
+	private static void addBase64(StringBuilder sb,byte[] a) {
+		String s = Base64.getEncoder().encodeToString(a);
+		int n = s.length() - 76;
+		int i;
+		for( i=0; i<n; i+=76 ) {
+			sb.append(s.substring(i,i+76)).append("\r\n");
+		}
+		sb.append(s.substring(i)).append("\r\n");
 	}
 
-	public String toText() {
+	public String toText() throws MailException {
 		StringBuilder sb = new StringBuilder();
+		String contentType = null;
 		for( Map.Entry<String,String> entry : headers.entrySet() ) {
 			String name = entry.getKey();
+			String value = entry.getValue();
 			if( name.equalsIgnoreCase("bcc") )
 				continue;
-			String value = entry.getValue();
+			if( name.equalsIgnoreCase("content-type") ) {
+				contentType = value;
+				continue;
+			}
 			sb.append( name ).append( ": " ).append( value ).append( "\r\n" );
 		}
-		sb.append( "Content-Type: " ).append( contentType ).append( "; charset=\"UTF-8\"\r\n" );
-		boolean isAscii = content.matches("\\p{ASCII}*");
-		if( !isAscii )
-			sb.append( "Content-Transfer-Encoding: base64\r\n" );
-		sb.append( "\r\n" );
-		if( isAscii ) {
-			Matcher m = line.matcher(content);
-			while( m.find() ) {
-				sb.append(m.group()).append("\r\n");		
+		if( contentType==null )
+			throw new MailException("Content-Type not defined");
+		if( content instanceof String ) {
+			String s = (String)content;
+			sb.append( "Content-Type: " ).append( contentType ).append( "\r\n" );
+			boolean isAscii = s.matches("\\p{ASCII}*");
+			if( !isAscii )
+				sb.append( "Content-Transfer-Encoding: base64\r\n" );
+			sb.append( "\r\n" );
+			if( isAscii ) {
+				Matcher m = line.matcher(s);
+				while( m.find() ) {
+					sb.append(m.group()).append("\r\n");		
+				}
+			} else {
+				addBase64( sb, GoodUtils.getBytes(s,"UTF-8") );
 			}
-		} else {
-			String s = GoodUtils.base64Encode(content);
-			int n = s.length() - 76;
-			int i;
-			for( i=0; i<n; i+=76 ) {
-				sb.append(s.substring(i,i+76)).append("\r\n");
-			}
-			sb.append(s.substring(i)).append("\r\n");
-		}
+		} else if( content instanceof byte[] ) {
+			sb.append( "Content-Type: " ).append( contentType ).append( "\r\n" );
+			sb.append( "Content-Transfer-Encoding: base64\r\n" );
+			sb.append( "\r\n" );
+			addBase64( sb, (byte[])content );
+		} else
+			throw new MailException("content is unrecognized type");
 		return sb.toString();
 	}
-
-	public static void main(String[] args) throws Exception {
-		String text = ""
-			+"testm 2\n"
-			+"x\n"
-//			+"产品\n"
-			+"rg; ;lrg dsl rgj errlgerrg neskrjg skrg rdsg drskrg sd;gr s;kgr skrg skrg sdg ds fg;ks gegr erg ;sg sd; g;sdr gsklrg sg s;kkrg s;hg ;slrg ;elrg ;reg r;g ;r g;er g;ler g;e g; g;r g rg; srkd fjl kj kklsjrg lsk gskdf;rs gkrj glj grekjs lksjgkjn kjslg rklrg ;rsd; kj drsg akrglk kalrgklrsdnrgkgj;r ;s ns b;n;sn ;njslk r;n\r\n"
-		;
-		Message msg = new Message(text);
-		msg.headers.put("From","smtp@luan.software");
-		msg.headers.put("To","fschmidt@gmail.com");
-		msg.headers.put("Subject","test");
-		Socket socket = new Socket("smtpcorp.com",2525);
-		Smtp smtp = new Smtp(socket);
-		smtp.authenticate("smtp@luan.software","luanhost");
-		smtp.send(msg);
-		smtp.close();
-		System.out.println("done msg");
-	}
 }