整备版本

mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

pom.xml

@@ -0,0 +1,211 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.3</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.td</groupId>
+    <artifactId>Dawa</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>Dawa</name>
+    <description>Demo project for Spring Boot</description>
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.22</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!--调度工具-->
+        <!--<dependency>-->
+        <!--    <groupId>org.springframework.boot</groupId>-->
+        <!--    <artifactId>spring-boot-starter-quartz</artifactId>-->
+        <!--</dependency>-->
+		        <!--热部署工具dev-tools-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- security安全校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <!--jwt-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+
+        <!-- thymeleaf模板 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+
+        <!--添加springdata-jpa依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <!--添加MySQL驱动依赖 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.13</version>
+        </dependency>
+
+        <!-- CopyUtil需要用到 -->
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+
+        <!-- springboot websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <!-- Base64编码需要  -->
+        <dependency>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>org.apache.commons.codec</artifactId>
+            <version>1.8</version>
+        </dependency>
+
+        <!--提供更多的加密、填充方式-->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <version>1.46</version>
+        </dependency>
+
+        <!--aop 面向切面-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <!--https://github.com/oshi/oshi。-->
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-json</artifactId>
+            <version>3.6.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.60</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+        </dependency>
+
+        <!--redis 处理分布式锁等相关问题-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+
+        <!--定制请求跳过ssl证书验证-->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <!--定制请求跳过ssl证书验证-->
+
+    </dependencies>
+
+    <build>
+        <finalName>SNTown</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+			<!-- 跳过启动测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/main/java/com/td/Dawa/BossApplication.java

@@ -0,0 +1,284 @@
+package com.td.Dawa;
+
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.game.comusers.service.ComUsersService;
+import com.td.Dawa.game.excelcharacterattri.service.ExcelCharacterAttriService;
+import com.td.Dawa.game.excelcharactercolor.service.ExcelCharacterColorService;
+import com.td.Dawa.game.excelcharactercreate.service.ExcelCharacterCreateService;
+import com.td.Dawa.game.excelcharacterlevel.service.ExcelCharacterLevelService;
+import com.td.Dawa.game.exceldrop.service.ExcelDropService;
+import com.td.Dawa.game.excelparameter.service.ExcelParameterService;
+import com.td.Dawa.game.excelprop.service.ExcelPropService;
+import com.td.Dawa.game.excelresources.service.ExcelResourcesService;
+import com.td.Dawa.game.excelscene.service.ExcelSceneService;
+import com.td.Dawa.game.excelworkpro.service.ExcelWorkProService;
+import com.td.Dawa.sys.sysmenu.vo.SysMenuVo;
+import com.td.Dawa.sys.sysshortcutmenu.service.SysShortcutMenuService;
+import com.td.Dawa.sys.sysshortcutmenu.vo.SysShortcutMenuVo;
+import com.td.Dawa.sys.sysuser.service.SysUserService;
+import com.td.Dawa.sys.sysuser.vo.SysUserVo;
+import com.td.Dawa.sys.sysusermenu.service.SysUserMenuService;
+import com.td.Dawa.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.session.SessionRegistryImpl;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+
+@EnableAsync//开启异步调用
+@EnableCaching// 开启缓存，需要显示的指定
+@EnableScheduling
+@SpringBootApplication
+public class BossApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(BossApplication.class, args);
+    }
+
+    /**
+     * 解决不能注入session注册表问题
+     */
+    @Bean
+    SessionRegistry sessionRegistry() {
+        return new SessionRegistryImpl();
+    }
+}
+
+@Slf4j
+@Controller
+@RequestMapping("/")
+@Configuration
+class IndexController {
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Autowired
+    private RedisSettingMap redisSettingMap;
+
+    @Autowired
+    private SysUserMenuService sysUserMenuService;
+
+    @Autowired
+    private SysShortcutMenuService sysShortcutMenuService;
+
+    @Autowired
+    private ComUsersService comUsersService;
+
+    @Autowired
+    private ExcelWorkProService excelWorkProService;
+
+    @Autowired
+    private ExcelSceneService excelSceneService;
+
+    @Autowired
+    private ExcelResourcesService excelResourcesService;
+
+    @Autowired
+    private ExcelPropService excelPropService;
+
+    @Autowired
+    private ExcelParameterService excelParameterService;
+
+    @Autowired
+    private ExcelCharacterLevelService excelCharacterLevelService;
+
+    @Autowired
+    private ExcelCharacterCreateService excelCharacterCreateService;
+
+    @Autowired
+    private ExcelCharacterAttriService excelCharacterAttriService;
+
+    @Autowired
+    private ExcelCharacterColorService excelCharacterColorService;
+
+    @Value("${server.servlet.context-path:}")
+    private String contextPath;
+
+
+    /**
+     * 端口
+     */
+    @Value("${server.port}")
+    private String port;
+
+    /**
+     * 启动成功
+     */
+    @Bean
+    public ApplicationRunner applicationRunner() {
+        return applicationArguments -> {
+            try {
+                /**
+                 * 当启动时候，向redis设置一次数据。
+                 */
+                //更新sys_setting
+                redisSettingMap.updateSysSettingMap();
+                //更新excel表对应缓存
+                excelCharacterColorService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_COLOR.getMessage());
+                excelWorkProService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_WORK_PRO.getMessage());
+                excelPropService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_PROP.getMessage());
+                excelSceneService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_SCENE.getMessage());
+                //生产和资源
+                excelCharacterCreateService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_CREATE.getMessage());
+                excelResourcesService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_RESOURCES.getMessage());
+                //等级
+                excelCharacterLevelService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_LEVEL.getMessage());
+
+                excelCharacterAttriService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_ATTRI.getMessage());
+                //参数
+                excelParameterService.updateListToCache(GameEnum.REDIS_KEY_EXCEL_PARAMETER.getMessage());
+
+
+                //获取本机内网IP
+                log.info("启动成功：" + "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + port + contextPath);
+            } catch (UnknownHostException e) {
+                //输出到日志文件中
+                log.error(ErrorUtil.errorInfoToString(e));
+            }
+        };
+    }
+
+    /**
+     * 跳转登录页面
+     */
+    @GetMapping("loginPage")
+    public ModelAndView login() {
+        ModelAndView modelAndView = new ModelAndView("login");
+
+        //系统信息 SysSettingUtil.getSysSetting()
+        modelAndView.addObject("sys", redisSettingMap.getSysSettingMap());
+
+        //系统审查信息 SysSettingTaskUtil.getSysSettingTask()
+        modelAndView.addObject("sysSettingTask", redisSettingMap.getSysSettingTaskMap());
+
+        //系统限制信息 SysSettingLimitUtil.getSysSettingLimit()
+        modelAndView.addObject("sysSettingLimit", redisSettingMap.getSysSettingLimitMap());
+
+
+        //后端公钥
+        String publicKey = redisSettingMap.getRSAPublicKeyBase64();  //RsaUtil.getPublicKey();
+        log.info("login后端公钥：" + publicKey);
+        modelAndView.addObject("publicKey", publicKey);
+
+        return modelAndView;
+    }
+
+    /**
+     * 跳转首页
+     */
+    @GetMapping("")
+    public void index1(HttpServletResponse response) {
+        //内部重定向
+        try {
+            response.sendRedirect(contextPath + "/index");
+        } catch (IOException e) {
+            //输出到日志文件中
+            log.error(ErrorUtil.errorInfoToString(e));
+        }
+    }
+
+    @GetMapping("index")
+    public ModelAndView index() {
+        ModelAndView modelAndView = new ModelAndView("index");
+
+        //系统信息 SysSettingUtil.getSysSetting()
+        modelAndView.addObject("sys", redisSettingMap.getSysSettingMap());
+
+        //系统审查信息 SysSettingTaskUtil.getSysSettingTask()
+        modelAndView.addObject("sysSettingTask", redisSettingMap.getSysSettingTaskMap());
+
+        //系统限制信息 SysSettingLimitUtil.getSysSettingLimit()
+        modelAndView.addObject("sysSettingLimit", redisSettingMap.getSysSettingLimitMap());
+
+        //登录用户
+        SysUserVo sysUserVo = sysUserService.findByLoginName(SecurityUtil.getLoginUser().getUsername()).getData();
+        sysUserVo.setPassword(null);//隐藏部分属性
+        modelAndView.addObject("loginUser", sysUserVo);
+
+        //登录用户系统菜单
+        List<SysMenuVo> menuVoList = sysUserMenuService.findByUserId(sysUserVo.getUserId()).getData();
+        modelAndView.addObject("menuList", menuVoList);
+
+        //登录用户快捷菜单
+        List<SysShortcutMenuVo> shortcutMenuVoList = sysShortcutMenuService.findByUserId(sysUserVo.getUserId()).getData();
+        modelAndView.addObject("shortcutMenuList", shortcutMenuVoList);
+
+        //后端公钥
+        String publicKey = redisSettingMap.getRSAPublicKeyBase64(); // RsaUtil.getPublicKey();
+        log.info("index后端公钥：" + publicKey);
+        modelAndView.addObject("publicKey", publicKey);
+
+        //获取一个全平台的用户数据
+        Long allComUserCount = comUsersService.findAllCount();
+        modelAndView.addObject("allComUserCount", allComUserCount);
+
+        Long todayComUserCount = comUsersService.newToday();
+        modelAndView.addObject("todayComUserCount", todayComUserCount);
+
+
+        return modelAndView;
+    }
+
+    /**
+     * 获取验证码图片和文本(验证码文本会保存在HttpSession中)
+     */
+    @RequestMapping("getVerifyCodeImage")
+    public void getVerifyCodeImage(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        //设置页面不缓存
+        response.setHeader("Pragma", "no-cache");
+        response.setHeader("Cache-Control", "no-cache");
+        response.setDateHeader("Expires", 0);
+        response.getOutputStream();
+        String verifyCode = VerifyCodeImageUtil.generateTextCode(VerifyCodeImageUtil.TYPE_NUM_UPPER, 4, null);
+
+        //将验证码放到HttpSession里面
+        request.getSession().setAttribute("verifyCode", verifyCode);
+        log.info("本次生成的验证码为：" + verifyCode + ",已存放到HttpSession中");
+
+        //设置输出的内容的类型为JPEG图像
+        response.setContentType("image/jpeg");
+        BufferedImage bufferedImage = VerifyCodeImageUtil.generateImageCode(verifyCode, 90, 30, 3, true, Color.WHITE, Color.BLACK, null);
+
+        //写给浏览器
+        ImageIO.write(bufferedImage, "JPEG", response.getOutputStream());
+    }
+
+    /**
+     * 跳转实时系统硬件监控
+     */
+    @GetMapping("monitor")
+    public ModelAndView monitor() {
+        return new ModelAndView("monitor.html", "port", port);
+    }
+
+    /**
+     * 跳转实时日志
+     */
+    @GetMapping("logging")
+    public ModelAndView logging() {
+        return new ModelAndView("logging.html", "port", port);
+    }
+}

src/main/java/com/td/Dawa/annotation/Between.java

@@ -0,0 +1,21 @@
+package com.td.Dawa.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Between {
+
+    /**
+     * 最小值的实体属性名
+     */
+    String min();
+
+    /**
+     * 最大值的实体属性名
+     */
+    String max();
+}

src/main/java/com/td/Dawa/annotation/Decrypt.java

@@ -0,0 +1,12 @@
+package com.td.Dawa.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Decrypt {
+
+}

src/main/java/com/td/Dawa/annotation/Encrypt.java

@@ -0,0 +1,12 @@
+package com.td.Dawa.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Encrypt {
+
+}

src/main/java/com/td/Dawa/annotation/In.java

@@ -0,0 +1,16 @@
+package com.td.Dawa.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface In {
+
+    /**
+     * in的具体集合的属性名
+     */
+    String values();
+}

src/main/java/com/td/Dawa/annotation/Like.java

@@ -0,0 +1,13 @@
+package com.td.Dawa.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Like {
+
+}

src/main/java/com/td/Dawa/aspect/SafetyAspect.java

@@ -0,0 +1,174 @@
+package com.td.Dawa.aspect;
+
+import cn.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.crypto.asymmetric.RSA;
+import com.td.Dawa.annotation.Decrypt;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.util.*;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+
+/**
+ * AES + RSA 加解密AOP处理
+ */
+@Slf4j
+@Aspect
+@Component
+public class SafetyAspect {
+
+    @Autowired
+    private RedisSettingMap redisSettingMap;
+
+    private final JwtTokenUtil jwtTokenUtil;
+    private final String tokenHeader;
+
+    public SafetyAspect(JwtTokenUtil jwtTokenUtil, @Value("${jwt.token}") String tokenHeader) {
+        this.jwtTokenUtil = jwtTokenUtil;
+        this.tokenHeader = tokenHeader;
+    }
+
+    /**
+     * Pointcut 切入点
+     */
+    @Pointcut(value = "execution(public * com.td.Dawa.sys.*.controller.*.*(..)) || " +
+            "execution(public * com.td.Dawa.*.controller.*.*(..))||" +
+            "execution(public * com.td.Dawa.game.*.controller.*.*(..))")
+    public void safetyAspect() {
+    }
+
+    /**
+     * 环绕通知
+     */
+    @Around(value = "safetyAspect()")
+    public Object around(ProceedingJoinPoint pjp) {
+        try {
+            log.info("---------------进入aop---------------");
+            //判断api加密开关是否开启 SysSettingUtil.getSysSetting()
+            if ("N".equals(redisSettingMap.getSysSettingMap().getSysApiEncrypt())) {
+                return pjp.proceed(pjp.getArgs());
+            }
+
+
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            assert attributes != null;
+            //request对象
+            HttpServletRequest request = attributes.getRequest();
+
+            //http请求方法  post get
+            String httpMethod = request.getMethod().toLowerCase();
+
+            //method方法
+            Method method = ((MethodSignature) pjp.getSignature()).getMethod();
+
+            //method方法上面的注解
+            Annotation[] annotations = method.getAnnotations();
+
+            //方法的形参参数
+            Object[] args = pjp.getArgs();
+
+            //是否有@Decrypt
+            boolean hasDecrypt = false;
+            //是否有@Encrypt
+            boolean hasEncrypt = false;
+            for (Annotation annotation : annotations) {
+                if (annotation.annotationType() == Decrypt.class) {
+                    hasDecrypt = true;
+                }
+                if (annotation.annotationType() == Encrypt.class) {
+                    hasEncrypt = true;
+                }
+            }
+
+            //前端公钥
+            String publicKey = null;
+
+            //jackson
+            ObjectMapper mapper = new ObjectMapper();
+            //jackson 序列化和反序列化 date处理
+            mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+
+            //执行方法之前解密，且只拦截post请求
+            if ("post".equals(httpMethod) && hasDecrypt) {
+                //AES加密后的数据
+                String data = request.getParameter("data");
+                //后端RSA公钥加密后的AES的key
+                String aesKey = request.getParameter("aesKey");
+                //前端公钥
+                publicKey = request.getParameter("publicKey");
+                log.info("前端公钥：" + publicKey);
+                //后端私钥解密的到AES的key
+                //切换一个方式
+                log.info(redisSettingMap.getRSAPrivateKeyBase64());
+                RSA rsa = new RSA(redisSettingMap.getRSAPrivateKeyBase64(), null);
+                byte[] plaintext = rsa.decrypt(Base64.decodeBase64(aesKey), KeyType.PrivateKey);
+                //byte[] plaintext = RsaUtil.decryptByPrivateKey(Base64.decodeBase64(aesKey), RsaUtil.getPrivateKey());
+                aesKey = new String(plaintext);
+                log.info("解密出来的AES的key：" + aesKey);
+                //AES解密得到明文data数据
+                String decrypt = AesUtil.decrypt(data, aesKey);
+                log.info("解密出来的data数据：" + decrypt);
+                //设置到方法的形参中，目前只能设置只有一个参数的情况
+                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                //注：参数最好用Vo对象来接参，单用String来接，args有长度但获取为空，很奇怪不知道为什么
+                if (args.length > 0) {
+                    args[0] = mapper.readValue(decrypt, args[0].getClass());
+                }
+                //HashMap hashMap = mapper.readValue(decrypt, HashMap.class);
+                //ParameterRequestWrapper parameterRequestWrapper = new ParameterRequestWrapper(request);
+                //for (Object key : hashMap.keySet()) {
+                //    parameterRequestWrapper.addParameter(String.valueOf(key), hashMap.get(key));
+                //}
+                //request = (HttpServletRequest) parameterRequestWrapper;
+            }
+
+            //执行并替换最新形参参数   PS：这里有一个需要注意的地方，method方法必须是要public修饰的才能设置值，private的设置不了
+            Object o = pjp.proceed(args);
+
+            //返回结果之前加密
+            if (hasEncrypt) {
+                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                //每次响应之前随机获取AES的key，加密data数据
+                String key = AesUtil.getKey();
+                log.info("AES的key：" + key);
+                String dataString = mapper.writeValueAsString(o);
+                log.info("需要加密的data数据：" + dataString);
+                String data = AesUtil.encrypt(dataString, key);
+
+                //用前端的公钥来解密AES的key，并转成Base64
+                //String aesKey = Base64.encodeBase64String(RsaUtil.encryptByPublicKey(key.getBytes(), publicKey));
+                //切换一个方式
+                RSA rsa = new RSA(null, publicKey);
+                String aesKey = Base64.encodeBase64String(rsa.encrypt(key.getBytes(), KeyType.PublicKey));
+                //转json字符串并转成Object对象，设置到Result中并赋值给返回值o
+                o = Result.of(mapper.readValue("{\"data\":\"" + data + "\",\"aesKey\":\"" + aesKey + "\"}", Object.class));
+            }
+
+            //返回
+            return o;
+
+        } catch (Throwable e) {
+            //输出到日志文件中
+            log.error(ErrorUtil.errorInfoToString(e));
+            return Result.of(null, false, "加解密异常：\n\t" + e.getMessage());
+        }
+    }
+
+}

src/main/java/com/td/Dawa/common/controller/CommonController.java

@@ -0,0 +1,77 @@
+package com.td.Dawa.common.controller;
+
+import com.td.Dawa.annotation.Decrypt;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.common.service.CommonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+/**
+ * 通用Controller
+ *
+ * @param <V> 实体类Vo
+ * @param <E> 实体类
+ * @param <T> id主键类型
+ */
+public class CommonController<V, E, T> {
+
+    @Autowired
+    private CommonService<V, E, T> commonService;
+
+    /*
+        CRUD、分页、排序测试
+     */
+    @PostMapping("page")
+    @Decrypt
+    @Encrypt
+    public Result<PageInfo<V>> page(V entityVo) {
+        return commonService.page(entityVo);
+    }
+
+    @PostMapping("list")
+    @Decrypt
+    @Encrypt
+    public Result<List<V>> list(V entityVo) {
+        return commonService.list(entityVo);
+    }
+
+    @GetMapping("get/{id}")
+    public Result<V> get(@PathVariable("id") T id) {
+        return commonService.get(id);
+    }
+
+    @PostMapping("save")
+    @Decrypt
+    @Encrypt
+    public Result<V> save(V entityVo) {
+        return commonService.save(entityVo);
+    }
+
+    @DeleteMapping("delete/{id}")
+    public Result<T> delete( @PathVariable("id") T id) {
+        /*
+        批量删除
+        @DeleteMapping("deleteBatch")
+        public Result<T> deleteBatch(@RequestBody List<String> ids){}
+        前端调用：
+        $.ajax({
+            url: ctx + "deleteBatch",
+            type: "DELETE",
+            data: JSON.stringify([id1,id2]),
+            dataType: "JSON",
+            contentType: 'application/json',
+            success: function (data) {
+
+            }
+        });
+         */
+        return commonService.delete(id);
+    }
+}

src/main/java/com/td/Dawa/common/pojo/IpVo.java

@@ -0,0 +1,22 @@
+package com.td.Dawa.common.pojo;
+
+import lombok.Data;
+
+/**
+ * ip
+ */
+@Data
+public class IpVo {
+    private String ip;//IP地址
+    private String pro;//省
+    private String proCode;//省编码
+    private String city;//城市
+    private String cityCode;//城市编码
+    private String region;//区
+    private String regionCode;//区编码
+    private String addr;//详细地址 + 运营商
+
+    //主要用于接参，无实际意义
+    private String regionNames;
+    private String err;
+}

src/main/java/com/td/Dawa/common/pojo/MonitorVo.java

@@ -0,0 +1,31 @@
+package com.td.Dawa.common.pojo;
+
+import lombok.Data;
+
+/**
+ * 系统监控信息Vo
+ */
+@Data
+public class MonitorVo {
+    private String os;//操作系统
+    private String runTime;//程序启动时间
+    private String jvmJavaVersion;//java版本
+
+    //jvm
+    private String jvmHeapInit;//jvm内存的初始大小
+    private String jvmHeapMax;//jvm最大可用内存量
+    private String jvmHeapUsed;//jvm已使用的内存量
+    private String jvmHeapCommitted;//jvm已申请的内存量
+    private String jvmNonHeapInit;//jvm内存的初始大小
+    private String jvmNonHeapMax;//jvm最大可用内存量
+    private String jvmNonHeapUsed;//jvm已使用的内存量
+    private String jvmNonHeapCommitted;//jvm已申请的内存量
+
+    //硬件信息
+    private String cpuInfo;//CPU信息
+    private String cpuUseRate;//CPU使用率
+    private String ramTotal;//系统内存总量
+    private String ramUsed;//已使用的系统内存量
+    private String diskTotal;//系统磁盘总量
+    private String diskUsed;//已使用的系统磁盘量
+}

src/main/java/com/td/Dawa/common/pojo/PageCondition.java

@@ -0,0 +1,39 @@
+package com.td.Dawa.common.pojo;
+
+import lombok.Data;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.thymeleaf.util.StringUtils;
+
+/**
+ * 分页条件（参考JqGrid插件）
+ */
+@Data
+public class PageCondition {
+    private int page = 1;//当前页码
+    private int rows = 10;//页面大小
+    private String sidx;//排序字段
+    private String sord;//排序方式
+
+    /**
+     * 获取JPA的分页查询对象
+     */
+    public Pageable getPageable() {
+        //处理非法页码
+        if (page < 0) {
+            page = 1;
+        }
+        //处理非法页面大小
+        if (rows < 0) {
+            rows = 10;
+        }
+        //处理排序
+        if(!StringUtils.isEmpty(sidx) && !StringUtils.isEmpty(sord)){
+            Direction direction = "desc".equals(sidx.toLowerCase()) ? Direction.DESC : Direction.ASC;
+            return PageRequest.of(page - 1, rows, Sort.by(direction, sord));
+        }
+        return PageRequest.of(page - 1, rows);
+    }
+}

src/main/java/com/td/Dawa/common/pojo/PageInfo.java

@@ -0,0 +1,84 @@
+package com.td.Dawa.common.pojo;
+
+import com.td.Dawa.util.CopyUtil;
+import lombok.Data;
+import org.hibernate.query.internal.NativeQueryImpl;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.support.PageableExecutionUtils;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+
+/**
+ * 分页对象（参考JqGrid插件）
+ */
+@Data
+public class PageInfo<M> {
+    private int page;//当前页码
+    private int pageSize;//页面大小
+    private String sidx;//排序字段
+    private String sord;//排序方式
+
+    private List<M> rows;//分页结果
+    private int records;//总记录数
+    private int total;//总页数
+
+    /**
+     * 获取统一分页结果
+     */
+    public static <M> PageInfo<M> of(Page page, Class<M> entityModelClass) {
+        int records = (int) page.getTotalElements();
+        int pageSize = page.getSize();
+        int total = records % pageSize == 0 ? records / pageSize : records / pageSize + 1;
+
+        PageInfo<M> pageInfo = new PageInfo<>();
+        pageInfo.setPage(page.getNumber() + 1);//页码
+        pageInfo.setPageSize(pageSize);//页面大小
+        pageInfo.setRows(CopyUtil.copyList(page.getContent(), entityModelClass));//分页结果
+        pageInfo.setRecords(records);//总记录数
+        pageInfo.setTotal(total);//总页数
+        return pageInfo;
+    }
+
+    /**
+     * 设置当前页面的content
+     * @param page
+     * @param content
+     * @param <M>
+     * @return
+     */
+    public static <M> PageInfo<M> customContent(Page page, List<M> content) {
+        int records = (int) page.getTotalElements();
+        int pageSize = page.getSize();
+        int total = records % pageSize == 0 ? records / pageSize : records / pageSize + 1;
+
+        PageInfo<M> pageInfo = new PageInfo<>();
+        pageInfo.setPage(page.getNumber() + 1);//页码
+        pageInfo.setPageSize(pageSize);//页面大小
+        pageInfo.setRows(content);//分页结果
+        pageInfo.setRecords(records);//总记录数
+        pageInfo.setTotal(total);//总页数
+        return pageInfo;
+    }
+
+    /**
+     * 获取JPA的分页对象
+     */
+    public static Page getJPAPage(Query query, PageRequest pageRequest, EntityManager em) {
+        query.setFirstResult((int) pageRequest.getOffset());
+        query.setMaxResults(pageRequest.getPageSize());
+
+        //获取分页结果
+        return PageableExecutionUtils.getPage(query.getResultList(), pageRequest, () -> {
+            //设置countQuerySQL语句
+            Query countQuery = em.createNativeQuery("select count(*) from ( " + ((NativeQueryImpl) query).getQueryString() + " ) count_table");
+            //设置countQuerySQL参数
+            query.getParameters().forEach(parameter -> countQuery.setParameter(parameter.getName(), query.getParameterValue(parameter.getName())));
+            //返回一个总数
+            return Long.valueOf(countQuery.getResultList().get(0).toString());
+        });
+    }
+}

src/main/java/com/td/Dawa/common/pojo/ParameterRequestWrapper.java

@@ -0,0 +1,42 @@
+package com.td.Dawa.common.pojo;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 重写一个RequestWrapper，实现可修改Parameter的值
+ */
+public class ParameterRequestWrapper extends HttpServletRequestWrapper {
+
+    private Map<String , String[]> params = new HashMap<String, String[]>();
+
+    public ParameterRequestWrapper(HttpServletRequest request) {
+        super(request);
+        this.params.putAll(request.getParameterMap());
+    }
+
+    //重写getParameter，从当前类中的map获取（查看UsernamePasswordAuthenticationFilter可知）
+    @Override
+    public String getParameter(String name) {
+        String[]values = params.get(name);
+        if(values == null || values.length == 0) {
+            return null;
+        }
+        return values[0];
+    }
+
+    //增加参数
+    public void addParameter(String name, Object value) {
+        if(value != null) {
+            if(value instanceof String[]) {
+                params.put(name , (String[])value);
+            }else if(value instanceof String) {
+                params.put(name , new String[] {(String)value});
+            }else {
+                params.put(name , new String[] {String.valueOf(value)});
+            }
+        }
+    }
+}

src/main/java/com/td/Dawa/common/pojo/Result.java

@@ -0,0 +1,79 @@
+package com.td.Dawa.common.pojo;
+
+import com.td.Dawa.config.enums.ResultEnum;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 统一返回对象
+ */
+
+@Data
+public class Result<T> implements Serializable {
+    /**
+     * 通信数据
+     */
+    private T data;
+    /**
+     * 通信状态
+     */
+    private boolean flag = true;
+    /**
+     * 通信描述
+     */
+    private String msg = "操作成功";
+
+    /**
+     * 通信code
+     */
+    private Integer code = 0;
+
+    /**
+     * 通过静态方法获取实例
+     */
+    public static <T> Result<T> of(T data) {
+        return new Result<>(data);
+    }
+
+    public static <T> Result<T> of(T data, boolean flag) {
+        return new Result<>(data, flag);
+    }
+
+    public static <T> Result<T> of(T data, boolean flag, String msg) {
+        return new Result<>(data, flag, msg);
+    }
+    public static <T> Result<T> of(T data, boolean flag, String msg,Integer code) {
+        return new Result<>(data, flag, msg,code);
+    }
+
+    public static <T> Result<T> of(T data, boolean flag, ResultEnum resultEnum) {
+        return new Result<>(data, flag, resultEnum.getMessage(),resultEnum.getCode());
+    }
+    @Deprecated
+    public Result() {
+
+    }
+
+    private Result(T data) {
+        this.data = data;
+    }
+
+    private Result(T data, boolean flag) {
+        this.data = data;
+        this.flag = flag;
+    }
+
+    private Result(T data, boolean flag, String msg) {
+        this.data = data;
+        this.flag = flag;
+        this.msg = msg;
+    }
+
+    private Result(T data, boolean flag, String msg ,Integer code) {
+        this.data = data;
+        this.flag = flag;
+        this.msg = msg;
+        this.code = code;
+    }
+}

src/main/java/com/td/Dawa/common/repository/CommonRepository.java

@@ -0,0 +1,16 @@
+package com.td.Dawa.common.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.NoRepositoryBean;
+
+/**
+ * 通用Repository
+ *
+ * @param <E> 实体类
+ * @param <T> id主键类型
+ */
+@NoRepositoryBean
+public interface CommonRepository<E,T> extends JpaRepository<E,T>, JpaSpecificationExecutor<E> {
+
+}

src/main/java/com/td/Dawa/common/service/CommonService.java

@@ -0,0 +1,38 @@
+package com.td.Dawa.common.service;
+
+
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+
+import java.util.List;
+
+/**
+ * 通用Service
+ *
+ * @param <V> 实体类Vo
+ * @param <E> 实体类
+ * @param <T> id主键类型
+ */
+public interface CommonService<V, E,T> {
+
+    Result<PageInfo<V>> page(V entityVo);
+
+    PageInfo<V> pageByClass(V entityVo, Class entityModelClass);
+
+    Result<List<V>> list(V entityVo);
+
+
+    Result<V> get(T id);
+
+    V getVo(T id);
+
+    Result<V> save(V entityVo);
+
+    Result<T> delete(T id);
+
+    //更新当前列表数据到缓存
+    List<E> updateListToCache(String key);
+    //添加缓存列表操作
+    List<E> getListFromCache(String key);
+
+}

src/main/java/com/td/Dawa/common/service/CommonServiceImpl.java

