1、添加/编辑功能的时候通过easy-search来选择菜单图标；

2、菜单图片改为可以为空

huigou-xt/src/main/resources/application.properties

@@ -38,17 +38,8 @@ sys.server.ip=127.0.0.1:8080/is/
 corpId=wxafae524e350f2298
 corpSecret=FwcIKKl8AcVp6xlaXYxfMF0KSTFmyWGP9ZSt0iaCFNf-1GQcLU29ulmk4mVax1QB
 
-# �Ƿ���ҵ��ڵ㳬ʱ������
-bpm.bizTask.timeoutCheck.enabled=true
-# BPMҵ��ڵ㳬ʱ����������
-bpm.bizTask.timeoutCheck.cron=0/10 * * * * ?
-
 email.host=https://mail.topsunit.com/EWS/Exchange.asmx
 email.username=portal@topsunit.com
 email.password=20180101
 
-activemq.brokerURL=tcp://127.0.0.1:61616
-activemq.userName=admin
-activemq.password=admin
-
 icon.cssFile=themes/fontawesome/css/font-awesome.min.css
\ No newline at end of file

huigou-xt/src/main/resources/spring-mvc.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p"
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
       http://www.springframework.org/schema/beans/spring-beans.xsd  
       http://www.springframework.org/schema/context  
@@ -12,17 +12,18 @@
       http://www.springframework.org/schema/mvc  
       http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
+	<context:property-placeholder location="classpath:application.properties"/>
 	<aop:aspectj-autoproxy></aop:aspectj-autoproxy>
-<!-- 
+    <!--
         <context:annotation-config />
      -->
     <!--注解扫描包 需要扫描的标注了@Controller的类 -->
     <context:component-scan base-package="com.**.controller" use-default-filters="false">
-		<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller" />
+		<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
 	</context:component-scan>
 	<bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter"></bean>
 	<bean name="handlerMapping" class="com.huigou.uasp.handlerMapping.UaspRequestMappingHandlerMapping"></bean>
-	<bean id="exceptionHandler" class="com.huigou.uasp.exception.ExceptionHandler" />
+	<bean id="exceptionHandler" class="com.huigou.uasp.exception.ExceptionHandler"/>
 	<mvc:interceptors>
 		<bean id="authenticationInterceptor" class="com.huigou.uasp.bmp.intercept.AuthenticationInterceptor">
 			<property name="csrfWhiteListURL">
@@ -38,10 +39,10 @@
 			</property>
 		</bean>
 		<bean id="executeContextInterceptor" class="com.huigou.uasp.bmp.intercept.ExecuteContextInterceptor">
-			<property name="operatorUIElementPermissionBuilder" ref="operatorUIElementPermissionBuilder" />
+			<property name="operatorUIElementPermissionBuilder" ref="operatorUIElementPermissionBuilder"/>
 		</bean>
         <!-- 国际化操作拦截器 如果采用基于（请求/Session/Cookie）则必需配置 -->
-    	<bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor" />  
+        <bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"/>
 	</mvc:interceptors>
 
     <!-- 视图解析器 -->

pom.xml

@@ -161,6 +161,7 @@
         <huigou.uasp.version>1.2.7</huigou.uasp.version>
          <classgraph.version>4.8.43</classgraph.version>
          <fastjson.version>1.2.59</fastjson.version>
+        <jstyleparser.version>3.5</jstyleparser.version>
     </properties>
 
     <dependencyManagement>
@@ -1929,6 +1930,11 @@
                 <artifactId>fastjson</artifactId>
                 <version>${fastjson.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.sf.cssbox</groupId>
+                <artifactId>jstyleparser</artifactId>
+                <version>${jstyleparser.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <distributionManagement>