From d15deac10536caafcac3f2fd9e764abe185035b4 Mon Sep 17 00:00:00 2001 From: MicLng <81649078@qq.com> Date: Fri, 5 Nov 2021 11:46:33 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20cl?= =?UTF-8?q?ose=20#3303=20report-platform=20=E9=85=8D=E7=BD=AE=E4=BA=A4?= =?UTF-8?q?=E7=94=B1=20nacos=20=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2pigxx.sql | 9 ++- db/6pigxx_config.sql | 1 + db/v4.1_v4.2_update.sql | 1 + .../PigxCommenceAuthExceptionEntryPoint.java | 3 +- pigx-visual/pigx-report-platform/pom.xml | 16 ++++-- .../src/main/resources/application.yml | 53 ------------------ .../src/main/resources/bootstrap.yml | 15 +++++ .../src/main/resources/favicon.ico | Bin 269342 -> 0 bytes .../src/main/resources/logback-spring.xml | 4 -- 9 files changed, 34 insertions(+), 68 deletions(-) delete mode 100644 pigx-visual/pigx-report-platform/src/main/resources/application.yml create mode 100644 pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml delete mode 100644 pigx-visual/pigx-report-platform/src/main/resources/favicon.ico diff --git a/db/2pigxx.sql b/db/2pigxx.sql index 19baf2f58..997fac1b7 100644 --- a/db/2pigxx.sql +++ b/db/2pigxx.sql @@ -684,11 +684,10 @@ INSERT INTO `sys_route_conf` VALUES (4, 'elastic-job定时任务模块', 'pigx-d INSERT INTO `sys_route_conf` VALUES (5, 'quartz定时任务模块', 'pigx-daemon-quartz', '[{\"args\": {\"_genkey_0\": \"/job/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-quartz', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:02', '0'); INSERT INTO `sys_route_conf` VALUES (6, '分布式事务模块', 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:04', '0'); INSERT INTO `sys_route_conf` VALUES (7, '通用权限模块', 'pigx-upms-biz', '[{\"args\": {\"_genkey_0\": \"/admin/**\"}, \"name\": \"Path\"}]', '[{\"args\": {\"key-resolver\": \"#{@remoteAddrKeyResolver}\", \"redis-rate-limiter.burstCapacity\": \"1000\", \"redis-rate-limiter.replenishRate\": \"1000\"}, \"name\": \"RequestRateLimiter\"}]', 'lb://pigx-upms-biz', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:05', '0'); -INSERT INTO `sys_route_conf` VALUES (8, '工作流长链接支持1', 'pigx-oa-platform-ws-1', '[{\"args\": {\"_genkey_0\": \"/act/ws/info/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-oa-platform', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:07', '0'); -INSERT INTO `sys_route_conf` VALUES (9, '工作流长链接支持2', 'pigx-oa-platform-ws-2', '[{\"args\": {\"_genkey_0\": \"/act/ws/**\"}, \"name\": \"Path\"}]', '[]', 'lb:ws://pigx-oa-platform', 100, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:09', '0'); -INSERT INTO `sys_route_conf` VALUES (10, '微信公众号管理', 'pigx-mp-platform', '[{\"args\": {\"_genkey_0\": \"/mp/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-mp-platform', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:12', '0'); -INSERT INTO `sys_route_conf` VALUES (11, '支付管理', 'pigx-pay-platform', '[{\"args\": {\"_genkey_0\": \"/pay/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-pay-platform', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:13', '0'); -INSERT INTO `sys_route_conf` VALUES (12, '监控管理', 'pigx-monitor', '[{\"args\": {\"_genkey_0\": \"/monitor/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-monitor', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:17', '0'); +INSERT INTO `sys_route_conf` VALUES (8, '工作流长链接支持', 'pigx-oa-platform-ws', '[{\"args\": {\"_genkey_0\": \"/act/ws/**\"}, \"name\": \"Path\"}]', '[]', 'lb:ws://pigx-oa-platform', 100, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:09', '0'); +INSERT INTO `sys_route_conf` VALUES (9, '微信公众号管理', 'pigx-mp-platform', '[{\"args\": {\"_genkey_0\": \"/mp/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-mp-platform', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:12', '0'); +INSERT INTO `sys_route_conf` VALUES (10, '支付管理', 'pigx-pay-platform', '[{\"args\": {\"_genkey_0\": \"/pay/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-pay-platform', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:13', '0'); +INSERT INTO `sys_route_conf` VALUES (11, '监控管理', 'pigx-monitor', '[{\"args\": {\"_genkey_0\": \"/monitor/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-monitor', 0, NULL, '2019-10-16 16:44:41', '2019-11-05 22:37:17', '0'); COMMIT; -- ---------------------------- diff --git a/db/6pigxx_config.sql b/db/6pigxx_config.sql index 592dadd8b..7102d3c61 100644 --- a/db/6pigxx_config.sql +++ b/db/6pigxx_config.sql @@ -46,6 +46,7 @@ INSERT INTO `config_info` VALUES (11, 'pigx-oa-platform-dev.yml', 'DEFAULT_GROUP INSERT INTO `config_info` VALUES (12, 'pigx-mp-platform-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(vW+Nup9LaTfIFwgufUBsYg==)\n client-secret: ENC(vW+Nup9LaTfIFwgufUBsYg==)\n scope: server\n# 数据源\nspring:\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - wx_mp_menu\n - wx_account\n - wx_account_fans\n - wx_msg\n - wx_auto_reply', 'b179debedf55403402031192824a251e', '2019-10-21 08:58:24', '2020-06-09 15:04:07', NULL, '172.17.0.156', '', '', 'null', 'null', 'null', 'yaml', 'null'); INSERT INTO `config_info` VALUES (13, 'pigx-bi-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n # 安全配置\n security:\n user:\n name: ENC(rZHA4LW5hHmhLAAzJoFNag==) # pigx\n password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n \n# ureport 报表相关设置\nureport:\n debug: false\n disableFileProvider: true\n disableHttpSessionReportCache: true\n\n# oss 保存报表设计文件\noss:\n bucket-name: lengleng\n access-key: lengleng\n secret-key: lengleng\n endpoint: http://minio.pig4cloud.com', '77e5829593e85d395aafdd88e662c036', '2020-10-15 18:18:13', '2021-02-03 19:12:08', NULL, '172.16.1.92', '', '', '', '', '', 'yaml', ''); INSERT INTO `config_info` VALUES (14, 'pigx-xxl-job-admin-dev.yml', 'DEFAULT_GROUP', '# xxl\nxxl:\n job:\n i18n: zh_CN\n logretentiondays: 30\n triggerpool:\n fast.max: 200\n slow.max: 200\n\n# mybatis\nmybatis:\n mapper-locations: classpath:/mybatis-mapper/*Mapper.xml\n\n# spring\nspring:\n datasource:\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n mvc:\n static-path-pattern: /static/**\n freemarker:\n suffix: .ftl\n request-context-attribute: request\n settings:\n number_format: 0.##########\n mail:\n host: smtp.mxhichina.com\n port: 465\n from: xxxx@gitee.wang\n username: xxxx@gitee.wang\n password: xxxx\n properties:\n mail:\n smtp:\n auth: true\n ssl.enable: true\n starttls.enable: false\n required: false\n# spring boot admin 配置\n\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \'*\'\n endpoint:\n health:\n show-details: ALWAYS', 'bcee40a6beef8c855c7cfc20a2e1c3ac', '2021-07-21 20:45:02', '2021-07-21 20:45:02', NULL, '127.0.0.1', '', '', NULL, NULL, NULL, 'yaml', NULL); +INSERT INTO `config_info` VALUES (15, 'pigx-report-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n messages:\n basename: i18n/messages\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\nmybatis-plus:\n configuration:\n call-setters-on-nulls: true\n mapperLocations:\n - classpath*:/mapper/**/*.xml\n - classpath*:/modeler-mybatis-mappings/**/*.xml\n\n \n# 本应用自定义参数\ncustomer:\n file:\n #上传对应本地全路径\n dist-path: /Users/lengleng/Downloads/file/\n white-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi\n excelSuffix: .xlsx|.xls|.csv\n downloadPath: http://127.0.0.1:9095/file/download\n', '899cac2c07fa36e0e6cafe7e45a235dc', '2021-11-05 09:13:54', '2021-11-05 11:38:55', 'nacos', '127.0.0.1', '', '', '大屏设计模块配置文件', '', '', 'yaml', ''); COMMIT; -- ---------------------------- diff --git a/db/v4.1_v4.2_update.sql b/db/v4.1_v4.2_update.sql index cc127032d..22a1e54f6 100644 --- a/db/v4.1_v4.2_update.sql +++ b/db/v4.1_v4.2_update.sql @@ -3,6 +3,7 @@ USE pigxx_config; UPDATE `config_info` SET `data_id` = 'pigx-gateway-dev.yml', `group_id` = 'DEFAULT_GROUP', `content` = 'gateway:\n encode-key: \'pigxpigxpigxpigx\'\n\nswagger:\n ignore-providers:\n - pigx-monitor\n - pigx-auth\n - pigx-tx-manager\n\nribbon:\n rule:\n gray-enabled: true\n\n# 验证码相关配置参考： http://t.cn/A647jEdu\naj:\n captcha:\n cache-type: redis\n water-mark: pig4cloud', `md5` = 'cd9f8a6a46e2c128f3b172be76ea3221', `gmt_create` = '2019-04-18 02:13:52', `gmt_modified` = '2021-10-07 15:32:51', `src_user` = 'nacos', `src_ip` = '127.0.0.1', `app_name` = '', `tenant_id` = '', `c_desc` = '', `c_use` = '', `effect` = '', `type` = 'yaml', `c_schema` = '' WHERE `id` = 5; UPDATE `config_info` SET `data_id` = 'pigx-upms-biz-dev.yml', `group_id` = 'DEFAULT_GROUP', `content` = '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n client-secret: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n scope: server\n ignore-urls:\n - /error\n - /druid/**\n - /actuator/**\n - /v2/api-docs\n\n# 数据源\nspring:\n autoconfigure:\n exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n stat-view-servlet:\n enabled: true\n allow: \"\"\n url-pattern: /druid/*\n #login-username: admin\n #login-password: admin\n filter:\n stat:\n enabled: true\n log-slow-sql: true\n slow-sql-millis: 10000\n merge-sql: false\n wall:\n config:\n multi-statement-allow: true\n\n# 文件系统 (minio测试环境，不可当生产使用)\noss:\n endpoint: http://minio.pig4cloud.com\n access-key: lengleng\n secret-key: lengleng\n bucket-name: tmp\n\n# Logger Config\nlogging:\n level:\n com.pig4cloud.pigx.admin.mapper: debug\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - sys_user\n - sys_role\n - sys_menu\n - sys_dept\n - sys_log\n - sys_social_details\n - sys_dict\n - sys_dict_item\n - sys_public_param\n - sys_log\n - sys_file\n - sys_oauth_client_details', `md5` = 'd80383a5e111c923f65d1edeb5ee18aa', `gmt_create` = '2019-04-18 02:32:44', `gmt_modified` = '2021-10-07 13:28:09', `src_user` = '', `src_ip` = '127.0.0.1', `app_name` = '', `tenant_id` = '', `c_desc` = 'admin 服务配置', `c_use` = 'null', `effect` = 'null', `type` = 'yaml', `c_schema` = 'null' WHERE `id` = 7; INSERT INTO `config_info` VALUES (14, 'pigx-xxl-job-admin-dev.yml', 'DEFAULT_GROUP', '# xxl\nxxl:\n job:\n i18n: zh_CN\n logretentiondays: 30\n triggerpool:\n fast.max: 200\n slow.max: 200\n\n# mybatis\nmybatis:\n mapper-locations: classpath:/mybatis-mapper/*Mapper.xml\n\n# spring\nspring:\n datasource:\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n mvc:\n static-path-pattern: /static/**\n freemarker:\n suffix: .ftl\n request-context-attribute: request\n settings:\n number_format: 0.##########\n mail:\n host: smtp.mxhichina.com\n port: 465\n from: xxxx@gitee.wang\n username: xxxx@gitee.wang\n password: xxxx\n properties:\n mail:\n smtp:\n auth: true\n ssl.enable: true\n starttls.enable: false\n required: false\n# spring boot admin 配置\n\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \'*\'\n endpoint:\n health:\n show-details: ALWAYS', 'bcee40a6beef8c855c7cfc20a2e1c3ac', '2021-07-21 20:45:02', '2021-07-21 20:45:02', NULL, '127.0.0.1', '', '', NULL, NULL, NULL, 'yaml', NULL); +INSERT INTO `config_info` VALUES (15, 'pigx-report-platform-dev.yml', 'DEFAULT_GROUP', 'spring:\n messages:\n basename: i18n/messages\n datasource:\n type: com.alibaba.druid.pool.DruidDataSource\n druid:\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL_USER:root}\n password: ${MYSQL_PWD:root}\n url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n\nmybatis-plus:\n configuration:\n call-setters-on-nulls: true\n mapperLocations:\n - classpath*:/mapper/**/*.xml\n - classpath*:/modeler-mybatis-mappings/**/*.xml\n\n \n# 本应用自定义参数\ncustomer:\n file:\n #上传对应本地全路径\n dist-path: /Users/lengleng/Downloads/file/\n white-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi\n excelSuffix: .xlsx|.xls|.csv\n downloadPath: http://127.0.0.1:9095/file/download\n', '899cac2c07fa36e0e6cafe7e45a235dc', '2021-11-05 09:13:54', '2021-11-05 11:38:55', 'nacos', '127.0.0.1', '', '', '大屏设计模块配置文件', '', '', 'yaml', ''); USE pigxx; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxCommenceAuthExceptionEntryPoint.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxCommenceAuthExceptionEntryPoint.java index fffdb9a9d..3e2fb8cb9 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxCommenceAuthExceptionEntryPoint.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxCommenceAuthExceptionEntryPoint.java @@ -64,8 +64,7 @@ public class PigxCommenceAuthExceptionEntryPoint implements AuthenticationEntryP response.setStatus(HttpStatus.UNAUTHORIZED.value()); result.setCode(CommonConstants.FAIL); - if (authException instanceof CredentialsExpiredException - || authException instanceof InsufficientAuthenticationException) { + if (authException instanceof CredentialsExpiredException) { String msg = PigxSecurityMessageSourceUtil.getAccessor().getMessage( "AbstractUserDetailsAuthenticationProvider.credentialsExpired", authException.getMessage()); result.setMsg(msg); diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml index 570d47152..834bfb76a 100644 --- a/pigx-visual/pigx-report-platform/pom.xml +++ b/pigx-visual/pigx-report-platform/pom.xml @@ -39,10 +39,6 @@ mysql mysql-connector-java - - com.alibaba - druid - jakarta.servlet @@ -86,6 +82,18 @@ org.springframework.boot spring-boot-starter-undertow + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba + druid-spring-boot-starter + diff --git a/pigx-visual/pigx-report-platform/src/main/resources/application.yml b/pigx-visual/pigx-report-platform/src/main/resources/application.yml deleted file mode 100644 index 92aae2649..000000000 --- a/pigx-visual/pigx-report-platform/src/main/resources/application.yml +++ /dev/null @@ -1,53 +0,0 @@ -server: - port: 9095 - servlet: - encoding: - charset: UTF-8 - force: true - enabled: true - -spring: - profiles: - active: dev - application: - name: ${project.artifactId} - servlet: - multipart: - max-file-size: 10MB #上传图片大小限制为10MB - jackson: - date-format: yyyy-MM-dd HH:mm:ss - messages: - basename: i18n/messages - datasource: - url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_report}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: ${MYSQL_USER:root} - password: ${MYSQL_PWD:root} - druid: - initial-size: 10 # 初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时 - min-idle: 10 # 最小连接池数量 - maxActive: 200 # 最大连接池数量 - maxWait: 3000 # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，如果需要可以通过配置 - timeBetweenEvictionRunsMillis: 60000 # 关闭空闲连接的检测时间间隔.Destroy线程会检测连接的间隔时间，如果连接空闲时间大于等于minEvictableIdleTimeMillis则关闭物理连接。 - minEvictableIdleTimeMillis: 300000 # 连接的最小生存时间.连接保持空闲而不被驱逐的最小时间 - testWhileIdle: true # 申请连接时检测空闲时间，根据空闲时间再检测连接是否有效.建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRun - poolPreparedStatements: true # 开启PSCache - maxPoolPreparedStatementPerConnectionSize: 20 #设置PSCache值 - connectionErrorRetryAttempts: 3 # 连接出错后再尝试连接三次 - breakAfterAcquireFailure: true # 数据库服务宕机自动重连机制 - timeBetweenConnectErrorMillis: 300000 # 连接出错后重试时间间隔 - -mybatis-plus: - configuration: - call-setters-on-nulls: true - mapperLocations: - - classpath*:/mapper/**/*.xml - - classpath*:/modeler-mybatis-mappings/**/*.xml - -# 本应用自定义参数 -customer: - file: - #上传对应本地全路径 - dist-path: /Users/lengleng/Downloads/file/ - white-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi - excelSuffix: .xlsx|.xls|.csv - downloadPath: http://127.0.0.1:9095/file/download diff --git a/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml new file mode 100644 index 000000000..c5044af08 --- /dev/null +++ b/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml @@ -0,0 +1,15 @@ +server: + port: 9095 + +spring: + application: + name: @artifactId@ + cloud: + nacos: + config: + server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} + file-extension: yml + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + profiles: + active: @profiles.active@ diff --git a/pigx-visual/pigx-report-platform/src/main/resources/favicon.ico b/pigx-visual/pigx-report-platform/src/main/resources/favicon.ico deleted file mode 100644 index 1e06ad49ec821fb935a71c9ad1257eedb5e69343..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269342 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

