微服务配置的修改

jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-dev.yaml

@@ -1,209 +0,0 @@
-spring:
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        loginUsername: admin
-        loginPassword: 123456
-        allow:
-      web-stat-filter:
-        enabled: true
-    dynamic:
-      druid: # 全局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
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-
-      datasource:
-        master:
-          url: jdbc:mysql://${MYSQL-HOST:jero-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:jero-boot}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: ${MYSQL-USER:root}
-          password: ${MYSQL-PWD:root}
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.cj.jdbc.Driver
-  #redis 配置
-  redis:
-    database: 0
-    host: jero-boot-redis
-    lettuce:
-      pool:
-        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
-        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password:
-    port: 6379
-  #rabbitmq配置
-  rabbitmq:
-    host: jero-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
-#jero专用配置
-jero :
-  # 本地：local\Minio：minio\阿里云：alioss
-  uploadType: local
-  path :
-    #文件上传根目录 设置
-    upload: D://opt//upFiles
-    #webapp文件路径
-    webapp: D://opt//webapp
-  shiro:
-    excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/map/**,/jmreport/bigscreen2/**
-  #阿里云oss存储配置
-  oss:
-    endpoint: oss-cn-beijing.aliyuncs.com
-    accessKey: ??
-    secretKey: ??
-    bucketName: jerodev
-    staticDomain: ??
-  # ElasticSearch 6设置
-  elasticsearch:
-    cluster-name: jero-ES
-    cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
-  # 表单设计器配置
-  desform:
-    # 主题颜色（仅支持 16进制颜色代码）
-    theme-color: "#1890ff"
-    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
-    upload-type: system
-    map:
-      # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
-      baidu: ??
-  # 在线预览文件服务器地址配置
-  file-view-domain: 127.0.0.1:8012
-  # minio文件上传
-  minio:
-    minio_url: http://minio.jero.com
-    minio_name: ??
-    minio_pass: ??
-    bucketName: otatest
-  #大屏报表参数设置
-  jmreport:
-    mode: dev
-    #是否需要校验token
-    is_verify_token: false
-    #必须校验方法
-    verify_methods: remove,delete,save,add,update
-  #Wps在线文档
-  wps:
-    domain: https://wwo.wps.cn/office/
-    appid: ??
-    appsecret: ??
-  #xxl-job配置
-  xxljob:
-    enabled: false
-    adminAddresses: http://jero-boot-xxljob:9080/xxl-job-admin
-    appname: ${spring.application.name}
-    accessToken: ''
-    logPath: logs/jero/job/jobhandler/
-    logRetentionDays: 30
-   #自定义路由配置 yml nacos database
-  route:
-    config:
-      data-id: jero-gateway-router
-      group: DEFAULT_GROUP
-      data-type: yml
-  #分布式锁配置
-  redisson:
-    address: jero-boot-redis:6379
-    password:
-    type: STANDALONE
-    enabled: true
-#Mybatis输出sql日志
-logging:
-  level:
-    com.jero.modules.system.mapper : info
-#cas单点登录
-cas:
-  prefixUrl: http://localhost:8888/cas
-#swagger
-knife4j:
-  production: false
-  basic:
-    enable: true
-    username: jero
-    password: jero1314
-
-#第三方登录
-justauth:
-  enabled: true
-  type:
-    GITHUB:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jero-boot/thirdLogin/github/callback
-    WECHAT_ENTERPRISE:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jero-boot/thirdLogin/wechat_enterprise/callback
-      agent-id: 1000002
-    DINGTALK:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jero-boot/thirdLogin/dingtalk/callback
-  cache:
-    type: default
-    prefix: 'demo::'
-    timeout: 1h
-#第三方APP对接
-third-app:
-  enabled: false
-  type:
-    #企业微信
-    WECHAT_ENTERPRISE:
-      enabled: false
-      #CORP_ID
-      client-id: ??
-      #SECRET
-      client-secret: ??
-      agent-id: ??
-      #自建应用秘钥（新版企微需要配置）
-      # agent-app-secret: ??
-    #钉钉
-    DINGTALK:
-      enabled: false
-      # appKey
-      client-id: ??
-      # appSecret
-      client-secret: ??
-      agent-id: ??

jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-gateway-router.json

@@ -1,5 +1,5 @@
 [{
-  "id": "jeecg-system",
+  "id": "jero-system",
   "order": 0,
   "predicates": [{
     "name": "Path",
@@ -18,9 +18,9 @@
     }
   }],
   "filters": [],
-  "uri": "lb://jeecg-system"
+  "uri": "lb://jero-system"
 }, {
-  "id": "jeecg-demo",
+  "id": "jero-demo",
   "order": 1,
   "predicates": [{
     "name": "Path",
@@ -32,9 +32,9 @@
     }
   }],
   "filters": [],
-  "uri": "lb://jeecg-demo"
+  "uri": "lb://jero-demo"
 }, {
-  "id": "jeecg-system-websocket",
+  "id": "jero-system-websocket",
   "order": 2,
   "predicates": [{
     "name": "Path",
@@ -45,9 +45,9 @@
     }
   }],
   "filters": [],
-  "uri": "lb:ws://jeecg-system"
+  "uri": "lb:ws://jero-system"
 }, {
-  "id": "jeecg-demo-websocket",
+  "id": "jero-demo-websocket",
   "order": 3,
   "predicates": [{
     "name": "Path",
@@ -56,5 +56,5 @@
     }
   }],
   "filters": [],
-  "uri": "lb:ws://jeecg-demo"
+  "uri": "lb:ws://jero-demo"
 }]

jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml

@@ -1,3 +1,4 @@
+# 标准配置的模板，可自行删减
 server:
   tomcat:
     max-swallow-size: -1
@@ -29,7 +30,7 @@ spring:
       max-request-size: 10MB
   mail:
     host: smtp.163.com
-    username: jeroos@163.com
+    username: test@163.com
     password: ??
     properties:
       mail:
@@ -42,7 +43,7 @@ spring:
   quartz:
     job-store-type: jdbc
     initialize-schema: embedded
-    #设置自动启动，默认为 true
+    #定时任务启动开关，true-开  false-关
     auto-startup: true
     #启动时更新己存在的Job
     overwrite-existing-jobs: true
@@ -68,16 +69,16 @@ spring:
   jackson:
     date-format:   yyyy-MM-dd HH:mm:ss
     time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
+  jpa:
+    open-in-view: false
   activiti:
     check-process-definitions: false
     #启用作业执行器
     async-executor-activate: false
     #启用异步执行器
     job-executor-activate: false
-  jpa:
-    open-in-view: false
+  aop:
+    proxy-target-class: true
   #配置freemarker
   freemarker:
     # 设置模板后缀名
@@ -99,9 +100,90 @@ spring:
     static-locations: classpath:/static/,classpath:/public/
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+        allow:
+      web-stat-filter:
+        enabled: true
+    dynamic:
+      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+        # 连接池的配置信息
+        # 初始化大小，最小，最大
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,wall,slf4j
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: 123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          #          url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #          username: root
+          #          password: 123456
+          #          driver-class-name: com.mysql.cj.jdbc.Driver
+          # 多数据源配置
+          #multi-datasource1:
+          #url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #username: root
+          #password: root
+          #driver-class-name: com.mysql.cj.jdbc.Driver
+  #redis 配置
+  redis:
+    database: 3
+    host: 121.36.69.172
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: 'hzwlsoft.com'
+    port: 4780
+  #rabbitmq 配置
+  rabbitmq:
+    host: 121.36.69.172
+    username: admin
+    password: hzwlsoft.com
+    port: 5672
+    publisher-confirm-type: correlated
+    publisher-returns: true
+    virtual-host: /
+    listener:
+      simple:
+        acknowledge-mode: manual
+        #消费者的最小数量
+        concurrency: 1
+        #消费者的最大数量
+        max-concurrency: 1
+        #是否支持重试
+        retry:
+          enabled: true
 #mybatis plus 设置
 mybatis-plus:
-  mapper-locations: classpath*:com/jero/modules/**/xml/*Mapper.xml
+  mapper-locations: classpath*:com/jero/**/xml/*Mapper.xml
   global-config:
     # 关闭MP3.0自带的banner
     banner: false
@@ -112,6 +194,128 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
-    call-setters-on-nulls: true
+    call-setters-on-nulls: true
+#jero专用配置
+jero :
+  # 签名密钥串(前后端要一致，正式发布请自行修改)
+  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
+  # 本地：local\Minio：minio\阿里云：alioss
+  uploadType: local
+  path :
+    #文件上传根目录 设置
+    upload: D://opt//upFiles
+    #webapp文件路径
+    webapp: D://opt//webapp
+  shiro:
+    excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+  #阿里云oss存储配置
+  oss:
+    endpoint: oss-cn-beijing.aliyuncs.com
+    accessKey: ??
+    secretKey: ??
+    bucketName: jeroos
+    staticDomain: jerodev
+  # ElasticSearch 6设置
+  elasticsearch:
+    cluster-name: jero-ES
+    cluster-nodes: 127.0.0.1:9200
+    check-enabled: false
+  # 表单设计器配置
+  desform:
+    # 主题颜色（仅支持 16进制颜色代码）
+    theme-color: "#1890ff"
+    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
+    upload-type: system
+  # 在线预览文件服务器地址配置
+  file-view-domain: 127.0.0.1:8012
+  # minio文件上传
+  minio:
+    minio_url: http://minio.jero.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: otatest
+  #大屏报表参数设置
+  jmreport:
+    mode: dev
+    #数据字典是否可以全局看到
+    saas: false
+    #是否需要校验token
+    is_verify_token: false
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
+  #Wps在线文档
+  wps:
+    domain: https://wwo.wps.cn/office/
+    appid: ??
+    appsecret: ??
+  #xxl-job配置
+  xxljob:
+    enabled: false
+    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+    appname: ${spring.application.name}
+    accessToken: ''
+    address: 127.0.0.1:30007
+    ip: 127.0.0.1
+    port: 30007
+    logPath: logs/jero/job/jobhandler/
+    logRetentionDays: 30
+  route:
+    config:
+      data-id: jero-gateway-router
+      group: DEFAULT_GROUP
+      #自定义路由配置 yml nacos database
+      data-type: yml
+  #分布式锁配置
+  redisson:
+    address: 121.36.69.172:4780
+    password: 'hzwlsoft.com'
+    type: STANDALONE
+    enabled: true
+  # 文件限制后缀黑名单
+  fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin
+  # 跨站白名单
+  whiteUrls:
+#cas单点登录
+cas:
+  prefixUrl: http://cas.example.org:8443/cas
+#Mybatis输出sql日志
+logging:
+  level:
+    com.jero.modules.system.mapper : info
+#swagger
+knife4j:
+  #开启增强配置
+  enable: true
+  #开启生产环境屏蔽
+  production: false
+  basic:
+    enable: false
+    username: jero
+    password: jero.com
+#第三方登录
+justauth:
+  enabled: true
+  type:
+    GITHUB:
+      client-id: true
+      client-secret: true
+      redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/github/callback
+    WECHAT_ENTERPRISE:
+      client-id: true
+      client-secret: true
+      redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_enterprise/callback
+      agent-id: 1000002
+    DINGTALK:
+      client-id: true
+      client-secret: true
+      redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/dingtalk/callback
+    WECHAT_OPEN:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_open/callback
+  cache:
+    type: default
+    prefix: 'demo::'
+    timeout: 1h

jero-boot/jero-boot-starter/jero-boot-starter-cloud/pom.xml

@@ -19,11 +19,29 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba.nacos</groupId>
+                    <artifactId>nacos-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Nacos配置中心 -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba.nacos</groupId>
+                    <artifactId>nacos-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Nacos 2.0客户端 -->
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-client</artifactId>
+            <version>2.0.4</version>
         </dependency>
         <!-- feign -->
         <dependency>

jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/resources/bootstrap.yml

@@ -1,33 +0,0 @@
-spring:
-  profiles:
-    # 当前激活环境
-    active: @profile.name@
-  cloud:
-    #配置Bus id(远程推送事件)
-    bus:
-      id: ${spring.application.name}:${server.port}
-    nacos:
-      config:
-        # Nacos 认证用户
-        username: nacos
-        # Nacos 认证密码
-        password: nacos
-        # 命名空间 常用场景之一是不同环境的配置的区分隔离，例如开发测试环境和生产环境的资源（如配置、服务）隔离等
-        namespace: @config.namespace@
-        # 配置中心地址
-        server-addr: @config.server-addr@
-        # 配置对应的分组
-        group: @config.group@
-        # 配置文件后缀
-        file-extension: yaml
-        prefix: @prefix.name@
-        # 支持多个共享 Data Id 的配置，优先级小于extension-configs,自定义 Data Id 配置 属性是个集合，内部由 Config POJO 组成。Config 有 3 个属性，分别是 dataId, group 以及 refresh
-        #shared-configs[0]:
-          #data-id: @prefix.name@-common.yaml # 配置文件名-Data Id
-          #group: @config.group@   # 默认为DEFAULT_GROUP
-          #refresh: false   # 是否动态刷新，默认为false
-      discovery:
-        namespace: @config.namespace@
-        server-addr: @config.server-addr@
-        watch:
-          enabled: false

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/DistributedLockHandler.java

@@ -52,7 +52,6 @@ public class DistributedLockHandler extends BaseAspect{
     @Around("@annotation(jLock)")
     public Object around(ProceedingJoinPoint joinPoint, JLock jLock) {
         Object obj = null;
-        log.info("进入RedisLock环绕通知...");
         RLock rLock = getLock(joinPoint, jLock);
         boolean res = false;
         //获取超时时间

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockService.java

@@ -1,4 +1,4 @@
-package com.jero.boot.starter.lock.test;
+package org.jero.boot.starter.lock.test;
 
 import com.jero.boot.starter.lock.annotation.JLock;
 import com.jero.boot.starter.lock.annotation.JRepeat;

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockTest.java

@@ -1,4 +1,4 @@
-package com.jero.boot.starter.lock.test;
+package org.jero.boot.starter.lock.test;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockTestApplication.java

@@ -1,4 +1,4 @@
-package com.jero.boot.starter.lock.test;
+package org.jero.boot.starter.lock.test;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/TestUser.java

@@ -1,4 +1,4 @@
-package com.jero.boot.starter.lock.test;
+package org.jero.boot.starter.lock.test;
 
 import lombok.Data;