去除aserver的SN校验

src/main/java/com/archser/aserver/common/config/MainConfig.java

@@ -39,6 +39,7 @@ import com.jfinal.server.undertow.WebBuilder;
 import com.jfinal.template.Engine;
 
 public class MainConfig extends JFinalConfig {
+
   /**
    * 将全局配置提出来 方便其他地方重用
    */
@@ -91,7 +92,7 @@ public class MainConfig extends JFinalConfig {
     me.add("/system", SystemController.class);
     me.add("/bug", BugController.class);
     me.add("/sn", SnController.class);
-    me.add("/medium",MediumController.class);
+    me.add("/medium", MediumController.class);
   }
 
   // 先加载开发环境配置，再追加生产环境的少量配置覆盖掉开发环境配置
@@ -106,7 +107,8 @@ public class MainConfig extends JFinalConfig {
    */
   public static DruidPlugin getDruidPlugin() {
     loadConfig();
-    return new DruidPlugin(p.get("jdbcUrl"), p.get("user"), p.get("password"), p.get("jdbc.driver"));
+    return new DruidPlugin(p.get("jdbcUrl"), p.get("user"), p.get("password"),
+        p.get("jdbc.driver"));
   }
 
   /**
@@ -125,7 +127,6 @@ public class MainConfig extends JFinalConfig {
     arp.setContainerFactory(new CaseInsensitiveContainerFactory(true));
     arp.setDialect(new OracleDialect());
     arp.addSqlTemplate("oracle.sql");
-    arp.addSqlTemplate("sn.sql");
     /******** 在此添加数据库 表-Model 映射 *********/
     // 如果使用了JFinal Model 生成器 生成了BaseModel 把下面注释解开即可
     _MappingKit.mapping(arp);
@@ -135,8 +136,9 @@ public class MainConfig extends JFinalConfig {
     me.add(arp);
 
 //   添加Redis 配置
-    RedisPlugin redis = new RedisPlugin("redis", PropKit.get("redis.url"), PropKit.get("redis.password"));
-  me.add(redis);
+    RedisPlugin redis = new RedisPlugin("redis", PropKit.get("redis.url"),
+        PropKit.get("redis.password"));
+    me.add(redis);
 
 //  添加定时任务
     me.add(new Cron4jPlugin(PropKit.use("task.properties")));
@@ -171,15 +173,15 @@ public class MainConfig extends JFinalConfig {
    */
   @Override
   public void onStart() {
-    String dbType=p.get("dbType");
-    if(dbType==null || "".equals(dbType.trim())) {
+    String dbType = p.get("dbType");
+    if (dbType == null || "".equals(dbType.trim())) {
       System.out.println("数据库配置文件中dbType不能为空值");
       return;
     }
-    dbType=dbType.trim();
-    dbType=dbType.toUpperCase();
-    String configPath=PathKit.getRootClassPath()+"/DBUpdate/";
-    DBService dbService= new DBService();
+    dbType = dbType.trim();
+    dbType = dbType.toUpperCase();
+    String configPath = PathKit.getRootClassPath() + "/DBUpdate/";
+    DBService dbService = new DBService();
     dbService.upgrade(configPath, dbType);
     new GoodSync().run();
   }
@@ -200,22 +202,24 @@ public class MainConfig extends JFinalConfig {
   public static void main(String[] args) {
     UndertowServer.create(MainConfig.class, "undertow.properties").configWeb(builder -> {
       addWebSocket(builder);
-    }) .start();
+    }).start();
   }
 
   /**
    * 添加websocket
+   *
    * @param builder
    */
   public static void addWebSocket(WebBuilder builder) {
     loadConfig();
-    if(p.getBoolean("openMessageWebSocket") != null && p.getBoolean("openMessageWebSocket") ) {
+    if (p.getBoolean("openMessageWebSocket") != null && p.getBoolean("openMessageWebSocket")) {
       addMessageWebSocket(builder);
     }
   }
 
   /**
    * 添加消息中心的websocket
+   *
    * @param builder
    */
   public static void addMessageWebSocket(WebBuilder builder) {

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

 package com.archser.aserver.controller;
 
-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.Ret;
-import com.registration.util.SnUtil;
-import java.util.Map;
+
 
 public class SnController extends Controller {
 
@@ -16,52 +11,5 @@ public class SnController extends Controller {
   SnService snService;
 
 
-  /**
-   * OrganName 机构名称 ；uniqueCode 机器唯一值； SnCode 注册码
-   *
-   * @param sn
-   */
-  public void registered(@Para("") Sn sn) {
-    System.err.println(sn.toString());
-//    校验SN码是否合格
-    Map<String, String> stringStringMap = null;
-    String uniqueCode = snService.getUniqueCode();
-    try {
-      stringStringMap = SnUtil.verifyValid(sn.getOrganName(), uniqueCode, sn.getSnCode());
-    } catch (Exception e) {
-      e.printStackTrace();
-      renderJson(Ret.fail("msg", "请填写正确的注册码"));
-      return;
-    }
-//    SN码不符合要求，返回验证提示信息
-    if (!Boolean.parseBoolean(stringStringMap.get("success"))) {
-      renderJson(stringStringMap);
-      return;
-    }
-//    SN码符合要求，保存到数据库
-    boolean success = snService.saveSn(sn.setUniqueCode(uniqueCode));
-    if (success) {
-      renderJson(Ret.ok("msg", "保存成功"));
-    } else {
-      renderJson(Ret.fail("msg", "保存失败"));
-    }
-  }
-
-  /**
-   * 校验服务器是否有合法的SN号和对应的加密Key
-   */
-  @Clear
-  public void snVerify() {
-    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,8 +31,6 @@ public class MyMetaBuilder extends MetaBuilder {
         return false;
       case "AS_MESSAGE":
         return false;
-      case "AS_SN":
-        return false;
       default:
         return true;
     }

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

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

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

@@ -22,7 +22,6 @@ 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", "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/BaseSn.java

-package com.archser.aserver.model.base;
-
-import com.jfinal.plugin.activerecord.Model;
-import com.jfinal.plugin.activerecord.IBean;
-
-/**
- * Generated by JFinal, do not modify this file.
- */
-@SuppressWarnings({"serial", "unchecked"})
-public abstract class BaseSn<M extends BaseSn<M>> extends Model<M> implements IBean {
-
-	public M setId(java.lang.Integer id) {
-		set("ID", id);
-		return (M)this;
-	}
-	
-	public java.lang.Integer getId() {
-		return getInt("ID");
-	}
-
-	/**
-	 * 服务器CPU唯一标识
-	 */
-	public M setUniqueCode(java.lang.String uniqueCode) {
-		set("UNIQUE_CODE", uniqueCode);
-		return (M)this;
-	}
-	
-	/**
-	 * 服务器CPU唯一标识
-	 */
-	public java.lang.String getUniqueCode() {
-		return getStr("UNIQUE_CODE");
-	}
-
-	/**
-	 * SN校验码
-	 */
-	public M setSnCode(java.lang.String snCode) {
-		set("SN_CODE", snCode);
-		return (M)this;
-	}
-	
-	/**
-	 * SN校验码
-	 */
-	public java.lang.String getSnCode() {
-		return getStr("SN_CODE");
-	}
-
-	/**
-	 * 机构名称
-	 */
-	public M setOrganName(java.lang.String organName) {
-		set("ORGAN_NAME", organName);
-		return (M)this;
-	}
-	
-	/**
-	 * 机构名称
-	 */
-	public java.lang.String getOrganName() {
-		return getStr("ORGAN_NAME");
-	}
-
-}

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

 package com.archser.aserver.service;
 
-import com.archser.aserver.model.Sn;
-import com.jfinal.kit.Kv;
-import com.jfinal.plugin.activerecord.Db;
-import com.registration.util.GetCupSerial;
-import com.registration.util.SnUtil;
-import java.io.IOException;
-import java.util.Map;
-
 public class SnService {
 
 
-  public boolean saveSn(Sn sn) {
-    return sn.save();
-  }
-
-  public boolean updateSn(Sn sn) {
-    return sn.update();
-  }
-
-
-  /**
-   * 校验服务器是否有合法的SN号和对应的加密Key
-   *
-   * @return
-   */
-  public Map<String, String> snVerify() throws Exception {
-    String sn = getUniqueCode();
-    if (sn == null) {
-      return null;
-    }
-    Map<String, String> stringStringMap = checkSnValue(getSnValueList(sn));
-    stringStringMap.put("uniqueCode", sn);
-    return stringStringMap;
-  }
-
-
-  /**
-   * 校验注册码是否有效
-   *
-   * @param sn
-   * @return
-   * @throws Exception
-   */
-  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(sn.getOrganName(), sn.getUniqueCode(), sn.getSnCode());
-  }
-
-  /**
-   * 根据SN 获取所有对应的数据
-   *
-   * @param sn
-   * @return
-   */
-  public Sn getSnValueList(String sn) {
-    return Sn.dao.findFirst(Db.getSql("getValueBySn"), sn);
-  }
-
-  /**
-   * 获取本机唯一值
-   *
-   * @return
-   */
-  public String getUniqueCode() {
-    try {
-      return GetCupSerial.getCupSerial();
-    } catch (IOException e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-
 }

src/main/resources/config-pro.properties

@@ -13,7 +13,6 @@ engineDevMode=true
 ## 是否同步Redis中的数据
 updateRedis=false
 
-
 authUrl=http://125.77.26.133:7001/auth/token
 userInfoUrl=http://125.77.26.133:7001/api/info/user_info
 redirect_uri=http://192.168.31.17:8080/

src/main/resources/sn.sql

-
-### 查询SN码对应的value
-#sql("getValueBySn")
-select * from AS_SN_VALUE where SN_CODE = ?
-#end
\ No newline at end of file