@@ -0,0 +1,240 @@
+package com.td.Dawa.common.service;
+
+import cn.hutool.json.JSONUtil;
+import com.td.Dawa.common.pojo.PageCondition;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.common.repository.CommonRepository;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.ErrorUtil;
+import com.td.Dawa.util.UUIDUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.hibernate.annotations.NotFound;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 通用Service实现类
+ *
+ * @param <V> 实体类Vo
+ * @param <E> 实体类
+ * @param <T> id主键类型
+ */
+@Slf4j
+public class CommonServiceImpl<V, E, T> implements CommonService<V, E, T> {
+
+    private Class<V> entityVoClass;//实体类Vo
+
+    private Class<E> entityClass;//实体类
+
+
+    @Autowired
+    private CommonRepository<E, T> commonRepository;//注入实体类仓库
+
+    @Autowired
+    private StringRedisTemplate redisTemplate; //注入缓存机制
+
+    //key 的前缀
+    private String keyPrefixStr = "data:excel:";
+
+
+    public CommonServiceImpl() {
+        Type[] types = ((ParameterizedType) this.getClass().getGenericSuperclass()).getActualTypeArguments();
+        this.entityVoClass = (Class<V>) types[0];
+        this.entityClass = (Class<E>) types[1];
+    }
+
+    @Override
+    public Result<PageInfo<V>> page(V entityVo) {
+        //实体类缺失分页信息
+        if (!(entityVo instanceof PageCondition)) {
+            throw new RuntimeException("实体类" + entityVoClass.getName() + "未继承PageCondition。");
+        }
+        PageCondition pageCondition = (PageCondition) entityVo;
+        Page<E> page = commonRepository.findAll(Example.of(CopyUtil.copy(entityVo, entityClass)), pageCondition.getPageable());
+        return Result.of(PageInfo.of(page, entityVoClass));
+    }
+
+    @Override
+    public PageInfo<V> pageByClass(V entityVo, Class entityModelClass) {
+        //实体类缺失分页信息
+        if (!(entityVo instanceof PageCondition)) {
+            throw new RuntimeException("实体类" + entityVoClass.getName() + "未继承PageCondition。");
+        }
+        PageCondition pageCondition = (PageCondition) entityVo;
+        Page<E> page = commonRepository.findAll(Example.of(CopyUtil.copy(entityVo, entityClass)), pageCondition.getPageable());
+        return PageInfo.of(page, entityModelClass);
+    }
+
+    @Override
+    public Result<List<V>> list(V entityVo) {
+        List<E> entityList = commonRepository.findAll(Example.of(CopyUtil.copy(entityVo, entityClass)));
+        List<V> entityModelList = CopyUtil.copyList(entityList, entityVoClass);
+        return Result.of(entityModelList);
+    }
+
+    @Override
+    public Result<V> get(T id) {
+        Optional<E> optionalE = commonRepository.findById(id);
+        if (!optionalE.isPresent()) {
+            return Result.of(null,false,"ID不存在！");
+        }
+        return Result.of(CopyUtil.copy(optionalE.get(), entityVoClass));
+    }
+
+    @Override
+    public V getVo(T id) {
+        Optional<E> optionalE = commonRepository.findById(id);
+        return !optionalE.isPresent()?null:CopyUtil.copy(optionalE.get(), entityVoClass);
+    }
+
+    @Override
+    public Result<V> save(V entityVo) {
+        //传进来的对象（属性可能残缺）
+        E entity = CopyUtil.copy(entityVo, entityClass);
+
+        //最终要保存的对象
+        E entityFull = entity;
+
+        //为空的属性值，忽略属性，BeanUtils复制的时候用到
+        List<String> ignoreProperties = new ArrayList<String>();
+
+        //获取最新数据，解决部分更新时jpa其他字段设置null问题
+        try {
+            //新增 true，更新 false，要求实体类的Id属性排在第一位，因为for循环读取是按照顺序的
+            boolean isInsert = false;
+
+            //反射获取Class的属性（Field表示类中的成员变量）
+            for (Field field : entity.getClass().getDeclaredFields()) {
+                //获取授权
+                field.setAccessible(true);
+                //属性名称
+                String fieldName = field.getName();
+                //属性的值
+                Object fieldValue = field.get(entity);
+
+                //找出Id主键，自增的不设置
+                if (field.isAnnotationPresent(Id.class)) {
+                    if(!field.isAnnotationPresent(GeneratedValue.class)){
+                        //UUID 部分
+                        if(!StringUtils.isEmpty(fieldValue)){
+                            //如果Id主键不为空，则为更新
+                            Optional<E> one = commonRepository.findById((T) fieldValue);
+                            if (one.isPresent()) {
+                                entityFull = one.get();
+                            }
+                        }else{
+                            //如果Id主键为空，则为新增
+                            fieldValue = UUIDUtil.getUUID();
+                            //set方法，第一个参数是对象
+                            field.set(entity, fieldValue);
+                            isInsert = true;
+                        }
+                    }else{
+                        //自增id处理数据
+                        if(!StringUtils.isEmpty(fieldValue)){
+                            //如果Id主键不为空，则为更新
+                            Optional<E> one = commonRepository.findById((T) fieldValue);
+                            if (one.isPresent()) {
+                                entityFull = one.get();
+                            }
+                        }else{
+                            //如果Id主键为空，则为新增
+                            //单纯插入数据，id自增
+                            isInsert = true;
+                        }
+                    }
+
+                }
+                //Boolean is = "createTime".equals(fieldName);
+                //if(is){
+                //    log.info(isInsert +" == "+ is+" == "+StringUtils.isEmpty(fieldValue));
+                //}
+                //如果前端不传这两个值，后台来维护创建时间、更新时间
+                if(isInsert && "createTime".equals(fieldName) && StringUtils.isEmpty(fieldValue)){
+                    //先赋值给fieldValue，以免后续进行copy对象判断属性是否为忽略属性是出错
+                    fieldValue = new Date();
+
+                    //set方法，第一个参数是对象
+                    field.set(entity, fieldValue);
+                }
+                if("updateTime".equals(fieldName) && StringUtils.isEmpty(fieldValue)){
+                    //先赋值给fieldValue，以免后续进行copy对象判断属性是否为忽略属性是出错
+                    fieldValue = new Date();
+
+                    //set方法，第一个参数是对象
+                    field.set(entity, fieldValue);
+                }
+
+                //找出值为空的属性，值为空则为忽略属性，或者被NotFound标注，我们复制的时候不进行赋值
+                if(null == fieldValue || field.isAnnotationPresent(NotFound.class)){
+                    ignoreProperties.add(fieldName);
+                }
+            }
+            /*
+                org.springframework.beans BeanUtils.copyProperties(A,B); 是A中的值付给B
+                org.apache.commons.beanutils; BeanUtils.copyProperties(A,B);是B中的值付给A
+                把entity的值赋给entityFull，第三个参数是忽略属性，表示不进行赋值
+             */
+            BeanUtils.copyProperties(entity, entityFull, ignoreProperties.toArray(new String[0]));
+        } catch (IllegalAccessException e) {
+            //输出到日志文件中
+            log.error(ErrorUtil.errorInfoToString(e));
+        }
+
+        E e = commonRepository.save(entityFull);
+        return Result.of(CopyUtil.copy(e, entityVoClass));
+    }
+
+    @Override
+    public Result<T> delete(T id) {
+        commonRepository.deleteById(id);
+        return Result.of(id);
+    }
+
+
+    /**
+     * 更新当前列表数据到缓存
+     * @param key
+     */
+    public List<E> updateListToCache(String key){
+        key = keyPrefixStr.concat(key);
+        List<E> entityList = commonRepository.findAll();
+        redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(entityList));
+        return entityList;
+    }
+
+
+    /**
+     * 从缓存中获取列表，没有缓存更新一次数据库数据到缓存
+     * @param key
+     * @return
+     */
+    @Override
+    public List<E> getListFromCache(String key) {
+        key = keyPrefixStr.concat(key);
+        List<E> entityList;
+        String s = redisTemplate.opsForValue().get(key);
+        if (StringUtils.hasText(s)) {
+            entityList = JSONUtil.toList(s,entityClass);
+        } else {
+            entityList = commonRepository.findAll();
+            redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(entityList));
+        }
+        return entityList;
+    }
+}

src/main/java/com/td/Dawa/config/async/AsyncConfig.java

@@ -0,0 +1,27 @@
+package com.td.Dawa.config.async;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+/**
+ * 线程池的配置
+ */
+@Configuration
+public class AsyncConfig {
+
+    private static final int MAX_POOL_SIZE = 50;
+
+    private static final int CORE_POOL_SIZE = 20;
+
+    @Bean("asyncTaskExecutor")
+    public AsyncTaskExecutor asyncTaskExecutor() {
+        ThreadPoolTaskExecutor asyncTaskExecutor = new ThreadPoolTaskExecutor();
+        asyncTaskExecutor.setMaxPoolSize(MAX_POOL_SIZE);
+        asyncTaskExecutor.setCorePoolSize(CORE_POOL_SIZE);
+        asyncTaskExecutor.setThreadNamePrefix("async-task-thread-pool-");
+        asyncTaskExecutor.initialize();
+        return asyncTaskExecutor;
+    }
+}

src/main/java/com/td/Dawa/config/enums/GameEnum.java

@@ -0,0 +1,89 @@
+package com.td.Dawa.config.enums;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author:slambb
+ * @date:2022/06/01
+ */
+@Getter
+public enum GameEnum {
+    //redis key
+    REDIS_KEY_EXCEL_WORK_PRO(0,"work_pro"),//工作效率表key
+    REDIS_KEY_EXCEL_SCENE(1,"scene"),//场景信息表key
+    REDIS_KEY_EXCEL_PROP(2,"prop"),//场景道具表key
+    REDIS_KEY_EXCEL_CHARACTER_COLOR(3,"character_color"),//颜色表key
+    REDIS_KEY_EXCEL_CHARACTER_CREATE(4,"character_create"),//生成表key
+    REDIS_KEY_EXCEL_RESOURCES(5,"resources"),//资源表key
+    REDIS_KEY_EXCEL_CHARACTER_LEVEL(6,"character_level"),//等级表key
+    REDIS_KEY_EXCEL_PARAMETER(7,"parameter"),//参数表key
+    REDIS_KEY_EXCEL_CHARACTER_ATTRI(8,"character_attri"),//角色属性表key
+
+    CHARACTERS_STATE_NORMAL(0,"角色普通状态"),
+    CHARACTERS_STATE_TRADE_BANK(1,"角色在交易行状态"),
+    CHARACTERS_STATE_IN_TEAM(2,"角色在队列状态"),
+    CHARACTERS_STATE_IN_WORK(3,"角色在工作状态"),
+
+    WORK_ING(0,"探索工作进行中"),
+    WORK_COMPLETE(1,"探索工作完成"),
+    WORK_NOT_STARTED(2,"探索工作未开始"),
+
+
+    PRO_POWER(0,"影响挖矿(或者伐木)"),
+    PRO_INTELLIGENCE(1,"影响勘探"),
+    PRO_SKIlLS(2,"影响运输"),
+
+    PRO_WORK_NORMAL(0,"自由工作职业"),
+    PRO_WORK_MINING(1,"工作职业为挖矿职业"),
+    PRO_WORK_PROSPECT(2,"工作职业为勘探职业"),
+    PRO_WORK_TRANSPORT(3,"工作职业为运输职业"),
+    PRO_WORK_LUMBERING(4,"工作职业为伐木职业"),
+
+    //伐木场景id
+    LUMBERING_00(101,"深林入口"),
+    LUMBERING_01(102,"深林一层"),
+    LUMBERING_02(103,"深林二层"),
+    LUMBERING_03(104,"深林三层"),
+    LUMBERING_04(105,"深林最深处"),
+
+    //矿洞场景id
+    MINE_00(201,"矿洞入口"),
+    MINE_01(202,"矿洞一层"),
+    MINE_02(203,"矿洞二层"),
+    MINE_03(204,"矿洞三层"),
+    MINE_04(205,"矿洞最深处"),
+    LIMIT_LEVEL(5,"现在层级，最后需要配置表设置"),
+
+
+    //属性区间
+    ATTRIBUTE_01(60,"属性等级1"),
+    ATTRIBUTE_02(100,"属性等级2"),
+    ATTRIBUTE_03(140,"属性等级3"),
+    ATTRIBUTE_04(180,"属性等级4"),
+    ATTRIBUTE_05(220,"属性等级5"),
+    ATTRIBUTE_06(260,"属性等级6");
+
+    private Integer value;
+    private String message;
+
+    GameEnum(Integer value, String message) {
+        this.value = value;
+        this.message = message;
+    }
+
+
+    //放入map中，通过键取值
+    private static Map<Integer,GameEnum> gMap = new HashMap<>();
+    static {
+        for (GameEnum value : GameEnum .values()) {
+            gMap.put(value.getValue(),value);
+        }
+    }
+    public static GameEnum getByValue(Integer value){
+        return gMap.get(value);
+    }
+}

src/main/java/com/td/Dawa/config/enums/ResultEnum.java

