diff --git a/.gitignore b/.gitignore index 39cb8a42..e1f1d407 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ target/ application-dev.yml application-pro.yml +application-dem.yml application-prod.yml application-test.yml \ No newline at end of file diff --git a/server/like-admin/src/main/resources/application-example-pro.yml b/server/like-admin/src/main/resources/application-pro-example.yml similarity index 68% rename from server/like-admin/src/main/resources/application-example-pro.yml rename to server/like-admin/src/main/resources/application-pro-example.yml index 90a35f74..f036cf79 100644 --- a/server/like-admin/src/main/resources/application-example-pro.yml +++ b/server/like-admin/src/main/resources/application-pro-example.yml @@ -1,6 +1,6 @@ # 项目配置 like: - upload-directory: /www/uploads/ # 上传目录 + upload-directory: /www/uploads/likeadmin-java/ # 上传目录 # 框架配置 spring: @@ -16,4 +16,9 @@ spring: host: localhost # Redis服务地址 port: 6379 # Redis端口 password: # Redis密码 - database: 0 # 数据库索引 \ No newline at end of file + database: 0 # 数据库索引 + +# Mybatis-plus配置 【是否开启SQL日志输出】 +#mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/server/like-admin/src/main/resources/application.yml b/server/like-admin/src/main/resources/application.yml index be90a50b..2c5b311b 100644 --- a/server/like-admin/src/main/resources/application.yml +++ b/server/like-admin/src/main/resources/application.yml @@ -9,12 +9,12 @@ server: # 框架配置 spring: profiles: - active: pro + active: dev mvc: static-path-pattern: /api/static/** # 数据源配置 datasource: - url: jdbc:mysql://localhost:3306/local_admin_java?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://localhost:3306/likeadmin?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false type: com.zaxxer.hikari.HikariDataSource # 数据源类型 driver-class-name: com.mysql.jdbc.Driver # MySql的驱动 username: root # 数据库账号 @@ -52,8 +52,6 @@ spring: mybatis-plus: mapper-locations: classpath*:/mapper/**Mapper.xml # 映射文件路径 typeAliasesPackage: com.mdd.**.mapper -# configuration: -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: banner: false db-config: diff --git a/server/like-admin/src/main/resources/log4j2-spring.xml b/server/like-admin/src/main/resources/log4j2-spring.xml index ae4069ab..afe77105 100644 --- a/server/like-admin/src/main/resources/log4j2-spring.xml +++ b/server/like-admin/src/main/resources/log4j2-spring.xml @@ -6,7 +6,7 @@ - + diff --git a/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java b/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java index 5df1d331..e0a3cddb 100644 --- a/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java +++ b/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java @@ -30,7 +30,7 @@ public class GlobalConfig { public static String publicPrefix = "api/uploads"; // 上传映射目录 - public static String uploadDirectory = "/www/like-admin/uploads/"; + public static String uploadDirectory = "/www/uploads/likeadmin-java/"; // 上传图片限制 public static Integer uploadImageSize = 1024 * 1024 * 10; diff --git a/server/like-admin/src/main/resources/static/ad01.jpg b/server/like-common/src/main/resources/static/ad01.jpg similarity index 100% rename from server/like-admin/src/main/resources/static/ad01.jpg rename to server/like-common/src/main/resources/static/ad01.jpg diff --git a/server/like-admin/src/main/resources/static/article01.png b/server/like-common/src/main/resources/static/article01.png similarity index 100% rename from server/like-admin/src/main/resources/static/article01.png rename to server/like-common/src/main/resources/static/article01.png diff --git a/server/like-admin/src/main/resources/static/article02.jpeg b/server/like-common/src/main/resources/static/article02.jpeg similarity index 100% rename from server/like-admin/src/main/resources/static/article02.jpeg rename to server/like-common/src/main/resources/static/article02.jpeg diff --git a/server/like-admin/src/main/resources/static/article03.png b/server/like-common/src/main/resources/static/article03.png similarity index 100% rename from server/like-admin/src/main/resources/static/article03.png rename to server/like-common/src/main/resources/static/article03.png diff --git a/server/like-admin/src/main/resources/static/backend_avatar.png b/server/like-common/src/main/resources/static/backend_avatar.png similarity index 100% rename from server/like-admin/src/main/resources/static/backend_avatar.png rename to server/like-common/src/main/resources/static/backend_avatar.png diff --git a/server/like-admin/src/main/resources/static/backend_backdrop.png b/server/like-common/src/main/resources/static/backend_backdrop.png similarity index 100% rename from server/like-admin/src/main/resources/static/backend_backdrop.png rename to server/like-common/src/main/resources/static/backend_backdrop.png diff --git a/server/like-admin/src/main/resources/static/backend_favicon.ico b/server/like-common/src/main/resources/static/backend_favicon.ico similarity index 100% rename from server/like-admin/src/main/resources/static/backend_favicon.ico rename to server/like-common/src/main/resources/static/backend_favicon.ico diff --git a/server/like-admin/src/main/resources/static/backend_logo.png b/server/like-common/src/main/resources/static/backend_logo.png similarity index 100% rename from server/like-admin/src/main/resources/static/backend_logo.png rename to server/like-common/src/main/resources/static/backend_logo.png diff --git a/server/like-admin/src/main/resources/static/banner01.png b/server/like-common/src/main/resources/static/banner01.png similarity index 100% rename from server/like-admin/src/main/resources/static/banner01.png rename to server/like-common/src/main/resources/static/banner01.png diff --git a/server/like-admin/src/main/resources/static/banner02.jpg b/server/like-common/src/main/resources/static/banner02.jpg similarity index 100% rename from server/like-admin/src/main/resources/static/banner02.jpg rename to server/like-common/src/main/resources/static/banner02.jpg diff --git a/server/like-admin/src/main/resources/static/default_avatar.png b/server/like-common/src/main/resources/static/default_avatar.png similarity index 100% rename from server/like-admin/src/main/resources/static/default_avatar.png rename to server/like-common/src/main/resources/static/default_avatar.png diff --git a/server/like-admin/src/main/resources/static/nav01.png b/server/like-common/src/main/resources/static/nav01.png similarity index 100% rename from server/like-admin/src/main/resources/static/nav01.png rename to server/like-common/src/main/resources/static/nav01.png diff --git a/server/like-admin/src/main/resources/static/nav02.png b/server/like-common/src/main/resources/static/nav02.png similarity index 100% rename from server/like-admin/src/main/resources/static/nav02.png rename to server/like-common/src/main/resources/static/nav02.png diff --git a/server/like-admin/src/main/resources/static/nav03.png b/server/like-common/src/main/resources/static/nav03.png similarity index 100% rename from server/like-admin/src/main/resources/static/nav03.png rename to server/like-common/src/main/resources/static/nav03.png diff --git a/server/like-admin/src/main/resources/static/nav04.png b/server/like-common/src/main/resources/static/nav04.png similarity index 100% rename from server/like-admin/src/main/resources/static/nav04.png rename to server/like-common/src/main/resources/static/nav04.png diff --git a/server/like-admin/src/main/resources/static/nav05.png b/server/like-common/src/main/resources/static/nav05.png similarity index 100% rename from server/like-admin/src/main/resources/static/nav05.png rename to server/like-common/src/main/resources/static/nav05.png diff --git a/server/like-admin/src/main/resources/static/shop_logo.png b/server/like-common/src/main/resources/static/shop_logo.png similarity index 100% rename from server/like-admin/src/main/resources/static/shop_logo.png rename to server/like-common/src/main/resources/static/shop_logo.png diff --git a/server/like-admin/src/main/resources/static/tabbar_home.png b/server/like-common/src/main/resources/static/tabbar_home.png similarity index 100% rename from server/like-admin/src/main/resources/static/tabbar_home.png rename to server/like-common/src/main/resources/static/tabbar_home.png diff --git a/server/like-admin/src/main/resources/static/tabbar_home_sel.png b/server/like-common/src/main/resources/static/tabbar_home_sel.png similarity index 100% rename from server/like-admin/src/main/resources/static/tabbar_home_sel.png rename to server/like-common/src/main/resources/static/tabbar_home_sel.png diff --git a/server/like-admin/src/main/resources/static/tabbar_me.png b/server/like-common/src/main/resources/static/tabbar_me.png similarity index 100% rename from server/like-admin/src/main/resources/static/tabbar_me.png rename to server/like-common/src/main/resources/static/tabbar_me.png diff --git a/server/like-admin/src/main/resources/static/tabbar_me_sel.png b/server/like-common/src/main/resources/static/tabbar_me_sel.png similarity index 100% rename from server/like-admin/src/main/resources/static/tabbar_me_sel.png rename to server/like-common/src/main/resources/static/tabbar_me_sel.png diff --git a/server/like-admin/src/main/resources/static/tabbar_text.png b/server/like-common/src/main/resources/static/tabbar_text.png similarity index 100% rename from server/like-admin/src/main/resources/static/tabbar_text.png rename to server/like-common/src/main/resources/static/tabbar_text.png diff --git a/server/like-admin/src/main/resources/static/tabbar_text_sel.png b/server/like-common/src/main/resources/static/tabbar_text_sel.png similarity index 100% rename from server/like-admin/src/main/resources/static/tabbar_text_sel.png rename to server/like-common/src/main/resources/static/tabbar_text_sel.png diff --git a/server/like-admin/src/main/resources/static/user_about.png b/server/like-common/src/main/resources/static/user_about.png similarity index 100% rename from server/like-admin/src/main/resources/static/user_about.png rename to server/like-common/src/main/resources/static/user_about.png diff --git a/server/like-admin/src/main/resources/static/user_collect.png b/server/like-common/src/main/resources/static/user_collect.png similarity index 100% rename from server/like-admin/src/main/resources/static/user_collect.png rename to server/like-common/src/main/resources/static/user_collect.png diff --git a/server/like-admin/src/main/resources/static/user_kefu.png b/server/like-common/src/main/resources/static/user_kefu.png similarity index 100% rename from server/like-admin/src/main/resources/static/user_kefu.png rename to server/like-common/src/main/resources/static/user_kefu.png diff --git a/server/like-admin/src/main/resources/static/user_setting.png b/server/like-common/src/main/resources/static/user_setting.png similarity index 100% rename from server/like-admin/src/main/resources/static/user_setting.png rename to server/like-common/src/main/resources/static/user_setting.png diff --git a/server/like-front/src/main/resources/application-pro-example.yml b/server/like-front/src/main/resources/application-pro-example.yml new file mode 100644 index 00000000..f036cf79 --- /dev/null +++ b/server/like-front/src/main/resources/application-pro-example.yml @@ -0,0 +1,24 @@ +# 项目配置 +like: + upload-directory: /www/uploads/likeadmin-java/ # 上传目录 + +# 框架配置 +spring: + # 数据源配置 + datasource: + url: jdbc:mysql://localhost:3306/【库名称】?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + type: com.zaxxer.hikari.HikariDataSource # 数据源类型 + driver-class-name: com.mysql.jdbc.Driver # MySql的驱动 + username: root # 数据库账号 + password: root # 数据库密码 + # Redis配置 + redis: + host: localhost # Redis服务地址 + port: 6379 # Redis端口 + password: # Redis密码 + database: 0 # 数据库索引 + +# Mybatis-plus配置 【是否开启SQL日志输出】 +#mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/server/like-front/src/main/resources/application.yml b/server/like-front/src/main/resources/application.yml index fa1e8161..7da8ffd0 100644 --- a/server/like-front/src/main/resources/application.yml +++ b/server/like-front/src/main/resources/application.yml @@ -1,7 +1,3 @@ -# 项目配置 -like: - upload-directory: /www/like-admin/uploads/ - # 服务配置 server: port: 8084 @@ -11,12 +7,12 @@ server: # 框架配置 spring: profiles: - active: pro + active: dev mvc: static-path-pattern: /api/static/** # 数据源配置 datasource: - url: jdbc:mysql://localhost:3306/local_frame?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://localhost:3306/likeadmin?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false type: com.zaxxer.hikari.HikariDataSource # 数据源类型 driver-class-name: com.mysql.jdbc.Driver # MySql的驱动 username: root # 数据库账号 @@ -54,8 +50,6 @@ spring: mybatis-plus: mapper-locations: classpath*:/mapper/**Mapper.xml # 映射文件路径 typeAliasesPackage: com.mdd.**.mapper - # configuration: - # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: banner: false db-config: diff --git a/server/like-front/src/main/resources/log4j2-spring.xml b/server/like-front/src/main/resources/log4j2-spring.xml index 4cf2a796..71e9e799 100644 --- a/server/like-front/src/main/resources/log4j2-spring.xml +++ b/server/like-front/src/main/resources/log4j2-spring.xml @@ -6,8 +6,8 @@ - - + + diff --git a/server/like-front/src/main/resources/static/ad01.jpg b/server/like-front/src/main/resources/static/ad01.jpg deleted file mode 100644 index 3ac345db..00000000 Binary files a/server/like-front/src/main/resources/static/ad01.jpg and /dev/null differ diff --git a/server/like-front/src/main/resources/static/article01.png b/server/like-front/src/main/resources/static/article01.png deleted file mode 100644 index ad176e7b..00000000 Binary files a/server/like-front/src/main/resources/static/article01.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/article02.jpeg b/server/like-front/src/main/resources/static/article02.jpeg deleted file mode 100644 index 3cc6f49f..00000000 Binary files a/server/like-front/src/main/resources/static/article02.jpeg and /dev/null differ diff --git a/server/like-front/src/main/resources/static/article03.png b/server/like-front/src/main/resources/static/article03.png deleted file mode 100644 index 3c62d410..00000000 Binary files a/server/like-front/src/main/resources/static/article03.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/banner01.png b/server/like-front/src/main/resources/static/banner01.png deleted file mode 100644 index 5894291e..00000000 Binary files a/server/like-front/src/main/resources/static/banner01.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/banner02.jpg b/server/like-front/src/main/resources/static/banner02.jpg deleted file mode 100644 index 0c2d3347..00000000 Binary files a/server/like-front/src/main/resources/static/banner02.jpg and /dev/null differ diff --git a/server/like-front/src/main/resources/static/default_avatar.png b/server/like-front/src/main/resources/static/default_avatar.png deleted file mode 100644 index 64d50e78..00000000 Binary files a/server/like-front/src/main/resources/static/default_avatar.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/nav01.png b/server/like-front/src/main/resources/static/nav01.png deleted file mode 100644 index c198426d..00000000 Binary files a/server/like-front/src/main/resources/static/nav01.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/nav02.png b/server/like-front/src/main/resources/static/nav02.png deleted file mode 100644 index 5c3f8100..00000000 Binary files a/server/like-front/src/main/resources/static/nav02.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/nav03.png b/server/like-front/src/main/resources/static/nav03.png deleted file mode 100644 index a9d0a21e..00000000 Binary files a/server/like-front/src/main/resources/static/nav03.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/nav04.png b/server/like-front/src/main/resources/static/nav04.png deleted file mode 100644 index 6eab45bd..00000000 Binary files a/server/like-front/src/main/resources/static/nav04.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/nav05.png b/server/like-front/src/main/resources/static/nav05.png deleted file mode 100644 index 744b0380..00000000 Binary files a/server/like-front/src/main/resources/static/nav05.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/shop_logo.png b/server/like-front/src/main/resources/static/shop_logo.png deleted file mode 100644 index 58f78001..00000000 Binary files a/server/like-front/src/main/resources/static/shop_logo.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/tabbar_home.png b/server/like-front/src/main/resources/static/tabbar_home.png deleted file mode 100644 index 5c58118b..00000000 Binary files a/server/like-front/src/main/resources/static/tabbar_home.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/tabbar_home_sel.png b/server/like-front/src/main/resources/static/tabbar_home_sel.png deleted file mode 100644 index c0538a7a..00000000 Binary files a/server/like-front/src/main/resources/static/tabbar_home_sel.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/tabbar_me.png b/server/like-front/src/main/resources/static/tabbar_me.png deleted file mode 100644 index a6d01c49..00000000 Binary files a/server/like-front/src/main/resources/static/tabbar_me.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/tabbar_me_sel.png b/server/like-front/src/main/resources/static/tabbar_me_sel.png deleted file mode 100644 index 6994a496..00000000 Binary files a/server/like-front/src/main/resources/static/tabbar_me_sel.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/tabbar_text.png b/server/like-front/src/main/resources/static/tabbar_text.png deleted file mode 100644 index 5731d465..00000000 Binary files a/server/like-front/src/main/resources/static/tabbar_text.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/tabbar_text_sel.png b/server/like-front/src/main/resources/static/tabbar_text_sel.png deleted file mode 100644 index 6663475b..00000000 Binary files a/server/like-front/src/main/resources/static/tabbar_text_sel.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/user_about.png b/server/like-front/src/main/resources/static/user_about.png deleted file mode 100644 index 733d5704..00000000 Binary files a/server/like-front/src/main/resources/static/user_about.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/user_collect.png b/server/like-front/src/main/resources/static/user_collect.png deleted file mode 100644 index c5484f4e..00000000 Binary files a/server/like-front/src/main/resources/static/user_collect.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/user_kefu.png b/server/like-front/src/main/resources/static/user_kefu.png deleted file mode 100644 index f8370fc9..00000000 Binary files a/server/like-front/src/main/resources/static/user_kefu.png and /dev/null differ diff --git a/server/like-front/src/main/resources/static/user_setting.png b/server/like-front/src/main/resources/static/user_setting.png deleted file mode 100644 index c4bcf5a6..00000000 Binary files a/server/like-front/src/main/resources/static/user_setting.png and /dev/null differ