From f43631675f4a162f576bfe0c4685573ba46caf79 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 9 Apr 2022 23:27:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/tables_nacos.sql | 6 +- .../com/jero/JeroSystemSingleApplication.java | 2 +- .../src/main/resources/application-dev.yml | 45 +++- .../src/main/resources/application-prod.yml | 93 +++++--- .../src/main/resources/application-test.yml | 131 ++++++----- .../nacos/jero-dev.yaml | 209 ----------------- .../nacos/jero-gateway-router.json | 16 +- .../jero-boot-starter-cloud/nacos/jero.yaml | 222 +++++++++++++++++- .../jero-boot-starter-cloud/pom.xml | 18 ++ .../lock/aspect/DistributedLockHandler.java | 1 - .../boot/starter/lock/test/LockService.java | 2 +- .../boot/starter/lock/test/LockTest.java | 2 +- .../lock/test/LockTestApplication.java | 2 +- .../boot/starter/lock/test/TestUser.java | 2 +- .../src/main/resources/application.yml | 36 +-- .../src/main/resources/bootstrap.yml | 44 ++++ .../jero/modules/cloud/lock/DemoLockTest.java | 3 +- .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application.yml | 2 +- .../src/main/resources/bootstrap.yml | 13 +- jero-boot/pom.xml | 6 - 21 files changed, 491 insertions(+), 364 deletions(-) delete mode 100644 jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-dev.yaml rename jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/{jeecg => jero}/boot/starter/lock/test/LockService.java (97%) rename jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/{jeecg => jero}/boot/starter/lock/test/LockTest.java (98%) rename jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/{jeecg => jero}/boot/starter/lock/test/LockTestApplication.java (91%) rename jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/{jeecg => jero}/boot/starter/lock/test/TestUser.java (72%) create mode 100644 jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/bootstrap.yml delete mode 100644 jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/application-dev.yml rename jero-boot/{jero-boot-starter/jero-boot-starter-cloud => jero-cloud-module/jero-cloud-system-start}/src/main/resources/bootstrap.yml (69%) diff --git a/jero-boot/db/tables_nacos.sql b/jero-boot/db/tables_nacos.sql index c55cc645..6b312787 100644 --- a/jero-boot/db/tables_nacos.sql +++ b/jero-boot/db/tables_nacos.sql @@ -48,9 +48,9 @@ CREATE TABLE `config_info` ( -- ---------------------------- -- Records of config_info -- ---------------------------- -INSERT INTO `config_info` VALUES (1, 'jero-dev.yaml', 'DEFAULT_GROUP', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)\n # 连接池的配置信息\n # 初始化大小，最小，最大\n initial-size: 5\n min-idle: 5\n maxActive: 20\n # 配置获取连接等待超时的时间\n maxWait: 60000\n # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒\n timeBetweenEvictionRunsMillis: 60000\n # 配置一个连接在池中最小生存的时间，单位是毫秒\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n # 打开PSCache，并且指定每个连接上PSCache的大小\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，\'wall\'用于防火墙\n filters: stat,wall,slf4j\n # 通过connectProperties属性来打开mergeSql功能；慢SQL记录\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n\n datasource:\n master:\n url: jdbc:mysql://jero-boot-mysql:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n # 多数据源配置\n #multi-datasource1:\n #url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n #username: root\n #password: root\n #driver-class-name: com.mysql.cj.jdbc.Driver\n #redis 配置\n redis:\n database: 0\n host: jero-boot-redis\n lettuce:\n pool:\n max-active: 8 #最大连接数据库连接数,设 0 为没有限制\n max-idle: 8 #最大等待连接中的数量,设 0 为没有限制\n max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。\n min-idle: 0 #最小等待连接中的数量,设 0 为没有限制\n shutdown-timeout: 100ms\n password:\n port: 4780\n #rabbitmq配置\n rabbitmq:\n host: 127.0.0.1\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n #消费者的最小数量\n concurrency: 1\n #消费者的最大数量\n max-concurrency: 1\n #是否支持重试\n retry:\n enabled: true\n#jero专用配置\njero :\n # 本地：local\\Minio：minio\\阿里云：alioss\n uploadType: local\n path :\n #文件上传根目录 设置\n upload: D://opt//upFiles\n #webapp文件路径\n webapp: D://opt//webapp\n shiro:\n excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n #阿里云oss存储配置\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeroos\n staticDomain: ??\n # ElasticSearch 6设置\n elasticsearch:\n cluster-name: jero-ES\n cluster-nodes: 127.0.0.1:9200\n check-enabled: false\n # 表单设计器配置\n desform:\n # 主题颜色（仅支持 16进制颜色代码）\n theme-color: \"#1890ff\"\n # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）\n upload-type: system\n # 在线预览文件服务器地址配置\n file-view-domain: 127.0.0.1:8012\n # minio文件上传\n minio:\n minio_url: http://minio.jero.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n #大屏报表参数设置\n jmreport:\n mode: dev\n #是否需要校验token\n is_verify_token: false\n #必须校验方法\n verify_methods: remove,delete,save,add,update\n #Wps在线文档\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n #xxl-job配置\n xxljob:\n enabled: false\n adminAddresses: http://jero-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jero/job/jobhandler/\n logRetentionDays: 30\n #自定义路由配置 yml nacos database\n route:\n config:\n data-id: jero-gateway-router\n group: DEFAULT_GROUP\n data-type: yml\n #分布式锁配置\n redisson:\n address: jero-boot-redis:4780\n password:\n type: STANDALONE\n enabled: true\n#Mybatis输出sql日志\nlogging:\n level:\n org.jero.modules.system.mapper : info\n#cas单点登录\ncas:\n prefixUrl: http://localhost:8888/cas\n#swagger\nknife4j:\n production: false\n basic:\n enable: false\n username: jero\n password: jero1314\n\n#第三方登录\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jero-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jero-boot/thirdLogin/wechat_enterprise/callback\n agent-id: 1000002\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jero-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h', '80f58d32d99203d9b12db85c469b51b1', '2021-03-03 13:01:11', '2021-03-05 17:11:54', NULL, '172.17.0.1', '', '', '', '', '', 'yaml', ''); -INSERT INTO `config_info` VALUES (2, 'jero.yaml', 'DEFAULT_GROUP', 'server:\r\n tomcat:\r\n max-swallow-size: -1\r\n error:\r\n include-exception: true\r\n include-stacktrace: ALWAYS\r\n include-message: ALWAYS\r\n compression:\r\n enabled: true\r\n min-response-size: 1024\r\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\r\nmanagement:\r\n health:\r\n mail:\r\n enabled: false\r\n endpoints:\r\n web:\r\n exposure:\r\n include: \"*\" #暴露所有节点\r\n health:\r\n sensitive: true #关闭过滤敏感信息\r\n endpoint:\r\n health:\r\n show-details: ALWAYS #显示详细信息\r\nspring:\r\n servlet:\r\n multipart:\r\n max-file-size: 10MB\r\n max-request-size: 10MB\r\n mail:\r\n host: smtp.163.com\r\n username: jeroos@163.com\r\n password: ??\r\n properties:\r\n mail:\r\n smtp:\r\n auth: true\r\n starttls:\r\n enable: true\r\n required: true\r\n ## quartz定时任务,采用数据库方式\r\n quartz:\r\n job-store-type: jdbc\r\n initialize-schema: embedded\r\n #设置自动启动，默认为 true\r\n auto-startup: true\r\n #启动时更新己存在的Job\r\n overwrite-existing-jobs: true\r\n properties:\r\n org:\r\n quartz:\r\n scheduler:\r\n instanceName: MyScheduler\r\n instanceId: AUTO\r\n jobStore:\r\n class: org.quartz.impl.jdbcjobstore.JobStoreTX\r\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\r\n tablePrefix: QRTZ_\r\n isClustered: true\r\n misfireThreshold: 60000\r\n clusterCheckinInterval: 10000\r\n threadPool:\r\n class: org.quartz.simpl.SimpleThreadPool\r\n threadCount: 10\r\n threadPriority: 5\r\n threadsInheritContextClassLoaderOfInitializingThread: true\r\n #json 时间戳统一转换\r\n jackson:\r\n date-format: yyyy-MM-dd HH:mm:ss\r\n time-zone: GMT+8\r\n aop:\r\n proxy-target-class: true\r\n activiti:\r\n check-process-definitions: false\r\n #启用作业执行器\r\n async-executor-activate: false\r\n #启用异步执行器\r\n job-executor-activate: false\r\n jpa:\r\n open-in-view: false\r\n #配置freemarker\r\n freemarker:\r\n # 设置模板后缀名\r\n suffix: .ftl\r\n # 设置文档类型\r\n content-type: text/html\r\n # 设置页面编码格式\r\n charset: UTF-8\r\n # 设置页面缓存\r\n cache: false\r\n prefer-file-system-access: false\r\n # 设置ftl文件路径\r\n template-loader-path:\r\n - classpath:/templates\r\n # 设置静态文件路径，js,css等\r\n mvc:\r\n static-path-pattern: /**\r\n resource:\r\n static-locations: classpath:/static/,classpath:/public/\r\n autoconfigure:\r\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\r\n#mybatis plus 设置\r\nmybatis-plus:\r\n mapper-locations: classpath*:com.jero.modules.**/xml/*Mapper.xml\r\n global-config:\r\n # 关闭MP3.0自带的banner\r\n banner: false\r\n db-config:\r\n #主键类型 0:\"数据库ID自增\",1:\"该类型为未设置主键类型\", 2:\"用户输入ID\",3:\"全局唯一ID (数字类型唯一ID)\", 4:\"全局唯一ID UUID\",5:\"字符串全局唯一ID (idWorker 的字符串表示)\";\r\n id-type: ASSIGN_ID\r\n # 默认数据库表下划线命名\r\n table-underline: true\r\n configuration:\r\n # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用\r\n #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\r\n # 返回类型为Map,显示null对应的字段\r\n call-setters-on-nulls: true', 'd695ddf9b45ff9f8e009803c93650263', '2021-03-03 13:01:42', '2021-03-03 13:01:42', NULL, '172.17.0.1', '', '', NULL, NULL, NULL, 'yaml', NULL); -INSERT INTO `config_info` VALUES (3, 'jero-gateway-router.json', 'DEFAULT_GROUP', '[{\r\n \"id\": \"jero-system\",\r\n \"order\": 0,\r\n \"predicates\": [{\r\n \"name\": \"Path\",\r\n \"args\": {\r\n \"_genkey_0\": \"/sys/**\",\r\n \"_genkey_1\": \"/eoa/**\",\r\n \"_genkey_2\": \"/joa/**\",\r\n \"_genkey_3\": \"/jmreport/**\",\r\n \"_genkey_4\": \"/bigscreen/**\",\r\n \"_genkey_5\": \"/desform/**\",\r\n \"_genkey_6\": \"/online/**\",\r\n \"_genkey_8\": \"/act/**\",\r\n \"_genkey_9\": \"/plug-in/**\",\r\n \"_genkey_10\": \"/generic/**\",\r\n \"_genkey_11\": \"/v1/**\"\r\n }\r\n }],\r\n \"filters\": [],\r\n \"uri\": \"lb://jero-system\"\r\n}, {\r\n \"id\": \"jero-demo\",\r\n \"order\": 1,\r\n \"predicates\": [{\r\n \"name\": \"Path\",\r\n \"args\": {\r\n \"_genkey_0\": \"/mock/**\",\r\n \"_genkey_1\": \"/test/**\",\r\n \"_genkey_2\": \"/bigscreen/template1/**\",\r\n \"_genkey_3\": \"/bigscreen/template2/**\"\r\n }\r\n }],\r\n \"filters\": [],\r\n \"uri\": \"lb://jero-demo\"\r\n}, {\r\n \"id\": \"jero-system-websocket\",\r\n \"order\": 2,\r\n \"predicates\": [{\r\n \"name\": \"Path\",\r\n \"args\": {\r\n \"_genkey_0\": \"/websocket/**\",\r\n \"_genkey_1\": \"/eoaSocket/**\",\r\n \"_genkey_2\": \"/newsWebsocket/**\"\r\n }\r\n }],\r\n \"filters\": [],\r\n \"uri\": \"lb:ws://jero-system\"\r\n}, {\r\n \"id\": \"jero-demo-websocket\",\r\n \"order\": 3,\r\n \"predicates\": [{\r\n \"name\": \"Path\",\r\n \"args\": {\r\n \"_genkey_0\": \"/vxeSocket/**\"\r\n }\r\n }],\r\n \"filters\": [],\r\n \"uri\": \"lb:ws://jero-demo\"\r\n}]', '82f4033ef6a51ce2ab6ce505be1b729a', '2021-03-03 13:02:14', '2021-03-03 13:02:14', NULL, '172.17.0.1', '', '', NULL, NULL, NULL, 'json', NULL); +INSERT INTO `config_info` VALUES (1, 'jeecg-dev.yaml', 'DEFAULT_GROUP', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)\n # 连接池的配置信息\n # 初始化大小，最小，最大\n initial-size: 5\n min-idle: 5\n maxActive: 20\n # 配置获取连接等待超时的时间\n maxWait: 60000\n # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒\n timeBetweenEvictionRunsMillis: 60000\n # 配置一个连接在池中最小生存的时间，单位是毫秒\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n # 打开PSCache，并且指定每个连接上PSCache的大小\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，\'wall\'用于防火墙\n filters: stat,wall,slf4j\n # 通过connectProperties属性来打开mergeSql功能；慢SQL记录\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n # 多数据源配置\n #multi-datasource1:\n #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n #username: root\n #password: root\n #driver-class-name: com.mysql.cj.jdbc.Driver\n #redis 配置\n redis:\n database: 0\n host: jeecg-boot-redis\n lettuce:\n pool:\n max-active: 8 #最大连接数据库连接数,设 0 为没有限制\n max-idle: 8 #最大等待连接中的数量,设 0 为没有限制\n max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。\n min-idle: 0 #最小等待连接中的数量,设 0 为没有限制\n shutdown-timeout: 100ms\n password:\n port: 6379\n #rabbitmq配置\n rabbitmq:\n host: 127.0.0.1\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n #消费者的最小数量\n concurrency: 1\n #消费者的最大数量\n max-concurrency: 1\n #是否支持重试\n retry:\n enabled: true\n#jeecg专用配置\nminidao :\n base-package: org.jeecg.modules.jmreport.*\njeecg :\n # 签名密钥串(前后端要一致，正式发布请自行修改)\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n # 本地：local\\Minio：minio\\阿里云：alioss\n uploadType: local\n path :\n #文件上传根目录 设置\n upload: /opt/upFiles\n #webapp文件路径\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n #阿里云oss存储配置\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n # ElasticSearch 6设置\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: 127.0.0.1:9200\n check-enabled: false\n # 表单设计器配置\n desform:\n # 主题颜色（仅支持 16进制颜色代码）\n theme-color: \"#1890ff\"\n # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）\n upload-type: system\n map:\n # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home\n baidu: ??\n # 在线预览文件服务器地址配置\n file-view-domain: 127.0.0.1:8012\n # minio文件上传\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n #大屏报表参数设置\n jmreport:\n mode: dev\n #是否需要校验token\n is_verify_token: false\n #必须校验方法\n verify_methods: remove,delete,save,add,update\n #Wps在线文档\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n #xxl-job配置\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n #自定义路由配置 yml nacos database\n route:\n config:\n data-id: jeecg-gateway-router\n group: DEFAULT_GROUP\n data-type: database\n #分布式锁配置\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\n#Mybatis输出sql日志\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\n#cas单点登录\ncas:\n prefixUrl: http://localhost:8888/cas\n#swagger\nknife4j:\n #开启生产环境屏蔽\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\n\n#第三方登录\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: 1000002\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\n#第三方APP对接\nthird-app:\n enabled: false\n type:\n #企业微信\n WECHAT_ENTERPRISE:\n enabled: false\n #CORP_ID\n client-id: ??\n #SECRET\n client-secret: ??\n agent-id: ??\n #自建应用秘钥（新版企微需要配置）\n # agent-app-secret: ??\n #钉钉\n DINGTALK:\n enabled: false\n # appKey\n client-id: ??\n # appSecret\n client-secret: ??\n agent-id: ??', '8b05ed4ee8ecbc4e7a4d425190b60273', '2021-03-03 13:01:11', '2021-08-13 08:10:45', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', ''); +INSERT INTO `config_info` VALUES (2, 'jeecg.yaml', 'DEFAULT_GROUP', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\" #暴露所有节点\n health:\n sensitive: true #关闭过滤敏感信息\n endpoint:\n health:\n show-details: ALWAYS #显示详细信息\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n ## quartz定时任务,采用数据库方式\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n #设置自动启动，默认为 true\n auto-startup: false\n #启动时更新己存在的Job\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.quartz.impl.jdbcjobstore.JobStoreTX\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 60000\n clusterCheckinInterval: 10000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n #json 时间戳统一转换\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n #启用作业执行器\n async-executor-activate: false\n #启用异步执行器\n job-executor-activate: false\n jpa:\n open-in-view: false\n #配置freemarker\n freemarker:\n # 设置模板后缀名\n suffix: .ftl\n # 设置文档类型\n content-type: text/html\n # 设置页面编码格式\n charset: UTF-8\n # 设置页面缓存\n cache: false\n prefer-file-system-access: false\n # 设置ftl文件路径\n template-loader-path:\n - classpath:/templates\n # 设置静态文件路径，js,css等\n mvc:\n static-path-pattern: /**\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n#mybatis plus 设置\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n # 关闭MP3.0自带的banner\n banner: false\n db-config:\n #主键类型 0:\"数据库ID自增\",1:\"该类型为未设置主键类型\", 2:\"用户输入ID\",3:\"全局唯一ID (数字类型唯一ID)\", 4:\"全局唯一ID UUID\",5:\"字符串全局唯一ID (idWorker 的字符串表示)\";\n id-type: ASSIGN_ID\n # 默认数据库表下划线命名\n table-underline: true\n configuration:\n # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用\n #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\n # 返回类型为Map,显示null对应的字段\n call-setters-on-nulls: true', '411f9c73fc519225add2f7c992279f6f', '2021-03-03 13:01:42', '2021-06-28 07:13:40', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', ''); +INSERT INTO `config_info` VALUES (3, 'jeecg-gateway-router.json', 'DEFAULT_GROUP', '[{\r\n \"id\": \"jeecg-system\",\r\n \"order\": 0,\r\n \"predicates\": [{\r\n \"name\": \"Path\",\r\n \"args\": {\r\n \"_genkey_0\": \"/sys/**\",\r\n \"_genkey_1\": \"/eoa/**\",\r\n \"_genkey_2\": \"/joa/**\",\r\n \"_genkey_3\": \"/jmreport/**\",\r\n \"_genkey_4\": \"/bigscreen/**\",\r\n \"_genkey_5\": \"/desform/**\",\r\n \"_genkey_6\": \"/online/**\",\r\n \"_genkey_8\": \"/act/**\",\r\n \"_genkey_9\": \"/plug-in/**\",\r\n \"_genkey_10\": \"/generic/**\",\r\n \"_genkey_11\": \"/v1/**\"\r\n }\r\n }],\r\n \"filters\": [],\r\n \"uri\": \"lb://jeecg-system\"\r\n}, {\r\n \"id\": \"jeecg-demo\",\r\n \"order\": 1,\r\n \"predicates\": [{\r\n \"name\": \"Path\",\r\n \"args\": {\r\n \"_genkey_0\": \"/mock/**\",\r\n \"_genkey_1\": \"/test/**\",\r\n \"_genkey_2\": \"/bigscreen/template1/**\",\r\n \"_genkey_3\": \"/bigscreen/template2/**\"\r\n }\r\n }],\r\n \"filters\": [],\r\n \"uri\": \"lb://jeecg-demo\"\r\n}, {\r\n \"id\": \"jeecg-system-websocket\",\r\n \"order\": 2,\r\n \"predicates\": [{\r\n \"name\": \"Path\",\r\n \"args\": {\r\n \"_genkey_0\": \"/websocket/**\",\r\n \"_genkey_1\": \"/eoaSocket/**\",\r\n \"_genkey_2\": \"/newsWebsocket/**\"\r\n }\r\n }],\r\n \"filters\": [],\r\n \"uri\": \"lb:ws://jeecg-system\"\r\n}, {\r\n \"id\": \"jeecg-demo-websocket\",\r\n \"order\": 3,\r\n \"predicates\": [{\r\n \"name\": \"Path\",\r\n \"args\": {\r\n \"_genkey_0\": \"/vxeSocket/**\"\r\n }\r\n }],\r\n \"filters\": [],\r\n \"uri\": \"lb:ws://jeecg-demo\"\r\n}]', '82f4033ef6a51ce2ab6ce505be1b729a', '2021-03-03 13:02:14', '2021-03-03 13:02:14', NULL, '172.17.0.1', '', '', NULL, NULL, NULL, 'json', NULL); -- ---------------------------- -- Table structure for config_info_aggr diff --git a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java index 078a88a1..8c403839 100644 --- a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java +++ b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java @@ -13,7 +13,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; /** - * @Description 单体应用启动类 + * @Description 单体应用启动类，若为微服务启动，可删掉该模块 * @Author zero * @Date 2021/3/15 **/ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 07ad748f..dfbe6e24 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -14,16 +14,16 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: - endpoints: - web: - exposure: - include: metrics,httptrace + endpoints: + web: + exposure: + include: metrics,httptrace spring: servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB + multipart: + max-file-size: 10MB + max-request-size: 10MB mail: host: smtp.163.com username: test@163.com @@ -135,10 +135,10 @@ spring: 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 + # 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 @@ -158,6 +158,25 @@ spring: 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/**/xml/*Mapper.xml @@ -246,8 +265,8 @@ jero : data-type: yml #分布式锁配置 redisson: - address: 127.0.0.1:4780 - password: + address: 121.36.69.172:4780 + password: 'hzwlsoft.com' type: STANDALONE enabled: true # 文件限制后缀黑名单 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml index f568b45c..dfbe6e24 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -14,16 +14,16 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: - endpoints: - web: - exposure: - include: metrics,httptrace + endpoints: + web: + exposure: + include: metrics,httptrace spring: servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB + multipart: + max-file-size: 10MB + max-request-size: 10MB mail: host: smtp.163.com username: test@163.com @@ -118,7 +118,7 @@ spring: timeBetweenEvictionRunsMillis: 60000 # 配置一个连接在池中最小生存的时间，单位是毫秒 minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -133,8 +133,12 @@ spring: 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: 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 @@ -143,8 +147,8 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 0 - host: 127.0.0.1 + database: 3 + host: 121.36.69.172 lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -152,8 +156,27 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms - password: '' + 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/**/xml/*Mapper.xml @@ -167,7 +190,7 @@ 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 #jero专用配置 @@ -175,26 +198,26 @@ jero : # 签名密钥串(前后端要一致，正式发布请自行修改) signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # 本地：local\Minio：minio\阿里云：alioss - uploadType: alioss + uploadType: local path : #文件上传根目录 设置 - upload: /opt/jero-boot/upload + upload: D://opt//upFiles #webapp文件路径 - webapp: /opt/jero-boot/webapp + webapp: D://opt//webapp shiro: - excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储配置 oss: + endpoint: oss-cn-beijing.aliyuncs.com accessKey: ?? secretKey: ?? - endpoint: oss-cn-beijing.aliyuncs.com - bucketName: jero - staticDomain: https://static.jero.com - # ElasticSearch 设置 + bucketName: jeroos + staticDomain: jerodev + # ElasticSearch 6设置 elasticsearch: cluster-name: jero-ES - cluster-nodes: ?? - check-enabled: true + cluster-nodes: 127.0.0.1:9200 + check-enabled: false # 表单设计器配置 desform: # 主题颜色（仅支持 16进制颜色代码） @@ -202,7 +225,7 @@ jero : # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） upload-type: system # 在线预览文件服务器地址配置 - file-view-domain: http://fileview.jero.com + file-view-domain: 127.0.0.1:8012 # minio文件上传 minio: minio_url: http://minio.jero.com @@ -211,18 +234,18 @@ jero : bucketName: otatest #大屏报表参数设置 jmreport: - mode: prod + mode: dev #数据字典是否可以全局看到 saas: false #是否需要校验token - is_verify_token: true + is_verify_token: false #必须校验方法 verify_methods: remove,delete,save,add,update #Wps在线文档 wps: domain: https://wwo.wps.cn/office/ - appid: true - appsecret: true + appid: ?? + appsecret: ?? #xxl-job配置 xxljob: enabled: false @@ -242,8 +265,8 @@ jero : data-type: yml #分布式锁配置 redisson: - address: 127.0.0.1:4780 - password: + address: 121.36.69.172:4780 + password: 'hzwlsoft.com' type: STANDALONE enabled: true # 文件限制后缀黑名单 @@ -262,9 +285,9 @@ knife4j: #开启增强配置 enable: true #开启生产环境屏蔽 - production: true + production: false basic: - enable: true + enable: false username: jero password: jero.com #第三方登录 @@ -285,10 +308,10 @@ justauth: client-secret: true redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/dingtalk/callback WECHAT_OPEN: - client-id: true - client-secret: true + 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 \ No newline at end of file + timeout: 1h diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml index 781a87eb..dfbe6e24 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml @@ -14,16 +14,16 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: - endpoints: - web: - exposure: - include: metrics,httptrace + endpoints: + web: + exposure: + include: metrics,httptrace spring: servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB + multipart: + max-file-size: 10MB + max-request-size: 10MB mail: host: smtp.163.com username: test@163.com @@ -65,16 +65,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: # 设置模板后缀名 @@ -118,7 +118,7 @@ spring: timeBetweenEvictionRunsMillis: 60000 # 配置一个连接在池中最小生存的时间，单位是毫秒 minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -130,42 +130,65 @@ spring: # 通过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: root - driver-class-name: com.mysql.cj.jdbc.Driver + 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 + #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: 192.168.1.199 - lettuce: - pool: - max-active: 8 #最大连接数据库连接数,设 0 为没有限制 - max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 - max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 - min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 - shutdown-timeout: 100ms - password: '' - port: 4780 + 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/**/xml/*Mapper.xml - global-config: + mapper-locations: classpath*:com/jero/**/xml/*Mapper.xml + global-config: # 关闭MP3.0自带的banner banner: false db-config: - #主键类型 + #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true - configuration: + configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 @@ -182,18 +205,18 @@ jero : #webapp文件路径 webapp: D://opt//webapp shiro: - excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + 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: https://static.jero.com - # ElasticSearch 设置 + staticDomain: jerodev + # ElasticSearch 6设置 elasticsearch: cluster-name: jero-ES - cluster-nodes: ?? + cluster-nodes: 127.0.0.1:9200 check-enabled: false # 表单设计器配置 desform: @@ -202,7 +225,7 @@ jero : # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） upload-type: system # 在线预览文件服务器地址配置 - file-view-domain: http://127.0.0.1:8012 + file-view-domain: 127.0.0.1:8012 # minio文件上传 minio: minio_url: http://minio.jero.com @@ -211,7 +234,7 @@ jero : bucketName: otatest #大屏报表参数设置 jmreport: - mode: prod + mode: dev #数据字典是否可以全局看到 saas: false #是否需要校验token @@ -239,24 +262,24 @@ jero : data-id: jero-gateway-router group: DEFAULT_GROUP #自定义路由配置 yml nacos database - data-type: database + data-type: yml #分布式锁配置 redisson: - address: 127.0.0.1:4780 - password: + 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 -#cas单点登录 -cas: - prefixUrl: http://cas.example.org:8443/cas #swagger knife4j: #开启增强配置 @@ -272,17 +295,17 @@ justauth: enabled: true type: GITHUB: - client-id: ?? - client-secret: ?? + client-id: true + client-secret: true redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/github/callback WECHAT_ENTERPRISE: - client-id: ?? - client-secret: ?? + 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: ?? - client-secret: ?? + client-id: true + client-secret: true redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/dingtalk/callback WECHAT_OPEN: client-id: ?? diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-dev.yaml b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-dev.yaml deleted file mode 100644 index cddfef04..00000000 --- a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-dev.yaml +++ /dev/null @@ -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: ?? diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-gateway-router.json b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-gateway-router.json index a9120ced..22323330 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-gateway-router.json +++ b/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" }] \ No newline at end of file diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml index 17a444bc..adb42faa 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml +++ b/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 \ No newline at end of file + 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 diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/pom.xml b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/pom.xml index 2a6d29be..04ac3f68 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/pom.xml +++ b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/pom.xml @@ -19,11 +19,29 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.nacos + nacos-client + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + com.alibaba.nacos + nacos-client + + + + + + com.alibaba.nacos + nacos-client + 2.0.4 diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/DistributedLockHandler.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/DistributedLockHandler.java index 242d5520..e928aa08 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/DistributedLockHandler.java +++ b/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; //获取超时时间 diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockService.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockService.java similarity index 97% rename from jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockService.java rename to jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockService.java index dbb2eac8..c39a37da 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockService.java +++ b/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; diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTest.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockTest.java similarity index 98% rename from jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTest.java rename to jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockTest.java index 3cc81ef3..a88dcd97 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTest.java +++ b/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; diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTestApplication.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockTestApplication.java similarity index 91% rename from jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTestApplication.java rename to jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/LockTestApplication.java index 6ec982b9..a99222cc 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTestApplication.java +++ b/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; diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/TestUser.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/TestUser.java similarity index 72% rename from jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/TestUser.java rename to jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jero/boot/starter/lock/test/TestUser.java index fb55483e..1404c2d4 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/TestUser.java +++ b/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; diff --git a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/application.yml b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/application.yml index ee406f66..45011588 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/application.yml +++ b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/application.yml @@ -16,23 +16,23 @@ spring: allowedMethods: "*" allowedHeaders: "*" #如果启用nacos或者数据库配置请删除一下配置 -# routes: -# - id: jero-demo -# uri: lb://jero-demo -# predicates: -# - Path=/mock/**,/test/**,/bigscreen/template1/**,/bigscreen/template2/** -# - id: jero-system -# uri: lb://jero-system -# predicates: -# - Path=/sys/**,/eoa/**,/v1/**,/joa/**,/online/**,/bigscreen/**,/jmreport/**,/desform/**,/act/**,/plug-in/**,/generic/** -# - id: jero-system-websocket -# uri: lb:ws://jero-system -# predicates: -# - Path=/websocket/**,/eoaSocket/**,/newsWebsocket/** -# - id: jero-demo-websocket -# uri: lb:ws://jero-demo -# predicates: -# - Path=/vxeSocket/** + routes: + - id: jero-demo + uri: lb://jero-demo + predicates: + - Path=/mock/**,/test/**,/bigscreen/template1/**,/bigscreen/template2/** + - id: jero-system + uri: lb://jero-system + predicates: + - Path=/sys/**,/eoa/**,/v1/**,/joa/**,/online/**,/bigscreen/**,/jmreport/**,/desform/**,/act/**,/plug-in/**,/generic/** + - id: jero-system-websocket + uri: lb:ws://jero-system + predicates: + - Path=/websocket/**,/eoaSocket/**,/newsWebsocket/** + - id: jero-demo-websocket + uri: lb:ws://jero-demo + predicates: + - Path=/vxeSocket/** # 全局熔断降级配置 default-filters: - name: Hystrix @@ -58,4 +58,4 @@ hystrix: isolation: strategy: SEMAPHORE thread: - timeoutInMilliseconds: 3000 \ No newline at end of file + timeoutInMilliseconds: 10000 \ No newline at end of file diff --git a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/bootstrap.yml b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..1255c25a --- /dev/null +++ b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/bootstrap.yml @@ -0,0 +1,44 @@ +# 以下@符号包裹的配置，均在父POM中进行定义. +# 在微服务环境下，该配置文件会先于application.yml加载 +# 对应到nacos配置的data-id是 application.name(应用名称) + profiles.active(开发环境是dev) +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@ + # 配置nacos中的配置文件名称 + prefix: jero-gateway + # 配置文件后缀 + file-extension: yaml + # 支持多个共享 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: + # 签名密钥串(前后端要一致) + signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a + # 文件限制后缀黑名单 + fileSuffixLimits: 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin + # 跨站白名单 + whiteUrls: diff --git a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/lock/DemoLockTest.java b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/lock/DemoLockTest.java index 2fe1498e..a1b70901 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/lock/DemoLockTest.java +++ b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/lock/DemoLockTest.java @@ -26,8 +26,9 @@ public class DemoLockTest { /** * 测试分布式锁【注解方式】 + * 注释掉测试环境 */ - @Scheduled(cron = "0/5 * * * * ?") +// @Scheduled(cron = "0/5 * * * * ?") @JLock(lockKey = CloudConstant.REDISSON_DEMO_LOCK_KEY1) public void execute() throws InterruptedException { log.info("执行execute任务开始，休眠三秒"); diff --git a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/application-dev.yml b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/application-dev.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/application.yml b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/application.yml index 4deaef31..afc3cbe2 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/application.yml +++ b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/application.yml @@ -3,4 +3,4 @@ server: port: 7001 spring: application: - name: jero-system \ No newline at end of file + name: jero-system diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/resources/bootstrap.yml b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/bootstrap.yml similarity index 69% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/resources/bootstrap.yml rename to jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/bootstrap.yml index f43a3974..5ff42654 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/resources/bootstrap.yml +++ b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/bootstrap.yml @@ -1,3 +1,6 @@ +# 以下@符号包裹的配置，均在父POM中进行定义. +# 在微服务环境下，该配置文件会先于application.yml加载 +# 对应到nacos配置的data-id是 application.name(应用名称) + profiles.active(开发环境是dev) spring: profiles: # 当前激活环境 @@ -18,9 +21,10 @@ spring: server-addr: @config.server-addr@ # 配置对应的分组 group: @config.group@ + # 配置nacos中的配置文件名称 + prefix: jero-system # 配置文件后缀 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 @@ -31,3 +35,10 @@ spring: server-addr: @config.server-addr@ watch: enabled: false +jero: + # 签名密钥串(前后端要一致) + signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a + # 文件限制后缀黑名单 + fileSuffixLimits: 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin + # 跨站白名单 + whiteUrls: diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml index 252cd16b..32487048 100644 --- a/jero-boot/pom.xml +++ b/jero-boot/pom.xml @@ -364,8 +364,6 @@ dev - - jero 127.0.0.1:8848 @@ -382,8 +380,6 @@ test - - jero 127.0.0.1:8848 @@ -400,8 +396,6 @@ prod - - jero 127.0.0.1:8848