@@ -0,0 +1,169 @@
+package com.td.Dawa.config.enums;
+
+import lombok.Getter;
+
+/**
+ * 返回的
+ * @author:slambb
+ * @date:2019/12/5
+ */
+@Getter
+public enum ResultEnum {
+    SUCCESS(0,"成功"),
+    //token数据
+    TOKEN_SUCCESS(300,"用户授权认证通过!"),
+    TOKEN_IS_ILLEGAL(301,"用户授权认证没有通过!客户端请求参数TOKEN信息无效"),
+    TOKEN_DOES_NOT_EXIST(302,"用户授权认证没有通过!客户端请求参数中无TOKEN信息"),
+    TOKEN_OUT_OF_DATE(303,"用户授权认证没有通过!TOKEN过期，重新获取"),
+    TOKEN_DOES_NOT_HAVE_USER_ID(304,"用户授权认证没有通过!TOKEN不存在用户id"),
+    NO_PARAMETERS_CARRIED(305,"输入对应参数"),
+
+    META_LOGIN_ERROR(306,"登录失败！"),
+    META_LOGIN_LIMIT(307,"禁止用户登录！"),
+    //setting部分
+    SETTING_IS_NULL(306,"配置信息不存在"),
+    //redis部分
+    REDIS_IS_LOCK(307,"操作过于频繁，稍后再试！"),
+    REDIS_IS_LOCK_ERROR(308,"操作失败，稍后再试！"),
+
+    //特定接口访问部分限制
+    LOGIN_IP_IS_ERROR(309,"IP异常?!"),
+    //用户数据
+    USER_DOES_NOT_EXIST(400,"不能存在用户信息！"),
+    USER_ENERGY_IS_INSUFFICIENT(401,"用户能量不足！"),
+    USER_VERIFICATION_ERROR(402,"登录验证失败异常！"),
+
+    USER_NOT_ADDRESS(403,"用户地址不存在！"),
+    USER_LIMIT_LOGIN(404,"用户限制登录！"),
+
+    USER_LOGIN_LOCK(405,"用户保存繁忙，请重试操作！"),
+    //角色数据 和 属性
+    PLAYER_DOES_NOT_EXIST(500,"不存在角色信息！"),
+    PLAYER_ATTRIBUTE_ERROR(500,"角色属性信息异常！"),
+    PLAYER_DOES_NOT_ATTRIBUTES(501,"battle player 数据不存在！"),
+    PLAYER_GOODS_LIMIT_ERROR(510,"背包超过预设长度！"),
+    PLAYER_NO_CHEST_INFO(511,"没有对应宝箱类型信息"),
+    PLAYER_NO_EQUIP_TYPE(512,"没有对应装备信息"),
+    PLAYER_GOODS_NO_CHEST(513,"背包没有对应宝箱"),
+    PLAYER_GOODS_NOT_CHEST_TYPE(514,"不是宝箱类型对象"),
+    PLAYER_GOODS_WEAR_NUM_ERROR(515,"请输入对应的参数,isWear:0或者1"),
+    PLAYER_GOODS_NO_QUIP_REQUIRED(516,"不用获取多余装备"),
+    PLAYER_GOODS_SEEDS_AMOUNT_ERROR(517,"土地消耗种子数量不足"),
+    PLAYER_ATTRIBUTE_STRENGTH_IS_NOT(518,"当前体力不足，队伍无法工作"),
+    PLAYER_GOODS_SAVE_LOCK(520,"操作繁忙，保存背包失败，稍后再试！"),
+    PLAYER_ATTRIBUTE_SAVE_LOCK(520,"属性操作繁满，稍后再试！"),
+    //背包
+    PLAYER_BACKPACK_ERROR(510,"背包异常"),
+
+    ROLE_DOES_NOT_EXIST(521,"不存在角色信息！"),
+    ROLE_PRO_DOES_NOT_EXIST(521,"不存在角色职业信息！"),
+    ROLE_WORK_NOT_NORMAL(521,"角色已有工作！"),
+    ROLE_WORK_ING(521,"角色在工作，不可删除！"),
+    ROLE_NOT_WORK(521,"角色不在工作，不可移除！"),
+    ROLE_ADD_ERROR(522,"添加角色信息异常！"),
+    ROLE_DELETE_ERROR(522,"删除角色信息异常！"),
+    ROLE_NOT_TEAM(522,"角色不在队伍中！"),
+    ROLE_NAME_TOO_LONG(522,"角色名字不能大于12个字！"),
+    ROLE_ALREADY_ADD(522,"角色已经添加！"),
+    GOLD_NOT_GET_ROLE(522,"金币不足，无法召唤！"),
+    ROLE_REPATRIATE_ERROR(522,"角色遣返错误！"),
+
+    EXPLORATION_INFO_ERROR(523 ,"勘探队伍异常！"),
+    EXPLORATION_ERROR(524 ,"勘探信息异常！"),
+    EXPLORATION_TIME_ERROR(525 ,"勘探时间异常！"),
+    EXPLORATION_INFO_NULL(526,"请先创建勘探队伍！"),
+    EXPLORATION_NOT_START(527,"请先开始工作勘探队伍！"),
+    EXPLORATION_ING(527,"勘探队伍正在工作！"),
+    EXPLORATION_COMPLETE(527,"勘探队伍已完成工作！"),
+    EXPLORATION_NOT_STOP(528,"工作时间未结束！"),
+
+
+    SCENE_ID_NOT(530,"没有对应场景！"),
+    //钱包数据
+    WALLET_CNT_PLAY_ERROR(601,"钱包CNT支付参数数据错误！"),
+    WALLET_SNB_INSUFFICIENT_QUANTITY(602,"snb不足以支付！"),
+    WALLET_SNB_SUCCESS_NOT_ZERO(603,"snb不可操作"),
+    WALLET_SNB_SIGN_ERROR(604,"钱包SNB参数签名错误！"),
+
+    APPLY_SNB_AMOUNT_ERROR(605,"snb参数错误！"),
+    APPLY_SNB_TOO_MUCH(606,"snb申请过多，待审核完成后再申请！"),
+    APPLY_SNB_HAS_APPLY(607,"已有一笔snb申请中，待审核完成后再申请！"),
+    APPLY_SNB_STATE_ERROR(608,"状态信息错误！"),
+
+
+    WALLET_SNB_ABNORMAL(609,"SNB异常状态"),
+    //土地数据
+    LAND_DATA_ERROR(701,"土地数据不能初始化！"),
+    LAND_NOT_LEASE(702,"土地未租赁！"),
+    LAND_IS_LEASE(703,"土地已租赁！"),
+    LAND_IS_PLANT(704,"土地已种植！"),
+    LAND_NOT_PLANT(705,"土地未种植！"),
+    LAND_LEASE_EXPIRED(706,"土地租赁已过期！"),
+    LAND_HARVEST_STOLEN(707,"土地已收成过！"),
+    LAND_STEAL_ALL(708,"土地已无多余收成！"),
+    LAND_STEAL_LOCK(709,"当前偷取人数过多，稍后再试！"),
+    LAND_PLANT_FLAG_IS_NULL(710,"土地标识为空，不能偷取"),
+    LAND_CAN_STEAL_IS_ZERO(711,"没有可收取果实的土地不存在！"),
+    LAND_CAN_STEAL_IS_NULL(712,"没有可收取果实的土地！"),
+
+    LAND_CAN_STEAL_IS_MAX(713,"已无多余利润！"),//达到最大值
+    LAND_USE_TOOL(714,"该土地正在使用工具中！"),
+    LAND_LAND_LEVELUPPING(715,"该土地正在升级中！"),
+
+    //土地受灾中，稍后重试！
+    LAND_DISATER_LOCK(716,"土地正在遭受灾害，稍后重试！"),
+    LAND_MALL_TYPE_ERROR(717,"种植或养殖类型不对！"),
+    LAND_MULTIPLE_ERROR(718,"土地倍数异常！"),
+    LAND_MULTIPLE_CONFIG_ERROR(719,"土地倍数与配置不符！"),
+
+    LAND_CAN_STEAL_SELF(720,"不能偷取自己的土地！"),
+
+    //种子数据不能存在
+    SEED_DATA_ERROR(801,"种子数据不存在！"),
+    FRUIT_DATA_ERROR(802,"果实数据不存在！"),
+    FRUIT_AMOUNT_ERROR(803,"果实数据出错！"),
+    FRUIT_SEND_SELF(804,"不能赠送给自己！"),
+    SEED_DATE_ERROR(805,"未到成熟时间！"),
+    SEED_AMOUNT_ERROR(806,"背包数量不对！"),
+    SEED_PLAY_ERROR(807,"支付价格不对！"),
+    SEED_PLAY_DIAMOND_ERROR(808,"钻石不足以兑换支付！"),
+    SEED_IS_EXCHANGE(809,"种子已经兑换过！"),
+
+    FOOD_DATA_ERROR(810,"食物数据不存在"),
+    FOOD_DOT_NOT(811,"狗粮不足！"),
+
+    SEED_SALE_SAVE_LOCK(810,"操作繁忙，出售失败，稍后再试！"),
+    SEED_NO_LAND_ERROR(812,"种子土地不匹配！"),
+    SEED_LAND_TIME_ERROR(813,"土地租赁时间不足！"),
+
+    LAND_NO_TIMES_ERROR(814,"次数不足，租赁失败！"),
+    FOOD_NO_TYPE_ERROR(815,"粮食和养殖类型不匹配！"),
+    LAND_NO_PLANT_ERROR(816,"土地未养殖，喂养失败！"),
+    FOOD_NO_ERROR(817,"未找到养料！"),
+    FOOD_REPEAT_ERROR(818,"今日已喂养！"),
+    SEED_LAND_WITHERED(819,"果实已枯萎！"),
+    //装备相关
+    MALL_OTHER_IS_NULL(810,"商城装备不存在!"),
+    MALL_OTHER_IS_HAVE(811,"商城装备已经存在!"),
+    PLAYER_OTHER_IS_NULL(812,"商城装备不存在!"),
+    PLAYER_OTHER_IS_HAVE(813,"商城装备已经存在!"),
+    MALL_ID_LIMIT(820,"商城装备不符合购买需求!"),
+    MALL_FOOD_ID_LIMIT(821,"粮食不符合购买需求!"),
+
+    DOG_SHOW_STATE_ERROR(822,"装备狗状态错误!"),
+
+
+    FRUIT_AMOUNT_IS_ZERO_AND_NOT_MULTIPLE(814,"请输入出售果实的数量！"),
+
+    //excel 配置信息
+    EXCEL_ERROR(901,"excel 配置错误！"),
+    ;
+    private Integer code;
+
+    private String message;
+
+    ResultEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

src/main/java/com/td/Dawa/config/exception/AuthorizeException.java

@@ -0,0 +1,25 @@
+package com.td.Dawa.config.exception;
+
+import com.td.Dawa.config.enums.ResultEnum;
+import lombok.Getter;
+
+/**
+ * @author:slambb
+ * @date:2019/12/13
+ */
+@Getter
+public class AuthorizeException extends RuntimeException {
+
+    private Integer code;
+
+    public AuthorizeException(ResultEnum resultEnum) {
+        super(resultEnum.getMessage());
+
+        this.code = resultEnum.getCode();
+    }
+
+    public AuthorizeException(Integer code, String message) {
+        super(message);
+        this.code = code;
+    }
+}

src/main/java/com/td/Dawa/config/logback/LoggingWSServer.java

@@ -0,0 +1,175 @@
+package com.td.Dawa.config.logback;
+
+
+import com.td.Dawa.config.websocket.MyEndpointConfigure;
+import com.td.Dawa.util.ErrorUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.thymeleaf.util.StringUtils;
+
+import javax.websocket.*;
+import javax.websocket.server.ServerEndpoint;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * WebSocket获取实时日志并输出到Web页面
+ */
+@Slf4j
+@Component
+@ServerEndpoint(value = "/websocket/logging", configurator = MyEndpointConfigure.class)
+public class LoggingWSServer {
+
+    @Value("${spring.application.name}")
+    private String applicationName;
+
+    /**
+     * 连接集合
+     */
+    private static Map<String, Session> sessionMap = new ConcurrentHashMap<String, Session>();
+    private static Map<String, Integer> lengthMap = new ConcurrentHashMap<String, Integer>();
+
+    /**
+     * 连接建立成功调用的方法
+     */
+    @OnOpen
+    public void onOpen(Session session) {
+        //添加到集合中
+        sessionMap.put(session.getId(), session);
+        lengthMap.put(session.getId(), 1);//默认从第一行开始
+
+        //获取日志信息
+        new Thread(()->{
+            log.info("LoggingWebSocketServer 任务开始");
+            boolean first = true;
+            BufferedReader reader = null;
+            while (sessionMap.get(session.getId()) != null) {
+                try {
+                    //日志文件，获取最新的
+                    FileReader fileReader = new FileReader(System.getProperty("user.home") + "/log/" + new SimpleDateFormat("yyyyMMdd").format(new Date()) + "/" + applicationName + ".log");
+
+                    //字符流
+                    reader = new BufferedReader(fileReader);
+                    Object[] lines = reader.lines().toArray();
+
+                    //只取从上次之后产生的日志
+                    Object[] copyOfRange = Arrays.copyOfRange(lines, lengthMap.get(session.getId()), lines.length);
+
+                    //对日志进行着色，更加美观  PS：注意，这里要根据日志生成规则来操作
+                    for (int i = 0; i < copyOfRange.length; i++) {
+                        String line = String.valueOf(copyOfRange[i]);
+                        //先转义
+                        line = line.replaceAll("&", "&amp;")
+                                .replaceAll("<", "&lt;")
+                                .replaceAll(">", "&gt;")
+                                .replaceAll("\"", "&quot;");
+
+                        //处理等级
+                        line = line.replace("DEBUG", "<span style='color: blue;'>DEBUG</span>");
+                        line = line.replace("INFO", "<span style='color: green;'>INFO</span>");
+                        line = line.replace("WARN", "<span style='color: orange;'>WARN</span>");
+                        line = line.replace("ERROR", "<span style='color: red;'>ERROR</span>");
+
+                        //处理类名
+                        String[] split = line.split("]");
+                        if (split.length >= 2) {
+                            String[] split1 = split[1].split("-");
+                            if (split1.length >= 2) {
+                                line = split[0] + "]" + "<span style='color: #298a8a;'>" + split1[0] + "</span>" + "-" + split1[1];
+                            }
+                        }
+
+                        // 匹配日期开头加换行，2019-08-12 14:15:04
+                        Pattern r = Pattern.compile("[\\d+][\\d+][\\d+][\\d+]-[\\d+][\\d+]-[\\d+][\\d+] [\\d+][\\d+]:[\\d+][\\d+]:[\\d+][\\d+]");
+                        Matcher m = r.matcher(line);
+                        if (m.find( )) {
+                            //找到下标
+                            int start = m.start();
+                            //插入
+                            StringBuilder  sb = new StringBuilder (line);
+                            sb.insert(start,"<br/><br/>");
+                            line = sb.toString();
+                        }
+
+                        copyOfRange[i] = line;
+                    }
+
+                    //存储最新一行开始
+                    lengthMap.replace(session.getId(), lines.length);
+
+                    //第一次如果太大，截取最新的200行就够了，避免传输的数据太大
+                    if(first && copyOfRange.length > 200){
+                        copyOfRange = Arrays.copyOfRange(copyOfRange, copyOfRange.length - 200, copyOfRange.length);
+                        first = false;
+                    }
+
+                    String result = StringUtils.join(copyOfRange, "<br/>");
+
+                    //发送
+                    send(session, result);
+
+                    //休眠一秒
+                    Thread.sleep(1000);
+                } catch (Exception e) {
+                    //输出到日志文件中
+                    log.error(ErrorUtil.errorInfoToString(e));
+                }
+            }
+            try {
+                reader.close();
+            } catch (IOException e) {
+                //输出到日志文件中
+                log.error(ErrorUtil.errorInfoToString(e));
+            }
+            log.info("LoggingWebSocketServer 任务结束");
+        }).start();
+    }
+
+    /**
+     * 连接关闭调用的方法
+     */
+    @OnClose
+    public void onClose(Session session) {
+        //从集合中删除
+        sessionMap.remove(session.getId());
+        lengthMap.remove(session.getId());
+    }
+
+    /**
+     * 发生错误时调用
+     */
+    @OnError
+    public void onError(Session session, Throwable error) {
+        //输出到日志文件中
+        log.error(ErrorUtil.errorInfoToString(error));
+    }
+
+    /**
+     * 服务器接收到客户端消息时调用的方法
+     */
+    @OnMessage
+    public void onMessage(String message, Session session) {
+
+    }
+
+    /**
+     * 封装一个send方法，发送消息到前端
+     */
+    private void send(Session session, String message) {
+        try {
+            session.getBasicRemote().sendText(message);
+        } catch (Exception e) {
+            //输出到日志文件中
+            log.error(ErrorUtil.errorInfoToString(e));
+        }
+    }
+}

src/main/java/com/td/Dawa/config/monitor/MonitorWSServer.java

@@ -0,0 +1,104 @@
+package com.td.Dawa.config.monitor;
+
+
+import com.td.Dawa.config.websocket.MyEndpointConfigure;
+import com.td.Dawa.util.ErrorUtil;
+import com.td.Dawa.util.SystemMonitorUtil;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.ServerEndpoint;
+import java.text.SimpleDateFormat;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * WebSocket获取实时系统监控并输出到Web页面
+ */
+@Slf4j
+@Component
+@ServerEndpoint(value = "/websocket/monitor", configurator = MyEndpointConfigure.class)
+public class MonitorWSServer {
+
+    @Value("${spring.application.name}")
+    private String applicationName;
+
+    /**
+     * 连接集合
+     */
+    private static Map<String, Session> sessionMap = new ConcurrentHashMap<String, Session>();
+
+    /**
+     * 连接建立成功调用的方法
+     */
+    @OnOpen
+    public void onOpen(Session session) {
+        //添加到集合中
+        sessionMap.put(session.getId(), session);
+
+        //获取系统监控信息
+        new Thread(()->{
+            log.info("MonitorWSServer 任务开始");
+            ObjectMapper mapper = new ObjectMapper();
+            //当属性的值为空（null或者""）时，不进行序列化，可以减少数据传输
+            mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+            //设置日期格式
+            mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+            while (sessionMap.get(session.getId()) != null) {
+                try {
+                    //获取系统监控信息 发送
+                    send(session,  mapper.writeValueAsString(SystemMonitorUtil.getSysMonitor()));
+
+                    //休眠一秒
+                    Thread.sleep(1000);
+                } catch (Exception e) {
+                    //输出到日志文件中
+                    log.error(ErrorUtil.errorInfoToString(e));
+                }
+            }
+            log.info("MonitorWSServer 任务结束");
+        }).start();
+    }
+
+    /**
+     * 连接关闭调用的方法
+     */
+    @OnClose
+    public void onClose(Session session) {
+        //从集合中删除
+        sessionMap.remove(session.getId());
+    }
+
+    /**
+     * 发生错误时调用
+     */
+    @OnError
+    public void onError(Session session, Throwable error) {
+        //输出到日志文件中
+        log.error(ErrorUtil.errorInfoToString(error));
+    }
+
+    /**
+     * 服务器接收到客户端消息时调用的方法
+     */
+    @OnMessage
+    public void onMessage(String message, Session session) {
+
+    }
+
+    /**
+     * 封装一个send方法，发送消息到前端
+     */
+    private void send(Session session, String message) {
+        try {
+            session.getBasicRemote().sendText(message);
+        } catch (Exception e) {
+            //输出到日志文件中
+            log.error(ErrorUtil.errorInfoToString(e));
+        }
+    }
+}

src/main/java/com/td/Dawa/config/security/CaptchaFilterConfig.java

@@ -0,0 +1,174 @@
+package com.td.Dawa.config.security;
+
+import cn.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.crypto.asymmetric.RSA;
+import com.td.Dawa.common.pojo.ParameterRequestWrapper;
+import com.td.Dawa.util.*;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.session.SessionInformation;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+
+/**
+ * 校验账号、密码前，先进行验证码处理，需要在这里进行登录解密操作
+ */
+@Component
+@Slf4j
+public class CaptchaFilterConfig implements Filter {
+
+    @Value("${captcha.enable}")
+    private Boolean captchaEnable;
+
+    @Value("${server.servlet.context-path:}")
+    private String contextPath;
+
+    @Autowired
+    private SessionRegistry sessionRegistry;
+
+    @Autowired
+    private UserConfig userConfig;
+
+    @Autowired
+    private JwtTokenUtil jwtTokenUtil;
+    @Value("${jwt.token}")
+    private String tokenHeader;
+
+    @Autowired
+    private RedisSettingMap redisSettingMap;
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        HttpSession session = request.getSession();
+
+        /*
+            注：详情可在SessionManagementFilter中进行断点调试查看
+            security框架会在session的attribute存储登录信息，先从session.getAttribute(this.springSecurityContextKey)中获取登录用户信息
+            ，如果没有，再从本地上下文SecurityContextHolder.getContext().getAuthentication()获取，因此想要强制用户下线得进行如下操作
+
+            另外，虽然重启了服务，sessionRegistry.getAllSessions()为空，但之前的用户session未过期同样能访问系统，也是这个原因
+         */
+        SessionInformation sessionInformation = sessionRegistry.getSessionInformation(session.getId());
+        if (sessionInformation == null && session.getAttribute("SPRING_SECURITY_CONTEXT") != null) {
+            //直接输出js脚本跳转强制用户下线
+            response.setContentType("text/html;charset=UTF-8");
+            response.getWriter().print("<script type='text/javascript'>window.location.href = '" + contextPath + "/logout'</script>");
+        }
+
+        //只拦截登录请求，且开发环境下不拦截
+        if ("POST".equals(request.getMethod()) && "/login".equals(request.getRequestURI().replaceFirst(contextPath, ""))) {
+            //前端公钥
+            String publicKey = null;
+
+            //jackson
+            ObjectMapper mapper = new ObjectMapper();
+            //jackson 序列化和反序列化 date处理
+            mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+
+            //判断api加密开关是否开启
+            if ("Y".equals(redisSettingMap.getSysSettingMap().getSysApiEncrypt())) {
+                //解密
+                try {
+                    //AES加密后的数据
+                    String data = request.getParameter("data");
+                    //后端RSA公钥加密后的AES的key
+                    String aesKey = request.getParameter("aesKey");
+                    //前端公钥
+                    publicKey = request.getParameter("publicKey");
+                    log.info("前端data：" + data);
+                    log.info("前端aesKey：" + aesKey);
+                    log.info("前端公钥：" + publicKey);
+                    //log.info("私钥：" + RsaUtil.getPrivateKey());
+                    //String _aesKey2 = aesKey;
+                    //后端私钥解密的到AES的key
+                    //切换一个方式
+                    RSA rsa = new RSA(redisSettingMap.getRSAPrivateKeyBase64(), null);
+                    byte[] plaintext = rsa.decrypt(Base64.decodeBase64(aesKey), KeyType.PrivateKey);
+                    //byte[] plaintext = RsaUtil.decryptByPrivateKey(Base64.decodeBase64(aesKey), RsaUtil.getPrivateKey());
+                    aesKey = new String(plaintext);
+                    log.info("解密出来的AES的key：" + aesKey);
+                    //log.info("前端aesKey2：" + _aesKey2);
+                    //String base64String = new Base64().encodeToString(_aesKey2.getBytes());
+                    //byte[] plaintext2 = RsaUtil.decryptByPrivateKey(Base64.decodeBase64(_aesKey2), RsaUtil.getPrivateKey());
+                    //String aesKey2 = new String(plaintext2);
+                    //log.info("解密出来的AES的key2：" + aesKey2);
+                    //AES解密得到明文data数据
+                    String decrypt = AesUtil.decrypt(data, aesKey);
+                    log.info("解密出来的data数据：" + decrypt);
+
+                    //设置到方法的形参中，目前只能设置只有一个参数的情况
+                    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+                    //new一个自定义RequestWrapper
+                    HashMap hashMap = mapper.readValue(decrypt, HashMap.class);
+                    ParameterRequestWrapper parameterRequestWrapper = new ParameterRequestWrapper(request);
+                    for (Object key : hashMap.keySet()) {
+                        parameterRequestWrapper.addParameter(String.valueOf(key), hashMap.get(key));
+                    }
+
+                    servletRequest = parameterRequestWrapper;
+                    request = (HttpServletRequest) servletRequest;
+                } catch (Throwable e) {
+                    //输出到日志文件中
+                    log.error(ErrorUtil.errorInfoToString(e));
+                }
+            }
+
+            //从session中获取生成的验证码
+            String verifyCode = session.getAttribute("verifyCode").toString();
+
+            if (captchaEnable && !verifyCode.toLowerCase().equals(request.getParameter("captcha").toLowerCase())) {
+                String dataString = "{\"code\":\"400\",\"msg\":\"验证码错误\"}";
+
+                //判断api加密开关是否开启
+                if ("Y".equals(redisSettingMap.getSysSettingMap().getSysApiEncrypt())) {
+                    //加密
+                    try {
+                        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                        //每次响应之前随机获取AES的key，加密data数据
+                        String key = AesUtil.getKey();
+                        log.info("AES的key：" + key);
+                        log.info("需要加密的data数据：" + dataString);
+                        String data = AesUtil.encrypt(dataString, key);
+
+                        //用前端的公钥来解密AES的key，并转成Base64
+                        //String aesKey = Base64.encodeBase64String(RsaUtil.encryptByPublicKey(key.getBytes(), publicKey));
+                        //切换一个方式
+                        RSA rsa = new RSA(null, publicKey);
+                        String aesKey = Base64.encodeBase64String(rsa.encrypt(key.getBytes(), KeyType.PublicKey));
+                        dataString = "{\"data\":{\"data\":\"" + data + "\",\"aesKey\":\"" + aesKey + "\"}}";
+                    } catch (Throwable e) {
+                        //输出到日志文件中
+                        log.error(ErrorUtil.errorInfoToString(e));
+                    }
+                }
+
+                //转json字符串并转成Object对象，设置到Result中并赋值给返回值o
+                response.setCharacterEncoding("UTF-8");
+                response.setContentType("application/json; charset=utf-8");
+                PrintWriter out = response.getWriter();
+                out.print(dataString);
+                out.flush();
+                out.close();
+                return;
+            }
+        }
+
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+}

src/main/java/com/td/Dawa/config/security/DynamicallyUrlInterceptor.java

@@ -0,0 +1,88 @@
+package com.td.Dawa.config.security;
+
+import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.SecurityMetadataSource;
+import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
+import org.springframework.security.access.intercept.InterceptorStatusToken;
+import org.springframework.security.web.FilterInvocation;
+import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+/**
+ * 自定义动态数据拦截器
+ */
+public class DynamicallyUrlInterceptor extends AbstractSecurityInterceptor implements Filter {
+
+    //标记自定义的url拦截器已经加载
+    private static final String FILTER_APPLIED = "__spring_security_filterSecurityInterceptor_filterApplied_dynamically";
+
+    private FilterInvocationSecurityMetadataSource securityMetadataSource;
+    private boolean observeOncePerRequest = true;
+
+
+    @Override
+    public Class<?> getSecureObjectClass() {
+        return FilterInvocation.class;
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        FilterInvocation fi = new FilterInvocation(request, response, chain);
+        invoke(fi);
+    }
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    @Override
+    public void destroy() {
+    }
+
+    public FilterInvocationSecurityMetadataSource getSecurityMetadataSource() {
+        return this.securityMetadataSource;
+    }
+
+    public SecurityMetadataSource obtainSecurityMetadataSource() {
+        return this.securityMetadataSource;
+    }
+
+    public void setSecurityMetadataSource(FilterInvocationSecurityMetadataSource newSource) {
+        this.securityMetadataSource = newSource;
+    }
+
+    @Override
+    public void setAccessDecisionManager(AccessDecisionManager accessDecisionManager) {
+        super.setAccessDecisionManager(accessDecisionManager);
+    }
+
+    public void invoke(FilterInvocation fi) throws IOException, ServletException {
+
+        if ((fi.getRequest() != null)
+                && (fi.getRequest().getAttribute(FILTER_APPLIED) != null)
+                && observeOncePerRequest) {
+            // filter already applied to this request and user wants us to observe
+            // once-per-request handling, so don't re-do security checking
+            fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
+        }
+        else {
+            // first time this request being called, so perform security checking
+            if (fi.getRequest() != null) {
+                fi.getRequest().setAttribute(FILTER_APPLIED, Boolean.TRUE);
+            }
+
+            InterceptorStatusToken token = super.beforeInvocation(fi);
+
+            try {
+                fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
+            }
+            finally {
+                super.finallyInvocation(token);
+            }
+
+            super.afterInvocation(token, null);
+        }
+    }
+}

src/main/java/com/td/Dawa/config/security/ErrorPageConfig.java

@@ -0,0 +1,55 @@
+package com.td.Dawa.config.security;
+
+import org.springframework.boot.web.server.ErrorPage;
+import org.springframework.boot.web.server.ErrorPageRegistrar;
+import org.springframework.boot.web.server.ErrorPageRegistry;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * 自定义errorPage
+ */
+@Component
+public class ErrorPageConfig implements ErrorPageRegistrar {
+
+    @Override
+    public void registerErrorPages(ErrorPageRegistry registry) {
+
+        /**
+         * ErrorPage 有两个参数
+         * 参数1 响应状态码
+         * 参数2 出现响应状态码的时候的跳转路径  可以自定义跳转路径
+         */
+
+        //将ErrorPage 注册到注册器中
+        registry.addErrorPages(
+                new ErrorPage(HttpStatus.FORBIDDEN, "/error/403"),
+                new ErrorPage(HttpStatus.NOT_FOUND, "/error/404"),
+                new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/error/500")
+                );
+    }
+}
+
+/**
+ * 错误页面跳转
+ */
+@Controller
+class ErrorPageController {
+    @GetMapping("/error/403")
+    public ModelAndView error403(){
+        return new ModelAndView("common/error/403");
+    }
+
+    @GetMapping("/error/404")
+    public ModelAndView error404(){
+        return new ModelAndView("common/error/404");
+    }
+
+    @GetMapping("/error/500")
+    public ModelAndView error500(){
+        return new ModelAndView("common/error/500");
+    }
+}

src/main/java/com/td/Dawa/config/security/LoginFailureHandlerConfig.java

@@ -0,0 +1,75 @@
+package com.td.Dawa.config.security;
+
+import cn.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.crypto.asymmetric.RSA;
+import com.td.Dawa.util.*;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+
+/**
+ * 登录失败处理
+ */
+@Component
+@Slf4j
+public class LoginFailureHandlerConfig implements AuthenticationFailureHandler {
+
+    @Autowired
+    private RedisSettingMap redisSettingMap;
+
+    @Override
+    public void onAuthenticationFailure(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AuthenticationException e) throws IOException {
+        String msg = "{\"code\":\"400\",\"msg\":\"用户名或密码错误\"}";
+
+        //判断api加密开关是否开启
+        if("Y".equals(redisSettingMap.getSysSettingMap().getSysApiEncrypt())){
+            //加密
+            try {
+                //前端公钥
+                String publicKey = httpServletRequest.getParameter("publicKey");
+
+                log.info("前端公钥：" + publicKey);
+
+                //jackson
+                ObjectMapper mapper = new ObjectMapper();
+                //jackson 序列化和反序列化 date处理
+                mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                //每次响应之前随机获取AES的key，加密data数据
+                String key = AesUtil.getKey();
+                log.info("AES的key：" + key);
+                log.info("需要加密的data数据：" + msg);
+                String data = AesUtil.encrypt(msg, key);
+
+                //用前端的公钥来解密AES的key，并转成Base64
+                //String aesKey = Base64.encodeBase64String(RsaUtil.encryptByPublicKey(key.getBytes(), publicKey));
+                //切换一个方式
+                RSA rsa = new RSA(null, publicKey);
+                String aesKey = Base64.encodeBase64String(rsa.encrypt(key.getBytes(), KeyType.PublicKey));
+                msg = "{\"data\":{\"data\":\"" + data + "\",\"aesKey\":\"" + aesKey + "\"}}";
+            } catch (Throwable ee) {
+                //输出到日志文件中
+                log.error(ErrorUtil.errorInfoToString(ee));
+            }
+        }
+
+        //转json字符串并转成Object对象，设置到Result中并赋值给返回值o
+        httpServletResponse.setCharacterEncoding("UTF-8");
+        httpServletResponse.setContentType("application/json; charset=utf-8");
+        PrintWriter out = httpServletResponse.getWriter();
+        out.print(msg);
+        out.flush();
+        out.close();
+    }
+}

src/main/java/com/td/Dawa/config/security/LoginSuccessHandlerConfig.java

@@ -0,0 +1,157 @@
+package com.td.Dawa.config.security;
+
+import cn.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.crypto.asymmetric.RSA;
+import com.td.Dawa.sys.sysuser.service.SysUserService;
+import com.td.Dawa.sys.sysuser.vo.SysUserVo;
+import com.td.Dawa.util.*;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.session.SessionInformation;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl;
+import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 登录成功处理，登陆成功后还需要验证账号的有效性
+ */
+@Component
+@Slf4j
+public class LoginSuccessHandlerConfig implements AuthenticationSuccessHandler {
+    @Autowired
+    private SessionRegistry sessionRegistry;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    private RedisSettingMap redisSettingMap;
+
+    @Override
+    public void onAuthenticationSuccess(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Authentication authentication) throws IOException, ServletException {
+        //从全局注册表中获取所有登陆用户，做用户单登陆判断
+        ArrayList<String> allSessionIdList = new ArrayList<>();
+        List<SessionInformation> allSessions = sessionRegistry.getAllSessions(authentication.getPrincipal(), false);
+        for (SessionInformation sessionInformation : allSessions) {
+            allSessionIdList.add(sessionInformation.getSessionId());
+        }
+
+        //查询当前与系统交互的用户，存储在本地线程安全上下文，校验账号有效性
+        User user = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        SysUserVo sysUserVo = sysUserService.findByLoginName(user.getUsername()).getData();
+
+        //默认登陆成功
+        String msg = "{\"code\":\"300\",\"msg\":\"登录成功\",\"url\":\"/index\"}";
+        boolean flag = false;
+
+        //登陆IP不在白名单
+        String ipAddr = IpUtil.getIpAddr(httpServletRequest);
+        String limitedIp = sysUserVo.getLimitedIp();
+        if (!StringUtils.isEmpty(limitedIp) && !Arrays.asList(limitedIp.split(",")).contains(ipAddr)) {
+            msg = "{\"code\":\"400\",\"msg\":\"登陆IP不在白名单，请联系管理员\"}";
+            flag = true;
+        }
+
+        //禁止多人在线
+        if ("N".equals(sysUserVo.getLimitMultiLogin()) && allSessionIdList.size() > 0) {
+            msg = "{\"code\":\"400\",\"msg\":\"该账号禁止多人在线，请联系管理员\"}";
+            flag = true;
+        }
+
+        //超出有效时间
+        if (!StringUtils.isEmpty(sysUserVo.getExpiredTime()) && new Date().getTime() > sysUserVo.getExpiredTime().getTime()) {
+            msg = "{\"code\":\"400\",\"msg\":\"该账号已失效，请联系管理员\"}";
+            flag = true;
+        }
+
+        //禁止登陆系统
+        if ("N".equals(sysUserVo.getValid())) {
+            msg = "{\"code\":\"400\",\"msg\":\"该账号已被禁止登陆系统，请联系管理员\"}";
+            flag = true;
+        }
+
+        //校验不通过
+        if (flag) {
+            //清除当前的上下文
+            SecurityContextHolder.clearContext();
+
+            //清除remember-me持久化tokens
+            persistentTokenRepository1().removeUserTokens(user.getUsername());
+        } else {
+            //校验通过，注册session
+            sessionRegistry.registerNewSession(httpServletRequest.getSession().getId(), user);
+        }
+
+        //判断api加密开关是否开启
+        if ("Y".equals(redisSettingMap.getSysSettingMap().getSysApiEncrypt())) {
+            //加密
+            try {
+                //前端公钥
+                String publicKey = httpServletRequest.getParameter("publicKey");
+
+                log.info("前端公钥：" + publicKey);
+
+                //jackson
+                ObjectMapper mapper = new ObjectMapper();
+                //jackson 序列化和反序列化 date处理
+                mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                //每次响应之前随机获取AES的key，加密data数据
+                String key = AesUtil.getKey();
+                log.info("AES的key：" + key);
+                log.info("需要加密的data数据：" + msg);
+                String data = AesUtil.encrypt(msg, key);
+
+                //用前端的公钥来解密AES的key，并转成Base64
+                //String aesKey = Base64.encodeBase64String(RsaUtil.encryptByPublicKey(key.getBytes(), publicKey));
+                //切换一个方式
+                RSA rsa = new RSA(null, publicKey);
+                String aesKey = Base64.encodeBase64String(rsa.encrypt(key.getBytes(), KeyType.PublicKey));
+                msg = "{\"data\":{\"data\":\"" + data + "\",\"aesKey\":\"" + aesKey + "\"}}";
+            } catch (Throwable e) {
+                //输出到日志文件中
+                log.error(ErrorUtil.errorInfoToString(e));
+            }
+        }
+
+        //转json字符串并转成Object对象，设置到Result中并赋值给返回值o
+        httpServletResponse.setCharacterEncoding("UTF-8");
+        httpServletResponse.setContentType("application/json; charset=utf-8");
+        PrintWriter out = httpServletResponse.getWriter();
+        out.print(msg);
+        out.flush();
+        out.close();
+    }
+
+    @Bean
+    public PersistentTokenRepository persistentTokenRepository1() {
+        JdbcTokenRepositoryImpl persistentTokenRepository = new JdbcTokenRepositoryImpl();
+        persistentTokenRepository.setDataSource(dataSource);
+        return persistentTokenRepository;
+    }
+}

src/main/java/com/td/Dawa/config/security/LogoutHandlerConfig.java

@@ -0,0 +1,37 @@
+package com.td.Dawa.config.security;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.session.SessionInformation;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.web.authentication.logout.LogoutHandler;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 注销处理
+ */
+@Component
+public class LogoutHandlerConfig implements LogoutHandler {
+    @Autowired
+    private SessionRegistry sessionRegistry;
+
+    @Override
+    public void logout(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Authentication authentication) {
+        //剔除退出用户
+        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        if (principal !=null){
+            List<SessionInformation> allSessions = sessionRegistry.getAllSessions(principal, false);
+            if (allSessions != null) {
+                for (SessionInformation sessionInformation : allSessions) {
+                    sessionInformation.expireNow();
+                    sessionRegistry.removeSessionInformation(sessionInformation.getSessionId());
+                }
+            }
+        }
+    }
+}

src/main/java/com/td/Dawa/config/security/MyAccessDecisionManager.java

@@ -0,0 +1,56 @@
+package com.td.Dawa.config.security;
+
+import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.vote.AbstractAccessDecisionManager;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
+import org.springframework.security.core.Authentication;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 提供一个认证管理器
+ */
+public class MyAccessDecisionManager extends AbstractAccessDecisionManager {
+
+    MyAccessDecisionManager(List<AccessDecisionVoter<?>> decisionVoters) {
+        super(decisionVoters);
+    }
+
+    @Override
+    public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes)
+            throws AccessDeniedException, InsufficientAuthenticationException {
+        int deny = 0;
+
+        for (AccessDecisionVoter voter : getDecisionVoters()) {
+            int result = voter.vote(authentication, object, configAttributes);
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Voter: " + voter + ", returned: " + result);
+            }
+
+            switch (result) {
+                case AccessDecisionVoter.ACCESS_GRANTED:
+                    return;
+
+                case AccessDecisionVoter.ACCESS_DENIED:
+                    deny++;
+
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        if (deny > 0) {
+            throw new AccessDeniedException(messages.getMessage(
+                    "AbstractAccessDecisionManager.accessDenied", "Access is denied"));
+        }
+
+        // To get this far, every AccessDecisionVoter abstained
+        checkAllowIfAllAbstainDecisions();
+    }
+}

src/main/java/com/td/Dawa/config/security/MyFilterInvocationSecurityMetadataSource.java

@@ -0,0 +1,77 @@
+package com.td.Dawa.config.security;
+
+import com.td.Dawa.sys.sysauthority.vo.SysAuthorityVo;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.web.FilterInvocation;
+import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 配置认证数据源，实现动态权限加载（注意：不要手动new，把它交给spring管理，spring默认单例）
+ */
+@Component
+public class MyFilterInvocationSecurityMetadataSource implements FilterInvocationSecurityMetadataSource {
+    //权限数据
+    private Map<RequestMatcher, Collection<ConfigAttribute>> requestMap;
+
+    /**
+     * 在我们初始化的权限数据中找到对应当前url的权限数据
+     */
+    @Override
+    public Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException {
+        FilterInvocation fi = (FilterInvocation) object;
+        HttpServletRequest request = fi.getRequest();
+
+        //遍历我们初始化的权限数据，找到对应的url对应的权限
+        for (Map.Entry<RequestMatcher, Collection<ConfigAttribute>> entry : requestMap
+                .entrySet()) {
+            if (entry.getKey().matches(request)) {
+                return entry.getValue();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Collection<ConfigAttribute> getAllConfigAttributes() {
+        return null;
+    }
+
+    @Override
+    public boolean supports(Class<?> clazz) {
+        return FilterInvocation.class.isAssignableFrom(clazz);
+    }
+
+    /**
+     * 更新权限集合
+     */
+    public void setRequestMap(List<SysAuthorityVo> authorityVoList){
+        Map<RequestMatcher, Collection<ConfigAttribute>> map = new ConcurrentHashMap<>();
+        for (SysAuthorityVo sysAuthorityVo : authorityVoList) {
+            String authorityName = sysAuthorityVo.getAuthorityName();
+            if (StringUtils.isEmpty(sysAuthorityVo.getAuthorityContent())) continue;
+            for (String url : sysAuthorityVo.getAuthorityContent().split(",")) {
+                Collection<ConfigAttribute> value = map.get(new AntPathRequestMatcher(url));
+                if (StringUtils.isEmpty(value)) {
+                    ArrayList<ConfigAttribute> configs = new ArrayList<>();
+                    configs.add(new SecurityConfig(authorityName));
+                    map.put(new AntPathRequestMatcher(url), configs);
+                } else {
+                    value.add(new SecurityConfig(authorityName));
+                }
+            }
+        }
+        this.requestMap = map;
+    }
+}

src/main/java/com/td/Dawa/config/security/MyInvalidSessionStrategy.java

@@ -0,0 +1,51 @@
+package com.td.Dawa.config.security;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.session.SessionInformation;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.web.session.InvalidSessionStrategy;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+/**
+ * 自定义session失效策略
+ */
+@Component
+@Slf4j
+public class MyInvalidSessionStrategy implements InvalidSessionStrategy {
+    @Autowired
+    private SessionRegistry sessionRegistry;
+
+    @Value("${server.servlet.context-path:}")
+    private String contextPath;
+
+    @Override
+    public void onInvalidSessionDetected(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException, ServletException {
+        HttpSession session = httpServletRequest.getSession();
+        String sessionId = httpServletRequest.getRequestedSessionId();
+        if(!session.isNew()){
+            //内部重定向
+            httpServletResponse.sendRedirect("/loginPage");
+        }else{
+            //直接输出js脚本跳转
+            httpServletResponse.setContentType("text/html;charset=UTF-8");
+            httpServletResponse.getWriter().print("<script type='text/javascript'>window.location.href = \"" + contextPath + "/loginPage\"</script>");
+        }
+        SessionInformation sessionInformation = sessionRegistry.getSessionInformation(sessionId);
+        if(sessionInformation != null){
+            User user = (User) sessionInformation.getPrincipal();
+            sessionRegistry.removeSessionInformation(sessionId);
+            log.info("剔除过期用户:"+user.getUsername());
+        }
+        log.info("session失效处理 " + sessionRegistry.getAllPrincipals().size()+"");
+        httpServletResponse.flushBuffer();
+    }
+}

src/main/java/com/td/Dawa/config/security/PasswordConfig.java

@@ -0,0 +1,20 @@
+package com.td.Dawa.config.security;
+
+import com.td.Dawa.util.MD5Util;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PasswordConfig implements PasswordEncoder {
+
+    @Override
+    public String encode(CharSequence charSequence) {
+        //charSequence是用户输入的密码，password是存库的密码
+        return MD5Util.getMD5(charSequence.toString());
+    }
+
+    @Override
+    public boolean matches(CharSequence charSequence, String password) {
+        return password.contentEquals(encode(charSequence));
+    }
+}

src/main/java/com/td/Dawa/config/security/SecurityConfig.java

@@ -0,0 +1,148 @@
+package com.td.Dawa.config.security;
+
+import com.td.Dawa.sys.sysauthority.service.SysAuthorityService;
+import com.td.Dawa.sys.sysauthority.vo.SysAuthorityVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.security.access.vote.RoleVoter;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl;
+import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+
+import javax.sql.DataSource;
+import java.util.ArrayList;
+import java.util.List;
+
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Autowired
+    private CaptchaFilterConfig captchaFilterConfig;
+
+    @Autowired
+    private UserConfig userConfig;
+
+    @Autowired
+    private PasswordConfig passwordConfig;
+
+    @Autowired
+    private LoginFailureHandlerConfig loginFailureHandlerConfig;
+
+    @Autowired
+    private LoginSuccessHandlerConfig loginSuccessHandlerConfig;
+
+    @Autowired
+    private LogoutHandlerConfig logoutHandlerConfig;
+
+    @Autowired
+    private SysAuthorityService sysAuthorityService;
+
+    @Autowired
+    private MyFilterInvocationSecurityMetadataSource myFilterInvocationSecurityMetadataSource;
+
+    @Autowired
+    private MyInvalidSessionStrategy myInvalidSessionStrategy;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Override
+    public void configure(WebSecurity web) throws Exception {
+        // game 走 token验证流程
+        web.ignoring().antMatchers("/game/**","/game_websocket/**","/static/**");
+    }
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth
+                //用户认证处理
+                .userDetailsService(userConfig)
+                //密码处理
+                .passwordEncoder(passwordConfig);
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http
+                // 关闭csrf防护
+                .csrf().disable()
+                .headers().frameOptions().disable()
+                .and();
+
+        http
+                //登录处理
+                .addFilterBefore(captchaFilterConfig, UsernamePasswordAuthenticationFilter.class)
+                .formLogin()
+                .loginProcessingUrl("/login")
+                //未登录时默认跳转页面
+                .loginPage("/loginPage")
+                .failureHandler(loginFailureHandlerConfig)
+                .successHandler(loginSuccessHandlerConfig)
+                .permitAll()
+                .and();
+        http
+                //登出处理
+                .logout()
+                .addLogoutHandler(logoutHandlerConfig)
+                .logoutUrl("/logout")
+                .logoutSuccessUrl("/loginPage")
+                .permitAll()
+                .and();
+        http
+                //"play_back"
+                //.mvcMatcher("/game")
+                //定制url访问权限，动态权限读取，参考：https://www.jianshu.com/p/0a06496e75ea
+                .addFilterAfter(dynamicallyUrlInterceptor(), FilterSecurityInterceptor.class)
+                .authorizeRequests()
+                //无需权限访问
+                .antMatchers("/favicon.ico","/common/**", "/webjars/**", "/getVerifyCodeImage","/error/*"
+                ).permitAll()
+                 //其他接口需要登录后才能访问
+                .anyRequest().authenticated()
+                .and();
+        http.sessionManagement()
+                //session无效处理策略
+                .invalidSessionStrategy(myInvalidSessionStrategy)
+                .and();
+        http
+                //开启记住我
+                .rememberMe()
+                .tokenValiditySeconds(604800)//七天免登陆
+                .tokenRepository(persistentTokenRepository())
+                .userDetailsService(userConfig)
+                .and();
+    }
+
+    @Bean
+    public PersistentTokenRepository persistentTokenRepository() {
+        JdbcTokenRepositoryImpl persistentTokenRepository = new JdbcTokenRepositoryImpl();
+        persistentTokenRepository.setDataSource(dataSource);
+        return persistentTokenRepository;
+    }
+
+    //配置filter
+    @Bean
+    public DynamicallyUrlInterceptor dynamicallyUrlInterceptor(){
+        //首次获取
+        List<SysAuthorityVo> authorityVoList = sysAuthorityService.list(new SysAuthorityVo()).getData();
+        myFilterInvocationSecurityMetadataSource.setRequestMap(authorityVoList);
+        //初始化拦截器并添加数据源
+        DynamicallyUrlInterceptor interceptor = new DynamicallyUrlInterceptor();
+        interceptor.setSecurityMetadataSource(myFilterInvocationSecurityMetadataSource);
+
+        //配置RoleVoter决策
+        List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
+        decisionVoters.add(new RoleVoter());
+
+        //设置认证决策管理器
+        interceptor.setAccessDecisionManager(new MyAccessDecisionManager(decisionVoters));
+        return interceptor;
+    }
+}

src/main/java/com/td/Dawa/config/security/UserConfig.java

@@ -0,0 +1,51 @@
+package com.td.Dawa.config.security;
+
+import com.td.Dawa.sys.sysuser.service.SysUserService;
+import com.td.Dawa.sys.sysuser.vo.SysUserVo;
+import com.td.Dawa.sys.sysuserauthority.service.SysUserAuthorityService;
+import com.td.Dawa.sys.sysuserauthority.vo.SysUserAuthorityVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+@Component
+public class UserConfig implements UserDetailsService {
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Autowired
+    private SysUserAuthorityService sysUserAuthorityService;
+
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        //查询用户
+        SysUserVo sysUserVo = sysUserService.findByLoginName(username).getData();
+        //查询权限
+        List<SysUserAuthorityVo> sysUserAuthorityVoList = sysUserAuthorityService.findByUserId(sysUserVo.getUserId()).getData();
+        StringBuilder authorityList = new StringBuilder();
+        for (int i = 0; i < sysUserAuthorityVoList.size(); i++) {
+            SysUserAuthorityVo sysUserAuthorityVo = sysUserAuthorityVoList.get(i);
+            authorityList.append(sysUserAuthorityVo.getSysAuthority().getAuthorityName());
+            if (i != sysUserAuthorityVoList.size() - 1) {
+                authorityList.append(",");
+            }
+        }
+
+        //查无此用户
+        if(StringUtils.isEmpty(sysUserVo.getUserId())){
+            sysUserVo.setLoginName("查无此用户");
+            sysUserVo.setPassword("查无此用户");
+        }
+
+        // 封装用户信息，并返回。参数分别是：用户名，密码，用户权限
+        return new User(sysUserVo.getLoginName(), sysUserVo.getPassword(), AuthorityUtils.commaSeparatedStringToAuthorityList(authorityList.toString()));
+    }
+}

src/main/java/com/td/Dawa/config/security/gameConfig.java

@@ -0,0 +1,51 @@
+package com.td.Dawa.config.security;
+
+import com.td.Dawa.sys.sysuser.service.SysUserService;
+import com.td.Dawa.sys.sysuser.vo.SysUserVo;
+import com.td.Dawa.sys.sysuserauthority.service.SysUserAuthorityService;
+import com.td.Dawa.sys.sysuserauthority.vo.SysUserAuthorityVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+@Component
+public class gameConfig implements UserDetailsService {
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Autowired
+    private SysUserAuthorityService sysUserAuthorityService;
+
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        //查询用户
+        SysUserVo sysUserVo = sysUserService.findByLoginName(username).getData();
+        //查询权限
+        List<SysUserAuthorityVo> sysUserAuthorityVoList = sysUserAuthorityService.findByUserId(sysUserVo.getUserId()).getData();
+        StringBuilder authorityList = new StringBuilder();
+        for (int i = 0; i < sysUserAuthorityVoList.size(); i++) {
+            SysUserAuthorityVo sysUserAuthorityVo = sysUserAuthorityVoList.get(i);
+            authorityList.append(sysUserAuthorityVo.getSysAuthority().getAuthorityName());
+            if (i != sysUserAuthorityVoList.size() - 1) {
+                authorityList.append(",");
+            }
+        }
+
+        //查无此用户
+        if(StringUtils.isEmpty(sysUserVo.getUserId())){
+            sysUserVo.setLoginName("查无此用户");
+            sysUserVo.setPassword("查无此用户");
+        }
+
+        // 封装用户信息，并返回。参数分别是：用户名，密码，用户权限
+        return new User(sysUserVo.getLoginName(), sysUserVo.getPassword(), AuthorityUtils.commaSeparatedStringToAuthorityList(authorityList.toString()));
+    }
+}

src/main/java/com/td/Dawa/config/token/WebConfig.java

@@ -0,0 +1,34 @@
+package com.td.Dawa.config.token;
+
+import com.td.Dawa.filter.gameFilter;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.filter.DelegatingFilterProxy;
+
+import javax.servlet.Filter;
+
+/**
+ * @author:slambb
+ * @date:2021/03/27
+ */
+@Configuration
+public class WebConfig {
+
+    @Bean
+    public Filter gameFilter() {
+        return new gameFilter();
+    }
+
+
+    @Bean
+    public FilterRegistrationBean authorizeFilterRegistration() {
+        FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setFilter(new DelegatingFilterProxy("gameFilter"));
+        registration.addUrlPatterns("/game/*");
+        registration.setName("gameFilter");
+        registration.setOrder(1);
+        return registration;
+    }
+
+}

src/main/java/com/td/Dawa/config/websocket/MyEndpointConfigure.java

@@ -0,0 +1,26 @@
+package com.td.Dawa.config.websocket;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+import javax.websocket.server.ServerEndpointConfig;
+
+/**
+ * 解决注入其他类的问题，详情参考这篇帖子：webSocket无法注入其他类：https://blog.csdn.net/tornadojava/article/details/78781474
+ */
+public class MyEndpointConfigure extends ServerEndpointConfig.Configurator implements ApplicationContextAware {
+
+    private static volatile BeanFactory context;
+
+    @Override
+    public <T> T getEndpointInstance(Class<T> clazz){
+        return context.getBean(clazz);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        MyEndpointConfigure.context = applicationContext;
+    }
+}

src/main/java/com/td/Dawa/config/websocket/WebSocketConfig.java

@@ -0,0 +1,32 @@
+package com.td.Dawa.config.websocket;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * WebSocket配置
+ */
+@Configuration
+public class WebSocketConfig {
+
+
+    /**
+     * 用途：扫描并注册所有携带@ServerEndpoint注解的实例。 @ServerEndpoint("/websocket")
+     * PS：如果使用外部容器 则无需提供ServerEndpointExporter。
+     */
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+
+    /**
+     * 支持注入其他类
+     */
+    @Bean
+    public MyEndpointConfigure newMyEndpointConfigure (){
+        return new MyEndpointConfigure ();
+    }
+
+
+}

src/main/java/com/td/Dawa/filter/gameFilter.java

@@ -0,0 +1,159 @@
+package com.td.Dawa.filter;
+
+
+import cn.hutool.core.convert.Convert;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.util.*;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.SignatureException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author:slambb
+ * @date:2021/03/27
+ */
+@Slf4j
+public class gameFilter implements Filter {
+    @Value("${jwt.token}")
+    private String tokenHeader;
+
+    @Value("${server.servlet.context-path:}")
+    private String contextPath;
+
+    @Autowired
+    private JwtTokenUtil jwtTokenUtil;
+
+    //添加redis 防止恶意请求
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    @Autowired
+    private RedisSettingMap redisSettingMap;
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    @Override
+    public void destroy() {
+    }
+
+    @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-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, PATCH, DELETE, PUT");
+        response.setHeader("Access-Control-Max-Age", "3600");
+        response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept , Authorization");
+
+        //log.info("********进入GameFilter过滤器********");
+        HttpServletRequest req = (HttpServletRequest) servletRequest;
+        //登陆IP不在白名单
+        String ipAddr = IpUtil.getIpAddr(req);
+        String token = req.getHeader(tokenHeader);
+        String path = req.getServletPath();
+
+        /**
+         * game接口都需要限制访问
+         */
+        //设置5秒内可以访问5次，同一个接口
+        String redisKey = "limit-req:".concat(req.getRequestURL().toString()).concat(":").concat(ipAddr);
+        int _limitTime = 5,_limitCount = 10;
+        if (!redisTemplate.hasKey(redisKey)) {
+            redisTemplate.opsForValue().set(redisKey, String.valueOf(1), _limitTime, TimeUnit.SECONDS);
+        } else {
+            int increment = Convert.toInt(redisTemplate.opsForValue().get(redisKey));
+            if (increment > _limitCount) {
+                response.setCharacterEncoding("UTF-8");
+                response.setContentType("application/json; charset=utf-8");
+                PrintWriter out = response.getWriter();
+                out.print(JsonUtils.toJson(Result.of(null, false, ResultEnum.REDIS_IS_LOCK.getMessage(), ResultEnum.REDIS_IS_LOCK.getCode())));
+                out.flush();
+                out.close();
+                return;
+            } else {
+                redisTemplate.opsForValue().set(redisKey, String.valueOf(++increment), _limitTime, TimeUnit.SECONDS);
+            }
+        }
+
+        //登录，获取验证码，不用登录的接口
+        // 存在game字段，需要检验token
+        if (!(path.indexOf("game") > -1)
+                || path.indexOf("loginToken") > -1
+                || path.indexOf("login") > -1
+                || path.indexOf("RSAConfig") > -1
+        ) {
+            //登录情况直接放行
+            filterChain.doFilter(servletRequest, response);
+            return;
+        }
+
+        log.info("token:" + token);
+        if (null == token || token.isEmpty() || !token.startsWith("Bearer ")) {
+            //没有token信息
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application/json; charset=utf-8");
+            PrintWriter out = response.getWriter();
+            out.print(JsonUtils.toJson(Result.of(null, false, ResultEnum.TOKEN_DOES_NOT_EXIST.getMessage(), ResultEnum.TOKEN_DOES_NOT_EXIST.getCode())));
+            out.flush();
+            out.close();
+            return;
+        } else {
+            String authToken = token.substring(7);
+            try {
+                String userId = jwtTokenUtil.getUserIdFromToken(authToken);
+                //log.info("userId:{}", userId);
+                //todo 后面需要校验时间，加入可切换 secret 校验
+                //log.info("validateToken:{}", jwtTokenUtil.validateToken(authToken, userId));
+                // 加入secret校验
+                if (!jwtTokenUtil.validateToken(authToken, userId)) {
+                    log.info("secret 不可靠，validateToken:{}", jwtTokenUtil.validateToken(authToken, userId));
+                }
+                if (StringUtils.hasText(userId)) {
+                    filterChain.doFilter(new TokenRequestWrapper((HttpServletRequest) servletRequest, userId), response);
+                } else {
+                    //不存在用户信息
+                    response.setCharacterEncoding("UTF-8");
+                    response.setContentType("application/json; charset=utf-8");
+                    PrintWriter out = response.getWriter();
+                    out.print(JsonUtils.toJson(Result.of(authToken, false, ResultEnum.TOKEN_DOES_NOT_HAVE_USER_ID.getMessage(), ResultEnum.TOKEN_DOES_NOT_HAVE_USER_ID.getCode())));
+                    out.flush();
+                    out.close();
+                }
+            } catch (ExpiredJwtException e) {
+                //token过期
+                response.setCharacterEncoding("UTF-8");
+                response.setContentType("application/json; charset=utf-8");
+                PrintWriter out = response.getWriter();
+                out.print(JsonUtils.toJson(Result.of(null, false, ResultEnum.TOKEN_OUT_OF_DATE.getMessage(), ResultEnum.TOKEN_OUT_OF_DATE.getCode())));
+                out.flush();
+                out.close();
+            } catch (SignatureException e) {
+                //secret校验密钥不对
+                response.setCharacterEncoding("UTF-8");
+                response.setContentType("application/json; charset=utf-8");
+                PrintWriter out = response.getWriter();
+                out.print(JsonUtils.toJson(Result.of(authToken, false, ResultEnum.TOKEN_IS_ILLEGAL.getMessage(), ResultEnum.TOKEN_IS_ILLEGAL.getCode())));
+                out.flush();
+                out.close();
+            }
+
+        }
+
+    }
+}

