83
#kafka.topic.aivideo=topicVideoTest
84
kafka.topic.aivideo=topic_ai_video
85
86
87
#AI\u5931\u8d25\u8bf7\u6c42\u5730\u5740
88
#ebc.ai.head-det-url=http://10.1.251.211:7001/todo/api/v1.4/control/online/IMAGE/HEAD/PREDICT
89
ebc.ai.head-det-url=http://10.1.251.211:7001/todo/api/v1.4/control/online/IMAGE/HUMAN/PREDICT
90
ebc.ai.helmet-det-url=http://10.1.251.211:7003/todo/api/v1.4/control/online/IMAGE/HELMET/PREDICT
91
ebc.ai.smokingdet-url=http://10.1.251.213:5125/smokingdet
92
ebc.ai.instrument-det-url=http://10.1.251.213:19100/predict
93
ebc.ai.work-clothes-det-url=http://10.1.251.211:7003/todo/api/v1.4/control/online/IMAGE/HUMAN/PREDICT
94
95
#ebc.ai.face-recog-service-url=http://10.21.10.28:9018/api/face/recog
96
ebc.ai.face-recog-service-url=http://10.1.251.211:7002/todo/api/v1.4/control/online/IMAGE/FACE/PREDICT
97
98
99
#AI\u4efb\u52a1\u8bf7\u6c42\u5730\u5740
100
ebc.protection.resource-url=http://localhost:8018/sp/resourceTool/getResourceToolAllInfo

+ 1 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/config/MyCorsFilter.java

@ -54,7 +54,7 @@ public class MyCorsFilter {
54 54
        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
55 55
        registrationBean.setFilter(new SessionUserFilter());
56 56
        //registrationBean.setUrlPatterns(Arrays.asList("/mySessionUserFilter"));
57
        registrationBean.setUrlPatterns(Arrays.asList("/login/*"));
57
        registrationBean.setUrlPatterns(Arrays.asList("/sdfsdafsafasf"));
58 58
        Map<String, String> initParameters = new HashMap<String,String>();
59 59
        initParameters.put("impl-classname","com.ai.sso.external.DefaultPopedomImpl");
60 60
        initParameters.put("ALLOWPATH","gif;jpg;jpeg;png;login;checkLogin;genVerificationCode;logout;");

+ 6 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/LoginServiceImpl.java

@ -98,20 +98,23 @@ public class LoginServiceImpl implements LoginService {
98 98
99 99
            String result = HttpServiceUtil.sendPost(menuUrl, paramsMap, charset,headerMap1 );
100 100
            //将返回结果转为map
101
            logger.error("返回结果json: " + result);
101 102
            resultMap = JSON.parseObject(result, Map.class);
102
103
            logger.error("返回结果resultMap: " + resultMap.toString());
103 104
            String result1 = (String)resultMap.get("RESULT");
104 105
            if(null!=result1&&!"".equals(result1)){
105 106
                //如果result有值返回正确,将返回结果转为List
107
108
                logger.error("返回结果result1: " + result1);
106 109
                List<Map<String,List<Map>>> list = JSON.parseObject(result1, List.class);
110
                logger.error("返回结果list: " + list.toString());
107 111
                resultMap.put("RESULT",list);
108 112
            }
109 113
        } catch (Exception e) {
110 114
            logger.error("调用uspa获取菜单接口失败: " + e.getMessage());
111
112 115
            return resultMap;
113 116
        }
114 117
        return resultMap;
115 118
    }
116 119
117
}
120
}

+ 3 - 3
security-protection-service/src/main/resources/application-minio.properties

@ -1,6 +1,6 @@
1 1
#minio
2
minio.endpoint=http://10.19.90.34
3
minio.port=19000
2
minio.endpoint=http://10.1.194.18
3
minio.port=9000
4 4
minio.accessKey=minioadmin
5 5
minio.secretKey=minioadmin
6 6
minio.secure=false
@ -22,4 +22,4 @@ spminio.bucketAiVideo=ai-video
22 22
# \u76d1\u63a7\u89c6\u9891\u622a\u56fe
23 23
spminio.bucketAiImage=ai-image
24 24
# \u76d1\u63a7\u89c6\u9891\u622a\u56fe
25
spminio.bucketM3U8=m3u8-index
25
spminio.bucketM3U8=m3u8-index

+ 7 - 8
security-protection-service/src/main/resources/application.properties

