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

xuhy

2023-06-08 c1c307fe42e8de9c9aac5c009e38ad405f934996

 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;