Răsfoiți Sursa

fix: 调整导航栏对齐样式

周玉环 1 zi în urmă
părinte
comite
f9b39dd8a2

+ 53 - 0
xinkeaboard-server/b2b2c-core/src/main/java/com/slodon/b2b2c/core/util/HttpClientUtil.java

@@ -156,6 +156,59 @@ public class HttpClientUtil {
 
 
     /**
+     * 发送HTTP POST请求,使用String类型作为请求体参数
+     * @param url 请求URL
+     * @param params 请求体参数(通常为JSON字符串)
+     * @param headers 请求头信息
+     * @return 响应结果字符串
+     * @throws Exception 可能抛出的异常
+     */
+    public static String httpPost201(String url, String params, HashMap<String, String> headers) throws Exception {
+        String result = "";
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        HttpPost httpPost = new HttpPost(url);
+
+        // 设置最大请求和传输超时时间
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(50000)
+                .setConnectTimeout(50000)
+                .build();
+        httpPost.setConfig(requestConfig);
+
+        // 设置请求头
+        if (headers != null && !headers.isEmpty()) {
+            for (String key : headers.keySet()) {
+                httpPost.addHeader(key, headers.get(key));
+            }
+        }
+
+        // 设置请求体参数
+        if (params != null && !params.isEmpty()) {
+            // 使用StringEntity直接设置字符串作为请求体
+            StringEntity stringEntity = new StringEntity(params, StandardCharsets.UTF_8);
+            httpPost.setEntity(stringEntity);
+        }
+
+        CloseableHttpResponse response = httpClient.execute(httpPost);
+
+        try {
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_CREATED) {
+                HttpEntity entity = response.getEntity();
+                result = EntityUtils.toString(entity, StandardCharsets.UTF_8);
+                EntityUtils.consume(entity);
+            } else {
+                throw new Exception(response.getStatusLine().toString());
+            }
+        } finally {
+            response.close();
+            httpClient.close();
+        }
+        return result;
+    }
+
+
+
+    /**
      * http POST 请求,支持自定义请求头
      *
      * @param url     请求URL

+ 4 - 3
xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/advich/MemberEmailActiveController.java

@@ -313,14 +313,15 @@ public class MemberEmailActiveController extends BaseController {
      */
     private JsonResult<Object> verifyCodeFromRedis(String redisKey, String verificationCode) {
         if (!stringRedisTemplate.hasKey(redisKey)) {
-            return SldResponse.fail("验证码已过期,请重新获取");
+            return SldResponse.fail("验证码校验失败");
         }
 
         String storedCode = stringRedisTemplate.opsForValue().get(redisKey);
         if (!verificationCode.equals(storedCode)) {
             return SldResponse.fail(ResponseConst.STATE_FAIL, "验证码校验失败");
         }
-
+        // 删除Redis中的验证码
+        stringRedisTemplate.delete(redisKey);
         return SldResponse.success("验证码校验成功");
     }
 
@@ -625,7 +626,7 @@ public class MemberEmailActiveController extends BaseController {
 
             return SldResponse.success("重置登录密码成功");
         }
-        return SldResponse.fail(ResponseConst.STATE_FAIL,"验证码已过期,请重新获取");
+        return SldResponse.fail(ResponseConst.STATE_FAIL,"验证码校验失败");
     }
 
 

+ 4 - 2
xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreModel.java

@@ -23,6 +23,7 @@ import com.slodon.b2b2c.goods.example.GoodsExample;
 import com.slodon.b2b2c.goods.example.GoodsExtendExample;
 import com.slodon.b2b2c.goods.pojo.Goods;
 import com.slodon.b2b2c.goods.pojo.GoodsExtend;
+import com.slodon.b2b2c.investment.constant.InvestmentConst;
 import com.slodon.b2b2c.member.example.MemberFollowStoreExample;
 import com.slodon.b2b2c.member.pojo.MemberFollowStore;
 import com.slodon.b2b2c.model.goods.GoodsModel;
@@ -434,13 +435,14 @@ public class StoreModel {
      */
     public JSONObject getStoreUrlsObject(Long storeId, String authorName) {
         HashMap<String, String> headers = new HashMap<>();
-        headers.put("Authorization", storeConfig.getToken());
+        headers.put(InvestmentConst.CONTENT_TYPE, InvestmentConst.APPLICATION_JSON);
+        headers.put(InvestmentConst.AUTHORIZATION, storeConfig.getToken());
         JSONObject param = new JSONObject();
         param.set("storeId", storeId.toString());
         param.set("authorName", authorName);
         String result;
         try {
-            result = HttpClientUtil.httpPost(storeConfig.getUrl(), param.toString(), headers);
+            result = HttpClientUtil.httpPost201(storeConfig.getUrl(), param.toString(), headers);
         } catch (Exception e) {
             throw new MallException("获取店铺url信息表失败,请重试");
         }

+ 2 - 0
xinkeaboard-server/doc/DDL/update.sql

@@ -353,6 +353,8 @@ ALTER TABLE vendor ADD COLUMN store_url_by9810 VARCHAR(1000)  DEFAULT NULL COMME
 
 update sys_setting set description='建议上传宽1920*高750的图片' where name in ('main_user_logon_bg','main_user_logon_bg_2','main_user_register_bg','main_user_register_bg_2','main_user_forget_password_bg','main_user_forget_password_bg_2');
 
+update sys_setting set description='建议上传宽1920*高104的图片 ' where name in ('default_image_store_banner_pc','default_image_store_banner_pc_2');
+
 update sys_setting set `value`='1' where name = 'verification_code_check_is_enable';