src/main/java/com/td/Dawa/game/comcharacters/controller/ComCharactersController.java

@@ -0,0 +1,191 @@
+/**
+ * 游戏角色controller，管理前端游戏相关的角色操作
+ */
+
+package com.td.Dawa.game.comcharacters.controller;
+
+import cn.hutool.core.date.DateUtil;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersRandomVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharacters.service.ComCharactersService;
+import com.td.Dawa.game.comusers.service.ComUsersService;
+import com.td.Dawa.game.excelcharacterattri.service.ExcelCharacterAttriService;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+import com.td.Dawa.util.CopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@RequestMapping("/game/comCharacters/")
+public class ComCharactersController extends CommonController<ComCharactersVo, ComCharacters, Integer> {
+    @Autowired
+    private ComCharactersService comCharactersService;
+
+    @Autowired
+    private ExcelCharacterAttriService excelCharacterAttriService;
+
+    @Autowired
+    private ComUsersService comUsersService;
+
+    /**
+     * 返回三个随机的角色数据
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("getRole")
+    @Encrypt
+    public Result<List<ComCharactersRandomVo>> getRole(@RequestParam(value = "userId") String userId) {
+
+        //消耗
+        try {
+            //消耗金币返回一个提示
+            comUsersService.consumesGoldFromGetRole(userId);
+            //1.excel 随机拿出number 数据, todo 暂时以attri表为主
+            List<ComCharactersRandomVo> excelCharacter =  comCharactersService.randomRoleByNumber(3);
+            //2.返回给前端一个character 数据表里面
+            return Result.of(excelCharacter);
+        }catch (AuthorizeException e) {
+            return Result.of(null, false, e.getMessage(), e.getCode());
+        }
+
+
+    }
+
+    /**
+     * 玩家选择一个添加角色,
+     * 因为召唤已经扣除了金币，添加角色直接检测是否召唤消耗过金币
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("addRole")
+    @Encrypt
+    public Result<ComCharactersClientVo> addRole(@RequestParam(value = "userId") String userId,
+                                                 @RequestParam(value = "roleId") Integer roleId) {
+
+        //todo  暂时roleType对应这roleId
+        //      暂时可以创建多个相同的角色
+        try {
+            //拿出一个角色对应的配置数据来生成角色
+            ExcelCharacterAttriVo excelCharacterAttriVo = excelCharacterAttriService.getVo(roleId);
+            if (excelCharacterAttriVo == null) {
+                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
+            }
+            //根据roleId 对应的数据，生成玩家数据,属性
+            ComCharactersClientVo comCharacters = comCharactersService.addRole(excelCharacterAttriVo, userId);
+            return Result.of(comCharacters);
+        } catch (Exception e) {
+            return Result.of(null, false, ResultEnum.ROLE_ADD_ERROR);
+        }
+
+    }
+
+
+    /**
+     * 修改名字
+     * @param userId
+     * @param id 使用 com_characters 里面的 id修改名字
+     * @param name
+     * @return
+     */
+    @PostMapping("modifyRoleName")
+    @Encrypt
+    public Result<?> modifyRoleName(@RequestParam(value = "userId") String userId,
+                                                        @RequestParam(value = "id") Integer id,
+                                                        @RequestParam(value = "name") String name) {
+        try {
+            //todo  暂时roleType对应这roleId
+            ComCharactersVo comCharactersVo = comCharactersService.getVo(id);
+            if (comCharactersVo == null) {
+                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
+            }
+            //判定是否是自己的数据
+            if(!comCharactersVo.getUserId().equals(userId)){
+                return Result.of(null, false, ResultEnum.ROLE_ADD_ERROR);
+            }
+            if(name.length()>12){
+                return Result.of(null, false, ResultEnum.ROLE_NAME_TOO_LONG);
+            }
+            if(StringUtils.hasText(name)){
+                comCharactersVo.setName(name);
+            }else{
+                //加入传入是空的，用id来作为名字
+                comCharactersVo.setName(comCharactersVo.getId().toString());
+            }
+            comCharactersVo.setUpdateTime(DateUtil.date());
+            comCharactersService.save(comCharactersVo);
+            return Result.of(CopyUtil.copy(comCharactersVo, ComCharactersClientVo.class));
+
+
+        } catch (Exception e) {
+            return Result.of(e.getMessage(), false, ResultEnum.ROLE_ADD_ERROR);
+        }
+
+    }
+
+
+    /**
+     * 列表排列顺序，根据选中职业对应属性高低排序
+     * 挖矿(伐木)：力量高的排前边
+     * 勘探：智力高的排前边
+     * 运输：技巧高的排前边
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("getRoleList")
+    @Encrypt
+    public Result<List<ComCharactersClientVo>> getRoleList(@RequestParam(value = "userId") String userId,
+    @RequestParam(value = "attribute") Integer attribute) {
+        List<ComCharactersClientVo> charactersClientVos = comCharactersService.findByProfessionalSort(userId,attribute);
+        return Result.of(charactersClientVos);
+    }
+
+    /**
+     * 遣返角色
+     * 根据当前角色state判断是否可遣返
+     * @param userId
+     * @param id
+     * @return
+     */
+    @PostMapping("repatriateRole")
+    @Encrypt
+    public Result<String> repatriateRole(@RequestParam(value = "userId") String userId,
+                                                        @RequestParam(value = "id") Integer id) {
+        try {
+            //todo  暂时roleType对应这roleId
+            ComCharactersVo comCharactersVo = comCharactersService.getVo(id);
+            if (comCharactersVo == null) {
+                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
+            }
+            //判定是否是自己的数据
+            if(!comCharactersVo.getUserId().equals(userId)){
+                return Result.of(null, false, ResultEnum.ROLE_REPATRIATE_ERROR);
+            }
+            //todo 判断是否处于空闲中，否则不能遣返
+            if(comCharactersVo.getState().equals(GameEnum.CHARACTERS_STATE_NORMAL.getValue())){
+                //删除角色
+                comCharactersService.delete(id);
+                return Result.of("删除成功");
+            }else{
+                return Result.of(GameEnum.getByValue(comCharactersVo.getState()).getMessage());
+            }
+        } catch (Exception e) {
+            return Result.of(null, false, ResultEnum.ROLE_REPATRIATE_ERROR);
+        }
+
+    }
+}

src/main/java/com/td/Dawa/game/comcharacters/pojo/ComCharacters.java

@@ -0,0 +1,55 @@
+package com.td.Dawa.game.comcharacters.pojo;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "com_characters")
+@Data
+public class ComCharacters implements Serializable {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;//该角色的id
+
+    private String userId;//创建该角色的用户id
+
+    private Integer roleId;//角色生成表 里面对应的id序号
+
+    private Integer roleType;//角色种类（角色等级表和角色属性表相关）
+
+    private String name;//角色名字
+
+    private Integer exp;//当前经验
+
+    private Integer level;//当前等级
+
+    private Integer power;//力量
+
+    private Integer intelligence;//智力值
+
+    private Integer skills;//技巧值
+
+    private Integer random;//随机属性值
+
+    private Integer professional;//当前职业
+
+    private Integer workPos;//配置时候位置（0：第一个,1：第二个，2：第三个）
+
+    private String action;//携带动作
+
+    private String interactive;//互动事件
+
+    private Integer state;//状态 (0：正常可配置，1：交易行)
+
+    private String modelId;//记录生成的模型id，如1|2|3格式
+
+    private String modelColor;//记录模型生成的颜色id,如1|2|3格式
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/comcharacters/repository/ComCharactersRepository.java

@@ -0,0 +1,22 @@
+package com.td.Dawa.game.comcharacters.repository;
+
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface ComCharactersRepository extends CommonRepository<ComCharacters, Integer>  {
+
+    Optional<ComCharacters> findByRoleId(Integer roleId);
+
+    List<ComCharacters> findByUserIdAndProfessional(String userId,Integer professional, Sort sort);
+
+    List<ComCharacters> findAllByUserId(String userId, Sort sort);
+
+    List<ComCharacters> findByIdIn(Integer[] ids, Sort sort);
+
+}

src/main/java/com/td/Dawa/game/comcharacters/service/ComCharactersService.java

@@ -0,0 +1,26 @@
+package com.td.Dawa.game.comcharacters.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersRandomVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+
+import java.util.List;
+
+public interface ComCharactersService extends CommonService<ComCharactersVo, ComCharacters, Integer> {
+
+    public List<ComCharactersRandomVo> randomRoleByNumber(Integer number);
+
+    public List<ComCharactersClientVo> findByProfessionalSort(String userId,Integer attribute);
+
+    public ComCharactersClientVo addRole(ExcelCharacterAttriVo _attr, String userId);
+
+    public ComCharacters findByRoleId(Integer roleId);
+
+    public List<ComCharacters> findByRoleIdIn(Integer[] ids);
+
+    public ComCharactersClientVo addSubResourcesClientListToVO(ComCharactersClientVo comCharactersClientVo ,String _modelIdStr,String _modelColorStr);
+}

src/main/java/com/td/Dawa/game/comcharacters/service/ComCharactersServiceImpl.java

@@ -0,0 +1,418 @@
+package com.td.Dawa.game.comcharacters.service;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import com.td.Dawa.annotation.In;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.game.comcharacters.vo.*;
+import com.td.Dawa.game.comcharacters.repository.ComCharactersRepository;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import com.td.Dawa.game.excelcharacterattri.repository.ExcelCharacterAttriRepository;
+import com.td.Dawa.game.excelcharacterattri.service.ExcelCharacterAttriService;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+import com.td.Dawa.game.excelcharactercolor.pojo.ExcelCharacterColor;
+import com.td.Dawa.game.excelcharactercolor.service.ExcelCharacterColorService;
+import com.td.Dawa.game.excelcharactercolor.vo.ExcelCharacterColorClientVo;
+import com.td.Dawa.game.excelcharactercreate.pojo.ExcelCharacterCreate;
+import com.td.Dawa.game.excelcharactercreate.service.ExcelCharacterCreateService;
+import com.td.Dawa.game.excelcharacterlevel.pojo.ExcelCharacterLevel;
+import com.td.Dawa.game.excelcharacterlevel.service.ExcelCharacterLevelService;
+import com.td.Dawa.game.excelcharacterlevel.vo.ExcelCharacterLevelVo;
+import com.td.Dawa.game.excelresources.pojo.ExcelResources;
+import com.td.Dawa.game.excelresources.service.ExcelResourcesService;
+import com.td.Dawa.game.excelresources.vo.ExcelResourcesClientVo;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.ProbabilityIntervalUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.hibernate.query.criteria.internal.CriteriaBuilderImpl;
+import org.hibernate.query.criteria.internal.expression.function.BasicFunctionExpression;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.Expression;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+@Slf4j
+public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo, ComCharacters, Integer> implements ComCharactersService {
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ComCharactersRepository comCharactersRepository;
+
+    @Autowired
+    private ExcelCharacterAttriRepository excelCharacterAttriRepository;
+
+    /**
+     * excel表service
+     */
+    @Autowired
+    private ExcelCharacterCreateService excelCharacterCreateService;
+
+    @Autowired
+    private ExcelCharacterAttriService excelCharacterAttriService;
+
+    @Autowired
+    private ExcelCharacterLevelService excelCharacterLevelService;
+
+    @Autowired
+    private ExcelCharacterColorService excelCharacterColorService;
+
+    @Autowired
+    private ExcelResourcesService excelResourcesService;
+
+
+    @Override
+    public List<ComCharactersRandomVo> randomRoleByNumber(Integer number) {
+        Specification<ExcelCharacterAttri> specification = (root, query, cb) -> {
+            //Predicate pd = cb.and(cb.equal(root.get("title"), "测试题"));
+            Expression<Double> e = new BasicFunctionExpression<>(
+                    (CriteriaBuilderImpl) cb, Double.class, "rand"
+            );
+            query.orderBy(cb.desc(e));
+            return null;
+        };
+        //1.获取了number 数量的 roleType todo 可加入内存
+        List<ExcelCharacterAttri> excelCharacterAttrList = excelCharacterAttriRepository.findAll(specification, PageRequest.of(0, number)).toList();
+        //2.根据roleType分类
+        List<ComCharactersRandomVo> characters = new ArrayList<>();
+        //3.查询role表全部数据
+        //List<Integer> roleIds = excelCharacterAttrList.stream().map(e -> e.getRoleType()).collect(Collectors.toList());
+        for (ExcelCharacterAttri excelCharacterAttr : excelCharacterAttrList) {
+            ComCharactersRandomVo character = new ComCharactersRandomVo();
+            character.setRoleId(excelCharacterAttr.getId());
+            character.setRoleType(excelCharacterAttr.getRoleType());
+            character.setAction(excelCharacterAttr.getAction());
+            character.setInteractive(excelCharacterAttr.getInteractive());
+            characters.add(character);
+        }
+        return characters;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ComCharactersClientVo addRole(ExcelCharacterAttriVo _attr, String userId) {
+
+        Integer roleType = _attr.getRoleType();//todo 暂时用属性表里面的roleType
+        //1.添加一个角色
+        ComCharacters comCharacters = new ComCharacters();
+        comCharacters.setUserId(userId);
+        comCharacters.setRoleId(_attr.getId()); //用属性的id来设置roleId
+        comCharacters.setRoleType(roleType);
+        ////力量
+        //Double _powerDouble = new Random().nextDouble() * (_attr.getStartPowerLimitUpper() - _attr.getStartPowerLimitLower()) + _attr.getStartPowerLimitLower();
+        //comCharacters.setPower(_powerDouble.intValue());
+        ////智力(智慧)
+        //Double _intelligenceDouble = new Random().nextDouble() * (_attr.getStartWisdomLimitUpper() - _attr.getStartWisdomLimitLower()) + _attr.getStartWisdomLimitLower();
+        //comCharacters.setIntelligence(_intelligenceDouble.intValue());
+        ////技巧
+        //Double _skillsDouble = new Random().nextDouble() * (_attr.getStartSkillLimitUpper() - _attr.getStartSkillLimitLower()) + _attr.getStartSkillLimitLower();
+        //comCharacters.setSkills(_skillsDouble.intValue());
+
+        //随机一个力量值，添加到后面的属性上
+        comCharacters.setRandom(_attr.getRandomAttr());
+        //力量
+        Double _random1 = new Random().nextDouble() * _attr.getRandomAttr();
+        Double _powerDouble = _random1 + _attr.getStartPowerLimitLower();
+        comCharacters.setPower(_powerDouble.intValue());
+        //智力(智慧)
+        Double _random2 = new Random().nextDouble() * _attr.getRandomAttr();
+        Double _intelligenceDouble = _random2 + _attr.getStartWisdomLimitLower();
+        comCharacters.setIntelligence(_intelligenceDouble.intValue());
+        //技巧
+        Double _random3 = new Random().nextDouble() * _attr.getRandomAttr();
+        Double _skillsDouble = _random3 + _attr.getStartSkillLimitLower();
+        comCharacters.setSkills(_skillsDouble.intValue());
+
+        comCharacters.setProfessional(0);//这里不区分职业，直接记录一个默认值，进行队伍配置时候，设置一个 1,2,3,4(挖矿，勘探，运输，伐木)
+        comCharacters.setWorkPos(0);//记录一个默认没有位置
+        comCharacters.setAction(_attr.getAction());
+        comCharacters.setInteractive(_attr.getInteractive());
+        comCharacters.setState(0);
+
+        List<ExcelCharacterLevel> levelList = excelCharacterLevelService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_LEVEL.getMessage());
+
+        //设置经验和等级
+        comCharacters.setExp(levelList.get(0).getExp());
+        comCharacters.setLevel(levelList.get(0).getId());
+
+        //随机生成一套model
+        List<String> colorIdList = new ArrayList<>();
+
+        //生成配件
+        List<ComCharactersResourcesVo> _genList = generateCharacterModels();
+        List<String> modelList = _genList.stream().map(e -> {
+            colorIdList.add(e.getColorIds());
+            return e.getArtId().toString();
+        }).collect(Collectors.toList());
+
+        comCharacters.setModelId(String.join("|", modelList));
+        //记录颜色id
+        comCharacters.setModelColor(String.join("|", colorIdList));
+
+        comCharacters.setCreateTime(DateUtil.date());
+        comCharacters.setUpdateTime(DateUtil.date());
+        comCharacters = comCharactersRepository.saveAndFlush(comCharacters);
+        //再存储一次id，根据当前生成的角色自增id来作为名字
+        comCharacters.setName(comCharacters.getId().toString());
+        comCharactersRepository.save(comCharacters);
+
+        ComCharactersClientVo clientVo = CopyUtil.copy(comCharacters, ComCharactersClientVo.class);
+        //设置第二级的升级经验
+        ExcelCharacterLevel excelCharacterLevel = levelList.get(1) ;//2级
+        clientVo.setLevelUpExp(excelCharacterLevel.getExp());
+
+        clientVo.setSubResourcesClientList(_genList);
+
+        return clientVo;
+    }
+
+
+    @Override
+    public ComCharacters findByRoleId(Integer roleId) {
+        return comCharactersRepository.findByRoleId(roleId).orElse(null);
+    }
+
+    /**
+     * 根据类型返回对应的排名
+     * 相同条件按创建时间处理
+     * @param userId
+     * @param attribute
+     * @return
+     */
+    @Override
+    public List<ComCharactersClientVo> findByProfessionalSort(String userId, Integer attribute) {
+        String _properties = "power";//默认power排序
+        if (attribute.equals(GameEnum.PRO_POWER.getValue())) {
+            _properties = "power";
+        } else if (attribute.equals(GameEnum.PRO_INTELLIGENCE.getValue())) {
+            _properties = "intelligence";
+        } else if (attribute.equals(GameEnum.PRO_SKIlLS.getValue())) {
+            _properties = "skills";
+        } else if (attribute.equals(3)) {
+            //等级排序
+            _properties = "level";
+        }
+        List<Sort.Order> sortOrder = new ArrayList<>();
+        sortOrder.add(new Sort.Order(Sort.Direction.DESC, _properties));
+        sortOrder.add(new Sort.Order(Sort.Direction.ASC,"createTime"));
+        List<ComCharacters> comCharactersList = comCharactersRepository.findAllByUserId(userId, Sort.by(sortOrder));
+        List<ComCharactersClientVo> comCharactersClientVos = comCharactersList.stream().map(e -> {
+            ComCharactersClientVo comCharactersClientVo = CopyUtil.copy(e, ComCharactersClientVo.class);
+            comCharactersClientVo = addSubResourcesClientListToVO(comCharactersClientVo, e.getModelId(), e.getModelColor());
+            //获取当前的升级等级
+            ExcelCharacterLevel _levelUpExp = excelCharacterLevelService.getNextLevelInfo(comCharactersClientVo.getLevel());
+            comCharactersClientVo.setLevelUpExp(_levelUpExp.getExp());
+            return comCharactersClientVo;
+        }).collect(Collectors.toList());
+        return comCharactersClientVos;
+    }
+
+
+    @Override
+    public List<ComCharacters> findByRoleIdIn(Integer[] ids) {
+        return comCharactersRepository.findByIdIn(ids, Sort.by(Sort.Direction.ASC, "id"));
+    }
+
+    /**
+     * 生成 7个配件,颜色，位置
+     *
+     * @return
+     */
+    private List<ComCharactersResourcesVo> generateCharacterModels() {
+        //全部颜色,并计算两个主副颜色
+        List<ExcelCharacterColor> _allColors = excelCharacterColorService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_COLOR.getMessage());
+        //颜色类型（0，旧颜色，1花纹、耳朵、尾巴、嘴巴、轮廓主色颜色预设，2内耳预制色，3眉毛预制色，4眼睛颜色预制色）
+        List<ExcelCharacterColor> _mainColors = _allColors.stream().filter(e->e.getType().equals(1)).collect(Collectors.toList());//取颜色1 为主颜色
+        ExcelCharacterColor _AColor = _mainColors.get((int) (Math.random() * _mainColors.size())); //A主色
+        List<ExcelCharacterColor> _bColorList = _mainColors.stream().filter(e -> !e.getId().equals(_AColor.getId())).collect(Collectors.toList());
+        ExcelCharacterColor _BColor = _bColorList.get((int) (Math.random() * _bColorList.size()));//不与A重复的花色B副色
+        //生产和资源
+        List<ExcelCharacterCreate> _allCreates = excelCharacterCreateService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_CREATE.getMessage());
+        List<ExcelResources> _allResources = excelResourcesService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_RESOURCES.getMessage());
+        //获取模型资源
+        List<ExcelResources> roleResources = _allResources.stream().filter(e -> e.getArtType().equals(5)).collect(Collectors.toList());
+        List<Integer> roleArtIds = roleResources.stream().map(ExcelResources::getArtId).collect(Collectors.toList());
+        //输出对象list
+        List<ComCharactersInfoVo> infoList = new ArrayList<>();
+        List<ExcelCharacterCreate> _currentCharacters = new ArrayList<>();
+        //1.生成瞳孔
+        //权重计算，当前有20个权重1,9个权重6,4个权重5，加起来值是100
+        List<ExcelCharacterCreate> pupilAll = _allCreates.stream().filter(e -> e.getPosition().equals(1)).collect(Collectors.toList());
+        //ExcelCharacterCreate pupil = pupilAll.get((int) (Math.random() * pupilAll.size()));
+        ExcelCharacterCreate pupil = ProbabilityIntervalUtil.getRolePos(pupilAll);
+        //左右瞳孔 todo 可能需要颜色区分
+        //_currentCharacters.add(pupil);
+        //_currentCharacters.add(pupil);
+        //瞳孔 独立色
+        List<ExcelCharacterColor> _pupilColors = _allColors.stream().filter(e->e.getType().equals(4)).collect(Collectors.toList());//取颜色4 为眼睛颜色
+        ExcelCharacterColor _pupilColor = _pupilColors.get((int) (Math.random() * _pupilColors.size()));
+        infoList.add(new ComCharactersInfoVo(pupil, _pupilColor, false));
+        infoList.add(new ComCharactersInfoVo(pupil, _pupilColor, true));
+
+        //2.生成耳朵
+        List<ExcelCharacterCreate> earsAll = _allCreates.stream().filter(e -> e.getPosition().equals(2)).collect(Collectors.toList());
+        ExcelCharacterCreate ears = ProbabilityIntervalUtil.getRolePos(earsAll);// earsAll.get((int) (Math.random() * earsAll.size()));
+        //_currentCharacters.add(ears);
+        //_currentCharacters.add(ears);
+        //内耳颜色，设置为副色
+        List<ExcelCharacterColor> _earsColors = _allColors.stream().filter(e->e.getType().equals(2)).collect(Collectors.toList());//取颜色2 为内耳颜色
+        ExcelCharacterColor _earsColor = _earsColors.get((int) (Math.random() * _earsColors.size()));
+        //A色一致
+        infoList.add(new ComCharactersInfoVo(ears, _AColor,_earsColor,false));
+        infoList.add(new ComCharactersInfoVo(ears, _AColor,_earsColor, true));
+        //3.生成眉毛
+        List<ExcelCharacterCreate> eyebrowAll = _allCreates.stream().filter(e -> e.getPosition().equals(3)).collect(Collectors.toList());
+        ExcelCharacterCreate eyebrow = ProbabilityIntervalUtil.getRolePos(eyebrowAll);// eyebrowAll.get((int) (Math.random() * eyebrowAll.size()));
+        //_currentCharacters.add(eyebrow);
+        //_currentCharacters.add(eyebrow);
+        List<ExcelCharacterColor> _eyeColors = _allColors.stream().filter(e->e.getType().equals(3)).collect(Collectors.toList());//取颜色3 为眉毛颜色
+        ExcelCharacterColor _eyeColor = _eyeColors.get((int) (Math.random() * _eyeColors.size()));
+        infoList.add(new ComCharactersInfoVo(eyebrow, _eyeColor, false));
+        infoList.add(new ComCharactersInfoVo(eyebrow, _eyeColor, true));
+        //4.生成吻部
+        List<ExcelCharacterCreate> snoutAll = _allCreates.stream().filter(e -> e.getPosition().equals(4)).collect(Collectors.toList());
+        ExcelCharacterCreate snout = ProbabilityIntervalUtil.getRolePos(snoutAll);//snoutAll.get((int) (Math.random() * snoutAll.size()));
+        //_currentCharacters.add(snout);
+        //独立色
+        ExcelCharacterColor _snoutColor = _mainColors.get((int) (Math.random() * _mainColors.size()));
+        infoList.add(new ComCharactersInfoVo(snout, _snoutColor));
+        //5.生成花纹
+        List<ExcelCharacterCreate> decorativePatternAll = _allCreates.stream().filter(e -> e.getPosition().equals(5)).collect(Collectors.toList());
+        ExcelCharacterCreate decorativePattern = ProbabilityIntervalUtil.getRolePos(decorativePatternAll); // decorativePatternAll.get((int) (Math.random() * decorativePatternAll.size()));
+        //_currentCharacters.add(decorativePattern);
+        infoList.add(new ComCharactersInfoVo(decorativePattern, _AColor, _BColor));
+
+        //6.生成轮廓
+        List<ExcelCharacterCreate> outLineAll = _allCreates.stream().filter(e -> e.getPosition().equals(6)).collect(Collectors.toList());
+        ExcelCharacterCreate outLine = ProbabilityIntervalUtil.getRolePos(outLineAll);//outLineAll.get((int) (Math.random() * outLineAll.size()));
+        //_currentCharacters.add(outLine);
+        //独立色
+        ExcelCharacterColor _outLineColor = _mainColors.get((int) (Math.random() * _mainColors.size()));
+        infoList.add(new ComCharactersInfoVo(outLine, _outLineColor));
+        //7.生成尾巴
+        List<ExcelCharacterCreate> tailAll = _allCreates.stream().filter(e -> e.getPosition().equals(7)).collect(Collectors.toList());
+        ExcelCharacterCreate tail = ProbabilityIntervalUtil.getRolePos(tailAll);//tailAll.get((int) (Math.random() * tailAll.size()));
+        //_currentCharacters.add(tail);
+        //独立色
+        ExcelCharacterColor _tailColor = _mainColors.get((int) (Math.random() * _mainColors.size()));
+        //主副色。主色与A色一致，副色为独立色
+        infoList.add(new ComCharactersInfoVo(tail, _AColor, _tailColor));
+
+        //拿到当前对应的resources 资源
+        List<ComCharactersInfoVo> resourcesList = infoList.stream().map(_res -> {
+            ExcelResources excelResources = roleResources.get(roleArtIds.indexOf(_res.getSubCreate().getModel()));
+            _res.setSubResources(excelResources);
+            return _res;
+        }).collect(Collectors.toList());
+
+
+        //对应资源
+        List<ComCharactersResourcesVo> resourcesList2 = resourcesList.stream().map(_res -> {
+            ComCharactersResourcesVo excelResourcesClientVo = new ComCharactersResourcesVo();
+            excelResourcesClientVo = CopyUtil.copy(_res.getSubResources(), ComCharactersResourcesVo.class);
+            excelResourcesClientVo.setPosition(_res.getSubCreate().getPosition());
+            excelResourcesClientVo.setCharacterColor(CopyUtil.copy(_res.getSubPrimaryColor(), ExcelCharacterColorClientVo.class));
+            excelResourcesClientVo.setNote(_res.getSubResources().getNote());
+            if (_res.getSubSecondaryColor() != null) {
+                excelResourcesClientVo.setCharacterSecondaryColor(CopyUtil.copy(_res.getSubSecondaryColor(), ExcelCharacterColorClientVo.class));
+                //如果有两个颜色id这记录
+                excelResourcesClientVo.setColorIds(_res.getSubPrimaryColor().getId() + "," + _res.getSubSecondaryColor().getId());
+            } else {
+                excelResourcesClientVo.setColorIds(_res.getSubPrimaryColor().getId().toString());
+            }
+            excelResourcesClientVo.setIsTheRight(_res.getIsTheRight());
+            return excelResourcesClientVo;
+        }).collect(Collectors.toList());
+
+        return resourcesList2;
+    }
+
+    /**
+     * 查询子配件,设置到 ComCharactersClientVo 里面
+     *
+     * @param comCharactersClientVo
+     * @param _modelIdStr
+     * @return
+     */
+    @Override
+    public ComCharactersClientVo addSubResourcesClientListToVO(ComCharactersClientVo comCharactersClientVo, String _modelIdStr, String _modelColorStr) {
+        Integer[] _modelIdArray = Convert.toIntArray(_modelIdStr.split("\\|"));
+        List<ExcelCharacterColor> allColorList = excelCharacterColorService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_COLOR.getMessage());
+        List<Integer> allColorIdList = allColorList.stream().map(ExcelCharacterColor::getId).collect(Collectors.toList());
+        // 1,2|主，副颜色
+        List<String> _colorList = Arrays.asList(_modelColorStr.split("\\|"));
+        List<String> _primaryColorList = new ArrayList<>();
+        List<String> _secondaryColorList = new ArrayList<>();
+        _colorList.stream().map(e -> {
+            String[] _colorIds = e.split(",");
+            if (_colorIds.length >= 2) {
+                _primaryColorList.add(_colorIds[0]);
+                _secondaryColorList.add(_colorIds[1]);
+            } else {
+                _primaryColorList.add(_colorIds[0]);
+                _secondaryColorList.add("");
+            }
+
+            return e;
+        }).collect(Collectors.toList());
+        List<ExcelCharacterColor> allPrimaryColors = _primaryColorList.stream().map(e -> allColorList.get(allColorIdList.indexOf(Integer.parseInt(e)))).collect(Collectors.toList());
+        List<ExcelCharacterColor> allSecondaryColors = new ArrayList<>();
+        for (String id : _secondaryColorList) {
+            if (StringUtils.hasText(id)&&allColorIdList.contains(Integer.parseInt(id))) {
+                ExcelCharacterColor _color = allColorList.get(allColorIdList.indexOf(Integer.parseInt(id)));
+                allSecondaryColors.add(_color);
+            }else{
+                allSecondaryColors.add(null);
+            }
+        }
+        //查询position
+        List<ExcelCharacterCreate> _genList = excelCharacterCreateService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_CREATE.getMessage());
+        List<Integer> characterModelIdList = _genList.stream().map(ExcelCharacterCreate::getModel).collect(Collectors.toList());
+        List<ExcelResources> allResourcesList = excelResourcesService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_RESOURCES.getMessage());
+        List<Integer> allResourcesArtIdList = allResourcesList.stream().map(ExcelResources::getArtId).collect(Collectors.toList());
+        List<ComCharactersResourcesVo> resourcesList = new ArrayList<>();
+        for(int i = 0;i<_modelIdArray.length;i++){
+            Integer ids = _modelIdArray[i];
+            Integer currentIndex = i+1;
+            ExcelResources excelResources =  allResourcesList.get(allResourcesArtIdList.indexOf(ids));
+            ExcelCharacterCreate excelCharacterCreate = _genList.get(characterModelIdList.indexOf(ids));
+            ComCharactersResourcesVo excelResourcesClientVo = CopyUtil.copy(excelResources, ComCharactersResourcesVo.class);
+            //简单按顺序区分左右，通常第一个就是左边
+            switch (currentIndex) {
+                case 1:
+                case 3:
+                case 5:
+                    excelResourcesClientVo.setIsTheRight(false);
+                    break;
+                case 2:
+                case 4:
+                case 6:
+                    excelResourcesClientVo.setIsTheRight(true);
+                    break;
+            }
+            excelResourcesClientVo.setNote(excelResources.getNote());
+            excelResourcesClientVo.setColorIds(_colorList.get(i));
+            excelResourcesClientVo.setPosition(excelCharacterCreate.getPosition());
+            excelResourcesClientVo.setCharacterColor(CopyUtil.copy(allPrimaryColors.get(i), ExcelCharacterColorClientVo.class));
+            if (allSecondaryColors.get(i) != null) {
+                excelResourcesClientVo.setCharacterSecondaryColor(CopyUtil.copy(allSecondaryColors.get(i), ExcelCharacterColorClientVo.class));
+            }
+            resourcesList.add(excelResourcesClientVo);
+        }
+        comCharactersClientVo.setSubResourcesClientList(resourcesList);
+        return comCharactersClientVo;
+    }
+}

