解决合并冲突

.idea/shelf/Uncommitted_changes_before_Update_at_2025_3_31_10_04___.xml

@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_2025_3_31_10_04_[更改]" date="1743386672345" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2025_3_31_10_04_[更改]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2025/3/31 10:04 [更改]" />
+</changelist>

target/classes/application.properties

@@ -0,0 +1,54 @@
+server.port=11997
+server.servlet.context-path=/szgqj
+spring.datasource.url=jdbc:mysql://192.168.0.14:4418/yn_img_tool?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=Bonus@admin123!
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.max-idle=10
+spring.datasource.max-wait=60000
+spring.datasource.min-idle=5
+spring.datasource.initial-size=5
+server.session.timeout=10
+server.tomcat.uri-encoding=UTF-8
+#mapper\u914D\u7F6E
+mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml
+mybatis.type-aliases-package=com.bonus.imgTool.*.vo
+#redis config
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.database=5
+#spring.redis.password=Fyzbns@Redis123!
+# \u65E5\u5FD7
+logging.config=classpath:logback-boot.xml
+log.level.root=info
+log.level.my=debug
+log.file=logs/sys-back.log
+log.maxsize=30MB
+#\u8BF7\u6C42\u5934\u5927\u5C0F
+server.max-http-header-size=102400
+spring.servlet.multipart.max-file-size=-1
+spring.servlet.multipart.max-request-size=-1
+spring.http.multipart.maxFileSize=10000Mb
+spring.http.multipart.maxRequestSize=10000Mb
+#\u914D\u7F6E\u7528\u6237\u540D\u5BC6\u7801
+#spring.security.user.name=zys
+#spring.security.user.password=123
+token.expire.seconds=7200
+#\u6587\u4EF6\u4E0A\u4F20
+spring.servlet.multipart.enabled=true
+zhly.aq.enable=true
+#\u6587\u4EF6\u8FC7\u6EE4
+zhly.aq.file.suffix=woff,js,css,html,woff2,lang,map,png,jpg
+#\u9759\u6001\u8D44\u6E90 \u4E0D\u62E6\u622A
+zhly.aq.file.html=login.html,index.html,pages/user/updateMyself.html,pages/user/changePassword.html
+#\u6253\u5370sql
+#mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+file.windwos.upload_path=L:/imgTool/files/
+file.linux.upload_path=L:/imgTool/files/
+
+#????
+quartz.scan=false
+