update pom config

base-common/pom.xml

@@ -6,7 +6,6 @@
         <artifactId>uskycloud</artifactId>
         <version>0.0.1</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>base-common</artifactId>
     <packaging>pom</packaging>
 
@@ -56,10 +55,6 @@
         <module>ruoyi-common-security</module>
         <module>ruoyi-common-datascope</module>
 		<module>ruoyi-common-datasource</module>
-        <module>common-cloud-starter</module>
-        <module>usky-common-core</module>
-        <module>usky-common-mvc</module>
-        <module>usky-common-spring</module>
     </modules>
 
 

base-common/ruoyi-common-core/pom.xml

@@ -16,7 +16,6 @@
     </description>
 
     <dependencies>
-
         <!-- SpringCloud Openfeign -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

base-common/ruoyi-common-datascope/pom.xml

@@ -8,20 +8,18 @@
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>ruoyi-common-datascope</artifactId>
-	
+
     <description>
         ruoyi-common-datascope权限范围
     </description>
 
     <dependencies>
-		
-        <!-- RuoYi Common Security -->
+       <!-- RuoYi Common Security-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
-        
     </dependencies>
 </project>

base-common/ruoyi-common-datasource/pom.xml

@@ -8,7 +8,7 @@
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>ruoyi-common-datasource</artifactId>
 	
     <description>

base-common/ruoyi-common-log/pom.xml

@@ -8,7 +8,7 @@
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>ruoyi-common-log</artifactId>
 	
     <description>

base-common/ruoyi-common-redis/pom.xml

@@ -8,7 +8,7 @@
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>ruoyi-common-redis</artifactId>
 	
     <description>

base-common/ruoyi-common-security/pom.xml

@@ -7,7 +7,7 @@
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>ruoyi-common-security</artifactId>
 
     <description>

base-common/ruoyi-common-swagger/pom.xml

@@ -8,7 +8,7 @@
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>ruoyi-common-swagger</artifactId>
 	
     <description>

base-components/gateway/src/main/resources/application-dev.yml.bak

@@ -0,0 +1,82 @@
+spring:
+  redis:
+    host: usky-cloud-redis
+    port: 6379
+    password: uskyredis
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lowerCaseServiceId: true
+          enabled: true
+      routes:
+        # 认证中心
+        - id: service-auth
+          uri: lb://service-auth
+          predicates:
+            - Path=/auth/**
+          filters:
+            # 验证码处理
+            - CacheRequestFilter
+            - ValidateCodeFilter
+            - StripPrefix=1
+        # 代码生成
+        - id: service-gen
+          uri: lb://service-gen
+          predicates:
+            - Path=/code/**
+          filters:
+            - StripPrefix=1
+        # 定时任务
+        - id: service-job
+          uri: lb://service-job
+          predicates:
+            - Path=/schedule/**
+          filters:
+            - StripPrefix=1
+        # 系统模块
+        - id: service-system
+          uri: lb://service-system
+          predicates:
+            - Path=/system/**
+          filters:
+            - StripPrefix=1
+        # 文件服务
+        - id: service-file
+          uri: lb://service-file
+          predicates:
+            - Path=/file/**
+          filters:
+            - StripPrefix=1
+        - id: usky-demo
+          uri: lb://usky-demo
+          predicates:
+            - Path=/uskyDemo/**
+          filters:
+            - StripPrefix=1
+        - id: usky-backend
+          uri: lb://usky-backend
+          predicates:
+            - Path=/backend/**
+          filters:
+            - StripPrefix=1
+
+# 安全配置
+security:
+  # 验证码
+  captcha:
+    enabled: true
+    type: math
+  # 防止XSS攻击
+  xss:
+    enabled: true
+    excludeUrls:
+      - /system/notice
+  # 不校验白名单
+  ignore:
+    whites:
+      - /auth/logout
+      - /auth/login
+      - /auth/register
+      - /*/v2/api-docs
+      - /csrf