@ -10,10 +10,10 @@ server.servlet.context-path=/sp
10 10
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
11 11
#spring.datasource.username=comon_frm
12 12
#spring.datasource.password=1qaz@WSX
13
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
13
spring.datasource.url=jdbc:mysql://10.1.252.196:3306/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
14 14
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
15
spring.datasource.username=ebc
16
spring.datasource.password=ebc@123
15
spring.datasource.username=root
16
spring.datasource.password=asdsadadaUda4u!@
17 17
18 18
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
19 19
#spring.jpa.database=default
@ -26,7 +26,7 @@ spring.main.allow-bean-definition-overriding=true
26 26
27 27
#kafka
28 28
#kafka.bootstrap-servers=47.105.160.21:9090
29
kafka.bootstrap-servers=10.19.90.34:9090
29
kafka.bootstrap-servers=10.1.194.17:9092
30 30
kafka.topic.aitask=topic_ai_task
31 31
kafka.topic.aivideo=topic_ai_video
32 32
#kafka.topic.aitask=topicTaskTest
@ -68,11 +68,10 @@ spring.servlet.multipart.resolve-lazily=false
68 68
logging.level.com.ai=debug
69 69
logging.level.org.springframework.data=debug
70 70
71
uspa.login.url=http://10.19.90.34:20000/usermng/login
71
uspa.login.url=http://10.1.194.17:20000/usermng/login
72 72
uspa.login.vercode=Hiz#8uAqkjhoPmXu8%aaa
73 73
74
uspa.login.menuUrl=http://10.19.90.34:20000/usermng/process/com.wframe.usermanager.services.impl.QueryMenuByUser
75
76
74
uspa.login.menuUrl=http://10.1.194.17:20000/usermng/process/com.wframe.usermanager.services.impl.QueryMenuByUser
75
        
77 76
# \u5f15\u5165minio\u548ciot\u7684\u914d\u7f6e\u6587\u4ef6
78 77
spring.profiles.active=iot,minio

+ 5 - 5
security-protection-service/src/main/resources/sso.properties

@ -15,7 +15,7 @@ COOKIE_MAXAGE=-1
15 15
TENANT_REGISTER_CLASS=com.ai.customermanager.services.impl.CustRegisterVercodeImpl
16 16
17 17
18
##\u8fdc\u7a0b\u7f13\u5b58\u8c03\u7528\u7c7b\uff0c\u8fd9\u4e2a\u7c7b\u5fc5\u987b\u6709\u4e09\u4e2a\u51fd\u6570 
18
##\u8fdc\u7a0b\u7f13\u5b58\u8c03\u7528\u7c7b\uff0c\u8fd9\u4e2a\u7c7b\u5fc5\u987b\u6709\u4e09\u4e2a\u51fd\u6570
19 19
##    public boolean set(String key,String value)
20 20
##    public String get(String key)
21 21
##    public boolean del(String key);
@ -53,8 +53,8 @@ RETURN_TAG={"MESSAGE":"NOLOGIN","CODE":999999,"FLAG":"FAIL","RESULT":{"URL":"htt
53 53
54 54
#redis.single=10.11.20.117:6379
55 55
#redis.password=luMZulgbotmo71aa
56
redis.single=10.19.90.34:6379
57
redis.password=Ipu@321!
56
redis.single=10.1.194.17:6379
57
redis.password=ebc@redis
58 58
59 59
redis.pool.maxTotal=1000
60 60
redis.pool.minIdle=5
@ -68,7 +68,7 @@ redis.pool.timeBetweenEvictionRunsMillis=10000
68 68
69 69
SESSION_DEFAULT_VERCODE=Hiz#8uAqkjhoPmXu8%aaa
70 70
71
#\u662f\u5426\u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 1 \u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 
71
#\u662f\u5426\u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 1 \u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236
72 72
is_check_interface=0
73 73
74 74
@ -78,4 +78,4 @@ is_check_interface=0
78 78
USER_LOGIN_AUTH_CLASS=com.wframe.usermanager.services.impl.UserLoginAuthImpl
79 79
#USER_LOGIN_AUTH_CLASS=com.wframe.msgmanager.services.impl.UserLoginByTokenImpl
80 80
#USER_LOGIN_AUTH_CLASS=com.wframe.msgmanager.services.impl.UserLoginByToken4XblImpl
81
SIGN_KEY_CODE=TENANT_CODE
81
SIGN_KEY_CODE=TENANT_CODE

Войти - Nuosi Git Service

Войти