更新

fiveep-common/fiveep-common-core/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.bizmatics</groupId>
-        <artifactId>fiveep-common</artifactId>
+        <artifactId>usky-power-common</artifactId>
         <version>0.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>fiveep-common-core</artifactId>
+    <artifactId>usky-power-common-core</artifactId>
 
     <dependencies>
 

fiveep-common/fiveep-common-mvc/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.bizmatics</groupId>
-        <artifactId>fiveep-common</artifactId>
+        <artifactId>usky-power-common</artifactId>
         <version>0.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>fiveep-common-mvc</artifactId>
+    <artifactId>usky-power-common-mvc</artifactId>
 
     <dependencies>
         <dependency>
@@ -43,13 +43,13 @@
         </dependency>
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-common-core</artifactId>
+            <artifactId>usky-power-common-core</artifactId>
             <version>0.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-common-spring</artifactId>
+            <artifactId>usky-power-common-spring</artifactId>
             <version>0.0.1</version>
         </dependency>
     </dependencies>

fiveep-common/fiveep-common-spring/pom.xml

@@ -2,18 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.bizmatics</groupId>
-        <artifactId>fiveep-common</artifactId>
+        <artifactId>usky-power-common</artifactId>
         <version>0.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>fiveep-common-spring</artifactId>
+    <artifactId>usky-power-common-spring</artifactId>
 
     <dependencies>
 
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-common-core</artifactId>
+            <artifactId>usky-power-common-core</artifactId>
             <version>0.0.1</version>
         </dependency>
 

fiveep-common/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>fiveep</artifactId>
+        <artifactId>usky-power</artifactId>
         <groupId>com.bizmatics</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>fiveep-common</artifactId>
+    <artifactId>usky-power-common</artifactId>
     <packaging>pom</packaging>
     <version>0.0.1</version>
 

fiveep-controller/pom.xml

@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>fiveep-controller</artifactId>
+    <artifactId>usky-power-controller</artifactId>
     <version>0.0.1</version>
-    <name>fiveep-controller</name>
+    <name>usky-power-controller</name>
 
     <properties>
         <project.name>${parent.name}</project.name>
     </properties>
     <parent>
-        <artifactId>fiveep</artifactId>
+        <artifactId>usky-power</artifactId>
         <groupId>com.bizmatics</groupId>
         <version>0.0.1</version>
     </parent>
