!283 merge

Merge pull request !283 from AE86/v_2.0

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/UserConfigServiceImpl.java

@@ -55,7 +55,7 @@ public class UserConfigServiceImpl implements UserConfigService {
         Assert.hasText(nickname, "The nickname is null.");
         String password = params.get("password");
         Assert.hasText(password, "The password is null.");
-        String mail = params.get("mail");
+        String email = params.get("email");
         String phone = params.get("phone");
 
         // 验证当前登录用户合法身份（必须是管理员操作）
@@ -65,7 +65,7 @@ public class UserConfigServiceImpl implements UserConfigService {
         // 新用户合法性（用户不能重复）
         Assert.isNull(userConfig.getUserInfo(username), "用户已存在，请换个账号");
         // 注册新用户
-        userConfig.getUserInfoList().add(new UserInfo(username, nickname, SHA1Util.b64_sha1(password), UserRoleEnum.USER.getCode(), mail, phone));
+        userConfig.getUserInfoList().add(new UserInfo(username, nickname, SHA1Util.b64_sha1(password), UserRoleEnum.USER.getCode(), email, phone));
 
         logService.log(LogType.UserLog.INSERT, String.format("[%s]添加[%s]账号成功", currentUser.getUsername(), username));
         return profileComponent.editConfigModel(userConfig);
@@ -78,7 +78,7 @@ public class UserConfigServiceImpl implements UserConfigService {
         String nickname = params.get("nickname");
         Assert.hasText(nickname, "The nickname is null.");
         String newPwd = params.get("newPwd");
-        String mail = params.get("mail");
+        String email = params.get("email");
         String phone = params.get("phone");
 
         // 验证当前登录用户合法身份（管理员或本人操作）
@@ -94,7 +94,7 @@ public class UserConfigServiceImpl implements UserConfigService {
 
         // 用户昵称
         updateUser.setNickname(nickname);
-        updateUser.setMail(mail);
+        updateUser.setEmail(email);
         updateUser.setPhone(phone);
         // 修改密码
         if (StringUtil.isNotBlank(newPwd)) {

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

@@ -32,8 +32,8 @@ 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(), StringUtil.COMMA)).forEach(mail -> mails.add(mail));
+            if (StringUtil.isNotBlank(userInfo.getEmail())) {
+                Arrays.asList(StringUtil.split(userInfo.getEmail(), StringUtil.COMMA)).forEach(email -> mails.add(email));
             }
         });
         if (CollectionUtils.isEmpty(mails)) {

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

@@ -30,7 +30,7 @@ public class UserInfo {
     /**
      * 邮箱(多个邮箱使用逗号拼接)
      */
-    private String mail;
+    private String email;
 
     /**
      * 手机
@@ -40,12 +40,12 @@ public class UserInfo {
     public UserInfo() {
     }
 
-    public UserInfo(String username, String nickname, String password, String roleCode, String mail, String phone) {
+    public UserInfo(String username, String nickname, String password, String roleCode, String email, String phone) {
         this.username = username;
         this.nickname = nickname;
         this.password = password;
         this.roleCode = roleCode;
-        this.mail = mail;
+        this.email = email;
         this.phone = phone;
     }
 
@@ -81,12 +81,12 @@ public class UserInfo {
         this.roleCode = roleCode;
     }
 
-    public String getMail() {
-        return mail;
+    public String getEmail() {
+        return email;
     }
 
-    public void setMail(String mail) {
-        this.mail = mail;
+    public void setEmail(String email) {
+        this.email = email;
     }
 
     public String getPhone() {

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

@@ -38,7 +38,7 @@ public class ProductInfo {
     /**
      * 邮箱(多个邮箱使用逗号拼接)
      */
-    private String mail;
+    private String email;
 
     /**
      * 备注信息
@@ -87,12 +87,12 @@ public class ProductInfo {
         this.phone = phone;
     }
 
-    public String getMail() {
-        return mail;
+    public String getEmail() {
+        return email;
     }
 
-    public void setMail(String mail) {
-        this.mail = mail;
+    public void setEmail(String email) {
+        this.email = email;
     }
 
     public String getRemark() {

dbsyncer-web/src/main/assembly/bin/startup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+#test
 SCRIPT_DIR=$(cd $(dirname $0);pwd)
 DBS_HOME=$(cd $SCRIPT_DIR/..;pwd)
 echo DBS_HOME=$DBS_HOME

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

@@ -147,7 +147,7 @@ public class LicenseController extends BaseController {
         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());
+        info.setEmail(StringUtil.isNotBlank(info.getEmail()) ? info.getEmail() : userInfo.getEmail());
         return invoke(info);
     }
 

dbsyncer-web/src/main/resources/public/license/license.html

@@ -57,11 +57,15 @@
         <div th:if="${productInfo?.products?.size() lt 0}">
             <div class="form-group">
                 <div class="row">
-                    <div class="col-md-6">
-                        <label class="control-label">公司名称</label>
+                    <div class="col-md-12">
+                        <label>公司名称</label>
                         <input class="form-control" type="text" name="company" maxlength="64" th:value="${company}"/>
                     </div>
-                    <div class="col-md-6">
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="row">
+                    <div class="col-md-12">
                         <label>申请人</label>
                         <input class="form-control" type="text" name="owner" maxlength="32" th:value="${userInfo?.nickname}"/>
                     </div>
@@ -69,14 +73,18 @@
             </div>
             <div class="form-group">
                 <div class="row">
-                    <div class="col-md-6">
+                    <div class="col-md-12">
                         <label>手机号</label>
                         <input class="form-control" type="text" name="phone" maxlength="11" th:value="${userInfo?.phone}"/>
                         <small class="text-muted">便于通过短信提前通知您授权情况</small>
                     </div>
-                    <div class="col-md-6">
-                        <label>邮箱</label>
-                        <input class="form-control" type="text" name="mail" maxlength="64" th:value="${userInfo?.mail}"/>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="row">
+                    <div class="col-md-12">
+                        <label>邮箱<i class="fa fa-question-circle fa_gray" aria-hidden="true" title="支持多个邮箱"></i></label><br />
+                        <input class="form-control" type="text" max="100" min="1" name="email" data-role="tagsinput" th:value="${userInfo?.email}"/>
                     </div>
                 </div>
             </div>
@@ -84,7 +92,7 @@
                 <div class="row">
                     <div class="col-md-12">
                         <label>备注</label>
-                        <input class="form-control" type="text" maxlength="64" name="remark"/>
+                        <textarea name="remark" class="form-control dbsyncer_textarea_resize_none" maxlength="64" rows="3" />
                     </div>
                 </div>
             </div>

dbsyncer-web/src/main/resources/public/user/add.html

@@ -62,7 +62,7 @@ xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
               <div class="form-group">
                 <label class="col-sm-2 control-label">邮箱<i class="fa fa-question-circle fa_gray" aria-hidden="true" title="支持多个邮箱"></i></label>
                 <div class="col-sm-10">
-                  <input type="string" class="form-control" max="100" min="1" dbsyncer-valid="false" name="mail" data-role="tagsinput"/>
+                  <input type="string" class="form-control" max="100" min="1" dbsyncer-valid="false" name="email" data-role="tagsinput"/>
                 </div>
               </div>
 

dbsyncer-web/src/main/resources/public/user/edit.html

@@ -77,7 +77,7 @@ xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
               <div class="form-group">
                 <label class="col-sm-2 control-label">邮箱<i class="fa fa-question-circle fa_gray" aria-hidden="true" title="支持多个邮箱"></i></label>
                 <div class="col-sm-10">
-                  <input type="string" class="form-control" max="100" min="1" name="mail" data-role="tagsinput" th:value="${currentUser?.mail}"/>
+                  <input type="string" class="form-control" max="100" min="1" name="email" data-role="tagsinput" th:value="${currentUser?.email}"/>
                 </div>
               </div>
 

dbsyncer-web/src/main/resources/public/user/user.html

@@ -40,7 +40,7 @@
                         <td th:text="${u?.username + '(' + u?.nickname + ')'}"/>
                         <td th:text="${u?.roleName}"/>
                         <td>
-                            <span href="javascript:;" th:each="m : ${#strings.listSplit(u?.mail,',')}">
+                            <span href="javascript:;" th:each="m : ${#strings.listSplit(u?.email,',')}">
                                 <span class="label label-success">[[${m}]]</span>
                             </span>
                         </td>

dbsyncer-web/src/main/resources/static/js/license/license.js

@@ -1,4 +1,7 @@
 $(function () {
+    // 绑定多值输入框事件
+    initMultipleInputTags();
+
     new QRCode("qrcode", {
         text: "https://work.weixin.qq.com/u/vc7f073c9f993bc776?v=4.1.20.26620",
         width: 200,