Commit 11d23583 authored by hubin's avatar hubin

更新目录结构 权限管理开发

parent 7ee888fb
![](https://img.shields.io/badge/ism--services-v1.0.0-blue)
![](https://img.shields.io/badge/ltc--services-v1.0.0-blue)
![](https://img.shields.io/badge/SpringBoot-2.3.2-brightgreen.svg)
![](https://img.shields.io/badge/SpringCloud-Hoxton.SR8-green.svg)
......@@ -51,7 +51,7 @@
>
> `system-api` 系统服务提供费feign API,打成jar包给到其他需要使用系统服务的项目引用
>
> `system-user-service` 系统服务的业务代码,
> `system-admin-service` 系统服务的业务代码,
>3.部署说明
>
......
......@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apply</artifactId>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -17,7 +17,7 @@
<artifactId>spring-cloud-openfeign-core</artifactId>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-core</artifactId>
<version>0.0.1</version>
</dependency>
......
......@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: apply-service
namespace: ism-service
namespace: ltc-service
labels:
app: apply-service
spec:
......@@ -16,10 +16,10 @@ spec:
app: apply-service
spec:
imagePullSecrets:
- name: ism-harbor
- name: ltc-harbor
containers:
- name: apply #TODO:pod的名称,必须字段,名称唯一且对象创建后不可以被修改
image: localhost:9999/ism/ism-system-user-service:latest #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
image: localhost:9999/ltc/ltc-system-user-service:latest #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
imagePullPolicy: Always #Always(总是去仓库下载),Never(从不去仓库下载),IfNotPresent(如果本地没有就去仓库下载),默认是"IfNotPresent"
ports:
- containerPort: 8001 #TODO:containerPort是pod内部容器的端口,targetPort映射到containerPort;例如,mysql服务需要暴露3306端口,redis暴露6379端口
......@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apply</artifactId>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -26,7 +26,7 @@
<!--基础包-->
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-core</artifactId>
<version>0.0.1</version>
<exclusions>
......@@ -49,12 +49,12 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-mybatis</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-redis</artifactId>
<version>0.0.1</version>
</dependency>
......
......@@ -5,7 +5,7 @@ spring:
enabled: true
additional-paths: src/main/java
application:
name: ISM-SYSTEM-USER-SERVICE-SERVICE
name: LTC-APPLY-SERVICE
cloud:
nacos:
discovery:
......@@ -16,10 +16,10 @@ spring:
server-addr: qw.hungraim.com:31158
file-extension: yaml # 必须修改成yaml
extension-configs:
- data-id: ism-database.yaml
- data-id: ltc-database.yaml
group: common
refresh: true
- data-id: ism-basic.yaml
- data-id: ltc-basic.yaml
group: common
refresh: true
- data-id: thread-config.yaml
......
......@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ism</artifactId>
<groupId>com.hungraim.ism</groupId>
<artifactId>ltc</artifactId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>assessment</artifactId>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -17,7 +17,7 @@
<artifactId>spring-cloud-openfeign-core</artifactId>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-core</artifactId>
<version>0.0.1</version>
</dependency>
......
......@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: assessment-service
namespace: ism-service
namespace: ltc-service
labels:
app: assessment-service
spec:
......@@ -16,10 +16,10 @@ spec:
app: assessment-service
spec:
imagePullSecrets:
- name: ism-harbor
- name: ltc-harbor
containers:
- name: assessment #TODO:pod的名称,必须字段,名称唯一且对象创建后不可以被修改
image: localhost:9999/ism/ism-system-user-service:latest #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
image: localhost:9999/ltc/ltc-system-user-service:latest #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
imagePullPolicy: Always #Always(总是去仓库下载),Never(从不去仓库下载),IfNotPresent(如果本地没有就去仓库下载),默认是"IfNotPresent"
ports:
- containerPort: 8001 #TODO:containerPort是pod内部容器的端口,targetPort映射到containerPort;例如,mysql服务需要暴露3306端口,redis暴露6379端口
......@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>assessment</artifactId>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -26,7 +26,7 @@
<!--基础包-->
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-core</artifactId>
<version>0.0.1</version>
<exclusions>
......@@ -49,12 +49,12 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-mybatis</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-redis</artifactId>
<version>0.0.1</version>
</dependency>
......
package com.hungraim.ism;
package com.hungraim.ltr;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......
......@@ -5,7 +5,7 @@ spring:
enabled: true
additional-paths: src/main/java
application:
name: ISM-SYSTEM-USER-SERVICE-SERVICE
name: LTC-ASSESSMENT-SERVICE
cloud:
nacos:
discovery:
......@@ -16,10 +16,10 @@ spring:
server-addr: qw.hungraim.com:31158
file-extension: yaml # 必须修改成yaml
extension-configs:
- data-id: ism-database.yaml
- data-id: ltc-database.yaml
group: common
refresh: true
- data-id: ism-basic.yaml
- data-id: ltc-basic.yaml
group: common
refresh: true
- data-id: thread-config.yaml
......
......@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ism</artifactId>
<groupId>com.hungraim.ism</groupId>
<artifactId>ltc</artifactId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
apiVersion: apps/v1
kind: Deployment
metadata:
name: ism-auth-service
namespace: ism-service
name: ltc-auth-service
namespace: ltc-service
labels:
app: ism-auth-service
app: ltc-auth-service
spec:
replicas: 1
selector:
matchLabels:
app: ism-auth-service
app: ltc-auth-service
template:
metadata:
labels:
app: ism-auth-service
app: ltc-auth-service
spec:
imagePullSecrets:
- name: ism-harbor
- name: ltc-harbor
containers:
- name: ism-auth-service #TODO:pod的名称,必须字段,名称唯一且对象创建后不可以被修改
image: localhost:9999/ism/ism-auth-service:latest #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
- name: ltc-auth-service #TODO:pod的名称,必须字段,名称唯一且对象创建后不可以被修改
image: localhost:9999/ltc/ltc-auth-service:latest #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
imagePullPolicy: Always #Always(总是去仓库下载),Never(从不去仓库下载),IfNotPresent(如果本地没有就去仓库下载),默认是"IfNotPresent"
ports:
- containerPort: 8001 #TODO:containerPort是pod内部容器的端口,targetPort映射到containerPort;例如,mysql服务需要暴露3306端口,redis暴露6379端口
......@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ism</artifactId>
<groupId>com.hungraim.ism</groupId>
<artifactId>ltc</artifactId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -18,17 +18,17 @@
<dependencies>
<!--基础配置数据源-->
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-core</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-mybatis</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-redis</artifactId>
<version>0.0.1</version>
</dependency>
......@@ -54,7 +54,7 @@
<!--系统服务api-->
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>system-api</artifactId>
<version>0.0.1</version>
</dependency>
......
package com.hungraim.ism.gateway.config;
import org.mybatis.generator.api.IntrospectedColumn;
import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
import org.mybatis.generator.internal.types.JavaTypeResolverDefaultImpl;
public class JavaTypeResolverImplUtil extends JavaTypeResolverDefaultImpl {
public JavaTypeResolverImplUtil() {
super();
/**
* this.typeMap.put(2003, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("ARRAY", new FullyQualifiedJavaType(Object.class.getName())));
* this.typeMap.put(-5, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("BIGINT", new FullyQualifiedJavaType(Long.class.getName())));
* this.typeMap.put(-2, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("BINARY", new FullyQualifiedJavaType("byte[]")));
* this.typeMap.put(-7, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("BIT", new FullyQualifiedJavaType(Boolean.class.getName())));
* this.typeMap.put(2004, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("BLOB", new FullyQualifiedJavaType("byte[]")));
* this.typeMap.put(16, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("BOOLEAN", new FullyQualifiedJavaType(Boolean.class.getName())));
* this.typeMap.put(1, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("CHAR", new FullyQualifiedJavaType(String.class.getName())));
* this.typeMap.put(2005, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("CLOB", new FullyQualifiedJavaType(String.class.getName())));
* this.typeMap.put(70, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("DATALINK", new FullyQualifiedJavaType(Object.class.getName())));
* this.typeMap.put(91, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("DATE", new FullyQualifiedJavaType(Date.class.getName())));
* this.typeMap.put(3, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("DECIMAL", new FullyQualifiedJavaType(BigDecimal.class.getName())));
* this.typeMap.put(2001, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("DISTINCT", new FullyQualifiedJavaType(Object.class.getName())));
* this.typeMap.put(8, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("DOUBLE", new FullyQualifiedJavaType(Double.class.getName())));
* this.typeMap.put(6, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("FLOAT", new FullyQualifiedJavaType(Double.class.getName())));
* this.typeMap.put(4, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("INTEGER", new FullyQualifiedJavaType(Integer.class.getName())));
* this.typeMap.put(2000, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("JAVA_OBJECT", new FullyQualifiedJavaType(Object.class.getName())));
* this.typeMap.put(-16, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("LONGNVARCHAR", new FullyQualifiedJavaType(String.class.getName())));
* this.typeMap.put(-4, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("LONGVARBINARY", new FullyQualifiedJavaType("byte[]")));
* this.typeMap.put(-1, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("LONGVARCHAR", new FullyQualifiedJavaType(String.class.getName())));
* this.typeMap.put(-15, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("NCHAR", new FullyQualifiedJavaType(String.class.getName())));
* this.typeMap.put(2011, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("NCLOB", new FullyQualifiedJavaType(String.class.getName())));
* this.typeMap.put(-9, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("NVARCHAR", new FullyQualifiedJavaType(String.class.getName())));
* this.typeMap.put(0, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("NULL", new FullyQualifiedJavaType(Object.class.getName())));
* this.typeMap.put(2, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("NUMERIC", new FullyQualifiedJavaType(BigDecimal.class.getName())));
* this.typeMap.put(1111, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("OTHER", new FullyQualifiedJavaType(Object.class.getName())));
* this.typeMap.put(7, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("REAL", new FullyQualifiedJavaType(Float.class.getName())));
* this.typeMap.put(2006, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("REF", new FullyQualifiedJavaType(Object.class.getName())));
* this.typeMap.put(5, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("SMALLINT", new FullyQualifiedJavaType(Short.class.getName())));
* this.typeMap.put(2002, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("STRUCT", new FullyQualifiedJavaType(Object.class.getName())));
* this.typeMap.put(92, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("TIME", new FullyQualifiedJavaType(Date.class.getName())));
* this.typeMap.put(93, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("TIMESTAMP", new FullyQualifiedJavaType(Date.class.getName())));
* this.typeMap.put(-6, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("TINYINT", new FullyQualifiedJavaType(Byte.class.getName())));
* this.typeMap.put(-3, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("VARBINARY", new FullyQualifiedJavaType("byte[]")));
* this.typeMap.put(12, new JavaTypeResolverDefaultImpl.JdbcTypeInformation("VARCHAR", new FullyQualifiedJavaType(String.class.getName())));
*
*/
super.typeMap.put(-6,
new JavaTypeResolverDefaultImpl.JdbcTypeInformation("TINYINT",
new FullyQualifiedJavaType(Integer.class.getName())));
super.typeMap.put(-5,
new JavaTypeResolverDefaultImpl.JdbcTypeInformation("BIGINT",
new FullyQualifiedJavaType(Integer.class.getName())));
}
/**
* 重写方法,把oracle中对应的number数据类型映射成Integer
*
* @param column 列
* @param defaultType 默认类型
* @return 返回类型
*/
@Override
protected FullyQualifiedJavaType calculateBigDecimalReplacement(IntrospectedColumn column, FullyQualifiedJavaType defaultType) {
FullyQualifiedJavaType answer;
if (column.getScale() <= 0 && column.getLength() <= 18 && !this.forceBigDecimals) {
if (column.getLength() > 11) {
answer = new FullyQualifiedJavaType(Long.class.getName());
} else {
answer = new FullyQualifiedJavaType(Integer.class.getName());
}
} else {
answer = defaultType;
}
return answer;
}
}
package com.hungraim.ism.gateway.config;
import org.mybatis.generator.api.CommentGenerator;
import org.mybatis.generator.api.IntrospectedColumn;
import org.mybatis.generator.api.IntrospectedTable;
import org.mybatis.generator.api.dom.java.*;
import org.mybatis.generator.api.dom.xml.XmlElement;
import org.mybatis.generator.config.MergeConstants;
import org.mybatis.generator.config.PropertyRegistry;
import org.mybatis.generator.internal.util.StringUtility;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
/**
*
* @Description :TODO( mybatis generator 自定义comment生成器.根据数据库 字段注释 生成po里对应的注释。 基于MBG 1.3.2.)
* @author 作者 :张齐
*/
public class MyCommentGenerator implements CommentGenerator {
private Properties properties;
private Properties systemPro;
private boolean suppressDate;
private boolean suppressAllComments;
private String currentDateStr;
public MyCommentGenerator() {
super();
properties = new Properties();
systemPro = System.getProperties();
suppressDate = false;
suppressAllComments = false;
currentDateStr = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
}
@Override
public void addJavaFileComment(CompilationUnit compilationUnit) {
// add no file level comments by default
return;
}
/**
* Adds a suitable comment to warn users that the element was generated, and
* when it was generated.
*/
@Override
public void addComment(XmlElement xmlElement) {
return;
}
@Override
public void addRootComment(XmlElement rootElement) {
// add no document level comments by default
return;
}
@Override
public void addConfigurationProperties(Properties properties) {
this.properties.putAll(properties);
suppressDate = StringUtility.isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_DATE));
suppressAllComments = StringUtility.isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_ALL_COMMENTS));
}
/**
* This method adds the custom javadoc tag for. You may do nothing if you do
* not wish to include the Javadoc tag - however, if you do not include the
* Javadoc tag then the Java merge capability of the eclipse plugin will
* break.
*
* @param javaElement the java element
*/
protected void addJavadocTag(JavaElement javaElement, boolean markAsDoNotDelete) {
javaElement.addJavaDocLine(" *");
StringBuilder sb = new StringBuilder();
sb.append(" * ");
sb.append(MergeConstants.NEW_ELEMENT_TAG);
if (markAsDoNotDelete) {
sb.append(" do_not_delete_during_merge");
}
String s = getDateString();
if (s != null) {
sb.append(' ');
sb.append(s);
}
javaElement.addJavaDocLine(sb.toString());
}
/**
* This method returns a formated date string to include in the Javadoc tag
* and XML comments. You may return null if you do not want the date in
* these documentation elements.
*
* @return a string representing the current timestamp, or null
*/
protected String getDateString() {
String result = null;
if (!suppressDate) {
result = currentDateStr;
}
return result;
}
@Override
public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
innerClass.addJavaDocLine("/**");
sb.append(" * ");
sb.append(introspectedTable.getFullyQualifiedTable());
sb.append(" ");
sb.append(getDateString());
innerClass.addJavaDocLine(sb.toString());
innerClass.addJavaDocLine(" */");
}
@Override
public void addEnumComment(InnerEnum innerEnum, IntrospectedTable introspectedTable) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
innerEnum.addJavaDocLine("/**");
// addJavadocTag(innerEnum, false);
sb.append(" * ");
sb.append(introspectedTable.getFullyQualifiedTable());
innerEnum.addJavaDocLine(sb.toString());
innerEnum.addJavaDocLine(" */");
}
@Override
public void addFieldComment(Field field, IntrospectedTable introspectedTable,
IntrospectedColumn introspectedColumn) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
field.addJavaDocLine("/**");
sb.append(" * ");
sb.append(introspectedColumn.getRemarks());
field.addJavaDocLine(sb.toString());
// addJavadocTag(field, false);
field.addJavaDocLine(" */");
}
@Override
public void addFieldComment(Field field, IntrospectedTable introspectedTable) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
field.addJavaDocLine("/**");
sb.append(" * ");
sb.append(introspectedTable.getFullyQualifiedTable());
field.addJavaDocLine(sb.toString());
field.addJavaDocLine(" */");
}
public void addModelClassComment(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
}
@Override
public void addGeneralMethodComment(Method method, IntrospectedTable introspectedTable) {
if (suppressAllComments) {
return;
}
// method.addJavaDocLine("/**");
// addJavadocTag(method, false);
// method.addJavaDocLine(" */");
}
@Override
public void addGetterComment(Method method, IntrospectedTable introspectedTable,
IntrospectedColumn introspectedColumn) {
if (suppressAllComments) {
return;
}
method.addJavaDocLine("/**");
StringBuilder sb = new StringBuilder();
sb.append(" * ");
sb.append(introspectedColumn.getRemarks());
method.addJavaDocLine(sb.toString());
sb.setLength(0);
sb.append(" * @return ");
sb.append(introspectedColumn.getActualColumnName());
sb.append(" ");
sb.append(introspectedColumn.getRemarks());
method.addJavaDocLine(sb.toString());
// addJavadocTag(method, false);
method.addJavaDocLine(" */");
}
@Override
public void addSetterComment(Method method, IntrospectedTable introspectedTable,
IntrospectedColumn introspectedColumn) {
if (suppressAllComments) {
return;
}
method.addJavaDocLine("/**");
StringBuilder sb = new StringBuilder();
sb.append(" * ");
sb.append(introspectedColumn.getRemarks());
method.addJavaDocLine(sb.toString());
Parameter parm = method.getParameters().get(0);
sb.setLength(0);
sb.append(" * @param ");
sb.append(parm.getName());
sb.append(" ");
sb.append(introspectedColumn.getRemarks());
method.addJavaDocLine(sb.toString());
// addJavadocTag(method, false);
method.addJavaDocLine(" */");
}
@Override
public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable, boolean markAsDoNotDelete) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
innerClass.addJavaDocLine("/**");
sb.append(" * ");
sb.append(introspectedTable.getFullyQualifiedTable());
innerClass.addJavaDocLine(sb.toString());
sb.setLength(0);
sb.append(" * @author ");
sb.append(systemPro.getProperty("user.name"));
sb.append(" ");
sb.append(currentDateStr);
// addJavadocTag(innerClass, markAsDoNotDelete);
innerClass.addJavaDocLine(" */");
}
}
package com.hungraim.ism.gateway.config;
import org.mybatis.generator.api.MyBatisGenerator;
import org.mybatis.generator.config.Configuration;
import org.mybatis.generator.config.xml.ConfigurationParser;
import org.mybatis.generator.internal.DefaultShellCallback;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
public class MybatisGeneratorRun {
public static void main(String[] args) throws Exception {
MybatisGeneratorRun app = new MybatisGeneratorRun();
System.out.println(app.getClass().getResource("/").getPath());
app.generator();
System.out.println(System.getProperty("user.dir"));
}
public void generator() throws Exception {
List<String> warnings = new ArrayList<>();
boolean overwrite = true;
InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("mybatis-generator/generatorConfig.xml");
ConfigurationParser cp = new ConfigurationParser(warnings);
Configuration config = cp.parseConfiguration(resourceAsStream);
DefaultShellCallback callback = new DefaultShellCallback(overwrite);
//MyBatisGenerator是逆向工程的核心类
MyBatisGenerator myBatisGenerator = new MyBatisGenerator(config, callback, warnings);
myBatisGenerator.generate(null);
for (String warning : warnings) {
System.out.println(warning);
}
}
}
package com.hungraim.ism;
package com.hungraim.ltr;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* @author hubin
......
package com.hungraim.ism.controller;
package com.hungraim.ltr.controller;
import com.hungraim.ism.util.RequestUtils;
import com.hungraim.ism.util.Result;
import com.hungraim.ltr.util.Result;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
......
package com.hungraim.ism.controller;
package com.hungraim.ltr.controller;
import com.nimbusds.jose.jwk.JWKSet;
import com.nimbusds.jose.jwk.RSAKey;
......
package com.hungraim.ism.gateway.config;
package com.hungraim.ltr.gateway.config;
import cn.hutool.http.HttpStatus;
import cn.hutool.json.JSONUtil;
import com.hungraim.ism.pojo.vo.system.UserLoginInfoVO;
import com.hungraim.ism.service.UserDetailsServiceImpl;
import com.hungraim.ism.util.Result;
import com.hungraim.ism.util.ResultCode;
import com.hungraim.ltr.pojo.vo.system.UserLoginInfoVO;
import com.hungraim.ltr.service.UserDetailsServiceImpl;
import com.hungraim.ltr.util.Result;
import com.hungraim.ltr.util.ResultCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......@@ -22,14 +22,7 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.E
import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
import org.springframework.security.oauth2.provider.ClientDetailsService;
import org.springframework.security.oauth2.provider.CompositeTokenGranter;
import org.springframework.security.oauth2.provider.TokenGranter;
import org.springframework.security.oauth2.provider.client.ClientCredentialsTokenGranter;
import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService;
import org.springframework.security.oauth2.provider.code.AuthorizationCodeTokenGranter;
import org.springframework.security.oauth2.provider.implicit.ImplicitTokenGranter;
import org.springframework.security.oauth2.provider.password.ResourceOwnerPasswordTokenGranter;
import org.springframework.security.oauth2.provider.refresh.RefreshTokenGranter;
import org.springframework.security.oauth2.provider.token.TokenEnhancer;
import org.springframework.security.oauth2.provider.token.TokenEnhancerChain;
import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
......@@ -144,7 +137,7 @@ public class AuthorizationServerConfiguration extends AuthorizationServerConfigu
@Bean
public KeyPair keyPair() {
KeyStoreKeyFactory factory = new KeyStoreKeyFactory(
new ClassPathResource("ism.jks"), "Hg123ism".toCharArray());
new ClassPathResource("ltc.jks"), "Hg123ism".toCharArray());
return factory.getKeyPair(
"ism", "Hg123ism".toCharArray());
}
......
package com.hungraim.ism.gateway.config;
package com.hungraim.ltr.gateway.config;
import com.hungraim.ism.util.Result;
import com.hungraim.ism.util.ResultCode;
import com.hungraim.ltr.util.Result;
import com.hungraim.ltr.util.ResultCode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
......
package com.hungraim.ism.gateway.config;
package com.hungraim.ltr.gateway.config;
import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
import org.springframework.context.annotation.Bean;
......
package com.hungraim.ism.service;
package com.hungraim.ltr.service;
import com.hungraim.ism.api.SystemUserFeignService;
import com.hungraim.ism.pojo.entity.system.SystemUser;
import com.hungraim.ism.pojo.vo.system.UserLoginInfoVO;
import com.hungraim.ism.util.Result;
import com.hungraim.ism.util.ResultCode;
import com.hungraim.ltr.api.SystemAdminFeignService;
import com.hungraim.ltr.pojo.entity.system.SystemUser;
import com.hungraim.ltr.pojo.vo.system.UserLoginInfoVO;
import com.hungraim.ltr.util.Result;
import com.hungraim.ltr.util.ResultCode;
import lombok.AllArgsConstructor;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
......@@ -20,28 +20,23 @@ import java.util.List;
@AllArgsConstructor
public class UserDetailsServiceImpl implements UserDetailsService {
private final SystemUserFeignService systemUserFeignService;
private final SystemAdminFeignService systemAdminFeignService;
@Override
public UserDetails loadUserByUsername(String account) throws UsernameNotFoundException {
//获取用户基本信息
Result<SystemUser> userRes = systemUserFeignService.loadUserInfoByAccount(account);
Result<SystemUser> userRes = systemAdminFeignService.loadUserInfoByAccount(account);
//用户不存在
if (ResultCode.USER_NOT_EXIST.getCode().equals(userRes.getCode())) {
throw new UsernameNotFoundException(ResultCode.USER_NOT_EXIST.getMsg());
}
SystemUser systemUser = userRes.getData();
//根据用户id获取用户权限
Result<List<Long>> roles = systemUserFeignService.loadUserRolesByUserId(systemUser.getId());
Result<List<Long>> roles = systemAdminFeignService.loadUserRolesByUserId(systemUser.getId());
UserLoginInfoVO userLoginInfoVO = new UserLoginInfoVO(systemUser);
userLoginInfoVO.setAuthorities(roles.getData());
// Result<SystemMarketer> systemMarketerRes = systemUserFeignService.loadUserDetailByCode(systemUser.getMarketerCode());
// if (!ResultCode.MARKETER_NOT_EXIST.getCode().equals(systemMarketerRes.getCode())) {
// SystemMarketer systemMarketer = systemMarketerRes.getData();
// userLoginInfoVO.setAvatar(systemMarketer.getAvatar());
// }
return userLoginInfoVO;
}
}
......@@ -5,7 +5,7 @@ spring:
enabled: true
additional-paths: src/main/java
application:
name: ISM-AUTH-SERVICE
name: LTC-AUTH-SERVICE
cloud:
nacos:
discovery:
......@@ -16,13 +16,13 @@ spring:
server-addr: qw.hungraim.com:31158
file-extension: yaml # 必须修改成yaml
extension-configs:
- data-id: ism-auth.yaml
- data-id: ltc-auth.yaml
group: auth
refresh: true
- data-id: ism-database.yaml
- data-id: ltc-database.yaml
group: common
refresh: true
- data-id: ism-basic.yaml
- data-id: ltc-basic.yaml
group: common
refresh: true
server:
......
jdbc.driverClass=oracle.jdbc.driver.OracleDriver
jdbc.connectionURL=jdbc:oracle:thin:@111.229.31.51:1521:helowin
jdbc.username=ch_dev
jdbc.password=ch_dev
<?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="mybatis-generator/generator.properties"/>
<context id="oracle" targetRuntime="MyBatis3">
<!-- 生成的Java文件的编码 -->
<property name="javaFileEncoding" value="UTF-8"/>
<!-- 格式化java代码 -->
<property name="javaFormatter" value="org.mybatis.generator.api.dom.DefaultJavaFormatter"/>
<!-- 自定义注释生成,原jar不支持,需要自己重写一个类 type指定 (就是这个类) -->
<property name="beginningDelimiter" value="`"/>
<property name="endingDelimiter" value="`"/>
<!-- optional,旨在创建class时,对注释进行控制 -->
<commentGenerator type="com.hungraim.ism.gateway.config.MyCommentGenerator">
</commentGenerator>
<!--jdbc的数据库连接 -->
<jdbcConnection
driverClass="${jdbc.driverClass}"
connectionURL="${jdbc.connectionURL}"
userId="${jdbc.username}"
password="${jdbc.password}">
<property name="remarksReporting" value="true"/>
</jdbcConnection>
<!-- 非必需,类型处理器,在数据库类型和java类型之间的转换控制-->
<javaTypeResolver type="com.hungraim.ism.gateway.config.JavaTypeResolverImplUtil">
<property name="forceBigDecimals" value="false"/>
</javaTypeResolver>
<!-- Model模型生成器,用来生成含有主键key的类,记录类 以及查询Example类
targetPackage 指定生成的model生成所在的包名
targetProject 指定在该项目下所在的路径
-->
<javaModelGenerator targetPackage="com.hungraim.ism.pojo.entity.role"
targetProject="E:/workspace/projects/long-term-care/common/common-core/src/main/java">
<!-- 是否允许子包,即targetPackage.schemaName.tableName -->
<property name="enableSubPackages" value="false"/>
<!-- 是否对model添加 构造函数 -->
<property name="constructorBased" value="false"/>
<!-- 是否对类CHAR类型的列的数据进行trim操作 -->
<property name="trimStrings" value="true"/>
<!-- 建立的Model对象是否 不可改变 即生成的Model对象不会有 setter方法,只有构造方法 -->
<property name="immutable" value="true"/>
</javaModelGenerator>
<!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
<sqlMapGenerator targetPackage="mybatis/role"
targetProject="E:/workspace/projects/long-term-care/system/system-user-service/src/main/resources">
<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.hungraim.ism.mapper.role"
targetProject="E:/workspace/projects/long-term-care/system/system-user-service/src/main/java" type="XMLMAPPER">
<!-- enableSubPackages:是否让schema作为包的后缀 -->
<property name="enableSubPackages" value="false"/>
<property name="isMergeable" value="true"/>
<property name="implementationPackage" value="com.baomidou.mybatisplus.core.mapper.BaseMapper"/>
</javaClientGenerator>
<!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名 mapperName是Dao名-->
<table tableName="CH_FND_AC_MODULE" domainObjectName="ChFndAcModule" mapperName="ChFndAcModuleMapper"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
</table>
<table tableName="CH_FND_AC_MODULE_URL_BAK" domainObjectName="ChFndAcModuleUrlBak" mapperName="ChFndAcModuleUrlBakMapper"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
</table>
<table tableName="CH_FND_AC_ROLE" domainObjectName="ChFndAcRole" mapperName="ChFndAcRoleMapper"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
</table>
<table tableName="CH_FND_AC_ROLE_MODULE" domainObjectName="ChFndAcRoleModule" mapperName="ChFndAcRoleModuleMapper"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
</table>
<table tableName="CH_FND_AC_USER_ROLE" domainObjectName="ChFndAcUserRole" mapperName="ChFndAcUserRoleMapper"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
</table>
<table tableName="TPPES_CH_ROLE" domainObjectName="TppesChRole" mapperName="TppesChRoleMapper"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
</table>
<table tableName="TPPES_CH_ROLE_MENU" domainObjectName="TppesChRoleMenu" mapperName="TppesChRoleMenuMapper"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
</table>
<table tableName="TPPES_CH_USER_ROLE" domainObjectName="TppesChUserRole" mapperName="TppesChUserRoleMapper"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
</table>
<!-- <table tableName="TPPES_CH_DISABILITY_INFO1" domainObjectName="tppesChDisabilityInfo1" mapperName="tppesChDisabilityInfo1Mapper"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- </table>-->
<!-- <table tableName="TPPES_FND_CH_USER_INFO1" domainObjectName="tppesFndChUserInfo1" mapperName="tppesFndChUserInfo1Mapper"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- </table>-->
</context>
</generatorConfiguration>
......@@ -18,23 +18,23 @@ buildDeploy
cd "${WORKSPACE}"
mvn install
kubectl delete deployment ism-auth-service -n ism-service
kubectl delete deployment ism-gateway-service -n ism-service
kubectl delete deployment ism-system-user-service -n ism-service
kubectl delete deployment ltc-auth-service -n ltc-service
kubectl delete deployment ltc-gateway-service -n ltc-service
kubectl delete deployment ltc-system-admin-service -n ltc-service
docker images | grep -E "(ism)" | awk '{print $3}' | uniq | xargs -I {} docker rmi --force {}
docker images | grep -E "(ltc)" | awk '{print $3}' | uniq | xargs -I {} docker rmi --force {}
echo "服务构建完毕,开始打包docker镜像..."
docker login -u admin -p Hg123harbor localhost:9999
echo "==================auth镜像==================="
docker build -t localhost:9999/ism/ism-auth-service:latest -f auth-service/DOCKERFILE .
docker push localhost:9999/ism/ism-auth-service:latest
docker build -t localhost:9999/ltc/ltc-auth-service:latest -f auth-service/DOCKERFILE .
docker push localhost:9999/ltc/ltc-auth-service:latest
echo "==================gateway镜像==================="
docker build -t localhost:9999/ism/ism-gateway-service:latest -f gateway-service/DOCKERFILE .
docker push localhost:9999/ism/ism-gateway-service:latest
echo "==================system-user-service镜像==================="
docker build -t localhost:9999/ism/ism-system-user-service:latest -f system/system-user-service/DOCKERFILE .
docker push localhost:9999/ism/ism-system-user-service:latest
docker build -t localhost:9999/ltc/ltc-gateway-service:latest -f gateway-service/DOCKERFILE .
docker push localhost:9999/ltc/ltc-gateway-service:latest
echo "==================system-admin-service镜像==================="
docker build -t localhost:9999/ltc/ltc-system-admin-service:latest -f system/system-admin-service/DOCKERFILE .
docker push localhost:9999/ltc/ltc-system-admin-service:latest
echo "docker镜像上传完毕,智能营销平台项目构建完毕"
echo "清理缓存。。。"
mvn clean
......@@ -43,7 +43,7 @@ echo "===========auth-service=============="
kubectl create -f ./auth-service/deployment.yaml
echo "===========gateway-service=============="
kubectl create -f ./gateway-service/deployment.yaml
echo "===========user-service=============="
kubectl create -f ./system/system-user-service/deployment.yaml
echo "===========admin-service=============="
kubectl create -f ./system/system-admin-service/deployment.yaml
......@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>common</artifactId>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -12,7 +12,7 @@
<dependencies>
<dependency>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<artifactId>common-redis</artifactId>
<version>0.0.1</version>
</dependency>
......
package com.hungraim.ism.constant;
package com.hungraim.ltr.constant;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
......
package com.hungraim.ism.constant;
package com.hungraim.ltr.constant;
/**
* @author hubin
......@@ -28,7 +28,7 @@ public interface AuthConstants {
/**
* Redis缓存权限规则key
*/
String PERMISSION_ROLES_KEY = "ism:auth:permission:roles";
String PERMISSION_ROLES_KEY = "ltc:auth:permission:roles";
/**
......
package com.hungraim.ism.constant;
package com.hungraim.ltr.constant;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
......
package com.hungraim.ism.pojo.entity.SysConfig;
package com.hungraim.ltr.pojo.entity.SysConfig;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.dept;
package com.hungraim.ltr.pojo.entity.dept;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.dept;
package com.hungraim.ltr.pojo.entity.dept;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import java.io.Serializable;
import java.math.BigDecimal;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.disable;
package com.hungraim.ltr.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.eval;
package com.hungraim.ltr.pojo.entity.eval;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.eval;
package com.hungraim.ltr.pojo.entity.eval;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.role;
package com.hungraim.ltr.pojo.entity.role;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.role;
package com.hungraim.ltr.pojo.entity.role;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.role;
package com.hungraim.ltr.pojo.entity.role;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.role;
package com.hungraim.ltr.pojo.entity.role;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.role;
package com.hungraim.ltr.pojo.entity.role;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.role;
package com.hungraim.ltr.pojo.entity.role;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.role;
package com.hungraim.ltr.pojo.entity.role;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.role;
package com.hungraim.ltr.pojo.entity.role;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.serviceManage;
package com.hungraim.ltr.pojo.entity.serviceManage;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.serviceManage;
package com.hungraim.ltr.pojo.entity.serviceManage;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.serviceManage;
package com.hungraim.ltr.pojo.entity.serviceManage;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.serviceManage;
package com.hungraim.ltr.pojo.entity.serviceManage;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.system;
package com.hungraim.ltr.pojo.entity.system;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......
package com.hungraim.ism.pojo.entity.system;
package com.hungraim.ltr.pojo.entity.system;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
......@@ -14,7 +14,7 @@ import java.util.List;
* @author hubin
*/
@Data
@TableName("ISM_RESOURCE")
@TableName("LTC_RESOURCE")
public class SystemResource {
private Long id;
......@@ -22,6 +22,9 @@ public class SystemResource {
private String resourceUrl;
private String method;
private String resourceType;
private Long parentId;
@TableField("RESOURCE_ICON")
private String icon;
private Date createTime;
@TableField(exist = false)
......
package com.hungraim.ism.pojo.entity.system;
package com.hungraim.ltr.pojo.entity.system;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......@@ -10,13 +10,13 @@ import java.util.Date;
* @author hubin
*/
@Data
@TableName("ISM_ROLE")
@TableName("LTC_ROLE")
public class SystemRole {
private Long id;
private String name;
private String status;
private Integer status;
private Date createTime;
private Date modifyTime;
......
package com.hungraim.ism.pojo.entity.system;
package com.hungraim.ltr.pojo.entity.system;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......@@ -9,7 +9,7 @@ import lombok.Data;
* @author hubin
*/
@Data
@TableName("ISM_ROLE_RESOURCE")
@TableName("LTC_ROLE_RESOURCE")
public class SystemRoleResource {
private Long id;
private Long roleId;
......
package com.hungraim.ism.pojo.entity.system;
package com.hungraim.ltr.pojo.entity.system;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* @author hubin
*/
@Data
@NoArgsConstructor
@TableName("ISM_USER")
@TableName("LTC_USER")
public class SystemUser {
@TableId(type = IdType.AUTO)
......@@ -23,8 +21,10 @@ public class SystemUser {
private String account;
private String password;
private String realName;
private String avatar;
private String gender;
private String userStatus;
private String marketerCode;
private Integer userStatus;
private Date createdTime;
private Date updatedTime;
......
package com.hungraim.ism.pojo.entity.system;
import java.io.Serializable;
package com.hungraim.ltr.pojo.entity.system;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
......@@ -11,7 +9,7 @@ import lombok.Data;
*
*/
@Data
@TableName("ISM_USER_ROLE")
@TableName("LTC_USER_ROLE")
public class SystemUserRole {
private Long id;
......
package com.hungraim.ltr.pojo.vo.system;
import lombok.Data;
import java.util.List;
/**
* @author hubin
*/
@Data
public class MainMenuVO {
private Long id;
private Long parentId;
private String name;
private String icon;
private List<MainMenuVO> children;
}
package com.hungraim.ltr.pojo.vo.system;
import lombok.Data;
/**
* @author hubin
*/
@Data
public class ReqResource {
private Long id;
private String name;
private String url;
private String method;
private String type;
private Long parentId;
private String icon;
}
package com.hungraim.ltr.pojo.vo.system;
import lombok.Data;
import java.util.List;
/**
* @author hubin
*/
@Data
public class ReqRoleInfo {
private Long id;
private String name;
private Integer status;
private List<Long> resource;
}
package com.hungraim.ltr.pojo.vo.system;
import lombok.Data;
import java.util.List;
/**
* @author hubin
*/
@Data
public class ReqUserInfo {
private Long id;
private String account;
private String password;
private String name;
private String avatar;
private Integer enable;
private String gender;
private String marketerCode;
private List<Long> roleIds;
}
package com.hungraim.ism.pojo.vo.system;
package com.hungraim.ltr.pojo.vo.system;
import cn.hutool.core.collection.CollectionUtil;
import com.hungraim.ism.pojo.entity.system.SystemUser;
import com.hungraim.ltr.pojo.entity.system.SystemUser;
import lombok.Data;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
......
package com.hungraim.ism.util;
package com.hungraim.ltr.util;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.hungraim.ism.constant.AuthConstants;
import com.hungraim.ltr.constant.AuthConstants;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpEntity;
......
package com.hungraim.ism.util;
package com.hungraim.ltr.util;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
......
package com.hungraim.ism.util;
package com.hungraim.ltr.util;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
......
......@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>common</artifactId>
<groupId>com.hungraim.ism</groupId>
<groupId>com.hungraim.ltc</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -16,7 +16,7 @@
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<!-- 引用Mybatis 和 Oracle驱动开始 -->
<!-- 引用Mybatis 和 Mysql驱动开始 -->
<!-- mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
......@@ -26,20 +26,9 @@
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.1.0.7.0</version>
<version>11.2.0.3</version>
</dependency>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>1.3.5</version>
</dependency>
<dependency>
<groupId>com.hungraim.ism</groupId>
<artifactId>common-core</artifactId>
<version>0.0.1</version>
<scope>compile</scope>
</dependency>
<!-- 引用Mybatis 和 Oracle驱动结束 -->
<!-- 引用Mybatis 和 Mysql驱动结束 -->
</dependencies>
</project>
package com.hungraim.ism.mapper.SysConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.SysConfig.ChCfgProperties;
public interface ChCfgPropertiesMapper extends BaseMapper<ChCfgProperties> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.dept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.dept.ChFndDeptCate;
public interface ChFndDeptCateMapper extends BaseMapper<ChFndDeptCate> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.dept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.dept.ChFndDept;
public interface ChFndDeptMapper extends BaseMapper<ChFndDept> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.ChDepositAcct;
public interface ChDepositAcctMapper extends BaseMapper<ChDepositAcct> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.chDepositTrns;
public interface chDepositTrnsMapper extends BaseMapper<chDepositTrns> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.system.disable.chDisableApplyHis;
public interface chDisableApplyHisMapper extends BaseMapper<chDisableApplyHis> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.chDisableInfoChange;
public interface chDisableInfoChangeMapper extends BaseMapper<chDisableInfoChange> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.chDisableLongitude;
public interface chDisableLongitudeMapper extends BaseMapper<chDisableLongitude> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.chDisableRiskLevelHis;
public interface chDisableRiskLevelHisMapper extends BaseMapper<chDisableRiskLevelHis> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.chDisableRiskLevel;
public interface chDisableRiskLevelMapper extends BaseMapper<chDisableRiskLevel> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.chDisableTreatment;
public interface chDisableTreatmentMapper extends BaseMapper<chDisableTreatment> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.chFndApplyStatusType;
public interface chFndApplyStatusTypeMapper extends BaseMapper<chFndApplyStatusType> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.tppesChDisabilityInfo1;
public interface tppesChDisabilityInfo1Mapper extends BaseMapper<tppesChDisabilityInfo1> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.disable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.disable.tppesFndChUserInfo1;
public interface tppesFndChUserInfo1Mapper extends BaseMapper<tppesFndChUserInfo1> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.eval;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.eval.ChAprReportEvaluate;
public interface ChAprReportEvaluateMapper extends BaseMapper<ChAprReportEvaluate> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.eval;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.eval.ChCfgAprGroupDetail;
public interface ChCfgAprGroupDetailMapper extends BaseMapper<ChCfgAprGroupDetail> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.role.ChFndAcModule;
public interface ChFndAcModuleMapper extends BaseMapper<ChFndAcModule> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.role.ChFndAcModuleUrlBak;
public interface ChFndAcModuleUrlBakMapper extends BaseMapper<ChFndAcModuleUrlBak> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.role.ChFndAcRole;
public interface ChFndAcRoleMapper extends BaseMapper<ChFndAcRole> {
}
\ No newline at end of file
package com.hungraim.ism.mapper.role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ism.pojo.entity.role.ChFndAcRoleModule;
public interface ChFndAcRoleModuleMapper extends BaseMapper<ChFndAcRoleModule> {
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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 to comment