优化代码

pom.xml

@@ -14,9 +14,9 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
-    <name>sky-oauth</name>
+    <name>sky-activate</name>
     <packaging>war</packaging>
-    <description>skyversation oauth server</description>
+    <description>skyversation activate server</description>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -37,8 +37,6 @@
         <!--            <version>3.1.0</version>-->
         <!--        </dependency>-->
 
-
-
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>

src/main/java/com/sky/activate/SkyMetadataApplication.java → src/main/java/com/sky/activate/SkyActivateApplication.java

@@ -6,13 +6,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import springfox.documentation.oas.annotations.EnableOpenApi;
 
-@EnableOpenApi  //swagger3.0
 @SpringBootApplication
 @MapperScan("com.sky.activate.mapper")
-public class SkyMetadataApplication extends SpringBootServletInitializer {
+public class SkyActivateApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
-        SpringApplication.run(SkyMetadataApplication.class, args);
+        SpringApplication.run(SkyActivateApplication.class, args);
     }
 
 }

src/main/java/com/sky/activate/controller/VerifysController.java

@@ -2,18 +2,14 @@ package com.sky.activate.controller;
 
 import com.sky.activate.entity.User;
 import com.sky.activate.service.VerifysService;
-import com.sky.activate.tool.Constant;
-import com.sky.activate.tool.MessageManage;
-import com.sky.activate.tool.Tools;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 
 @RestController
 @RequestMapping("/verify")
