Commit 3238e7c0073eaad0a2231a349377fff32cde8654

Authored by zhangdaiscott
1 parent f73bdb7f

微服务报错 Could not resolve placeholder 'jeecg.signatureSecret' in value "${jeecg.signatureSecret}"

Showing 1 changed file with 18 additions and 23 deletions
jeecg-boot/db/tables_nacos.sql
... ... @@ -14,7 +14,7 @@ use `nacos`;
14 14 Target Server Version : 50727
15 15 File Encoding : 65001
16 16  
17   - Date: 01/06/2021 15:44:04
  17 + Date: 20/12/2021 11:16:39
18 18 */
19 19  
20 20 SET NAMES utf8mb4;
... ... @@ -30,8 +30,8 @@ CREATE TABLE `config_info` (
30 30 `group_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
31 31 `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'content',
32 32 `md5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'md5',
33   - `gmt_create` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
34   - `gmt_modified` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
  33 + `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
  34 + `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
35 35 `src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user',
36 36 `src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip',
37 37 `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
... ... @@ -43,13 +43,13 @@ CREATE TABLE `config_info` (
43 43 `c_schema` text CHARACTER SET utf8 COLLATE utf8_bin NULL,
44 44 PRIMARY KEY (`id`) USING BTREE,
45 45 UNIQUE INDEX `uk_configinfo_datagrouptenant`(`data_id`, `group_id`, `tenant_id`) USING BTREE
46   -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info' ROW_FORMAT = Dynamic;
  46 +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info' ROW_FORMAT = Dynamic;
47 47  
48 48 -- ----------------------------
49 49 -- Records of config_info
50 50 -- ----------------------------
51   -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.*\n #DB类型(mysql | postgresql | oracle | sqlserver| other)\n db-type: mysql\njeecg :\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/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: true\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 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: ??', '9140ac47638475ac08b332fffa0ca3ee', '2021-03-03 13:01:11', '2021-06-01 07:43:23', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '');
52   -INSERT INTO `config_info` VALUES (2, 'jeecg.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: jeecgos@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*:org/jeecg/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);
  51 +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-17 10:14:56', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '');
  52 +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', '');
53 53 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);
54 54  
55 55 -- ----------------------------
... ... @@ -62,7 +62,7 @@ CREATE TABLE `config_info_aggr` (
62 62 `group_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'group_id',
63 63 `datum_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'datum_id',
64 64 `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '内容',
65   - `gmt_modified` datetime(0) NOT NULL COMMENT '修改时间',
  65 + `gmt_modified` datetime NOT NULL COMMENT '修改时间',
66 66 `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
67 67 `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段',
68 68 PRIMARY KEY (`id`) USING BTREE,
... ... @@ -81,8 +81,8 @@ CREATE TABLE `config_info_beta` (
81 81 `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'content',
82 82 `beta_ips` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'betaIps',
83 83 `md5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'md5',
84   - `gmt_create` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
85   - `gmt_modified` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
  84 + `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
  85 + `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
86 86 `src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user',
87 87 `src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip',
88 88 `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段',
... ... @@ -103,8 +103,8 @@ CREATE TABLE `config_info_tag` (
103 103 `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'app_name',
104 104 `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'content',
105 105 `md5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'md5',
106   - `gmt_create` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
107   - `gmt_modified` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
  106 + `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
  107 + `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
108 108 `src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user',
109 109 `src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip',
110 110 PRIMARY KEY (`id`) USING BTREE,
... ... @@ -141,8 +141,8 @@ CREATE TABLE `group_capacity` (
141 141 `max_aggr_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '聚合子配置最大个数,,0表示使用默认值',
142 142 `max_aggr_size` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '单个聚合数据的子配置大小上限,单位为字节,0表示使用默认值',
143 143 `max_history_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '最大变更历史数量',
144   - `gmt_create` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
145   - `gmt_modified` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
  144 + `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
  145 + `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
146 146 PRIMARY KEY (`id`) USING BTREE,
147 147 UNIQUE INDEX `uk_group_id`(`group_id`) USING BTREE
148 148 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '集群、各Group容量信息表' ROW_FORMAT = Dynamic;
... ... @@ -159,8 +159,8 @@ CREATE TABLE `his_config_info` (
159 159 `app_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'app_name',
160 160 `content` longtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
161 161 `md5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
162   - `gmt_create` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00',
163   - `gmt_modified` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00',
  162 + `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00',
  163 + `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00',
164 164 `src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL,
165 165 `src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
166 166 `op_type` char(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
... ... @@ -169,12 +169,7 @@ CREATE TABLE `his_config_info` (
169 169 INDEX `idx_gmt_create`(`gmt_create`) USING BTREE,
170 170 INDEX `idx_gmt_modified`(`gmt_modified`) USING BTREE,
171 171 INDEX `idx_did`(`data_id`) USING BTREE
172   -) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '多租户改造' ROW_FORMAT = Dynamic;
173   -
174   --- ----------------------------
175   --- Records of his_config_info
176   --- ----------------------------
177   -INSERT INTO `his_config_info` VALUES (1, 13, '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.*\n db-type: mysql\njeecg :\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/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: jeecgos\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 # 在线预览文件服务器地址配置\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: true\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 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', '1b5d012493d038197e1dc1291efb1610', '2010-05-05 00:00:00', '2021-06-01 07:43:23', NULL, '0:0:0:0:0:0:0:1', 'U', '');
  172 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '多租户改造' ROW_FORMAT = Dynamic;
178 173  
179 174 -- ----------------------------
180 175 -- Table structure for permissions
... ... @@ -215,8 +210,8 @@ CREATE TABLE `tenant_capacity` (
215 210 `max_aggr_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '聚合子配置最大个数',
216 211 `max_aggr_size` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '单个聚合数据的子配置大小上限,单位为字节,0表示使用默认值',
217 212 `max_history_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '最大变更历史数量',
218   - `gmt_create` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
219   - `gmt_modified` datetime(0) NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
  213 + `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间',
  214 + `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
220 215 PRIMARY KEY (`id`) USING BTREE,
221 216 UNIQUE INDEX `uk_tenant_id`(`tenant_id`) USING BTREE
222 217 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '租户容量信息表' ROW_FORMAT = Dynamic;
... ...