zoujiajian преди 3 години
родител
ревизия
6e22f95ba6

+ 1 - 4
netflix-service/src/main/java/com/cyksj/common/EnvCommonService.java

@@ -54,10 +54,7 @@ public class EnvCommonService {
 		if (!DISTRIBUTE_DEFAULT_URL_PREFIX.endsWith("/")) {
 			DISTRIBUTE_DEFAULT_URL_PREFIX += "/";
 		}
-		if (!isPrdEnv()) {
-			DISTRIBUTE_DEFAULT_URL_PREFIX += "yinhe/web";
-		}
-		DISTRIBUTE_DEFAULT_URL_PREFIX += "?sharedId=%s";
+		DISTRIBUTE_DEFAULT_URL_PREFIX += "yinhe/web?sharedId=%s";
 
 		DISTRIBUTE_DESIGN_URL_PREFIX = DISTRIBUTE_DEFAULT_URL_PREFIX.replace("sharedId", "dsCode");
 	}

+ 2 - 2
netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -30,7 +30,7 @@ import com.cyksj.model.dto.JsSdkTicket;
 import com.cyksj.model.entity.PhoneCode;
 import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.UserDistributePopularize;
-import com.cyksj.model.request.loginReq;
+import com.cyksj.model.request.LoginReq;
 import com.cyksj.model.response.LoginPhoneRep;
 import com.cyksj.model.response.WxGzhQrCodeTicketRep;
 import com.cyksj.redis.RedisService;
@@ -432,7 +432,7 @@ public class AuthorizationController {
             user.setNickname(String.format("%s%s", name, Codec.DoDigest.custom().setAlgorithm(Codec.DoDigest.Algorithm.MD5).setStringData(String.format("%s%s", user.getId(), loginReq.getType() == 1 ? user.getLoginPhone() : user.getEmail())).toHexString().substring(0, 6)));
             //默认头像
             user.setHeadimgurl(Constant.DEFAULT_HEAD_IMG);
-            String registerEnv = loginPhoneReq.getRegisterEnv();
+            String registerEnv = loginReq.getRegisterEnv();
             user.setRegisterEnv(StrUtil.isEmpty(registerEnv) ? User.RegisterEnv.pc.name() : registerEnv);
             userService.save(user);
             //新用户分销

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
netflix-web/src/main/resources/application-prd.yml


Някои файлове не бяха показани, защото твърде много файлове са промени