Commit efbd18365828453171bb6a2bd1327aed3fc4edc7
1 parent
0a25c13e
feat: 修改金高配置文件
Showing
2 changed files
with
12 additions
and
37 deletions
Bsth-admin/src/main/resources/application-druid-dev.yml
| @@ -154,12 +154,12 @@ swagger: | @@ -154,12 +154,12 @@ swagger: | ||
| 154 | api: | 154 | api: |
| 155 | url: | 155 | url: |
| 156 | # all 为获取所有驾驶员信息 | 156 | # all 为获取所有驾驶员信息 |
| 157 | - getDriverInfo: http://58.247.254.118:9089/webservice/rest/person/%s | 157 | + getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s |
| 158 | # 获取公司编码下的员工信息 暂时没用 | 158 | # 获取公司编码下的员工信息 暂时没用 |
| 159 | - getCompanyInfo: http://58.247.254.118:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s | 159 | + getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s |
| 160 | # 获取排班信息 | 160 | # 获取排班信息 |
| 161 | - getSchedulingInfo: http://58.247.254.118:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s | ||
| 162 | - getSchedulingInfoNew: http://58.247.254.118:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s | 161 | + getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s |
| 162 | + getSchedulingInfoNew: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s | ||
| 163 | config: | 163 | config: |
| 164 | password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464 | 164 | password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464 |
| 165 | # 随机字符串 | 165 | # 随机字符串 |
Bsth-admin/src/main/resources/application-druid-prd.yml
| @@ -20,7 +20,6 @@ spring: | @@ -20,7 +20,6 @@ spring: | ||
| 20 | enable: true | 20 | enable: true |
| 21 | socketFactory: | 21 | socketFactory: |
| 22 | class: javax.net.ssl.SSLSocketFactory | 22 | class: javax.net.ssl.SSLSocketFactory |
| 23 | - | ||
| 24 | datasource: | 23 | datasource: |
| 25 | type: com.alibaba.druid.pool.DruidDataSource | 24 | type: com.alibaba.druid.pool.DruidDataSource |
| 26 | driverClassName: com.mysql.cj.jdbc.Driver | 25 | driverClassName: com.mysql.cj.jdbc.Driver |
| @@ -28,7 +27,7 @@ spring: | @@ -28,7 +27,7 @@ spring: | ||
| 28 | # 主库数据源 | 27 | # 主库数据源 |
| 29 | master: | 28 | master: |
| 30 | # 测试地址 | 29 | # 测试地址 |
| 31 | - url: jdbc:mysql://127.0.0.1:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true | 30 | + url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true |
| 32 | username: root | 31 | username: root |
| 33 | password: jingaogongjiao20230730 | 32 | password: jingaogongjiao20230730 |
| 34 | # 从库数据源 | 33 | # 从库数据源 |
| @@ -69,8 +68,8 @@ spring: | @@ -69,8 +68,8 @@ spring: | ||
| 69 | allow: | 68 | allow: |
| 70 | url-pattern: /druid/* | 69 | url-pattern: /druid/* |
| 71 | # 控制台管理用户名和密码 | 70 | # 控制台管理用户名和密码 |
| 72 | - login-username: qpgj | ||
| 73 | - login-password: 2023#manager@jsgjuse | 71 | + login-username: jggj |
| 72 | + login-password: 20230925@mannager#jggj | ||
| 74 | filter: | 73 | filter: |
| 75 | stat: | 74 | stat: |
| 76 | enabled: true | 75 | enabled: true |
| @@ -92,14 +91,14 @@ spring: | @@ -92,14 +91,14 @@ spring: | ||
| 92 | devtools: | 91 | devtools: |
| 93 | restart: | 92 | restart: |
| 94 | # 热部署开关 | 93 | # 热部署开关 |
| 95 | - enabled: false | 94 | + enabled: true |
| 96 | # redis 配置 | 95 | # redis 配置 |
| 97 | redis: | 96 | redis: |
| 98 | # 地址 | 97 | # 地址 |
| 99 | -# host: 121.41.83.61 | 98 | + # host: 121.41.83.61 |
| 100 | host: 127.0.0.1 | 99 | host: 127.0.0.1 |
| 101 | database: 0 | 100 | database: 0 |
| 102 | -# password: qpgjredis | 101 | + # password: "guzijian" |
| 103 | port: 6379 | 102 | port: 6379 |
| 104 | # 连接超时时间 | 103 | # 连接超时时间 |
| 105 | timeout: 10s | 104 | timeout: 10s |
| @@ -132,30 +131,12 @@ ruoyi: | @@ -132,30 +131,12 @@ ruoyi: | ||
| 132 | copyrightYear: 2023 | 131 | copyrightYear: 2023 |
| 133 | # 实例演示开关 | 132 | # 实例演示开关 |
| 134 | demoEnabled: true | 133 | demoEnabled: true |
| 135 | - # 文件路径 示例( Windows配置E:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) | 134 | + # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) |
| 136 | profile: D:/ruoyi/uploadPath | 135 | profile: D:/ruoyi/uploadPath |
| 137 | # 获取ip地址开关 | 136 | # 获取ip地址开关 |
| 138 | addressEnabled: false | 137 | addressEnabled: false |
| 139 | # 验证码类型 math 数字计算 char 字符验证 | 138 | # 验证码类型 math 数字计算 char 字符验证 |
| 140 | captchaType: math | 139 | captchaType: math |
| 141 | -# 开发环境配置 | ||
| 142 | -server: | ||
| 143 | - # 服务器的HTTP端口,默认为8080 | ||
| 144 | - port: 8080 | ||
| 145 | - servlet: | ||
| 146 | - # 应用的访问路径 | ||
| 147 | - context-path: / | ||
| 148 | - tomcat: | ||
| 149 | - # tomcat的URI编码 | ||
| 150 | - uri-encoding: UTF-8 | ||
| 151 | - # 连接数满后的排队数,默认为100 | ||
| 152 | - accept-count: 1000 | ||
| 153 | - threads: | ||
| 154 | - # tomcat最大线程数,默认为200 | ||
| 155 | - max: 800 | ||
| 156 | - # Tomcat启动初始化的线程数,默认值10 | ||
| 157 | - min-spare: 100 | ||
| 158 | - | ||
| 159 | mybatis-plus: | 140 | mybatis-plus: |
| 160 | # 搜索指定包别名 | 141 | # 搜索指定包别名 |
| 161 | typeAliasesPackage: com.ruoyi.**.domain | 142 | typeAliasesPackage: com.ruoyi.**.domain |
| @@ -171,10 +152,6 @@ swagger: | @@ -171,10 +152,6 @@ swagger: | ||
| 171 | # 请求前缀 | 152 | # 请求前缀 |
| 172 | # pathMapping: /dev-api | 153 | # pathMapping: /dev-api |
| 173 | pathMapping: / | 154 | pathMapping: / |
| 174 | -springfox: | ||
| 175 | - documentation: | ||
| 176 | - auto-startup: false | ||
| 177 | - enabled: false | ||
| 178 | api: | 155 | api: |
| 179 | url: | 156 | url: |
| 180 | # all 为获取所有驾驶员信息 | 157 | # all 为获取所有驾驶员信息 |
| @@ -185,7 +162,6 @@ api: | @@ -185,7 +162,6 @@ api: | ||
| 185 | getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s | 162 | getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s |
| 186 | getSchedulingInfoNew: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s | 163 | getSchedulingInfoNew: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s |
| 187 | config: | 164 | config: |
| 188 | - # 固定密码 | ||
| 189 | password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464 | 165 | password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464 |
| 190 | # 随机字符串 | 166 | # 随机字符串 |
| 191 | nonce: adfsad | 167 | nonce: adfsad |
| @@ -201,6 +177,5 @@ api: | @@ -201,6 +177,5 @@ api: | ||
| 201 | appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5 | 177 | appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5 |
| 202 | people: | 178 | people: |
| 203 | url: https://api.dingtalk.com/v1.0/yida/forms/instances/search | 179 | url: https://api.dingtalk.com/v1.0/yida/forms/instances/search |
| 204 | - | ||
| 205 | log: | 180 | log: |
| 206 | - path: D:/ruoyi/logs | ||
| 207 | \ No newline at end of file | 181 | \ No newline at end of file |
| 182 | + path: D:/ruoyi/logs |