Selaa lähdekoodia

冻结用户-错误信息返回

huangzhiyong 6 vuotta sitten
vanhempi
commit
167c22cdc8

+ 0 - 40
svr/svr-healthy-house/pom.xml

@ -30,12 +30,6 @@
		<dependency>
			<groupId>org.springframework.cloud</groupId>
			<artifactId>spring-cloud-starter</artifactId>
			<exclusions>
				<exclusion>
					<artifactId>bcprov-jdk15on</artifactId>
					<groupId>org.bouncycastle</groupId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
@ -88,34 +82,6 @@
					<artifactId>jackson-coreutils</artifactId>
					<groupId>com.github.fge</groupId>
				</exclusion>
				<exclusion>
					<artifactId>jsr305</artifactId>
					<groupId>com.google.code.findbugs</groupId>
				</exclusion>
				<exclusion>
					<artifactId>commons-logging</artifactId>
					<groupId>commons-logging</groupId>
				</exclusion>
				<exclusion>
					<artifactId>swagger-compat-spec-parser</artifactId>
					<groupId>io.swagger</groupId>
				</exclusion>
				<exclusion>
					<artifactId>swagger-models</artifactId>
					<groupId>io.swagger</groupId>
				</exclusion>
				<exclusion>
					<artifactId>vavr</artifactId>
					<groupId>io.vavr</groupId>
				</exclusion>
				<exclusion>
					<artifactId>commons-lang3</artifactId>
					<groupId>org.apache.commons</groupId>
				</exclusion>
				<exclusion>
					<artifactId>asm</artifactId>
					<groupId>org.ow2.asm</groupId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
@ -213,12 +179,6 @@
		<dependency>
			<groupId>net.sf.json-lib</groupId>
			<artifactId>json-lib</artifactId>
			<exclusions>
				<exclusion>
					<artifactId>commons-lang</artifactId>
					<groupId>commons-lang</groupId>
				</exclusion>
			</exclusions>
		</dependency>
        <!-- 文件服务器 -->
        <dependency>

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/LoginController.java

@ -118,7 +118,7 @@ public class LoginController extends EnvelopRestEndpoint {
        try {
            user = loginService.iJklogin(request, clientId, username, password);
        } catch (ManageException e) {
            failed(e.getMessage());
            return failed(e.getMessage());
        }
        if (user != null) {
            return success("登录成功", user);
@ -151,7 +151,7 @@ public class LoginController extends EnvelopRestEndpoint {
        try {
            user = loginService.idCardlogin(request, username, password);
        } catch (ManageException e) {
            failed(e.getMessage());
            return failed(e.getMessage());
        }
        if (user != null) {
            return success("登录成功", user);