refactor(yudao-server): 更新数据库连接配置

- 将 PostgreSQL 数据库连接 URL 从本地改为远程服务器
- 注释掉 OpenGauss 数据库连接示例- 优化代码格式，调整缩进和空行

pom.xml

@@ -134,15 +134,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

yudao-framework/yudao-spring-boot-starter-mq/pom.xml

@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <!--<optional>true</optional>-->
         </dependency>
     </dependencies>
 

yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/rocketmq/core/GroupConstants.java

@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.framework.mq.rocketmq.core;
-
-/**
- * @author bixuan
- * @version 1.0
- * @description: TODO
- * @date 2025/5/4 10:22
- */
-public interface GroupConstants {
-    String BIND_CARD_PACKAGE_GROUP = "bind-card-package-group";
-    String UNBIND_CARD_PACKAGE_GROUP = "unbind-card-package-group";
-    String CHANGE_CARD_PACKAGE_GROUP = "change-card-package-group";
-    String SYNC_BATCH_GROUP = "sync-batch-group";
-    String SYNC_CARD_PACKAGE_GROUP = "sync-card-package-group";
-    String SYNC_CARD_PACKAGE_TRAFFIC_GROUP = "sync-card-package-traffic-group";
-    String SYNC_CARD_POOL_TRAFFIC_GROUP = "sync-card-pool-traffic-group";
-    String SYNC_POOL_TRAFFIC_GROUP = "sync-pool-traffic-group";
-    String SYNC_STATISTICS_CARD_POOL_TRAFFIC_GROUP = "sync-statistics-card-pool-traffic-group";
-    String SYNC_STATISTICS_CARD_PACKAGE_TRAFFIC_GROUP = "sync-statistics-card-package-traffic-group";
-    String PAY_ORDER_DELAY_CLOSE_GROUP = "pay-order-delay-close-group";
-    String PAY_ORDER_GENERATE_BILL_GROUP = "pay-order-generate-bill-group";
-    String REFUND_ORDER_WRITE_OFF_BILL_GROUP = "refund-order-write-off-bill-group";
-    String SYNC_PACKAGE_TRAFFIC_GROUP = "sync-package-traffic-group";
-    String PAY_ORDER_REFUND_GROUP = "pay-order-refund-group";
-    String EIOT_CLUB_NOTIFY_SUBPKGLIST_GROUP = "eiot-club-notify-subPkgList-group";
-    String EIOT_CLUB_NOTIFY_REFUND_GROUP = "eiot-club-notify-refund-group";
-
-}

yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/rocketmq/core/TopicNameConstants.java

@@ -1,41 +0,0 @@
-package cn.iocoder.yudao.framework.mq.rocketmq.core;
-
-
-
-/**
- * @program: b2b2c-admin
- * @ClassName TopicNameConstants
- * @description:
- * @author: HuangLei
- * @create: 2025/4/28/周一 9:55
- * @Version 1.0
- **/
-public interface TopicNameConstants {
-
-
-    /**
-     * 运营商主题,相同操作消息可以使用tag区分
-     */
-    String IOT_OPERATOR = "iot-operator";
-
-    /**
-     * 事务主题,相同操作消息可以使用tag区分
-     */
-    String IOT_TRANSACTION = "iot-transaction";
-
-    /**
-     * 延时主题,相同操作消息可以使用tag区分
-     */
-    String IOT_DELAY = "iot-delay";
-
-    /**
-     * 退款主题,相同操作消息可以使用tag区分
-     */
-    String PAY_REFUND_ORDER = "pay-refund-order";
-
-
-    /**
-     * eiotclub异步通知主题
-     */
-    String EIOT_CLUB_NOTIFY_TOPIC = "eiot-club-notify";
-}

yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/rocketmq/core/TopicTagConstants.java

@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.framework.mq.rocketmq.core;
-
-/**
- * @description: TODO
- * @author bixuan
- * @date 2025/5/4 10:22
- * @version 1.0
- */
- public interface TopicTagConstants {
-     String BIND_CARD_PACKAGE_TAG = "bind_card_package";
-     String UNBIND_CARD_PACKAGE_TAG = "unbind_card_package";
-     String CHANGE_CARD_PACKAGE_TAG = "change_card_package";
-     String SYNC_BATCH_TAG = "sync_batch";
-     String SYNC_CARD_PACKAGE_TAG = "sync_card_package";
-     String SYNC_CARD_PACKAGE_TRAFFIC_TAG = "sync_card_package_traffic";
-     String SYNC_CARD_POOL_TRAFFIC_TAG = "sync_card_pool_traffic";
-     String SYNC_POOL_TRAFFIC_TAG = "sync_pool_traffic";
-     String SYNC_STATISTICS_CARD_POOL_TRAFFIC_TAG = "sync_statistics_card_pool_traffic";
-     String SYNC_STATISTICS_CARD_PACKAGE_TRAFFIC_TAG = "sync_statistics_card_package_traffic";
-
-     String PAY_ORDER_SUCCESS_BILL_TAG = "pay_order_success_bill";
-     String REFUND_SUCCESS_BILL_TAG = "refund_success_bill";
-     String DELAY_PAY_ORDER_DELAY_CLOSE = "delay_pay_order_close";
-
-
-
-}

yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml

@@ -32,6 +32,7 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
@@ -41,7 +42,6 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
-import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.lang.Nullable;
 
