海盐登录问题修改

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/controller/LoginController.java

@@ -2,6 +2,7 @@ package com.huimv.environment.controller;
 
 
 import com.huimv.common.result.Result;
+import com.huimv.environment.entity.SysAccountEntity;
 import com.huimv.environment.service.ILoginService;
 import com.huimv.environment.session.AccessToken;
 import com.huimv.environment.session.CheckNumber;
@@ -31,12 +32,14 @@ public class LoginController {
 //        Result result = iLoginService.login(accountName,         .getMD5Str(password));
         // 未对密码加密
         Result result = iLoginService.login(accountName, password);
+        SysAccountEntity sysAccountEntity = (SysAccountEntity) result.getData();
         if(result.getCode() != 1000){
             AccessToken accessToken = new AccessToken();
 //            accessToken.setToken(session.getId());
 //            accessToken.setLoginIp(userIp);
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountName);
+            accessToken.setUser(sysAccountEntity);
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
             return accessToken;
@@ -50,8 +53,9 @@ public class LoginController {
         accessToken.setToken(session.getId());
         accessToken.setLoginIp(userIp);
         accessToken.setCreated(new Date());
-        accessToken.setAccountName(accountName);
+        accessToken.setAccountName(sysAccountEntity.getUserName());
         accessToken.setCode(result.getCode());
+
         return accessToken;
     }
 

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SysAccountEntity.java

@@ -1,25 +1,28 @@
 package com.huimv.environment.entity;
 
+import lombok.Data;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
 @Entity
 @Table(name = "sys_account")
+@Data
 public class SysAccountEntity implements Serializable {
 
     private static final long serialVersionUID = 6073065542016688601L;
 
-    @Override
-    public String toString() {
-        return "SysAccountEntity{" +
-                "id=" + id +
-                ", accountName='" + accountName + '\'' +
-                ", password='" + password + '\'' +
-                ", accountStatus=" + accountStatus +
-                ", remark='" + remark + '\'' +
-                ", userId=" + userId +
-                '}';
-    }
+//    @Override
+//    public String toString() {
+//        return "SysAccountEntity{" +
+//                "id=" + id +
+//                ", accountName='" + accountName + '\'' +
+//                ", password='" + password + '\'' +
+//                ", accountStatus=" + accountStatus +
+//                ", remark='" + remark + '\'' +
+//                ", userId=" + userId +
+//                '}';
+//    }
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -41,52 +44,9 @@ public class SysAccountEntity implements Serializable {
     @Column(name = "user_id")
     private Long userId;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setAccountStatus(Integer accountStatus) {
-        this.accountStatus = accountStatus;
-    }
-
-    public Integer getAccountStatus() {
-        return accountStatus;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
+    @Column(name = "user_name")
+    private String userName;
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
 
-    public Long getUserId() {
-        return userId;
-    }
 
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/session/AccessToken.java

@@ -1,17 +1,21 @@
 package com.huimv.environment.session;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * 登录的token信息
  * @author guojian
  */
+@Data
 public class AccessToken {
     private String token;
     private String loginIp;
     private Date created;
     private String accountName;
     private Integer code;
+    private Object user;
 
     public String getMessage() {
         return message;

huimv-ql-farm/huimv-ql-gateway/src/main/resources/application-haiyan.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8011
+  port: 8010
 
 spring:
   application:
@@ -9,35 +9,41 @@ spring:
       enabled: true
       routes:
         - id: environment_route
-          uri: http://47.98.40.154:8090
+          uri: http://127.0.0.1:8090
           predicates:
             - Path=/production/**
           filters:
             - StripPrefix=1
         - id: video_route
-          uri: http://47.98.40.154:8101
+          uri: http://127.0.0.1:8100
           predicates:
             - Path=/video/**
           filters:
             - StripPrefix=1
         - id: production_route
-          uri: http://47.98.40.154:8086
+          uri: http://127.0.0.1:8085
           predicates:
             - Path=/environment/**
           filters:
             - StripPrefix=1
         - id: security_route
-          uri: http://47.98.40.154:8095
+          uri: http://127.0.0.1:8095
           predicates:
             - Path=/security/**
           filters:
             - StripPrefix=1
         - id: security_route
-          uri: http://47.98.40.154:8089
+          uri: http://127.0.0.1:8089
           predicates:
             - Path=/testreal/**
           filters:
             - StripPrefix=1
+        - id: security_route
+          uri: http://127.0.0.1:9105
+          predicates:
+            - Path=/getData/**
+          filters:
+            - StripPrefix=1
 logging:
   level:
     org.springframework.cloud.gateway: debug  # Gateway调试模式

huimv-ql-farm/huimv-ql-gateway/src/main/resources/application-ycg.yml

@@ -38,6 +38,12 @@ spring:
             - Path=/testreal/**
           filters:
             - StripPrefix=1
+        - id: security_route
+          uri: http://127.0.0.1:9105
+          predicates:
+            - Path=/getData/**
+          filters:
+            - StripPrefix=1
 logging:
   level:
     org.springframework.cloud.gateway: debug  # Gateway调试模式

huimv-ql-farm/huimv-ql-gateway/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-#spring.profiles.active=ycg
+spring.profiles.active=ycg
 #spring.profiles.active=wuyi
-spring.profiles.active=haiyan
+#spring.profiles.active=haiyan
 #spring.profiles.active=wjj

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/SysAccountController.java

@@ -0,0 +1,36 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.SysAccount;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.SysAccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/SysAccount")
+public class SysAccountController {
+
+	@Autowired
+	private SysAccountService service;
+
+	@RequestMapping("/add")
+	public Result add(SysAccount childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result remove(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(SysAccount childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAllById")
+	public Result findAllById(Integer id){ return service.findAllById(id); }
+
+
+	@RequestMapping("/findAll")
+	public Result findAll(String name , Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/SysAccount.java

@@ -0,0 +1,36 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "sys_account")
+public class SysAccount implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "account_name")
+	private String accountName;
+
+	@Column(name = "password")
+	private String password;
+
+	@Column(name = "account_status")
+	private Boolean accountStatus;
+
+	@Column(name = "remark")
+	private String remark;
+
+	@Column(name = "user_id")
+	private Long userId;
+
+	@Column(name = "user_name")
+	private String userName;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/SysAccountRepository.java

@@ -0,0 +1,14 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.SysAccount;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface SysAccountRepository extends JpaRepository<SysAccount, Integer>,JpaSpecificationExecutor<SysAccount>{
+	
+	@Query(nativeQuery = true ,value = "select * from sys_account where account_name like %?1% limit ?2 , ?3")
+    List<SysAccount> findAll(String name, Integer startPage, Integer pageSize);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/SysAccountService.java

@@ -0,0 +1,22 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.SysAccount;
+import com.huimv.production.result.Result;
+
+public interface SysAccountService {
+
+   //添加
+   Result add(SysAccount entity);
+
+   //添加
+   Result remove(Integer[] ids);
+
+   //添加
+   Result update(SysAccount entity);
+
+   //查询
+  Result findAll(String name, Integer pageNum, Integer pageSize);
+
+   //根据id查找
+   Result findAllById(Integer id);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/SysAccountServiceImpl.java

@@ -0,0 +1,90 @@
+package com.huimv.production.service.impl;
+
+
+import com.huimv.production.domain.SysAccount;
+import com.huimv.production.repo.SysAccountRepository;
+import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
+import com.huimv.production.service.SysAccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SysAccountServiceImpl implements SysAccountService {
+
+	@Autowired
+	private SysAccountRepository rep;
+
+	@Override
+	public Result add(SysAccount entity){
+		if (entity == null){
+			return new Result(10002, ResultStatus.addNull);
+		}
+		try {
+			rep.save(entity);
+			return new Result(10000,ResultStatus.addSuccess);
+		}catch (Exception e){
+			return new Result(10001,ResultStatus.addFailed);
+		}
+	}
+
+	@Override
+	public Result remove(Integer[] ids) {
+		if (ids == null || ids.length==0){
+			return new Result(10002,ResultStatus.deleteNull);
+		}
+		try {
+			for (Integer id : ids) {
+				rep.deleteById(id);
+			}
+			return new Result(10000,ResultStatus.deleteSuccess);
+		}catch (Exception e){
+			return new Result(10001,ResultStatus.deleteFailed);
+		}
+	}
+
+	@Override
+	public Result update(SysAccount entity) {
+		if (entity == null){
+			return new Result(10002,ResultStatus.updateNull);
+		}
+		try {
+			rep.save(entity);
+			return new Result(10000,ResultStatus.updateSuccess);
+		}catch (Exception e){
+			return new Result(10001,ResultStatus.updateFailed);
+		}
+	}
+
+	@Override
+	public Result findAll(String name , Integer pageNum , Integer pageSize) {
+//		try {
+			Map map = new HashMap();
+
+			Integer startPage = (pageNum-1) * pageSize;
+			int size = rep.findAll(name,startPage,pageSize).size() ;
+			List<SysAccount> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
+			
+			return new Result(10000,ResultStatus.findSuccess,map);
+//		}catch (Exception e){
+//			return new Result(10001,ResultStatus.findFailed,null);
+//		}
+	}
+
+	@Override
+	public Result findAllById(Integer id) {
+		try {
+			SysAccount entity = rep.findById(id).get();
+			return new Result(10000,ResultStatus.findSuccess,entity);
+		}catch (Exception e){
+			return new Result(10001,ResultStatus.findFailed,null);
+		}
+	}
+}

huimv-ql-farm/huimv-ql-production/src/main/resources/application-haiyan.yml

@@ -5,8 +5,8 @@ spring:
     name: production
 
   datasource:
-#    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://122.112.250.26:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://122.112.250.26:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver