Kaynağa Gözat

cms support show terminalUser | auth info

guozhaoshun 6 yıl önce
ebeveyn
işleme
de9fd93e84

+ 35 - 35
rankin-user-service/pom.xml

@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.rankin</groupId>
-	<artifactId>rankin-user-service</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+    <artifactId>rankin-user-service</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-	<name>rankin-user-service</name>
-	<description>User Service For Spring Cloud</description>
+    <name>rankin-user-service</name>
+    <description>User Service For Spring Cloud</description>
 
-	<parent>
+    <parent>
         <groupId>cn.rankin</groupId>
         <artifactId>rankin</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-	</parent>
+    </parent>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Dalston.SR4</spring-cloud.version>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>Dalston.SR4</spring-cloud.version>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -57,19 +57,19 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
-	</dependencies>
+    </dependencies>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <build>
         <finalName>${project.name}</finalName>

+ 3 - 2
rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalUserController.java

@@ -139,7 +139,8 @@ public class TerminalUserController {
         TerminalUser terminalUser = new TerminalUser();
         String code = terminalUserSearchDTO.getCode();
         if (!StringUtils.isEmpty(code)) {
-            terminalUser.setCode("%" + code + "%");
+            log.info("/user/auth/list | request code={}",code);
+            terminalUser.setCode(code);
         }
         LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
         sort.put("gmtModified", BaseOrderEnum.DESC);
@@ -149,7 +150,7 @@ public class TerminalUserController {
 
 
         if(CollectionUtils.isEmpty(terminalUserList)){
-            log.info("terminalUser list is empty!");
+            log.info("terminalUserList is empty!");
             return pageResult;
         }else if(terminalUserList.size() == 1){
             //查询到唯一用户时,设置资源库查询条件 | 其他情况默认查询全部

+ 2 - 2
rankin-user-service/src/main/resources/bootstrap.yml

@@ -5,9 +5,9 @@ spring:
     active:
   cloud:
     config:
-      uri: http://config.rankin.com:8921
+      uri: http://192.168.1.151:8921
       label: master
-      profile: ${profile:dev}
+      profile: ${profile:local}
 
 #logging:
 #  level: