diff --git a/mxdata_v-system/src/main/resources/application-dev.yml b/mxdata_v-system/src/main/resources/application-dev.yml index bd8c032..110d844 100644 --- a/mxdata_v-system/src/main/resources/application-dev.yml +++ b/mxdata_v-system/src/main/resources/application-dev.yml @@ -25,7 +25,7 @@ mxDataV: # 文件路径 示例（ Windows配置D:/mx/uploadPath，Linux配置 /home/mx/uploadPath） #profile: D:\bigScreen\gansu\mx # profile: /Users/mingyanglee/Desktop/Lee/mxData-java/G-GanSu2/uploadPath - profile: /Users/sunkexin/uploadPath + profile: /home/mxdatav_gs/uploadPath/ # 获取ip地址开关 addressEnabled: true @@ -41,14 +41,12 @@ spring: # url: jdbc:mysql://47.97.193.17:3306/mx-datav-gansu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 # username: root # password: PQkqqog5hz+fYrheMkxJNgc3L3t/Q7DdRp2o5O4OLhYq26mPNedGWUaMwT30Gj444+afyN6/9V1J/xAYsm7B0w== - url: jdbc:mysql://39.96.27.4:3306/mx-datav-gansu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root -# password: HzLQvhTlxR6dKyq1MC5a5YJiJ2fuyXGb8dVKkVjNTSSv+9PKELqXUaHQcIij/BC4joI59qtFsyFozSYjzkV3wg== - password: 2SqD+5iNuRR/af7/5i7G1Q== -# url: jdbc:mysql://127.0.0.1:3306/mx-datav-gansu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 +# url: jdbc:mysql://39.96.27.4:3306/mx-datav-gansu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 # username: root -# password: bNVOqb7WKLX5Bjnw+LMv92taj25KOxDimXxILPQjw42wgv+1lHzOH8kr97xDwWdhpY67QuYCS7sWN4W46YbkFA== -# password: DrudQ3JPbVy3qiZ1VML3DSS9m0dmYFfu8jIOJ5xofJeoPGc/wUNpPwrcxjLFi/8tk6EEBoPxu4MzpvBPsAyDkQ== +# password: 2SqD+5iNuRR/af7/5i7G1Q== + url: jdbc:mysql://8.134.61.107:3306/mx-datav-gansu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + username: root + password: 3n1E+zfdcWm+p9mFpLGi/Q== # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -84,7 +82,7 @@ spring: url-pattern: /druid/* # 控制台管理用户名和密码 login-username: admin - login-password: admin + login-password: gs2024!@# filter: stat: enabled: true @@ -105,12 +103,12 @@ spring: #redis redis: # 地址 - host: 127.0.0.1 + host: 8.134.61.107 #host: 39.96.27.4 # 端口，默认为6379 - port: 6379 + port: 16379 # 密码 - password: DHmE1Yr2YfmnOr01pVzzWw== + password: 3n1E+zfdcWm+p9mFpLGi/Q== # 连接超时时间 timeout: 10s database: 0 @@ -131,8 +129,8 @@ env: #甘肃电力交易平台相关配置 sgcc: - uploadPath: D:/upload/ - videoPath: D:/video/ + uploadPath: /home/mxdatav_gs/along/ + videoPath: /home/mxdatav_gs/video/ publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeCzY9bdSYp/Ju6S8MROkQaCeuvj2OYSMCGF6B+jmNKIM2W/n7nAUJyUet7Owsg8y1YZIxryHUoxABJYiZADb7mqNhirVzPL8uBvH9pRX0VP/AstTKVcjdWNXTtGZJozfEJT9xdNt1LSVyBWRL+3eQZVdzGqvUzmi35CGdDiBYGwIDAQAB #信息披露服务地址 informationAddress: http://39.96.27.4:16016/px-settlement-infpubgrid-lz @@ -140,6 +138,6 @@ sgcc: #交易公告上传路径 notice: - filePath: E:/notice/ + filePath: /home/mxdatav_gs/notice/ market: - filePath: E:/notice/market/ \ No newline at end of file + filePath: /home/mxdatav_gs/notice/market/ \ No newline at end of file diff --git a/mxdata_v-system/src/main/resources/application-local.yml b/mxdata_v-system/src/main/resources/application-local.yml new file mode 100644 index 0000000..45311f8 --- /dev/null +++ b/mxdata_v-system/src/main/resources/application-local.yml @@ -0,0 +1,143 @@ +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 16002 + servlet: + # 应用的访问路径 + context-path: / + undertow: + io-threads: 16 + worker-threads: 256 + buffer-size: 1024 + buffers-per-region: 1024 + direct-buffers: true + +# 项目相关配置 +mxDataV: + # 名称 + name: mxDataV + # 版本 + version: 1.0.0 + # 版权年份 + copyrightYear: 2020 + # 实例演示开关 + demoEnabled: true + # 文件路径 示例（ Windows配置D:/mx/uploadPath，Linux配置 /home/mx/uploadPath） + #profile: D:\bigScreen\gansu\mx +# profile: /Users/mingyanglee/Desktop/Lee/mxData-java/G-GanSu2/uploadPath + profile: D:\bigScreen\gansu\mx + # 获取ip地址开关 + addressEnabled: true + +# redis 配置 +spring: + #mysql + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: +# url: jdbc:mysql://47.97.193.17:3306/mx-datav-gansu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 +# username: root +# password: PQkqqog5hz+fYrheMkxJNgc3L3t/Q7DdRp2o5O4OLhYq26mPNedGWUaMwT30Gj444+afyN6/9V1J/xAYsm7B0w== +# url: jdbc:mysql://39.96.27.4:3306/mx-datav-gansu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 +# username: root +# password: 2SqD+5iNuRR/af7/5i7G1Q== + url: jdbc:mysql://8.134.61.107:3306/mx-datav-gansu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + username: root + password: 3n1E+zfdcWm+p9mFpLGi/Q== + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: false + statViewServlet: + enabled: false + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: admin + login-password: gs2024!@# + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true +# filters: config +# connection-properties: config.decrypt=false + logging: + pattern: + console: "%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([%15.15t]){cyan} %clr(%X{__traceId}){magenta} %clr(%-40.40logger{39}){blue} %clr(:) %m%n" + level: + com.alonginfo.project: debug + #redis + redis: + # 地址 + host: 8.134.61.107 + #host: 39.96.27.4 + # 端口，默认为6379 + port: 16379 + # 密码 + password: 3n1E+zfdcWm+p9mFpLGi/Q== + # 连接超时时间 + timeout: 10s + database: 0 + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + +#对接交易平台环境标识 +env: + key: dev + +#甘肃电力交易平台相关配置 +sgcc: + uploadPath: D:/upload/ + videoPath: D:/video/ + publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeCzY9bdSYp/Ju6S8MROkQaCeuvj2OYSMCGF6B+jmNKIM2W/n7nAUJyUet7Owsg8y1YZIxryHUoxABJYiZADb7mqNhirVzPL8uBvH9pRX0VP/AstTKVcjdWNXTtGZJozfEJT9xdNt1LSVyBWRL+3eQZVdzGqvUzmi35CGdDiBYGwIDAQAB + #信息披露服务地址 + informationAddress: http://39.96.27.4:16016/px-settlement-infpubgrid-lz +# informationAddress: http://localhost:16016/px-settlement-infpubgrid-lz + +#交易公告上传路径 +notice: + filePath: E:/notice/ +market: + filePath: E:/notice/market/ \ No newline at end of file diff --git a/mxdata_v-system/src/main/resources/application.yml b/mxdata_v-system/src/main/resources/application.yml index fd84e3e..5c7225b 100644 --- a/mxdata_v-system/src/main/resources/application.yml +++ b/mxdata_v-system/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: dev + active: local # 文件上传 servlet: multipart: