client配置修改,mybatis-generator使用

facade/src/app/core/startup/startup.service.ts

@@ -101,6 +101,7 @@ export class StartupService {
       let menus = res.menu || [];
       user['token'] = token || '';
 
+      res.app.description = res.app.note;
       // 应用信息：包括站点名、描述、年份
       this.settingService.setApp(res.app);
       // 用户信息：包括姓名、头像、邮箱地址

facade/src/app/routes/passport/login/login.component.ts

@@ -114,20 +114,22 @@ export class UserLoginComponent implements OnDestroy {
 
     const data = {
         grant_type: 'password',
-        client_id: environment.client_id,
-        client_secret: environment.client_secret,
+        client_id: this.settingsService.app.clientId || environment.client_id,
+        client_secret: this.settingsService.app.clientSecret || environment.client_secret,
         scope: '*',
         username: this.userName.value,
         password: this.password.value,
         provider: environment.provider,
       };
 
+      console.log(this.settingsService.app);
+
     const url = environment.BASE_URL + 'oauth/token?_allow_anonymous=true';
     let options = null;
     let params: any = null;
     let body = null;
     if ( environment.auth_set_header ) {
-       options = {headers:   {Authorization: 'Basic ' + btoa ( environment.client_id + ':' + environment.client_secret ),
+       options = {headers:   {Authorization: 'Basic ' + btoa ( data.client_id + ':' + data.client_secret ),
          'Content-type': 'application/x-www-form-urlencoded'}};
       params = data;
     } else {

pom.xml

@@ -123,6 +123,27 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.mybatis.generator</groupId>
+				<artifactId>mybatis-generator-maven-plugin</artifactId>
+				<version>1.3.7</version>
+				<configuration>
+					<verbose>true</verbose>
+					<overwrite>true</overwrite>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>com.oracle</groupId>
+						<artifactId>ojdbc6</artifactId>
+						<version>11.2.0</version>
+					</dependency>
+					<dependency>
+						<groupId>org.mybatis.generator</groupId>
+						<artifactId>mybatis-generator-core</artifactId>
+						<version>1.3.7</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>

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

@@ -2,24 +2,20 @@ package com.kingkong.bljs.api;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.kingkong.bljs.accesstor.Accesstor;
+import com.kingkong.bljs.dao.AppMapper;
+import com.kingkong.bljs.entity.App;
 import com.kingkong.bljs.security.CustomUser;
 import com.kingkong.bljs.service.*;
 import com.kingkong.bljs.util.FileUtil;
-import org.apache.ibatis.javassist.scopedpool.SoftValueHashMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -58,6 +54,9 @@ public class IndexController extends ApiController {
     @Autowired
     private CommonService commonService;
 
+    @Autowired
+    private AppMapper appMapper;
+
 
     @GetMapping("app")
     public Map app(@RequestParam("app_id") String app_id) throws Exception{
@@ -80,6 +79,7 @@ public class IndexController extends ApiController {
         userService.clearUser(customUser.getUsername(),customUser.getAppid());
         Map user = userService.getCurrentUser();
 
+
         result.put("app",appInfo(app_id));
         if(null == user){
             result.put("user",new HashMap<>());
@@ -91,21 +91,14 @@ public class IndexController extends ApiController {
         return result;
     }
 
-    private Map appInfo(String appid) throws Exception{
-        //Map app = new HashMap();
-        //app.put("name",this.appName);
-        //app.put("description",this.appDesc);
-
-        //Map env  = moduleService.getEnvVariable();
-        //String appid = env.get("app_id").toString();
-        Map app = this.queryService.first("k_app","id=" + appid);
+    private App appInfo(String appid) throws Exception{
+        App app = appMapper.get(appid);
         if(null == app)
             throw new Exception("系统不存在！");
-        if(!app.get("status").toString().equals("1"))
+        if(app.getStatus() != 1)
             throw new Exception("应用正在调整。。。");
 
-        app.put("description",app.get("note"));
-
+        // app.put("description",app.get("note"));
         return app;
     }
 

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

@@ -22,8 +22,8 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 //                .and().cors().and().csrf().disable();
         http
                 .authorizeRequests()
-                .antMatchers("/oauth/*","/api/app","/api/i18n","/test","/api/report").permitAll()
-                .antMatchers("/**").authenticated()
+                .antMatchers("/oauth/authorize","/oauth/token","/api/app","/api/i18n","/test","/api/report","/api/lang").permitAll()
+                .antMatchers("/api/**").authenticated()
                 .and().formLogin()
                 //.authenticationDetailsSource(authenticationDetailsSource)
                 .and().logout().permitAll().and().cors().and().csrf().disable();

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

@@ -43,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/AppMapper.java

@@ -0,0 +1,15 @@
+package com.kingkong.bljs.dao;
+
+import com.kingkong.bljs.entity.App;
+import com.kingkong.bljs.entity.UserApi;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+public interface AppMapper {
+
+    @Select("select * from k_app where client_id=#{client_id}")
+    App getByClientId(String client_id);
+
+    @Select("select * from   where id=#{id}")
+    App get(String id);
+}

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

@@ -1,11 +0,0 @@
-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/App.java

@@ -0,0 +1,88 @@
+package com.kingkong.bljs.entity;
+
+public class App {
+    private int id;
+    private String name;
+    private String note;
+    private int status;
+    private String icon;
+    private String client_id;
+    private String client_secret;
+    private String redirect_uri;
+
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public String getClient_id() {
+        return client_id;
+    }
+
+    public void setClient_id(String client_id) {
+        this.client_id = client_id;
+    }
+
+    public String getClient_secret() {
+        return client_secret;
+    }
+
+    public void setClient_secret(String client_secret) {
+        this.client_secret = client_secret;
+    }
+
+    public String getRedirect_uri() {
+        return redirect_uri;
+    }
+
+    public void setRedirect_uri(String redirect_uri) {
+        this.redirect_uri = redirect_uri;
+    }
+
+    public App(int id, String name, String note, int status, String icon, String client_id, String client_secret, String redirect_uri) {
+        this.id = id;
+        this.name = name;
+        this.note = note;
+        this.status = status;
+        this.icon = icon;
+        this.client_id = client_id;
+        this.client_secret = client_secret;
+        this.redirect_uri = redirect_uri;
+    }
+}

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

@@ -1,38 +0,0 @@
-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,9 +1,8 @@
 package com.kingkong.bljs.security;
 
-import com.kingkong.bljs.dao.AuthClientMapper;
-import com.kingkong.bljs.entity.AuthClient;
+import com.kingkong.bljs.dao.AppMapper;
+import com.kingkong.bljs.entity.App;
 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;
 import org.springframework.security.oauth2.provider.ClientRegistrationException;
@@ -16,23 +15,23 @@ import java.util.Set;
 public class CustomClientDetailService implements ClientDetailsService {
 
     @Autowired
-    private AuthClientMapper authClientMapper;
+    private AppMapper appMapper;
 
     @Override
     public ClientDetails loadClientByClientId(String s) throws ClientRegistrationException {
 
-        AuthClient authClient = authClientMapper.get(s);
+        App app = appMapper.getByClientId(s);
 
-        if(null == authClient)
+        if(null == app)
             throw new ClientRegistrationException("incorrect client id");
 
         BaseClientDetails clientDetails = new BaseClientDetails();
         clientDetails.setClientId(s);
-        clientDetails.setClientSecret("{noop}" + authClient.getClientSecret());
+        clientDetails.setClientSecret("{noop}" + app.getClient_secret());
         clientDetails.setAuthorizedGrantTypes(Arrays.asList("authorization_code","client_credentials", "refresh_token", "password", "implicit"));
         clientDetails.setScope(Arrays.asList("*","all"));
         Set<String> uris = new HashSet<>();
-        uris.add(authClient.getRedirectUri());
+        uris.add(app.getRedirect_uri());
         clientDetails.setRegisteredRedirectUri(uris);
         clientDetails.setAccessTokenValiditySeconds(3600*24);
         return clientDetails;

src/main/resources/application-c.properties

@@ -28,13 +28,14 @@ app.pdfpath=D:\\report-test\\pdf\\
 app.printerpath=D:/report-test/ZLReportPrint.exe
 app.table.user=k_user
 app.table.app_user=k_app_user
-
+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
+mybatis.configuration.map-underscore-to-camel-case=true
 
 spring.redis.database=0
 spring.redis.host=127.0.0.1

src/main/resources/application-h.properties

@@ -28,7 +28,7 @@ app.pdfpath=D:\\report-test\\pdf\\
 app.printerpath=D:/report-test/ZLReportPrint.exe
 app.table.user=k_user
 app.table.app_user=k_app_user
-
+app.default.app_id=100
 
 
 spring.jackson.default-property-inclusion=always
@@ -36,6 +36,7 @@ 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
+mybatis.configuration.map-underscore-to-camel-case=true
 
 spring.redis.database=0
 spring.redis.host=127.0.0.1

src/main/resources/application-his.properties

@@ -35,6 +35,7 @@ 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
+mybatis.configuration.map-underscore-to-camel-case=true
 
 spring.redis.database=0
 spring.redis.host=127.0.0.1

src/main/resources/generatorConfig.xml

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+    <!--导入属性配置 -->
+    <!--<properties resource="g-h.properties"></properties>-->
+
+    <!--指定特定数据库的jdbc驱动jar包的位置 -->
+    <!--<classPathEntry location="${jdbc.driverLocation}"/>-->
+
+    <context id="default" targetRuntime="MyBatis3">
+
+
+        <!-- optional，旨在创建class时，对注释进行控制 -->
+        <commentGenerator>
+            <property name="suppressDate" value="true" />
+        </commentGenerator>
+
+
+        <!--jdbc的数据库连接 -->
+        <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver" connectionURL="jdbc:oracle:thin:@127.0.0.1:1521:orcl" userId="k_user" password="123">
+        </jdbcConnection>
+
+
+
+        <!-- 非必需，类型处理器，在数据库类型和java类型之间的转换控制-->
+        <javaTypeResolver >
+            <property name="forceBigDecimals" value="false" />
+        </javaTypeResolver>
+
+        <!-- Model模型生成器,用来生成含有主键key的类，记录类 以及查询Example类
+            targetPackage     指定生成的model生成所在的包名
+            targetProject     指定在该项目下所在的路径
+        -->
+        <javaModelGenerator targetPackage="com.kingkong.bljs.entity" targetProject="src/main/java">
+            <!-- 是否对model添加 构造函数 -->
+            <property name="constructorBased" value="true"/>
+
+            <!-- 是否允许子包，即targetPackage.schemaName.tableName -->
+            <property name="enableSubPackages" value="false"/>
+
+            <!-- 建立的Model对象是否 不可改变  即生成的Model对象不会有 setter方法，只有构造方法 -->
+            <property name="immutable" value="true"/>
+
+            <!-- 给Model添加一个父类 -->
+            <!--<property name="rootClass" value="com.foo.louis.Hello"/>-->
+
+            <!-- 是否对类CHAR类型的列的数据进行trim操作 -->
+            <property name="trimStrings" value="true"/>
+        </javaModelGenerator>
+
+        <!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
+        <sqlMapGenerator targetPackage="com.kingkong.bljs.dao" targetProject="src/main/java">
+            <property name="enableSubPackages" value="false"/>
+        </sqlMapGenerator>
+
+
+        <!-- 客户端代码，生成易于使用的针对Model对象和XML配置文件 的代码
+                type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象
+                type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象
+                type="XMLMAPPER",生成SQLMap XML文件和独立的Mapper接口
+        -->
+        <javaClientGenerator targetPackage="com.kingkong.bljs.dao" targetProject="src/main/java" type="MIXEDMAPPER">
+            <property name="enableSubPackages" value=""/>
+            <!--
+                    定义Maper.java 源代码中的ByExample() 方法的可视性，可选的值有：
+                    public;
+                    private;
+                    protected;
+                    default
+                    注意：如果 targetRuntime="MyBatis3",此参数被忽略
+             -->
+            <property name="exampleMethodVisibility" value=""/>
+            <!--
+                                           方法名计数器
+              Important note: this property is ignored if the target runtime is MyBatis3.
+             -->
+            <property name="methodNameCalculator" value=""/>
+
+            <!--
+                                                为生成的接口添加父接口
+             -->
+            <property name="rootInterface" value=""/>
+
+        </javaClientGenerator>
+
+
+
+        <table tableName="k_dictionary" schema="k_user">
+
+            <!-- optional   , only for mybatis3 runtime
+                 自动生成的键值（identity,或者序列值）
+               如果指定此元素，MBG将会生成<selectKey>元素，然后将此元素插入到SQL Map的<insert> 元素之中
+               sqlStatement 的语句将会返回新的值
+               如果是一个自增主键的话，你可以使用预定义的语句,或者添加自定义的SQL语句. 预定义的值如下:
+                  Cloudscape    This will translate to: VALUES IDENTITY_VAL_LOCAL()
+                  DB2:      VALUES IDENTITY_VAL_LOCAL()
+                  DB2_MF:       SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1
+                  Derby:        VALUES IDENTITY_VAL_LOCAL()
+                  HSQLDB:   CALL IDENTITY()
+                  Informix:     select dbinfo('sqlca.sqlerrd1') from systables where tabid=1
+                  MySql:        SELECT LAST_INSERT_ID()
+                  SqlServer:    SELECT SCOPE_IDENTITY()
+                  SYBASE:   SELECT @@IDENTITY
+                  JDBC:     This will configure MBG to generate code for MyBatis3 suport of JDBC standard generated keys. This is a database independent method of obtaining the value from identity columns.
+                  identity: 自增主键  If true, then the column is flagged as an identity column and the generated <selectKey> element will be placed after the insert (for an identity column). If false, then the generated <selectKey> will be placed before the insert (typically for a sequence).
+
+            -->
+            <!--<generatedKey column="" sqlStatement="" identity="" type=""/>-->
+
+            <domainObjectRenamingRule searchString="^K" replaceString="" />
+            <!-- optional.
+                    列的命名规则：
+                    MBG使用 <columnRenamingRule> 元素在计算列名的对应 名称之前，先对列名进行重命名，
+                    作用：一般需要对BUSI_CLIENT_NO 前的BUSI_进行过滤
+                    支持正在表达式
+                     searchString 表示要被换掉的字符串
+                     replaceString 则是要换成的字符串，默认情况下为空字符串，可选
+            -->
+            <!--<columnRenamingRule searchString="^k" replaceString=""/>-->
+
+
+
+            <!-- optional.告诉 MBG 忽略某一列
+                    column，需要忽略的列
+                    delimitedColumnName:true ,匹配column的值和数据库列的名称 大小写完全匹配，false 忽略大小写匹配
+                    是否限定表的列名，即固定表列在Model中的名称
+            -->
+            <ignoreColumn column="PLAN_ID"  delimitedColumnName="true" />
+
+
+            <!--optional.覆盖MBG对Model 的生成规则
+                 column: 数据库的列名
+                 javaType: 对应的Java数据类型的完全限定名
+                 在必要的时候可以覆盖由JavaTypeResolver计算得到的java数据类型. For some databases, this is necessary to handle "odd" database types (e.g. MySql's unsigned bigint type should be mapped to java.lang.Object).
+                 jdbcType:该列的JDBC数据类型(INTEGER, DECIMAL, NUMERIC, VARCHAR, etc.)，该列可以覆盖由JavaTypeResolver计算得到的Jdbc类型，对某些数据库而言，对于处理特定的JDBC 驱动癖好 很有必要(e.g. DB2's LONGVARCHAR type should be mapped to VARCHAR for iBATIS).
+                 typeHandler:
+
+            -->
+            <!--<columnOverride column="" javaType=""    jdbcType="" typeHandler=""  delimitedColumnName="" />-->
+
+        </table>
+    </context>
+</generatorConfiguration>