From 1f52ede2975a0a585dae0ab51da2fb257db6e136 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Tue, 30 Jan 2024 16:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E7=BD=91oss=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 38 +++++++------------
 .../bonus/sgzb/auth/SgzbAuthApplication.java  | 10 ++---
 .../sgzb/auth/form/NwLoginConstants.java      | 12 +++---
 3 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index f26ab2ef..a5e9d8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,6 +202,19 @@
                 <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>
 
@@ -223,31 +236,6 @@
             <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>
diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java
index 1c11bb97..45b54793 100644
--- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java
+++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java
@@ -9,15 +9,13 @@ 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");
     }
diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java
index 0bdf84e9..13683621 100644
--- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java
+++ b/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) {