base-components/gateway/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-                            _                        _                                 
-                           (_)                      | |                                
- _ __  _   _   ___   _   _  _  ______   __ _   __ _ | |_   ___ __      __  __ _  _   _ 
-| '__|| | | | / _ \ | | | || ||______| / _` | / _` || __| / _ \\ \ /\ / / / _` || | | |
-| |   | |_| || (_) || |_| || |        | (_| || (_| || |_ |  __/ \ V  V / | (_| || |_| |
-|_|    \__,_| \___/  \__, ||_|         \__, | \__,_| \__| \___|  \_/\_/   \__,_| \__, |
-                      __/ |             __/ |                                     __/ |
-                     |___/             |___/                                     |___/ 

base-modules/service-system/service-system-api/pom.xml

@@ -18,10 +18,9 @@
     <dependencies>
         <!-- RuoYi Common Core-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
+           <groupId>com.ruoyi</groupId>
+           <artifactId>ruoyi-common-core</artifactId>
         </dependency>
-        
     </dependencies>
 
 </project>

base-modules/service-system/service-system-biz/src/main/resources/application-dev.yml.bak

@@ -0,0 +1,83 @@
+# spring配置
+spring:
+  redis:
+    host: usky-cloud-redis
+    port: 6379
+    password: uskyredis
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+    dynamic:
+      druid:
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        maxWait: 60000
+        timeBetweenEvictionRunsMillis: 60000
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        filters: stat,slf4j
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+          # 主库数据源
+          master:
+            driver-class-name: com.mysql.cj.jdbc.Driver
+            url: jdbc:mysql://usky-cloud-mysql:3306/usky-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+            username: usky
+            password: Yt#75Usky
+          # 从库数据源
+          # slave:
+            # username:
+            # password:
+            # url:
+            # driver-class-name:
+      # seata: true    # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭
+
+# seata配置
+seata:
+  # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启
+  enabled: false
+  # Seata 应用编号，默认为 ${spring.application.name}
+  application-id: ${spring.application.name}
+  # Seata 事务组编号，用于 TC 集群名
+  tx-service-group: ${spring.application.name}-group
+  # 关闭自动代理
+  enable-auto-data-source-proxy: false
+  # 服务配置项
+  service:
+    # 虚拟组和分组的映射
+    vgroup-mapping:
+      ruoyi-system-group: default
+  config:
+    type: nacos
+    nacos:
+      serverAddr: 127.0.0.1:8848
+      group: SEATA_GROUP
+      namespace:
+  registry:
+    type: nacos
+    nacos:
+      application: seata-server
+      server-addr: 127.0.0.1:8848
+      namespace:
+
+# mybatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.system,com.usky
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath:mapper/**/*.xml
+
+# swagger配置
+swagger:
+  title: 系统模块接口文档
+  license: Powered By ruoyi
+  licenseUrl: https://ruoyi.vip

docker/docker-compose.yml

@@ -61,10 +61,10 @@ services:
       - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/logs:/var/log/nginx
       - ./nginx/conf.d:/etc/nginx/conf.d
-    depends_on:
-      - ruoyi-gateway
-    links:
-      - ruoyi-gateway
+#    depends_on:
+#      - ruoyi-gateway
+#    links:
+#      - ruoyi-gateway
   ruoyi-gateway:
     container_name: ruoyi-gateway
     build:

docker/mysql/dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM mysql:5.7
 # author
-MAINTAINER ruoyi
+MAINTAINER  usky
 
 # 执行sql脚本
 ADD ./db/*.sql /docker-entrypoint-initdb.d/

docker/nginx/conf/nginx.conf

@@ -25,7 +25,7 @@ http {
 			proxy_set_header X-Real-IP $remote_addr;
 			proxy_set_header REMOTE-HOST $remote_addr;
 			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-			proxy_pass http://ruoyi-gateway:8080/;
+			proxy_pass http://localhost:8080/;
 		}
 
         error_page   500 502 503 504  /50x.html;
@@ -33,4 +33,4 @@ http {
             root   html;
         }
     }
-}# requirepass 123456
+}

pom.xml

@@ -30,7 +30,7 @@
 
     <properties>
         <usky.version>0.0.1</usky.version>
-        <ruoyi.version>3.5.0</ruoyi.version>
+        <ruoyi.version>3.3.5</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -343,6 +343,7 @@
         <module>base-components</module>
         <module>base-common</module>
         <module>base-modules</module>
+        <module>usky-common</module>
     </modules>
     <packaging>pom</packaging>
 

base-common/common-cloud-starter/pom.xml → usky-common/common-cloud-starter/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.usky</groupId>
-        <artifactId>base-common</artifactId>
+        <artifactId>usky-common</artifactId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

usky-common/pom.xml

@@ -0,0 +1,59 @@
+<?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">
+
+    <parent>
+        <artifactId>uskycloud</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>usky-common</artifactId>
+    <packaging>pom</packaging>
+    <description>
+        usky-common通用模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <modules>
+        <module>usky-common-core</module>
+        <module>usky-common-mvc</module>
+        <module>usky-common-spring</module>
+        <module>common-cloud-starter</module>
+    </modules>
+</project>

base-common/usky-common-core/pom.xml → usky-common/usky-common-core/pom.xml

@@ -3,7 +3,7 @@
          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">
     <parent>
-        <artifactId>base-common</artifactId>
+        <artifactId>usky-common</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>

base-common/usky-common-mvc/pom.xml → usky-common/usky-common-mvc/pom.xml

@@ -3,7 +3,7 @@
          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">
     <parent>
-        <artifactId>base-common</artifactId>
+        <artifactId>usky-common</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>

base-common/usky-common-spring/pom.xml → usky-common/usky-common-spring/pom.xml

@@ -3,7 +3,7 @@
          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">
     <parent>
-        <artifactId>base-common</artifactId>
+        <artifactId>usky-common</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>