4.0

sop-admin/sop-admin-server/pom.xml

@@ -22,8 +22,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+			<groupId>com.gitee.sop</groupId>
+			<artifactId>sop-bridge-nacos</artifactId>
+			<version>3.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- easyopen starter -->

sop-admin/sop-admin-server/readme.md

@@ -10,4 +10,13 @@
 
 后台用户表：admin_user_info
 
-密码保存规则：两次MD5，即`md5(md5("123456"))`
+- 密码保存规则：`md5(username + md5(password) + username)`
+
+```text
+username: admin
+password: 123456
+即
+md5("admin" + md5(123456) + "admin")
+```
+
+详见：com.gitee.sop.adminserver.AccountTest

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/system/SystemApi.java

@@ -36,7 +36,7 @@ public class SystemApi {
     String adminLogin(LoginForm param) {
         String username = param.getUsername();
         String password = param.getPassword();
-        password = DigestUtils.md5Hex(password);
+        password = DigestUtils.md5Hex(username + password + username);
 
         Query query = new Query()
                 .eq("username", username)

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ServiceInfo.java

@@ -1,16 +1,29 @@
 package com.gitee.sop.adminserver.bean;
 
-import lombok.Data;
-
 import java.util.List;
 
 /**
  * @author tanghc
  */
-@Data
 public class ServiceInfo {
     /** 服务名称 */
     private String serviceId;
     /** 实例列表 */
     private List<ServiceInstance> instances;
+
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public List<ServiceInstance> getInstances() {
+        return instances;
+    }
+
+    public void setInstances(List<ServiceInstance> instances) {
+        this.instances = instances;
+    }
 }

sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties

@@ -10,10 +10,14 @@ admin.access-token.timeout-minutes=30
 sop.sign-type=rsa
 
 # nacos配置
-nacos.config.server-addr=${nacos.url}
-nacos.discovery.server-addr=${nacos.url}
+nacos.config.server-addr=${register.url}
+nacos.discovery.server-addr=${register.url}
+
 # nacos cloud配置
-spring.cloud.nacos.discovery.server-addr=${nacos.url}
+spring.cloud.nacos.discovery.server-addr=${register.url}
+
+# eureka地址
+eureka.client.serviceUrl.defaultZone=${register.url}
 
 # 数据库配置
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

sop-admin/sop-admin-server/src/main/resources/application-dev.properties

@@ -5,7 +5,7 @@ mysql.host=localhost:3306
 mysql.username=root
 mysql.password=root
 
-# nacos注册中心地址
-nacos.url=127.0.0.1:8848
+# 注册中心地址
+register.url=127.0.0.1:8848
 
 logging.level.com.gitee=debug

sop-admin/sop-admin-server/src/test/java/com/gitee/sop/adminserver/AccountTest.java

@@ -0,0 +1,23 @@
+package com.gitee.sop.adminserver;
+
+import junit.framework.TestCase;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author tanghc
+ */
+public class AccountTest  extends TestCase {
+
+    /*
+    生成密码
+     */
+    @Test
+    public void genPwd() {
+        String username = "admin";
+        String password = "123456";
+        String save_to_db = DigestUtils.md5Hex(username + DigestUtils.md5Hex(password) + username);
+        System.out.println(save_to_db);
+    }
+
+}