master

分支 (1)

管理

管理

master

Ruoyi-Vue-ChatGPT-SuperCMS
/
t --objects --all  grep ffff8289acd4...

[33mcommit 17a48822bcaeff69a66be89d72c9e3bde2ce0edd[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m)[m
Author: 15960006022 <[email protected]>
Date:   Wed Jul 12 14:05:21 2023 +0800

    部署修正

[1mdiff --git a/ruoyi-admin/docker/superyan/ruoyi-admin.jar b/ruoyi-admin/docker/superyan/ruoyi-admin.jar[m
[1mindex 6abaef6..ffff828 100644[m
Binary files a/ruoyi-admin/docker/superyan/ruoyi-admin.jar and b/ruoyi-admin/docker/superyan/ruoyi-admin.jar differ
[1mdiff --git "a/ruoyi-admin/docker/superyan/\351\203\250\347\275\262\346\226\207\346\241\243.md" "b/ruoyi-admin/docker/superyan/\351\203\250\347\275\262\346\226\207\346\241\243.md"[m
[1mindex 535ec0b..2a94a76 100644[m
[1m--- "a/ruoyi-admin/docker/superyan/\351\203\250\347\275\262\346\226\207\346\241\243.md"[m
[1m+++ "b/ruoyi-admin/docker/superyan/\351\203\250\347\275\262\346\226\207\346\241\243.md"[m
[36m@@ -6,7 +6,7 @@[m
 [m
 将jar包移动到superyan文件夹中依次执行一下命令 [m
 [m
[31m-docker build -t tobesuper/supercms:1.0.1 .[m
[32m+[m[32mdocker build -t tobesuper/supercms:1.0.4 .[m
 [m
 通过docker images获取ImageId[m
 [m
[1mdiff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml[m
[1mindex 2b2dc3c..90282db 100644[m
[1m--- a/ruoyi-admin/src/main/resources/application-dev.yml[m
[1m+++ b/ruoyi-admin/src/main/resources/application-dev.yml[m
[36m@@ -17,7 +17,7 @@[m [mruoyi:[m
 # 开发环境配置[m
 server:[m
   # 服务器的HTTP端口，默认为8080[m
[31m-  port: 8080[m
[32m+[m[32m  port: 8099[m
   # 开启优雅停机[m
   shutdown: graceful [m
   servlet:[m
[36m@@ -112,9 +112,9 @@[m [mspring:[m
     druid: [m
       # 主库数据源[m
       master:[m
[31m-        url: jdbc:mysql://175.24.234.214:3306/ry-cms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8[m
[32m+[m[32m        url: jdbc:mysql://123.249.23.143:3306/supercms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8[m
         username: root[m
[31m-        password: superadmin[m
[32m+[m[32m        password: supercmsadmin[m
       # 从库数据源[m
       slave:[m
         # 从数据源开关/默认关闭[m
[1mdiff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml[m
[1mindex fdec01e..ed49cb3 100644[m
[1m--- a/ruoyi-admin/src/main/resources/application-prod.yml[m
[1m+++ b/ruoyi-admin/src/main/resources/application-prod.yml[m
[36m@@ -21,7 +21,7 @@[m [mruoyi:[m
 # 开发环境配置[m
 server:[m
   # 服务器的HTTP端口，默认为8090[m
[31m-  port: 8092[m
[32m+[m[32m  port: 8099[m
   servlet:[m
     # 应用的访问路径[m
     context-path: /[m
[36m@@ -76,7 +76,7 @@[m [mspring:[m
       # 地址[m
       host: supercms-redis[m
       # 端口，默认为6379[m
[31m-      port: 8091[m
[32m+[m[32m      port: 8096[m
       # 数据库索引[m
       database: 0[m
       # 密码[m
[1mdiff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml[m
[1mindex b9a0a35..597ed8f 100644[m
[1m--- a/ruoyi-admin/src/main/resources/application.yml[m
[1m+++ b/ruoyi-admin/src/main/resources/application.yml[m
[36m@@ -6,4 +6,4 @@[m [mspring:[m
 [m
 ruoyi:[m
   cms:[m
[31m-    resourceRoot: D:\superyan\chatgpt[m
\ No newline at end of file[m
[32m+[m[32m    resourceRoot: D:\supercms\chatgpt[m
\ No newline at end of file[m
[1mdiff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js[m
[1mindex e0f1f89..b555829 100644[m
[1m--- a/ruoyi-ui/vue.config.js[m
[1m+++ b/ruoyi-ui/vue.config.js[m
[36m@@ -35,7 +35,7 @@[m [mmodule.exports = {[m
     proxy: {[m
       // detail: https://cli.vuejs.org/config/#devserver-proxy[m
       [process.env.VUE_APP_BASE_API]: {[m
[31m-        target: `http://localhost:8080`,[m
[32m+[m[32m        target: `http://localhost:8099`,[m
         changeOrigin: true,[m
         pathRewrite: {[m
           ['^' + process.env.VUE_APP_BASE_API]: ''[m