523096025 vor 2 Jahren
Ursprung
Commit
fe7c1ccbb1

+ 1 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/controller/AuthorizeController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
+@CrossOrigin
 @RestController
 @RequestMapping(value = "/auth")
 public class AuthorizeController {

+ 2 - 4
admin/src/main/java/com/huimv/farm/damsubsidy/controller/EnterpriseCooperativeController.java

@@ -13,10 +13,7 @@ import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.huimv.farm.damsubsidy.service.IBillSubsidyService;
 import com.huimv.farm.damsubsidy.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -32,6 +29,7 @@ import java.util.Map;
  * @author Newspaper
  * @since 2023-04-27
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/Enterprise-Cooperative")
 public class EnterpriseCooperativeController {

+ 2 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/controller/IsloatedLogController.java

@@ -1,6 +1,7 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author author
  * @since 2023-04-26
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/isloated-log")
 public class IsloatedLogController {

+ 1 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/controller/MenuController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
+@CrossOrigin
 @RestController
 @RequestMapping("/menu")
 public class MenuController {

+ 1 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/controller/PovertyUserRegistController.java

@@ -34,6 +34,7 @@ import java.util.Map;
  * @author author
  * @since 2023-04-28
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/poverty-user-regist")
 public class PovertyUserRegistController {

+ 2 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/controller/Sheet1Controller.java

@@ -5,6 +5,7 @@ import com.huimv.farm.damsubsidy.entity.Sheet1;
 import com.huimv.farm.damsubsidy.mapper.Sheet1Mapper;
 import com.huimv.farm.damsubsidy.service.ISheet1Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -23,6 +24,7 @@ import java.util.stream.Collectors;
  * @author author
  * @since 2023-05-06
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/sheet1")
 public class Sheet1Controller {

+ 1 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysGroupController.java

@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 
+@CrossOrigin
 @RestController
 @RequestMapping("/group")
 public class SysGroupController {

+ 4 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -107,6 +107,10 @@ public class SysUserController {
                 String token = TokenSign.sign(accountName,accountEntity.getPhone(),accountEntity.getId());
                 accessToken.setToken(token);
 
+                accessToken.setUserName(accountEntity.getUserName());
+                accessToken.setUserId(accountEntity.getId());
+                accessToken.setPhone(accountEntity.getPhone());
+
                 accessToken.setLoginIp(remoteHost);
                 return new Result(ResultCode.SUCCESS,accessToken);
             }

+ 18 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/entity/AccessToken.java

@@ -16,6 +16,24 @@ public class AccessToken {
     private String message;
     private Integer lastFarmId;
     private String userName;
+    private Long userId;
+    private String phone;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
 
     public String getUserName() {
         return userName;

+ 2 - 2
admin/src/main/resources/application-dev.yml

@@ -48,5 +48,5 @@ spring:
 
 mybatis-plus:
   configuration:
-#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

admin/src/main/resources/mapper/BaseVeterStationMapper.xml → admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BaseVeterStationMapper.xml


admin/src/main/resources/mapper/Sheet1Mapper.xml → admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/Sheet1Mapper.xml