From 76758eaeac4e3ab4c78ffc2388a9fbfaf0206111 Mon Sep 17 00:00:00 2001
From: bonus <bonus@bonus.cn>
Date: Tue, 1 Apr 2025 15:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20.idea/shelf/Uncommitted=5F?=
 =?UTF-8?q?changes=5Fbefore=5FUpdate=5Fat=5F2025=5F3=5F31=5F10=5F04=5F[?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9]/shelved.patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shelved.patch                             | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_2025_3_31_10_04_[更改]/shelved.patch

diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2025_3_31_10_04_[更改]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_2025_3_31_10_04_[更改]/shelved.patch
deleted file mode 100644
index 3df3fc4..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_2025_3_31_10_04_[更改]/shelved.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: pom.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n    <modelVersion>4.0.0</modelVersion>\r\n    <parent>\r\n        <groupId>org.springframework.boot</groupId>\r\n        <artifactId>spring-boot-starter-parent</artifactId>\r\n        <version>2.4.5</version>\r\n        <relativePath/> <!-- lookup parent from repository -->\r\n    </parent>\r\n    <groupId>com.bonus.boot</groupId>\r\n    <artifactId>szgqj-service</artifactId>\r\n    <version>1.0.0.1-SNAPSHOT</version>\r\n    <name>szgqj-service</name>\r\n    <description>szgqj-service</description>\r\n    <properties>\r\n        <java.version>1.8</java.version>\r\n    </properties>\r\n    <dependencies>\r\n        <!-- 负载均衡定时任务执行一次 -->\r\n        <dependency>\r\n            <groupId>net.javacrumbs.shedlock</groupId>\r\n            <artifactId>shedlock-spring</artifactId>\r\n            <version>2.2.1</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.springframework.boot</groupId>\r\n            <artifactId>spring-boot-starter-freemarker</artifactId>\r\n            <version>3.2.5</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.springframework.boot</groupId>\r\n            <artifactId>spring-boot-starter-web</artifactId>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.springframework.boot</groupId>\r\n            <artifactId>spring-boot-starter-test</artifactId>\r\n            <scope>test</scope>\r\n        </dependency>\r\n<!--        <dependency>-->\r\n<!--            <groupId>org.springframework.boot</groupId>-->\r\n<!--            <artifactId>spring-boot-starter-data-mongodb</artifactId>-->\r\n<!--        </dependency>-->\r\n\r\n\r\n<!--        <dependency>-->\r\n<!--            <groupId>org.apache.poi</groupId>-->\r\n<!--            <artifactId>poi-ooxml</artifactId>-->\r\n<!--            <version>5.2.0</version>-->\r\n<!--        </dependency>-->\r\n        <dependency>\r\n            <groupId>com.itextpdf</groupId>\r\n            <artifactId>layout</artifactId>\r\n            <version>7.1.16</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>com.itextpdf</groupId>\r\n            <artifactId>itextpdf</artifactId>\r\n            <version>5.5.12</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>com.itextpdf</groupId>\r\n            <artifactId>forms</artifactId>\r\n            <version>7.1.16</version>\r\n        </dependency>\r\n\r\n            <dependency>\r\n                <groupId>com.squareup.okhttp3</groupId>\r\n                <artifactId>okhttp</artifactId>\r\n                <version>4.9.1</version>\r\n            </dependency>\r\n        <!-- websocket -->\r\n        <dependency>\r\n            <groupId>org.springframework.boot</groupId>\r\n            <artifactId>spring-boot-starter-websocket</artifactId>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.mybatis.spring.boot</groupId>\r\n            <artifactId>mybatis-spring-boot-starter</artifactId>\r\n            <version>2.1.3</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>com.alibaba</groupId>\r\n            <artifactId>druid-spring-boot-starter</artifactId>\r\n            <version>1.1.9</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>redis.clients</groupId>\r\n            <artifactId>jedis</artifactId>\r\n            <version>2.9.0</version>\r\n            <type>jar</type>\r\n            <scope>compile</scope>\r\n        </dependency>\r\n        <!-- redis jar -->\r\n        <dependency>\r\n            <groupId>org.springframework.boot</groupId>\r\n            <artifactId>spring-boot-starter-data-redis</artifactId>\r\n        </dependency>\r\n        <!-- security -->\r\n        <dependency>\r\n            <groupId>org.springframework.boot</groupId>\r\n            <artifactId>spring-boot-starter-security</artifactId>\r\n        </dependency>\r\n        <!-- 工具类 -->\r\n        <dependency>\r\n            <groupId>cn.hutool</groupId>\r\n            <artifactId>hutool-all</artifactId>\r\n            <version>5.5.2</version>\r\n        </dependency>\r\n        <!-- mysql -->\r\n        <dependency>\r\n            <groupId>mysql</groupId>\r\n            <artifactId>mysql-connector-java</artifactId>\r\n            <scope>runtime</scope>\r\n        </dependency>\r\n        <!-- mybatis -->\r\n        <dependency>\r\n            <groupId>tk.mybatis</groupId>\r\n            <artifactId>mapper</artifactId>\r\n            <version>4.1.5</version>\r\n        </dependency>\r\n        <!--jwttoken-->\r\n        <dependency>\r\n            <groupId>io.jsonwebtoken</groupId>\r\n            <artifactId>jjwt</artifactId>\r\n            <version>0.9.0</version>\r\n        </dependency>\r\n        <!--任务管理-->\r\n        <dependency>\r\n            <groupId>org.quartz-scheduler</groupId>\r\n            <artifactId>quartz</artifactId>\r\n        </dependency>\r\n        <!-- poi -->\r\n        <dependency>\r\n            <groupId>org.apache.poi</groupId>\r\n            <artifactId>poi</artifactId>\r\n            <version>4.1.2</version>\r\n        </dependency>\r\n        <!--mq-->\r\n        <dependency>\r\n            <groupId>org.springframework.boot</groupId>\r\n            <artifactId>spring-boot-starter-amqp</artifactId>\r\n        </dependency>\r\n\r\n        <!-- poi -->\r\n        <dependency>\r\n            <groupId>org.apache.poi</groupId>\r\n            <artifactId>poi-ooxml</artifactId>\r\n            <version>4.1.2</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>javax.xml.bind</groupId>\r\n            <artifactId>jaxb-api</artifactId>\r\n            <version>2.3.0</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>com.sun.xml.bind</groupId>\r\n            <artifactId>jaxb-impl</artifactId>\r\n            <version>2.3.0</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>com.sun.xml.bind</groupId>\r\n            <artifactId>jaxb-core</artifactId>\r\n            <version>2.3.0</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.apache.commons</groupId>\r\n            <artifactId>commons-lang3</artifactId>\r\n            <version>3.7</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>commons-io</groupId>\r\n            <artifactId>commons-io</artifactId>\r\n            <version>1.4</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>commons-fileupload</groupId>\r\n            <artifactId>commons-fileupload</artifactId>\r\n            <version>1.3</version>\r\n        </dependency>\r\n        <!-- json 解析 -->\r\n        <dependency>\r\n            <groupId>com.alibaba</groupId>\r\n            <artifactId>fastjson</artifactId>\r\n            <version>1.2.83</version>\r\n        </dependency>\r\n        <!-- junit -->\r\n        <dependency>\r\n            <groupId>junit</groupId>\r\n            <artifactId>junit</artifactId>\r\n        </dependency>\r\n        <!-- webService jar -->\r\n        <dependency>\r\n            <groupId>javax.xml.rpc</groupId>\r\n            <artifactId>javax.xml.rpc-api</artifactId>\r\n            <version>1.1.1</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.apache.axis</groupId>\r\n            <artifactId>axis</artifactId>\r\n            <version>1.4</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>commons-logging</groupId>\r\n            <artifactId>commons-logging</artifactId>\r\n            <version>1.2</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>commons-discovery</groupId>\r\n            <artifactId>commons-discovery</artifactId>\r\n            <version>0.5</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>wsdl4j</groupId>\r\n            <artifactId>wsdl4j</artifactId>\r\n            <version>1.6.2</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>ws.schild</groupId>\r\n            <artifactId>jave-core</artifactId>\r\n            <version>2.4.5</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>ws.schild</groupId>\r\n            <artifactId>jave-native-win64</artifactId>\r\n            <version>2.4.5</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>ws.schild</groupId>\r\n            <artifactId>jave-native-linux64</artifactId>\r\n            <version>2.4.5</version>\r\n        </dependency>\r\n        <!--bean辅助-->\r\n        <dependency>\r\n            <groupId>org.projectlombok</groupId>\r\n            <artifactId>lombok</artifactId>\r\n            <version>1.16.18</version>\r\n            <scope>provided</scope>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>io.springfox</groupId>\r\n            <artifactId>springfox-swagger2</artifactId>\r\n            <version>2.8.0</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>io.springfox</groupId>\r\n            <artifactId>springfox-bean-validators</artifactId>\r\n            <version>2.8.0</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>io.springfox</groupId>\r\n            <artifactId>springfox-swagger-ui</artifactId>\r\n            <version>2.8.0</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.aspectj</groupId>\r\n            <artifactId>aspectjweaver</artifactId>\r\n            <version>1.9.6</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.bouncycastle</groupId>\r\n            <artifactId>bcpkix-jdk15on</artifactId>\r\n            <version>1.64</version>\r\n        </dependency>\r\n\r\n        <dependency>\r\n            <groupId>org.bouncycastle</groupId>\r\n            <artifactId>bcprov-jdk15on</artifactId>\r\n            <version>1.64</version>\r\n        </dependency>\r\n\r\n        <dependency>\r\n            <groupId>com.google.zxing</groupId>\r\n            <artifactId>core</artifactId>\r\n            <version>3.3.3</version>\r\n        </dependency>\r\n\r\n        <dependency>\r\n            <groupId>com.google.zxing</groupId>\r\n            <artifactId>javase</artifactId>\r\n            <version>3.3.0</version>\r\n            <exclusions>\r\n                <exclusion>\r\n                    <artifactId>core</artifactId>\r\n                    <groupId>com.google.zxing</groupId>\r\n                </exclusion>\r\n            </exclusions>\r\n        </dependency>\r\n\r\n        <dependency>\r\n            <groupId>com.github.pagehelper</groupId>\r\n            <artifactId>pagehelper-spring-boot-starter</artifactId>\r\n            <version>1.4.5</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.hibernate</groupId>\r\n            <artifactId>hibernate-validator</artifactId>\r\n            <version>6.0.18.Final</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.apache.commons</groupId>\r\n            <artifactId>commons-collections4</artifactId>\r\n            <version>4.4</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org.apache.httpcomponents</groupId>\r\n            <artifactId>httpclient</artifactId>\r\n            <version>4.5.3</version>\r\n        </dependency>\r\n        <dependency>\r\n            <groupId>org</groupId>\r\n            <artifactId>jaudiotagger</artifactId>\r\n            <version>2.0.1</version>\r\n        </dependency>\r\n\r\n\t\t<!--外部依赖-->\r\n\t\t<dependency>\r\n\t\t\t<groupId>jna-1.1.0</groupId>\r\n\t\t\t<artifactId>jna</artifactId>\r\n\t\t\t<version>1.3.0</version>\r\n\t\t\t<scope>system</scope>\r\n\t\t\t<systemPath>${project.basedir}/src/main/resources/lib/jna-1.1.0.jar\r\n\t\t\t</systemPath>\r\n\t\t</dependency>\r\n\r\n\t\t<dependency>\r\n\t\t\t<groupId>minacore-1.0</groupId>\r\n\t\t\t<artifactId>minacore</artifactId>\r\n\t\t\t<version>1.3.0</version>\r\n\t\t\t<scope>system</scope>\r\n\t\t\t<systemPath>${project.basedir}/src/main/resources/lib/minacore-1.0.jar\r\n\t\t\t</systemPath>\r\n\t\t</dependency>\r\n\t\t<dependency>\r\n\t\t\t<groupId>arcsoft-sdk-face-3.0.0.0</groupId>\r\n\t\t\t<artifactId>arcsoft</artifactId>\r\n\t\t\t<version>1.3.0</version>\r\n\t\t\t<scope>system</scope>\r\n\t\t\t<systemPath>${project.basedir}/src/main/resources/lib/arcsoft-sdk-face-3.0.0.0.jar\r\n\t\t\t</systemPath>\r\n\t\t</dependency>\r\n\t\t<dependency>\r\n\t\t\t<groupId>examples-1.0</groupId>\r\n\t\t\t<artifactId>examples</artifactId>\r\n\t\t\t<version>1.3.0</version>\r\n\t\t\t<scope>system</scope>\r\n\t\t\t<systemPath>${project.basedir}/src/main/resources/lib/examples-1.0.jar\r\n\t\t\t</systemPath>\r\n\t\t</dependency>\r\n\t\t<dependency>\r\n\t\t\t<groupId>json</groupId>\r\n\t\t\t<artifactId>examples</artifactId>\r\n\t\t\t<version>1.3.0</version>\r\n\t\t\t<scope>system</scope>\r\n\t\t\t<systemPath>${project.basedir}/src/main/resources/lib/json.jar\r\n\t\t\t</systemPath>\r\n\t\t</dependency>\r\n        <dependency>\r\n            <groupId>cn.afterturn</groupId>\r\n            <artifactId>easypoi-base</artifactId>\r\n            <version>4.1.2</version>\r\n        </dependency>\r\n\r\n    </dependencies>\r\n\r\n\r\n        <build>\r\n            <plugins>\r\n                <plugin>\r\n                    <groupId>org.springframework.boot</groupId>\r\n                    <artifactId>spring-boot-maven-plugin</artifactId>\r\n                    <configuration>\r\n                        <includeSystemScope>true</includeSystemScope>\r\n                    </configuration>\r\n                </plugin>\r\n                <plugin>\r\n                    <groupId>org.apache.maven.plugins</groupId>\r\n                    <version>2.6</version>\r\n                    <artifactId>maven-resources-plugin</artifactId>\r\n                    <configuration>\r\n                        <encoding>UTF-8</encoding>\r\n                    </configuration>\r\n                </plugin>\r\n            </plugins>\r\n        </build>\r\n\r\n</project>\r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/pom.xml b/pom.xml
---- a/pom.xml	(revision 9460c74a4870ef088df0ca994710949ac4fc0573)
-+++ b/pom.xml	(date 1743386519254)
-@@ -9,7 +9,7 @@
-         <relativePath/> <!-- lookup parent from repository -->
-     </parent>
-     <groupId>com.bonus.boot</groupId>
--    <artifactId>szgqj-service</artifactId>
-+    <artifactId>yn_img_tool</artifactId>
-     <version>1.0.0.1-SNAPSHOT</version>
-     <name>szgqj-service</name>
-     <description>szgqj-service</description>