src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersClientVo.java

@@ -0,0 +1,60 @@
+package com.td.Dawa.game.comcharacters.vo;
+
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateClientVo;
+import com.td.Dawa.game.excelresources.vo.ExcelResourcesClientVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ComCharactersClientVo implements Serializable {
+    private Integer id;//该角色的id
+
+    //private String userId;//创建该角色的用户id
+
+    private Integer roleId;//角色生成表 里面对应的id序号
+
+    private Integer roleType;//角色种类（角色等级表和角色属性表相关）
+
+    private String name;//角色名字
+
+    private Integer power;//力量
+
+    private Integer previousExp;//之前的经验
+
+    private Integer previousLevel;//之前的等级
+
+    private Integer exp;//当前经验
+
+    private Integer level;//当前等级
+
+    private Integer levelUpExp;//当前等级升级需要的经验
+
+    private Integer intelligence;//智力值
+
+    private Integer skills;//技巧值
+
+    private Integer random;//随机属性值
+
+    private Integer professional;//当前职业
+
+    private Integer workPos;//配置时候位置（0：第一个,1：第二个，2：第三个）
+
+    private String action;//携带动作
+
+    private String interactive;//互动事件
+
+    private Integer state;//状态 (0：正常可配置，1：交易行)
+
+    //private String modelId;//记录生成的模型id，如1|2|3格式
+
+    private List<ExcelCharacterCreateClientVo> subCreateClientList;
+
+    private List<ComCharactersResourcesVo> subResourcesClientList;
+
+    //private Date createTime;//
+    //
+    //private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersInfoVo.java

@@ -0,0 +1,52 @@
+package com.td.Dawa.game.comcharacters.vo;
+
+import com.td.Dawa.game.excelcharactercolor.pojo.ExcelCharacterColor;
+import com.td.Dawa.game.excelcharactercreate.pojo.ExcelCharacterCreate;
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateClientVo;
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateVo;
+import com.td.Dawa.game.excelresources.pojo.ExcelResources;
+import com.td.Dawa.game.excelresources.vo.ExcelResourcesClientVo;
+import com.td.Dawa.game.excelresources.vo.ExcelResourcesVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ComCharactersInfoVo implements Serializable {
+
+    //生成信息
+    private ExcelCharacterCreate subCreate;
+    //资源信息
+    private ExcelResources subResources;
+    //主颜色信息
+    private ExcelCharacterColor subPrimaryColor;
+    //副颜色信息
+    private ExcelCharacterColor subSecondaryColor;
+    //在右边
+    private Boolean isTheRight;
+
+    public ComCharactersInfoVo(ExcelCharacterCreate subCreate,ExcelCharacterColor subPrimaryColor){
+        this.subCreate = subCreate;
+        this.subPrimaryColor = subPrimaryColor;
+    }
+
+    public ComCharactersInfoVo(ExcelCharacterCreate subCreate,ExcelCharacterColor subPrimaryColor,ExcelCharacterColor subSecondaryColor){
+        this.subCreate = subCreate;
+        this.subPrimaryColor = subPrimaryColor;
+        this.subSecondaryColor = subSecondaryColor;
+    }
+
+    public ComCharactersInfoVo(ExcelCharacterCreate subCreate,ExcelCharacterColor subPrimaryColor,Boolean isTheRight){
+        this.subCreate = subCreate;
+        this.subPrimaryColor = subPrimaryColor;
+        this.isTheRight = isTheRight;
+    }
+
+    public ComCharactersInfoVo(ExcelCharacterCreate subCreate,ExcelCharacterColor subPrimaryColor,ExcelCharacterColor subSecondaryColor,Boolean isTheRight){
+        this.subCreate = subCreate;
+        this.subPrimaryColor = subPrimaryColor;
+        this.subSecondaryColor = subSecondaryColor;
+        this.isTheRight = isTheRight;
+    }
+}

src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersRandomVo.java

@@ -0,0 +1,20 @@
+package com.td.Dawa.game.comcharacters.vo;
+
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateClientVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ComCharactersRandomVo implements Serializable {
+
+    private Integer roleId;//角色生成表 里面对应的id序号
+
+    private Integer roleType;//角色种类（角色等级表和角色属性表相关）
+
+    private String action;//携带动作
+
+    private String interactive;//互动事件
+
+}

src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersResourcesVo.java

@@ -0,0 +1,37 @@
+package com.td.Dawa.game.comcharacters.vo;
+
+import com.td.Dawa.game.excelcharactercolor.pojo.ExcelCharacterColor;
+import com.td.Dawa.game.excelcharactercolor.vo.ExcelCharacterColorClientVo;
+import com.td.Dawa.game.excelcharactercreate.pojo.ExcelCharacterCreate;
+import com.td.Dawa.game.excelresources.pojo.ExcelResources;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ComCharactersResourcesVo implements Serializable {
+
+    private Integer artId;//art编号
+
+    private Integer artType;//美术资源种类(1：场景，2：动作，3：特效，4：图标, 5:模型)
+
+    //private String artName;//美术资源名
+
+    //private Integer artActionFrame;//帧数
+
+    //private String artLocal;//资源位置
+
+    private Integer position;//部位
+
+    private String colorIds;//当前部位的颜色id
+
+    //在右边
+    private Boolean isTheRight;
+
+    private ExcelCharacterColorClientVo characterColor;//主颜色信息
+
+    private ExcelCharacterColorClientVo characterSecondaryColor;//副颜色信息
+
+    private String note;//备注
+
+}

src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersSimpleVo.java

@@ -0,0 +1,47 @@
+package com.td.Dawa.game.comcharacters.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComCharactersSimpleVo implements Serializable {
+    private Integer id;//该角色的id
+
+    //private String userId;//创建该角色的用户id
+
+    private Integer roleId;//角色生成表 里面对应的id序号
+
+    private Integer roleType;//角色种类（角色等级表和角色属性表相关）
+
+    private String name;//角色名字
+
+    private Integer exp;//当前经验
+
+    private Integer level;//当前等级
+
+    private Integer power;//力量
+
+    private Integer intelligence;//智力值
+
+    private Integer skills;//技巧值
+
+    private Integer random;//随机属性值
+
+    private Integer professional;//当前职业
+
+    private Integer workPos;//配置时候位置（0：第一个,1：第二个，2：第三个）
+
+    private String action;//携带动作
+
+    private String interactive;//互动事件
+
+    private Integer state;//状态 (0：正常可配置，1：交易行)
+
+    private String modelId;//记录生成的模型id，如1|2|3格式
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersVo.java

@@ -0,0 +1,49 @@
+package com.td.Dawa.game.comcharacters.vo;
+
+import com.td.Dawa. common.pojo.PageCondition;import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComCharactersVo extends PageCondition implements Serializable {
+    private Integer id;//该角色的id
+
+    private String userId;//创建该角色的用户id
+
+    private Integer roleId;//角色生成表 里面对应的id序号
+
+    private Integer roleType;//角色种类（角色等级表和角色属性表相关）
+
+    private String name;//角色名字
+
+    private Integer exp;//当前经验
+
+    private Integer level;//当前等级
+
+    private Integer power;//力量
+
+    private Integer intelligence;//智力值
+
+    private Integer skills;//技巧值
+
+    private Integer random;//随机属性值
+
+    private Integer professional;//当前职业
+
+    private Integer workPos;//配置时候位置（0：第一个,1：第二个，2：第三个）
+
+    private String action;//携带动作
+
+    private String interactive;//互动事件
+
+    private Integer state;//状态 (0：正常可配置，1：交易行)
+
+    private String modelId;//记录生成的模型id，如1|2|3格式
+
+    private String modelColor;//记录模型生成的颜色id,如1|2|3格式
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/controller/ComCharactersDiscoveryController.java

@@ -0,0 +1,192 @@
+/**
+ * 游戏勘探controller，管理前端游戏相关的勘探操作
+ */
+
+
+package com.td.Dawa.game.comcharactersdiscovery.controller;
+
+import com.td.Dawa.annotation.Decrypt;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.comcharacters.service.ComCharactersService;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryClientVo;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryVo;
+import com.td.Dawa.game.comcharactersdiscovery.service.ComCharactersDiscoveryService;
+import com.td.Dawa.util.RedisData;
+import com.td.Dawa.util.RedisLock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping("/game/comCharactersDiscovery/")
+public class ComCharactersDiscoveryController extends CommonController<ComCharactersDiscoveryVo, ComCharactersDiscovery, Integer> {
+    @Autowired
+    private ComCharactersDiscoveryService comCharactersDiscoveryService;
+    @Autowired
+    private ComCharactersService comCharactersService;
+
+    @Autowired
+    private RedisLock redisLock;
+
+    /**
+     * 开始工作
+     *
+     * @param userId
+     * @param sceneId
+     * @return
+     */
+    @PostMapping("startExploration")
+    @Decrypt
+    @Encrypt
+    public Result<?> startExploration(@RequestParam(value = "userId") String userId,
+                                      @RequestParam(value = "sceneId") Integer sceneId) {
+        try {
+            ComCharactersDiscoveryClientVo characterDiscoveryClientVo = comCharactersDiscoveryService.startDiscover(userId, sceneId);
+            return Result.of(characterDiscoveryClientVo);
+        } catch (AuthorizeException e) {
+            return Result.of(null, false, e.getMessage(), e.getCode());
+        } catch (Exception e) {
+            return Result.of(e.getMessage(), false, ResultEnum.EXPLORATION_INFO_ERROR);
+        }
+
+    }
+
+    /**
+     * 玩家选择一个添加角色,添加工作
+     * @param userId
+     * @param roleId
+     * @param workPos
+     * @param sceneId
+     * @param isAdd 默认true是添加角色，false则移除工作角色
+     * @return
+     */
+    @PostMapping("addExplorationRole")
+    @Decrypt
+    @Encrypt
+    public Result<?> addExplorationRole(@RequestParam(value = "userId") String userId,
+                                        @RequestParam(value = "roleId") Integer roleId,
+                                        @RequestParam(value = "workPos") Integer workPos,
+                                        @RequestParam(value = "sceneId") Integer sceneId,
+                                        @RequestParam(value = "isAdd",defaultValue = "true") Boolean isAdd) {
+
+        long time = System.currentTimeMillis() + RedisData.getCharactersTimeout();
+        String _redisKey = RedisData.getCharactersKey(userId,roleId);
+
+        try {
+            // 防止重复操作
+            if (!redisLock.lock(_redisKey, String.valueOf(time))) {
+                return Result.of(null, false, ResultEnum.REDIS_IS_LOCK);
+            }
+            //拿出一个角色对应的配置数据来生成角色
+            ComCharactersVo comCharactersVo = comCharactersService.getVo(roleId);
+            if (comCharactersVo == null || !comCharactersVo.getUserId().equals(userId)) {
+                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
+            }
+            //如果是添加的状态
+            if(isAdd){
+                if(!comCharactersVo.getProfessional().equals(GameEnum.PRO_WORK_NORMAL.getValue())){
+                    //带工作信息的不给添加
+                    return Result.of(null, false, ResultEnum.ROLE_WORK_NOT_NORMAL);
+                }
+                if (workPos.equals(GameEnum.PRO_POWER.getValue() + 1)) {
+                    //按场景区分，是挖矿还是伐木
+                    if (sceneId.equals(GameEnum.MINE_00.getValue())) {
+                        comCharactersVo.setProfessional(GameEnum.PRO_WORK_MINING.getValue());
+                    } else if (sceneId.equals(GameEnum.LUMBERING_00.getValue())) {
+                        comCharactersVo.setProfessional(GameEnum.PRO_WORK_LUMBERING.getValue());
+                    } else {
+                        //不存在场景时候，抛出异常
+                        return Result.of(null, false, ResultEnum.SCENE_ID_NOT);
+                    }
+                } else if (workPos.equals(GameEnum.PRO_INTELLIGENCE.getValue() + 1)) {
+                    comCharactersVo.setProfessional(GameEnum.PRO_WORK_PROSPECT.getValue());
+                } else if (workPos.equals(GameEnum.PRO_SKIlLS.getValue() + 1)) {
+                    comCharactersVo.setProfessional(GameEnum.PRO_WORK_TRANSPORT.getValue());
+                } else {
+                    return Result.of(null, false, ResultEnum.ROLE_PRO_DOES_NOT_EXIST);
+                }
+                //设置一个位置
+                comCharactersVo.setWorkPos(workPos);
+                //根据roleId 对应的数据，加入队伍
+                ComCharactersDiscoveryClientVo clientVo = comCharactersDiscoveryService.addDiscoverRole(comCharactersVo, sceneId);
+                return Result.of(clientVo);
+            }else{
+                if(comCharactersVo.getProfessional().equals(GameEnum.PRO_WORK_NORMAL.getValue())){
+                    //不带工作信息的不给移除
+                    return Result.of(null, false, ResultEnum.ROLE_NOT_WORK);
+                }
+                //根据roleId 对应的数据，移出队伍
+                ComCharactersDiscoveryClientVo clientVo = comCharactersDiscoveryService.removeDiscoverRole(comCharactersVo, sceneId);
+                return Result.of(clientVo);
+            }
+
+        } catch (AuthorizeException e) {
+            return Result.of(null, false, e.getMessage(), e.getCode());
+        } catch (Exception e) {
+            return Result.of(e.getMessage(), false, ResultEnum.ROLE_ADD_ERROR);
+        } finally {
+            redisLock.unlock(_redisKey, String.valueOf(time));
+        }
+
+    }
+
+
+    /**
+     * 返回一个挖矿队伍列表
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("getExplorationList")
+    @Encrypt
+    public Result<PageInfo<ComCharactersDiscoveryClientVo>> getExplorationList(@RequestParam(value = "userId") String userId,
+                                                                               @RequestParam(value = "page", defaultValue = "0") Integer page,
+                                                                               @RequestParam(value = "limit", defaultValue = "3") Integer limit) {
+        ComCharactersDiscoveryVo characterDiscoveryVo = new ComCharactersDiscoveryVo();
+        characterDiscoveryVo.setUserId(userId);
+        characterDiscoveryVo.setPage(page + 1);
+        characterDiscoveryVo.setRows(limit);
+        characterDiscoveryVo.setSidx("desc");
+        characterDiscoveryVo.setSord("createTime");
+        PageInfo<ComCharactersDiscoveryClientVo> clientVoList = comCharactersDiscoveryService.findDiscoverClientVo(characterDiscoveryVo);
+        return Result.of(clientVoList);
+    }
+
+    /**
+     * 根据探索队伍的id，更新当前探索的状态
+     * 用于处理中途显示奖励之类的操作
+     *
+     * @param userId
+     * @param explorationId
+     * @return ComCharactersDiscoveryClientVo And string
+     */
+    @PostMapping("updateState")
+    @Decrypt
+    @Encrypt
+    public Result<?> updateState(@RequestParam(value = "userId") String userId,
+                                 @RequestParam(value = "explorationId") Integer explorationId,
+                                 @RequestParam(value = "isStop", defaultValue = "false") Boolean isStop) {
+        try {
+            //查看是否存在勘探数据
+            ComCharactersDiscoveryVo discoveryVo = comCharactersDiscoveryService.getVo(explorationId);
+            if (discoveryVo == null || !discoveryVo.getUserId().equals(userId)) {
+                throw new RuntimeException("勘探队伍不存在！");
+            }
+            //计算收益updateState
+            return Result.of(comCharactersDiscoveryService.explorationState(discoveryVo, isStop));
+        } catch (AuthorizeException e) {
+            return Result.of(null, false, e.getMessage(), e.getCode());
+        } catch (Exception e) {
+            return Result.of(e.getMessage(), false, ResultEnum.EXPLORATION_ERROR);
+        }
+
+    }
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/pojo/ComCharactersDiscovery.java

@@ -0,0 +1,53 @@
+package com.td.Dawa.game.comcharactersdiscovery.pojo;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+@Entity
+@Table(name = "com_characters_discovery")
+@Data
+public class ComCharactersDiscovery implements Serializable {
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    private Integer id;//
+
+    private String roleId;//人物id排序字符串，比如：1|2|3
+
+    private String userId;//用户id
+
+    private String name;//工作名字
+
+    private Integer isWork;//是否工作 0: 工作中，1：工作完成
+
+    private Integer workId;//工作的id
+
+    private Date workStart;//开始时间
+
+    private Integer workDay;//探索日期,记录毫秒,转成成工作日期。
+
+    private String workFlag;//每次探索生成一个唯一标识
+
+    private Integer discoverLevel;//探索级别
+
+    private Integer sceneId;//当前场景Id
+
+    private String rewardItem; //记录奖励物品
+
+    private String rewardCount; //记录奖励物品的数量 reward_item 奖励对应的数量 1000|2000
+
+    private Integer rewardExp; //记录奖励的经验
+
+    private Integer rewardCurrency;//记录奖励的货币
+
+    private String allItem; //全部产出的item记录
+
+    private String note;//描述
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/repository/ComCharactersDiscoveryRepository.java

@@ -0,0 +1,14 @@
+package com.td.Dawa.game.comcharactersdiscovery.repository;
+
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface ComCharactersDiscoveryRepository extends CommonRepository<ComCharactersDiscovery, Integer> {
+
+    Optional<ComCharactersDiscovery> findByUserIdAndSceneId(String userId, Integer sceneId);
+
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/service/ComCharactersDiscoveryService.java

@@ -0,0 +1,23 @@
+package com.td.Dawa.game.comcharactersdiscovery.service;
+
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryClientVo;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryVo;
+
+public interface ComCharactersDiscoveryService extends CommonService<ComCharactersDiscoveryVo, ComCharactersDiscovery, Integer> {
+
+    ComCharactersDiscoveryClientVo startDiscover(String userId, Integer sceneId);
+
+    ComCharactersDiscoveryClientVo addDiscoverRole(ComCharactersVo charactersVo, Integer sceneId);
+
+    ComCharactersDiscoveryClientVo removeDiscoverRole(ComCharactersVo charactersVo, Integer sceneId);
+
+    PageInfo<ComCharactersDiscoveryClientVo> findDiscoverClientVo(ComCharactersDiscoveryVo charactersDiscoveryVo);
+
+    ComCharactersDiscoveryClientVo explorationState(ComCharactersDiscoveryVo discoveryVo,Boolean isStop);
+
+
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/service/ComCharactersDiscoveryServiceImpl.java

@@ -0,0 +1,1003 @@
+package com.td.Dawa.game.comcharactersdiscovery.service;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.NumberUtil;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.game.comcharacters.service.ComCharactersService;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryClientVo;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryVo;
+import com.td.Dawa.game.comcharactersdiscovery.repository.ComCharactersDiscoveryRepository;
+import com.td.Dawa.game.complayerbackpack.service.ComPlayerBackpackService;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackVo;
+import com.td.Dawa.game.complayersattri.service.ComPlayersAttriService;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriVo;
+import com.td.Dawa.game.comusers.service.ComUsersService;
+import com.td.Dawa.game.comusers.vo.ComUsersVo;
+import com.td.Dawa.game.excelcharactercreate.service.ExcelCharacterCreateService;
+import com.td.Dawa.game.excelcharacterlevel.pojo.ExcelCharacterLevel;
+import com.td.Dawa.game.excelcharacterlevel.service.ExcelCharacterLevelService;
+import com.td.Dawa.game.excelcharacterlevel.vo.ExcelCharacterLevelVo;
+import com.td.Dawa.game.exceldrop.service.ExcelDropService;
+import com.td.Dawa.game.excelparameter.pojo.ExcelParameter;
+import com.td.Dawa.game.excelparameter.service.ExcelParameterService;
+import com.td.Dawa.game.excelparameter.vo.ExcelParameterVo;
+import com.td.Dawa.game.excelprop.pojo.ExcelProp;
+import com.td.Dawa.game.excelprop.service.ExcelPropService;
+import com.td.Dawa.game.excelprop.vo.ExcelPropAndProVo;
+import com.td.Dawa.game.excelprop.vo.ExcelPropClientVo;
+import com.td.Dawa.game.excelresources.service.ExcelResourcesService;
+import com.td.Dawa.game.excelscene.pojo.ExcelScene;
+import com.td.Dawa.game.excelscene.service.ExcelSceneService;
+import com.td.Dawa.game.excelworkpro.pojo.ExcelWorkPro;
+import com.td.Dawa.game.excelworkpro.service.ExcelWorkProService;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.ProbabilityIntervalUtil;
+import com.td.Dawa.util.UUIDUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+@Slf4j
+public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComCharactersDiscoveryVo, ComCharactersDiscovery, Integer> implements ComCharactersDiscoveryService {
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ComCharactersDiscoveryRepository comCharactersDiscoveryRepository;
+
+    @Autowired
+    private ComCharactersService comCharactersService;
+
+    @Autowired
+    private ExcelDropService excelDropService;
+
+    @Autowired
+    private ExcelSceneService excelSceneService;
+
+    @Autowired
+    private ExcelCharacterLevelService excelCharacterLevelService;
+
+    @Autowired
+    private ComPlayersAttriService comPlayersAttriService;
+
+    @Autowired
+    private ExcelParameterService excelParameterService;
+
+    @Autowired
+    private ExcelResourcesService excelResourcesService;
+
+    @Autowired
+    private ExcelCharacterCreateService excelCharacterCreateService;
+
+    @Autowired
+    private ExcelWorkProService excelWorkProService;
+    @Autowired
+    private ExcelPropService excelPropService;
+
+    @Autowired
+    private ComPlayerBackpackService comPlayerBackpackService;
+
+    @Autowired
+    private ComUsersService comUsersService;
+
+    /**
+     * 开始工作
+     *
+     * @param userId
+     * @param sceneId
+     * @return
+     */
+    @Override
+    public ComCharactersDiscoveryClientVo startDiscover(String userId, Integer sceneId) {
+
+        ComCharactersDiscovery comCharacterDiscovery =
+                comCharactersDiscoveryRepository.findByUserIdAndSceneId(userId, sceneId).orElse(null);
+        if (comCharacterDiscovery == null || !StringUtils.hasText(comCharacterDiscovery.getRoleId())) {
+            throw new AuthorizeException(ResultEnum.EXPLORATION_INFO_NULL);
+        } else {
+            if (comCharacterDiscovery.getIsWork().equals(GameEnum.WORK_ING.getValue())) {
+                throw new AuthorizeException(ResultEnum.EXPLORATION_ING);
+            }
+            if (comCharacterDiscovery.getIsWork().equals(GameEnum.WORK_COMPLETE.getValue())) {
+                throw new AuthorizeException(ResultEnum.EXPLORATION_COMPLETE);
+            }
+
+            //设置工作状态，设置工作开始时间
+            comCharacterDiscovery.setIsWork(GameEnum.WORK_ING.getValue());
+            comCharacterDiscovery.setWorkStart(DateUtil.date());
+
+            ExcelParameterVo maxStrength = excelParameterService.getVo(1);
+            ExcelParameterVo workConsumesStrength = excelParameterService.getVo(2); //消耗的体力单位
+            if (maxStrength == null || workConsumesStrength == null) {
+                throw new AuthorizeException(ResultEnum.SETTING_IS_NULL);
+            }
+            //todo 扣除一个体力值,判断是否超过设置的体力值
+            ComPlayersAttriVo attriVo = comPlayersAttriService.findByUserId(userId);
+            Integer _strength = attriVo.getStrength() + workConsumesStrength.getValue().intValue();
+            if (maxStrength.getValue().intValue() < _strength) {
+                //假如设置的值小于当前计算的体力，返回提示 当前体力不足，队伍无法工作
+                throw new AuthorizeException(ResultEnum.PLAYER_ATTRIBUTE_STRENGTH_IS_NOT);
+            }
+            //消耗一个体力值(+1)
+            attriVo.setStrength(_strength);
+            comPlayersAttriService.save(attriVo);
+        }
+        ComCharactersDiscoveryVo comCharacterDiscoveryVo = CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
+        //存储
+        ComCharactersDiscoveryVo discoveryVo = super.save(comCharacterDiscoveryVo).getData();
+        //先找出三个职业对象
+        String[] roleId = discoveryVo.getRoleId().split("\\|");
+        Integer[] _roleIds = Convert.toIntArray(roleId);
+        List<ComCharacters> characters = comCharactersService.findByRoleIdIn(_roleIds);
+        ComCharactersDiscoveryClientVo discoveryClientVo = CopyUtil.copy(discoveryVo, ComCharactersDiscoveryClientVo.class);
+        //找出资源
+        List<ComCharactersClientVo> comCharactersClientVos = characters.stream().map(e -> {
+            ComCharactersClientVo comCharactersClientVo = new ComCharactersClientVo();
+            comCharactersClientVo = CopyUtil.copy(e, ComCharactersClientVo.class);
+            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, e.getModelId(), e.getModelColor());
+            return comCharactersClientVo;
+        }).collect(Collectors.toList());
+        discoveryClientVo.setSubCharacters(comCharactersClientVos);//当前职业
+        // 把当前时间设置到mill中
+        discoveryClientVo.setWorkMill(discoveryVo.getWorkDay().longValue());
+        //设置携带属性
+        discoveryClientVo = setDiscoveryClientVoProAndTransNum(discoveryClientVo);
+
+        //存储并且返回
+        return discoveryClientVo;
+    }
+
+    /**
+     * 添加角色,根据当前位置，设置工作类型，就是当前professional（1,2,3,4）
+     *
+     * @param charactersVo
+     * @param sceneId
+     * @return
+     */
+    @Override
+    public ComCharactersDiscoveryClientVo addDiscoverRole(ComCharactersVo charactersVo, Integer sceneId) {
+
+        //角色list
+        List<ComCharactersClientVo> comCharactersClientVos = new ArrayList<>();
+        ComCharactersDiscovery comCharacterDiscovery =
+                comCharactersDiscoveryRepository.findByUserIdAndSceneId(charactersVo.getUserId(), sceneId).orElse(null);
+        if (comCharacterDiscovery == null) {
+            comCharacterDiscovery = new ComCharactersDiscovery();
+            //新建一个队伍
+            comCharacterDiscovery.setUserId(charactersVo.getUserId());
+            comCharacterDiscovery.setRoleId(charactersVo.getId().toString());
+            //comCharacterDiscovery.setName();
+            comCharacterDiscovery.setIsWork(GameEnum.WORK_NOT_STARTED.getValue());//默认不工作
+            comCharacterDiscovery.setWorkStart(DateUtil.date());
+            ExcelParameterVo workMill = excelParameterService.getVo(6); //初始化工作时长
+            comCharacterDiscovery.setWorkDay(workMill.getValue().intValue()); //工作时间，todo 暂时定60s
+            comCharacterDiscovery.setWorkFlag(UUIDUtil.getUUID());
+            comCharacterDiscovery.setDiscoverLevel(1); //默认探索第一层场景
+            comCharacterDiscovery.setSceneId(sceneId); // 比如矿洞id对应的入口是201
+            comCharacterDiscovery.setRewardExp(0); // 默认不奖励经验
+            comCharacterDiscovery.setRewardCurrency(0); // 默认不奖励货币
+            comCharacterDiscovery.setNote("工作队伍");
+
+            comCharacterDiscovery.setCreateTime(DateUtil.date());
+            comCharacterDiscovery.setUpdateTime(DateUtil.date());
+
+            //没有角色，即把传入角色添加上
+            comCharactersClientVos.add(CopyUtil.copy(charactersVo, ComCharactersClientVo.class));
+
+
+        } else {
+            //如果剩余空字符串，直接赋值
+            if (StringUtils.hasText(comCharacterDiscovery.getRoleId())) {
+                String[] roleIds = comCharacterDiscovery.getRoleId().split("\\|");
+                Boolean isReplace = false; //是否是替换角色
+                for (int i = 0; i < roleIds.length; i++) {
+                    if (roleIds[i].equals(charactersVo.getId().toString())) {
+                        //不能添加相同的角色,直接返回一个查询的
+                        //return CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
+                        throw new AuthorizeException(ResultEnum.ROLE_ALREADY_ADD);
+                    } else {
+                        ComCharactersVo _findCharacter = comCharactersService.getVo(Integer.parseInt(roleIds[i]));
+                        //如果当前职业相同，直接替换id
+                        //log.info(_findCharacter.getProfessional() + "=" + charactersVo.getProfessional());
+                        //列表角色和传入的角色做对比
+                        if (_findCharacter.getProfessional().equals(charactersVo.getProfessional())) {
+                            //替换时候，重置旧的对象职业
+                            _findCharacter.setProfessional(0);
+                            _findCharacter.setWorkPos(0);
+                            comCharactersService.save(_findCharacter);
+                            //如职业一样，替换列表中的角色
+                            roleIds[i] = charactersVo.getId().toString();
+                            isReplace = true;
+                            comCharactersClientVos.add(CopyUtil.copy(charactersVo, ComCharactersClientVo.class));
+                        } else {
+                            comCharactersClientVos.add(CopyUtil.copy(_findCharacter, ComCharactersClientVo.class));
+                        }
+
+                    }
+                }
+                //如果不是替换，再旧的基础上添加一个角色
+                if (!isReplace) {
+                    String _roleId = comCharacterDiscovery.getRoleId() + "|" + charactersVo.getId().toString();
+                    //如果最后没有替换到列表，说明没有角色，即把传入角色添加上
+                    comCharactersClientVos.add(CopyUtil.copy(charactersVo, ComCharactersClientVo.class));
+                    comCharacterDiscovery.setRoleId(_roleId);
+                } else {
+                    comCharacterDiscovery.setRoleId(String.join("|", roleIds));
+                }
+            } else {
+                comCharacterDiscovery.setRoleId(charactersVo.getId().toString());
+                comCharactersClientVos.add(CopyUtil.copy(charactersVo, ComCharactersClientVo.class));
+            }
+
+            comCharacterDiscovery.setUpdateTime(DateUtil.date());
+        }
+        //保存一次用户修改的当前职业工作标签profession，工作位置workPos,工作结算时候，重置一次为零
+        comCharactersService.save(charactersVo);
+
+        ComCharactersDiscoveryVo comCharacterDiscoveryVo = CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
+        super.save(comCharacterDiscoveryVo);
+        ComCharactersDiscoveryClientVo comCharacterDiscoveryClientVo = CopyUtil.copy(comCharacterDiscoveryVo, ComCharactersDiscoveryClientVo.class);
+        comCharacterDiscoveryClientVo.setSubCharacters(comCharactersClientVos);
+        //设置携带属性
+        comCharacterDiscoveryClientVo = setDiscoveryClientVoProAndTransNum(comCharacterDiscoveryClientVo);
+        return comCharacterDiscoveryClientVo;
+    }
+
+    @Override
+    public ComCharactersDiscoveryClientVo removeDiscoverRole(ComCharactersVo charactersVo, Integer sceneId) {
+        //角色list
+        List<ComCharactersClientVo> comCharactersClientVos = new ArrayList<>();
+        ComCharactersDiscovery comCharacterDiscovery =
+                comCharactersDiscoveryRepository.findByUserIdAndSceneId(charactersVo.getUserId(), sceneId).orElse(null);
+        if (comCharacterDiscovery == null) {
+            //如果没有工作队伍，抛出删除异常
+            throw new AuthorizeException(ResultEnum.ROLE_DELETE_ERROR);
+        }
+
+        String[] roleIds = comCharacterDiscovery.getRoleId().split("\\|");
+        if (!ArrayUtil.contains(roleIds, charactersVo.getId().toString())) {
+            throw new AuthorizeException(ResultEnum.ROLE_NOT_TEAM);
+        } else {
+            int index = ArrayUtil.indexOf(roleIds, charactersVo.getId().toString());
+            //删除时候，重置旧的对象职业
+            charactersVo.setProfessional(0);
+            charactersVo.setWorkPos(0);
+            comCharactersService.save(charactersVo);
+            //剩余的角色
+            roleIds = ArrayUtil.remove(roleIds, index);
+        }
+        if (roleIds.length > 0) {
+            for (int i = 0; i < roleIds.length; i++) {
+                ComCharactersVo _findCharacter = comCharactersService.getVo(Integer.parseInt(roleIds[i]));
+                comCharactersClientVos.add(CopyUtil.copy(_findCharacter, ComCharactersClientVo.class));
+            }
+            comCharacterDiscovery.setRoleId(String.join("|", roleIds));
+            comCharacterDiscovery.setUpdateTime(DateUtil.date());
+            ComCharactersDiscoveryVo comCharacterDiscoveryVo = CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
+            super.save(comCharacterDiscoveryVo);
+            ComCharactersDiscoveryClientVo comCharacterDiscoveryClientVo = CopyUtil.copy(comCharacterDiscoveryVo, ComCharactersDiscoveryClientVo.class);
+            comCharacterDiscoveryClientVo.setSubCharacters(comCharactersClientVos);
+            //设置携带属性
+            comCharacterDiscoveryClientVo = setDiscoveryClientVoProAndTransNum(comCharacterDiscoveryClientVo);
+            return comCharacterDiscoveryClientVo;
+        } else {
+            //没有数据处理删除
+            super.delete(comCharacterDiscovery.getId());
+            comCharacterDiscovery.setRoleId("");
+            comCharacterDiscovery.setUpdateTime(DateUtil.date());
+            ComCharactersDiscoveryVo comCharacterDiscoveryVo = CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
+            ComCharactersDiscoveryClientVo comCharacterDiscoveryClientVo = CopyUtil.copy(comCharacterDiscoveryVo, ComCharactersDiscoveryClientVo.class);
+            comCharacterDiscoveryClientVo.setSubCharacters(comCharactersClientVos);
+            comCharacterDiscoveryClientVo = setDiscoveryClientVoProAndTransNum(comCharacterDiscoveryClientVo);
+            return comCharacterDiscoveryClientVo;
+        }
+
+    }
+
+    @Override
+    public PageInfo<ComCharactersDiscoveryClientVo> findDiscoverClientVo(ComCharactersDiscoveryVo characterDiscoveryVo) {
+        PageInfo<ComCharactersDiscoveryVo> comCharactersDiscoveryVo = super.page(characterDiscoveryVo).getData();
+        //获取到探索队伍的数据
+        List<ComCharactersDiscoveryVo> _listVo = comCharactersDiscoveryVo.getRows();
+        List<ComCharactersDiscoveryClientVo> _discoveryClientVos = new ArrayList<>();
+        for (ComCharactersDiscoveryVo discoveryVo : _listVo) {
+            String[] roleId = discoveryVo.getRoleId().split("\\|");
+            //角色list
+            List<ComCharactersClientVo> comCharactersClientVos = new ArrayList<>();
+            for (int i = 0; i < roleId.length; i++) {
+                ComCharactersVo comCharactersVo = comCharactersService.getVo(Integer.parseInt(roleId[i]));
+                ComCharactersClientVo comCharactersClientVo = CopyUtil.copy(comCharactersVo, ComCharactersClientVo.class);
+                comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, comCharactersVo.getModelId(), comCharactersVo.getModelColor());
+                comCharactersClientVos.add(comCharactersClientVo);
+            }
+            //开始工作时间 + 工作天数
+            Date endDate = DateUtil.offsetMillisecond(discoveryVo.getWorkStart(), discoveryVo.getWorkDay());
+            //
+            Long dif = 0L;
+            if (discoveryVo.getIsWork().equals(GameEnum.WORK_ING.getValue())) {
+                //如果已经开始工作，计算当前时间与结束时间的毫秒
+                dif = DateUtil.between(DateUtil.date(), endDate, DateUnit.MS, false);
+                if (dif <= 0L) {
+                    //工作完成
+                    discoveryVo.setIsWork(GameEnum.WORK_COMPLETE.getValue());
+                    super.save(discoveryVo);
+                    dif = 0L;
+                }
+            } else {
+                //还没开始工作，返回开始和结束直接的毫秒
+                dif = DateUtil.between(discoveryVo.getWorkStart(), endDate, DateUnit.MS, false);
+                if (dif <= 0L) {
+                    dif = 0L;
+                }
+            }
+
+            ComCharactersDiscoveryClientVo comCharacterDiscoveryClientVo = CopyUtil.copy(discoveryVo, ComCharactersDiscoveryClientVo.class);
+            //小于等于零即完成
+            comCharacterDiscoveryClientVo.setWorkMill(dif);
+            comCharacterDiscoveryClientVo.setSubCharacters(comCharactersClientVos);
+            //设置携带属性
+            comCharacterDiscoveryClientVo = setDiscoveryClientVoProAndTransNum(comCharacterDiscoveryClientVo);
+            _discoveryClientVos.add(comCharacterDiscoveryClientVo);
+        }
+
+        PageInfo<ComCharactersDiscoveryClientVo> backPageInfo = new PageInfo<>();
+        backPageInfo.setRows(_discoveryClientVos);
+        backPageInfo.setPage(comCharactersDiscoveryVo.getPage());
+        backPageInfo.setPageSize(comCharactersDiscoveryVo.getPageSize());
+        backPageInfo.setTotal(comCharactersDiscoveryVo.getTotal());
+        backPageInfo.setRecords(comCharactersDiscoveryVo.getRecords());
+        backPageInfo.setSidx(comCharactersDiscoveryVo.getSidx());
+        backPageInfo.setSord(comCharactersDiscoveryVo.getSord());
+        return backPageInfo;
+    }
+
+    /**
+     * 挖矿工作状态
+     * 1.工作时间未完结时候，刷新按照最后一次updateTime来判定是否重新计算产出，假如挖矿和勘探分别有不同的时间
+     * 2.工作未完结时间，记录当前产出的物品和产出m
+     * 3.工作完结，删除工作队列，相关产出转移背包，计算经验等。（删除的队列进入回收列表）
+     * 4.可中途结束工作
+     *
+     * @param discoveryVo
+     * @return
+     */
+    @Override
+    public ComCharactersDiscoveryClientVo explorationState(ComCharactersDiscoveryVo discoveryVo, Boolean isStop) {
+        if (discoveryVo.getIsWork().equals(GameEnum.WORK_NOT_STARTED.getValue())) {
+            throw new AuthorizeException(ResultEnum.EXPLORATION_NOT_START);
+        }
+        //获取参数表
+        List<ExcelParameter> parameterVos = excelParameterService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_PARAMETER.getMessage());
+        //奖励物品的时间计数
+        String[] _hasDropCounts = StringUtils.hasText(discoveryVo.getRewardCount()) ? discoveryVo.getRewardCount().split("\\|") : new String[0];
+        //总共参数的奖励物品
+        String[] _allDropIds = StringUtils.hasText(discoveryVo.getRewardCount()) ? discoveryVo.getAllItem().split("\\|") : new String[0];
+        //记录当前的产出奖励
+        List<ExcelPropClientVo> outExcelProps = new ArrayList<>();
+        List<ComPlayerBackpackVo> comPlayerBackpackVoList = new ArrayList<>();
+
+        //开始工作时间 + 工作天数
+        Date endDate = DateUtil.offsetMillisecond(discoveryVo.getWorkStart(), discoveryVo.getWorkDay());
+        //用更新数据时间与最终偏移时间点来计算 当前的秒数，为零说明工作完成
+        Long difSecond = DateUtil.between(discoveryVo.getUpdateTime(), endDate, DateUnit.SECOND, false);
+        if (difSecond <= 0L) {
+            difSecond = 0L;//这里difSecond是用户更新数据计算所剩余的时间
+        }
+        log.info("剩余计算的时长difSecond：" + difSecond);
+        //当前时间与结束时间的毫秒
+        Long dif = DateUtil.between(DateUtil.date(), endDate, DateUnit.MS, false);
+
+        //判断是否结束工作 小于等于零即完成
+        if (dif <= 0L) {
+            discoveryVo.setIsWork(GameEnum.WORK_COMPLETE.getValue());
+            dif = 0L;
+        } else if (isStop) {
+            //工作时长未完结，不可停止
+            throw new AuthorizeException(ResultEnum.EXPLORATION_NOT_STOP);
+        }
+
+        //todo 根据场景id获取当前场景配置 后面处理缓存，提高速度
+        //获取场景全部列表
+        //List<ExcelScene> excelSceneList = excelSceneService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_SCENE.getMessage());
+        //主场景id
+        ExcelScene excelScene = excelSceneService.findBySceneId(discoveryVo.getSceneId());
+        if (excelScene.equals(null)) {
+            throw new RuntimeException("excelScene 未配置!");
+        }
+        //获取当前的一个基础数量
+        Integer outTransUpperLimit = excelScene.getAmount();
+        //获取概率表数据（缓存取）
+        List<ExcelWorkPro> workProList = excelWorkProService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_WORK_PRO.getMessage());
+        //获取当前道具表
+        List<ExcelProp> propList = excelPropService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_PROP.getMessage());
+
+        //已经挖出的全部道具
+        List<String> _allDropIdList = Arrays.asList(_allDropIds);
+        List<ExcelProp> allExcelProps = propList.stream().filter(e -> _allDropIdList.contains(e.getPropId().toString())).collect(Collectors.toList());
+        List<Integer> allExcelPropsIds = allExcelProps.stream().map(e -> e.getPropId()).collect(Collectors.toList());
+        String[] final_hasDropCounts = _hasDropCounts;
+        AtomicInteger hasDropCountsIndex = new AtomicInteger();
+        List<ExcelPropClientVo> allPropClientVoList = _allDropIdList.stream().map(e -> {
+            ExcelProp excelProp = allExcelProps.get(allExcelPropsIds.indexOf(Integer.parseInt(e)));
+            ExcelPropClientVo _vo = CopyUtil.copy(excelProp, ExcelPropClientVo.class);
+            int _miningInterval = parameterVos.get(3).getValue().intValue();//挖矿时间间隔
+            int _dropCount = Integer.parseInt(ArrayUtil.get(final_hasDropCounts, hasDropCountsIndex.get()));//根据id获取记录的count
+            _vo.setCreateTime(DateUtil.offsetSecond(discoveryVo.getWorkStart(), (_dropCount + 1) * _miningInterval));
+            _vo.setItemNum(1);
+            hasDropCountsIndex.getAndIncrement();
+            return _vo;
+        }).collect(Collectors.toList());
+
+        //当前探索队伍
+        String[] roleId = discoveryVo.getRoleId().split("\\|");
+        Integer[] _roleIds = Convert.toIntArray(roleId);
+        //角色list
+        List<ComCharactersClientVo> comCharactersClientVos = new ArrayList<>();
+
+        //先找出三个职业对象
+        ComCharactersVo powerChar = null, intelliChar = null, skillChar = null;
+        ExcelWorkPro _excelWorkPro = null;
+        List<ExcelPropAndProVo> currentPropAndPros;//当前的道具和概率
+
+        List<ComCharacters> characters = comCharactersService.findByRoleIdIn(_roleIds);
+        //设置一个默认的基础数量
+        for (int i = 0; i < characters.size(); i++) {
+            ComCharactersVo comCharactersVo = CopyUtil.copy(characters.get(i), ComCharactersVo.class); //comCharactersService.getVo(Integer.parseInt(roleId[i]));
+            //根据当前角色的职业计算
+            Integer _professional = comCharactersVo.getProfessional();
+            if (_professional.equals(GameEnum.PRO_WORK_TRANSPORT.getValue())) {
+                //运输工
+                skillChar = comCharactersVo;
+                //计算当前运输格数，即获取到物品的上限
+                //场景的最低运输数量
+                Integer _selfLimit = getLimitSkillsAndList(comCharactersVo.getSkills(), workProList);
+                if (_selfLimit > outTransUpperLimit) {
+                    outTransUpperLimit = _selfLimit;
+                }
+            } else if (_professional.equals(GameEnum.PRO_WORK_MINING.getValue()) ||
+                    _professional.equals(GameEnum.PRO_WORK_LUMBERING.getValue())) {
+                //矿工
+                powerChar = comCharactersVo;
+                //获取当前工作的效率表
+                _excelWorkPro = getRatioByPowerAndSceneIdAndList(powerChar.getPower(), discoveryVo.getSceneId(), workProList);
+
+                //  每3秒执行一次挖矿动作。根据属性数值概率，获得收益
+                //  矿工有休息动作，休息时间3秒
+                currentPropAndPros = getPropAndPros(_excelWorkPro, discoveryVo.getDiscoverLevel(), propList);
+
+                int _miningInterval = parameterVos.get(3).getValue().intValue();//挖矿时间间隔
+                log.info("挖矿间隔时间：" + _miningInterval);
+                int _count = (int) Math.floor(difSecond / _miningInterval); // 一共执行的工作次数和休息
+                log.info("执行的工作次数：" + _count);
+                //按次数执行奖励
+                //对应物品数量少于或等于运输数量
+                for (int j = 0; j < _count; j++) {
+                    //采集x4+休息x1
+                    if (j % 5 != 0) {
+                        //工作，并且奖励物品
+                        //1.先判定Probability， 2.再判定Currency是不是挖到货币或道具  3.挖到道具 再计算道具概率掉落
+                        Double _getProbability = _excelWorkPro.getProbability() / 100;
+                        double curRandom = new Random().nextDouble();
+                        log.info("curRandom:" + curRandom + "，Probability:" + _getProbability);
+                        if (NumberUtil.compare(curRandom, _getProbability) <= 0) {
+                            Double _currencyPro = Double.parseDouble(_excelWorkPro.getCurrency() + "") / 100;
+                            log.info("掉落货币概率: " + _currencyPro);
+                            ExcelPropClientVo _propClientVo;
+                            log.info("是否掉落物品：" + NumberUtil.compare(curRandom, _currencyPro));
+                            if (NumberUtil.compare(curRandom, _currencyPro) > 0) {//物品概率
+                                //获取当前抽中的物品
+                                ExcelPropAndProVo excelPropAndProVo = ProbabilityIntervalUtil.getProp(currentPropAndPros, 100);
+                                _propClientVo = CopyUtil.copy(excelPropAndProVo, ExcelPropClientVo.class);
+                                log.info("随机道具" + _propClientVo.getPropId());
+                                //产生物品，直接添加
+                                _allDropIds = ArrayUtil.append(_allDropIds, _propClientVo.getPropId().toString());
+                                _propClientVo.setItemNum(1);
+                                //这里的时间返回一个开始工作时候和偏移的值
+                                _propClientVo.setCreateTime(DateUtil.offsetSecond(discoveryVo.getWorkStart(), (j + 1) * _miningInterval));
+                                _hasDropCounts = ArrayUtil.append(_hasDropCounts, j + "");//新添加一个挖出的时间
+                                allPropClientVoList.add(_propClientVo);
+                            } else {
+                                ////剩余获得货币
+                                //List<ExcelProp> currencyProp = propList.stream().filter(e -> e.getItemType().equals(1)).collect(Collectors.toList());
+                                ////todo 暂时随机两种货币添加
+                                //int index = (int) Math.floor(Math.random() * currencyProp.size());
+                                //_propClientVo = CopyUtil.copy(currencyProp.get(index), ExcelPropClientVo.class);
+                                //log.info("随机道具货币" + _propClientVo.getPropId());
+                                ////todo 货币数据未给出，暂定100
+                                ExcelParameterVo _currency = excelParameterService.getVo(8);
+                                int _num = (int) Math.round(_currency.getValue());
+                                discoveryVo.setRewardCurrency(discoveryVo.getRewardCurrency() == null ? _num : discoveryVo.getRewardCurrency() + _num);
+                            }
+                            ////产生物品，直接添加
+                            //_allDropIds = ArrayUtil.append(_allDropIds, _propClientVo.getPropId().toString());
+                            //_propClientVo.setItemNum(1);
+                            ////这里的时间返回一个开始工作时候和偏移的值
+                            //_propClientVo.setCreateTime(DateUtil.offsetSecond(discoveryVo.getWorkStart(), (j + 1) * _miningInterval));
+                            //_hasDropCounts = ArrayUtil.append(_hasDropCounts, j + "");//新添加一个挖出的时间
+                            //allPropClientVoList.add(_propClientVo);
+                        }
+                    }
+                }
+            } else if (_professional.equals(GameEnum.PRO_WORK_PROSPECT.getValue())) {
+                //勘测地形
+                intelliChar = comCharactersVo;
+
+                //勘测地形，用于进入下层场景的职业
+                //每15秒执行一次勘探。根据属性数值概率，前往下层洞穴
+                if (!discoveryVo.getDiscoverLevel().equals(GameEnum.LIMIT_LEVEL.getValue())) {
+                    Integer _intelligence = intelliChar.getIntelligence();
+                    int _explorationInterval = parameterVos.get(4).getValue().intValue();//挖矿时间间隔
+                    log.info("勘探间隔时间：" + _explorationInterval);
+                    int _count = (int) Math.floor(difSecond / _explorationInterval); // 一共执行勘探的次数
+                    //按次数执行奖励
+                    for (int j = 0; j < _count; j++) {
+                        //计算是否进入下一层的概率
+                        double _nextRatio = gotoNextSceneRatioAndList(discoveryVo.getDiscoverLevel(), _intelligence, workProList);
+                        if (NumberUtil.compare(new Random().nextDouble(), _nextRatio) <= 0) {
+                            //todo 切换关卡的奖励物品
+                            Integer _currentLevel = discoveryVo.getDiscoverLevel() + 1;
+                            discoveryVo.setDiscoverLevel(_currentLevel);
+                            super.save(discoveryVo); // 更新数据
+                            //切换场景id
+                            if (_excelWorkPro != null) {
+                                //道具和道具对应的概率
+                                currentPropAndPros = getPropAndPros(_excelWorkPro, _currentLevel, propList);
+                            }
+
+                        }
+                    }
+                }
+            }
+        }
+
+        //记录一个物品获得情况
+        String _rewardCounts = String.join("|", _hasDropCounts);
+        String _allItems = String.join("|", _allDropIds);
+        discoveryVo.setRewardCount(_rewardCounts);
+        discoveryVo.setAllItem(_allItems);
+
+        //保存挖矿数据
+        //设置一次updateTime
+        discoveryVo.setUpdateTime(DateUtil.date());
+        //取最开始挖的 outTransUpperLimit 数量物品
+        outExcelProps = allPropClientVoList.stream().limit(outTransUpperLimit).collect(Collectors.toList());
+
+        //当前关卡奖励的经验,按获得算
+        Integer outExp = outExcelProps.stream().mapToInt(ExcelPropClientVo::getItemExp).sum();
+        discoveryVo.setRewardExp(outExp);
+        //todo 工作完成后，isStop
+        if (discoveryVo.getIsWork().equals(GameEnum.WORK_COMPLETE.getValue()) && isStop) {
+
+            comCharactersClientVos = characters.stream().map(e -> {
+                ComCharactersVo comCharactersVo = CopyUtil.copy(e, ComCharactersVo.class);
+                ComCharactersClientVo comCharactersClientVo = upgradeComCharactersVo(comCharactersVo, outExp);
+                //设置保存的经验
+                comCharactersVo.setExp(comCharactersClientVo.getExp());
+                comCharactersVo.setLevel(comCharactersClientVo.getLevel());
+                comCharactersVo.setProfessional(GameEnum.PRO_WORK_NORMAL.getValue());
+                comCharactersVo.setWorkPos(0);
+                comCharactersService.save(comCharactersVo);
+                comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, e.getModelId(), e.getModelColor());
+                return comCharactersClientVo;
+            }).collect(Collectors.toList());
+
+            //保存金币
+            comUsersService.addGold(discoveryVo.getUserId(), discoveryVo.getRewardCurrency());
+
+            //把奖励物品保存到背包
+            comPlayerBackpackService.saveAllByUserIdAndProps(discoveryVo.getUserId(), outExcelProps);
+            //删除对应的队伍
+            super.delete(discoveryVo.getId());
+        } else {
+            //只显示已获得的经验和添加对应的部件
+            comCharactersClientVos = characters.stream().map(e -> {
+                ComCharactersVo comCharactersVo = CopyUtil.copy(e, ComCharactersVo.class);
+                ComCharactersClientVo comCharactersClientVo = upgradeComCharactersVo(comCharactersVo, outExp);
+                comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, e.getModelId(), e.getModelColor());
+                return comCharactersClientVo;
+            }).collect(Collectors.toList());
+            //todo 后续优化，不用每次都存储
+            super.save(discoveryVo);
+        }
+        ComCharactersDiscoveryClientVo discoveryClientVo = CopyUtil.copy(discoveryVo, ComCharactersDiscoveryClientVo.class);
+        discoveryClientVo.setSubCharacters(comCharactersClientVos);//当前职业
+        discoveryClientVo.setWorkMill(dif);//倒计时
+        //输出限制
+        discoveryClientVo.setSubGetDrops(outExcelProps);//当前收获的物品
+        //全部的奖励物品
+        discoveryClientVo.setSubAllDrops(allPropClientVoList);
+        //设置携带属性
+        discoveryClientVo = setDiscoveryClientVoProAndTransNum(discoveryClientVo);
+        return discoveryClientVo;
+    }
+
+    //private ComCharactersClientVo addSubResourcesClientList(ComCharactersClientVo comCharactersClientVo ,String _modelIdStr){
+    //    Integer[] _modelIdArray = Convert.toIntArray(_modelIdStr.split("\\|"));
+    //    //查询position
+    //    List<ExcelCharacterCreate> _genList = excelCharacterCreateService.findByModelIn(_modelIdArray);
+    //    List<ExcelResourcesClientVo> resourcesList = excelResourcesService.findByArtIdIn(_modelIdArray).stream().map(_res -> {
+    //        ExcelCharacterCreate excelCharacterCreate = _genList.stream().filter(_gen -> _gen.getModel().equals(_res.getArtId())).findFirst().get();
+    //        _res.setPosition(excelCharacterCreate.getPosition());
+    //        return _res;
+    //    }).collect(Collectors.toList());
+    //    comCharactersClientVo.setSubResourcesClientList(resourcesList);
+    //    return comCharactersClientVo;
+    //}
+
+    /**
+     * 存储
+     *
+     * @param comCharactersVo
+     */
+    private ComCharactersClientVo upgradeComCharactersVo(ComCharactersVo comCharactersVo, Integer outExp) {
+        if (comCharactersVo.getExp() == null) {
+            throw new RuntimeException("upgrade characters exp is null！");
+        }
+        if (comCharactersVo.getLevel() == null) {
+            throw new RuntimeException("upgrade characters level is null！");
+        }
+        //List<ExcelCharacterLevel> levelList = excelCharacterLevelService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_CHARACTER_LEVEL.getMessage());
+        //记录之前的经验和等级
+        Integer _previousExp = comCharactersVo.getExp();
+        Integer _previousLevel = comCharactersVo.getLevel();
+
+        Integer _level = comCharactersVo.getLevel(); // 当前人物等级 这里等级至少是1级
+        Integer _exp = comCharactersVo.getExp() + outExp;
+        //不是满级的情况下，才处理升级
+        ExcelCharacterLevel nextLevel = excelCharacterLevelService.getNextLevelInfo(_level);
+        if (_level < nextLevel.getId()) {
+            //Integer next_level = _level + 1; //下一级
+            //ExcelCharacterLevel nextLevelVo = levelList.stream().filter(e -> e.getId().equals(next_level)).findFirst().get();
+            while (_exp > nextLevel.getExp()) {
+                _exp -= nextLevel.getExp();
+                _level += 1;//提升一级
+
+                //增加的属性
+                Integer cPower = nextLevel.getPower() + comCharactersVo.getPower();
+                Integer cSkill = nextLevel.getSkill() + comCharactersVo.getSkills();
+                Integer cIntelligence = nextLevel.getIntelligence() + comCharactersVo.getIntelligence();
+                int randomAttr = (int) Math.ceil(Math.random() * nextLevel.getRandomAttr());
+                double addRandom = Math.random();
+                if (addRandom < 0.33) {
+                    cPower += randomAttr;
+                } else if (addRandom >= 0.33 && addRandom < 0.66) {
+                    cSkill += randomAttr;
+                } else {
+                    cIntelligence += randomAttr;
+                }
+                comCharactersVo.setPower(cPower);
+                comCharactersVo.setSkills(cSkill);
+                comCharactersVo.setIntelligence(cIntelligence);
+
+                //获取下一级
+                //Integer next_level2 = _level + 1;
+                //nextLevelVo = levelList.stream().filter(e -> e.getId().equals(next_level2)).findFirst().get();
+                nextLevel = excelCharacterLevelService.getNextLevelInfo(_level);
+            }
+            //最后的等级和经验
+            comCharactersVo.setLevel(_level);
+            comCharactersVo.setExp(_exp);
+
+            ComCharactersClientVo comCharactersClientVo = CopyUtil.copy(comCharactersVo, ComCharactersClientVo.class);
+            //返回当前需要升级的经验
+            comCharactersClientVo.setLevelUpExp(nextLevel.getExp());
+            //返回给前端工作前的经验和等级
+            comCharactersClientVo.setPreviousExp(_previousExp);
+            comCharactersClientVo.setPreviousLevel(_previousLevel);
+            return comCharactersClientVo;
+        } else {
+            //经验直接设置
+            comCharactersVo.setExp(_exp);
+            //返回当前级别的数据
+            Integer cur_level = _level; //当前级
+            //ExcelCharacterLevel curLevelVo = levelList.stream().filter(e -> e.getId().equals(cur_level)).findFirst().get();
+            ComCharactersClientVo comCharactersClientVo = CopyUtil.copy(comCharactersVo, ComCharactersClientVo.class);
+            //返回当前需要升级的经验
+            comCharactersClientVo.setLevelUpExp(nextLevel.getExp());
+            //返回给前端工作前的经验和等级
+            comCharactersClientVo.setPreviousExp(_previousExp);
+            comCharactersClientVo.setPreviousLevel(_previousLevel);
+            return comCharactersClientVo;
+        }
+
+
+    }
+
+
+    /**
+     * 设置discoveryClientVo带的两个概率和一个运输数量
+     *
+     * @param clientVo
+     * @return
+     */
+    private ComCharactersDiscoveryClientVo setDiscoveryClientVoProAndTransNum(ComCharactersDiscoveryClientVo clientVo) {
+        //获取概率表数据（缓存取）
+        List<ExcelWorkPro> workProList = excelWorkProService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_WORK_PRO.getMessage());
+        //主场景id
+        ExcelScene excelScene = excelSceneService.findBySceneId(clientVo.getSceneId());
+        if (excelScene.getAmount() == null) {
+            throw new RuntimeException("excelScene amount is null");
+        }
+        Integer outTransUpperLimit = excelScene.getAmount();
+        clientVo.setTransQuantity(outTransUpperLimit);
+
+        List<ComCharactersClientVo> voList = clientVo.getSubCharacters();
+        for (int i = 0; i < clientVo.getSubCharacters().size(); i++) {
+            ComCharactersClientVo charactersClientVo = voList.get(i);
+            Integer _professional = charactersClientVo.getProfessional();
+            if (_professional.equals(GameEnum.PRO_WORK_TRANSPORT.getValue())) {
+                //_professional.equals(GameEnum.PRO_SKIlLS.getValue())
+                //运输工
+                //计算当前运输格数，即获取到物品的上限
+                //场景的最低运输数量
+                Integer _selfLimit = getLimitSkillsAndList(charactersClientVo.getSkills(), workProList);
+                if (_selfLimit > outTransUpperLimit) {
+                    clientVo.setTransQuantity(_selfLimit);
+                }
+            } else if (_professional.equals(GameEnum.PRO_WORK_MINING.getValue()) ||
+                    _professional.equals(GameEnum.PRO_WORK_LUMBERING.getValue())) {
+                //_professional.equals(GameEnum.PRO_POWER.getValue())
+                //矿工
+                ExcelWorkPro excelWorkPro = getRatioByPowerAndSceneIdAndList(charactersClientVo.getPower(), clientVo.getSceneId(), workProList);
+                //todo 这个概率可能还要计算
+                clientVo.setPowerPro(excelWorkPro.getProbability());
+            } else if (_professional.equals(GameEnum.PRO_WORK_PROSPECT.getValue())) {
+                //_professional.equals(GameEnum.PRO_INTELLIGENCE.getValue())
+                //勘测地形
+                clientVo.setIntelliPro(gotoNextSceneRatioAndList(clientVo.getDiscoverLevel(), charactersClientVo.getIntelligence(), workProList));
+            }
+        }
+        return clientVo;
+    }
+
+    /**
+     * 直接设置获得道具的概率
+     *
+     * @param value       当前力量值
+     * @param mainSceneId 主场景id
+     * @param workProList
+     * @return
+     */
+    private ExcelWorkPro getRatioByPowerAndSceneIdAndList(Integer value, Integer mainSceneId, List<ExcelWorkPro> workProList) {
+        //取最接近value的一个最小值
+        if (mainSceneId.equals(GameEnum.MINE_00.getValue())) {
+            //如果是挖矿场景id
+            ExcelWorkPro excelWorkPro = workProList.stream().filter(e -> e.getProfessionalType().equals(1) && e.getAttribute() <= value).max(Comparator.comparing(u -> u.getAttribute())).get();
+            return excelWorkPro;
+        } else if (mainSceneId.equals(GameEnum.LUMBERING_00.getValue())) {
+            //如果是伐木场景id
+            List<ExcelWorkPro> workPros = workProList.stream().filter(e -> e.getProfessionalType().equals(4) && e.getAttribute() >= value).collect(Collectors.toList());
+
+            log.info(workPros.toString());
+            ExcelWorkPro excelWorkPro = workProList.stream().filter(e -> e.getProfessionalType().equals(4) && e.getAttribute() <= value).max(Comparator.comparing(u -> u.getAttribute())).get();
+            return excelWorkPro;
+        } else {
+            throw new RuntimeException("No mainSceneId value");
+        }
+    }
+
+    private double getRatioByPower(Integer value) {
+        double _ratio = 0d;
+        if (value >= GameEnum.ATTRIBUTE_01.getValue() && value < GameEnum.ATTRIBUTE_02.getValue()) {
+            //60~100
+            _ratio = 0.004;
+        } else if (value < GameEnum.ATTRIBUTE_03.getValue()) {
+            //100~140
+            _ratio = 0.006;
+        } else if (value < GameEnum.ATTRIBUTE_04.getValue()) {
+            //140~180
+            _ratio = 0.01;
+        } else if (value < GameEnum.ATTRIBUTE_05.getValue()) {
+            //180~220
+            _ratio = 0.015;
+        } else if (value < GameEnum.ATTRIBUTE_06.getValue()) {
+            //220~260
+            _ratio = 0.02;
+        } else {
+            //>=260
+            _ratio = 0.025;
+        }
+        return _ratio;
+    }
+
+    /**
+     * 根据当前场景的层级和属性值获取一个进入下个场景的概率
+     *
+     * @param sceneLevel
+     * @param value
+     * @return
+     */
+    private double gotoNextSceneRatioAndList(Integer sceneLevel, Integer value, List<ExcelWorkPro> workProList) {
+        //取最接近value的一个最小值
+        ExcelWorkPro excelWorkPro = workProList.stream().filter(e -> e.getProfessionalType().equals(2) && e.getAttribute() <= value).max(Comparator.comparing(u -> u.getAttribute())).get();
+        String[] exploration = excelWorkPro.getExploration().split("\\|");//层级参数
+        String[] enterPro = excelWorkPro.getEnterPro().split("\\|");//层级参数对应的概率
+        Double _ratio = 0d;
+        String netLevel = String.valueOf(sceneLevel + 1);
+        if (ArrayUtil.contains(exploration, netLevel)) {
+            int index = ArrayUtil.indexOf(exploration, netLevel);
+            log.info(Integer.parseInt(ArrayUtil.get(enterPro, index)) + "");
+            _ratio = Double.parseDouble(ArrayUtil.get(enterPro, index)) / 100;
+        }
+        return _ratio;
+    }
+
+    private double gotoNextSceneRatio(Integer sceneLevel, Integer value) {
+        double _ratio = 0d;
+        if (value >= GameEnum.ATTRIBUTE_01.getValue() && value < GameEnum.ATTRIBUTE_02.getValue()) {
+            //60~100
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.04;  // 1=>2
+            }
+        } else if (value < GameEnum.ATTRIBUTE_03.getValue()) {
+            //100~140
+            _ratio = 0.006;
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.11;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.1;  // 2=>3
+            }
+        } else if (value < GameEnum.ATTRIBUTE_04.getValue()) {
+            //140~180
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.23;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.03;  // 2=>3
+            } else if (sceneLevel.equals(3)) {
+                _ratio = 0.01;  // 3=>4
+            }
+        } else if (value < GameEnum.ATTRIBUTE_05.getValue()) {
+            //180~220
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.34;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.07;  // 2=>3
+            } else if (sceneLevel.equals(3)) {
+                _ratio = 0.03;  // 3=>4
+            }
+        } else if (value < GameEnum.ATTRIBUTE_06.getValue()) {
+            //220~260
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.51;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.11;  // 2=>3
+            } else if (sceneLevel.equals(3)) {
+                _ratio = 0.07;  // 3=>4
+            }
+        } else {
+            //>=260
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.97;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.19;  // 2=>3
+            } else if (sceneLevel.equals(3)) {
+                _ratio = 0.13;  // 3=>4
+            }
+        }
+        return _ratio;
+    }
+
+    /**
+     * 获得当前的运输数量值
+     *
+     * @param value
+     * @param workProList
+     * @return
+     */
+    private int getLimitSkillsAndList(Integer value, List<ExcelWorkPro> workProList) {
+        //取最接近value的一个最小值
+        ExcelWorkPro excelWorkPro = workProList.stream().filter(e -> e.getProfessionalType().equals(3) && e.getAttribute() <= value).max(Comparator.comparing(u -> u.getAttribute())).get();
+        return excelWorkPro.getTransport();
+    }
+
+    private int getLimitSkills(Integer value) {
+        int _limit = 0;
+        if (value >= GameEnum.ATTRIBUTE_01.getValue() && value < GameEnum.ATTRIBUTE_02.getValue()) {
+            //60~100
+            _limit = 5;
+        } else if (value < GameEnum.ATTRIBUTE_03.getValue()) {
+            //100~140
+            _limit = 10;
+        } else if (value < GameEnum.ATTRIBUTE_04.getValue()) {
+            //140~180
+            _limit = 15;
+        } else if (value < GameEnum.ATTRIBUTE_05.getValue()) {
+            //180~220
+            _limit = 20;
+        } else if (value < GameEnum.ATTRIBUTE_06.getValue()) {
+            //220~260
+            _limit = 25;
+        } else {
+            //>=260
+            _limit = 30;
+        }
+        return _limit;
+    }
+
+
+    private int getSceneIdByLevel(Integer value, Integer sceneType) {
+        int _levelId = 0;
+        if (sceneType >= 101 || sceneType <= 105) {
+            if (value.equals(1)) {
+                _levelId = GameEnum.LUMBERING_00.getValue();
+            } else if (value.equals(2)) {
+                _levelId = GameEnum.LUMBERING_01.getValue();
+            } else if (value.equals(3)) {
+                _levelId = GameEnum.LUMBERING_02.getValue();
+            } else if (value.equals(4)) {
+                _levelId = GameEnum.LUMBERING_03.getValue();
+            } else if (value.equals(5)) {
+                _levelId = GameEnum.LUMBERING_04.getValue();
+            }
+            //伐木
+        } else if (sceneType >= 201 || sceneType <= 205) {
+            if (value.equals(1)) {
+                _levelId = GameEnum.MINE_00.getValue();
+            } else if (value.equals(2)) {
+                _levelId = GameEnum.MINE_01.getValue();
+            } else if (value.equals(3)) {
+                _levelId = GameEnum.MINE_02.getValue();
+            } else if (value.equals(4)) {
+                _levelId = GameEnum.MINE_03.getValue();
+            } else if (value.equals(5)) {
+                _levelId = GameEnum.MINE_04.getValue();
+            }
+        }
+
+        return _levelId;
+    }
+
+    /**
+     * 获取道具和概率数组
+     *
+     * @param _excelWorkPro
+     * @param _currentLevel
+     * @param propList
+     * @return
+     */
+    private List<ExcelPropAndProVo> getPropAndPros(ExcelWorkPro _excelWorkPro, Integer _currentLevel, List<ExcelProp> propList) {
+        //道具和道具对应的概率
+        String[] _levelItemList = _excelWorkPro.getLevelItem().split(",");
+        //获取当前层级的道具
+        String _levelProp = ArrayUtil.get(_levelItemList, _currentLevel - 1);
+        List<String> _levelPropIds = Arrays.asList(ArrayUtil.remove(_levelProp.split("\\|"), 0)); //对应的id list
+        //场景对应物品的概率
+        String[] _levelProList = _excelWorkPro.getLevelPro().split(",");
+        String _levelPropPro = ArrayUtil.get(_levelProList, _currentLevel - 1);//获取当前层级的道具对应的概率
+        List<String> _levelPropProList = Arrays.asList(ArrayUtil.remove(_levelPropPro.split("\\|"), 0)); //对应的概率id list 第一个是场景level，移除
+
+        return propList.stream().filter(e ->
+                _levelPropIds.contains(e.getPropId().toString())
+                        && !"0".equals(_levelPropProList.get(_levelPropIds.indexOf(e.getPropId().toString()))))
+                .map(e -> {
+                    ExcelPropAndProVo excelPropAndProVo = new ExcelPropAndProVo();
+                    log.info("场景:" + _currentLevel + "=>" + _levelPropProList.get(_levelPropIds.indexOf(e.getPropId().toString())));
+                    int index = _levelPropIds.indexOf(e.getPropId().toString());
+                    excelPropAndProVo = CopyUtil.copy(e, ExcelPropAndProVo.class);
+                    excelPropAndProVo.setProbability(Double.parseDouble(_levelPropProList.get(index)));
+                    return excelPropAndProVo;
+                }).collect(Collectors.toList());
+
+    }
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/vo/ComCharactersDiscoveryClientVo.java

