fix bug

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

@@ -101,17 +101,14 @@ public class LicenseController extends BaseController {
     @ResponseBody
     public RestResult activate(HttpServletRequest request) {
         try {
-            ProductInfo productInfo = licenseService.getProductInfo();
-            if (productInfo == null || (productInfo != null && CollectionUtils.isEmpty(productInfo.getProducts()))) {
-                String content = getLicenseContent(getParams(request));
-                if (StringUtil.isNotBlank(content)) {
-                    String filename = "license";
-                    File dest = new File(licenseService.getLicensePath() + filename);
-                    FileUtils.writeStringToFile(dest, content, Charset.defaultCharset());
-                    licenseService.updateLicense();
-                    logger.info("{}:{}", LogType.UserLog.ACTIVATE_FREE_LICENSE_FILE.getMessage(), filename);
-                    logService.log(LogType.UserLog.ACTIVATE_FREE_LICENSE_FILE);
-                }
+            String content = getLicenseContent(getParams(request));
+            if (StringUtil.isNotBlank(content)) {
+                String filename = "license";
+                File dest = new File(licenseService.getLicensePath() + filename);
+                FileUtils.writeStringToFile(dest, content, Charset.defaultCharset());
+                licenseService.updateLicense();
+                logger.info("{}:{}", LogType.UserLog.ACTIVATE_FREE_LICENSE_FILE.getMessage(), filename);
+                logService.log(LogType.UserLog.ACTIVATE_FREE_LICENSE_FILE);
             }
             return RestResult.restSuccess("ok");
         } catch (Exception e) {

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

@@ -54,71 +54,69 @@
         </div>
 
         <div id="qrcode" class="hidden"></div>
-        <div th:if="${productInfo?.products?.size() lt 0}">
-            <div class="form-group">
-                <div class="row">
-                    <div class="col-md-12">
-                        <label>公司名称</label>
-                        <input class="form-control" type="text" name="company" maxlength="64" th:value="${company}"/>
-                    </div>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-12">
+                    <label>公司名称</label>
+                    <input class="form-control" type="text" name="company" maxlength="64" th:value="${company}"/>
                 </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>
+        </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>
             </div>
-            <div class="form-group">
-                <div class="row">
-                    <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>
+        <div class="form-group">
+            <div class="row">
+                <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>
-            <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 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 class="form-group">
-                <div class="row">
-                    <div class="col-md-12">
-                        <label>备注</label>
-                        <textarea name="remark" class="form-control dbsyncer_textarea_resize_none" maxlength="64" rows="3" />
-                    </div>
+        </div>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-12">
+                    <label>备注</label>
+                    <textarea name="remark" class="form-control dbsyncer_textarea_resize_none" maxlength="64" rows="3" />
                 </div>
             </div>
-            <div class="form-group">
-                <div class="row">
-                    <div class="col-md-12">
-                        <button id="activateBtn" th:if="${productInfo?.products?.size() lt 0}" class="btn btn-primary" type="button" th:title="填写的信息会严格保密，我们不会向其他人共享您的信息">在线激活(免费使用15天)</button>
-                    </div>
+        </div>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-12">
+                    <button id="activateBtn" class="btn btn-primary" type="button" th:title="填写的信息会严格保密，我们不会向其他人共享您的信息">在线激活(首次可免费体验15天)</button>
                 </div>
             </div>
+        </div>
 
-            <hr/>
-            <div class="row">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">离线激活（无法访问互联网时） 1.复制机器码给 <a href="javascript:;" id="myService" class="text-success"><span class='fa fa-wechat'></span>星河同步官方</a> 帮您生成License文件; 2.上传License文件</h3>
+        <hr/>
+        <div class="row">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">离线激活（无法访问互联网时） 1.复制机器码给 <a href="javascript:;" id="myService" class="text-success"><span class='fa fa-wechat'></span>星河同步官方</a> 帮您生成License文件; 2.上传License文件</h3>
+                </div>
+                <div class="panel-body">
+                    <div class="input-group">
+                        <input id="licenseKey" type="text" class="form-control text-primary" readonly="readonly" th:value="${key}">
+                        <span class="input-group-btn"><button id="copyBtn" class="btn btn-default" type="button" th:title="复制机器码"><i class="fa fa-copy"></i>&nbsp;复制</button></span>
                     </div>
-                    <div class="panel-body">
-                        <div class="input-group">
-                            <input id="licenseKey" type="text" class="form-control text-primary" readonly="readonly" th:value="${key}">
-                            <span class="input-group-btn"><button id="copyBtn" class="btn btn-default" type="button" th:title="复制机器码"><i class="fa fa-copy"></i>&nbsp;复制</button></span>
-                        </div>
-                        <br />
-                        <div class="file-loading">
-                            <input id="fileLicense" type="file" name="files" multiple="multiple"/>
-                        </div>
+                    <br />
+                    <div class="file-loading">
+                        <input id="fileLicense" type="file" name="files" multiple="multiple"/>
                     </div>
                 </div>
             </div>