Browse Source

微服务配置文件调整

master
liupopo 2 years ago
parent
commit
58343edc2c
  1. 3
      supervise-crm-ui/.env.production
  2. 2
      supervise-monitor-ui/src/layout/components/Sidebar/index.vue
  3. 4
      supervise-monitor-ui/src/router/index.js
  4. 1210
      supervise-monitor-ui/src/router/modules/codemenu.js
  5. 48
      supervise-monitor-ui/src/views/monitor/videos/index.vue
  6. 2
      yxt-portal-ui/.env.development
  7. 2
      yxt_supervise/gateway/src/main/resources/application-devv.yml
  8. 8
      yxt_supervise/gateway/src/main/resources/application-test.yml
  9. 3
      yxt_supervise/gateway/src/main/resources/application.yml
  10. 12
      yxt_supervise/supervise-crm/pom.xml
  11. 10
      yxt_supervise/supervise-crm/supervise-crm-api/pom.xml
  12. 10
      yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml
  13. 3
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml
  14. 3
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml
  15. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml
  16. 2
      yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml
  17. 3
      yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml
  18. 2
      yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml

3
supervise-crm-ui/.env.production

@ -2,8 +2,7 @@
ENV = 'production'
# base api
VUE_APP_BASE_API = '/api/service'
VUE_APP_BASE_API = '/api'
## 配置 正式接口地址
VUE_APP_URL = "http://120.46.131.15:8111"

2
supervise-monitor-ui/src/layout/components/Sidebar/index.vue

@ -35,7 +35,7 @@
YongHuid: [],
routes: [],
params: {
sourceSid: '04dd1f41-5989-4ac7-8698-db26996094fb',
sourceSid: '5b8b2224-7272-4c56-a8d6-1dc426e2f3df',
userSid: '',
}
}

4
supervise-monitor-ui/src/router/index.js

@ -7,7 +7,7 @@ Vue.use(Router)
import Layout from '@/layout'
/* 所有角色可以访问/没有权限要求的基页 */
// import codemenu from './modules/codemenu'
import codemenu from './modules/codemenu'
export const constantRoutes = [
{
@ -46,7 +46,7 @@ export const constantRoutes = [
}
}]
},
// ...codemenu,
...codemenu,
{
path: '/404',
component: () =>

1210
supervise-monitor-ui/src/router/modules/codemenu.js

File diff suppressed because it is too large

48
supervise-monitor-ui/src/views/monitor/videos/index.vue

@ -0,0 +1,48 @@
<template>
<div class="app-container">
<!-- 标题按钮部分开始 -->
<div class="tab-header webtop">
<!-- 标题 -->
<div>环境监控-视频中心</div>
<!-- start 添加修改按钮 -->
<div />
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
</div>
</template>
<script>
export default {
name: 'MonitorVideos',
data() {
return {
submitdisabled: false,
viewTitle: '视频中心',
tableKey: 0,
index: 0,
totalQuantity: '', //
amountInTotal: '', //
formobj: {},
rules: {}
}
},
created() {},
methods: {
handleReturn() {
this.formobj = {}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.title {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

2
yxt-portal-ui/.env.development

@ -5,4 +5,4 @@ ENV = 'development'
VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
VUE_APP_URL = "http://192.168.3.108:8112"
VUE_APP_URL = "http://192.168.3.9:8112"

2
yxt_supervise/gateway/src/main/resources/application-devv.yml

@ -14,6 +14,6 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
password: 123456
password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)

8
yxt_supervise/gateway/src/main/resources/application-test.yml

@ -1,19 +1,19 @@
spring:
resources:
static-locations: file:/home/lzh/docker_data/nginx/html/supervise-system-ui
static-locations: file:D://supervise
cloud:
nacos:
discovery:
server-addr: 172.18.0.5:8848
server-addr: 127.0.0.1:8848
redis:
database: 3 # Redis数据库索引(默认为0)
host: 172.18.0.7
host: 127.0.0.1
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间(毫秒)

3
yxt_supervise/gateway/src/main/resources/application.yml

@ -12,7 +12,8 @@ spring:
application:
name: gateway-server
profiles:
active: devv
# active: devv
active: test
cloud:
gateway:
routes:

12
yxt_supervise/supervise-crm/pom.xml

@ -16,12 +16,12 @@
<packaging>pom</packaging>
<description>客户管理</description>
<parent>
<groupId>com.yxt.supervise</groupId>
<artifactId>yxt_supervise</artifactId>
<version>0.0.1</version>
<relativePath/>
</parent>
<!-- <parent>-->
<!-- <groupId>com.yxt.supervise</groupId>-->
<!-- <artifactId>yxt_supervise</artifactId>-->
<!-- <version>0.0.1</version>-->
<!-- <relativePath/>-->
<!-- </parent>-->
</project>

10
yxt_supervise/supervise-crm/supervise-crm-api/pom.xml

@ -3,10 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- <parent>-->
<!-- <groupId>com.yxt.supervise</groupId>-->
<!-- <artifactId>supervise-crm</artifactId>-->
<!-- <version>0.0.1</version>-->
<!-- </parent>-->
<parent>
<groupId>com.yxt.supervise</groupId>
<artifactId>supervise-crm</artifactId>
<groupId>com.yxt</groupId>
<artifactId>yxt-parent</artifactId>
<version>0.0.1</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>

10
yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml

@ -3,10 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- <parent>-->
<!-- <groupId>com.yxt.supervise</groupId>-->
<!-- <artifactId>supervise-crm</artifactId>-->
<!-- <version>0.0.1</version>-->
<!-- </parent> -->
<parent>
<groupId>com.yxt.supervise</groupId>
<artifactId>supervise-crm</artifactId>
<groupId>com.yxt</groupId>
<artifactId>yxt-parent</artifactId>
<version>0.0.1</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>

3
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml

@ -1,7 +1,8 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://122.14.222.186:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
# url: jdbc:mysql://122.14.222.186:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
username: root
password: 1LAiGz$t1*Iw
cloud:

3
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml

@ -2,7 +2,8 @@ spring:
application:
name: supervise-crm
profiles:
active: devv
# active: devv
active: test
messages:
# 国际化资源文件路径
basename: i18n/messages

4
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml

@ -2,8 +2,8 @@ spring:
application:
name: supervise-portal
profiles:
# active: devv
active: test
active: devv
# active: test
messages:
# 国际化资源文件路径
basename: i18n/messages

2
yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml

@ -18,7 +18,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
password: 123456
password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)

3
yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml

@ -2,7 +2,8 @@ spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://122.14.222.186:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
url: jdbc:mysql://122.14.222.186:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
# url: jdbc:mysql://122.14.222.186:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
url: jdbc:mysql://127.0.0.1:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
username: root
password: 1LAiGz$t1*Iw
# cloud:

2
yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml

@ -2,7 +2,7 @@ spring:
application:
name: supervise-system
profiles:
#active: devv
# active: devv
active: test
messages:
# 国际化资源文件路径

Loading…
Cancel
Save