From 7e82153c15a6c1f2b62db0ea19448e283d6f0535 Mon Sep 17 00:00:00 2001
From: "=.*" <17638147107@163.com>
Date: Sat, 15 Jun 2024 18:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chushang-module-loan/loan-service/pom.xml | 25 ++++++++++++++++++-
 .../src/main/resources/application.yml        |  8 +++---
 chushang-modules/chushang-module-oss/pom.xml  |  5 ++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/chushang-modules/chushang-module-loan/loan-service/pom.xml b/chushang-modules/chushang-module-loan/loan-service/pom.xml
index bb44f20..4ee12fd 100644
--- a/chushang-modules/chushang-module-loan/loan-service/pom.xml
+++ b/chushang-modules/chushang-module-loan/loan-service/pom.xml
@@ -19,12 +19,35 @@
     <dependencies>
         <dependency>
             <groupId>com.chushang</groupId>
-            <artifactId>loan-feign</artifactId>
+            <artifactId>system-feign</artifactId>
+            <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.chushang</groupId>
+                    <artifactId>chushang-common-mybatis-plugin</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.chushang</groupId>
             <artifactId>chushang-common-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.chushang</groupId>
+            <artifactId>system-feign</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.chushang</groupId>
+            <artifactId>oss-feign</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/resources/application.yml b/chushang-modules/chushang-module-loan/loan-service/src/main/resources/application.yml
index a424c40..4dd443c 100644
--- a/chushang-modules/chushang-module-loan/loan-service/src/main/resources/application.yml
+++ b/chushang-modules/chushang-module-loan/loan-service/src/main/resources/application.yml
@@ -3,7 +3,7 @@ server:
   shutdown: graceful
   port: 8086
   servlet:
-    context-path: /task
+    context-path: /loan
   tomcat:
     uri-encoding: UTF-8
     threads:
@@ -22,9 +22,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    username: ${config.jdbc.master.task.username}
-    password: ${config.jdbc.master.task.password}
-    url: jdbc:mysql://${config.jdbc.master.task.host}:${config.jdbc.master.task.port}/${config.jdbc.master.task.database}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+    username: ${config.jdbc.master.loan.username}
+    password: ${config.jdbc.master.loan.password}
+    url: jdbc:mysql://${config.jdbc.master.loan.host}:${config.jdbc.master.loan.port}/${config.jdbc.master.loan.database}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
     hikari:
       # 最大线程池数量
       maximum-pool-size: 30
diff --git a/chushang-modules/chushang-module-oss/pom.xml b/chushang-modules/chushang-module-oss/pom.xml
index d660ef7..61d9175 100644
--- a/chushang-modules/chushang-module-oss/pom.xml
+++ b/chushang-modules/chushang-module-oss/pom.xml
@@ -37,6 +37,11 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>${zxing.version}</version>
+        </dependency>
         <!--注册中心客户端-->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>