From 2eaf01593d5647647767e6cecbb818aadf25ed79 Mon Sep 17 00:00:00 2001 From: clunt Date: Mon, 7 Mar 2022 10:14:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B7=A5=E5=9C=88?= =?UTF-8?q?=E5=AD=90=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/FUNDING.yml | 1 + .gitignore | 33 + .../src/main/java/com/ghy/GhyApplication.java | 2 +- .../src/main/resources/application-druid.yml | 6 +- ghy-admin/src/main/resources/application.yml | 2 +- .../templates/demo/form/duallistbox.html | 24 +- .../templates/demo/form/summernote.html | 4 +- .../resources/templates/demo/modal/layer.html | 2 +- .../resources/templates/index-topnav.html | 2 +- .../src/main/resources/templates/index.html | 4 +- .../src/main/resources/templates/login.html | 8 +- .../src/main/resources/templates/main.html | 6 +- .../main/resources/templates/register.html | 8 +- .../src/main/resources/application.properties | 1 + logs/sys-error.2022-02-22.log | 0 logs/sys-error.log | 1287 +++++++++++++++++ logs/sys-info.2022-02-22.log | 76 + logs/sys-info.log | 274 ++++ logs/sys-user.2022-02-22.log | 4 + logs/sys-user.log | 11 + pom.xml | 2 +- sql/ry_20210924.sql | 30 +- 22 files changed, 1737 insertions(+), 50 deletions(-) create mode 100644 .github/FUNDING.yml create mode 100644 .gitignore create mode 100644 ghy-payment/src/main/resources/application.properties create mode 100644 logs/sys-error.2022-02-22.log create mode 100644 logs/sys-error.log create mode 100644 logs/sys-info.2022-02-22.log create mode 100644 logs/sys-info.log create mode 100644 logs/sys-user.2022-02-22.log create mode 100644 logs/sys-user.log diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..5a0b447b --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +custom: http://doc.ruoyi.vip/ruoyi/other/donate.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/ghy-admin/src/main/java/com/ghy/GhyApplication.java b/ghy-admin/src/main/java/com/ghy/GhyApplication.java index 17cce83d..972c2c44 100644 --- a/ghy-admin/src/main/java/com/ghy/GhyApplication.java +++ b/ghy-admin/src/main/java/com/ghy/GhyApplication.java @@ -16,7 +16,7 @@ public class GhyApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(GhyApplication.class, args); - System.out.println("(♥◠‿◠)ノ゙ 光惠影管理系统启动成功 ლ(´ڡ`ლ)゙ \n" + + System.out.println("(♥◠‿◠)ノ゙ 工圈子管理系统启动成功 ლ(´ڡ`ლ)゙ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/ghy-admin/src/main/resources/application-druid.yml b/ghy-admin/src/main/resources/application-druid.yml index ef61ade8..a5ef3b43 100644 --- a/ghy-admin/src/main/resources/application-druid.yml +++ b/ghy-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://121.4.113.60:3307/ghy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: 123456 + url: jdbc:mysql://121.4.113.60:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: admin + password: Clunt@12345 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ghy-admin/src/main/resources/application.yml b/ghy-admin/src/main/resources/application.yml index 6ec56581..67ef826c 100644 --- a/ghy-admin/src/main/resources/application.yml +++ b/ghy-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/ruoyi/uploadPath + profile: /home/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false diff --git a/ghy-admin/src/main/resources/templates/demo/form/duallistbox.html b/ghy-admin/src/main/resources/templates/demo/form/duallistbox.html index 652b13f3..c9fb72b7 100644 --- a/ghy-admin/src/main/resources/templates/demo/form/duallistbox.html +++ b/ghy-admin/src/main/resources/templates/demo/form/duallistbox.html @@ -19,18 +19,18 @@

diff --git a/ghy-admin/src/main/resources/templates/demo/form/summernote.html b/ghy-admin/src/main/resources/templates/demo/form/summernote.html index 8d80785b..f1d43486 100644 --- a/ghy-admin/src/main/resources/templates/demo/form/summernote.html +++ b/ghy-admin/src/main/resources/templates/demo/form/summernote.html @@ -14,7 +14,7 @@
-

光惠影后台管理系统

+

工圈子后台管理系统

ruoyi是一个完全响应式,基于Bootstrap3.3.7最新版本开发的扁平化主题,她采用了主流的左右两栏式布局,使用了Html5+CSS3等现代技术,她提供了诸多的强大的可以重新组合的UI组件,并集成了最新的jQuery版本(v2.1.1),当然,也集成了很多功能强大,用途广泛的就jQuery插件,她可以用于所有的Web应用程序,如网站管理后台网站会员中心CMSCRMOA等等,当然,您也可以对她进行深度定制,以做出更强系统。

当前版本:v4.7.2 @@ -53,7 +53,7 @@

-

你好,光惠影

+

你好,工圈子

H+是一个完全响应式,基于Bootstrap3.3.7最新版本开发的扁平化主题,她采用了主流的左右两栏式布局,使用了Html5+CSS3等现代技术,她提供了诸多的强大的可以重新组合的UI组件,并集成了最新的jQuery版本(v2.1.1),当然,也集成了很多功能强大,用途广泛的就jQuery插件,她可以用于所有的Web应用程序,如网站管理后台网站会员中心CMSCRMOA等等,当然,您也可以对她进行深度定制,以做出更强系统。

当前版本:v4.7.2 diff --git a/ghy-admin/src/main/resources/templates/demo/modal/layer.html b/ghy-admin/src/main/resources/templates/demo/modal/layer.html index 8d243c1b..103c37dd 100644 --- a/ghy-admin/src/main/resources/templates/demo/modal/layer.html +++ b/ghy-admin/src/main/resources/templates/demo/modal/layer.html @@ -259,7 +259,7 @@ $("#button-open-16").click(function(){ var json = { - "title": "光惠影相册", //相册标题 + "title": "工圈子相册", //相册标题 "id": 123, //相册id "start": 0, //初始显示的图片序号,默认0 "data": [ //相册包含的图片,数组格式 diff --git a/ghy-admin/src/main/resources/templates/index-topnav.html b/ghy-admin/src/main/resources/templates/index-topnav.html index ae6bdac6..5e6029e7 100644 --- a/ghy-admin/src/main/resources/templates/index-topnav.html +++ b/ghy-admin/src/main/resources/templates/index-topnav.html @@ -4,7 +4,7 @@ - 光惠影系统首页 + 工圈子系统首页 diff --git a/ghy-admin/src/main/resources/templates/index.html b/ghy-admin/src/main/resources/templates/index.html index c4019301..398c6f74 100644 --- a/ghy-admin/src/main/resources/templates/index.html +++ b/ghy-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 光惠影系统首页 + 工圈子管理系统 @@ -26,7 +26,7 @@