diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/application-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/application-dev.yml deleted file mode 100644 index e959cb021..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/application-dev.yml +++ /dev/null @@ -1,108 +0,0 @@ -# 加解密根密码 -jasypt: - encryptor: - password: pigx #根密码 -# redis 相关 -spring: - redis: - password: - host: ${REDIS-HOST:pigx-redis} - # zipkin - zipkin: - enabled: true - base-url: http://${ZIPKIN-HOST:pigx-zipkin} - sleuth: - web: - client: - enabled: true - sampler: - # 默认的采样比率为0.1，不能看到所有请求数据 - # 更改采样比率为1，就能看到所有的请求数据了，但是这样会增加接口调用延迟 - probability: 1.0 - -# 暴露监控端点 -management: - endpoints: - web: - exposure: - include: '*' - -# feign 配置 -feign: - hystrix: - enabled: true - okhttp: - enabled: true - httpclient: - enabled: false - client: - config: - default: - connectTimeout: 10000 - readTimeout: 10000 - compression: - request: - enabled: true - response: - enabled: true -# hystrix If you need to use ThreadLocal bound variables in your RequestInterceptor`s -# you will need to either set the thread isolation strategy for Hystrix to `SEMAPHORE or disable Hystrix in Feign. -hystrix: - command: - default: - execution: - isolation: - strategy: SEMAPHORE - thread: - timeoutInMilliseconds: 60000 - shareSecurityContext: true - -#请求处理的超时时间 -ribbon: - ReadTimeout: 10000 - ConnectTimeout: 10000 - -# mybaits-plus配置 -mybatis-plus: - # MyBatis Mapper所对应的XML文件位置 - mapper-locations: classpath:/mapper/*Mapper.xml - global-config: - # 关闭MP3.0自带的banner - banner: false - db-config: - # 主键类型 - id-type: auto - -#swagger公共信息 -swagger: - host: ${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999} - title: PigX Swagger API - description: 全宇宙最牛逼的Spring Cloud微服务开发脚手架 - version: '@project.version@' - license: Powered By PigX - licenseUrl: https://pig4cloud.com/ - terms-of-service-url: https://pig4cloud.com/ - contact: - name: 冷冷 - email: wangiegie@gmail.com - url: https://pig4cloud.com/about.html - authorization: - name: pigX OAuth - auth-regex: ^.*$ - authorization-scope-list: - - scope: server - description: server all - token-url-list: - - http://${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999}/auth/oauth/token - -## spring security 配置 -security: - oauth2: - client: - # 默认放行url,如果子模块重写这里的配置就会被覆盖 - ignore-urls: - - /actuator/** - - /v2/api-docs - resource: - loadBalanced: true - token-info-uri: http://${AUTH-HOST:pigx-auth}/oauth/check_token \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-activiti-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-activiti-dev.yml deleted file mode 100644 index 55a336ca5..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-activiti-dev.yml +++ /dev/null @@ -1,31 +0,0 @@ -## spring security 配置 -security: - oauth2: - client: - client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==) - client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==) - scope: server - ignore-urls: - - '/actuator/**' - - '/v2/api-docs' - - '/editor-app/**' - - '/modeler.html' - - '/ws/**' -spring: - autoconfigure: - exclude: org.activiti.spring.boot.SecurityAutoConfiguration - activiti: - check-process-definitions: false - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-USER:root} - password: ${MYSQL-PWD:root} - url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_ac}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true - -# 租户表维护 -pigx: - tenant: - column: tenant_id - tables: - - oa_leave_bill \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-auth-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-auth-dev.yml deleted file mode 100644 index e8e501808..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-auth-dev.yml +++ /dev/null @@ -1,22 +0,0 @@ -# 数据源 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-USER:root} - password: ${MYSQL-PWD:root} - 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 - freemarker: - allow-request-override: false - allow-session-override: false - cache: true - charset: UTF-8 - check-template-location: true - content-type: text/html - enabled: true - expose-request-attributes: false - expose-session-attributes: false - expose-spring-macro-helpers: true - prefer-file-system-access: true - suffix: .ftl - template-loader-path: classpath:/templates/ \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-codegen-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-codegen-dev.yml deleted file mode 100644 index 3d08ff4a3..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-codegen-dev.yml +++ /dev/null @@ -1,23 +0,0 @@ -## spring security 配置 -security: - oauth2: - client: - client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==) - client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==) - scope: server -# 数据源配置 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-USER:root} - password: ${MYSQL-PWD:root} - 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 - resources: - static-locations: classpath:/static/,classpath:/views/ - -pigx: - tenant: - column: tenant_id - tables: - - sys_datasource_conf \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-daemon-elastic-job-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-daemon-elastic-job-dev.yml deleted file mode 100644 index 063ffcc9e..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-daemon-elastic-job-dev.yml +++ /dev/null @@ -1,52 +0,0 @@ -## spring security 配置 -security: - oauth2: - client: - client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==) - client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==) - scope: server -## 定时任务 -spring: - # 保存定时任务的数据源 - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-USER:root} - password: ${MYSQL-PWD:root} - 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 - elasticjob: - # 分布式任务协调依赖zookeeper - zookeeper: - server-lists: ${ZOOKEEPER-HOST:pigx-zookeeper}:${ZOOKEEPER-PORT:2181} - namespace: pigx-daemon - # 普通任务 - simples: - spring-simple-job: - job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob - cron: 0 0 0/1 * * ? - sharding-total-count: 3 - sharding-item-parameters: 0=service1,1=service2,2=service3 - eventTraceRdbDataSource: 'dataSource' - listener: - listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener - spring-simple-job2: - job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob2 - cron: 0 0 0/1 * * ? - sharding-total-count: 3 - sharding-item-parameters: 0=service1,1=service2,2=service3 - eventTraceRdbDataSource: 'dataSource' - listener: - listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener - # 简单任务 - dataflows: - spring-dataflow-job: - job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxDataflowJob - cron: 0 0 0/1 * * ? - sharding-total-count: 3 - sharding-item-parameters: 0=service1,1=service2,2=service3 - streaming-process: true - eventTraceRdbDataSource: 'dataSource' - listener: - distributed-listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxDistributeElasticJobListener - started-timeout-milliseconds: 5000 - completed-timeout-milliseconds: 10000 \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-daemon-quartz-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-daemon-quartz-dev.yml deleted file mode 100644 index 27d7b05d2..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-daemon-quartz-dev.yml +++ /dev/null @@ -1,44 +0,0 @@ -## spring security 配置 -security: - oauth2: - client: - client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==) - client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==) - scope: server - -# 数据源配置 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-USER:root} - password: ${MYSQL-PWD:root} - 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 - resources: - static-locations: classpath:/static/,classpath:/views/ - quartz: - #相关属性配置 - properties: - org: - quartz: - scheduler: - instanceName: clusteredScheduler - instanceId: AUTO - jobStore: - class: org.quartz.impl.jdbcjobstore.JobStoreTX - driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate - tablePrefix: QRTZ_ - isClustered: true - clusterCheckinInterval: 10000 - useProperties: false - threadPool: - class: org.quartz.simpl.SimpleThreadPool - threadCount: 50 - threadPriority: 5 - threadsInheritContextClassLoaderOfInitializingThread: true - #数据库方式 - job-store-type: jdbc - #初始化表结构 - #jdbc: - #initialize-schema: never - diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-gateway-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-gateway-dev.yml deleted file mode 100644 index ea7fb846d..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-gateway-dev.yml +++ /dev/null @@ -1,12 +0,0 @@ -security: - encode: - # 前端密码密钥，必须16位 - key: 'pigxpigxpigxpigx' - -# 不校验验证码终端 -ignore: - clients: - - test - swagger-providers: - - ${AUTH-HOST:pigx-auth} - - ${TX-MGR-HOST:pigx-tx-manager} \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-monitor-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-monitor-dev.yml deleted file mode 100644 index a6e76ee14..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-monitor-dev.yml +++ /dev/null @@ -1,13 +0,0 @@ -spring: - # 安全配置 - security: - user: - name: ENC(rZHA4LW5hHmhLAAzJoFNag==) # pigx - password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx - boot: - admin: - ui: - resource-locations: 'classpath:/ui/,classpath:/static/' - template-location: 'classpath:/ui/' - title: 'pigx 服务状态监控' - brand: 'pigx 服务状态监控' \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-mp-manager-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-mp-manager-dev.yml deleted file mode 100644 index 17c6d3409..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-mp-manager-dev.yml +++ /dev/null @@ -1,31 +0,0 @@ -## spring security 配置 -security: - oauth2: - client: - client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==) - client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==) - scope: server - -# 数据源配置 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-USER:root} - password: ${MYSQL-PWD:root} - 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 - hikari: - connection-init-sql: SET NAMES utf8mb4 - resources: - static-locations: classpath:/static/,classpath:/views/ - - -# 租户表维护 -pigx: - tenant: - column: tenant_id - tables: - - wx_menu - - wx_account - - wx_account_fans - - wx_fans_msg_res \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-tx-manager-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-tx-manager-dev.yml deleted file mode 100644 index 31befaf2c..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-tx-manager-dev.yml +++ /dev/null @@ -1,24 +0,0 @@ -# 页面配置 -spring: - mvc: - static-path-pattern: /** - resources: - static-locations: classpath:/static/ - - -# LCN 配置 -tm: - transaction: - netty: - delaytime: 5 # 客户端链接最大通讯时间 （秒） - hearttime: 15 # 客户端心跳时间 （秒） - redis: - savemaxtime: 30 # redis 保存时间 （秒） - socket: - port: 9998 # 通讯端口 - maxconnection: 1000 #最大链接数 - compensate: - auto: false #是否自动补偿 - notifyUrl: http://ip:port/path #补偿结果通知（配消息总线里面） - tryTime: 30 # z再次重试时间间隔 - maxWaitTime: 5000 # 请求超时的最大时间 (毫秒) \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-upms-biz-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-upms-biz-dev.yml deleted file mode 100644 index a5b106445..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-upms-biz-dev.yml +++ /dev/null @@ -1,41 +0,0 @@ -## spring security 配置 -security: - oauth2: - client: - client-id: ENC(ltJPpR50wT0oIY9kfOe1Iw==) - client-secret: ENC(ltJPpR50wT0oIY9kfOe1Iw==) - scope: server - -# 数据源 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-USER:root} - password: ${MYSQL-PWD:root} - 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 - -# 文件系统 (提供测试环境，不要乱传) -minio: - url: https://minio.pig4cloud.com - access-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ) - secret-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ) - -# Logger Config -logging: - level: - com.pig4cloud.pigx.admin.mapper: debug - -# 租户表维护 -pigx: - tenant: - column: tenant_id - tables: - - sys_user - - sys_role - - sys_dept - - sys_log - - sys_social_details - - sys_dict - - sys_dict_item - - sys_log \ No newline at end of file diff --git a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-zipkin-dev.yml b/pigx-config/data/config-data/DEFAULT_GROUP/pigx-zipkin-dev.yml deleted file mode 100644 index 2d3d0ed8b..000000000 --- a/pigx-config/data/config-data/DEFAULT_GROUP/pigx-zipkin-dev.yml +++ /dev/null @@ -1,18 +0,0 @@ -spring: - # 数据源 - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-USER:root} - password: ${MYSQL-PWD:root} - url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_zipkin}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 -management: - metrics: - web: - server: - auto-time-requests: false -zipkin: - storage: - type: mysql -sleuth: - enabled: true \ No newline at end of file diff --git a/pigx-config/data/naming/meta.properties b/pigx-config/data/naming/meta.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java index 9b257f589..cb3c67779 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java @@ -33,8 +33,9 @@ public class PigxNacosApplication { public static void main(String[] args) { System.setProperty(ConfigConstant.TOMCAT_DIR, "logs"); + System.setProperty(ConfigConstant.TOMCAT_ACCESS_LOG, "false"); System.setProperty(ConfigConstant.NACOS_HOME, "pigx-config"); - System.setProperty(ConfigConstant.USER_HOME, "logs"); + System.setProperty(ConfigConstant.NACOS_LOGS_PATH, "logs/nacos"); System.setProperty(ConfigConstant.STANDALONE_MODE, "true"); SpringApplication.run(PigxNacosApplication.class, args); } diff --git a/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstant.java b/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstant.java index 0b8977412..75bc13cf2 100644 --- a/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstant.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstant.java @@ -15,6 +15,11 @@ public interface ConfigConstant { */ String USER_HOME = "user.home"; + /** + * nacos 日志路径配置 + */ + String NACOS_LOGS_PATH = "nacos.logs.path"; + /** * nacos 家目录 */ @@ -24,4 +29,9 @@ public interface ConfigConstant { * tomcat 目录 */ String TOMCAT_DIR = "server.tomcat.basedir"; + + /** + * tomcat 日志配置 + */ + String TOMCAT_ACCESS_LOG = "server.tomcat.accesslog.enabled"; }