Merge remote-tracking branch 'origin/dev0.0.1' into dev0.0.1

game-module/game-manage/pom.xml

@@ -29,4 +29,34 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.14</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

game-module/game-manage/src/main/java/com/zanxiang/manage/ManageApplication.java

@@ -7,7 +7,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
-@CrossOrigin
 @Slf4j
 @EnableDiscoveryClient
 @SpringBootApplication

game-module/game-manage/src/main/java/com/zanxiang/manage/config/CORSConfig.java

@@ -1,31 +0,0 @@
-package com.zanxiang.manage.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-16
- * @description : 跨域配置
- */
-@Configuration
-public class CORSConfig {
-
-    private CorsConfiguration buildConfig() {
-        CorsConfiguration corsConfiguration = new CorsConfiguration();
-        corsConfiguration.addAllowedOrigin("*");
-        corsConfiguration.addAllowedHeader("*");
-        corsConfiguration.addAllowedMethod("*");
-        return corsConfiguration;
-    }
-
-    @Bean
-    public CorsFilter corsFilter() {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", buildConfig());
-        return new CorsFilter(source);
-    }
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/filter/CORSFilter.java

@@ -1,32 +0,0 @@
-package com.zanxiang.manage.filter;
-
-import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-16
- * @description : 过滤器
- */
-@WebFilter(filterName = "CorsFilter ")
-@Configuration
-public class CORSFilter implements Filter {
-
-    @Override
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
-        HttpServletResponse response = (HttpServletResponse) res;
-        HttpServletRequest request = (HttpServletRequest) req;
-        response.setHeader("Access-Control-Allow-Origin", request.getHeader("origin"));
-        response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Methods", "POST, GET, PATCH, DELETE, PUT, OPTION");
-        response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, cookie, token, Authorization");
-        chain.doFilter(req, res);
-    }
-
-}

game-module/game-manage/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: DEV_game
+        namespace: LOCAL_game
         # 服务注册地址
         server-addr: 118.178.187.109:8848
       config:

game-module/game-sdk/pom.xml

@@ -63,4 +63,34 @@
             <version>3.0.2</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.14</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

game-module/game-sdk/src/main/java/com/zanxiang/sdk/SDKApplication.java

@@ -5,9 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.bind.annotation.CrossOrigin;
 
-@CrossOrigin
 @Slf4j
 @EnableDiscoveryClient
 @SpringBootApplication

game-module/game-sdk/src/main/java/com/zanxiang/sdk/config/CORSConfig.java

@@ -1,31 +0,0 @@
-package com.zanxiang.sdk.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-16
- * @description : 跨域配置
- */
-@Configuration
-public class CORSConfig {
-
-    private CorsConfiguration buildConfig() {
-        CorsConfiguration corsConfiguration = new CorsConfiguration();
-        corsConfiguration.addAllowedOrigin("*");
-        corsConfiguration.addAllowedHeader("*");
-        corsConfiguration.addAllowedMethod("*");
-        return corsConfiguration;
-    }
-
-    @Bean
-    public CorsFilter corsFilter() {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", buildConfig());
-        return new CorsFilter(source);
-    }
-}

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/PayController.java

@@ -34,7 +34,6 @@ import java.util.Objects;
  * @date 2022/6/8 14:49
  */
 @Api(tags = "支付公共入口")
-@CrossOrigin
 @RestController
 @RequestMapping(value = "/pay")
 @Slf4j

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/RegisterLoginController.java

@@ -21,7 +21,6 @@ import javax.servlet.http.HttpServletResponse;
  * @description : 用户注册登录
  */
 @Api(tags = "注册登录接口")
-@CrossOrigin
 @RestController
 @RequestMapping(value = "/api/user")
 public class RegisterLoginController {

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/SmsController.java

@@ -12,7 +12,10 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author : lingfeng
@@ -20,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
  * @description : 短信服务接口
  */
 @Api(tags = "短信服务接口")
-@CrossOrigin
 @RestController
 @RequestMapping(value = "/api/sms")
 public class SmsController {

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/UserController.java

@@ -12,7 +12,10 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author : lingfeng
@@ -20,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
  * @description : 用户接口
  */
 @Api(tags = "用户接口")
-@CrossOrigin
 @RestController
 @RequestMapping(value = "/api/user")
 public class UserController {

game-module/game-sdk/src/main/java/com/zanxiang/sdk/filter/CORSFilter.java

@@ -1,32 +0,0 @@
-package com.zanxiang.sdk.filter;
-
-import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-16
- * @description : 过滤器
- */
-@WebFilter(filterName = "CorsFilter ")
-@Configuration
-public class CORSFilter implements Filter {
-
-    @Override
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
-        HttpServletResponse response = (HttpServletResponse) res;
-        HttpServletRequest request = (HttpServletRequest) req;
-        response.setHeader("Access-Control-Allow-Origin", request.getHeader("origin"));
-        response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Methods", "POST, GET, PATCH, DELETE, PUT, OPTION");
-        response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, cookie, token");
-        chain.doFilter(req, res);
-    }
-
-}

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/GameUserImpl.java

@@ -2,14 +2,10 @@ package com.zanxiang.sdk.service.Impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.mybatis.entity.GameUser;
-import com.zanxiang.mybatis.entity.GameUserRole;
 import com.zanxiang.mybatis.mapper.GameUserMapper;
-import com.zanxiang.mybatis.mapper.GameUserRoleMapper;
-import com.zanxiang.sdk.service.GameUserRoleService;
 import com.zanxiang.sdk.service.GameUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author : xufeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/GameUserRoleImpl.java

@@ -1,35 +1,11 @@
 package com.zanxiang.sdk.service.Impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.domain.ResultVo;
-import com.zanxiang.common.enums.ExpireTimeEnum;
-import com.zanxiang.common.enums.HttpStatusEnum;
-import com.zanxiang.common.enums.SmsTypeEnum;
-import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.mybatis.entity.GameUserRole;
-import com.zanxiang.mybatis.entity.LogPayCp;
 import com.zanxiang.mybatis.mapper.GameUserRoleMapper;
-import com.zanxiang.mybatis.mapper.LogPayCpMapper;
-import com.zanxiang.sdk.common.constant.RedisKeyConstant;
-import com.zanxiang.sdk.common.util.RedisUtil;
-import com.zanxiang.sdk.domain.dto.UserDTO;
-import com.zanxiang.sdk.domain.params.SmsCheckParam;
-import com.zanxiang.sdk.domain.params.SmsSendParam;
-import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.service.GameUserRoleService;
-import com.zanxiang.sdk.service.SmsService;
-import com.zanxiang.sdk.service.UserService;
-import com.zanxiang.sdk.service.UserTokenService;
-import com.zanxiangnet.module.sms.pojo.SendResult;
-import com.zanxiangnet.module.sms.service.impl.AliSmsService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Objects;
-import java.util.Random;
 
 /**
  * @author : xufeng

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserExtServiceImpl.java

@@ -6,7 +6,6 @@ import com.zanxiang.mybatis.mapper.UserExtMapper;
 import com.zanxiang.sdk.service.UserExtService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author : xufeng

game-module/game-sdk/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: DEV_game
+        namespace: LOCAL_game
         # 服务注册地址
         server-addr: 118.178.187.109:8848
       config: