允许用户直接登录，绕过SN

src/main/java/com/archser/aserver/controller/SnController.java

 package com.archser.aserver.controller;
 
-import com.archser.aserver.model.SnValue;
+import com.archser.aserver.model.Sn;
 import com.archser.aserver.service.SnService;
 import com.jfinal.aop.Clear;
 import com.jfinal.aop.Inject;
 import com.jfinal.core.Controller;
 import com.jfinal.core.paragetter.Para;
-import com.jfinal.kit.PropKit;
 import com.jfinal.kit.Ret;
 import com.registration.util.SnUtil;
 import java.util.Map;
@@ -17,12 +16,18 @@ public class SnController extends Controller {
   SnService snService;
 
 
-  public void registered(@Para("") SnValue snValue) {
+  /**
+   * OrganName 机构名称 ；uniqueCode 机器唯一值； SnCode 注册码
+   *
+   * @param sn
+   */
+  public void registered(@Para("") Sn sn) {
+    System.err.println(sn.toString());
 //    校验SN码是否合格
     Map<String, String> stringStringMap = null;
-    String snCode = snService.getSn();
+    String uniqueCode = snService.getUniqueCode();
     try {
-      stringStringMap = SnUtil.verifyValid(snValue.getOrganName(), snValue.getUniqueCode(), snCode);
+      stringStringMap = SnUtil.verifyValid(sn.getOrganName(), uniqueCode, sn.getSnCode());
     } catch (Exception e) {
       e.printStackTrace();
       renderJson(Ret.fail("msg", "请填写正确的注册码"));
@@ -34,7 +39,7 @@ public class SnController extends Controller {
       return;
     }
 //    SN码符合要求，保存到数据库
-    boolean success = snService.saveSn(snValue.setSnCode(snCode));
+    boolean success = snService.saveSn(sn.setUniqueCode(uniqueCode));
     if (success) {
       renderJson(Ret.ok("msg", "保存成功"));
     } else {
@@ -47,17 +52,14 @@ public class SnController extends Controller {
    */
   @Clear
   public void snVerify() {
-    if (PropKit.getBoolean("checkSn")) {
-      try {
-        Map<String, String> stringStringMap = snService.snVerify();
-        renderJson(stringStringMap);
-      } catch (Exception e) {
-        e.printStackTrace();
-        renderJson(Ret.fail("msg", e.getMessage()));
-      }
-    } else {
-      renderJson(Ret.ok());
-    }
+    renderJson(Ret.ok());
+//    try {
+//      Map<String, String> stringStringMap = snService.snVerify();
+//      renderJson(stringStringMap);
+//    } catch (Exception e) {
+//      e.printStackTrace();
+//      renderJson(Ret.fail("msg", e.getMessage()));
+//    }
 
   }
 

src/main/java/com/archser/aserver/generator/MyMetaBuilder.java

@@ -31,7 +31,7 @@ public class MyMetaBuilder extends MetaBuilder {
         return false;
       case "AS_MESSAGE":
         return false;
-      case "AS_SN_VALUE":
+      case "AS_SN":
         return false;
       default:
         return true;

src/main/java/com/archser/aserver/model/SnValue.java → src/main/java/com/archser/aserver/model/Sn.java

 package com.archser.aserver.model;
 
-import com.archser.aserver.model.base.BaseSnValue;
+import com.archser.aserver.model.base.BaseSn;
 
 /**
  * Generated by JFinal.
  */
 @SuppressWarnings("serial")
-public class SnValue extends BaseSnValue<SnValue> {
-	public static final SnValue dao = new SnValue().dao();
+public class Sn extends BaseSn<Sn> {
+	public static final Sn dao = new Sn().dao();
 }

src/main/java/com/archser/aserver/model/_DataDictionary.txt

@@ -83,15 +83,15 @@ Table: AS_ORGAN
  RANKING | NUMBER(4)      | YES  |     |         |         
 ---------+----------------+------+-----+---------+---------
 
-Table: AS_SN_VALUE	Remarks: SN唯一码校验表
--------------+--------------+------+-----+---------+---------
- Field       | Type         | Null | Key | Default | Remarks 
--------------+--------------+------+-----+---------+---------
- ID          | INTEGER(10)  | NO   | PRI |         |         
- UNIQUE_CODE | VARCHAR2(50) | NO   |     |         | 服务器CPU唯一标识
- SN_CODE     | VARCHAR2(50) | NO   |     |         | SN校验码   
- ORGAN_NAME  | VARCHAR2(50) | YES  |     |         | 机构名称    
--------------+--------------+------+-----+---------+---------
+Table: AS_SN	Remarks: SN唯一码校验表
+-------------+----------------+------+-----+---------+---------
+ Field       | Type           | Null | Key | Default | Remarks 
+-------------+----------------+------+-----+---------+---------
+ ID          | INTEGER(10)    | NO   | PRI |         |         
+ UNIQUE_CODE | VARCHAR2(500)  | NO   |     |         | 服务器CPU唯一标识
+ SN_CODE     | VARCHAR2(1000) | NO   |     |         | SN校验码   
+ ORGAN_NAME  | VARCHAR2(50)   | YES  |     |         | 机构名称    
+-------------+----------------+------+-----+---------+---------
 
 Table: AS_SYSTEM
 -------------+----------------+------+-----+---------+---------

src/main/java/com/archser/aserver/model/_MappingKit.java

@@ -22,7 +22,7 @@ public class _MappingKit {
 		arp.addMapping("AS_MENU_STAR", "ID", MenuStar.class);
 		arp.addMapping("AS_MESSAGE", "ID", Message.class);
 		arp.addMapping("AS_ORGAN", "ID", Organ.class);
-		arp.addMapping("AS_SN_VALUE", "ID", SnValue.class);
+		arp.addMapping("AS_SN", "ID", Sn.class);
 		arp.addMapping("AS_SYSTEM", "ID", System.class);
 		arp.addMapping("AS_USER", "ID", User.class);
 	}

src/main/java/com/archser/aserver/model/base/BaseSnValue.java → src/main/java/com/archser/aserver/model/base/BaseSn.java

@@ -7,7 +7,7 @@ import com.jfinal.plugin.activerecord.IBean;
  * Generated by JFinal, do not modify this file.
  */
 @SuppressWarnings({"serial", "unchecked"})
-public abstract class BaseSnValue<M extends BaseSnValue<M>> extends Model<M> implements IBean {
+public abstract class BaseSn<M extends BaseSn<M>> extends Model<M> implements IBean {
 
 	public M setId(java.lang.Integer id) {
 		set("ID", id);

src/main/java/com/archser/aserver/service/SnService.java

 package com.archser.aserver.service;
 
-import com.archser.aserver.model.SnValue;
+import com.archser.aserver.model.Sn;
 import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Db;
 import com.registration.util.GetCupSerial;
@@ -11,12 +11,12 @@ import java.util.Map;
 public class SnService {
 
 
-  public boolean saveSn(SnValue snValue) {
-    return snValue.save();
+  public boolean saveSn(Sn sn) {
+    return sn.save();
   }
 
-  public boolean updateSn(SnValue snValue) {
-    return snValue.update();
+  public boolean updateSn(Sn sn) {
+    return sn.update();
   }
 
 
@@ -26,12 +26,12 @@ public class SnService {
    * @return
    */
   public Map<String, String> snVerify() throws Exception {
-    String sn = getSn();
+    String sn = getUniqueCode();
     if (sn == null) {
       return null;
     }
     Map<String, String> stringStringMap = checkSnValue(getSnValueList(sn));
-    stringStringMap.put("SN", sn);
+    stringStringMap.put("uniqueCode", sn);
     return stringStringMap;
   }
 
@@ -39,16 +39,16 @@ public class SnService {
   /**
    * 校验注册码是否有效
    *
-   * @param snValue
+   * @param sn
    * @return
    * @throws Exception
    */
-  public Map<String, String> checkSnValue(SnValue snValue) throws Exception {
-    if (snValue == null || snValue.getSnCode() == null || snValue.getOrganName() == null
-        || snValue.getUniqueCode() == null) {
-      return Kv.by("success", "false").set("msg", "请先复制SN码并联系软件作者获取软件注册码");
+  public Map<String, String> checkSnValue(Sn sn) throws Exception {
+    if (sn == null || sn.getSnCode() == null || sn.getOrganName() == null
+        || sn.getUniqueCode() == null) {
+      return Kv.by("success", "false").set("msg", "请将单位名称和唯一值提交给软件厂商来获取注册码注册");
     }
-    return SnUtil.verifyValid(snValue.getOrganName(), snValue.getUniqueCode(), snValue.getSnCode());
+    return SnUtil.verifyValid(sn.getOrganName(), sn.getUniqueCode(), sn.getSnCode());
   }
 
   /**
@@ -57,16 +57,16 @@ public class SnService {
    * @param sn
    * @return
    */
-  public SnValue getSnValueList(String sn) {
-    return SnValue.dao.findFirst(Db.getSql("getValueBySn"), sn);
+  public Sn getSnValueList(String sn) {
+    return Sn.dao.findFirst(Db.getSql("getValueBySn"), sn);
   }
 
   /**
-   * 获取本机SN码
+   * 获取本机唯一值
    *
    * @return
    */
-  public String getSn() {
+  public String getUniqueCode() {
     try {
       return GetCupSerial.getCupSerial();
     } catch (IOException e) {

src/main/resources/config-pro.properties

@@ -13,8 +13,6 @@ engineDevMode=true
 ## 是否同步Redis中的数据
 updateRedis=false
 
-## 是否开启SN码校验
-checkSn=false
 
 authUrl=http://125.77.26.133:7001/auth/token
 userInfoUrl=http://125.77.26.133:7001/api/info/user_info