!282 merge

Merge pull request !282 from AE86/v_2.0

dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/MessageServiceImpl.java

@@ -33,7 +33,7 @@ public class MessageServiceImpl implements MessageService {
         List<String> mails = new ArrayList<>();
         userConfig.getUserInfoList().forEach(userInfo -> {
             if (StringUtil.isNotBlank(userInfo.getMail())) {
-                Arrays.asList(StringUtil.split(userInfo.getMail(), ",")).forEach(mail -> mails.add(mail));
+                Arrays.asList(StringUtil.split(userInfo.getMail(), StringUtil.COMMA)).forEach(mail -> mails.add(mail));
             }
         });
         if (CollectionUtils.isEmpty(mails)) {

dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/UserInfo.java

@@ -28,7 +28,7 @@ public class UserInfo {
     private String roleCode;
 
     /**
-     * 邮箱(多个邮箱使用分号拼接)
+     * 邮箱(多个邮箱使用逗号拼接)
      */
     private String mail;
 

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/ProductInfo.java

@@ -35,6 +35,11 @@ public class ProductInfo {
      */
     private String phone;
 
+    /**
+     * 邮箱(多个邮箱使用逗号拼接)
+     */
+    private String mail;
+
     /**
      * 备注信息
      */
@@ -82,6 +87,14 @@ public class ProductInfo {
         this.phone = phone;
     }
 
+    public String getMail() {
+        return mail;
+    }
+
+    public void setMail(String mail) {
+        this.mail = mail;
+    }
+
     public String getRemark() {
         return remark;
     }

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/license/LicenseController.java

@@ -41,7 +41,6 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
-import java.util.HashMap;
 import java.util.Map;
 
 @Controller
@@ -141,29 +140,23 @@ public class LicenseController extends BaseController {
     }
 
     private String getLicenseContent(Map<String, String> params) throws IOException {
-        Map<String, Object> map = new HashMap<>();
-        String company = params.get("company");
-        String owner = params.get("owner");
-        String phone = params.get("phone");
-        String mail = params.get("mail");
-        String remark = params.get("remark");
-        map.put("licenseKey", licenseService.getKey());
-        map.put("company", StringUtil.isNotBlank(company) ? company : appConfig.getCompany());
+        ProductInfo info = JsonUtil.jsonToObj(JsonUtil.objToJson(params), ProductInfo.class);
         UserInfo userInfo = getUserInfo();
         Assert.notNull(userInfo, "会话过期，请重新登录");
-        map.put("owner", StringUtil.isNotBlank(owner) ? owner : userInfo.getNickname());
-        map.put("phone", StringUtil.isNotBlank(phone) ? phone : userInfo.getPhone());
-        map.put("mail", StringUtil.isNotBlank(mail) ? mail : userInfo.getMail());
-        map.put("remark", StringUtil.isNotBlank(remark) ? remark : StringUtil.EMPTY);
-        return invoke(SERVER_ADDRESS, map);
+        info.setLicenseKey(licenseService.getKey());
+        info.setCompany(StringUtil.isNotBlank(info.getCompany()) ? info.getCompany() : appConfig.getCompany());
+        info.setOwner(StringUtil.isNotBlank(info.getOwner()) ? info.getOwner() : userInfo.getNickname());
+        info.setPhone(StringUtil.isNotBlank(info.getPhone()) ? info.getPhone() : userInfo.getPhone());
+        info.setMail(StringUtil.isNotBlank(info.getMail()) ? info.getMail() : userInfo.getMail());
+        return invoke(info);
     }
 
-    public String invoke(String url, Map params) throws IOException {
-        String data = URLEncoder.encode(JsonUtil.objToJson(params), "UTF-8");
+    public String invoke(ProductInfo info) throws IOException {
+        String data = URLEncoder.encode(JsonUtil.objToJson(info), "UTF-8");
         StringEntity se = new StringEntity(data);
         se.setContentEncoding("UTF-8");
         se.setContentType("application/json");
-        HttpPost httpPost = new HttpPost(url);
+        HttpPost httpPost = new HttpPost(SERVER_ADDRESS);
         httpPost.setEntity(se);
         CloseableHttpClient httpClient = HttpClients.createDefault();
         try {