pom.xml

@@ -202,19 +202,6 @@
                 <version>${sgzb.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-core</artifactId>
-                <version>9.0.81</version>
-                <scope>compile</scope>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>tomcat-annotations-api</artifactId>
-                        <groupId>org.apache.tomcat</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -236,6 +223,31 @@
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>8.5.94</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>tomcat-annotations-api</artifactId>
+                    <groupId>org.apache.tomcat</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>8.5.94</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <version>8.5.94</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java

@@ -9,13 +9,15 @@ import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 认证授权中心
- *
+ * 
  * @author ruoyi
  */
 @EnableRyFeignClients
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class SgzbAuthApplication {
-    public static void main(String[] args) {
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+public class SgzbAuthApplication
+{
+    public static void main(String[] args)
+    {
         SpringApplication.run(SgzbAuthApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  认证授权中心启动成功   ლ(´ڡ`ლ)ﾞ  \n");
     }

sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java

@@ -82,16 +82,16 @@ public class NwLoginConstants {
 
     public static String appAppsecret;
 
-  /*  @Value("${appAppsecret}")
+    @Value("${appAppsecret}")
     public void setAppAppsecret(String appAppsecret) {
         NwLoginConstants.appAppsecret = appAppsecret;
-    }*/
+    }
 
     public static String appsecret;
 
     public static String h5Appsecret;
 
- /*   @Value("${h5Appsecret}")
+    @Value("${h5Appsecret}")
     public void setH5Appsecret(String h5Appsecret) {
         NwLoginConstants.h5Appsecret = h5Appsecret;
     }
@@ -99,7 +99,7 @@ public class NwLoginConstants {
     @Value("${appsecret}")
     public void setAppsecret(String appsecret) {
         NwLoginConstants.appsecret = appsecret;
-    }*/
+    }
 
     public static String appId;
 
@@ -108,7 +108,7 @@ public class NwLoginConstants {
     public static String appAppId;
 
 
-  /*  @Value("${appAppId}")
+    @Value("${appAppId}")
     public void setAppAppId(String appAppId) {
         NwLoginConstants.appAppId = appAppId;
     }
@@ -122,7 +122,7 @@ public class NwLoginConstants {
     @Value("${appId}")
     public void setAppId(String appId) {
         NwLoginConstants.appId = appId;
-    }*/
+    }
 
     @Value("${baseUrl}")
     public void setBaseUrl(String baseUrl) {

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java

@@ -71,18 +71,8 @@ public interface PurchaseCheckInfoMapper
      */
     String selectTypeNameByTaskId(Long taskId);
 
-    /**
-     * 插入
-     * @param bmNoticeInfo
-     * @return
-     */
     int insertBmNoticeInfo(BmNoticeInfo bmNoticeInfo);
 
-    /**
-     *
-     * @param purchaseCheckInfo
-     * @return
-     */
     List<PurchaseCheckInfo> selectPutInListList(PurchaseCheckInfo purchaseCheckInfo);
 
     /**