升级springboot版本至2.6.16

升级springcloud alibaba版本至2021.0.5.0
升级springcloud版本至2021.0.5
移除ribbon,使用spring cloud loadbalancer

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/AdminUserInfo.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -17,12 +14,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "admin_user_info")
+@Table(name = "admin_user_info",pk = @Pk(name = "id"))
 @Data
 public class AdminUserInfo implements Serializable {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigCommon.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,12 +13,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "config_common")
+@Table(name = "config_common",pk = @Pk(name = "id"))
 @Data
 public class ConfigCommon {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigGray.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,12 +13,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "config_gray")
+@Table(name = "config_gray",pk = @Pk(name = "id"))
 @Data
 public class ConfigGray {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigGrayInstance.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -15,12 +12,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "config_gray_instance")
+@Table(name = "config_gray_instance",pk = @Pk(name = "id"))
 @Data
 public class ConfigGrayInstance {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigIpBlacklist.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,12 +13,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "config_ip_blacklist")
+@Table(name = "config_ip_blacklist",pk = @Pk(name = "id"))
 @Data
 public class ConfigIpBlacklist {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigLimit.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,12 +13,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "config_limit")
+@Table(name = "config_limit",pk = @Pk(name = "id"))
 @Data
 public class ConfigLimit {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigRouteBase.java

@@ -4,11 +4,8 @@ import lombok.Data;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 
 
 /**
@@ -17,12 +14,9 @@ import javax.persistence.Table;
  *
  * @author tanghc
  */
-@Table(name = "config_route_base")
+@Table(name = "config_route_base",pk = @Pk(name = "id"))
 @Data
 public class ConfigRouteBase {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigServiceRoute.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,12 +13,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "config_service_route")
+@Table(name = "config_service_route",pk = @Pk(name = "id"))
 @Data
 public class ConfigServiceRoute {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.AUTO)
     /**  数据库字段：id */
     private String id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IspResource.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,13 +13,10 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "isp_resource")
+@Table(name = "isp_resource",pk = @Pk(name = "id"))
 @Data
 public class IspResource {
     /**  数据库字段：id */
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     /** 资源名称, 数据库字段：name */

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IsvInfo.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,12 +13,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "isv_info")
+@Table(name = "isv_info",pk = @Pk(name = "id"))
 @Data
 public class IsvInfo {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IsvKeys.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,12 +13,9 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "isv_keys")
+@Table(name = "isv_keys",pk = @Pk(name = "id"))
 @Data
 public class IsvKeys {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/MonitorInfo.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -16,13 +13,10 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "monitor_info")
+@Table(name = "monitor_info",pk = @Pk(name = "id"))
 @Data
 public class MonitorInfo {
     /**  数据库字段：id */
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     /** 路由id, 数据库字段：route_id */

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/MonitorInfoError.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Date;
 
 
@@ -15,13 +12,10 @@ import java.util.Date;
  *
  * @author tanghc
  */
-@Table(name = "monitor_info_error")
+@Table(name = "monitor_info_error",pk = @Pk(name = "id"))
 @Data
 public class MonitorInfoError {
     /**  数据库字段：id */
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     /** 错误id,md5Hex(instanceId + routeId + errorMsg), 数据库字段：error_id */

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/MonitorSummary.java

@@ -2,11 +2,8 @@ package com.gitee.sop.adminserver.entity;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/PermIsvRole.java

@@ -4,11 +4,8 @@ import lombok.Data;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 
 
 /**
@@ -17,12 +14,9 @@ import javax.persistence.Table;
  *
  * @author tanghc
  */
-@Table(name = "perm_isv_role")
+@Table(name = "perm_isv_role",pk = @Pk(name = "id"))
 @Data
 public class PermIsvRole {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/PermRole.java

@@ -4,11 +4,8 @@ import lombok.Data;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 
 
 /**
@@ -17,12 +14,9 @@ import javax.persistence.Table;
  *
  * @author tanghc
  */
-@Table(name = "perm_role")
+@Table(name = "perm_role",pk = @Pk(name = "id"))
 @Data
 public class PermRole {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/PermRolePermission.java

@@ -4,11 +4,8 @@ import lombok.Data;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.Table;
 
 
 /**
@@ -17,12 +14,9 @@ import javax.persistence.Table;
  *
  * @author tanghc
  */
-@Table(name = "perm_role_permission")
+@Table(name = "perm_role_permission",pk = @Pk(name = "id"))
 @Data
 public class PermRolePermission {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     /**  数据库字段：id */
     private Long id;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/RegistryServiceNacosImpl.java

@@ -135,7 +135,8 @@ public class RegistryServiceNacosImpl implements RegistryService {
         params.put("ip", serviceInstance.getIp());
         params.put("port", String.valueOf(serviceInstance.getPort()));
         String instanceJson = httpTool.request("http://" + nacosAddr + "/nacos/v1/ns/instance", params, null, HttpTool.HTTPMethod.GET);
-        Instance instance = JSON.parseObject(instanceJson, Instance.class);
+        JSONObject jsonObject = JSON.parseObject(instanceJson);
+        Instance instance = JSON.parseObject(jsonObject.getString("data"), Instance.class);
         instance.setServiceName(serviceInstance.getServiceId());
         return instance;
     }