diff --git a/pom.xml b/pom.xml index 56afc599..d84a8535 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ ruoyi http://www.ruoyi.vip - 北跨泾河-产发工程数字管理平台 + 长安区数字工程监管系统 3.8.6 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index 63cf81bd..415e9f8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -113,7 +113,7 @@ public class SwaggerConfig // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题:北跨泾河-产发工程数字管理平台_接口文档") + .title("标题:长安区数字工程监管系统_接口文档") // 描述 .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index bcfa370c..eb227f0f 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -15,11 +15,11 @@ ruoyi: # 验证码类型 math 数字计算 char 字符验证 captchaType: math # 服务回调地址 - projectUrl: https://szgc.jhncidg.com + projectUrl: http://106.55.153.13:8888 # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 - port: 8090 + port: 8088 servlet: # 应用的访问路径 context-path: /jhapi @@ -49,12 +49,9 @@ spring: druid: # 主库数据源 master: - #url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh_2024?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://106.55.153.13:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root - #password: Sxyanzhu@cf123 - url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 - #username: root - password: hadoopspring123 + password: sxyz@uqw8qmash!<76j # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 8823ffa6..c5c390ac 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -9,17 +9,17 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/soft/data/uploadPath + profile: /data/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 captchaType: math # 服务回调地址 - projectUrl: https://szgc.jhncidg.com + projectUrl: http://106.55.153.13:8888 # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 - port: 8081 + port: 8088 servlet: # 应用的访问路径 context-path: /jhapi @@ -57,9 +57,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root - password: hadoopspring123 + password: sxyz@uqw8qmash!<76j # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -119,7 +119,7 @@ spring: # 数据库索引 database: 1 # 密码 - password: 123456 + password: # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml index 9332b54e..c9cf794c 100644 --- a/ruoyi-admin/src/main/resources/application-test.yml +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -15,7 +15,7 @@ ruoyi: # 验证码类型 math 数字计算 char 字符验证 captchaType: math # 服务回调地址 - projectUrl: http://42.193.7.8:8888 + projectUrl: http://106.55.153.13:8888 # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 @@ -48,9 +48,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://42.193.7.8:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://106.55.153.13:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root - password: Sxyanzhu@cf123 + password: sxyz@uqw8qmash!<76j # 从库数据源 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-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index 0344d825..f231997a 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 196ad2f7..f8a824a7 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,11 +1,11 @@ # 页面标题 -VUE_APP_TITLE = 产发工程数字管理平台 +VUE_APP_TITLE = 长安区数字工程监管系统 # 开发环境配置 ENV = 'development' -# 产发工程数字管理平台/开发环境 -VUE_APP_BASE_API = '/jhapi' +# 长安区数字工程监管系统/开发环境 +VUE_APP_BASE_API = '/prod-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index e0a57d2e..6185eadf 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' +# 长安区数字工程监管系统/生产环境 +VUE_APP_BASE_API = '/prod-api' diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging index eda5f42e..b4e25778 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 b5fa1f03..ad5f2017 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/public/favicon.ico b/ruoyi-ui/public/favicon.ico index 0908b501..0bbaf063 100644 Binary files a/ruoyi-ui/public/favicon.ico and b/ruoyi-ui/public/favicon.ico differ diff --git a/ruoyi-ui/public/logo/logo.png b/ruoyi-ui/public/logo/logo.png index 9b990efb..b94b5f3f 100644 Binary files a/ruoyi-ui/public/logo/logo.png and b/ruoyi-ui/public/logo/logo.png differ diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png index 9b990efb..b94b5f3f 100644 Binary files a/ruoyi-ui/src/assets/logo/logo.png and b/ruoyi-ui/src/assets/logo/logo.png differ diff --git a/ruoyi-ui/src/assets/logo/logo_min.png b/ruoyi-ui/src/assets/logo/logo_min.png new file mode 100644 index 00000000..d856a1b3 Binary files /dev/null and b/ruoyi-ui/src/assets/logo/logo_min.png differ diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue index 5b0cb944..34aa6d01 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue @@ -2,13 +2,13 @@