重构项目

muyu-auth/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java

@@ -58,7 +58,7 @@ public class IpUtils {
             ip = request.getRemoteAddr();
         }
 
-        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip);
+        return "0:0:0:0:0:0:0:1".equals(ip) ? "175.24.138.82" : getMultistageReverseProxyIp(ip);
     }
 
     /**
@@ -70,7 +70,7 @@ public class IpUtils {
      */
     public static boolean internalIp (String ip) {
         byte[] addr = textToNumericFormatV4(ip);
-        return internalIp(addr) || "127.0.0.1".equals(ip);
+        return internalIp(addr) || "175.24.138.82".equals(ip);
     }
 
     /**
@@ -197,7 +197,7 @@ public class IpUtils {
             return InetAddress.getLocalHost().getHostAddress();
         } catch (UnknownHostException e) {
         }
-        return "127.0.0.1";
+        return "175.24.138.82";
     }
 
     /**

muyu-gateway/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -28,12 +28,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: 175.24.138.82:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 175.24.138.82:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

muyu-modules/muyu-etl/muyu-etl-common/pom.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-etl</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-etl-common</artifactId>
+
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+</project>

muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java

@@ -0,0 +1,179 @@
+package com.muyu.etl.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.common.security.annotation.EnableCustomConfig;
+import com.muyu.etl.domain.req.BasicConfigQueryReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.function.Supplier;
+
+/**
+ * 数据接入 BasicConfigInfo
+ *
+ * @author xiaohuang
+ * on 2024/5/8
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class BasicConfigInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 接入源名称
+     */
+    @Excel(name = "接入源名称")
+    private String dataResourceName;
+
+
+    /**
+     * 数据来源系统名称
+     */
+    @Excel(name = "数据来源系统名称")
+    private String dataSourcesSystemName;
+
+
+    /**
+     * 主机ip地址
+     */
+    @Excel(name = "主机ip地址")
+    private String host;
+
+
+    /**
+     * 端口
+     */
+    @Excel(name = "端口")
+    private String port;
+
+
+    /**
+     * 数据接入类型
+     */
+    @Excel(name = "数据接入类型")
+    private String databaseType;
+
+
+    /**
+     * 数据库名称
+     */
+    @Excel(name = "数据库名称")
+    private String databaseName;
+
+
+    /**
+     * 初始化连接数量
+     */
+    @Excel(name = "初始化连接数量")
+    private Long initLinkNum;
+
+
+    /**
+     * 最大连接数量
+     */
+    @Excel(name = "最大连接数量")
+    private Long maxLinkNum;
+
+
+    /**
+     * 最大等待时间
+     */
+    @Excel(name = "最大等待时间")
+    private Long maxWaitTime;
+
+
+    /**
+     * 最大等待次数
+     */
+    @Excel(name = "最大等待次数")
+    private Long maxWaitTimes;
+
+
+    /**
+     * 链接参数
+     */
+    @Excel(name = "链接参数")
+    private String connectionParams;
+
+
+    /**
+     * 用户名
+     */
+    @Excel(name = "用户名")
+    private String username;
+
+
+    /**
+     * 密码
+     */
+    @Excel(name = "密码")
+    private String password;
+
+
+    private String createBy;
+    private String updateBy;
+    private Date createTime;
+    private Date updateTime;
+
+
+    /**
+     * 创建       储存对象
+     */
+    public static  BasicConfigInfo saveBuilder(BasicConfigQueryReq configQueryReq, Supplier<String> username){
+        return BasicConfigInfo.builder()
+                .id(configQueryReq.getId())
+                .databaseName(configQueryReq.getDatabaseName())
+                .databaseType(configQueryReq.getDatabaseType())
+                .dataResourceName(configQueryReq.getDataResourceName())
+                .dataSourcesSystemName(configQueryReq.getDataSourcesSystemName())
+                .host(configQueryReq.getHost())
+                .port(configQueryReq.getPort())
+                .initLinkNum(configQueryReq.getInitLinkNum())
+                .maxLinkNum(configQueryReq.getMaxLinkNum())
+                .maxWaitTime(configQueryReq.getMaxWaitTime())
+                .createBy(username.get())
+                .createTime(new Date())
+                .build();
+
+    }
+
+
+    /**
+     * 修改
+     */
+    public static BasicConfigInfo editBuilder(BasicConfigQueryReq configQueryReq,Supplier<String> username){
+        return BasicConfigInfo.builder()
+                .id(configQueryReq.getId())
+                .databaseName(configQueryReq.getDatabaseName())
+                .databaseType(configQueryReq.getDatabaseType())
+                .dataResourceName(configQueryReq.getDataResourceName())
+                .dataSourcesSystemName(configQueryReq.getDataSourcesSystemName())
+                .host(configQueryReq.getHost())
+                .port(configQueryReq.getPort())
+                .initLinkNum(configQueryReq.getInitLinkNum())
+                .maxLinkNum(configQueryReq.getMaxLinkNum())
+                .maxWaitTime(configQueryReq.getMaxWaitTime())
+                .createBy(username.get())
+                .createTime(new Date())
+                .build();
+
+    }
+}

muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/BasicConfigQueryReq.java

@@ -0,0 +1,112 @@
+package com.muyu.etl.domain.req;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 接入数据库 BasicConfigQueryReq
+ *
+ * @author xiaohuang
+ * on 2024/5/8
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class BasicConfigQueryReq {
+
+    private static  final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 接入源名称
+     */
+    @Excel(name = "接入源名称")
+    private String dataResourceName;
+
+
+    /**
+     * 数据来源系统名称
+     */
+    @Excel(name = "数据来源系统名称")
+    private String dataSourcesSystemName;
+
+
+    /**
+     * 主机ip地址
+     */
+    @Excel(name = "主机ip地址")
+    private String host;
+
+
+    /**
+     * 端口
+     */
+    @Excel(name = "端口")
+    private String port;
+
+
+    /**
+     * 数据接入类型
+     */
+    @Excel(name = "数据接入类型")
+    private String databaseType;
+
+
+    /**
+     * 数控库名称
+     */
+    @Excel(name = "数据库名称")
+    private String databaseName;
+
+
+    /**
+     * 初始化连接数量
+     */
+    @Excel(name = "初始化连接数量")
+    private Long initLinkNum;
+
+
+    /**
+     * 最大连接数量
+     */
+    @Excel(name = "最大连接数量")
+    private Long maxLinkNum;
+
+
+    /**
+     * 最大等待时间
+     */
+    @Excel(name = "最大等待时间")
+    private Long maxWaitTime;
+
+
+    /**
+     * 最大等待次数
+     */
+    @Excel(name = "最大等待次数")
+    private Long maxWaitTimes;
+
+
+    private String connectionParams;
+    private String createBy;
+    private String updateBy;
+    private Date createTime;
+    private Date updateTime;
+
+
+}

muyu-modules/muyu-etl/muyu-etl-remote/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-etl</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-etl-remote</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+    </dependencies>
+</project>

muyu-modules/muyu-etl/muyu-etl-service/pom.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-etl</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-etl-service</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.3.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-etl-common</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataSource -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-datasource</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataScope -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-datascope</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Log -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-log</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Swagger -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-swagger</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 加入maven deploy插件，当在deploy时，忽略些model-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/MuYuEtlApplication.java

@@ -0,0 +1,28 @@
+package com.muyu;
+
+
+import com.muyu.common.security.annotation.EnableCustomConfig;
+import com.muyu.common.security.annotation.EnableMyFeignClients;
+import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * etl启动 MuYuEtlApplication
+ *
+ * @author xiaohuang
+ * on 2024/5/9
+ */
+
+
+@SpringBootApplication
+@EnableMyFeignClients
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableFeignClients
+public class MuYuEtlApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MuYuEtlApplication.class);
+    }
+}

muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java

@@ -0,0 +1,11 @@
+package com.muyu.etl.controller;
+
+/**
+ * 数据接入 BasicConfigInfoController
+ *
+ * @author xiaohuang
+ * on 2024/5/9
+ */
+public class BasicConfigInfoController {
+
+}

muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/BasicConfigInfoMapper.java

@@ -0,0 +1,13 @@
+package com.muyu.etl.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 数据接入mapper层 BasicConfigInfoMapper
+ *
+ * @author xiaohuang
+ * on 2024/5/9
+ */
+@Mapper
+public interface BasicConfigInfoMapper {
+}

muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigService.java

@@ -0,0 +1,10 @@
+package com.muyu.etl.service;
+
+/**
+ * 数据接入的service层 BasicConfigService
+ *
+ * @author xiaohuang
+ * on 2024/5/9
+ */
+public interface BasicConfigService {
+}

muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigServiceImpl.java

@@ -0,0 +1,16 @@
+package com.muyu.etl.service.impl;
+
+import com.muyu.etl.service.BasicConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 数据接入 BasicConfigServiceImpl
+ *
+ * @author xiaohuang
+ * on 2024/5/9
+ */
+@Service
+public class BasicConfigServiceImpl implements BasicConfigService {
+
+
+}

muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/bootstrap.yml

@@ -0,0 +1,28 @@
+# Tomcat
+server:
+  port: 9211
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: muyu-etl
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 175.24.138.82:8848
+      config:
+        # 配置中心地址
+        server-addr: 175.24.138.82:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+logging:
+  level:
+    com.muyu.system.mapper: DEBUG

muyu-modules/muyu-etl/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-modules</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-etl</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>muyu-etl-common</module>
+        <module>muyu-etl-remote</module>
+        <module>muyu-etl-service</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+
+</project>

muyu-modules/muyu-file/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-job/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-system/pom.xml

@@ -103,6 +103,7 @@
                 </configuration>
             </plugin>
         </plugins>
+
     </build>
 
 </project>

muyu-modules/muyu-system/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/pom.xml

@@ -13,6 +13,7 @@
         <module>muyu-gen</module>
         <module>muyu-job</module>
         <module>muyu-file</module>
+        <module>muyu-etl</module>
     </modules>
 
     <artifactId>muyu-modules</artifactId>

muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 175.24.138.82:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

pom.xml

@@ -206,6 +206,13 @@
                 <version>${muyu.version}</version>
             </dependency>
 
+            <!-- 系统级别 插件 -->
+            <dependency>
+                <groupId>com.muyu</groupId>
+                <artifactId>muyu-etl-common</artifactId>
+                <version>${muyu.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

sql/ry_20230706.sql

@@ -67,8 +67,8 @@ create table sys_user (
 -- ----------------------------
 -- 初始化-用户信息表数据
 -- ----------------------------
-insert into sys_user values(1,  103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员');
+insert into sys_user values(1,  103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '175.24.138.82', sysdate(), 'admin', sysdate(), '', null, '管理员');
-insert into sys_user values(2,  105, 'ry',    '若依', '00', 'ry@qq.com',  '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员');
+insert into sys_user values(2,  105, 'ry',    '若依', '00', 'ry@qq.com',  '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '175.24.138.82', sysdate(), 'admin', sysdate(), '', null, '测试员');
 
 
 -- ----------------------------

sql/ry_config_20220929.sql

@@ -40,7 +40,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod
 (5,'muyu-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.system\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip','48e0ed4a040c402bdc2444213a82c910','2020-11-20 00:00:00','2022-09-29 02:49:09','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''),
 (6,'muyu-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: root\n    password: root\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.gen.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 代码生成接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n# 代码生成\ngen:\n  # 作者\n  author: muyu\n  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n  packageName: com.muyu.system\n  # 自动去除表前缀，默认是false\n  autoRemovePre: false\n  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n  tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''),
 (7,'muyu-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password: \n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: root\n    password: root\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.job.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 定时任务接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''),
-(8,'muyu-file-dev.yml','DEFAULT_GROUP','# 本地文件上传    \r\nfile:\r\n    domain: http://127.0.0.1:9300\r\n    path: D:/muyu/uploadPath\r\n    prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n  domain: http://8.129.231.12\r\n  soTimeout: 3000\r\n  connectTimeout: 2000\r\n  trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n  url: http://8.129.231.12:9000\r\n  accessKey: minioadmin\r\n  secretKey: minioadmin\r\n  bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''),
+(8,'muyu-file-dev.yml','DEFAULT_GROUP','# 本地文件上传    \r\nfile:\r\n    domain: http://175.24.138.82:9300\r\n    path: D:/muyu/uploadPath\r\n    prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n  domain: http://8.129.231.12\r\n  soTimeout: 3000\r\n  connectTimeout: 2000\r\n  trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n  url: http://8.129.231.12:9000\r\n  accessKey: minioadmin\r\n  secretKey: minioadmin\r\n  bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''),
 (9,'sentinel-muyu-gateway','DEFAULT_GROUP','[\r\n    {\r\n        \"resource\": \"muyu-auth\",\r\n        \"count\": 500,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-system\",\r\n        \"count\": 1000,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-gen\",\r\n        \"count\": 200,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-job\",\r\n        \"count\": 300,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json',NULL,'');