结合zlhis，三方登录

src/main/java/com/kingkong/bljs/api/BaseController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import java.util.HashMap;
 import java.util.Map;
 
-@ControllerAdvice
+//@ControllerAdvice
 public class BaseController {
 
     @ResponseBody

src/main/java/com/kingkong/bljs/config/AuthorizationServerConfiguration.java

@@ -19,6 +19,7 @@ import org.springframework.security.oauth2.provider.token.store.redis.RedisToken
 
 import java.util.concurrent.TimeUnit;
 
+//@Order(2)
 @Configuration
 @EnableAuthorizationServer
 public class AuthorizationServerConfiguration extends AuthorizationServerConfigurerAdapter {

src/main/java/com/kingkong/bljs/config/ResourceServerConfig.java

@@ -1,11 +1,13 @@
 package com.kingkong.bljs.config;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
 
+//@Order(7)
 @Configuration
 @EnableResourceServer
 public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
@@ -14,10 +16,18 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     public void configure(HttpSecurity http) throws Exception{
 
         http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED);
-        http.authorizeRequests()
-                .antMatchers("/oauth/token","/api/app","/api/lang","/test","/api/report").permitAll()
-                .antMatchers("/api/**").authenticated()
-                .and().cors().and().csrf().disable();
+//        http.authorizeRequests()
+//                .antMatchers("/oauth/token","/api/app","/api/lang","/test","/api/report").permitAll()
+//                .antMatchers("/api/**").authenticated()
+//                .and().cors().and().csrf().disable();
+        http
+                .authorizeRequests()
+                .antMatchers("/oauth/*","/api/app","/api/i18n","/test","/api/report").permitAll()
+                .antMatchers("/**").authenticated()
+                .and().formLogin()
+                //.authenticationDetailsSource(authenticationDetailsSource)
+                .and().logout().permitAll().and().cors().and().csrf().disable();
+
 
     }
 }

src/main/java/com/kingkong/bljs/config/WebSecurityConfig.java

@@ -5,6 +5,7 @@ import com.kingkong.bljs.security.CustomtAuthenticationProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationDetailsSource;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -21,6 +22,7 @@ import org.springframework.security.web.authentication.WebAuthenticationDetails;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 
+//@Order(4)
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
@@ -41,13 +43,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         //设置规则
-        http
-                .authorizeRequests()
-                .antMatchers("/oauth/*","/api/app","/api/i18n","/test","/api/report").permitAll()
-                .antMatchers("/**").authenticated()
-                .and().formLogin()
-                //.authenticationDetailsSource(authenticationDetailsSource)
-                .and().logout().permitAll().and().cors().and().csrf().disable();
+//        http
+//                .authorizeRequests()
+//                .antMatchers("/oauth/*","/api/app","/api/i18n","/test","/api/report").permitAll()
+//                .antMatchers("/**").authenticated()
+//                .and().formLogin()
+//                //.authenticationDetailsSource(authenticationDetailsSource)
+//                .and().logout().permitAll().and().cors().and().csrf().disable();
 
     }
 

src/main/java/com/kingkong/bljs/dao/AuthClientMapper.java

@@ -0,0 +1,11 @@
+package com.kingkong.bljs.dao;
+
+import com.kingkong.bljs.entity.AuthClient;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+public interface AuthClientMapper {
+
+    @Select("select * from k_client where client_id=#{code}")
+    AuthClient get(String code);
+}

src/main/java/com/kingkong/bljs/entity/AuthClient.java

@@ -0,0 +1,38 @@
+package com.kingkong.bljs.entity;
+
+public class AuthClient {
+
+    private String clientId;
+    private String clientSecret;
+    private String redirectUri;
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    public String getRedirectUri() {
+        return redirectUri;
+    }
+
+    public AuthClient(String clientId, String clientSecret, String redirectUri) {
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.redirectUri = redirectUri;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+
+    public void setRedirectUri(String redirectUri) {
+        this.redirectUri = redirectUri;
+    }
+}

src/main/java/com/kingkong/bljs/security/CustomClientDetailService.java

@@ -1,5 +1,8 @@
 package com.kingkong.bljs.security;
 
+import com.kingkong.bljs.dao.AuthClientMapper;
+import com.kingkong.bljs.entity.AuthClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.oauth2.provider.ClientDetails;
 import org.springframework.security.oauth2.provider.ClientDetailsService;
@@ -11,15 +14,25 @@ import java.util.HashSet;
 import java.util.Set;
 
 public class CustomClientDetailService implements ClientDetailsService {
+
+    @Autowired
+    private AuthClientMapper authClientMapper;
+
     @Override
     public ClientDetails loadClientByClientId(String s) throws ClientRegistrationException {
+
+        AuthClient authClient = authClientMapper.get(s);
+
+        if(null == authClient)
+            throw new ClientRegistrationException("incorrect client id");
+
         BaseClientDetails clientDetails = new BaseClientDetails();
         clientDetails.setClientId(s);
-        clientDetails.setClientSecret("{noop}123");
+        clientDetails.setClientSecret("{noop}" + authClient.getClientSecret());
         clientDetails.setAuthorizedGrantTypes(Arrays.asList("authorization_code","client_credentials", "refresh_token", "password", "implicit"));
         clientDetails.setScope(Arrays.asList("*","all"));
         Set<String> uris = new HashSet<>();
-        uris.add("http://localhost:8080/login");
+        uris.add(authClient.getRedirectUri());
         clientDetails.setRegisteredRedirectUri(uris);
         clientDetails.setAccessTokenValiditySeconds(3600*24);
         return clientDetails;

src/main/java/com/kingkong/bljs/security/CustomUserDetailsService.java

@@ -36,6 +36,9 @@ public class CustomUserDetailsService implements UserDetailsService {
     @Value("${app.table.app_user}")
     private String k_app_user;
 
+    @Value("${app.default.app_id}")
+    private String default_app_id;
+
 
 
     @Override
@@ -47,6 +50,8 @@ public class CustomUserDetailsService implements UserDetailsService {
             throw new UsernameNotFoundException("用户不存在！");
 
         String appid = this.request.getParameter("app_id");
+        if(null == appid)
+            appid = default_app_id;
         Map condition = new HashMap();
         condition.put("u_id",user.get("id").toString());
         condition.put("app_id",appid);

src/main/resources/application-his.properties

@@ -0,0 +1,54 @@
+spring.datasource.url=jdbc:oracle:thin:@192.168.1.150:1521:orcl
+spring.datasource.username=k_user
+spring.datasource.password=123
+spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.max-idle=10
+spring.datasource.max-wait=10000
+spring.datasource.min-idle=5
+spring.datasource.initial-size=5
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+server.port=8092
+spring.cache.redis.time-to-live=150000
+spring.cache.type=redis
+
+app.name=ZLSOFT
+app.desc=中联软件
+app.origin.url=http://localhost:4200
+
+#应用类型1， 结合中联oracle
+app.type=1
+#登录程序位置
+app.loginpath=D:/work/zllogin.exe
+#登录服务名
+app.server=orcl3
+
+#报表pdf存放目录
+app.pdfpath=D:\\report-test\\pdf\\
+#报表打印程序位置
+app.printerpath=D:/report-test/ZLReportPrint.exe
+app.table.user=k_user2
+app.table.app_user=k_app_user2
+app.default.app_id=100
+
+spring.jackson.default-property-inclusion=always
+
+mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis.type-aliases-package=com.kingkong.bljs.dao
+mybatis.configuration.call-setters-on-nulls=true
+
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.session.store-type=redis
+
+spring.thymeleaf.cache=false
+spring.thymeleaf.prefix=classpath:/templates/
+spring.thymeleaf.check-template-location=true
+spring.thymeleaf.suffix=.html
+spring.thymeleaf.encoding=UTF-8
+
+
+#websocket配置
+netty-websocket.host=127.0.0.1
+netty-websocket.path=/
+netty-websocket.port=9021

src/main/resources/application.properties

@@ -1 +1 @@
-spring.profiles.active=c
+spring.profiles.active=his