Skip to content

caosy / fun-admin

Go to a project
Commit 2cd13e90 by chongli
Options

权限改造启动异常做了修改

parent 1fe229d7
Inline Side-by-side
Showing with 2 additions and 99 deletions
pom.xml
......@@ -51,6 +51,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
......
src/main/resources/config/spring-security.xml
<?xml version="1.0" encoding="UTF-8"?>
<<<<<<< HEAD
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xmlns:sec="http://www.springframework.org/schema/security"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.2.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.2.xsd ">
<context:property-placeholder location="classpath:properties/app.properties" ignore-unresolvable="true" />
<sec:http pattern="/static/**" security="none" />
<sec:http pattern="/adminUser/*" security="none" />
<sec:http pattern="/favicon.ico" security="none" />
<sec:http pattern="/cc/**" security="none" />
<sec:http pattern="/websocket/**" security="none" />
<sec:http access-decision-manager-ref="" auto-config="true" access-denied-page="/you-will-not-want-to-be-here">
<sec:intercept-url pattern="/order/orderList/list_refund" access="ROLE_CTRIP_PAY,ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
<sec:intercept-url pattern="/voucherOrder/**" access="ROLE_CTRIP_PAY,ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
<sec:intercept-url pattern="/order/detail" access="ROLE_CTRIP_PAY,ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
<sec:intercept-url pattern="/order/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_ORDER_COURSE" />
<sec:intercept-url pattern="/communeOrder/**" access="ROLE_DEV,ROLE_COMMUNEORDER" />
<sec:intercept-url pattern="/eventActivityOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_ACTIVITY_ORDER" />
<sec:intercept-url pattern="/rechargeOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_RECHARGEORDER" />
<sec:intercept-url pattern="/accounting/**" access="ROLE_OP,ROLE_FINANCE,ROLE_DEV,ROLE_PROD,ROLE_ASSIST,ROLE_ACCOUNT" />
<sec:intercept-url pattern="/basic/prepaycard/create" access="ROLE_IWCARD" />
<sec:intercept-url pattern="/basic/prepaycard/waste" access="ROLE_IWCARD" />
<sec:intercept-url pattern="/basic/**" access="ROLE_PROD,ROLE_DEV,ROLE_PROMOTION,ROLE_ASSIST,ROLE_BASIC" />
<sec:intercept-url pattern="/workPoint/**" access="ROLE_PROD,ROLE_DEV,ROLE_PROMOTION,ROLE_ASSIST,ROLE_WORKPOINT" />
<sec:intercept-url pattern="/golf/course/list" access="ROLE_PROD,ROLE_DEV,ROLE_ASSIST,ROLE_GOLF,ROLE_GOLF_COURSE_LIST" />
<sec:intercept-url pattern="/golf/course/create" access="ROLE_PROD,ROLE_DEV,ROLE_ASSIST,ROLE_GOLF_COURSE_CREATE" />
<sec:intercept-url pattern="/golf/course-product/list" access="ROLE_PROD,ROLE_DEV,ROLE_ASSIST,ROLE_GOLF_COURSEPRODUCT_LIST" />
<sec:intercept-url pattern="/golf/course-product/create" access="ROLE_PROD,ROLE_DEV,ROLE_ASSIST,ROLE_GOLF_COURSEPRODUCT_CREATE" />
<sec:intercept-url pattern="/golf/course-resource/list" access="ROLE_PROD,ROLE_DEV,ROLE_ASSIST,ROLE_GOLF_COURSERES_LIST" />
<sec:intercept-url pattern="/golf/course-resource/create" access="ROLE_PROD,ROLE_DEV,ROLE_ASSIST,ROLE_GOLF_COURSERES_CREATE" />
<sec:intercept-url pattern="/golf/**" access="ROLE_PROD,ROLE_DEV,ROLE_PROMOTION,ROLE_ASSIST,ROLE_GOLF" />
<sec:intercept-url pattern="/marketing/**" access="ROLE_MARKET,ROLE_DEV,ROLE_PROD,ROLE_ASSIST" />
<sec:intercept-url pattern="/tools/**" access="ROLE_MARKET,ROLE_DEV,ROLE_PROD,ROLE_OP,ROLE_FINANCE,ROLE_PROMOTION,ROLE_ASSIST,ROLE_TEL,ROLE_TEL_ADMIN" />
<sec:intercept-url pattern="/j/**" access="ROLE_MARKET,ROLE_DEV,ROLE_PROD,ROLE_OP,ROLE_FINANCE,ROLE_PROMOTION,ROLE_ASSIST" />
<sec:intercept-url pattern="/system/**" access="ROLE_FINANCE,ROLE_DEV,ROLE_PROMOTION,ROLE_ASSIST,ROLE_SYSTEM" />
<sec:intercept-url pattern="/error" access="ROLE_MARKET,ROLE_DEV,ROLE_PROD,ROLE_OP,ROLE_FINANCE,ROLE_PROMOTION,ROLE_ASSIST" />
<!-- <sec:intercept-url pattern="/cc/**" access="ROLE_MARKET,ROLE_DEV,ROLE_PROD,ROLE_OP,ROLE_FINANCE,ROLE_PROMOTION,ROLE_ASSIST" /> -->
<sec:intercept-url pattern="/extralresource/**" access="ROLE_AWTCZ,ROLE_DEV" />
<sec:intercept-url pattern="/tourAreaInfo/**" access="ROLE_AWTCZ,ROLE_DEV" />
<sec:intercept-url pattern="/tour/**" access="ROLE_AWTCZ,ROLE_DEV" />
<sec:intercept-url pattern="/travelDay/**" access="ROLE_AWTCZ,ROLE_DEV" />
<sec:intercept-url pattern="/tourOrder/**" access="ROLE_AWTCZ,ROLE_DEV,ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
<sec:intercept-url pattern="/notification/**" access="ROLE_MARKET,ROLE_DEV,ROLE_PROD,ROLE_OP,ROLE_FINANCE,ROLE_PROMOTION,ROLE_ASSIST,ROLE_NOTIFICATION" />
<sec:intercept-url pattern="/statistics/**" access="ROLE_STATISTICS" />
<sec:intercept-url pattern="/sendMessage/**" access="ROLE_ASSIST,ROLE_SENDMSG" />
<sec:intercept-url pattern="/courseFinance/**" access="ROLE_FINANCE" />
<sec:intercept-url pattern="/tourFinance/**" access="ROLE_FINANCE" />
<sec:intercept-url pattern="/insuranceFinance/**" access="ROLE_FINANCE" />
<sec:intercept-url pattern="/voucherRule/**" access="ROLE_VOUCHER" />
<sec:intercept-url pattern="/voucher/**" access="ROLE_VOUCHER" />
<sec:intercept-url pattern="/insideSms/**" access="ROLE_INSIDESMS" />
<sec:intercept-url pattern="/telTask/create" access="ROLE_TEL_ADMIN"/>
<sec:intercept-url pattern="/telTask/unbindTelTaskDetail" access="ROLE_TEL_ADMIN"/>
<sec:intercept-url pattern="/telTask/**" access="ROLE_TEL,ROLE_TEL_ADMIN"/>
<sec:intercept-url pattern="/eventCustomerInfo/**" access="ROLE_PROD,ROLE_DEV,ROLE_PROMOTION,ROLE_ASSIST" />
<sec:intercept-url pattern="/communeExt/**" access="ROLE_COMMUNE,ROLE_IWCARD,ROLE_PROD,ROLE_DEV,ROLE_PROMOTION,ROLE_ASSIST,ROLE_COMMUNEEXT"/>
<sec:intercept-url pattern="/luck/**" access="ROLE_DEV,ROLE_PROMOTION" />
<sec:intercept-url pattern="/impression/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE" />
<sec:intercept-url pattern="/review/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE" />
<sec:intercept-url pattern="/communeNotice/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE" />
<sec:intercept-url pattern="/file/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE" />
<sec:intercept-url pattern="/ingegral/**" access="ROLE_DEV,ROLE_USERINFO_MODIFY" />
<sec:intercept-url pattern="/callcenter/sipPhone/**" access="ROLE_TEL,ROLE_ASSIST,ROLE_PROMOTION" />
<sec:intercept-url pattern="/communeservice/communeAdm/queryList" access="ROLE_COMMUNE_SYS_ADMIN" />
<sec:intercept-url pattern="/communeservice/communeAdm/**" access="ROLE_COMMUNE_SYS_ADMIN,ROLE_COMMUNE_SYS" />
<sec:intercept-url pattern="/vipmemberOrder/**" access="ROLE_VIP,ROLE_COMMUNE" />
<sec:intercept-url pattern="/communeservice/**" access="ROLE_COMMUNE_ANALYSIS" />
<sec:intercept-url pattern="/**" access="ROLE_DEV" />
<sec:form-login login-page="/adminUser/adminLoginGet" authentication-failure-url="/adminUser/adminLoginError" default-target-url="/marketing/campaign/create" />
</sec:http>
<sec:authentication-manager alias="authenticationManager">
<sec:authentication-provider ref="authenticationProvider" />
</sec:authentication-manager>
<bean id="authenticationProvider" class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
<property name="passwordEncoder" ref="passwordEncoder" />
<property name="userDetailsService" ref="userDetailsService"></property>
</bean>
<bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.Md5PasswordEncoder" />
=======
<b:beans
xmlns="http://www.springframework.org/schema/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......@@ -127,9 +34,6 @@
<authentication-manager alias="authenticationManager">
<authentication-provider ref="authenticationProvider" />
</authentication-manager>
>>>>>>> roleRebuild
<b:bean id="authenticationProvider" class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
<b:property name="passwordEncoder" ref="passwordEncoder" />
<b:property name="userDetailsService" ref="myUserDetailService"></b:property>
......@@ -149,9 +53,7 @@
<!--资源源数据定义，将所有的资源和权限对应关系建立起来，即定义某一资源可以被哪些角色访问 -->
<b:bean id="securityMetadataSource" class="com.ctrip.fun.admin.service.system.MyInvocationSecurityMetadataSource" >
<b:property name="adminResourcesService" ref="adminResourcesService"></b:property>
</b:bean>
</b:bean>
</b:beans>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment