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

puzhibing

2023-06-02 f604f87781d7cdae5571465a3bafffff53313028

 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;