@@ -24,13 +20,12 @@ public class VerifysController {
     private VerifysService verifysService;
 
 
-    @PostMapping("/testStr")
+    @RequestMapping("/testStr")
     public  String testStr(){
         return verifysService.testStr();
     }
 
 
-    @ApiOperation("添加用户")
     @PostMapping("/register")
     public String register(User user){
 //        if(user == null || StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())){

src/main/java/com/sky/activate/tool/Constant.java

@@ -1,112 +0,0 @@
-package com.sky.activate.tool;
-
-public class Constant {
-
-    /** 模拟聚划算高并发解决方案 **/
-    public final static String JHS_KEY_A = "jhs_A";
-    public final static String JHS_KEY_B = "jhs_B";
-
-    /** 模拟微博排行榜 **/
-    public final static String HOT_RANK_LIST_HOUR_KEY = "hot_rank_list_hour_key";
-    public final static String HOT_RANK_LIST_DAY_KEY = "hot_rank_list_day_key";
-    public final static String HOT_RANK_LIST_WEEK_KEY = "hot_rank_list_week_key";
-    public final static String HOT_RANK_LIST_MONTH_KEY = "hot_rank_list_month_key";
-
-    /** JWT ACCESS 密钥加密 **/
-    public final static String JWT_ACCESS_PRIVATE_KEY = "SKYVERSATION-ACCESS";
-    /** JWT REFRESH 密钥加密 **/
-    public final static String JWT_REFRESH_PRIVATE_KEY = "SKYVERSATION-REFRESH";
-    /** redis保存access_token的key的头 **/
-    public final static String REDIS_USER_ACCESS_HEADER = "USER_ACCESS_TOKEN::";
-    /** redis保存refresh_token的key的头 **/
-    public final static String REDIS_USER_REFRESH_HEADER = "USER_REFRESH_TOKEN::";
-    /** redis保存用户权限信息的key的头**/
-    public final static String REDIS_USER_USERID_HEADER="USER_USERID::";
-
-    /** Role Permission 角色、权限数据刷新时间 **/
-    public final static long ROLE_PERMISSION_REFRESH_TIME = 1000 * 60;
-
-    /** 游客权限 **/
-    public final static String VISITOR_PERMISSION = "1";
-    /** 普通用户权限 **/
-    public final static String GENERAL_PERMISSION = "1,2,7,11,17,20,23";
-    /** 角色管理员权限 **/
-    public final static String ROLE_MANAGER_PERMISSION = "3,4,8,13,18,21,25";
-    /** 系统管理员权限 **/
-    public final static String SYSTEM_MANAGER_PERMISSION = "5,9,10,12,14,15,19,22";
-    /** 超级管理员权限 **/
-    public final static String SUPER_MANAGER_PERMISSION = "27";
-
-    /** 无超管权限*/
-    public final static int NO_SYSDBA_PERMISSION = 600;
-
-    /** 游客有效时间 **/
-    public final static long VISITOR_TIME = 1000 * 60 * 60 * 24 * 365;
-    /**  普通用户有效时间 **/
-    public final static long GENERAL_TIME = 1000 * 60 * 60 * 24 * 365;
-    /**  角色管理员有效时间 **/
-    public final static long ROLE_MANAGER_TIME = 1000 * 60 * 60 * 24 * 365 * 2;
-    /**  系统管理员有效时间 **/
-    public final static long SYSTEM_MANAGER_TIME = 1000 * 60 * 60 * 24 * 365 * 2;
-    /**  超级管理员有效时间 **/
-    public final static long SUPER_MANAGER_TIME = 1000 * 60 * 60 * 24 * 365 * 3;
-
-    /** access token 有效时间 **/
-    public final static long ACCESS_TOKEN_TIME = 1000 * 60 * 60 * 24;
-    /** refresh token 有效时间 **/
-    public final static long REFRESH_TOKEN_TIME = 1000 * 60 * 60 * 24 * 7;
-
-
-    /** 网络请求返回值 **/
-    public final static int SUCCESS = 200;
-    /** 参数错误 **/
-    public final static int PARAM_ERROR = -1;
-    /** 服务端错误 **/
-    public final static int SERVER_ERROR = 500;
-    /** 无权限 **/
-    public final static int NO_PERMISSION = 201;
-    /** 数据错误，无数据 **/
-    public final static int NO_DATA = 202;
-    /** 内部错误 **/
-    public final static int INTER_ERROR = 203;
-    /** 数据库错误 **/
-    public final static int DATABASE_ERROR = 204;
-    /** 数据为空 **/
-    public final static int NULL_DATA = 205;
-    /** 用户过期 **/
-    public final static int USER_FAILURE = 206;
-    /** 用户失效 **/
-    public final static int USER_ARCHIVED = 207;
-    /** 无token **/
-    public final static int NO_TOKEN = 208;
-    /** 无效token **/
-    public final static int FAILURE_TOKEN = 212;
-
-//    public final static String[] TABLE_NAME = new String[]{
-//            "http://localhost:10086/oauth/user/getUserByToken",
-//            "http://localhost:10086/oauth/record/addRecord",
-//            "http://localhost:10086/oauth/user/getUserRolePermission",
-//            "http://localhost:10086/oauth/permission/updatePermission",
-//            "http://localhost:10086/oauth/permission/addRoleAndPermission"};
-
-
-    public final static String[] METADATA_URL_NAME = new String[]{
-            "http://localhost:10086/user/getUserByToken",
-            "http://localhost:10086/record/addRecord",
-            "http://localhost:10086/user/getUserRolePermission",
-            "http://localhost:10086/permission/updatePermission",
-            "http://localhost:10086/permission/addRoleAndPermission"};
-
-
-
-
-    final static int [] sizeTable = { 9, 99, 999, 9999, 99999, 999999, 9999999, 99999999, 999999999, Integer.MAX_VALUE };
-
-    // Requires positive x
-    public final static int STRINGSIZE(int x) {
-        for (int i=0; ; i++)
-            if (x <= sizeTable[i])
-                return i+1;
-    }
-
-}

src/main/java/com/sky/activate/tool/MessageManage.java

@@ -1,110 +0,0 @@
-package com.sky.activate.tool;
-
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONException;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-
-/***
- * 接口返回消息封装管理工具
- */
-
-@Slf4j
-public class MessageManage {
-
-    private static MessageManage messageManage = new MessageManage();
-    private MessageManage(){}
-    public static MessageManage getInstance(){
-        if(messageManage == null)
-            messageManage = new MessageManage();
-        return messageManage;
-    }
-
-    public String getResultContent(int code, String content, String message){
-        JSONObject json = new JSONObject();
-        try {
-            json.put("code", code);
-            if(content == null || content.equals("")){
-                json.put("content", null);
-            } else {
-                json.put("content", content);
-            }
-            json.put("message", message);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        log.info(json.toString());
-        return json.toString();
-    }
-
-    public String getResultContent(int code, Object bean, String message){
-        JSONObject json = new JSONObject();
-        try {
-            json.put("code", code);
-            if(bean == null){
-                json.put("content", null);
-            } else {
-                json.put("content", JSON.toJSON(bean));
-            }
-            json.put("message", message);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        log.info(json.toString());
-        return json.toString();
-    }
-
-    public String getResultContent(int code, List lis, String message){
-        JSONObject json = new JSONObject();
-        try {
-            json.put("code", code);
-            json.put("message", message);
-            if(lis != null && lis.size() > 0){
-                JSONArray data = new JSONArray();
-                for(Object obj : lis){
-                    data.add(JSON.toJSON(obj));
-                }
-                json.put("content", data);
-            } else {
-                json.put("content", null);
-            }
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        log.info(json.toString());
-        return json.toString();
-    }
-    public String getResultContent(int code, List lis, String message, Long total){
-        JSONObject json = new JSONObject();
-        try {
-            json.put("code", code);
-            json.put("message", message);
-            if(total == null || total < 0){
-                json.put("total", 0);
-            } else {
-                json.put("total", total);
-            }
-            if(lis != null && lis.size() > 0){
-                JSONArray data = new JSONArray();
-                for(Object obj : lis){
-                    data.add(JSON.toJSON(obj));
-                }
-                json.put("content", data);
-            } else {
-                json.put("content", "");
-            }
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        log.info(json.toString());
-        return json.toString();
-    }
-
-
-}

src/main/resources/application.properties

@@ -1,62 +1,19 @@
 
-#\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7
-server.port=10086
-# 121.43.55.7   localhost
-# \u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u72E1\u51E4\u62F7\u951F\u65A4\u62F7121.43.55.7
-# \u4F4F\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F?193.168.195.16(\u951F\u65A4\u62F7\u53F0\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7)   193.168.195.17(web\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7)
-## \u4F4F\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u82A5\u50A8\u951F\u65A4\u62F7\u951F\u65A4\u62F7193.168.195.18(\u951F\u65A4\u62F7\u951F\u82A5\u50A8)  193.168.195.19(\u951F\u63A5\u5B58\u50A8)
-#server.servlet.encoding.force=true
-#server.servlet.encoding.charset=UTF-8
-# \u4F7F\u951F\u65A4\u62F7mysql\u951F\u65A4\u62F7\u951F\u65A4\u62F7
-#spring.datasource.url=jdbc:mysql://localhost:3306/oauth_sky?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
-#spring.datasource.username=root
-## \u4F4F\u951F\u65A4\u62F7\u951F\u65A4\u62F7mysql\u951F\u65A4\u62F7 Abcd1234,       \u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7mysql\u951F\u65A4\u62F7 123456    SKYversation0816
-#spring.datasource.password=root
-#spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-
-# \u4F7F\u951F\u65A4\u62F7sqlite\u951F\u65A4\u62F7\u951F\u65A4\u62F7
+#基本配置
+server.port=10081
+# 使用sqlite配置
 spring.datasource.driver-class-name=org.sqlite.JDBC
 spring.datasource.url=jdbc:sqlite::resource:static/test.db
 spring.datasource.username=
 spring.datasource.password=
 
-# \u951F\u65A4\u62F7\u59CB\u951F\u65A4\u62F7servlet
+# 初始化servlet
 spring.mvc.servlet.load-on-startup=1
 
-#\u4F7F\u951F\u65A4\u62F7mysql
-spring.jpa.database = mysql
-#\u951F\u89D2\u51E4\u62F7\u951F\u65A4\u62F7\u793Asql\u951F\u65A4\u62F7\u951F?
+#使用sqlite
+spring.jpa.database = sqlite
+#是否显示sql语句
 spring.jpa.show-sql=true
-#mybatis\u951F\u65A4\u62F7\u951F\u65A4\u62F7 mybatis.config-location=classpath:mybatis-config.xml // \u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u4FA5\u7877\u62F7\u4F4D\u951F\u65A4\u62F7
+#mybatis配置 mybatis.config-location=classpath:mybatis-config.xml // 配置文件位置
 mybatis.typeAliasesPackage=com.sky.activate.entity
 mybatis.mapper-locations=classpath:mapper/*.xml
-
-# redis\u951F\u65A4\u62F7\u951F\u65A4\u62F7
-# REDIS (RedisProperties)
-# Redis\u951F\u65A4\u62F7\u951F\u6377\u5321\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u9ED8\u951F\u65A4\u62F7\u4E3A0\u951F\u65A4\u62F7
-spring.redis.database=2
-# Redis\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u5740    //121.40.241.56     193.168.195.18      121.43.55.7     10.242.251.44
-spring.redis.host=${CONLLECTION_REDIS_IP:121.43.55.7}
-#spring.redis.host=121.43.55.7
-# Redis\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u63A5\u7AEF\u5321\u62F7
-spring.redis.port=${CONLLECTION_REDIS_PORT:6380}
-#spring.redis.port=6379
-# Redis\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u8BEB\uFF08\u9ED8\u951F\u65A4\u62F7\u4E3A\u951F\u79F8\uFF4F\u62F7
-spring.redis.password=${REDIS_PASSWORD:SKYversation}
-# \u951F\u65A4\u62F7\u951F\u63A5\u7B79\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u7EDE\u7678\u62F7\u9176\u951F\u8857\u7889\u62F7\u951F\u7EDE\u4E45\u4F19\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u75B2\u951F?
-spring.redis.jedis.pool.max-active=8
-# \u951F\u65A4\u62F7\u951F\u63A5\u7B79\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u5374\u951F\u7EDE\u618B\u62F7\u6D0C\u310A\u7678\u62F7\u9176\u951F\u8857\u7889\u62F7\u951F\u7EDE\u4E45\u4F19\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u75B2\u951F?
-spring.redis.jedis.pool.max-wait=-1
-# \u951F\u65A4\u62F7\u951F\u63A5\u7B79\u62F7\u951F\u53EB\u7889\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7
-spring.redis.jedis.pool.max-idle=8
-# \u951F\u65A4\u62F7\u951F\u63A5\u7B79\u62F7\u951F\u53EB\u7889\u62F7\u951F\u65A4\u62F7\u5C0F\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7\u951F\u65A4\u62F7
-spring.redis.jedis.pool.min-idle=0
-# \u951F\u65A4\u62F7\u951F\u63A5\u7B79\u62F7\u65F6\u65F6\u951F\u6212\uFF08\u951F\u65A4\u62F7\u951F\u8BEB\uFF09
-spring.redis.timeout=5000
-
-# \u951F\u65A4\u62F7\u951F\u65A4\u62F7swagger
-springfox.documentation.swagger-ui.enabled=true
-
-#DR\uFFFD\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD
-overdue.date = ${OAUTH_OVERDUE_DATE:1711938935000}
-