Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

# Conflicts: # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgCaptchaException.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java
2026-01-04 04:45:28 +08:00 · 2024-06-23 10:29:34 +08:00
parent 1632c241ee 402ab0ffc4
commit 96ab98ac3e
1673 changed files with 1155 additions and 54 deletions
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
@ -0,0 +1,15 @@
+FROM alibabadragonwell/dragonwell:17-anolis
+
+MAINTAINER jeecgos@163.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /jeecg-cloud-nacos
+
+WORKDIR /jeecg-cloud-nacos
+
+EXPOSE 8848
+
+ADD ./target/jeecg-cloud-nacos-3.7.0.jar ./
+
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.7.0.jar
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/README.md
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/README.md
@ -0,0 +1,16 @@
+访问地址: http://localhost:8848/nacos
+账号密码：nacos/nacos
+
+
+# 使用方法
+
+- 1、目前只做了关闭鉴权模式
+- 2、此项目与官方同步，只是为了简化微服务部署
+- 3、如何不用此模块，使用自己的naocs，请创建下面目录中的配置文件
+     目录：jeecg-cloud-nacos/docs/config
+     配置文件： YAML
+
+
+# 常见问题
+- UnsupportedOperationException: Cannot determine JNI library name for ARCH='x86' OS='windows 10'
+  解决方案：http://t.zoukankan.com/mindzone-p-15808190.html
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml
@ -0,0 +1,156 @@
+spring:
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+        allow:
+      web-stat-filter:
+        enabled: true
+    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,wall,slf4j
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        master:
+          url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: root
+          driver-class-name: com.mysql.cj.jdbc.Driver
+  data:
+    redis:
+      database: 0
+      host: jeecg-boot-redis
+      password:
+      port: 6379
+  rabbitmq:
+    host: jeecg-boot-rabbitmq
+    username: guest
+    password: guest
+    port: 5672
+    publisher-confirms: true
+    publisher-returns: true
+    virtual-host: /
+    listener:
+      simple:
+        acknowledge-mode: manual
+        concurrency: 1
+        max-concurrency: 1
+        retry:
+          enabled: true
+minidao:
+  base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*
+jeecg:
+  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
+  signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
+  uploadType: local
+  domainUrl:
+    pc: http://localhost:3100
+    app: http://localhost:8051
+  path:
+    upload: /opt/upFiles
+    webapp: /opt/webapp
+  oss:
+    endpoint: oss-cn-beijing.aliyuncs.com
+    accessKey: ??
+    secretKey: ??
+    bucketName: jeecgdev
+    staticDomain: ??
+  elasticsearch:
+    cluster-name: jeecg-ES
+    cluster-nodes: jeecg-boot-es:9200
+    check-enabled: false
+  file-view-domain: 127.0.0.1:8012
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: otatest
+  jmreport:
+    mode: dev
+    is_verify_token: false
+    verify_methods: remove,delete,save,add,update
+  wps:
+    domain: https://wwo.wps.cn/office/
+    appid: ??
+    appsecret: ??
+  xxljob:
+    enabled: false
+    adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin
+    appname: ${spring.application.name}
+    accessToken: ''
+    logPath: logs/jeecg/job/jobhandler/
+    logRetentionDays: 30
+  redisson:
+    address: jeecg-boot-redis:6379
+    password:
+    type: STANDALONE
+    enabled: true
+logging:
+  level:
+    org.jeecg.modules.system.mapper : info
+cas:
+  prefixUrl: http://localhost:8888/cas
+knife4j:
+  production: false
+  basic:
+    enable: false
+    username: jeecg
+    password: jeecg1314
+justauth:
+  enabled: true
+  type:
+    GITHUB:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback
+    WECHAT_ENTERPRISE:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback
+      agent-id: ??
+    DINGTALK:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback
+  cache:
+    type: default
+    prefix: 'demo::'
+    timeout: 1h
+third-app:
+  enabled: false
+  type:
+    WECHAT_ENTERPRISE:
+      enabled: false
+      client-id: ??
+      client-secret: ??
+      agent-id: ??
+    DINGTALK:
+      enabled: false
+      client-id: ??
+      client-secret: ??
+      agent-id: ??
+
+security:
+  oauth2:
+    client:
+      ignore-urls:
+        - /test/jeecgDemo/demo3
+        - /test/jeecgDemo/redisDemo/**
+        - /category/**
+        - /visual/**
+        - /map/**
+        - /jmreport/bigscreen2/**
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml
@ -0,0 +1,14 @@
+jeecg:
+  route:
+    config:
+      #type:database nacos yml
+      data-type: database
+      group: DEFAULT_GROUP
+      data-id: jeecg-gateway-router
+spring:
+  data:
+    redis:
+      database: 0
+      host: jeecg-boot-redis
+      port: 6379
+      password:
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json
@ -0,0 +1,52 @@
+[{
+  "id": "jeecg-system",
+  "order": 0,
+  "predicates": [{
+    "name": "Path",
+    "args": {
+      "_genkey_0": "/sys/**",
+      "_genkey_1": "/jmreport/**",
+      "_genkey_3": "/online/**",
+      "_genkey_4": "/generic/**"
+    }
+  }],
+  "filters": [],
+  "uri": "lb://jeecg-system"
+}, {
+  "id": "jeecg-demo",
+  "order": 1,
+  "predicates": [{
+    "name": "Path",
+    "args": {
+      "_genkey_0": "/mock/**",
+      "_genkey_1": "/test/**",
+      "_genkey_2": "/bigscreen/template1/**",
+      "_genkey_3": "/bigscreen/template2/**"
+    }
+  }],
+  "filters": [],
+  "uri": "lb://jeecg-demo"
+}, {
+  "id": "jeecg-system-websocket",
+  "order": 2,
+  "predicates": [{
+    "name": "Path",
+    "args": {
+      "_genkey_0": "/websocket/**",
+      "_genkey_1": "/newsWebsocket/**"
+    }
+  }],
+  "filters": [],
+  "uri": "lb:ws://jeecg-system"
+}, {
+  "id": "jeecg-demo-websocket",
+  "order": 3,
+  "predicates": [{
+    "name": "Path",
+    "args": {
+      "_genkey_0": "/vxeSocket/**"
+    }
+  }],
+  "filters": [],
+  "uri": "lb:ws://jeecg-demo"
+}]
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg.yaml
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg.yaml
@ -0,0 +1,100 @@
+server:
+  tomcat:
+    max-swallow-size: -1
+  error:
+    include-exception: true
+    include-stacktrace: ALWAYS
+    include-message: ALWAYS
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+management:
+  health:
+    mail:
+      enabled: false
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+    health:
+      sensitive: true
+  endpoint:
+    health:
+      show-details: ALWAYS
+spring:
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 10MB
+  mail:
+    host: smtp.163.com
+    username: jeecgos@163.com
+    password: ??
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+            required: true
+  quartz:
+    job-store-type: jdbc
+    initialize-schema: embedded
+    auto-startup: false
+    startup-delay: 1s
+    overwrite-existing-jobs: true
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceName: MyScheduler
+            instanceId: AUTO
+          jobStore:
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            tablePrefix: QRTZ_
+            isClustered: true
+            misfireThreshold: 12000
+            clusterCheckinInterval: 15000
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            threadsInheritContextClassLoaderOfInitializingThread: true
+  jackson:
+    date-format:   yyyy-MM-dd HH:mm:ss
+    time-zone:   GMT+8
+  aop:
+    proxy-target-class: true
+  activiti:
+    check-process-definitions: false
+    async-executor-activate: false
+    job-executor-activate: false
+  jpa:
+    open-in-view: false
+  freemarker:
+    suffix: .ftl
+    content-type: text/html
+    charset: UTF-8
+    cache: false
+    prefer-file-system-access: false
+    template-loader-path:
+      - classpath:/templates
+  mvc:
+    static-path-pattern: /**
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  resource:
+    static-locations: classpath:/static/,classpath:/public/
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+mybatis-plus:
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
+  global-config:
+    banner: false
+    db-config:
+      id-type: ASSIGN_ID
+      table-underline: true
+  configuration:
+    call-setters-on-nulls: true
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding-multi.yaml
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding-multi.yaml
@ -0,0 +1,59 @@
+spring:
+  shardingsphere:
+    datasource:
+      names: ds0,ds1
+      ds0:
+        driverClassName: com.mysql.cj.jdbc.Driver
+        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+        type: com.alibaba.druid.pool.DruidDataSource
+        username: root
+        password: root
+      ds1:
+        driverClassName: com.mysql.cj.jdbc.Driver
+        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+        type: com.alibaba.druid.pool.DruidDataSource
+        username: root
+        password: root
+    props:
+      sql-show: true
+    rules:
+      replica-query:
+        load-balancers:
+          round-robin:
+            type: ROUND_ROBIN
+            props:
+              default: 0
+        data-sources:
+          prds:
+            primary-data-source-name: ds0
+            replica-data-source-names: ds1
+            load-balancer-name: round_robin
+      sharding:
+        binding-tables:
+          - sys_log
+        key-generators:
+          snowflake:
+            type: SNOWFLAKE
+            props:
+              worker-id: 123
+        sharding-algorithms:
+          table-classbased:
+            props:
+              strategy: standard
+              algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm
+            type: CLASS_BASED
+          database-inline:
+            type: INLINE
+            props:
+              algorithm-expression: ds$->{operate_type % 2}
+        tables:
+          sys_log:
+            actual-data-nodes: ds$->{0..1}.sys_log$->{0..1}
+            database-strategy:
+              standard:
+                sharding-column: operate_type
+                sharding-algorithm-name: database-inline
+            table-strategy:
+              standard:
+                sharding-algorithm-name: table-classbased
+                sharding-column: log_type
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding.yaml
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding.yaml
@ -0,0 +1,33 @@
+spring:
+  shardingsphere:
+    datasource:
+      names: ds0
+      ds0:
+        driverClassName: com.mysql.cj.jdbc.Driver
+        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+        username: root
+        password: root
+        type: com.alibaba.druid.pool.DruidDataSource
+    props:
+      sql-show: true
+    rules:
+      sharding:
+        binding-tables: sys_log
+        key-generators:
+          snowflake:
+            type: SNOWFLAKE
+            props:
+              worker-id: 123
+        sharding-algorithms:
+          table-classbased:
+            props:
+              strategy: standard
+              algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm
+            type: CLASS_BASED
+        tables:
+          sys_log:
+            actual-data-nodes: ds0.sys_log$->{0..1}
+            table-strategy:
+              standard:
+                sharding-algorithm-name: table-classbased
+                sharding-column: log_type
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
@ -0,0 +1,80 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jeecg-cloud-nacos</artifactId>
+    <name>jeecg-cloud-nacos</name>
+    <description>nacos启动模块</description>
+    <version>3.7.0</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.7.18</version>
+        <relativePath/>
+    </parent>
+
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jeecg</id>
+            <name>jeecg Repository</name>
+            <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <properties>
+        <log4j2.version>2.17.0</log4j2.version>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.nacos</groupId>
+            <artifactId>nacos-naming</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.nacos</groupId>
+            <artifactId>nacos-istio</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.nacos</groupId>
+            <artifactId>nacos-config</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.nacos</groupId>
+            <artifactId>nacos-console</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java
@ -0,0 +1,47 @@
+package com.alibaba.nacos;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Nacos 启动类
+ *
+ * @author zyf
+ */
+@SpringBootApplication(scanBasePackages = "com.alibaba.nacos")
+@ServletComponentScan
+@EnableScheduling
+public class JeecgNacosApplication {
+
+    /** 是否单机模式启动 */
+    private static String standalone = "true";
+    /** 是否开启鉴权 */
+    private static String enabled = "false";
+
+    public static void main(String[] args) {
+        System.setProperty("nacos.standalone", standalone);
+        System.setProperty("nacos.core.auth.enabled", enabled);
+        System.setProperty("server.tomcat.basedir","logs");
+        //自定义启动端口号
+        System.setProperty("server.port","8848");
+        SpringApplication.run(JeecgNacosApplication.class, args);
+    }
+
+    /**
+     * 默认跳转首页
+     *
+     * @param model
+     * @return
+     */
+    @GetMapping("/")
+    public String index(Model model, HttpServletResponse response) {
+        // 视图重定向 - 跳转
+        return "/nacos";
+    }
+}
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml
@ -0,0 +1,60 @@
+server:
+  servlet:
+    contextPath: /nacos
+  tomcat:
+    accesslog:
+      enabled: true
+      pattern: '%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i'
+    basedir: ''
+spring:
+  sql:
+    init:
+      platform: mysql
+db:
+  num: 1
+  password:
+    '0': ${MYSQL-PWD:root}
+  url:
+    '0': jdbc:mysql://${MYSQL-HOST:jeecg-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+  user:
+    '0': ${MYSQL-USER:root}
+management:
+  metrics:
+    export:
+      elastic:
+        enabled: false
+      influx:
+        enabled: false
+nacos:
+  core:
+    auth:
+      enabled: false
+      caching:
+        enabled: true
+      server:
+        identity:
+          key: example
+          value: example
+      plugin:
+        nacos:
+          token:
+            expire:
+              seconds: 18000
+            secret:
+              key: SecretKey01234567890123456789012345345678999987654901234567890123456789
+      system:
+        type: nacos
+  istio:
+    mcp:
+      server:
+        enabled: false
+  naming:
+    empty-service:
+      auto-clean: true
+      clean:
+        initial-delay-ms: 50000
+        period-time-ms: 30000
+  security:
+    ignore:
+      urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
+  standalone: true