Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

合并之前代码，解决部分参数校验问题，解决消息发送加入到两个mq队列通道问题，取消两个无效maven依赖

framework/pom.xml

@@ -137,11 +137,11 @@
             <version>${jasypt-version}</version>
         </dependency>
         <!-- 模板引擎 -->
-        <dependency>
-            <groupId>com.ibeetl</groupId>
-            <artifactId>beetl</artifactId>
-            <version>${beetl-version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.ibeetl</groupId>-->
+<!--            <artifactId>beetl</artifactId>-->
+<!--            <version>${beetl-version}</version>-->
+<!--        </dependency>-->
         <!-- 阿里云核心包-->
         <dependency>
             <groupId>com.aliyun</groupId>
@@ -276,11 +276,11 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>${logstash-logback-encoder}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.interceptor</groupId>
-            <artifactId>javax.interceptor-api</artifactId>
-            <version>${interceptor-api}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>javax.interceptor</groupId>-->
+<!--            <artifactId>javax.interceptor-api</artifactId>-->
+<!--            <version>${interceptor-api}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>