瀏覽代碼

基础配置修改

ytf 3 年之前
父節點
當前提交
3a88ecbe3a

+ 1 - 1
b2b2c/b2b2c-core/src/main/java/com/slodon/b2b2c/core/config/DomainUrlUtil.java

@@ -21,7 +21,7 @@ public class DomainUrlUtil {
21
     public static final String SLD_PC_URL = "http://jbbcs-pc.slodon.cn/";                   //pc前端地址
21
     public static final String SLD_PC_URL = "http://jbbcs-pc.slodon.cn/";                   //pc前端地址
22
 
22
 
23
     public static final String SLD_ADMIN_URL = "https://ad.eqbidding.com";              //admin前端地址
23
     public static final String SLD_ADMIN_URL = "https://ad.eqbidding.com";              //admin前端地址
24
-    public static final String SLD_SELLER_URL = "http://jbbcs-seller.slodon.cn";            //seller前端地址
24
+    public static final String SLD_SELLER_URL = "https://ve.eqbidding.com";            //seller前端地址
25
 
25
 
26
     public static final String SLD_IMAGE_RESOURCES = "https://ad.eqbidding.com";                            //图片资源的URL
26
     public static final String SLD_IMAGE_RESOURCES = "https://ad.eqbidding.com";                            //图片资源的URL
27
     public static final String QIUNIUYUN_IMAGE_RESOURCES = "http://javaimg.slodon.cn";                          //七牛云图片资源的URL
27
     public static final String QIUNIUYUN_IMAGE_RESOURCES = "http://javaimg.slodon.cn";                          //七牛云图片资源的URL

+ 2 - 2
b2b2c/b2b2c-core/src/main/java/com/slodon/b2b2c/core/constant/ExpireTimeConst.java

@@ -12,9 +12,9 @@ public class ExpireTimeConst {
12
     public static final int EXPIRE_SECOND_15_DAY = 15 * 24 * 60 * 60;
12
     public static final int EXPIRE_SECOND_15_DAY = 15 * 24 * 60 * 60;
13
 
13
 
14
     /**
14
     /**
15
-     * token过期时间1小时
15
+     * token过期时间1
16
      */
16
      */
17
-    public static final long TOKEN_EXPIRE_TIME = 1000 * 60 * 60;
17
+    public static final long TOKEN_EXPIRE_TIME = 1000 * 60 * 60 *24;
18
     /**
18
     /**
19
      * refresh_token过期时间15天
19
      * refresh_token过期时间15天
20
      */
20
      */

+ 3 - 1
b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/MemberInfoController.java

@@ -51,6 +51,8 @@ import java.util.Date;
51
 @RequestMapping("v3/member/front/member")
51
 @RequestMapping("v3/member/front/member")
52
 public class MemberInfoController extends BaseController {
52
 public class MemberInfoController extends BaseController {
53
 
53
 
54
+    private final static String SELLER_SUCCESS_URL = "/base/user/login";//商户地址
55
+
54
     @Resource
56
     @Resource
55
     private MemberModel memberModel;
57
     private MemberModel memberModel;
56
     @Resource
58
     @Resource
@@ -128,7 +130,7 @@ public class MemberInfoController extends BaseController {
128
         vo.setMsgNum(memberReceiveModel.getMemberReceiveList(receiveExample, null).size());
130
         vo.setMsgNum(memberReceiveModel.getMemberReceiveList(receiveExample, null).size());
129
         String sellerSwitch = stringRedisTemplate.opsForValue().get("seller_center_entrance_is_enable");
131
         String sellerSwitch = stringRedisTemplate.opsForValue().get("seller_center_entrance_is_enable");
130
         vo.setSellerSwitch(StringUtil.isEmpty(sellerSwitch) ? "0" : sellerSwitch);
132
         vo.setSellerSwitch(StringUtil.isEmpty(sellerSwitch) ? "0" : sellerSwitch);
131
-        vo.setSellerUrl(DomainUrlUtil.SLD_SELLER_URL);
133
+        vo.setSellerUrl(DomainUrlUtil.SLD_SELLER_URL+SELLER_SUCCESS_URL);
132
         return SldResponse.success(vo);
134
         return SldResponse.success(vo);
133
     }
135
     }
134
 
136