@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-service</artifactId>
+            <artifactId>usky-power-service</artifactId>
             <version>0.0.1</version>
         </dependency>
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/MybatisGeneratorUtils.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class MybatisGeneratorUtils {
     public static void main(String[] args) {
         //修改成自己的模块名称
-        String[] models = {"fiveep-controller", "fiveep-service", "fiveep-model", "fiveep-persistence"};
+        String[] models = {"usky-power-controller", "usky-power-service", "usky-power-model", "usky-power-persistence"};
         for (String model : models) {
             shell(model);
         }
@@ -43,10 +43,10 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://124.70.160.158:3306/smart_electricity?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://101.133.214.75:3306/usky-electricity?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("Y48hD&Eg");
+        dsc.setUsername("usky");
+        dsc.setPassword("Yt#75Usky");
         mpg.setDataSource(dsc);
 
         // 3、包配置
@@ -70,13 +70,13 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude(new String[]{"ht_analog_173_data"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude(new String[]{"sys_tenant_config"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录
         //修改对应的模块名称
         TemplateConfig tc = new TemplateConfig();
-        if ("fiveep-persistence".equals(model)) {
+        if ("usky-power-persistence".equals(model)) {
             tc.setController(null);
             tc.setEntity(null);
             tc.setService(null);
@@ -104,18 +104,18 @@ public class MybatisGeneratorUtils {
             cfg.setFileOutConfigList(focList);
             mpg.setCfg(cfg);
             tc.setXml(null);
-        } else if ("fiveep-model".equals(model)) {
+        } else if ("usky-power-model".equals(model)) {
             tc.setController(null);
             tc.setService(null);
             tc.setServiceImpl(null);
             tc.setMapper(null);
             tc.setXml(null);
-        } else if ("fiveep-service".equals(model)) {
+        } else if ("usky-power-service".equals(model)) {
             tc.setController(null);
             tc.setMapper(null);
             tc.setXml(null);
             tc.setEntity(null);
-        } else if ("fiveep-controller".equals(model)) {
+        } else if ("usky-power-controller".equals(model)) {
             tc.setMapper(null);
             tc.setXml(null);
             tc.setService(null);

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysTenantConfigController.java

@@ -0,0 +1,38 @@
+package com.bizmatics.controller.web;
+
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.model.SysTenantConfig;
+import com.bizmatics.service.SysTenantConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 登录中间页配置
+ *
+ * @author ya
+ * @since 2022-05-06
+ */
+@RestController
+@RequestMapping("/sysTenantConfig")
+public class SysTenantConfigController {
+    @Autowired
+    private SysTenantConfigService sysTenantConfigService;
+
+    /**
+     * 登录中间页-样式配置查询
+     *
+     * @param url 域名
+     * @return
+     */
+    @GetMapping("/getTenantConfig")
+    public ApiResult<List<SysTenantConfig>> getTenantConfig(@RequestParam String url) {
+        return ApiResult.success(sysTenantConfigService.getTenantConfig(url));
+    }
+}
+

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysTenantController.java

@@ -0,0 +1,44 @@
+package com.bizmatics.controller.web;
+
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.model.vo.SysTenantVo;
+import com.bizmatics.service.SysTenantService;
+import com.bizmatics.service.system.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 个人中心
+ *
+ * @author ya
+ * @since 2022-05-05
+ */
+@RestController
+@RequestMapping("/sysTenant")
+public class SysTenantController {
+
+    @Autowired
+    private SysTenantService sysTenantService;
+
+    @Autowired
+    private ISysUserService userService;
+
+
+    /**
+     * 个人中心-信息查询
+     *
+     * @return
+     */
+    @GetMapping("getUserData")
+    public ApiResult<List<SysTenantVo>> getUserData() {
+        return ApiResult.success(sysTenantService.getUserData());
+    }
+
+
+}
+

fiveep-controller/src/main/java/com/bizmatics/controller/web/es/WeatherControllerWeb.java

@@ -0,0 +1,57 @@
+package com.bizmatics.controller.web.es;
+
+
+import com.bizmatics.common.core.exception.BusinessException;
+import com.bizmatics.common.core.util.HttpUtils;
+import com.bizmatics.common.core.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/6/16 18:02
+ */
+@RestController
+@RequestMapping("aliWeather")
+public class WeatherControllerWeb {
+    private static final String ALI_WEATHER_API_URL = "https://weather01.market.alicloudapi.com/area-to-weather";
+    private static final String ALI_WEATHER_HEADER_KEY = "Authorization";
+    private static final String ALI_WEATHER_APPCODE = "0f2b7fce6e104ba8835358b7b59b4fb6";
+    private static final String ALI_WEATHER_HEADER_VALUE = "APPCODE " + ALI_WEATHER_APPCODE;
+
+    private String weather = "";
+
+    private Date date = null;
+
+    @GetMapping()
+    public String get(@RequestParam String area) {
+        if (StringUtils.isBlank(weather)){
+            weather = getWeatherApi(area);
+            date = new Date();
+        }else {
+            if ((System.currentTimeMillis() - date.getTime()) >= (1000 * 60 * 60 * 5)){
+                weather = getWeatherApi(area);
+                date = new Date();
+            }
+        }
+        return weather;
+    }
+    public String getWeatherApi(String area){
+        try {
+            Map<String,String> headerMap = new HashMap<>();
+            headerMap.put(ALI_WEATHER_HEADER_KEY,ALI_WEATHER_HEADER_VALUE);
+            headerMap.put("Content-Type","application/json; charset=utf-8");
+            return HttpUtils.get(ALI_WEATHER_API_URL+"?area="+area,headerMap);
+        } catch (IOException e) {
+            throw new BusinessException(e.getMessage());
+        }
+    }
+}
+

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysLoginController.java

@@ -2,10 +2,12 @@ package com.bizmatics.controller.web.system;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.mvc.utils.ServletUtils;
+import com.bizmatics.model.SysTenantConfig;
 import com.bizmatics.model.system.LoginStyle;
 import com.bizmatics.model.system.SysMenu;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.RouterVo;
+import com.bizmatics.service.SysTenantConfigService;
 import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.system.ISysMenuService;
 import com.bizmatics.service.system.impl.SysLoginService;
@@ -38,6 +40,9 @@ public class SysLoginController
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private SysTenantConfigService sysTenantConfigService;
+
     /**
      * 登录方法
      * 
@@ -103,4 +108,16 @@ public class SysLoginController
         LoginStyle loginStyle = loginService.getLoginStyle(url);
         return ApiResult.success(loginStyle);
     }
+
+
+//    /**
+//     * 登录中间页-样式配置查询
+//     *
+//     * @param url 域名
+//     * @return
+//     */
+//    @GetMapping("/getTenantConfig")
+//    public ApiResult<List<SysTenantConfig>> getTenantConfig(@RequestParam String url) {
+//        return ApiResult.success(sysTenantConfigService.getTenantConfig(url));
+//    }
 }

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysUserController.java

@@ -4,14 +4,20 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.exception.BusinessErrorCode;
 import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.StringUtils;
+import com.bizmatics.common.mvc.utils.ServletUtils;
 import com.bizmatics.model.UserSite;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.page.TableDataInfo;
+import com.bizmatics.model.system.SysMenu;
 import com.bizmatics.model.system.SysRole;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.system.SysUserVo;
+import com.bizmatics.model.vo.RouterVo;
+import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.system.ISysPostService;
 import com.bizmatics.service.system.ISysRoleService;
 import com.bizmatics.service.system.ISysUserService;
+import com.bizmatics.service.system.impl.TokenService;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -44,6 +50,9 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysPostService postService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * 获取用户列表
      */
@@ -210,4 +219,60 @@ public class SysUserController extends BaseController
         userService.insertUserAuth(userId, roleIds);
         return ApiResult.success();
     }
+
+    @GetMapping("getUserData")
+    public ApiResult<SysUser> getUserData()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return ApiResult.success(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+    }
+
+
+    /**
+     * 个人中心-信息编辑
+     */
+    @PostMapping("/setUserData")
+    public ApiResult<Void> setUserData(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.updateUser1(user));
+    }
+
+    /**
+     * 个人中心-重置密码
+     */
+    @PutMapping("/updatePwd")
+    public ApiResult updatePwd(String oldPassword, String newPassword)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String userName = loginUser.getUsername();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新密码不能与旧密码相同");
+        }
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        {
+            // 更新缓存用户密码
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            tokenService.setLoginUser(loginUser);
+            return ApiResult.success();
+        }
+        return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改密码异常，请联系管理员");
+    }
 }

fiveep-controller/src/main/resources/application-dev.properties

@@ -1,9 +1,9 @@
 debug=true
 spring.main.lazy-initialization=false
 spring.main.allow-bean-definition-overriding=true
-temp.basedir=/usr/local/service/fiveep/file
+temp.basedir=/usr/local/service/usky-power/uskyfile
 # application
-server.port=8010
+server.port=8011
 # mybatis-plus
 mybatis-plus.mapper-locations=classpath*:mapper/**/*.xml
 mybatis-plus.configuration.lazy-loading-enabled=true
@@ -16,10 +16,10 @@ mybatis.refresh.delay-seconds=10
 mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-spring.datasource.dynamic.primary=fiveep
-spring.datasource.dynamic.datasource.fiveep.url=jdbc:mysql://124.70.160.158:3306/smart_electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
-spring.datasource.dynamic.datasource.fiveep.username=root
-spring.datasource.dynamic.datasource.fiveep.password=Y48hD&Eg
+spring.datasource.dynamic.primary=usky-power
+spring.datasource.dynamic.datasource.usky-power.url=jdbc:mysql://101.133.214.75:3306/usky-electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
+spring.datasource.dynamic.datasource.usky-power.username=usky
+spring.datasource.dynamic.datasource.usky-power.password=Yt#75Usky
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30

fiveep-controller/src/main/resources/application-prod.properties

@@ -3,7 +3,7 @@ spring.main.lazy-initialization=false
 spring.main.allow-bean-definition-overriding=true
 temp.basedir=C:/Users/jichaobo/Desktop
 # application
-server.port=8010
+server.port=8011
 # mybatis-plus
 mybatis-plus.mapper-locations=classpath*:mapper/**/*.xml
 mybatis-plus.configuration.lazy-loading-enabled=true
@@ -16,10 +16,10 @@ mybatis.refresh.delay-seconds=10
 mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-spring.datasource.dynamic.primary=fiveep
-spring.datasource.dynamic.datasource.fiveep.url=jdbc:mysql://124.70.160.158:3306/smart_electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
-spring.datasource.dynamic.datasource.fiveep.username=root
-spring.datasource.dynamic.datasource.fiveep.password=Y48hD&Eg
+spring.datasource.dynamic.primary=usky-power
+spring.datasource.dynamic.datasource.usky-power.url=jdbc:mysql://101.133.214.75:3306/usky-electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
+spring.datasource.dynamic.datasource.usky-power.username=usky
+spring.datasource.dynamic.datasource.usky-power.password=Yt#75Usky
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30

fiveep-controller/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 # common
 spring.profiles.active=dev
-spring.application.name=fiveep
+spring.application.name=usky-power
 spring.main.banner-mode=off
 mybatis-plus.global-config.banner=false
 # log4j2

fiveep-controller/src/main/resources/log4j2-spring-dev.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration status="OFF">
     <properties>
-        <property name="LOG_HOME">./logs/fiveep</property>
+        <property name="LOG_HOME">./logs/usky-power</property>
         <Property name="CONSOLE_LOG_PATTERN">%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{blue} %clr{%-5level}
             %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%l}{cyan} %clr{:}{faint} %m%n%xwEx
         </Property>

fiveep-controller/src/main/resources/log4j2-spring-prod.xml

@@ -2,7 +2,7 @@
 <configuration status="OFF">
 
     <properties>
-        <property name="LOG_HOME">/data/logs/fiveep</property>
+        <property name="LOG_HOME">/data/logs/usky-power</property>
         <Property name="CONSOLE_LOG_PATTERN">%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{blue} %clr{%-5level}
             %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%l}{cyan} %clr{:}{faint} %m%n%xwEx
         </Property>

fiveep-controller/src/main/resources/log4j2-spring-test.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration status="OFF">
     <properties>
-        <property name="LOG_HOME">/data/logs/fiveep</property>
+        <property name="LOG_HOME">/data/logs/usky-power</property>
     </properties>
     <appenders>
         <!-- 日志级别：ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF -->

fiveep-model/pom.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>fiveep</artifactId>
+        <artifactId>usky-power</artifactId>
         <groupId>com.bizmatics</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>fiveep-model</artifactId>
-    <name>fiveep-model</name>
+    <artifactId>usky-power-model</artifactId>
+    <name>usky-power-model</name>
     <version>0.0.1</version>
 
     <dependencies>
@@ -23,18 +23,18 @@
 <!--        </dependency>-->
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-common-core</artifactId>
+            <artifactId>usky-power-common-core</artifactId>
             <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-common-spring</artifactId>
+            <artifactId>usky-power-common-spring</artifactId>
             <version>0.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-common-mvc</artifactId>
+            <artifactId>usky-power-common-mvc</artifactId>
             <version>0.0.1</version>
         </dependency>
 

fiveep-model/src/main/java/com/bizmatics/model/SysTenant.java

@@ -0,0 +1,108 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 租户信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysTenant implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 租户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantCode;
+
+    /**
+     * 租户名称
+     */
+    private String tenantName;
+
+    /**
+     * 租户负责人
+     */
+    private String tenantManager;
+
+    /**
+     * 租户类型（0 试用租户  1 正式租户）
+     */
+    private String tenantType;
+
+    /**
+     * 租户站点域名
+     */
+    private String domain;
+
+    /**
+     * 租户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 有效期限
+     */
+    private String tenantTerm;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 租户状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

fiveep-model/src/main/java/com/bizmatics/model/SysTenantConfig.java

@@ -0,0 +1,123 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 租户配置表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysTenantConfig implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 租户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+    /**
+     * 租户名称
+     */
+    private String loginTitle;
+
+    /**
+     * 登录页log
+     */
+    private String loginLogo;
+
+    /**
+     * 登录页背景地址
+     */
+    private String loginBackUrl;
+
+    /**
+     * 登录页底部名称
+     */
+    private String loginFooter;
+
+    /**
+     * 登录类型
+     */
+    private String loginType;
+
+    /**
+     * 中间页logo地址
+     */
+    private String middleLogo;
+
+    /**
+     * 中间页背景URL
+     */
+    private String middleBackUrl;
+
+    /**
+     * 中间页标题
+     */
+    private String middleTitle;
+
+    /**
+     * 中间页底部名称
+     */
+    private String middleFooter;
+
+    /**
+     * 主页logo地址
+     */
+    private String homeLogo;
+
+    /**
+     * 主页默认访问地址
+     */
+    private String homePageUrl;
+
+    /**
+     * 主页导航布局
+     */
+    private String homeLayout;
+
+    /**
+     * 主页主题样式
+     */
+    private String homeStyle;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

fiveep-model/src/main/java/com/bizmatics/model/base/BaseEntity.java

@@ -43,6 +43,7 @@ public class BaseEntity implements Serializable {
      */
     private String remark;
 
+
     /**
      * 开始时间
      */

fiveep-model/src/main/java/com/bizmatics/model/system/SysUser.java

@@ -85,6 +85,11 @@ public class SysUser extends BaseEntity
     /** 创建用户 */
     private String createByOne;
 
+    /** 地址 */
+    private String address;
+
+
+
     public SysUser()
     {
 
@@ -323,6 +328,14 @@ public class SysUser extends BaseEntity
         return createByOne;
     }
 
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
 
     @Override
     public String toString() {

fiveep-model/src/main/java/com/bizmatics/model/system/SysUserVo.java

@@ -0,0 +1,245 @@
+package com.bizmatics.model.system;
+
+import com.bizmatics.model.base.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 用户对象 sys_user
+ * 
+ * @author yq
+ */
+public class SysUserVo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 用户账号 */
+    private String userName;
+
+    /** 用户昵称 */
+    private String nickName;
+
+    /** 用户邮箱 */
+    private String email;
+
+    /** 手机号码 */
+    private String phonenumber;
+
+    /** 用户性别 */
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 帐号状态（0正常 1停用） */
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最后登录IP */
+    private String loginIp;
+
+    /** 最后登录时间 */
+    private Date loginDate;
+
+    public SysUserVo()
+    {
+
+    }
+
+    public SysUserVo(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    public String getNickName()
+    {
+        return nickName;
+    }
+
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    public void setEmail(String email)
+    {
+        this.email = email;
+    }
+
+    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber)
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getAvatar()
+    {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar)
+    {
+        this.avatar = avatar;
+    }
+
+    @JsonIgnore
+    @JsonProperty
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getLoginIp()
+    {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp)
+    {
+        this.loginIp = loginIp;
+    }
+
+    public Date getLoginDate()
+    {
+        return loginDate;
+    }
+
+    public void setLoginDate(Date loginDate)
+    {
+        this.loginDate = loginDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .append("userName", getUserName())
+            .append("nickName", getNickName())
+            .append("email", getEmail())
+            .append("phonenumber", getPhonenumber())
+            .append("sex", getSex())
+            .append("avatar", getAvatar())
+            .append("password", getPassword())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("loginIp", getLoginIp())
+            .append("loginDate", getLoginDate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

fiveep-model/src/main/java/com/bizmatics/model/vo/SysTenantVo.java

@@ -0,0 +1,146 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.bizmatics.model.system.SysDept;
+import com.bizmatics.model.system.SysRole;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 个人信息
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysTenantVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 用户账号 */
+    private String userName;
+
+    /** 用户昵称 */
+    private String nickName;
+
+    /** 用户邮箱 */
+    private String email;
+
+    /** 手机号码 */
+    private String phonenumber;
+
+    /** 用户性别 */
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 盐加密 */
+    private String salt;
+
+    /** 帐号状态（0正常 1停用） */
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最后登录IP */
+    private String loginIp;
+
+    /** 最后登录时间 */
+    private Date loginDate;
+
+    /** 部门对象 */
+    private SysDept dept;
+
+    /** 角色对象 */
+    private List<SysRole> roles;
+
+    /** 角色组 */
+    private Long[] roleIds;
+
+    /** 岗位组 */
+    private Long[] postIds;
+
+    /** 角色ID */
+    private Long roleId;
+
+    /** 站点组组 */
+    private int[] siteId;
+
+    /** 创建用户 */
+    private String createByOne;
+
+
+
+    /**
+     * 租户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantCode;
+
+    /**
+     * 租户名称
+     */
+    private String tenantName;
+
+    /**
+     * 租户负责人
+     */
+    private String tenantManager;
+
+    /**
+     * 租户类型（0 试用租户  1 正式租户）
+     */
+    private String tenantType;
+
+    /**
+     * 租户站点域名
+     */
+    private String domain;
+
+    /**
+     * 手机号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 有效期限
+     */
+    private String tenantTerm;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

fiveep-persistence/pom.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>fiveep</artifactId>
+        <artifactId>usky-power</artifactId>
         <groupId>com.bizmatics</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
 
-    <artifactId>fiveep-persistence</artifactId>
-    <name>fiveep-persistence</name>
+    <artifactId>usky-power-persistence</artifactId>
+    <name>usky-power-persistence</name>
     <version>0.0.1</version>
 
     <dependencies>
 
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-model</artifactId>
+            <artifactId>usky-power-model</artifactId>
             <version>0.0.1</version>
         </dependency>
 

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SysTenantConfigMapper.java

@@ -0,0 +1,20 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.SysTenantConfig;
+import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.vo.SysTenantVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户配置表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-06
+ */
+public interface SysTenantConfigMapper extends CrudMapper<SysTenantConfig> {
+    List<SysTenantConfig> getTenantConfig(@Param("url") String url);
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SysTenantMapper.java

@@ -0,0 +1,23 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.SysTenant;
+import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.vo.SiteListVo;
+import com.bizmatics.model.vo.SysTenantVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-05
+ */
+public interface SysTenantMapper extends CrudMapper<SysTenant> {
+
+    List<SysTenantVo> getUserData(@Param("userId") int userId);
+
+}

fiveep-persistence/src/main/resources/mapper/mysql/SysTenantConfigMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.persistence.mapper.SysTenantConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.SysTenantConfig">
+        <id column="id" property="id" />
+        <result column="tenant_id" property="tenantId" />
+        <result column="login_title" property="loginTitle" />
+        <result column="login_logo" property="loginLogo" />
+        <result column="login_back_url" property="loginBackUrl" />
+        <result column="login_footer" property="loginFooter" />
+        <result column="login_type" property="loginType" />
+        <result column="middle_logo" property="middleLogo" />
+        <result column="middle_back_url" property="middleBackUrl" />
+        <result column="middle_title" property="middleTitle" />
+        <result column="middle_footer" property="middleFooter" />
+        <result column="home_logo" property="homeLogo" />
+        <result column="home_page_url" property="homePageUrl" />
+        <result column="home_layout" property="homeLayout" />
+        <result column="home_style" property="homeStyle" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+    <select id="getTenantConfig" resultType="com.bizmatics.model.SysTenantConfig">
+        SELECT
+        b.*
+        FROM
+        sys_tenant AS a
+        JOIN sys_tenant_config AS b ON a.id = b.tenant_id
+        <where>
+            a. STATUS = 0
+            AND a.domain = #{url}
+        </where>
+    </select>
+</mapper>

fiveep-persistence/src/main/resources/mapper/mysql/SysTenantMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.persistence.mapper.SysTenantMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.SysTenant">
+        <id column="id" property="id" />
+        <result column="tenant_code" property="tenantCode" />
+        <result column="tenant_name" property="tenantName" />
+        <result column="tenant_manager" property="tenantManager" />
+        <result column="tenant_type" property="tenantType" />
+        <result column="domain" property="domain" />
+        <result column="email" property="email" />
+        <result column="phone_number" property="phoneNumber" />
+        <result column="address" property="address" />
+        <result column="tenant_term" property="tenantTerm" />
+        <result column="remark" property="remark" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <select id="getUserData" resultType="com.bizmatics.model.vo.SysTenantVo">
+        SELECT
+        a.*,b.id,b.tenant_code,b.tenant_name,b.tenant_manager,b.tenant_type,b.domain,b.phone_number,b.address,b.tenant_term
+        FROM
+        sys_user AS a
+        LEFT JOIN sys_tenant AS b ON a.tenant_id = b.id
+        <where>
+            a.user_id =  #{userId}
+        </where>
+    </select>
+
+</mapper>

fiveep-persistence/src/main/resources/mapper/mysql/system/SysUserMapper.xml

@@ -190,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="address != null and address != ''">address = #{address},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

fiveep-service/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>fiveep</artifactId>
+        <artifactId>usky-power</artifactId>
         <groupId>com.bizmatics</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>fiveep-service</artifactId>
-    <name>fiveep-service</name>
+    <artifactId>usky-power-service</artifactId>
+    <name>usky-power-service</name>
     <version>0.0.1</version>
 
     <dependencies>
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>com.bizmatics</groupId>
-            <artifactId>fiveep-persistence</artifactId>
+            <artifactId>usky-power-persistence</artifactId>
             <version>0.0.1</version>
         </dependency>
 

fiveep-service/src/main/java/com/bizmatics/service/SysTenantConfigService.java

@@ -0,0 +1,18 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.SysTenantConfig;
+import com.bizmatics.common.mvc.base.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户配置表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-06
+ */
+public interface SysTenantConfigService extends CrudService<SysTenantConfig> {
+    List<SysTenantConfig> getTenantConfig(String url);
+}

fiveep-service/src/main/java/com/bizmatics/service/SysTenantService.java

@@ -0,0 +1,21 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.SysTenant;
+import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.SysTenantVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-05
+ */
+public interface SysTenantService extends CrudService<SysTenant> {
+    List<SysTenantVo> getUserData();
+
+}

fiveep-service/src/main/java/com/bizmatics/service/config/SecurityConfig.java

@@ -98,7 +98,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/getLoginStyle").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/getLoginStyle","/sysTenantConfig/getTenantConfig","/aliWeather").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

fiveep-service/src/main/java/com/bizmatics/service/impl/SysTenantConfigServiceImpl.java

@@ -0,0 +1,27 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.model.SysTenantConfig;
+import com.bizmatics.persistence.mapper.SysTenantConfigMapper;
+import com.bizmatics.service.SysTenantConfigService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户配置表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-06
+ */
+@Service
+public class SysTenantConfigServiceImpl extends AbstractCrudService<SysTenantConfigMapper, SysTenantConfig> implements SysTenantConfigService {
+
+    @Override
+    public List<SysTenantConfig> getTenantConfig(String url) {
+        List<SysTenantConfig> list = baseMapper.getTenantConfig(url);
+        return list;
+    }
+}

fiveep-service/src/main/java/com/bizmatics/service/impl/SysTenantServiceImpl.java

@@ -0,0 +1,39 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.model.Device;
+import com.bizmatics.model.SysTenant;
+import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.SiteDeviceCountVo;
+import com.bizmatics.model.vo.SysTenantVo;
+import com.bizmatics.persistence.mapper.SysTenantMapper;
+import com.bizmatics.persistence.mapper.system.SysUserMapper;
+import com.bizmatics.service.SysTenantService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户信息表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-05
+ */
+@Service
+public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, SysTenant> implements SysTenantService {
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Override
+    public List<SysTenantVo> getUserData() {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Integer userId = user.getUserId().intValue();
+        List<SysTenantVo> list = baseMapper.getUserData(userId);
+        return list;
+    }
+}

fiveep-service/src/main/java/com/bizmatics/service/system/ISysUserService.java

@@ -127,6 +127,14 @@ public interface ISysUserService {
      */
     public int updateUser(SysUser user);
 
+
+    /**
+     * 个人中心-信息编辑
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUser1(SysUser user);
     /**
      * 用户授权角色
      *

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysUserServiceImpl.java

@@ -50,6 +50,7 @@ public class SysUserServiceImpl implements ISysUserService {
 
     @Autowired
     private UserSiteMapper userSiteMapper;
+
     /**
      * 根据条件分页查询用户列表
      *
@@ -282,6 +283,11 @@ public class SysUserServiceImpl implements ISysUserService {
         return userMapper.updateUser(user);
     }
 
+    @Override
+    public int updateUser1(SysUser user) {
+        return userMapper.updateUser(user);
+    }
+
     /**
      * 用户授权角色
      *

pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.bizmatics</groupId>
-    <artifactId>fiveep</artifactId>
+    <artifactId>usky-power</artifactId>
     <packaging>pom</packaging>
     <version>0.0.1</version>
 
-    <name>fiveep</name>
-    <description>fiveep</description>
+    <name>usky-power</name>
+    <description>usky-power</description>
 
 
     <parent>