zl-1-23-后端

ruoyi-modules/ruoyi-customer/pom.xml

@@ -140,6 +140,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.customer.RuoyiCustomerApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/PartnerUser.java

@@ -88,5 +88,10 @@ public class PartnerUser extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 系统用户ID（关联sys_user.user_id）
+     */
+    private Long sysUserId;
+
 
 }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/PartnerUserBo.java

@@ -84,5 +84,10 @@ public class PartnerUserBo extends BaseEntity {
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    /**
+     * 系统用户ID（关联sys_user.user_id）
+     */
+    private Long sysUserId;
+
 
 }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/PartnerUserServiceImpl.java

@@ -11,11 +11,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.dromara.customer.domain.bo.PartnerUserBo;
 import org.dromara.customer.domain.vo.PartnerUserVo;
 import org.dromara.customer.domain.PartnerUser;
 import org.dromara.customer.mapper.PartnerUserMapper;
 import org.dromara.customer.service.IPartnerUserService;
+import org.dromara.system.api.RemoteUserService;
+import org.dromara.system.api.domain.bo.RemoteUserBo;
 
 import java.util.List;
 import java.util.Map;
@@ -33,6 +36,7 @@ import java.util.Collection;
 public class PartnerUserServiceImpl  extends ServiceImpl<PartnerUserMapper, PartnerUser> implements IPartnerUserService {
 
     private final PartnerUserMapper baseMapper;
+    private final RemoteUserService remoteUserService;
 
     /**
      * 查询伙伴商用户
@@ -96,12 +100,33 @@ public class PartnerUserServiceImpl  extends ServiceImpl<PartnerUserMapper, Part
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(PartnerUserBo bo) {
         PartnerUser add = MapstructUtils.convert(bo, PartnerUser.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
+
+            // 调用远程服务创建系统用户
+            RemoteUserBo remoteUserBo = new RemoteUserBo();
+            remoteUserBo.setUserName(bo.getLoginUser());
+            remoteUserBo.setPassword(bo.getPassword());
+            remoteUserBo.setPhonenumber(bo.getPhone());
+            remoteUserBo.setEmail(bo.getEmail());
+            remoteUserBo.setNickName(bo.getName());
+            remoteUserBo.setTenantId(add.getTenantId()); // 从实体对象获取 tenantId
+            remoteUserBo.setUserSonType("2"); // 2=伙伴商
+            remoteUserBo.setStatus(StringUtils.isNotBlank(bo.getStatus()) ? bo.getStatus() : "0");
+            remoteUserBo.setRemark(bo.getRemark());
+
+            // 调用远程服务新增用户
+            Long sysUserId = remoteUserService.addUser(remoteUserBo);
+
+            // 更新 sys_user_id
+            add.setSysUserId(sysUserId);
+            baseMapper.updateById(add);
+            bo.setSysUserId(sysUserId);
         }
         return flag;
     }

ruoyi-modules/ruoyi-external/pom.xml

@@ -139,6 +139,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.external.RuoyiExternalApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-modules/ruoyi-gen/pom.xml

@@ -111,6 +111,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.gen.RuoYiGenApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-modules/ruoyi-job/pom.xml

@@ -96,6 +96,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.job.RuoYiJobApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-modules/ruoyi-order/pom.xml

@@ -139,6 +139,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.order.RuoyiOrderApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-modules/ruoyi-product/pom.xml

@@ -141,6 +141,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.product.RuoyiProductApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-modules/ruoyi-resource/pom.xml

@@ -134,6 +134,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.resource.RuoYiResourceApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-modules/ruoyi-system/pom.xml

@@ -135,6 +135,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.system.RuoYiSystemApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAdaptSceneController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAddressAreaController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAnnouncementController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysCustomPosterController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDecorationSectionController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFloorAdvertManageController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFloorAdvertiseController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFloorController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFloorLabelController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFloorTitleController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysHelpCategoryController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysHelpCenterController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysIndustrialHomeTitleController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOperationMessageController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPriceRangeController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProjectTypeController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPurchaseCategoryController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRuleCategoryController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRuleCenterController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysServiceTimeController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUploadImgLibController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.controller;
+package org.dromara.system.controller.system;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-workflow/pom.xml

@@ -109,6 +109,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <mainClass>org.dromara.workflow.RuoYiWorkflowApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties

@@ -40,7 +40,7 @@ spring.sql.init.platform=mysql
 db.num=1
 
 ### Connect URL of DB:
-db.url.0=jdbc:mysql://yp1.yingpaipay.com:9031/yoe_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://192.168.1.123:3306/yoe_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=youyida
 db.password.0=aapYBDthby