diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java
index 5f297b7..cfcb785 100644
--- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java
+++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java
@@ -2,8 +2,6 @@ package cn.axzo.framework.auth.domain;
 
 import lombok.Data;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  **/
 @Data
@@ -18,4 +16,6 @@ public class SystemAndDeviceInfo {
 	private String deviceNo;
 	
 	private String appVersion;
+	
+	private String ipAddress;
 }
diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java
index f588eca..e2a8fd6 100644
--- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java
+++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java
@@ -106,14 +106,12 @@ public class TerminalInfo {
 	public static final String STR_TERMINAL_SCREEN = "screen";
 
 	/**
-	   * cn.axzo.pudge.server.modules.sys.enums.AppTerminalTypeEnum
-	   * 
-	   * 智能面板插件
-	   */
+	 * cn.axzo.pudge.server.modules.sys.enums.AppTerminalTypeEnum
+	 * 
+	 * 智能面板插件
+	 */
 	@Deprecated
 	public static final String STR_TERMINAL_PL_PREFIX = "pl-";
-	
-	
 
 	private static Map<String, String> aliasMap = new HashMap<>();
 	private static Map<String, List<String>> ntLegacyMap = new HashMap<>();
@@ -172,7 +170,7 @@ public class TerminalInfo {
 		aliasMap.put(NT_CM_APP_CM_LEADER, NT_CM_APP_CM_LEADER);
 		aliasMap.put(STR_TERMINAL_CM_LEADER, NT_CM_APP_CM_LEADER);
 	}
-	//貌似还有这么用的：TEAM(2, "cm_leader"),
+	// 貌似还有这么用的：TEAM(2, "cm_leader"),
 
 	/**
 	 * 安心筑App-工人
@@ -215,17 +213,17 @@ public class TerminalInfo {
 	}
 
 	static {
-		for(Entry<String, String> entry : aliasMap.entrySet()) {
+		for (Entry<String, String> entry : aliasMap.entrySet()) {
 			String nt = entry.getValue();
 			List<String> list = ntLegacyMap.get(nt);
-			if(list == null) {
+			if (list == null) {
 				list = new ArrayList<String>();
 				ntLegacyMap.put(nt, list);
 			}
 			list.add(entry.getKey());
 		}
 	}
-	
+
 	private String rawTerminalString;
 
 	private String newTerminalString;
@@ -234,8 +232,8 @@ public class TerminalInfo {
 		this.rawTerminalString = rawTerminalString;
 		this.newTerminalString = aliasMap.get(rawTerminalString);
 		// TODO: 为了调试方便，先注释掉这两句。@gaowei
-		// if (this.newTerminalString == null)
-		// throw new IllegalArgumentException("无效的Terminal：" + rawTerminalString);
+		if (this.newTerminalString == null)
+			throw new IllegalArgumentException("无效的Terminal：" + rawTerminalString);
 	}
 
 	public TerminalInfo(String rawTerminalString, String newTerminalString) {
@@ -294,6 +292,7 @@ public class TerminalInfo {
 
 	/**
 	 * 新代码逻辑不要用这个
+	 * 
 	 * @param legacyTerminalString
 	 * @return
 	 */
@@ -317,26 +316,27 @@ public class TerminalInfo {
 
 	/**
 	 * 新代码逻辑不要用这个
+	 * 
 	 * @return
 	 */
 	@Deprecated
 	public List<String> allNames() {
 		List<String> list = ntLegacyMap.get(this.newTerminalString);
-		if(list == null)
+		if (list == null)
 			return Collections.emptyList();
 		return list;
 	}
-	
+
 	/**
 	 * 
 	 * @param terminal
-	 * @param enums 各种历史的字符串
+	 * @param enums    各种历史的字符串
 	 * @return parse成功就返回enums里的值，否则返回原terminal string
 	 */
-	public static String parseLegacyTerminal(String terminal, String ... enums) {
+	public static String parseLegacyTerminal(String terminal, String... enums) {
 		TerminalInfo tm = new TerminalInfo(terminal);
-		for(String e : enums) {
-			if(tm.isLegacy(e))
+		for (String e : enums) {
+			if (tm.isLegacy(e))
 				return e;
 		}
 		return terminal;
@@ -346,7 +346,7 @@ public class TerminalInfo {
 		TerminalInfo tm1 = new TerminalInfo(t1);
 		return tm1.isLegacy(t2);
 	}
-	
+
 	public static List<String> allNamesOf(String terminal) {
 		TerminalInfo tm = new TerminalInfo(terminal);
 		return tm.allNames();
diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
index ffa5f35..0cf970b 100644
--- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
+++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
@@ -247,7 +247,7 @@ public class ContextInfoBuilderAspect {
 		String terminalHeader = request.getHeader(AuthConstants.HEADER_TERMINAL);
 		String terminalSession = StpUtil.getLoginDevice();
 		String terminal = terminalHeader;
-		if (null == terminalHeader || "".equals(terminalHeader)) {
+		if (null == terminalHeader || "".equals(terminalHeader) || "0".equals(terminalHeader)) {
 			log.warn("请求缺少terminal header，token={}。暂时使用session中的补齐terminal={}。", contextInfo.getToken(),
 					terminalSession);
 			terminal = terminalSession;