

diff --git a/src/main/java/com/cm/serviceusercenter/controller/SignController.java b/src/main/java/com/cm/serviceusercenter/controller/SignController.java index 9d47bea..fdcf2f7 100644 --- a/src/main/java/com/cm/serviceusercenter/controller/SignController.java +++ b/src/main/java/com/cm/serviceusercenter/controller/SignController.java @@ -3,7 +3,6 @@ package com.cm.serviceusercenter.controller; import com.cm.common.component.SecurityComponent; import com.cm.common.config.properties.SystemProperties; import com.cm.common.constants.ISystemConstant; -import com.cm.common.dingding.config.properties.DingDingAppProperties; import com.cm.common.exception.SearchException; import com.cm.common.pojo.bos.UserInfoBO; import com.cm.common.utils.verification.code.Captcha; @@ -15,6 +14,7 @@ import com.cm.serviceusercenter.manager.ConfigManager; import com.cm.serviceusercenter.service.system.menu.IMenuService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -47,10 +47,12 @@ public class SignController { private IMenuService menuService; @Autowired private DingDingScanCodeLoginProperties dingDingScanCodeLoginProperties; + @Value("${server.default-home-page:index}") + private String defaultHomePage; @GetMapping("index") public ModelAndView goIndex() throws SearchException { - ModelAndView mv = new ModelAndView("index"); + ModelAndView mv = new ModelAndView(defaultHomePage); UserInfoBO userInfoBO = securityComponent.getCurrentUser(); mv.addObject("userUsername", userInfoBO.getUserUsername()); return mv; diff --git a/src/main/resources/application-btgxq.yml b/src/main/resources/application-btgxq.yml index 272103a..fa76cb9 100644 --- a/src/main/resources/application-btgxq.yml +++ b/src/main/resources/application-btgxq.yml @@ -4,6 +4,7 @@ server: ws: ws://192.168.0.103:7021/usercenter/ws title: 统一用户管理平台 login-page-name: 统一用户管理平台 + default-home-page: index-gxq servlet: context-path: /usercenter diff --git a/src/main/resources/application-btyj.yml b/src/main/resources/application-btyj.yml index 7719a47..fea97bd 100644 --- a/src/main/resources/application-btyj.yml +++ b/src/main/resources/application-btyj.yml @@ -28,11 +28,13 @@ spring: max-request-size: 1GB datasource: druid: - url: jdbc:mysql://127.0.0.1:3306/db_cloud_v2_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC + # url: jdbc:mysql://127.0.0.1:3306/db_cloud_v2_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC + url: jdbc:mysql://127.0.0.1:3306/db_btyjj_usercenter1?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC db-type: mysql driver-class-name: com.mysql.cj.jdbc.Driver username: root - password: TSkj@0471.123 +# password: TSkj@0471.123 + password: root initial-size: 2 min-idle: 2 max-active: 10 diff --git a/src/main/resources/static/assets/images/gxq/1.jpg b/src/main/resources/static/assets/images/gxq/1.jpg new file mode 100644 index 0000000..2efce6a Binary files /dev/null and b/src/main/resources/static/assets/images/gxq/1.jpg differ diff --git a/src/main/resources/static/assets/images/gxq/2.jpg b/src/main/resources/static/assets/images/gxq/2.jpg new file mode 100644 index 0000000..f87ff24 Binary files /dev/null and b/src/main/resources/static/assets/images/gxq/2.jpg differ diff --git a/src/main/resources/static/assets/images/gxq/3.jpg b/src/main/resources/static/assets/images/gxq/3.jpg new file mode 100644 index 0000000..3e40dfe Binary files /dev/null and b/src/main/resources/static/assets/images/gxq/3.jpg differ diff --git a/src/main/resources/static/assets/images/gxq/4.jpg b/src/main/resources/static/assets/images/gxq/4.jpg new file mode 100644 index 0000000..fc3bd78 Binary files /dev/null and b/src/main/resources/static/assets/images/gxq/4.jpg differ diff --git a/src/main/resources/static/assets/images/gxq/5.jpg b/src/main/resources/static/assets/images/gxq/5.jpg new file mode 100644 index 0000000..7c5730a Binary files /dev/null and b/src/main/resources/static/assets/images/gxq/5.jpg differ diff --git a/src/main/resources/static/assets/images/gxq/logo.png b/src/main/resources/static/assets/images/gxq/logo.png new file mode 100644 index 0000000..c97792b Binary files /dev/null and b/src/main/resources/static/assets/images/gxq/logo.png differ diff --git a/src/main/resources/static/assets/images/gxq/map.png b/src/main/resources/static/assets/images/gxq/map.png new file mode 100644 index 0000000..76d38af Binary files /dev/null and b/src/main/resources/static/assets/images/gxq/map.png differ diff --git a/src/main/resources/static/assets/images/gxq/title.png b/src/main/resources/static/assets/images/gxq/title.png new file mode 100644 index 0000000..a497d2e Binary files /dev/null and b/src/main/resources/static/assets/images/gxq/title.png differ diff --git a/src/main/resources/templates/index-gxq.html b/src/main/resources/templates/index-gxq.html new file mode 100644 index 0000000..67b7bb3 --- /dev/null +++ b/src/main/resources/templates/index-gxq.html @@ -0,0 +1,155 @@ + + +
+ +