Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-21 8bb36ed768729cbf5afb340969980ccfef1c1750

 management/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java

@@ -1,5 +1,6 @@
package com.stylefeng.guns;

import com.stylefeng.guns.core.shiro.ShiroKit;
import org.apache.http.client.HttpClient;
import org.apache.http.config.SocketConfig;
import org.apache.http.impl.client.HttpClientBuilder;