@@ -16,17 +15,13 @@ import java.util.List;
 @Mapper
 public interface RoleMapper extends BaseMapperX<RoleDO> {
 
-
     default PageResult<RoleDO> selectPage(RolePageReqVO reqVO) {
-        PageResult<RoleDO> roleDOPageResult = selectPage(reqVO, new LambdaQueryWrapperX<RoleDO>()
+        return selectPage(reqVO, new LambdaQueryWrapperX<RoleDO>()
                 .likeIfPresent(RoleDO::getName, reqVO.getName())
                 .likeIfPresent(RoleDO::getCode, reqVO.getCode())
                 .eqIfPresent(RoleDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime())
-                .ne(RoleDO::getCode, RoleCodeEnum.SUPER_ADMIN.getCode())
                 .orderByAsc(RoleDO::getSort));
-        //过滤掉super_admin及管理员
-         return roleDOPageResult;
     }
 
     default RoleDO selectByName(String name) {
@@ -38,9 +33,7 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
     }
 
     default List<RoleDO> selectListByStatus(@Nullable Collection<Integer> statuses) {
-        return selectList(new LambdaQueryWrapperX<RoleDO>()
-                .eq(RoleDO::getStatus, statuses)
-                .ne(RoleDO::getCode, RoleCodeEnum.SUPER_ADMIN.getCode()));
+        return selectList(RoleDO::getStatus, statuses);
     }
 
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -5,8 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
-import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
-import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
@@ -20,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import jakarta.annotation.Resource;
-
 import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -167,39 +164,9 @@ public class DeptServiceImpl implements DeptService {
 
     @Override
     public List<DeptDO> getDeptList(DeptListReqVO reqVO) {
-        List<DeptDO> list = DataPermissionUtils.executeIgnore(() -> {
-            return deptMapper.selectList(reqVO);
-        });
-        Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
-        //从当前登录的部门开始,递归获取子部门
-        // 从当前登录的部门开始, 递归获取所有子部门
-        List<DeptDO> allSubDepts = new ArrayList<>();
-        if (loginUserDeptId != null) {
-            DeptDO currentDept = deptMapper.selectById(loginUserDeptId);
-            if (currentDept != null) {
-                allSubDepts.add(currentDept);
-                collectAllSubDept(allSubDepts, currentDept.getId(), list);
-            }
-        }
-        // 合并所有子部门到结果列表中
-        allSubDepts.sort(Comparator.comparing(DeptDO::getSort));
-        return allSubDepts;
-    }
-
-    /**
-     * 递归收集所有子部门.
-     *
-     * @param allSubDepts 收集所有子部门的列表
-     * @param parentId 父部门ID
-     * @param allDepts 所有部门的列表
-     */
-    private void collectAllSubDept(List<DeptDO> allSubDepts, Long parentId, List<DeptDO> allDepts) {
-        for (DeptDO dept : allDepts) {
-            if (parentId.equals(dept.getParentId())) {
-                allSubDepts.add(dept);
-                collectAllSubDept(allSubDepts, dept.getId(), allDepts); // 递归收集子部门
-            }
-        }
+        List<DeptDO> list = deptMapper.selectList(reqVO);
+        list.sort(Comparator.comparing(DeptDO::getSort));
+        return list;
     }
 
     @Override

yudao-server/pom.xml

@@ -108,12 +108,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-mq</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
         <!-- IoT 物联网相关模块。默认注释，保证编译速度 -->
 <!--        <dependency>-->
 <!--            <groupId>cn.iocoder.boot</groupId>-->

yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java

@@ -9,12 +9,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
  * 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
  * 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
- * cn.iocoder.yudao.server
+ *
  * @author 芋道源码
  */
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
-@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module",
-        "${yudao.info.base-package}.framework.*"})
+@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module"})
 public class YudaoServerApplication {
 
     public static void main(String[] args) {

yudao-server/src/main/resources/application-dev.yaml

@@ -56,14 +56,10 @@ spring:
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
     redis:
-      host: 192.168.201.228 # 地址
-      port: 31314 # 端口
+      host: 400-infra.server.iocoder.cn # 地址
+      port: 6379 # 端口
       database: 1 # 数据库索引
-      password: redis.123456 # 密码，建议生产环境开启
-      # 连接超时时间
-      timeout: 10s
-      # 是否开启ssl
-      ssl.enabled: false
+#    password: 123456 # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
 
@@ -100,7 +96,7 @@ spring:
 
 # rocketmq 配置项，对应 RocketMQProperties 配置类
 rocketmq:
-  name-server: 192.168.201.58:9876 # RocketMQ Namesrv
+  name-server: 127.0.0.1:9876 # RocketMQ Namesrv
 
 spring:
   # RabbitMQ 配置项，对应 RabbitProperties 配置类

yudao-server/src/main/resources/application-local.yaml

@@ -48,16 +48,16 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://192.168.201.228:30509/iot_card_plus_dev?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+#          url: jdbc:mysql://192.168.201.228:30509/iot_card_plus_dev?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例
-          #          url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
+          url: jdbc:postgresql://192.168.201.188:5432/iot_card # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true;useUnicode=true;characterEncoding=utf-8 # SQLServer 连接的示例
           #          url: jdbc:dm://127.0.0.1:5236?schema=RUOYI_VUE_PRO # DM 连接的示例
           #          url: jdbc:kingbase8://127.0.0.1:54321/test  # 人大金仓 KingbaseES 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/postgres # OpenGauss 连接的示例
-          username: root
-          password: spmd.test.123456
+          username: postgres
+          password: AM38xymTdFree4Fh
           #          username: sa # SQL Server 连接的示例
           #          password: Yudao@2024 # SQL Server 连接的示例
           #          username: SYSDBA # DM 连接的示例
@@ -84,10 +84,6 @@ spring:
       port: 31314 # 端口
       database: 2 # 数据库索引
       password: redis.123456 # 密码，建议生产环境开启
-      # 连接超时时间
-      timeout: 10s
-      # 是否开启ssl
-      ssl.enabled: false
 
 --- #################### 定时任务相关配置 ####################