Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

# Conflicts:
#	src/main/resources/application.properties

README.md

@@ -2,4 +2,20 @@
 
 ## 代码生成方法
 
-* test/com.mokamrp/AutoMP 右击运行即可
+* test/com.mokamrp/AutoMP 右击运行即可
+
+## 加环境配置启动
+
+* 和环境相关的配置都放在application-{profiles}.properties里面
+* java -jar -Dspring.profiles.active=test moka-private.jar
+* {profiles} test表示测试环境  pro表示正式环境
+* idea中切换环境，点击右上角Maven窗口上面的Profiles切换环境
+
+
+## Mac/Linux系统配置环境变量模式
+
+编辑环境变量配置文件/etc/profile，添加名为SPRING_PROFILES_ACTIVE的环境变量
+
+如下所示： spring 环境激活
+
+export SPRING_PROFILES_ACTIVE=test

pom.xml

@@ -1,237 +1,178 @@
 <?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.mokamrp</groupId>
-  <artifactId>moka-private</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>moka-private</name>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <redis.version>3.1.0</redis.version>
-    <springboot.version>2.1.7.RELEASE</springboot.version>
-  </properties>
-  <dependencyManagement>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.mokamrp</groupId>
+    <artifactId>moka-private</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>moka-private</name>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <redis.version>3.1.0</redis.version>
+        <springboot.version>2.1.7.RELEASE</springboot.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.1.7.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.1.7.RELEASE</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.nekohtml</groupId>
-      <artifactId>nekohtml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-thymeleaf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mybatis</groupId>
-      <artifactId>mybatis-ehcache</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>2.8.3</version>
-    </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>fastjson</artifactId>
-      <version>1.2.62</version>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
-    <dependency>
-      <groupId>com.baomidou</groupId>
-      <artifactId>mybatis-plus-boot-starter</artifactId>
-      <version>3.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.baomidou</groupId>
-      <artifactId>mybatis-plus-generator</artifactId>
-      <version>3.4.1</version>
-    </dependency>
-    <!-- Apache velocity -->
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity-engine-core</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.8</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- xxl-sso-core -->
-    <dependency>
-      <groupId>com.xuxueli</groupId>
-      <artifactId>xxl-sso-core</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
-    </dependency>
-    <!-- jedis -->
-    <dependency>
-      <groupId>redis.clients</groupId>
-      <artifactId>jedis</artifactId>
-      <version>3.2.0</version>
-    </dependency>
-    <!-- redis 缓存操作 -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-data-redis</artifactId>
-    </dependency>
-    <!-- 开启二级缓存 -->
-    <dependency>
-      <groupId>org.mybatis.caches</groupId>
-      <artifactId>mybatis-ehcache</artifactId>
-      <version>1.1.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.aliyun.oss</groupId>
-      <artifactId>aliyun-sdk-oss</artifactId>
-      <version>3.8.0</version>
-    </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-ehcache</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>2.8.3</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+        <!-- Apache velocity -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- xxl-sso-core -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-sso-core</artifactId>
+            <version>1.1.1-SNAPSHOT</version>
+        </dependency>
+        <!-- jedis -->
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <!-- redis 缓存操作 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <!-- 开启二级缓存 -->
+        <dependency>
+            <groupId>org.mybatis.caches</groupId>
+            <artifactId>mybatis-ehcache</artifactId>
+            <version>1.1.0</version>
+        </dependency>
 
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory><!--所在的目录-->
-        <includes><!--包括目录下的.properties,.xml文件都会扫描到-->
-          <include>**/*.xml</include>
-        </includes>
-        <filtering>false</filtering>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory><!--所在的目录-->
-        <includes><!--包括目录下的.properties,.xml文件都会扫描到-->
-          <include>**/*.xml</include>
-          <include>**/*.properties</include>
-        </includes>
-        <filtering>false</filtering>
-      </resource>
-      <resource>
-        <directory>src/main/resources/template</directory><!--所在的目录-->
-        <includes><!--包括目录下的.properties,.xml文件都会扫描到-->
-          <include>**/*.vm</include>
-        </includes>
-        <filtering>false</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18.1</version>
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.2</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>2.1.7.RELEASE</version>
-        <configuration>
-          <fork>true</fork>
-          <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
-          <includeSystemScope>true</includeSystemScope>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- maven资源文件复制插件 -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
-        <executions>
-          <execution>
-            <id>copy-config</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/resources</directory>
-                  <includes>
-                    <exclude>**/*.xml</exclude>
-                    <exclude>**/*.conf</exclude>
-                    <exclude>**/*.properties</exclude>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-              <encoding>UTF-8</encoding>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <finalName>moka-private</finalName>
-          <excludes>
-            <exclude>*.properties</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.8.0</version>
+        </dependency>
 
+    </dependencies>
+    <profiles>
+        <!--        <profile>-->
+        <!--            <id>dev</id>-->
+        <!--            <properties>-->
+        <!--                <profileActive>dev</profileActive>-->
+        <!--            </properties>-->
+        <!--            <activation>-->
+        <!--                <activeByDefault>true</activeByDefault>-->
+        <!--            </activation>-->
+        <!--        </profile>-->
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>test</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>prod</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 
 </project>

src/main/java/com/mokamrp/privates/config/CorsConfig.java

@@ -0,0 +1,22 @@
+package com.mokamrp.privates.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 跨域配置文件
+ */
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**") // 允许跨域访问的路径
+                .allowedOrigins("*")    // 允许跨域访问的源
+                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")    // 允许请求方法
+                .maxAge(168000)    // 预检间隔时间
+                .allowedHeaders("*")  // 允许头部设置
+                .allowCredentials(true);    // 是否发送cookie
+    }
+}

