Merge branch 'master' of http://192.168.1.200/lxc/Iot

lpro/build/classes/config/config.properties

@@ -1,6 +1,6 @@
 #------------------------- jdbc config -------------------------
-jdbc.driverClassName= com.mysql.jdbc.Driver
-#jdbc.driverClassName= com.mysql.cj.jdbc.Driver
+#jdbc.driverClassName= com.mysql.jdbc.Driver
+jdbc.driverClassName= com.mysql.cj.jdbc.Driver
 
 jdbc.maxActive=200
 jdbc.maxWait=500

lpro/src/main/java/com/lp/authority/AuthorityIntercept.java

@@ -6,12 +6,6 @@
  */
 package com.lp.authority;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.lp.bo.UserInfoBO;
 import com.lp.cache.CacheName;
 import com.lp.cache.ProCacheUtil;
@@ -21,9 +15,13 @@ import com.lp.util.CommonUtil;
 import com.lp.util.LogUtil;
 import com.lp.util.ObjectUtil;
 import com.lp.util.ResultMapUtils;
-
 import net.sf.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
 public class AuthorityIntercept {
 
 	/**
@@ -46,7 +44,8 @@ public class AuthorityIntercept {
 			if (requestUrl.contains("/login") || requestUrl.contains("/register") || requestUrl.contains("/password") || 
 					requestUrl.contains("/validate/code") || requestUrl.contains("/security_code") || requestUrl.contains("/upload")
 					|| requestUrl.contains("/mail") || requestUrl.contains("/bind") || requestUrl.contains("/live") || 
-					requestUrl.contains("/mqtt") ||  requestUrl.contains("/baidu") || requestUrl.contains("/vp") ||requestUrl.contains("/noauth") || requestUrl.endsWith("/") ) {
+					requestUrl.contains("/mqtt") ||  requestUrl.contains("/baidu") || requestUrl.contains("/vp") ||requestUrl.contains("/noauth")
+					|| requestUrl.endsWith("/") || requestUrl.contains("/service/dictionary/130")) {
 				return true;
 			} else {
 				if (ObjectUtil.isNotEmpty(userKey) || requestMethod.equals("PUT") || requestMethod.equals("POST")

lpro/src/main/resources/config/config.properties

@@ -1,6 +1,6 @@
 #------------------------- jdbc config -------------------------
-jdbc.driverClassName= com.mysql.jdbc.Driver
-#jdbc.driverClassName= com.mysql.cj.jdbc.Driver
+#jdbc.driverClassName= com.mysql.jdbc.Driver
+jdbc.driverClassName= com.mysql.cj.jdbc.Driver
 
 jdbc.maxActive=200
 jdbc.maxWait=500