فهرست منبع

用户绑定界面添加系统选择功能

syh 5 سال پیش
والد
کامیت
6150878e2a

+ 0 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/config/ureport/PropertiesConfig.java

@@ -10,9 +10,6 @@ import org.springframework.core.io.ClassPathResource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-
-import static java.lang.System.setProperties;
-
 @Slf4j
 @Configuration
 @ConditionalOnBean(UReportConfig.class)

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java

@@ -100,6 +100,7 @@ public class BindAccountLoginController {
             String mediaId = json.getString("mediaId");
             Long projectId = json.getLong("projectId");
             String projectName = json.getString("projectName");
+            String systemType = json.getString("systemType");
             UserAllocation userAllocation = new UserAllocation();
             userAllocation.setUserName(userName);
             userAllocation.setUserId(userId);
@@ -110,6 +111,7 @@ public class BindAccountLoginController {
             userAllocation.setProjectId(projectId);
             userAllocation.setProjectName(projectName);
             userAllocation.setMediaId(mediaId);
+            userAllocation.setSystemType(systemType);
             int i = userAllocationMapper.insert(userAllocation);
             if (i > 0) {
                 logger.info("用户分配入库完成,advertiserId:{}", advertiserId);

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -155,6 +155,7 @@ public class CallbackController {
                     Long projectId = json.getLong("projectId");
                     BigDecimal WarningProportion = json.getBigDecimal("WarningProportion");
                     BigDecimal WarningAmount = json.getBigDecimal("WarningAmount");
+                    String systemType = json.getString("systemType");
 
                     CtopOauthToken topOauthToken = new CtopOauthToken();
                     topOauthToken.setId(String.valueOf(accountId));
@@ -188,6 +189,7 @@ public class CallbackController {
                     userAllocation.setUserName(userName);
                     userAllocation.setUserId(userId);
                     userAllocation.setAdvertiserId(advertiserId);
+                    userAllocation.setSystemType(systemType);
                     // 获取快手昵称
                     Map<String, Object> advertiseBaseInfoMap = kuaishouInterfaceService.advertiserInfo(accountId, token.getAccessToken());
                     if ((Integer) advertiseBaseInfoMap.get("code") == 0) {
@@ -313,6 +315,7 @@ public class CallbackController {
                 returnMap.put("desc", "授权失败,账号已被:" + checkUserAllocation.getUserName() + "绑定");
             }
 
+            String systemType = json.getString("systemType");
             UserAllocation userAllocation = new UserAllocation();
             userAllocation.setUserId(userId);
             userAllocation.setUserName(userName);
@@ -321,6 +324,7 @@ public class CallbackController {
             userAllocation.setMediaId(mediaId);
             userAllocation.setProjectId(projectId);
             userAllocation.setProjectName(projectName);
+            userAllocation.setSystemType(systemType);
             userAllocation.setAuthName((String) advertiserDataMap.get("name"));
             userAllocation.setAdvertiserId(advertiserId);
             userAllocation.setWarningProportion(WarningProportion);

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java

@@ -60,6 +60,8 @@ public class UserAllocation {
     @ApiModelProperty(value = "广告主ID")
     private String advertiserId;
 
+    private String systemType;
+
     /**
      * 项目id
      */