diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 603be66d..7a0ff43d 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -19,7 +19,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
- port: 8090
+ port: 8081
servlet:
# 应用的访问路径
context-path: /jhapi
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index ffc4930a..0db84dd8 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -9,13 +9,13 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
- profile: D:/soft/data/uploadPath
+ profile: /data/yanzhu
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
captchaType: math
# 服务回调地址
- projectUrl: https://szgc.jhncidg.com
+ projectUrl: https://xiangguan.sxyanzhu.com
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 0955bda3..c83a99e6 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -9,7 +9,7 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
- profile: /data/uploadPath
+ profile: /data/yanzhu
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
@@ -19,7 +19,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
- port: 8088
+ port: 8081
servlet:
# 应用的访问路径
context-path: /jhapi
@@ -48,9 +48,9 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://42.193.7.8:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root
- password: Sxyanzhu@cf
+ password: Sxyanzhu@cf123
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 73a50cfe..8cdba68b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -24,7 +24,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
- active: druid
+ active: prod
# 文件上传
servlet:
multipart:
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 196ad2f7..926a090a 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,10 +1,10 @@
# 页面标题
-VUE_APP_TITLE = 产发工程数字管理平台
+VUE_APP_TITLE = 数字项管+
# 开发环境配置
ENV = 'development'
-# 产发工程数字管理平台/开发环境
+# 数字项管+/开发环境
VUE_APP_BASE_API = '/jhapi'
# 路由懒加载
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index e0a57d2e..8b638ff0 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,8 +1,8 @@
# 页面标题
-VUE_APP_TITLE = 产发工程数字管理平台
+VUE_APP_TITLE = 数字项管+
# 生产环境配置
ENV = 'production'
-# 产发工程数字管理平台/生产环境
+# 数字项管+/生产环境
VUE_APP_BASE_API = '/jhapi'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
index eda5f42e..2f6f3fbc 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -1,10 +1,10 @@
# 页面标题
-VUE_APP_TITLE = 产发工程数字管理平台
+VUE_APP_TITLE = 数字项管+
NODE_ENV = production
# 测试环境配置
ENV = 'staging'
-# 产发工程数字管理平台/测试环境
+# 数字项管+/测试环境
VUE_APP_BASE_API = '/stage-api'
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 8b4ecd2b..2e29df00 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.6",
- "description": "产发工程数字管理平台",
+ "description": "数字项管+",
"author": "若依",
"license": "MIT",
"scripts": {
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 187ee4f8..3ae009ee 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -3,7 +3,7 @@
- 产发工程数字管理平台
+ 数字项管+
- 产发工程数字管理平台
+ 数字项管+
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index c9d50d32..b8b8758c 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -1,7 +1,7 @@
- 产发工程数字管理平台
+ 数字项管+
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 7e435c78..b24c7ba9 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
-const name = process.env.VUE_APP_TITLE || '产发工程数字管理平台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '数字项管+' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
diff --git a/ruoyi-wechat/src/main/resources/application-prod.yml b/ruoyi-wechat/src/main/resources/application-prod.yml
index 99ad5d56..47b53ada 100644
--- a/ruoyi-wechat/src/main/resources/application-prod.yml
+++ b/ruoyi-wechat/src/main/resources/application-prod.yml
@@ -1,7 +1,7 @@
# 项目相关配置
ruoyi:
# 名称
- name: WeChat
+ name: Wechat
# 版本
version: 3.8.6
# 版权年份
@@ -9,23 +9,21 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
- profile: D:/soft/data/uploadPath
+ profile: /data/yanzhu
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
captchaType: math
# 服务回调地址
- projectUrl: https://szgcwx.jhncidg.com/
+ projectUrl: https://xiangguan.sxyanzhu.com
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
port: 8082
servlet:
# 应用的访问路径
- context-path: /
+ context-path: /jhapp
tomcat:
- max-http-post-size: 100MB #请求参数长度
- max-http-form-post-size: 100MB #form表单长度
# tomcat的URI编码
uri-encoding: UTF-8
# 连接数满后的排队数,默认为100
@@ -46,9 +44,10 @@ wechat:
# 日志配置
logging:
level:
- com.ruoyi: error
- com.yanzhu.jh: error
+ com.ruoyi: info
+ com.yanzhu.jh: info
org.springframework: error
+ org.flowable: error
# 数据源配置
spring:
@@ -65,9 +64,9 @@ spring:
slave:
# 从数据源开关/默认关闭
enabled: false
- url:
- username:
- password:
+ url:
+ username:
+ password:
# 初始连接数
initialSize: 5
# 最小连接池数量
@@ -91,7 +90,7 @@ spring:
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
- webStatFilter:
+ webStatFilter:
enabled: true
statViewServlet:
enabled: true
@@ -111,7 +110,6 @@ spring:
wall:
config:
multi-statement-allow: true
-
# redis 配置
redis:
# 地址
diff --git a/yanzhu-deviceApi/src/main/resources/application-druid.yml b/yanzhu-deviceApi/src/main/resources/application-druid.yml
index e1e25b1b..a88cf00a 100644
--- a/yanzhu-deviceApi/src/main/resources/application-druid.yml
+++ b/yanzhu-deviceApi/src/main/resources/application-druid.yml
@@ -1,7 +1,7 @@
# 项目相关配置
ruoyi:
# 名称
- name: WeChat
+ name: DeviceApi
# 版本
version: 3.8.6
# 版权年份
@@ -15,7 +15,7 @@ ruoyi:
# 验证码类型 math 数字计算 char 字符验证
captchaType: math
# 服务回调地址
- projectUrl: https://szgcwx.jhncidg.com/
+ projectUrl: https://szgcwx.jhncidg.com
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
diff --git a/yanzhu-deviceApi/src/main/resources/application-prod.yml b/yanzhu-deviceApi/src/main/resources/application-prod.yml
index a6a99fa5..bff2b8fa 100644
--- a/yanzhu-deviceApi/src/main/resources/application-prod.yml
+++ b/yanzhu-deviceApi/src/main/resources/application-prod.yml
@@ -9,23 +9,21 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
- profile: D:/soft/data/uploadPath
+ profile: /data/yanzhu
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
captchaType: math
# 服务回调地址
- projectUrl: https://szgcwx.jhncidg.com/
+ projectUrl: https://xiangguan.sxyanzhu.com
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
- port: 9998
+ port: 9990
servlet:
# 应用的访问路径
- context-path: /
+ context-path: /devapi
tomcat:
- max-http-post-size: 100MB #请求参数长度
- max-http-form-post-size: 100MB #form表单长度
# tomcat的URI编码
uri-encoding: UTF-8
# 连接数满后的排队数,默认为100
@@ -46,9 +44,10 @@ wechat:
# 日志配置
logging:
level:
- com.ruoyi: error
- com.yanzhu.jh: error
+ com.ruoyi: info
+ com.yanzhu.jh: info
org.springframework: error
+ org.flowable: error
# 数据源配置
spring:
@@ -65,9 +64,9 @@ spring:
slave:
# 从数据源开关/默认关闭
enabled: false
- url:
- username:
- password:
+ url:
+ username:
+ password:
# 初始连接数
initialSize: 5
# 最小连接池数量
@@ -91,7 +90,7 @@ spring:
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
- webStatFilter:
+ webStatFilter:
enabled: true
statViewServlet:
enabled: true
@@ -111,7 +110,6 @@ spring:
wall:
config:
multi-statement-allow: true
-
# redis 配置
redis:
# 地址
diff --git a/yanzhu-deviceApi/src/main/resources/application.yml b/yanzhu-deviceApi/src/main/resources/application.yml
index 07929941..13ee415f 100644
--- a/yanzhu-deviceApi/src/main/resources/application.yml
+++ b/yanzhu-deviceApi/src/main/resources/application.yml
@@ -20,7 +20,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
- active: prod
+ active: druid
# 文件上传
servlet:
multipart: