Browse Source

1.解决log4j相关冲突
2.将引入log4j2除去log4j的逻辑下沉到父类pom中(ipu-rest-libs中)

huangbo 5 years ago
parent
commit
6503cc0449

+ 2 - 43
ipu-rest-scaffold/pom.xml

39
            <groupId>com.ai.ipu</groupId>
39
            <groupId>com.ai.ipu</groupId>
40
            <artifactId>ipu-sql-mgmt</artifactId>
40
            <artifactId>ipu-sql-mgmt</artifactId>
41
            <version>${ipu}</version>
41
            <version>${ipu}</version>
42
            <scope>provided</scope>
43
            <exclusions>
44
            	<exclusion>
45
            		<groupId>log4j</groupId>
46
            		<artifactId>log4j</artifactId>
47
            	</exclusion>
48
            </exclusions>
49
        </dependency>
50
        <dependency>
51
            <groupId>com.ai.ipu</groupId>
52
            <artifactId>ipu-sql-mgmt</artifactId>
53
            <version>${ipu}</version>
54
            <scope>provided</scope>
55
        </dependency>
56
        <dependency>
57
            <groupId>de.codecentric</groupId>
58
            <artifactId>spring-boot-admin-starter-client</artifactId>
59
            <exclusions>
60
                <exclusion>
61
                    <groupId>org.slf4j</groupId>
62
                    <artifactId>log4j-over-slf4j</artifactId>
63
                </exclusion>
64
                <exclusion>
65
                    <groupId>org.slf4j</groupId>
66
                    <artifactId>jcl-over-slf4j</artifactId>
67
                </exclusion>
68
                <exclusion>
69
                	<groupId>org.slf4j</groupId>
70
                	<artifactId>jul-to-slf4j</artifactId>
71
                </exclusion>
72
            </exclusions>
73
        </dependency>
74
        <!-- 解决ClassNotFoundException: org.apache.commons.logging.LogFactory -->
75
        <dependency>
76
            <groupId>commons-logging</groupId>
77
            <artifactId>commons-logging</artifactId>
78
            <version>1.2</version>
42
            <!-- 屏蔽以后Idea可能启动报错 -->
43
            <!-- <scope>provided</scope> -->
79
        </dependency>
44
        </dependency>
80
        <dependency>
45
        <dependency>
81
        	<groupId>com.ai.ipu.server</groupId>
46
        	<groupId>com.ai.ipu.server</groupId>
82
        	<artifactId>ipu-restful</artifactId>
47
        	<artifactId>ipu-restful</artifactId>
83
        	<exclusions>
84
        		<exclusion>
85
        			<groupId>log4j</groupId>
86
        			<artifactId>log4j</artifactId>
87
        		</exclusion>
88
        	</exclusions>
89
        </dependency>
48
        </dependency>
90
    </dependencies>
49
    </dependencies>
91
50

+ 3 - 0
ipu-rest-scaffold/readme.md

27
总体:应用名设置;Logo设置;风格选择;皮肤选择;
27
总体:应用名设置;Logo设置;风格选择;皮肤选择;
28
登录界面:登录背景设置;是否显示保存密码;是否显示自动登录;自定义账号密码校验,前端和后端;
28
登录界面:登录背景设置;是否显示保存密码;是否显示自动登录;自定义账号密码校验,前端和后端;
29
首页界面:菜单层级设置;
29
首页界面:菜单层级设置;
30

31

32
yml和properties格式转换:http://toyaml.com/

+ 5 - 1
ipu-rest-scaffold/src/main/java/com/ai/ipu/server/control/AuthController.java

1
package com.ai.ipu.server.control;
1
package com.ai.ipu.server.control;
2
2
3
import org.slf4j.Logger;
4
import org.slf4j.LoggerFactory;
3
import org.springframework.stereotype.Controller;
5
import org.springframework.stereotype.Controller;
4
import org.springframework.web.bind.annotation.RequestMapping;
6
import org.springframework.web.bind.annotation.RequestMapping;
5
import org.springframework.web.bind.annotation.ResponseBody;
7
import org.springframework.web.bind.annotation.ResponseBody;
12
14
13
@Controller
15
@Controller
14
public class AuthController {
16
public class AuthController {
15
17
    private static final Logger log = LoggerFactory.getLogger(AuthController.class);
16
    /**
18
    /**
17
     * 登录
19
     * 登录
18
     * @param param
20
     * @param param
22
    @ResponseBody
24
    @ResponseBody
23
    @RequestMapping("/login")
25
    @RequestMapping("/login")
24
    public JMap login(JMap param) throws Exception {
26
    public JMap login(JMap param) throws Exception {
27
        log.debug("正在登陆");
25
        /*获取账号密码*/
28
        /*获取账号密码*/
26
        String username = param.getString("username");
29
        String username = param.getString("username");
27
        String password= param.getString("password");
30
        String password= param.getString("password");
45
    @ResponseBody
48
    @ResponseBody
46
    @RequestMapping("/menu")
49
    @RequestMapping("/menu")
47
    public JMap takeMenu(JMap param) throws Exception {
50
    public JMap takeMenu(JMap param) throws Exception {
51
        log.debug("获取菜单");
48
        /*获取账号*/
52
        /*获取账号*/
49
        //String username = param.getString("username");
53
        //String username = param.getString("username");
50
        String menuJson = FileUtil.readFile(AuthController.class.getClassLoader().getResourceAsStream("menu.json"));
54
        String menuJson = FileUtil.readFile(AuthController.class.getClassLoader().getResourceAsStream("menu.json"));

+ 0 - 11
ipu-rest-scaffold/src/main/resources/dev/log4j.properties

1
### set log levels ###
2
log4j.rootLogger=DEBUG
3

4
### direct log messages to stdout ###
5
log4j.appender.Console=org.apache.log4j.ConsoleAppender
6
log4j.appender.Console.Target=System.out
7
log4j.appender.Console.layout=org.apache.log4j.PatternLayout
8
log4j.appender.Console.layout.ConversionPattern=%-5p(%10c{1}) %m%n
9

10
### application log config ###
11
log4j.logger.com.ai.ipu=DEBUG,Console

+ 15 - 0
ipu-rest-scaffold/src/main/resources/dev/log4j2.xml

1
<?xml version="1.0" encoding="UTF-8"?>
2
<Configuration status="WARN">
3
    <Appenders>
4
        <Console name="Console" target="SYSTEM_OUT">
5
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
6
        </Console>
7
    </Appenders>
8
    <Loggers>
9
        <Root level="WARN">
10
            <AppenderRef ref="Console"/>
11
        </Root>
12
        <logger name="com.ai" level="DEBUG"></logger>
13
        <logger name="org.springframework.boot.web" level="DEBUG"></logger>
14
    </Loggers>
15
</Configuration>