UdTW8^73*U@3=P@T3pc#{v!t> z=J+<~3k#tqSZDSJ*~oC}-%uHxmb%=KdHXgb1v&z#$)83^cx z0QUwvK<;Gia{7<9#2R$-obdM06C4Bovi`6=O)|W|9Uri19=RL~Mg+ctuH{YS*Sz$s z$)Wb#cd>SMSNL(?47>eRCfBZRbT{uy0Rh{G?3JwoKBac867g1vfRE7*Cyoyt4PMX> za_T7V5fEcqVe|#DJb|(j_+$z6_Y1Mkzlc5kMXFzQFfa!4GCJe=+yF(fnXHMfx<=@l4VE29L8K_h5YwuGnux@DtGc z<5=U*2R!zJowXJBP_)%E-v;^SS(C#i{x&f>nO}1p0{1K^6A!_LKwdz5RokK92mAgg zuKhgH7Hi-kCyWhU27AK8*!vF0eqjOD$aSEfFli{7FOYttX-qXeXYzc?@i;2M!zjzI z0#BO?UHxk~Zi7zbG}uk|={GOZLcF+D;5WOT8+9kYhi?wXmg6&Px^E!h9s-OxpiT?) zFODe;3CIJ2^zj7p%|fre+n*+e4m)y8@LcR8?gc$P1HLdCHn91SpI3l4YzD1GKs%MB zJ^H*y(<%9bERTr4m%PV*$4B;lr5v(K5XV}q>tA6EGa<(h!QX+P^S%@xR0kVu4x7W1_JdVz_`R)k;nARNnzWra5`uPa)5mZ)Imlb>g{1` z*adrs{ZVW3Oz6Zff{yIA&V`}pp=bO6eleqx)76WAS}Bd>!6~oIVhI=Ss*bJrGB80^Ye7?4dh<_G@Kx@FKy3 z`*+Im=U~r6zBXV{nP6^K)BFbk@aMW#ZFjFp-S_wp#Wme8i2uFzd(G{*Cdv8Q+l6S8 z@PfMAlRO{_f4U@kz@VDm@&A?y&R1?bo$v))qR%IIK~ePi1TTm_E$YKCs`tEdV0;f_ zUN1yJ{Q07o=hq)$?CE+Ph#5VvjeCCF>xJkNdqGj$^W*1mQ2hC3vG>QHj_Y8(?!`f< zUiacUSX}Sz@|U1BgP+ZC6GOFhTcY1`s#-HP48GaPhXMZu?ZQ?F9+X zM^VwBZFg<^6g9wYKSq7phNB6G7d1l(hZi-#gu{!Pq2j2wMt!UsV3PB711yTVDe7b0 z00%|=81=Dk2BUt9{^*=fJbY0HfF#4O13;4D*8v~_^44^t76Xc-I~D!87C=eQ*8-?0 z`kv^|wE!9v{af_s+Vjyr#eA*-P%`j107`zohRGxaUo8NWf-n7f8-Pi{Tgyd@W5yKo z#RhPS^EQBsVs44~VxJ!r^HaCO*|y(9J;?oW9h6PWIN>;vPzVS?j+ ziT&Cn_4I>K3?=i8*Y zKkfOV_&3IWZ7nd&fEHxqU876`kCT1=Tl5j z0pOEr0=w{hiU~@0ejx8pL7_aIibC!4$tlbRe+mtP4c-(Q5F5Pd&nE@24gM4WEU4*! z(h2BNb3Q462iBZV3c#AvNdZ_3o}>V(1y52HPTl#U#28i!zN9Rq7CcD-R8ZUhWEj@P zIiCao&gmoos2hF~0MrdH2>|Mbmt=r-!%H&2g1Y`C9^k-j=MxSv>U<&|6*ats1Be=4 zLKKhce!>A3Z0lY^9?&KFe1Z-}pH46XG2KrvfGFtmN%d&3Aolt7XsAo<`FaqJJzcMZ zG0@|+aUF<(9?!=Sc>#ZmZgCxmK2`HMhQ{i>KCT1xULQ9_UFttSdWzzJUvqKMwjLyS le9Q|HJRZ-eyFcOMqd-(p^TK-n*FGS@;A<|eg>lU7{|^!g43q!> diff --git a/pigx-visual/pigx-report-platform/src/main/resources/logback-spring.xml b/pigx-visual/pigx-report-platform/src/main/resources/logback-spring.xml index 964ca8735..368c41323 100644 --- a/pigx-visual/pigx-report-platform/src/main/resources/logback-spring.xml +++ b/pigx-visual/pigx-report-platform/src/main/resources/logback-spring.xml @@ -54,10 +54,6 @@ - - - -