修正错误

README.md

@@ -106,7 +106,7 @@ sh ./docker-maven-build.sh
 
 ```
 # mysql的host地址
-MYSQLDB_HOST=192.168.31.57
+MYSQLDB_HOST=127.0.0.1
 
 # mysql的端口号
 MYSQLDB_PORT=3306
@@ -139,7 +139,7 @@ GATEWAY_PORT=8091
 
 
 # mysql的host地址
-MYSQLDB_HOST=192.168.31.57
+MYSQLDB_HOST=127.0.0.1
 
 # mysql的端口号
 MYSQLDB_PORT=3306
@@ -158,7 +158,7 @@ MYSQLDB_PASSWORD=123456
 
 - 步骤4：启动服务
 
-> windows下，需按照如下顺序双击如下脚本启动对应的服务
+> windows下，需按照如下顺序双击脚本启动对应的服务
 
 启动manager服务：bin/manager_startup.cmd
 
@@ -166,7 +166,7 @@ MYSQLDB_PASSWORD=123456
 
 启动gateway服务：bin/gateway_startup.cmd
 
-> linux下，需按照如下顺序双击如下脚本启动对应的服务
+> linux下，需按照如下顺序双击脚本启动对应的服务
 
 启动manager服务：sh bin/sqlrestctl.sh start manager
 
@@ -180,6 +180,8 @@ MYSQLDB_PASSWORD=123456
 
 ![001.png](docs/images/001.PNG)
 
+![000.png](docs/images/000.PNG)
+
 ![002.png](docs/images/002.PNG)
 
 ![003.png](docs/images/003.PNG)

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/AccessToken.java

@@ -24,6 +24,9 @@ public class AccessToken implements Serializable {
   @ApiModelProperty("token字符串")
   private String accessToken;
 
+  @ApiModelProperty("创建时的时间戳")
+  private Long createTimestamp;
+
   @ApiModelProperty("有效时间(单位秒)")
   private Long expireSeconds;
 }

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/ProductTypeEnum.java

@@ -137,7 +137,7 @@ public enum ProductTypeEnum {
           .defaultPort(5236)
           .testSql("SELECT 'Hello' from DUAL")
           .urlPrefix("jdbc:dm://")
-          .tplUrls(new String[]{"jdbc:dm://{host}[:{port}]/[{database}][\\?{params}]"})
+          .tplUrls(new String[]{"jdbc:dm://{host}:{port}[/{database}][\\\\?{params}]"})
           .urlSample("jdbc:dm://172.17.2.10:5236")
           .sqlSchemaList("SHOW SCHEMAS")
           .adapter(database -> Pair.of(null, database))

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/SwaggerEntity.java

@@ -588,7 +588,7 @@ public class SwaggerEntity {
 
     private String in = "header";
 
-    private String description ="用户登录后获取的Token（头部需加上bearer ）";
+    private String description ="用户登录后获取的Token（头部需加上Bearer ）";
 
     public String getType() {
       return type;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/SystemUserService.java

@@ -36,7 +36,7 @@ public class SystemUserService {
     String token = TokenUtils.generateValue();
     CacheUtils.put(token, user);
     AccessToken accessTokenWrapper = new AccessToken(user.getRealName(), user.getUsername(), token,
-        CacheUtils.CACHE_DURATION_SECONDS);
+        System.currentTimeMillis() / 1000, CacheUtils.CACHE_DURATION_SECONDS);
     return accessTokenWrapper;
   }
 

sqlrest-core/src/main/java/com/gitee/sqlrest/core/servlet/ClientTokenService.java

@@ -39,6 +39,7 @@ public class ClientTokenService {
               .realName(appClient.getName())
               .appKey(appClient.getAppKey())
               .accessToken(appClient.getAccessToken())
+              .createTimestamp(appClient.getCreateTime().getTime() / 1000)
               .expireSeconds(appClient.getExpireDuration().getValue())
               .build();
 
@@ -52,7 +53,7 @@ public class ClientTokenService {
           }
 
           Map tokenClientMap = hazelcastCacheFactory.getCacheMap(Constants.CACHE_KEY_TOKEN_CLIENT);
-          tokenClientMap.put(appClient.getAccessToken(), Pair.of(clientToken, now));
+          tokenClientMap.put(appClient.getAccessToken(), clientToken);
         }
       }
       log.info("Finish load client app token from persistence.");
@@ -72,6 +73,7 @@ public class ClientTokenService {
         .realName(appClient.getName())
         .appKey(clientId)
         .accessToken(token)
+        .createTimestamp(System.currentTimeMillis()/1000)
         .expireSeconds(Constants.CLIENT_TOKEN_DURATION_SECONDS)
         .build();
     if (DurationTimeEnum.TIME_VALUE.equals(appClient.getExpireDuration())) {
@@ -113,7 +115,7 @@ public class ClientTokenService {
         tokenClientMap.remove(tokenStr);
       }
       return clientToken.getAppKey();
-    } else if ((System.currentTimeMillis() / 1000) > expireTime) {
+    } else if ((System.currentTimeMillis() / 1000) - clientToken.getCreateTimestamp() > expireTime) {
       log.error("token [{}] expired, clientId: {}", tokenStr, clientToken.getAppKey());
       return null;
     }

sqlrest-dist/src/main/assembly/bin/executor_startup.cmd

@@ -26,8 +26,10 @@ set APP_DRIVERS_PATH=%APP_HOME%\drivers
 ::读取配置文件参数
 for /f "delims=" %%i in ('type "%APP_HOME%\conf\config.ini"^| find /i "="') do set %%i
 
+::设置DEBUG端口
+set DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=18092
 ::java虚拟机启动参数
-set JAVA_OPTS=-server -Xms4096m -Xmx4096m -Xmn2048m -XX:+DisableExplicitGC -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Doracle.jdbc.J2EE13Compliant=true
+set JAVA_OPTS=-server -Xms4096m -Xmx4096m -Xmn2048m -XX:+DisableExplicitGC %DEBUG_OPTS% -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Doracle.jdbc.J2EE13Compliant=true
 
 ::打印环境信息
 echo System Information:

sqlrest-dist/src/main/assembly/bin/gateway_startup.cmd

@@ -26,8 +26,10 @@ set APP_CONF_PATH=%APP_HOME%\conf\gateway
 ::读取配置文件参数
 for /f "delims=" %%i in ('type "%APP_HOME%\conf\config.ini"^| find /i "="') do set %%i
 
+::设置DEBUG端口
+set DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=18091
 ::java虚拟机启动参数
-set JAVA_OPTS=-server -Xms4096m -Xmx4096m -Xmn2048m -XX:+DisableExplicitGC -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Doracle.jdbc.J2EE13Compliant=true
+set JAVA_OPTS=-server -Xms4096m -Xmx4096m -Xmn2048m -XX:+DisableExplicitGC %DEBUG_OPTS% -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Doracle.jdbc.J2EE13Compliant=true
 
 ::打印环境信息
 echo System Information:

sqlrest-dist/src/main/assembly/bin/manager_startup.cmd

@@ -26,8 +26,10 @@ set APP_DRIVERS_PATH=%APP_HOME%\drivers
 ::读取配置文件参数
 for /f "delims=" %%i in ('type "%APP_HOME%\conf\config.ini"^| find /i "="') do set %%i
 
+::设置DEBUG端口
+set DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=18090
 ::java虚拟机启动参数
-set JAVA_OPTS=-server -Xms4096m -Xmx4096m -Xmn2048m -XX:+DisableExplicitGC -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Doracle.jdbc.J2EE13Compliant=true
+set JAVA_OPTS=-server -Xms4096m -Xmx4096m -Xmn2048m -XX:+DisableExplicitGC %DEBUG_OPTS% -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Doracle.jdbc.J2EE13Compliant=true
 
 ::打印环境信息
 echo System Information:

sqlrest-dist/src/main/assembly/conf/config.ini

 # manager节点的host地址
-MANAGER_HOST=localhost
+MANAGER_HOST=127.0.0.1
 
 
 # manager的端口号
@@ -13,7 +13,7 @@ GATEWAY_PORT=8091
 
 
 # mysql的host地址
-MYSQLDB_HOST=192.168.31.57
+MYSQLDB_HOST=127.0.0.1
 
 # mysql的端口号
 MYSQLDB_PORT=3306

sqlrest-executor/src/main/resources/application.yaml

@@ -7,7 +7,7 @@ spring:
     allow-bean-definition-overriding: false
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${MYSQLDB_HOST}:${MYSQLDB_PORT}/${MYSQLDB_NAME}?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000
+    url: jdbc:mysql://${MYSQLDB_HOST}:${MYSQLDB_PORT}/${MYSQLDB_NAME}?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000&serverTimezone=Asia/Shanghai
     username: ${MYSQLDB_USERNAME}
     password: ${MYSQLDB_PASSWORD}
     validation-query: SELECT 1

sqlrest-gateway/src/main/resources/application.yaml

@@ -7,7 +7,7 @@ spring:
     web-application-type: reactive
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${MYSQLDB_HOST}:${MYSQLDB_PORT}/${MYSQLDB_NAME}?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000
+    url: jdbc:mysql://${MYSQLDB_HOST}:${MYSQLDB_PORT}/${MYSQLDB_NAME}?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000&serverTimezone=Asia/Shanghai
     username: ${MYSQLDB_USERNAME}
     password: ${MYSQLDB_PASSWORD}
     validation-query: SELECT 1

sqlrest-manager-ui/README.md

@@ -4,8 +4,6 @@
 
 基于Vue.js 2.0编写的sqlrest管理web端。
 
-## 二、构建
-
 ## 二、环境
 
  **node** : >= v14.15.4
@@ -36,7 +34,7 @@ npm -v
 
 可参考[博文教程](https://zhuanlan.zhihu.com/p/572795586)
 
-## 二、构建
+## 三、构建
 
 ``` bash
 # install dependencies
@@ -52,6 +50,6 @@ npm run build
 npm run build --report
 ```
 
-## 三、部署
+## 四、部署
 
 执行`npm run build`命令后，sqlrest-ui\dist目录生成的所有文件拷贝（或替换）sqlrest-manager\src\main\resources目录下。然后直接使用mvn对整个sqlrest项目打包即可。

sqlrest-manager-ui/src/components/databaseIcon/databaseIcon.vue

@@ -35,4 +35,4 @@ export default {
   font-weight: 500;
   margin-right: 5px;
 }
-</style>
+</style>
\ No newline at end of file

sqlrest-manager/src/main/resources/application.yaml

@@ -8,7 +8,7 @@ spring:
     static-path-pattern: /**
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${MYSQLDB_HOST}:${MYSQLDB_PORT}/${MYSQLDB_NAME}?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000
+    url: jdbc:mysql://${MYSQLDB_HOST}:${MYSQLDB_PORT}/${MYSQLDB_NAME}?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000&serverTimezone=Asia/Shanghai
     username: ${MYSQLDB_USERNAME}
     password: ${MYSQLDB_PASSWORD}
     validation-query: SELECT 1