@@ -0,0 +1,68 @@
+package com.td.Dawa.game.comcharactersdiscovery.vo;
+
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.exceldrop.vo.ExcelDropClientVo;
+import com.td.Dawa.game.excelprop.vo.ExcelPropClientVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ComCharactersDiscoveryClientVo implements Serializable {
+    private Integer id;//
+
+    //private String roleId;//人物id排序字符串，比如：1|2|3
+
+    //private String userId;//用户id
+
+    private String name;//工作名字
+
+    private Integer isWork;//是否工作 0: 工作中，1：工作完成
+
+    private Integer workId;//工作的id
+
+    private Date workStart;//开始时间
+
+    private Integer workDay;//探索日期,记录毫秒,转成成工作日期。
+
+    private Long workMill;//返回一个探索剩余时间毫秒
+
+    private String workFlag;//每次探索生成一个唯一标识
+
+    private Integer discoverLevel;//探索级别
+
+    private Integer sceneId;//当前场景Id
+
+    //private String rewardItem; //记录奖励物品
+
+    //private String rewardCount; //记录奖励物品的数量 reward_item 奖励对应的数量 1000|2000
+
+    private Integer rewardExp; //记录奖励的经验
+
+    private Integer rewardCurrency;//记录奖励的货币
+
+    //private String allItem; //全部产出的item记录
+
+    private Double powerPro;//产出概率
+
+    private Double intelliPro;//勘探概率
+
+    private Integer transQuantity;//当前运输数量
+
+    private String note;//描述
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+    private Integer currentStrength;//当前的体力值
+
+    List<ComCharactersClientVo> subCharacters;
+
+    List<ExcelPropClientVo> subGetDrops;
+
+    List<ExcelPropClientVo> subAllDrops;
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/vo/ComCharactersDiscoverySimpleVo.java

@@ -0,0 +1,48 @@
+package com.td.Dawa.game.comcharactersdiscovery.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+@Data
+public class ComCharactersDiscoverySimpleVo implements Serializable {
+    private Integer id;//
+
+    private String roleId;//人物id排序字符串，比如：1|2|3
+
+    private String userId;//用户id
+
+    private String name;//工作名字
+
+    private Integer isWork;//是否工作 0: 工作中，1：工作完成
+
+    private Integer workId;//工作的id
+
+    private Date workStart;//开始时间
+
+    private Integer workDay;//探索日期,记录毫秒,转成成工作日期。
+
+    private String workFlag;//每次探索生成一个唯一标识
+
+    private Integer discoverLevel;//探索级别
+
+    private Integer sceneId;//当前场景Id
+
+    private String rewardItem; //记录奖励物品
+
+    private String rewardCount; //记录奖励物品的数量 reward_item 奖励对应的数量 1000|2000
+
+    private Integer rewardExp; //记录奖励的经验
+
+    private Integer rewardCurrency;//记录奖励的货币
+
+    private String allItem; //全部产出的item记录
+
+    private String note;//描述
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/vo/ComCharactersDiscoveryVo.java

@@ -0,0 +1,48 @@
+package com.td.Dawa.game.comcharactersdiscovery.vo;
+
+import com.td.Dawa. common.pojo.PageCondition;import lombok.Data;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+@Data
+public class ComCharactersDiscoveryVo extends PageCondition implements Serializable {
+    private Integer id;//
+
+    private String roleId;//人物id排序字符串，比如：1|2|3
+
+    private String userId;//用户id
+
+    private String name;//工作名字
+
+    private Integer isWork;//是否工作 0: 工作中，1：工作完成
+
+    private Integer workId;//工作的id
+
+    private Date workStart;//开始时间
+
+    private Integer workDay;//探索日期,记录毫秒,转成成工作日期。
+
+    private String workFlag;//每次探索生成一个唯一标识
+
+    private Integer discoverLevel;//探索级别
+
+    private Integer sceneId;//当前场景Id
+
+    private String rewardItem; //记录奖励物品
+
+    private String rewardCount; //记录奖励物品的数量 reward_item 奖励对应的数量 1000|2000
+
+    private Integer rewardExp; //记录奖励的经验
+
+    private Integer rewardCurrency;//记录奖励的货币
+
+    private String allItem; //全部产出的item记录
+
+    private String note;//描述
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/complayerbackpack/controller/ComPlayerBackpackController.java

@@ -0,0 +1,50 @@
+package com.td.Dawa.game.complayerbackpack.controller;
+
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.complayerbackpack.pojo.ComPlayerBackpack;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackClientVo;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackSimpleVo;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackVo;
+import com.td.Dawa.game.complayerbackpack.service.ComPlayerBackpackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/game/comPlayerBackpack/")
+public class ComPlayerBackpackController extends CommonController<ComPlayerBackpackVo, ComPlayerBackpack, String> {
+    @Autowired
+    private ComPlayerBackpackService comPlayerBackpackService;
+
+
+    @PostMapping("getByTag")
+    @Encrypt
+    public Result<?> getByTag(@RequestParam(value = "userId") String userId,
+                              @RequestParam(value = "tag") Integer tag,
+                              @RequestParam(value = "page",defaultValue = "1") Integer page,
+                              @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize) {
+        try {
+            ComPlayerBackpackVo vo = new ComPlayerBackpackVo();
+            vo.setUserId(userId);
+            if(!tag.equals(0)){
+                vo.setItemTag(tag);
+            }
+            vo.setPage(page);
+            vo.setRows(pageSize);
+            vo.setSidx("desc");
+            vo.setSord("createTime");
+            PageInfo pageInfo = comPlayerBackpackService.getPageAndProp(vo);
+            return Result.of(pageInfo);
+        } catch (Exception e) {
+            return Result.of(null, false, ResultEnum.PLAYER_BACKPACK_ERROR);
+        }
+
+    }
+}

src/main/java/com/td/Dawa/game/complayerbackpack/pojo/ComPlayerBackpack.java

@@ -0,0 +1,33 @@
+package com.td.Dawa.game.complayerbackpack.pojo;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "com_player_backpack")
+@Data
+public class ComPlayerBackpack implements Serializable {
+    @Id
+    private String id;//仓库物品id，字符串
+
+    private String userId;//用户id
+
+    private Integer itemId;//仓库物品对应id
+
+    private Integer itemType;//对应类型（0:全部，1:货币，2：矿石，3：材料）
+
+    private Integer itemTag;//标记分类
+
+    private String itemName;//物品名字
+
+    private String pictureName;//图片
+
+    private Double amount;//数量
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/complayerbackpack/repository/ComPlayerBackpackRepository.java

@@ -0,0 +1,19 @@
+package com.td.Dawa.game.complayerbackpack.repository;
+
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.complayerbackpack.pojo.ComPlayerBackpack;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackVo;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Repository;
+
+import javax.swing.text.html.Option;
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface ComPlayerBackpackRepository extends CommonRepository<ComPlayerBackpack, String> {
+
+    Optional<ComPlayerBackpack> findByUserIdAndItemId(String userId, Integer itemId);
+
+    List<ComPlayerBackpack> findAllByItemIdInAndUserId(List<Integer> itemId,String userId);
+}

src/main/java/com/td/Dawa/game/complayerbackpack/service/ComPlayerBackpackService.java

@@ -0,0 +1,22 @@
+package com.td.Dawa.game.complayerbackpack.service;
+
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.complayerbackpack.pojo.ComPlayerBackpack;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackClientVo;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackSimpleVo;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackVo;
+import com.td.Dawa.game.excelprop.vo.ExcelPropClientVo;
+
+import java.util.List;
+
+public interface ComPlayerBackpackService extends CommonService<ComPlayerBackpackVo, ComPlayerBackpack, String> {
+
+    ComPlayerBackpack  findByUserIdAndItemId(String userId,Integer itemId);
+
+    List<ComPlayerBackpack> saveAllByUserIdAndProps(String userId, List<ExcelPropClientVo> propClientVoList);
+
+    ComPlayerBackpack saveByUserIdAndProp(String userId, ExcelPropClientVo vo);
+
+    PageInfo getPageAndProp(ComPlayerBackpackVo comPlayerBackpackVo);
+}

src/main/java/com/td/Dawa/game/complayerbackpack/service/ComPlayerBackpackServiceImpl.java

@@ -0,0 +1,159 @@
+package com.td.Dawa.game.complayerbackpack.service;
+
+import cn.hutool.core.util.ArrayUtil;
+import com.td.Dawa.common.pojo.PageCondition;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.game.complayerbackpack.pojo.ComPlayerBackpack;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackClientVo;
+import com.td.Dawa.game.complayerbackpack.vo.ComPlayerBackpackVo;
+import com.td.Dawa.game.complayerbackpack.repository.ComPlayerBackpackRepository;
+import com.td.Dawa.game.excelprop.pojo.ExcelProp;
+import com.td.Dawa.game.excelprop.service.ExcelPropService;
+import com.td.Dawa.game.excelprop.vo.ExcelPropClientVo;
+import com.td.Dawa.game.excelprop.vo.ExcelPropVo;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.UUIDUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+@Slf4j
+public class ComPlayerBackpackServiceImpl extends CommonServiceImpl<ComPlayerBackpackVo, ComPlayerBackpack, String> implements ComPlayerBackpackService {
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ComPlayerBackpackRepository comPlayerBackpackRepository;
+    @Autowired
+    private ExcelPropService excelPropService;
+
+    @Override
+    public ComPlayerBackpack findByUserIdAndItemId(String userId, Integer itemId) {
+        ComPlayerBackpack comPlayerBackpack = comPlayerBackpackRepository.findByUserIdAndItemId(userId,itemId).orElse(null);
+        return comPlayerBackpack;
+    }
+
+    /**
+     * 根据userId对应的propIds保存全部物品
+     *
+     * @param propClientVoList
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<ComPlayerBackpack> saveAllByUserIdAndProps(String userId, List<ExcelPropClientVo> propClientVoList) {
+        //对传入的数据去重，叠加
+        List<ExcelPropClientVo> _difPropClientVoList = new ArrayList<>();
+        for(ExcelPropClientVo _vo : propClientVoList){
+            //createTime不一样，用时间做对比
+            List<Integer> ids = _difPropClientVoList.stream().map(ExcelPropClientVo::getPropId).collect(Collectors.toList());
+            if(ids.contains(_vo.getPropId())){
+                //叠加
+                ExcelPropClientVo _super = _difPropClientVoList.get(ids.indexOf(_vo.getPropId()));
+                //log.info(_super.toString());
+                _super.setItemNum(_super.getItemNum() + _vo.getItemNum());
+            }else{
+                _difPropClientVoList.add(_vo);
+            }
+        }
+        //todo 如果传入的数据背包有一部分没有，则新增
+        List<Integer> propIds = _difPropClientVoList.stream().map(ExcelPropClientVo::getPropId).collect(Collectors.toList());
+        List<ComPlayerBackpack> comPlayerBackpackList = comPlayerBackpackRepository.findAllByItemIdInAndUserId(propIds, userId);
+        List<Integer> itemArray = comPlayerBackpackList.stream().map(ComPlayerBackpack::getItemId).collect(Collectors.toList());
+        //propIds 为原始prop id
+        for (ExcelPropClientVo vo : _difPropClientVoList) {
+            if (itemArray.contains(vo.getPropId())) {
+                //如果存在，则为旧数据，+ itemNum
+                ComPlayerBackpack comPlayerBackpack = comPlayerBackpackList.get(itemArray.indexOf(vo.getPropId()));
+                comPlayerBackpack.setAmount(comPlayerBackpack.getAmount() + vo.getItemNum());
+                log.info("1==>id:"+vo.getPropId());
+                log.info(comPlayerBackpack.toString());
+                super.save(CopyUtil.copy(comPlayerBackpack, ComPlayerBackpackVo.class));
+            } else {
+                //如果不存在，新增
+                ComPlayerBackpack comPlayerBackpack = new ComPlayerBackpack();
+                //comPlayerBackpack.setId(UUIDUtil.getUUID());
+                comPlayerBackpack.setAmount(vo.getItemNum().doubleValue());
+                comPlayerBackpack.setItemId(vo.getPropId());
+                comPlayerBackpack.setUserId(userId);
+                comPlayerBackpack.setItemName(vo.getName());
+                comPlayerBackpack.setItemTag(vo.getItemType());
+                comPlayerBackpack.setItemType(vo.getItemType());//分类和标识暂时设置一样
+                comPlayerBackpack.setCreateTime(vo.getCreateTime());
+                comPlayerBackpackList.add(comPlayerBackpack);
+                log.info("2==>id:"+vo.getPropId());
+                log.info(comPlayerBackpack.toString());
+                super.save(CopyUtil.copy(comPlayerBackpack, ComPlayerBackpackVo.class));
+            }
+        }
+        //comPlayerBackpackRepository.saveAll(comPlayerBackpackList);
+        return comPlayerBackpackList;
+    }
+
+
+    @Override
+    public ComPlayerBackpack saveByUserIdAndProp(String userId, ExcelPropClientVo vo) {
+
+        //todo 如果传入的数据背包有一部分没有，则新增
+        ComPlayerBackpack comPlayerBackpack = comPlayerBackpackRepository.findByUserIdAndItemId(userId, vo.getPropId()).orElse(null);
+         //propIds 为原始prop id
+        if (comPlayerBackpack != null) {
+            //如果存在，则为旧数据，+ itemNum
+            comPlayerBackpack.setAmount(comPlayerBackpack.getAmount() + 1d);
+            log.info("1==>id:"+vo.getPropId());
+            log.info(comPlayerBackpack.toString());
+            super.save(CopyUtil.copy(comPlayerBackpack, ComPlayerBackpackVo.class));
+        } else {
+            //如果不存在，新增
+            comPlayerBackpack = new ComPlayerBackpack();
+            comPlayerBackpack.setAmount(1d);
+            comPlayerBackpack.setItemId(vo.getPropId());
+            comPlayerBackpack.setUserId(userId);
+            comPlayerBackpack.setItemName(vo.getName());
+            comPlayerBackpack.setItemTag(vo.getItemType());
+            comPlayerBackpack.setItemType(vo.getItemType());//分类和标识暂时设置一样
+            comPlayerBackpack.setCreateTime(vo.getCreateTime());
+            log.info("2==>id:"+vo.getPropId());
+            log.info(comPlayerBackpack.toString());
+            super.save(CopyUtil.copy(comPlayerBackpack, ComPlayerBackpackVo.class));
+        }
+        return comPlayerBackpack;
+    }
+
+
+    @Override
+    public PageInfo getPageAndProp(ComPlayerBackpackVo comPlayerBackpackVo) {
+
+        if (!(comPlayerBackpackVo instanceof PageCondition)) {
+            throw new RuntimeException("ComPlayerBackpackVo 未继承PageCondition。");
+        }
+        List<ExcelProp> excelPropVoList = excelPropService.getListFromCache(GameEnum.REDIS_KEY_EXCEL_PROP.getMessage());
+        List<Integer> propIdList = excelPropVoList.stream().map(ExcelProp::getPropId).collect(Collectors.toList());
+
+        PageCondition pageCondition = (PageCondition) comPlayerBackpackVo;
+        Page<ComPlayerBackpack> page = comPlayerBackpackRepository.findAll(Example.of(CopyUtil.copy(comPlayerBackpackVo, ComPlayerBackpack.class)), pageCondition.getPageable());
+
+        List<ComPlayerBackpackClientVo> comPlayerBackpackClientVos = page.getContent().stream().map(e -> {
+            ComPlayerBackpackClientVo comPlayerBackpackClientVo = CopyUtil.copy(e, ComPlayerBackpackClientVo.class);
+            comPlayerBackpackClientVo.setPropInfo(CopyUtil.copy(excelPropVoList.get(propIdList.indexOf(e.getItemId())), ExcelPropClientVo.class));
+            return comPlayerBackpackClientVo;
+        }).collect(Collectors.toList());
+
+        return  PageInfo.customContent(page, comPlayerBackpackClientVos);
+    }
+}

src/main/java/com/td/Dawa/game/complayerbackpack/vo/ComPlayerBackpackClientVo.java

@@ -0,0 +1,33 @@
+package com.td.Dawa.game.complayerbackpack.vo;
+
+import com.td.Dawa.game.excelprop.vo.ExcelPropClientVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComPlayerBackpackClientVo implements Serializable {
+    private String id;//仓库物品id，字符串
+
+    //private String userId;//用户id
+
+    //private Integer itemId;//仓库物品对应id
+
+    private ExcelPropClientVo propInfo;// 道具物品
+
+    private Integer itemType;//对应类型（0:全部，1:货币，2：矿石，3：材料）
+
+    private Integer itemTag;//标记分类
+
+    private String itemName;//物品名字
+
+    private String pictureName;//图片
+
+    private Double amount;//数量
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/complayerbackpack/vo/ComPlayerBackpackSimpleVo.java

@@ -0,0 +1,29 @@
+package com.td.Dawa.game.complayerbackpack.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComPlayerBackpackSimpleVo implements Serializable {
+    private String id;//仓库物品id，字符串
+
+    private String userId;//用户id
+
+    private Integer itemId;//仓库物品对应id
+
+    private Integer itemType;//对应类型（0:全部，1:货币，2：矿石，3：材料）
+
+    private Integer itemTag;//标记分类
+
+    private String itemName;//物品名字
+
+    private String pictureName;//图片
+
+    private Double amount;//数量
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/complayerbackpack/vo/ComPlayerBackpackVo.java

@@ -0,0 +1,29 @@
+package com.td.Dawa.game.complayerbackpack.vo;
+
+import com.td.Dawa. common.pojo.PageCondition;import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComPlayerBackpackVo extends PageCondition implements Serializable {
+    private String id;//仓库物品id，字符串
+
+    private String userId;//用户id
+
+    private Integer itemId;//仓库物品对应id
+
+    private Integer itemType;//对应类型（0:全部，1:货币，2：矿石，3：材料）
+
+    private Integer itemTag;//标记分类
+
+    private String itemName;//物品名字
+
+    private String pictureName;//图片
+
+    private Double amount;//数量
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/complayersattri/controller/ComPlayersAttriController.java

@@ -0,0 +1,54 @@
+package com.td.Dawa.game.complayersattri.controller;
+
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.complayersattri.pojo.ComPlayersAttri;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriClientVo;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriVo;
+import com.td.Dawa.game.complayersattri.service.ComPlayersAttriService;
+import com.td.Dawa.game.excelparameter.service.ExcelParameterService;
+import com.td.Dawa.game.excelparameter.vo.ExcelParameterVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/game/comPlayersAttri/")
+public class ComPlayersAttriController extends CommonController<ComPlayersAttriVo, ComPlayersAttri, Integer> {
+    @Autowired
+    private ComPlayersAttriService comPlayersAttriService;
+
+    @Autowired
+    private ExcelParameterService excelParameterService;
+    /**
+     * 获取玩家属性
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("getAttribute")
+    public Result<ComPlayersAttriClientVo> getPlayerAttributeFunction(@RequestParam(value = "userId") String userId) {
+        try {
+            //获取数据库相关配置
+            //ComSettingVo comSettingVo = redisSettingMap.getComSettingMap();//comSettingService.get("1").getData();
+            //todo 暂时是id=1为体力
+            ExcelParameterVo excelParameterVo = excelParameterService.getVo(1);
+            if (excelParameterVo.equals(null)) {
+                //return Result.of(null, false, ResultEnum.SETTING_IS_NULL);
+                throw new AuthorizeException(ResultEnum.SETTING_IS_NULL);
+            }
+            //获取一下用户属性，新增表
+            ComPlayersAttriVo attriVo = comPlayersAttriService.findByUserId(userId);
+            //计算一下体力值
+            ComPlayersAttriClientVo clientVo =  comPlayersAttriService.setStrengthAttriClientVo(attriVo,excelParameterVo.getValue().intValue());
+            return Result.of(clientVo);
+        } catch (AuthorizeException e){
+            return Result.of(null, false, e.getMessage(),e.getCode());
+        } catch (Exception e){
+            return Result.of(null, false, ResultEnum.PLAYER_ATTRIBUTE_ERROR);
+        }
+
+    }
+
+}

src/main/java/com/td/Dawa/game/complayersattri/enums/ComPlayerLuckyLogEnum.java

@@ -0,0 +1,18 @@
+package com.td.Dawa.game.complayersattri.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum ComPlayerLuckyLogEnum {
+    tool(0, "工具"),
+    level(1, "升级土地"),
+    cnb(2, "兑换CNB");
+
+    ComPlayerLuckyLogEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    private Integer code;
+    private String msg;
+}

src/main/java/com/td/Dawa/game/complayersattri/pojo/ComPlayersAttri.java

@@ -0,0 +1,29 @@
+package com.td.Dawa.game.complayersattri.pojo;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "com_players_attri")
+@Data
+public class ComPlayersAttri implements Serializable {
+    @Id
+    private String id;//该角色的id
+
+    private String userId;//创建该角色的用户id
+
+    private String name;//角色名词
+
+    private Integer strength;//体力值，初始0，记录使用的体力
+
+    private Integer lucky;//幸运值
+
+    private Date resetStrength;//重置体力的时间
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/complayersattri/repository/ComPlayersAttriRepository.java

@@ -0,0 +1,13 @@
+package com.td.Dawa.game.complayersattri.repository;
+
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.complayersattri.pojo.ComPlayersAttri;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface ComPlayersAttriRepository extends CommonRepository<ComPlayersAttri, Integer> {
+
+    Optional<ComPlayersAttri> findByUserId(String userId);
+}

src/main/java/com/td/Dawa/game/complayersattri/service/ComPlayersAttriService.java

@@ -0,0 +1,16 @@
+package com.td.Dawa.game.complayersattri.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.complayersattri.pojo.ComPlayersAttri;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriClientVo;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriSimpleVo;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriVo;
+
+public interface ComPlayersAttriService extends CommonService<ComPlayersAttriVo, ComPlayersAttri, Integer> {
+    ComPlayersAttriVo findByUserId(String userId);
+
+    ComPlayersAttriClientVo setStrengthAttriClientVo(ComPlayersAttriVo attriVo,Integer strength);
+
+
+    void consumesStrengthFromGetRole();
+}

src/main/java/com/td/Dawa/game/complayersattri/service/ComPlayersAttriServiceImpl.java

@@ -0,0 +1,93 @@
+package com.td.Dawa.game.complayersattri.service;
+
+import cn.hutool.core.util.StrUtil;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.complayersattri.pojo.ComPlayersAttri;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriClientVo;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriSimpleVo;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriVo;
+import com.td.Dawa.game.complayersattri.repository.ComPlayersAttriRepository;
+import com.td.Dawa.game.excelparameter.service.ExcelParameterService;
+import com.td.Dawa.game.excelparameter.vo.ExcelParameterVo;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.DateUtil;
+import com.td.Dawa.util.RedisData;
+import com.td.Dawa.util.RedisLock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.naming.AuthenticationException;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+@Service
+@Transactional
+public class ComPlayersAttriServiceImpl extends CommonServiceImpl<ComPlayersAttriVo, ComPlayersAttri, Integer> implements ComPlayersAttriService {
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ComPlayersAttriRepository comPlayersAttriRepository;
+
+    @Autowired
+    private RedisLock redisLock;
+
+    /**
+     * 如果没有体力相关数据，创建一个新的数据，此代码块加redis锁
+     * @param userId
+     * @return
+     */
+    @Override
+    public ComPlayersAttriVo findByUserId(String userId) {
+        long time = System.currentTimeMillis() + RedisData.getPlayerTimeout();
+        String redisKey = StrUtil.format("players_attri_{}", userId);
+        // redis锁
+        if (!redisLock.lock(redisKey, String.valueOf(time))) {
+            throw new AuthorizeException(ResultEnum.PLAYER_ATTRIBUTE_SAVE_LOCK);
+        }
+        ComPlayersAttri comPlayersAttri = comPlayersAttriRepository.findByUserId(userId).orElse(null);
+        ComPlayersAttriVo playersAttribute = CopyUtil.copy(comPlayersAttri, ComPlayersAttriVo.class);
+        if (comPlayersAttri == null) {
+            // todo player 如果角色不存在的话，直接创建一个。
+            playersAttribute = new ComPlayersAttriVo();
+            playersAttribute.setUserId(userId);
+            playersAttribute.setStrength(0);
+            playersAttribute.setLucky(0);
+            playersAttribute.setResetStrength(DateUtil.getNowDate());
+            playersAttribute.setCreateTime(DateUtil.getNowDate());
+            playersAttribute.setUpdateTime(DateUtil.getNowDate());
+            playersAttribute = super.save(playersAttribute).getData();
+        }
+        redisLock.unlock(redisKey, String.valueOf(time));
+        return playersAttribute;
+    }
+
+    /**
+     * 返回一个当前的显示体力计算
+     * @param attriVo
+     * @param strength
+     * @return
+     */
+    @Override
+    public ComPlayersAttriClientVo setStrengthAttriClientVo(ComPlayersAttriVo attriVo,Integer strength){
+        //前端的显示,输出一个不小于0的体力值
+        Integer _maxStrength = strength;
+        Integer _out = _maxStrength - Math.abs(attriVo.getStrength());
+        ComPlayersAttriClientVo clientVo = CopyUtil.copy(attriVo, ComPlayersAttriClientVo.class);
+        clientVo.setCurrentStrength(_out < 0 ? 0 : _out);
+        //最大值是配置的值和链上数据的值相加
+        clientVo.setMaxStrength(_maxStrength);
+        return  clientVo;
+    }
+
+
+    @Override
+    public void consumesStrengthFromGetRole() {
+
+    }
+}

src/main/java/com/td/Dawa/game/complayersattri/vo/ComPlayersAttriClientVo.java

@@ -0,0 +1,25 @@
+package com.td.Dawa.game.complayersattri.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComPlayersAttriClientVo implements Serializable {
+
+    //private String name;//角色名词
+
+    private Integer currentStrength;//返回前端是计算的值，当前的体力值
+
+    private Integer MaxStrength;//返回前端是计算的值，最大体力
+
+    //private Integer lucky;//幸运值
+
+//    private Date resetStrength;//重置体力的时间
+
+//    private Date createTime;//
+
+//    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/complayersattri/vo/ComPlayersAttriSimpleVo.java

@@ -0,0 +1,27 @@
+package com.td.Dawa.game.complayersattri.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComPlayersAttriSimpleVo implements Serializable {
+
+    private String id;//该角色的id
+
+    private String name;//角色名词
+
+    private Integer currentStrength;//返回前端是计算的值，当前的体力值
+
+    private Integer MaxStrength;//返回前端是计算的值，最大体力
+
+    private Integer lucky;//幸运值
+
+    private Date resetStrength;//重置体力的时间
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/complayersattri/vo/ComPlayersAttriVo.java

@@ -0,0 +1,25 @@
+package com.td.Dawa.game.complayersattri.vo;
+
+import com.td.Dawa. common.pojo.PageCondition;import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComPlayersAttriVo extends PageCondition implements Serializable {
+    private String id;//该角色的id
+
+    private String userId;//创建该角色的用户id
+
+    private String name;//角色名词
+
+    private Integer strength;//体力值，初始0，记录使用的体力
+
+    private Integer lucky;//幸运值
+
+    private Date resetStrength;//重置体力的时间
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/comsetting/controller/ComSettingController.java

@@ -0,0 +1,206 @@
+package com.td.Dawa.game.comsetting.controller;
+
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriSimpleVo;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+import com.td.Dawa.game.excelcharactercolor.service.ExcelCharacterColorService;
+import com.td.Dawa.game.excelcharactercolor.vo.ExcelCharacterColorSimpleVo;
+import com.td.Dawa.game.excelcharactercolor.vo.ExcelCharacterColorVo;
+import com.td.Dawa.game.excelcharactercreate.service.ExcelCharacterCreateService;
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateSimpleVo;
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateVo;
+import com.td.Dawa.game.excelcharacterlevel.service.ExcelCharacterLevelService;
+import com.td.Dawa.game.excelcharacterlevel.vo.ExcelCharacterLevelSimpleVo;
+import com.td.Dawa.game.excelcharacterlevel.vo.ExcelCharacterLevelVo;
+import com.td.Dawa.game.exceldrop.service.ExcelDropService;
+import com.td.Dawa.game.exceldrop.vo.ExcelDropVo;
+import com.td.Dawa.game.excelparameter.service.ExcelParameterService;
+import com.td.Dawa.game.excelparameter.vo.ExcelParameterSimpleVo;
+import com.td.Dawa.game.excelparameter.vo.ExcelParameterVo;
+import com.td.Dawa.game.excelprop.service.ExcelPropService;
+import com.td.Dawa.game.excelprop.vo.ExcelPropSimpleVo;
+import com.td.Dawa.game.excelprop.vo.ExcelPropVo;
+import com.td.Dawa.game.excelresources.service.ExcelResourcesService;
+import com.td.Dawa.game.excelresources.vo.ExcelResourcesSimpleVo;
+import com.td.Dawa.game.excelresources.vo.ExcelResourcesVo;
+import com.td.Dawa.game.excelscene.service.ExcelSceneService;
+import com.td.Dawa.game.excelscene.vo.ExcelSceneSimpleVo;
+import com.td.Dawa.game.excelscene.vo.ExcelSceneVo;
+import com.td.Dawa.game.excelworkpro.service.ExcelWorkProService;
+import com.td.Dawa.game.excelworkpro.vo.ExcelWorkProSimpleVo;
+import com.td.Dawa.game.excelworkpro.vo.ExcelWorkProVo;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.ExcelDataUtil;
+import com.td.Dawa.game.excelcharacterattri.service.ExcelCharacterAttriService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.util.List;
+
+@RestController
+@RequestMapping("/game/comSetting/")
+@Slf4j
+public class ComSettingController{
+
+    @Autowired
+    private ExcelCharacterLevelService excelCharacterLevelService;
+
+    @Autowired
+    private ExcelCharacterCreateService excelCharacterCreateService;
+
+    @Autowired
+    private ExcelCharacterAttriService excelCharacterAttriService;
+
+    @Autowired
+    private ExcelCharacterColorService excelCharacterColorService;
+
+    @Autowired
+    private ExcelSceneService excelSceneService;
+
+    @Autowired
+    private ExcelPropService excelPropService;
+
+    @Autowired
+    private ExcelResourcesService excelResourcesService;
+
+    @Autowired
+    private ExcelDropService excelDropService;
+
+    @Autowired
+    private ExcelParameterService excelParameterService;
+
+    @Autowired
+    private ExcelWorkProService excelWorkProService;
+
+
+    @ResponseBody
+    @RequestMapping(value = "/excelImport")
+    public Result<?> importExcel(@RequestParam("file") MultipartFile file) {
+        int count = 0;
+        if (file.isEmpty()) {
+            System.out.println("文件为空！");
+            Result.of(count);
+        }
+        // 获取上传文件输入流
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        } catch (Exception e) {
+            //return ResponseData.fail(ResponseCodeEnum.ERROR_PARAM_INVALID);
+            e.printStackTrace();
+        }
+        log.info("file.getName():" + file.getOriginalFilename());
+        ExcelReader excelReader = ExcelUtil.getReader(inputStream);
+        //暂时按照名字区分
+
+        switch (file.getOriginalFilename().replace(".xlsx", "")) {
+            case "UI界面":
+
+                return null;
+            case "帮助":
+
+                return null;
+            case "参数":
+                List<ExcelParameterVo> voList = ExcelDataUtil.setParameter(excelReader);
+                for (ExcelParameterVo objects : voList) {
+                    excelParameterService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(voList, ExcelParameterSimpleVo.class));
+            case "产出表":
+
+                return null;
+            case "场景":
+                List<ExcelSceneVo> excelSceneVoList = ExcelDataUtil.setScene(excelReader);
+                for (ExcelSceneVo objects : excelSceneVoList) {
+                    excelSceneService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(excelSceneVoList, ExcelSceneSimpleVo.class));
+            case "道具":
+                List<ExcelPropVo> excelPropVoList = ExcelDataUtil.setProp(excelReader);
+                for (ExcelPropVo objects : excelPropVoList) {
+                    excelPropService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(excelPropVoList, ExcelPropSimpleVo.class));
+            case "掉落":
+                List<ExcelDropVo> excelDropVoList = ExcelDataUtil.setDrop(excelReader);
+                for (ExcelDropVo objects : excelDropVoList) {
+                    excelDropService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(excelDropVoList, ExcelPropSimpleVo.class));
+            case "多语言":
+
+                return null;
+            case "工作效率对应":
+                List<ExcelWorkProVo> excelWorkPros = ExcelDataUtil.setWorkPro(excelReader);
+                for (ExcelWorkProVo objects : excelWorkPros) {
+                    excelWorkProService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(excelWorkPros, ExcelWorkProSimpleVo.class));
+            case "挂机收益":
+
+                return null;
+            case "互动事件":
+
+                return null;
+            case "技能":
+
+                return null;
+            case "建筑升级":
+
+                return null;
+            case "角色等级":
+                List<ExcelCharacterLevelVo> characterLevelVoList = ExcelDataUtil.setCharacterLevel(excelReader);
+                for (ExcelCharacterLevelVo objects : characterLevelVoList) {
+                    excelCharacterLevelService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(characterLevelVoList, ExcelCharacterLevelSimpleVo.class));
+            case "角色生成":
+                List<ExcelCharacterCreateVo> characterCreateReaderList = ExcelDataUtil.setCharacterCreate(excelReader);
+                for (ExcelCharacterCreateVo objects : characterCreateReaderList) {
+                    excelCharacterCreateService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(characterCreateReaderList, ExcelCharacterCreateSimpleVo.class));
+            case "角色属性":
+                List<ExcelCharacterAttriVo> characterReaderList = ExcelDataUtil.setCharacterAttributes(excelReader);
+                for (ExcelCharacterAttriVo objects : characterReaderList) {
+                    excelCharacterAttriService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(characterReaderList, ExcelCharacterAttriSimpleVo.class));
+            case "角色颜色":
+                List<ExcelCharacterColorVo> characterColorVoList = ExcelDataUtil.setCharacterColor(excelReader);
+                for (ExcelCharacterColorVo objects : characterColorVoList) {
+                    excelCharacterColorService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(characterColorVoList, ExcelCharacterColorSimpleVo.class));
+            case "角色刷新":
+
+                return null;
+            case "路径":
+
+                return null;
+            case "模型":
+
+                return null;
+            case "文字":
+
+                return null;
+            case "引导":
+
+                return null;
+            case "资源":
+                List<ExcelResourcesVo> resourcesVos = ExcelDataUtil.setResource(excelReader);
+                for (ExcelResourcesVo objects : resourcesVos) {
+                    excelResourcesService.save(objects);
+                }
+                return Result.of(CopyUtil.copyList(resourcesVos, ExcelResourcesSimpleVo.class));
+
+        }
+        return Result.of(null);
+    }
+
+}

src/main/java/com/td/Dawa/game/comusers/controller/ComUsersController.java

@@ -0,0 +1,225 @@
+package com.td.Dawa.game.comusers.controller;
+
+import cn.hutool.json.JSONObject;
+import com.td.Dawa.annotation.Decrypt;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.complayersattri.service.ComPlayersAttriService;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriClientVo;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriVo;
+import com.td.Dawa.game.comusers.vo.ComUsersClientVo;
+import com.td.Dawa.game.comusers.vo.ComUsersLoginVo;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.game.comusers.pojo.ComUsers;
+import com.td.Dawa.game.comusers.vo.ComUsersVo;
+import com.td.Dawa.game.comusers.service.ComUsersService;
+import com.td.Dawa.game.excelparameter.service.ExcelParameterService;
+import com.td.Dawa.game.excelparameter.vo.ExcelParameterVo;
+import com.td.Dawa.sys.syssetting.vo.SysSettingVo;
+import com.td.Dawa.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.HttpClientErrorException;
+
+import java.util.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/game/comUsers/")
+public class ComUsersController extends CommonController<ComUsersVo, ComUsers, String> {
+    @Autowired
+    private ComUsersService comUsersService;
+
+    @Autowired
+    private ComPlayersAttriService comPlayersAttriService;
+
+    @Autowired
+    private JwtTokenUtil jwtTokenUtil;
+
+
+    @Value("${spring.profiles.active}")
+    private String active;
+
+    @Value(value = "classpath:static/dapp/dapp-plugin.min.js")
+    private Resource dappPluginFile;
+    @Value(value = "classpath:static/dapp/dapp.js")
+    private Resource dappFile;
+
+    @Autowired
+    private RedisLock redisLock;
+
+    @Autowired
+    private ExcelParameterService excelParameterService;
+
+    @Autowired
+    private RedisSettingMap redisSettingMap;
+
+    /**
+     * 接口需要token放行
+     *
+     * @return
+     */
+    @PostMapping("RSAConfig")
+    public Result<Map> publicKeyAndSys() {
+        //存储在redis上
+        Map map = new HashMap();
+        map.put("active", active);
+        map.put("publicKey", redisSettingMap.getRSAPublicKeyBase64());
+        SysSettingVo sysSettingVo = redisSettingMap.getSysSettingMap();
+        map.put("apiEncrypt", sysSettingVo.getSysApiEncrypt());
+        return Result.of(map);
+    }
+
+    /**
+     * 登录后返回一个token令牌
+     *
+     * @param comUsersLoginVo
+     * @return
+     */
+    @PostMapping("login")
+    @Decrypt
+    @Encrypt
+    public Result<Map> login(ComUsersLoginVo comUsersLoginVo) {
+        log.info("login:"+comUsersLoginVo.toString());
+        Map map = new HashMap();
+        try {
+            Map metaLoginInfo = WaDaNetUtil.MetaPalLogin(comUsersLoginVo.getUsername(), comUsersLoginVo.getPassword());
+            if (!metaLoginInfo.get("code").equals(200)) {
+                //登录失败
+                return Result.of(metaLoginInfo, false, ResultEnum.META_LOGIN_ERROR.getMessage(), ResultEnum.META_LOGIN_ERROR.getCode());
+            }
+            JSONObject jsonObject = new JSONObject(metaLoginInfo.get("result"));
+            if (jsonObject.get("accountStatus").equals(1)) {
+                //禁止登录
+                return Result.of(metaLoginInfo, false, ResultEnum.META_LOGIN_LIMIT.getMessage(), ResultEnum.META_LOGIN_LIMIT.getCode());
+            }
+            String uuid = jsonObject.getStr("uuid"), address = jsonObject.getStr("wallet");
+            String _redisKey = "SNB_SAVE_" + uuid;
+            //todo snb冻结加锁
+            long time = System.currentTimeMillis() + RedisData.getSnbTimeout();
+            //如果校验通过，生成用户数据，生成token
+            ComUsersVo comUsersVo = comUsersService.findByUserId(uuid);
+            if (comUsersVo == null) {
+                //如果没有用户信息
+                comUsersVo = new ComUsersVo();
+                comUsersVo.setUserId(uuid);
+                comUsersVo.setGold(0);
+                comUsersVo.setDiamond(0);
+                comUsersVo.setCnt(0);
+                comUsersVo.setSnb(0);
+                comUsersVo.setSnbPart(0d);
+                comUsersVo.setName(jsonObject.getStr("userName"));
+                comUsersVo.setRealName(jsonObject.getStr("realName"));
+                comUsersVo.setEmail(jsonObject.getStr("email"));
+                comUsersVo.setTelephone(jsonObject.getStr("telephone"));
+                comUsersVo.setBirthday(jsonObject.getStr("birthday"));
+                comUsersVo.setSex(jsonObject.getInt("sex"));
+                comUsersVo.setWallet(address);
+                comUsersVo.setLimitTran(0);
+                comUsersVo.setLimitLogin(0);
+                comUsersVo.setAddress(address);
+                comUsersVo.setLastLogin(new Date());
+                comUsersVo.setCreateTime(new Date());
+                comUsersService.save(comUsersVo);
+            } else {
+                //如果是黑名单限制登录的用户，限制登录
+                if (comUsersVo.getLimitLogin().equals(1)) {
+                    map.put("msg", "当前用户限制登录，请联系游戏管理人员！");
+                    return Result.of(map, false, ResultEnum.USER_LIMIT_LOGIN.getMessage(), ResultEnum.USER_LIMIT_LOGIN.getCode());
+                }
+                //记录一下用户的Address
+                if (comUsersVo.getAddress() == null) {
+                    comUsersVo.setWallet(address);
+                    comUsersVo.setAddress(address);
+                }
+                //维护一个最后登录时间
+                comUsersVo.setLastLogin(new Date());
+                // 防止重复操作
+                if (!redisLock.lock(_redisKey, String.valueOf(time))) {
+                    return Result.of(map, false, ResultEnum.USER_LOGIN_LOCK.getMessage(), ResultEnum.USER_LOGIN_LOCK.getCode());
+                }
+                comUsersService.save(comUsersVo);
+                redisLock.unlock(_redisKey, String.valueOf(time));
+
+            }
+            //获取一下用户属性，新增表
+            ComPlayersAttriVo playersAttribute = comPlayersAttriService.findByUserId(comUsersVo.getUserId());
+            if (playersAttribute == null) {
+                // todo player 如果角色不存在的话，直接创建一个。
+                playersAttribute = new ComPlayersAttriVo();
+                playersAttribute.setUserId(comUsersVo.getUserId());
+                playersAttribute.setStrength(0);
+                playersAttribute.setLucky(0);
+                playersAttribute.setResetStrength(DateUtil.getNowDate());
+                playersAttribute.setCreateTime(DateUtil.getNowDate());
+                playersAttribute.setUpdateTime(DateUtil.getNowDate());
+                comPlayersAttriService.save(playersAttribute);
+            } else {
+                //todo 判断是否过了一天，是的话重置体力值
+                if (playersAttribute.getResetStrength() == null) {
+                    playersAttribute.setStrength(0);
+                    playersAttribute.setResetStrength(DateUtil.getNowDate());
+                    comPlayersAttriService.save(playersAttribute);
+                } else {
+                    Long _attributeTime = DateUtil.getOldDateAddDay(playersAttribute.getResetStrength(), 1).getTime() - DateUtil.getNowDate().getTime();
+                    if (_attributeTime <= 0) {
+                        playersAttribute.setStrength(0);
+                        playersAttribute.setResetStrength(DateUtil.getNowDate());
+                        comPlayersAttriService.save(playersAttribute);
+                    }
+                }
+
+            }
+            //todo 暂时是id=1为体力
+            ExcelParameterVo excelParameterVo = excelParameterService.getVo(1);
+            if (excelParameterVo.equals(null)) {
+                //return Result.of(null, false, ResultEnum.SETTING_IS_NULL);
+                throw new AuthorizeException(ResultEnum.SETTING_IS_NULL);
+            }
+            //计算一下体力值
+            ComPlayersAttriClientVo clientVo =  comPlayersAttriService.setStrengthAttriClientVo(playersAttribute,excelParameterVo.getValue().intValue());
+
+            //返回前端的体力值是读取一个配置的体力值，
+            map.put("attribute", clientVo);
+
+            //生成token
+            final String token = jwtTokenUtil.generateToken(comUsersVo.getUserId());
+            map.put("token", token);
+            map.put("userInfo", CopyUtil.copy(comUsersVo, ComUsersClientVo.class));
+
+            return Result.of(map);
+        } catch (HttpClientErrorException e) {
+            log.error(e.toString());
+            //返回 402 错误
+            map.put("active", active);
+            map.put("response", e.toString());
+            return Result.of(map, false, ResultEnum.USER_VERIFICATION_ERROR.getMessage(), ResultEnum.USER_VERIFICATION_ERROR.getCode());
+        }
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("getUserInfo")
+    @Decrypt
+    @Encrypt
+    public Result<Map> getUserInfo(@RequestParam(value = "userId") String userId) {
+        Map map = new HashMap();
+        ComUsersVo comUsersVo = comUsersService.findByUserId(userId);
+        if (comUsersVo == null) {
+            return Result.of(null, false, ResultEnum.USER_DOES_NOT_EXIST.getMessage(), ResultEnum.USER_DOES_NOT_EXIST.getCode());
+        }
+        map.put("gold", comUsersVo.getGold());
+        map.put("address", comUsersVo.getAddress());
+        return Result.of(map);
+    }
+
+}

src/main/java/com/td/Dawa/game/comusers/pojo/ComUsers.java

@@ -0,0 +1,48 @@
+package com.td.Dawa.game.comusers.pojo;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "com_users")
+@Data
+public class ComUsers implements Serializable {
+    @Id
+    private String userId;//用户id
+
+    private Integer gold;//游戏本身金币
+
+    private Integer diamond;//游戏本身钻石
+
+    private Integer cnt;//
+
+    private Integer snb;//
+
+    private Double snbPart;//神农呗小数部分
+
+    private String name;//登录名字
+
+    private String realName;//真实名字
+
+    private String email;//邮件地址
+
+    private String telephone;//电话号码
+
+    private String birthday;//生日
+
+    private Integer sex;//性别
+
+    private String address;//记录一个用户钱包地址
+
+    private Integer limitLogin;//是否限制登录 0：否，1：是
+
+    private Integer limitTran;//是否限制交易 0：否，1：是
+
+    private Date lastLogin;//最后登录时间
+
+    private Date createTime;//创建时间
+
+    private Date updateTime;//更新时间
+}

src/main/java/com/td/Dawa/game/comusers/repository/ComUsersRepository.java

@@ -0,0 +1,18 @@
+package com.td.Dawa.game.comusers.repository;
+
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comusers.pojo.ComUsers;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface ComUsersRepository extends CommonRepository<ComUsers, String> {
+    Optional<ComUsers> findByUserId(String userId);
+
+    Optional<ComUsers> findByAddress(String address);
+
+    @Query(value = "SELECT COUNT(*) FROM com_users WHERE TO_DAYS(DATE_FORMAT(create_time,'%y-%m-%d')) = TO_DAYS(NOW())",nativeQuery = true)
+    Long newToday();
+}

src/main/java/com/td/Dawa/game/comusers/service/ComUsersService.java

@@ -0,0 +1,36 @@
+package com.td.Dawa.game.comusers.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comusers.pojo.ComUsers;
+import com.td.Dawa.game.comusers.vo.ComUsersVo;
+
+public interface ComUsersService extends CommonService<ComUsersVo, ComUsers, String> {
+
+    /**
+     * 获取游戏用户信息
+     * @param userId
+     * @return
+     */
+    ComUsersVo findByUserId(String userId);
+
+
+    ComUsersVo findByAddress(String address);
+
+
+    ComUsersVo tranSNBByUserId(Double tranSnb,String userId);
+
+    /**
+     * 全部注册数量
+     * @return
+     */
+    Long findAllCount();
+    /**
+     * 今日新增
+     * @return
+     */
+    Long newToday();
+
+    void consumesGoldFromGetRole(String userId);
+
+    ComUsersVo addGold(String userId,Integer gold);
+}

src/main/java/com/td/Dawa/game/comusers/service/ComUsersServiceImpl.java

@@ -0,0 +1,101 @@
+package com.td.Dawa.game.comusers.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.comusers.pojo.ComUsers;
+import com.td.Dawa.game.comusers.vo.ComUsersVo;
+import com.td.Dawa.game.comusers.repository.ComUsersRepository;
+import com.td.Dawa.game.excelparameter.service.ExcelParameterService;
+import com.td.Dawa.game.excelparameter.vo.ExcelParameterVo;
+import com.td.Dawa.util.CopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.util.Optional;
+
+@Service
+@Transactional
+public class ComUsersServiceImpl extends CommonServiceImpl<ComUsersVo, ComUsers, String> implements ComUsersService{
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ComUsersRepository comUsersRepository;
+
+    @Autowired
+    private ExcelParameterService excelParameterService;
+
+    @Override
+    public ComUsersVo findByUserId(String userId) {
+        Optional<ComUsers>  comUsers =  comUsersRepository.findById(userId);
+        if(comUsers.orElse(null) == null){
+            return null;
+        }else{
+            return CopyUtil.copy(comUsers.get(), ComUsersVo.class);
+        }
+    }
+
+
+    @Override
+    public ComUsersVo findByAddress(String address) {
+        Optional<ComUsers>  comUsers =  comUsersRepository.findByAddress(address);
+        if(comUsers.orElse(null) == null){
+            return null;
+        }else{
+            return CopyUtil.copy(comUsers.get(), ComUsersVo.class);
+        }
+    }
+
+    /**
+     * 统一交易double snb 操作
+     * @param tranSnb
+     * @param userId
+     * @return
+     */
+    @Override
+    public ComUsersVo tranSNBByUserId(Double tranSnb, String userId) {
+
+        return null;
+    }
+
+    @Override
+    public Long findAllCount() {
+        return comUsersRepository.count();
+    }
+
+    @Override
+    public Long newToday() {
+        return comUsersRepository.newToday();
+    }
+
+
+    @Override
+    public void consumesGoldFromGetRole(String userId) {
+        ExcelParameterVo characterConsumesGold = excelParameterService.getVo(3); //召唤角色时候消耗的金币
+        if (characterConsumesGold == null) {
+            throw new AuthorizeException(ResultEnum.SETTING_IS_NULL);
+        }
+        ComUsersVo attriVo = super.getVo(userId);
+        //todo 改成double
+        Integer _gold = attriVo.getGold() - characterConsumesGold.getValue().intValue();
+        if( _gold <0){
+            //XX不足，无法召唤
+            throw new AuthorizeException(ResultEnum.GOLD_NOT_GET_ROLE);
+        }
+        //记录当前金币
+        attriVo.setGold(_gold);
+        super.save(attriVo);
+    }
+
+
+    @Override
+    public ComUsersVo addGold(String userId,Integer gold) {
+        ComUsersVo attriVo = super.getVo(userId);
+        //记录当前金币
+        attriVo.setGold(attriVo.getGold() + gold);
+        return super.save(attriVo).getData();
+    }
+}

src/main/java/com/td/Dawa/game/comusers/vo/ComUsersClientVo.java

@@ -0,0 +1,27 @@
+package com.td.Dawa.game.comusers.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ComUsersClientVo implements Serializable {
+
+    private Integer gold;//游戏本身金币
+
+    private String name;//登录名字
+
+    private String realName;//真实名字
+
+    private String email;//邮件地址
+
+    private String telephone;//电话号码
+
+    private String birthday;//生日
+
+    private Integer sex;//性别
+
+    private String address;//记录一个用户钱包地址
+
+    private Integer limitTran;//是否限制交易 0：否，1：是
+}

src/main/java/com/td/Dawa/game/comusers/vo/ComUsersLoginVo.java

@@ -0,0 +1,20 @@
+package com.td.Dawa.game.comusers.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ComUsersLoginVo implements Serializable {
+
+    private String username;
+
+    private String password;
+
+    private String captcha;
+
+    @JsonProperty("remember-me")
+    private String rememberMe;
+
+}

src/main/java/com/td/Dawa/game/comusers/vo/ComUsersSimpleVo.java

@@ -0,0 +1,35 @@
+package com.td.Dawa.game.comusers.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ComUsersSimpleVo implements Serializable {
+
+    private Integer gold;//游戏本身金币
+
+    private Integer diamond;//游戏本身钻石
+
+    private Integer cnt;//
+
+    private Integer snb;//
+
+    private Double snbPart;//神农呗小数部分
+
+    private String name;//登录名字
+
+    private String realName;//真实名字
+
+    private String email;//邮件地址
+
+    private String telephone;//电话号码
+
+    private String birthday;//生日
+
+    private Integer sex;//性别
+
+    private String address;//记录一个用户钱包地址
+
+    private Integer limitTran;//是否限制交易 0：否，1：是
+}

src/main/java/com/td/Dawa/game/comusers/vo/ComUsersVo.java

@@ -0,0 +1,50 @@
+package com.td.Dawa.game.comusers.vo;
+
+import com.td.Dawa.common.pojo.PageCondition;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComUsersVo extends PageCondition implements Serializable {
+
+    private String userId;//用户id
+
+    private Integer gold;//游戏本身金币
+
+    private Integer diamond;//游戏本身钻石
+
+    private Integer cnt;//
+
+    private Integer snb;//
+
+    private Double snbPart;//神农呗小数部分
+
+    private String name;//登录名字
+
+    private String realName;//真实名字
+
+    private String email;//邮件地址
+
+    private String telephone;//电话号码
+
+    private String birthday;//生日
+
+    private Integer sex;//性别
+
+    private String wallet;//记录一个用户钱包地址
+
+    private String address;//记录一个用户钱包地址
+
+    private Integer limitLogin;//是否限制登录 0：否，1：是
+
+    private Integer limitTran;//是否限制交易 0：否，1：是
+
+    private Date lastLogin;//最后登录时间
+
+    private Date createTime;//创建时间
+
+    private Date updateTime;//更新时间
+
+}

src/main/java/com/td/Dawa/game/excelcharacterattri/controller/ExcelCharacterAttriController.java

@@ -0,0 +1,15 @@
+package com.td.Dawa.game.excelcharacterattri.controller;
+
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+import com.td.Dawa.game.excelcharacterattri.service.ExcelCharacterAttriService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/game/excelCharacterAttri/")
+public class ExcelCharacterAttriController extends CommonController<ExcelCharacterAttriVo, ExcelCharacterAttri, Integer> {
+    @Autowired
+    private ExcelCharacterAttriService excelCharacterAttriService;
+}

src/main/java/com/td/Dawa/game/excelcharacterattri/pojo/ExcelCharacterAttri.java

@@ -0,0 +1,30 @@
+package com.td.Dawa.game.excelcharacterattri.pojo;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "excel_character_attri")
+@Data
+public class ExcelCharacterAttri implements Serializable {
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    private Integer id;//
+    private Integer roleType;//角色种类
+    private Integer startPowerLimitLower;//初始力量下限
+    private Integer startPowerLimitUpper;//初始力量上限
+    private Integer startWisdomLimitLower;//初始智慧下限
+    private Integer startWisdomLimitUpper;//初始智慧上限
+    private Integer startSkillLimitLower;//初始技巧下限
+    private Integer startSkillLimitUpper;//初始技巧上限
+    private Integer randomAttr;//属性随机值
+    private String professional;//职业
+    private String action;//携带动作
+    private String interactive;//互动事件
+    private String note;//备注
+    private Date createTime;//
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/excelcharacterattri/repository/ExcelCharacterAttriRepository.java

@@ -0,0 +1,13 @@
+package com.td.Dawa.game.excelcharacterattri.repository;
+
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface ExcelCharacterAttriRepository extends CommonRepository<ExcelCharacterAttri, Integer> {
+
+    Optional<ExcelCharacterAttri> findByRoleType(Integer roleType);
+}

src/main/java/com/td/Dawa/game/excelcharacterattri/service/ExcelCharacterAttriService.java

@@ -0,0 +1,12 @@
+package com.td.Dawa.game.excelcharacterattri.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+
+public interface ExcelCharacterAttriService extends CommonService<ExcelCharacterAttriVo, ExcelCharacterAttri, Integer> {
+
+    ExcelCharacterAttri findByRoleType(Integer roleType);
+
+
+}

src/main/java/com/td/Dawa/game/excelcharacterattri/service/ExcelCharacterAttriServiceImpl.java

@@ -0,0 +1,34 @@
+package com.td.Dawa.game.excelcharacterattri.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+import com.td.Dawa.game.excelcharacterattri.repository.ExcelCharacterAttriRepository;
+import com.td.Dawa.game.excelcharactercreate.service.ExcelCharacterCreateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+@Service
+@Transactional
+public class ExcelCharacterAttriServiceImpl extends CommonServiceImpl<ExcelCharacterAttriVo, ExcelCharacterAttri, Integer> implements ExcelCharacterAttriService{
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ExcelCharacterAttriRepository excelCharacterAttriRepository;
+
+    @Autowired
+    private ExcelCharacterCreateService excelCharacterCreateService;
+
+    @Override
+    public ExcelCharacterAttri findByRoleType(Integer roleType) {
+        return excelCharacterAttriRepository.findByRoleType(roleType).orElse(null);
+    }
+
+
+
+
+}

src/main/java/com/td/Dawa/game/excelcharacterattri/vo/ExcelCharacterAttriSimpleVo.java

@@ -0,0 +1,28 @@
+package com.td.Dawa.game.excelcharacterattri.vo;
+
+import com.td.Dawa.common.pojo.PageCondition;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ExcelCharacterAttriSimpleVo extends PageCondition implements Serializable {
+
+    private Integer id;//
+    private Integer roleType;//角色种类
+    private Integer startPowerLimitLower;//初始力量下限
+    private Integer startPowerLimitUpper;//初始力量上限
+    private Integer startWisdomLimitLower;//初始智慧下限
+    private Integer startWisdomLimitUpper;//初始智慧上限
+    private Integer startSkillLimitLower;//初始技巧下限
+    private Integer startSkillLimitUpper;//初始技巧上限
+    private Integer randomAttr;//属性随机值
+    private String professional;//职业
+    private String action;//携带动作
+    private String interactive;//互动事件
+    private String note;//备注
+    private Date createTime;//
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/excelcharacterattri/vo/ExcelCharacterAttriVo.java

@@ -0,0 +1,27 @@
+package com.td.Dawa.game.excelcharacterattri.vo;
+
+import com.td.Dawa.common.pojo.PageCondition;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ExcelCharacterAttriVo extends PageCondition implements Serializable {
+
+    private Integer id;//
+    private Integer roleType;//角色种类
+    private Integer startPowerLimitLower;//初始力量下限
+    private Integer startPowerLimitUpper;//初始力量上限
+    private Integer startWisdomLimitLower;//初始智慧下限
+    private Integer startWisdomLimitUpper;//初始智慧上限
+    private Integer startSkillLimitLower;//初始技巧下限
+    private Integer startSkillLimitUpper;//初始技巧上限
+    private Integer randomAttr;//属性随机值
+    private String professional;//职业
+    private String action;//携带动作
+    private String interactive;//互动事件
+    private String note;//备注
+    private Date createTime;//
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/excelcharactercolor/controller/ExcelCharacterColorController.java

@@ -0,0 +1,15 @@
+package com.td.Dawa.game.excelcharactercolor.controller;
+
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.game.excelcharactercolor.pojo.ExcelCharacterColor;
+import com.td.Dawa.game.excelcharactercolor.vo.ExcelCharacterColorVo;
+import com.td.Dawa.game.excelcharactercolor.service.ExcelCharacterColorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/game/excelCharacterColor/")
+public class ExcelCharacterColorController extends CommonController<ExcelCharacterColorVo, ExcelCharacterColor, Integer> {
+    @Autowired
+    private ExcelCharacterColorService excelCharacterColorService;
+}

src/main/java/com/td/Dawa/game/excelcharactercolor/pojo/ExcelCharacterColor.java

@@ -0,0 +1,32 @@
+package com.td.Dawa.game.excelcharactercolor.pojo;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "excel_character_color")
+@Data
+public class ExcelCharacterColor implements Serializable {
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    private Integer id;//
+
+    private Double r;//
+
+    private Double g;//
+
+    private Double b;//
+
+    private Integer a;//alpha
+
+    private Integer type;//颜色类型（0，旧颜色，1花纹、耳朵、尾巴、嘴巴、轮廓主色颜色预设，2内耳预制色，3眉毛预制色，4眼睛颜色预制色）
+
+    private String note;//备注
+
+    private Date createTime;//
+
+    private Date updateTime;//
+
+}

src/main/java/com/td/Dawa/game/excelcharactercolor/repository/ExcelCharacterColorRepository.java

@@ -0,0 +1,9 @@
+package com.td.Dawa.game.excelcharactercolor.repository;
+
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.excelcharactercolor.pojo.ExcelCharacterColor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExcelCharacterColorRepository extends CommonRepository<ExcelCharacterColor, Integer> {
+}

src/main/java/com/td/Dawa/game/excelcharactercolor/service/ExcelCharacterColorService.java

@@ -0,0 +1,8 @@
+package com.td.Dawa.game.excelcharactercolor.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.excelcharactercolor.pojo.ExcelCharacterColor;
+import com.td.Dawa.game.excelcharactercolor.vo.ExcelCharacterColorVo;
+
+public interface ExcelCharacterColorService extends CommonService<ExcelCharacterColorVo, ExcelCharacterColor, Integer> {
+}

src/main/java/com/td/Dawa/game/excelcharactercolor/service/ExcelCharacterColorServiceImpl.java

@@ -0,0 +1,21 @@
+package com.td.Dawa.game.excelcharactercolor.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.excelcharactercolor.pojo.ExcelCharacterColor;
+import com.td.Dawa.game.excelcharactercolor.vo.ExcelCharacterColorVo;
+import com.td.Dawa.game.excelcharactercolor.repository.ExcelCharacterColorRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+@Service
+@Transactional
+public class ExcelCharacterColorServiceImpl extends CommonServiceImpl<ExcelCharacterColorVo, ExcelCharacterColor, Integer> implements ExcelCharacterColorService{
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ExcelCharacterColorRepository excelCharacterColorRepository;
+}