src/main/java/com/mokamrp/privates/config/CrossOriginFilter.java

@@ -1,35 +0,0 @@
-package com.mokamrp.privates.config;
-
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@Component
-@Order(1)
-public class CrossOriginFilter implements Filter {
-
-    @Override
-    public void init(FilterConfig filterConfig) {
-    }
-
-    @Override
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
-            throws IOException, ServletException {
-        HttpServletResponse response = (HttpServletResponse) servletResponse;
-        response.setHeader("Access-Control-Allow-Origin", "*");
-        response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Methods", "*");
-        response.setHeader("Access-Control-Allow-Headers",
-                "Origin,Content-Type,XFILENAME,XFILECATEGORY,XFILESIZE,X-URL-PATH,Authorization,X-Requested-With, Content-Type, Accept");
-        filterChain.doFilter(servletRequest, servletResponse);
-    }
-
-    @Override
-    public void destroy() {
-
-    }
-
-}

src/main/java/com/mokamrp/privates/controller/GroupController.java

@@ -1,13 +1,16 @@
 package com.mokamrp.privates.controller;
 
 
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.GetWorkRoomHandle;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.help.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
 import com.mokamrp.privates.service.GroupService;
 import com.mokamrp.privates.mapper.pojo.Group;
 
-import org.springframework.web.bind.annotation.RestController;
-
 import javax.validation.Valid;
 import java.util.List;
 
@@ -32,6 +35,22 @@ public class GroupController extends BaseController<Group> {
      * 如果需要定制化，需要将BaseController中对应的方法复制到当前控制器,然后进行修改
      */
 
+    /**
+     * 账号总揽
+     * @return
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@Valid @RequestBody PostBasePageHandle handle, BindingResult bindingResult){
+
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        Object res = groupService.selectGroupData(handle);
+
+        return AjaxResult.success("success", res);
+    }
 
 }
 

src/main/java/com/mokamrp/privates/controller/UserController.java

@@ -2,9 +2,12 @@ package com.mokamrp.privates.controller;
 
 
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.GetWorkRoomHandle;
 import com.mokamrp.privates.entity.LoginHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.service.UserCorpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,8 +15,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,5 +32,11 @@ import java.util.Map;
 @Controller
 @RequestMapping("/user")
 public class UserController extends BaseController<User>{
+
+    @PostMapping("/info")
+    @ResponseBody
+    public Object info(@AuthUser User authUser) {
+        return AjaxResult.success(authUser);
+    }
 }
 

src/main/java/com/mokamrp/privates/controller/WorkContactEmployeeController.java

@@ -69,16 +69,14 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult,
-            HttpServletRequest request) {
+            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult) {
 
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
 
         if(corpIds.size() <=0){
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
@@ -88,22 +86,19 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
         Map<String, Object> resMap = WorkContactEmployeeService.getPageList(handle);//所有
 
         return AjaxResult.success(resMap);
-
     }
 
     @RequestMapping("/export")
     @ResponseBody
     public Object export(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult,
-            HttpServletRequest request) {
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if(corpIds.size() <=0){
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
@@ -112,8 +107,9 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
 
         Downfile downObj = new Downfile();
         downObj.setMsg(Downfile.DEFAULT_MSG);
-        downObj.setAuthId(authUser.getId());
+        downObj.setAuthId(Integer.parseInt(authUser.getId().toString()));
         downObj.setAuthName(authUser.getName());
+
         downObj.setTitle(Downfile.WORK_CONTACT_EMPLOYEE);
         downfileService.save(downObj);
 

src/main/java/com/mokamrp/privates/controller/WorkEmployeeController.java

@@ -69,8 +69,8 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
             return AjaxResult.error(HttpStatus.LOGIN_ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> userCorpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
-        Object res = workEmployeeService.selectWorkEmployeeList(user.getUserid(), workEmployee);
+        List<Integer> userCorpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
+        Object res = workEmployeeService.selectWorkEmployeeList(authUser.getId().toString(), workEmployee);
         return AjaxResult.success(res);
     }
 
@@ -78,16 +78,13 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult,
-            HttpServletRequest request) {
-
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+            @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
@@ -118,15 +115,13 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
     @ResponseBody
     public Object export(
             @AuthUser User authUser,
-            @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult,
-            HttpServletRequest request) {
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+            @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if(corpIds.size() <=0){
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }

src/main/java/com/mokamrp/privates/controller/WorkRoomController.java

@@ -61,16 +61,13 @@ public class WorkRoomController extends BaseController<WorkRoom> {
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult,
-            HttpServletRequest request) {
-
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
@@ -88,12 +85,11 @@ public class WorkRoomController extends BaseController<WorkRoom> {
             @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult,
             HttpServletRequest request) {
 
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }

src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java

@@ -0,0 +1,9 @@
+package com.mokamrp.privates.entity;
+
+import lombok.Data;
+
+@Data
+public class PostBasePageHandle {
+    private Integer page;
+    private Integer pagesize;
+}

src/main/java/com/mokamrp/privates/entity/PostWorkEmployee.java

@@ -17,4 +17,5 @@ public class PostWorkEmployee {
     private Integer gender;
     private Integer groupId;
     private String mobile;
+    private Integer privateTagId;
 }

src/main/java/com/mokamrp/privates/entity/WorkEmployeeHandle.java

@@ -24,5 +24,7 @@ public class WorkEmployeeHandle {
     private String admin;
     //.标签
     private Integer tag;
+    //.标签
+    private Integer privateTagId;
 
 }

src/main/java/com/mokamrp/privates/mapper/GroupMapper.java

@@ -1,7 +1,14 @@
 package com.mokamrp.privates.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mokamrp.privates.mapper.pojo.Group;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
+import com.mokamrp.privates.mapper.vo.WorkGroupDataVo;
+import com.mokamrp.privates.mapper.vo.WorkRoomVo;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -18,4 +25,15 @@ import java.util.Map;
 @Component
 public interface GroupMapper extends BaseMapper<Group> {
     public List<Map<String, Object>> selectCorpAndWorkEmployeeList(String corpIds);
+    Integer getBaseJoinListTotal();
+    List<WorkGroupDataVo> getBaseJoinList(IPage<WorkGroupDataVo> page);
+
+    @MapKey("group_id")
+    Map<String,Map<String, Object>> getRoomData(@Param("ew") QueryWrapper<WorkGroupDataVo> queryWrapper);
+
+    @MapKey("group_id")
+    Map<String,Map<String, Object>> getFanData(@Param("ew") QueryWrapper<WorkGroupDataVo> queryWrapper);
+
+    List<Map<String, Object>> getEmployeeDataList(@Param("ew") QueryWrapper<WorkGroupDataVo> queryWrapper);
+
 }

src/main/java/com/mokamrp/privates/mapper/GroupMapper.xml

@@ -2,8 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.mokamrp.privates.mapper.GroupMapper">
 
-    <!-- 开启二级缓存 -->
-    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.Group">
@@ -45,4 +43,69 @@
         WHERE A.corp_id IN (#{corpIds})
     </select>
 
+    <select id="getBaseJoinList" resultType="com.mokamrp.privates.mapper.vo.WorkGroupDataVo">
+        SELECT
+            a.*,count(*) as companyNum
+        FROM
+            private_group AS a
+            LEFT JOIN private_group_corp AS b ON b.group_id = a.id
+            LEFT JOIN mc_corp AS c ON b.corp_id = c.id
+        WHERE
+            group_type =1
+        GROUP BY a.id
+    </select>
+
+    <select id="getBaseJoinListTotal" resultType="Integer">
+        SELECT
+            count(*)
+        FROM
+            private_group
+        WHERE
+            group_type =1
+    </select>
+
+    <select id="getRoomData" resultType="map">
+        SELECT
+            c.group_id,a.corp_id,count(*) as num
+        FROM
+            mc_work_room AS a
+            LEFT JOIN mc_corp AS b ON b.id = a.corp_id
+            LEFT JOIN private_group_corp AS c ON b.id = c.corp_id
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        group by c.group_id;
+    </select>
+
+    <select id="getFanData" resultType="map">
+        SELECT
+            c.group_id,a.corp_id,count(*) as num
+        FROM
+            mc_work_contact_employee AS a
+            LEFT JOIN mc_corp AS b ON b.id = a.corp_id
+            LEFT JOIN private_group_corp AS c ON b.id = c.corp_id
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        group by c.group_id;
+    </select>
+
+    <select id="getEmployeeDataList" resultType="map">
+        SELECT
+            c.group_id,
+            a.private_tag_id,
+            d.tag_name,
+            concat(c.group_id,"_",a.private_tag_id) as kk,
+            count(*) as num
+        FROM
+            mc_work_employee AS a
+        LEFT JOIN mc_corp AS b ON b.id = a.corp_id
+        LEFT JOIN private_group_corp AS c ON b.id = c.corp_id
+        LEFT JOIN private_tag AS D ON a.private_tag_id = d.id
+        where d.tag_name != '' AND ${ew.sqlSegment}
+        GROUP BY
+            c.group_id,
+            a.private_tag_id
+    </select>
+
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkEmployeeMapper.xml

@@ -57,12 +57,14 @@
             A.in_group_cnt,
             A.wx_user_id,
             C.`name` AS companyName,
-            D.group_id
+            D.group_id,
+            E.tag_name
         FROM
             mc_work_employee AS A
             LEFT JOIN private_group_corp AS D ON A.corp_id = D.corp_id
             LEFT JOIN private_group AS B ON D.group_id = B.id
             LEFT JOIN mc_corp AS C ON A.corp_id = C.id
+            LEFT JOIN private_tag AS E ON E.id = A.private_tag_id
         <where>
             ${ew.sqlSegment}
         </where>
@@ -78,6 +80,7 @@
         LEFT JOIN private_group_corp AS D ON A.corp_id = D.corp_id
         LEFT JOIN private_group AS B ON D.group_id = B.id
         LEFT JOIN mc_corp AS C ON A.corp_id = C.id
+        LEFT JOIN private_tag AS E ON E.id = A.private_tag_id
         <where>
             ${ew.sqlSegment}
         </where>

src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.xml

@@ -27,20 +27,22 @@
 
     <select id="getVoList" resultType="com.mokamrp.privates.mapper.vo.WorkRoomVo">
         SELECT
-        a.*,
-        c.group_id AS company_group_id,
-        b.`name` AS corp_name,
-        e.`name` AS employee_name,
-        c.group_id,
-        GROUP_CONCAT(g.tag_name) as tag_names
+            a.*,
+            c.group_id AS company_group_id,
+            b.`name` AS corp_name,
+            e.`name` AS employee_name,
+            c.group_id,
+            h.group_name,
+            GROUP_CONCAT(g.tag_name) as tag_names
         FROM
-        mc_work_room AS a
+            mc_work_room AS a
         LEFT JOIN mc_corp AS b ON a.corp_id = b.id
         LEFT JOIN private_group_corp AS c ON a.corp_id = c.corp_id
         LEFT JOIN mc_corp AS d ON a.corp_id = d.id
         LEFT JOIN mc_work_employee AS e ON a.owner_id = e.id
         LEFT JOIN private_room_tag AS f ON a.id = f.room_id
         LEFT JOIN private_tag AS g ON g.id = f.tag_id
+        LEFT JOIN private_group AS h ON h.id = c.group_id
         <where>
             ${ew.sqlSegment}
         </where>

src/main/java/com/mokamrp/privates/mapper/vo/WorkEmployeeVo.java

@@ -33,6 +33,15 @@ public class WorkEmployeeVo {
     private Object fanNum;
     private String wxUserId;
     private Integer groupId;
+    private String tagName;
+
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
 
     public Integer getGroupId() {
         return groupId;

src/main/java/com/mokamrp/privates/mapper/vo/WorkGroupDataVo.java

@@ -0,0 +1,71 @@
+package com.mokamrp.privates.mapper.vo;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 通讯录 - 客户 中间表
+ * </p>
+ *
+ * @author gengyang
+ * @since 2021-04-17
+ */
+public class WorkGroupDataVo {
+
+    private Integer id;
+    private String groupName;
+    private String companyNum;
+    private Integer totalFanNum;
+    private Integer totalRoomNum;
+    private List<Map<String,Object>> employeeList;
+
+    public List<Map<String, Object>> getEmployeeList() {
+        return employeeList;
+    }
+
+    public void setEmployeeList(List<Map<String, Object>> employeeList) {
+        this.employeeList = employeeList;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getCompanyNum() {
+        return companyNum;
+    }
+
+    public void setCompanyNum(String companyNum) {
+        this.companyNum = companyNum;
+    }
+
+    public Integer getTotalFanNum() {
+        return totalFanNum;
+    }
+
+    public void setTotalFanNum(Integer totalFanNum) {
+        this.totalFanNum = totalFanNum;
+    }
+
+    public Integer getTotalRoomNum() {
+        return totalRoomNum;
+    }
+
+    public void setTotalRoomNum(Integer totalRoomNum) {
+        this.totalRoomNum = totalRoomNum;
+    }
+}

src/main/java/com/mokamrp/privates/mapper/vo/WorkRoomVo.java

@@ -29,6 +29,15 @@ public class WorkRoomVo {
     private Integer addNum;
     private Integer leftNum;
     private String tagNames;
+    private String groupName;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
 
     public Integer getCorpId() {
         return corpId;

src/main/java/com/mokamrp/privates/service/GroupService.java

@@ -1,8 +1,12 @@
 package com.mokamrp.privates.service;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pojo.Group;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 分组信息表 服务类
@@ -12,5 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2021-04-20
  */
 public interface GroupService extends IService<Group> {
-
+    public Map<String, Object> selectGroupData(PostBasePageHandle handle);
 }

src/main/java/com/mokamrp/privates/service/impl/GroupServiceImpl.java

@@ -1,10 +1,21 @@
 package com.mokamrp.privates.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.mapper.WorkRoomMapper;
 import com.mokamrp.privates.mapper.pojo.Group;
 import com.mokamrp.privates.mapper.GroupMapper;
+import com.mokamrp.privates.mapper.vo.WorkGroupDataVo;
 import com.mokamrp.privates.service.GroupService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -17,4 +28,73 @@ import org.springframework.stereotype.Service;
 @Service
 public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements GroupService {
 
+    @Autowired
+    public GroupMapper groupMapper;
+
+    @Autowired
+    public WorkRoomMapper workRoomMapper;
+
+    @Override
+    public Map<String, Object> selectGroupData(PostBasePageHandle handle) {
+
+        Page<WorkGroupDataVo> pageObj = new Page<>(handle.getPage(), handle.getPagesize());
+        Integer total = 0;
+        List<WorkGroupDataVo> list;
+        Map<String, Object> resMap = new HashMap<String, Object>();
+        resMap.put("list", null);
+
+        list = groupMapper.getBaseJoinList(pageObj);
+        total = groupMapper.getBaseJoinListTotal();
+        int len = list.size();
+        if (len > 0) {
+            List<Integer> ids = list.stream().map(WorkGroupDataVo -> WorkGroupDataVo.getId()).collect(Collectors.toList());
+
+            QueryWrapper<WorkGroupDataVo> groupobj = new QueryWrapper<WorkGroupDataVo>();
+            groupobj.in("c.group_id", ids);
+            Map<String, Map<String, Object>> llist = groupMapper.getFanData(groupobj);
+            Map<String, Map<String, Object>> blist = groupMapper.getRoomData(groupobj);
+            List<Map<String, Object>> clist = groupMapper.getEmployeeDataList(groupobj);
+
+            int employeeLen = clist.size();
+
+            /**获取标签下客服数据**/
+            Integer tempGroupId;
+            int k;
+
+            for (int i = 0; i < len; i++){
+                List<Map<String,Object>> tempTagEmployeeDataList = new ArrayList<>();
+                Map<String,Object> tempTagEmployeeData = new HashMap<String, Object>();
+                WorkGroupDataVo detail =  list.get(i);
+
+                detail.setTotalFanNum(0);
+                detail.setTotalRoomNum(0);
+                if(llist.get(detail.getId()) != null){
+                    detail.setTotalFanNum(Integer.parseInt(llist.get(detail.getId()).get("num").toString()));
+                }
+
+                if(blist.get(detail.getId()) != null){
+                    detail.setTotalRoomNum(Integer.parseInt(blist.get(detail.getId()).get("num").toString()));
+                }
+
+                for (k = 0; k < employeeLen; k++) {
+                    tempGroupId= Integer.parseInt(clist.get(k).get("group_id").toString());
+
+                    if(detail.getId().equals(tempGroupId)){
+                        tempTagEmployeeData.put("privateTagId",clist.get(k).get("private_tag_id"));
+                        tempTagEmployeeData.put("tagName",clist.get(k).get("tag_name"));
+                        tempTagEmployeeData.put("num",clist.get(k).get("num"));
+                        tempTagEmployeeDataList.add(tempTagEmployeeData);
+                    }
+                }
+                detail.setEmployeeList(tempTagEmployeeDataList);
+            }
+
+        }
+
+        resMap.put("list", list);
+        resMap.put("total", total);
+
+        return resMap;
+    }
+
 }

src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java

@@ -165,6 +165,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
         Integer gender = handle.getGender();
         Integer groupId = handle.getGroupId();
         String mobile = handle.getMobile();
+        Integer privateTagId = handle.getPrivateTagId();
 
         QueryWrapper<WorkEmployeeVo> obj = new QueryWrapper<WorkEmployeeVo>();
 
@@ -178,11 +179,14 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
             obj.eq("A.gender", gender);
         }
 
+        if (privateTagId != null) {
+            obj.eq("A.private_tag_id", privateTagId);
+        }
+
         if (groupId != null) {
             obj.eq("D.group_id", groupId);
         }
 
-
         if (mobile != null) {
             obj.eq("A.mobile", mobile);
         }

src/main/java/com/mokamrp/privates/service/impl/WorkRoomServiceImpl.java

@@ -155,6 +155,9 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
                 list = list.stream().map(WorkRwoomVo -> {
                     WorkRoomVo detail = new WorkRoomVo();
                     BeanUtils.copyProperties(WorkRwoomVo, detail);
+                    detail.setTotalNum(0);
+                    detail.setAddNum(0);
+                    detail.setLeftNum(0);
                     if (dataById.get(detail.getId()) != null) {
                         detail.setTotalNum((dataById.get(detail.getId()).get("total")));
                         detail.setAddNum(dataById.get(detail.getId()).get("add_num"));

src/main/resources/application-prod.properties

@@ -0,0 +1,37 @@
+server.port=8085
+
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://rm-uf618jc32u2o80g55oo.mysql.rds.aliyuncs.com:3306/mochat
+spring.datasource.username=typer
+spring.datasource.password=jch9sh_shl
+spring.datasource.max-idle=10
+spring.datasource.max-wait=10000
+spring.datasource.min-idle=5
+spring.datasource.initial-size=5
+
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.configuration.map-underscore-to-camel-case=true
+
+spring.redis.host=r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com
+spring.redis.port=6379
+spring.redis.password=Jch9shshl
+spring.redis.database=7
+spring.redis.timeout=10s
+spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-active=20
+spring.redis.jedis.pool.max-wait=-1ms
+
+#阿里云oss配置(增加一个cdn地址配置)
+aliyun.host=https://mini-short-video-test.oss-cn-hangzhou.aliyuncs.com/
+aliyun.endpoint=https://oss-cn-hangzhou.aliyuncs.com
+aliyun.accessKeyId=LTAI4FnmkS1SNFkaKb4YZ1ga
+aliyun.accessKeySecret=irLfHOni7ffLU3yAf3LsKEXwQLfrNc
+aliyun.bucketName=mini-short-video-test
+spring.servlet.multipart.max-request-size=10MB
+spring.servlet.multipart.max-file-size=10MB
+
+xxl.sso.server=http://sso.mokamrp.com:8888/sso
+xxl.sso.logout.path=/logout
+xxl-sso.excluded.paths=
+xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0

src/main/resources/application-test.properties

@@ -0,0 +1,37 @@
+server.port=8085
+
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://rm-uf618jc32u2o80g55oo.mysql.rds.aliyuncs.com:3306/mochat
+spring.datasource.username=typer
+spring.datasource.password=jch9sh_shl
+spring.datasource.max-idle=10
+spring.datasource.max-wait=10000
+spring.datasource.min-idle=5
+spring.datasource.initial-size=5
+
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.configuration.map-underscore-to-camel-case=true
+
+spring.redis.host=r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com
+spring.redis.port=6379
+spring.redis.password=Jch9shshl
+spring.redis.database=7
+spring.redis.timeout=10s
+spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-active=20
+spring.redis.jedis.pool.max-wait=-1ms
+
+#阿里云oss配置(增加一个cdn地址配置)
+aliyun.host=https://mini-short-video-test.oss-cn-hangzhou.aliyuncs.com/
+aliyun.endpoint=https://oss-cn-hangzhou.aliyuncs.com
+aliyun.accessKeyId=LTAI4FnmkS1SNFkaKb4YZ1ga
+aliyun.accessKeySecret=irLfHOni7ffLU3yAf3LsKEXwQLfrNc
+aliyun.bucketName=mini-short-video-test
+spring.servlet.multipart.max-request-size=10MB
+spring.servlet.multipart.max-file-size=10MB
+
+xxl.sso.server=http://sso.mokamrp.com:8888/sso
+xxl.sso.logout.path=/logout
+xxl-sso.excluded.paths=
+xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0

src/main/resources/application.properties

@@ -1,5 +1,6 @@
 spring.application.name=moka-private
 server.port=8085
+<<<<<<< HEAD
 
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -38,4 +39,7 @@ xxl.sso.logout.path=/logout
 xxl-sso.excluded.paths=
 xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 
+server.servlet.context-path=/private
+spring.profiles.active=${profileActive}
+
 generator.buildpath=D://project/moka-private/src/main/java

src/main/resources/logback.xml → src/main/resources/logback-spring.xml

@@ -19,21 +19,29 @@
             <charset>UTF-8</charset>
         </encoder>
     </appender>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>logs/moka-private.log.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <MaxHistory>3</MaxHistory>
-        </rollingPolicy>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-    <!-- 日志输出级别 -->
-    <root level="INFO">
-        <appender-ref ref="CONSOLE" />
-<!--        <appender-ref ref="FILE" />-->
-    </root>
+    <springProfile name="prod">
+        <!-- 按照每天生成日志文件 -->
+        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+                <FileNamePattern>logs/moka-private-server.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+                <MaxHistory>3</MaxHistory>
+            </rollingPolicy>
+            <encoder>
+                <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+                <!-- 设置字符集 -->
+                <charset>UTF-8</charset>
+            </encoder>
+        </appender>
+    </springProfile>
+    <springProfile name="test">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE" />
+        </root>
+    </springProfile>
+    <springProfile name="prod">
+        <root level="INFO">
+            <appender-ref ref="FILE" />
+        </root>
+    </springProfile>
+
 </configuration>