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

README.md

-![](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.部署说明
 >

apply/apply-api/pom.xml

@@ -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>

apply/apply-service/deployment.yaml

@@ -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端口

apply/apply-service/pom.xml

@@ -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>

apply/apply-service/src/main/java/com/hungraim/ism/ApplyApplication.java → apply/apply-service/src/main/java/com/hungraim/ltr/ApplyApplication.java

-package com.hungraim.ism;
+package com.hungraim.ltr;
 
 
 import org.springframework.boot.SpringApplication;

apply/apply-service/src/main/resources/bootstrap.yml

@@ -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

apply/pom.xml

@@ -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>

assessment/assessment-api/pom.xml

@@ -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>

assessment/assessment-service/deployment.yaml

@@ -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端口

assessment/assessment-service/pom.xml

@@ -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>

assessment/assessment-service/src/main/java/com/hungraim/ism/AssessmentApplication.java → assessment/assessment-service/src/main/java/com/hungraim/ltr/AssessmentApplication.java

-package com.hungraim.ism;
+package com.hungraim.ltr;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

assessment/assessment-service/src/main/resources/bootstrap.yml

@@ -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

assessment/pom.xml

@@ -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>

auth-service/deployment.yaml

 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端口

auth-service/pom.xml

@@ -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>

auth-service/src/main/java/com/hungraim/ism/gateway/config/JavaTypeResolverImplUtil.java

-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;
-    }
-}

auth-service/src/main/java/com/hungraim/ism/gateway/config/MyCommentGenerator.java

-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(" */");
-    }
-}

auth-service/src/main/java/com/hungraim/ism/gateway/config/MybatisGeneratorRun.java

-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);
-        }
-    }
-}

auth-service/src/main/java/com/hungraim/ism/AuthApplication.java → auth-service/src/main/java/com/hungraim/ltr/AuthApplication.java

-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

auth-service/src/main/java/com/hungraim/ism/controller/AuthController.java → auth-service/src/main/java/com/hungraim/ltr/controller/AuthController.java

-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;

auth-service/src/main/java/com/hungraim/ism/controller/PublicKeyController.java → auth-service/src/main/java/com/hungraim/ltr/controller/PublicKeyController.java

-package com.hungraim.ism.controller;
+package com.hungraim.ltr.controller;
 
 import com.nimbusds.jose.jwk.JWKSet;
 import com.nimbusds.jose.jwk.RSAKey;

auth-service/src/main/java/com/hungraim/ism/gateway/config/AuthorizationServerConfiguration.java → auth-service/src/main/java/com/hungraim/ltr/gateway/config/AuthorizationServerConfiguration.java

-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());
     }

auth-service/src/main/java/com/hungraim/ism/gateway/config/GlobalExceptionHandler.java → auth-service/src/main/java/com/hungraim/ltr/gateway/config/GlobalExceptionHandler.java

-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;

auth-service/src/main/java/com/hungraim/ism/gateway/config/WebSecurityConfig.java → auth-service/src/main/java/com/hungraim/ltr/gateway/config/WebSecurityConfig.java

-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;

auth-service/src/main/java/com/hungraim/ism/service/UserDetailsServiceImpl.java → auth-service/src/main/java/com/hungraim/ltr/service/UserDetailsServiceImpl.java

-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;
     }
 }

auth-service/src/main/resources/bootstrap.yml

@@ -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:

auth-service/src/main/resources/mybatis-generator/generator.properties

-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

auth-service/src/main/resources/mybatis-generator/generatorConfig.xml

-<?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>

build.sh

@@ -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
 
 

common/common-core/pom.xml

@@ -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>

common/common-core/src/main/java/com/hungraim/ism/constant/AssignStatus.java → common/common-core/src/main/java/com/hungraim/ltr/constant/AssignStatus.java

-package com.hungraim.ism.constant;
+package com.hungraim.ltr.constant;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

common/common-core/src/main/java/com/hungraim/ism/constant/AuthConstants.java → common/common-core/src/main/java/com/hungraim/ltr/constant/AuthConstants.java

-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";
 
 
   /**

common/common-core/src/main/java/com/hungraim/ism/constant/Gender.java → common/common-core/src/main/java/com/hungraim/ltr/constant/Gender.java

-package com.hungraim.ism.constant;
+package com.hungraim.ltr.constant;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/SysConfig/ChCfgProperties.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/SysConfig/ChCfgProperties.java

-package com.hungraim.ism.pojo.entity.SysConfig;
+package com.hungraim.ltr.pojo.entity.SysConfig;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/dept/ChFndDept.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/dept/ChFndDept.java

-package com.hungraim.ism.pojo.entity.dept;
+package com.hungraim.ltr.pojo.entity.dept;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/dept/ChFndDeptCate.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/dept/ChFndDeptCate.java

-package com.hungraim.ism.pojo.entity.dept;
+package com.hungraim.ltr.pojo.entity.dept;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDepositAcct.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChDepositAcct.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDepositTrns.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChDepositTrns.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableApplyHis.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChDisableApplyHis.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableInfoChange.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChDisableInfoChange.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableLongitude.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChDisableLongitude.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableRiskLevel.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChDisableRiskLevel.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableRiskLevelHis.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChDisableRiskLevelHis.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableTreatment.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChDisableTreatment.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChFndApplyStatusType.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/ChFndApplyStatusType.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/TppesChDisabilityInfo1.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/TppesChDisabilityInfo1.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/TppesFndChUserInfo1.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/disable/TppesFndChUserInfo1.java

-package com.hungraim.ism.pojo.entity.disable;
+package com.hungraim.ltr.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/eval/ChAprReportEvaluate.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/eval/ChAprReportEvaluate.java

-package com.hungraim.ism.pojo.entity.eval;
+package com.hungraim.ltr.pojo.entity.eval;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/eval/ChCfgAprGroupDetail.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/eval/ChCfgAprGroupDetail.java

-package com.hungraim.ism.pojo.entity.eval;
+package com.hungraim.ltr.pojo.entity.eval;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcModule.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/role/ChFndAcModule.java

-package com.hungraim.ism.pojo.entity.role;
+package com.hungraim.ltr.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcModuleUrlBak.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/role/ChFndAcModuleUrlBak.java

-package com.hungraim.ism.pojo.entity.role;
+package com.hungraim.ltr.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcRole.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/role/ChFndAcRole.java

-package com.hungraim.ism.pojo.entity.role;
+package com.hungraim.ltr.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcRoleModule.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/role/ChFndAcRoleModule.java

-package com.hungraim.ism.pojo.entity.role;
+package com.hungraim.ltr.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcUserRole.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/role/ChFndAcUserRole.java

-package com.hungraim.ism.pojo.entity.role;
+package com.hungraim.ltr.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/TppesChRole.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/role/TppesChRole.java

-package com.hungraim.ism.pojo.entity.role;
+package com.hungraim.ltr.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/TppesChRoleMenu.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/role/TppesChRoleMenu.java

-package com.hungraim.ism.pojo.entity.role;
+package com.hungraim.ltr.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/TppesChUserRole.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/role/TppesChUserRole.java

-package com.hungraim.ism.pojo.entity.role;
+package com.hungraim.ltr.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/serviceManage/ChCfgAcc.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/serviceManage/ChCfgAcc.java

-package com.hungraim.ism.pojo.entity.serviceManage;
+package com.hungraim.ltr.pojo.entity.serviceManage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/serviceManage/ChSrvProgram.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/serviceManage/ChSrvProgram.java

-package com.hungraim.ism.pojo.entity.serviceManage;
+package com.hungraim.ltr.pojo.entity.serviceManage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/serviceManage/ChSrvSendEvaluate.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/serviceManage/ChSrvSendEvaluate.java

-package com.hungraim.ism.pojo.entity.serviceManage;
+package com.hungraim.ltr.pojo.entity.serviceManage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/serviceManage/TppesChh5Picture1.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/serviceManage/TppesChh5Picture1.java

-package com.hungraim.ism.pojo.entity.serviceManage;
+package com.hungraim.ltr.pojo.entity.serviceManage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemClientDetails.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/system/SystemClientDetails.java

-package com.hungraim.ism.pojo.entity.system;
+package com.hungraim.ltr.pojo.entity.system;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemResource.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/system/SystemResource.java

-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)

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemRole.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/system/SystemRole.java

-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;
 

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemRoleResource.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/system/SystemRoleResource.java

-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;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemUser.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/system/SystemUser.java

-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;
 

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemUserRole.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/system/SystemUserRole.java

-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;
 

common/common-core/src/main/java/com/hungraim/ltr/pojo/vo/system/MainMenuVO.java

+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;
+
+}

common/common-core/src/main/java/com/hungraim/ltr/pojo/vo/system/ReqResource.java

+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;
+}

common/common-core/src/main/java/com/hungraim/ltr/pojo/vo/system/ReqRoleInfo.java

+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;
+
+
+}

common/common-core/src/main/java/com/hungraim/ltr/pojo/vo/system/ReqUserInfo.java

+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;
+
+
+}

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/system/UserLoginInfoVO.java → common/common-core/src/main/java/com/hungraim/ltr/pojo/vo/system/UserLoginInfoVO.java

-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;

common/common-core/src/main/java/com/hungraim/ltr/util/CheckStrength.java

+package com.hungraim.ltr.util;
+
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * 检测密码强度
+ *
+ * @author venshine
+ */
+public class CheckStrength {
+    public enum LEVEL {
+        //强度分级
+        EASY,
+        MEDIUM,
+        STRONG,
+        VERY_STRONG,
+        EXTREMELY_STRONG
+    }
+
+    /**
+     * NUM 数字
+     * SMALL_LETTER 小写字母
+     * CAPITAL_LETTER 大写字母
+     * OTHER_CHAR 特殊字符
+     */
+    private static final int NUM = 1;
+    private static final int SMALL_LETTER = 2;
+    private static final int CAPITAL_LETTER = 3;
+    private static final int OTHER_CHAR = 4;
+    /**
+     * 简单的密码字典
+     */
+    private final static String[] DICTIONARY = {"password", "abc123", "iloveyou", "adobe123", "123123", "sunshine",
+        "1314520", "a1b2c3", "123qwe", "aaa111", "qweasd", "admin", "passwd"};
+
+    /**
+     * 检查字符类型，包括num、大写字母、小写字母和其他字符。
+     *
+     * @param c
+     * @return
+     */
+    private static int checkCharacterType(char c) {
+        if (c >= 48 && c <= 57) {
+            return NUM;
+        }
+        if (c >= 65 && c <= 90) {
+            return CAPITAL_LETTER;
+        }
+        if (c >= 97 && c <= 122) {
+            return SMALL_LETTER;
+        }
+        return OTHER_CHAR;
+    }
+
+    /**
+     * 按不同类型计算密码的数量
+     *
+     * @param passwd
+     * @param type
+     * @return
+     */
+    private static int countLetter(String passwd, int type) {
+        int count = 0;
+        if (null != passwd && passwd.length() > 0) {
+            for (char c : passwd.toCharArray()) {
+                if (checkCharacterType(c) == type) {
+                    count++;
+                }
+            }
+        }
+        return count;
+    }
+
+    public static boolean isCharEqual(String str) {
+        return str.replace(str.charAt(0), ' ').trim().length() == 0;
+    }
+
+    /**
+     * 检查密码的强度
+     *
+     * @param passwd
+     * @return strength level
+     */
+    public static int checkPasswordStrength(String passwd) {
+        if (StrUtil.isBlankIfStr(passwd)) {
+            throw new IllegalArgumentException("password is empty");
+        }
+        int len = passwd.length();
+        int level = 0;
+        // 增加点
+        //判断密码是否含有数字有level++
+        if (countLetter(passwd, NUM) > 0) {
+            level++;
+        }
+        //判断密码是否含有小写字母有level++
+        if (countLetter(passwd, SMALL_LETTER) > 0) {
+            level++;
+        }
+        //判断密码是否还有大写字母有level++
+        if (len > 4 && countLetter(passwd, CAPITAL_LETTER) > 0) {
+            level++;
+        }
+        //判断密码是否还有特殊字符有level++
+        if (len > 6 && countLetter(passwd, OTHER_CHAR) > 0) {
+            level++;
+        }
+        //密码长度大于4并且2种类型组合......（不一一概述）
+        if (len > 4 && countLetter(passwd, NUM) > 0 && countLetter(passwd, SMALL_LETTER) > 0
+            || countLetter(passwd, NUM) > 0 && countLetter(passwd, CAPITAL_LETTER) > 0
+            || countLetter(passwd, NUM) > 0 && countLetter(passwd, OTHER_CHAR) > 0
+            || countLetter(passwd, SMALL_LETTER) > 0 && countLetter(passwd, CAPITAL_LETTER) > 0
+            || countLetter(passwd, SMALL_LETTER) > 0 && countLetter(passwd, OTHER_CHAR) > 0
+            || countLetter(passwd, CAPITAL_LETTER) > 0 && countLetter(passwd, OTHER_CHAR) > 0) {
+            level++;
+        }
+        //密码长度大于6并且3中类型组合......（不一一概述）
+        if (len > 6 && countLetter(passwd, NUM) > 0 && countLetter(passwd, SMALL_LETTER) > 0
+            && countLetter(passwd, CAPITAL_LETTER) > 0 || countLetter(passwd, NUM) > 0
+            && countLetter(passwd, SMALL_LETTER) > 0 && countLetter(passwd, OTHER_CHAR) > 0
+            || countLetter(passwd, NUM) > 0 && countLetter(passwd, CAPITAL_LETTER) > 0
+            && countLetter(passwd, OTHER_CHAR) > 0 || countLetter(passwd, SMALL_LETTER) > 0
+            && countLetter(passwd, CAPITAL_LETTER) > 0 && countLetter(passwd, OTHER_CHAR) > 0) {
+            level++;
+        }
+        //密码长度大于8并且4种类型组合......（不一一概述）
+        if (len > 8 && countLetter(passwd, NUM) > 0 && countLetter(passwd, SMALL_LETTER) > 0
+            && countLetter(passwd, CAPITAL_LETTER) > 0 && countLetter(passwd, OTHER_CHAR) > 0) {
+            level++;
+        }
+        //密码长度大于6并且2种类型组合每种类型长度大于等于3或者2......（不一一概述）
+        if (len > 6 && countLetter(passwd, NUM) >= 3 && countLetter(passwd, SMALL_LETTER) >= 3
+            || countLetter(passwd, NUM) >= 3 && countLetter(passwd, CAPITAL_LETTER) >= 3
+            || countLetter(passwd, NUM) >= 3 && countLetter(passwd, OTHER_CHAR) >= 2
+            || countLetter(passwd, SMALL_LETTER) >= 3 && countLetter(passwd, CAPITAL_LETTER) >= 3
+            || countLetter(passwd, SMALL_LETTER) >= 3 && countLetter(passwd, OTHER_CHAR) >= 2
+            || countLetter(passwd, CAPITAL_LETTER) >= 3 && countLetter(passwd, OTHER_CHAR) >= 2) {
+            level++;
+        }
+        //密码长度大于8并且3种类型组合每种类型长度大于等于3或者2......（不一一概述）
+        if (len > 8 && countLetter(passwd, NUM) >= 2 && countLetter(passwd, SMALL_LETTER) >= 2
+            && countLetter(passwd, CAPITAL_LETTER) >= 2 || countLetter(passwd, NUM) >= 2
+            && countLetter(passwd, SMALL_LETTER) >= 2 && countLetter(passwd, OTHER_CHAR) >= 2
+            || countLetter(passwd, NUM) >= 2 && countLetter(passwd, CAPITAL_LETTER) >= 2
+            && countLetter(passwd, OTHER_CHAR) >= 2 || countLetter(passwd, SMALL_LETTER) >= 2
+            && countLetter(passwd, CAPITAL_LETTER) >= 2 && countLetter(passwd, OTHER_CHAR) >= 2) {
+            level++;
+        }
+        //密码长度大于10并且4种类型组合每种类型长度大于等于2......（不一一概述）
+        if (len > 10 && countLetter(passwd, NUM) >= 2 && countLetter(passwd, SMALL_LETTER) >= 2
+            && countLetter(passwd, CAPITAL_LETTER) >= 2 && countLetter(passwd, OTHER_CHAR) >= 2) {
+            level++;
+        }
+        //特殊字符>=3 level++;
+        if (countLetter(passwd, OTHER_CHAR) >= 3) {
+            level++;
+        }
+        //特殊字符>=6 level++;
+        if (countLetter(passwd, OTHER_CHAR) >= 6) {
+            level++;
+        }
+        //长度>12 >16 level++
+        if (len > 12) {
+            level++;
+            if (len >= 16) {
+                level++;
+            }
+        }
+        // 减少点
+        if ("abcdefghijklmnopqrstuvwxyz".indexOf(passwd) > 0 || "ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(passwd) > 0) {
+            level--;
+        }
+        if ("qwertyuiop".indexOf(passwd) > 0 || "asdfghjkl".indexOf(passwd) > 0 || "zxcvbnm".indexOf(passwd) > 0) {
+            level--;
+        }
+        if (NumberUtil.isNumber(passwd) && ("01234567890".indexOf(passwd) > 0 || "09876543210".indexOf(passwd) > 0)) {
+            level--;
+        }
+        if (countLetter(passwd, NUM) == len || countLetter(passwd, SMALL_LETTER) == len
+            || countLetter(passwd, CAPITAL_LETTER) == len) {
+            level--;
+        }
+        // aaabbb
+        if (len % 2 == 0) {
+            String part1 = passwd.substring(0, len / 2);
+            String part2 = passwd.substring(len / 2);
+            if (part1.equals(part2)) {
+                level--;
+            }
+            if (isCharEqual(part1) && isCharEqual(part2)) {
+                level--;
+            }
+        }
+        // ababab
+        if (len % 3 == 0) {
+            String part1 = passwd.substring(0, len / 3);
+            String part2 = passwd.substring(len / 3, len / 3 * 2);
+            String part3 = passwd.substring(len / 3 * 2);
+            if (part1.equals(part2) && part2.equals(part3)) {
+                level--;
+            }
+        }
+        // 19881010 or 881010
+        if (NumberUtil.isNumber(passwd) && len >= 6) {
+            int year = 0;
+            if (len == 8 || len == 6) {
+                year = Integer.parseInt(passwd.substring(0, len - 4));
+            }
+            int size = (year + "").length();
+            int month = Integer.parseInt(passwd.substring(size, size + 2));
+            int day = Integer.parseInt(passwd.substring(size + 2, len));
+            if (year >= 1950 && year < 2050 && month >= 1 && month <= 12 && day >= 1 && day <= 31) {
+                level--;
+            }
+        }
+        // dictionary
+        if (DICTIONARY.length > 0) {
+            for (String s : DICTIONARY) {
+                if (passwd.equals(s) || s.contains(passwd)) {
+                    level--;
+                    break;
+                }
+            }
+        }
+        if (len <= 6) {
+            level--;
+            if (len <= 4) {
+                level--;
+                if (len <= 3) {
+                    level = 0;
+                }
+            }
+        }
+        if (isCharEqual(passwd)) {
+            level = 0;
+        }
+        if (level < 0) {
+            level = 0;
+        }
+        return level;
+    }
+
+    /**
+     * 获得密码强度等级，包括简单、复杂、强、强、强
+     *
+     * @param passwd
+     * @return
+     */
+    public static LEVEL getPasswordLevel(String passwd) {
+        int level = checkPasswordStrength(passwd);
+        switch (level) {
+            case 0:
+            case 1:
+            case 2:
+            case 3:
+                return LEVEL.EASY;
+            case 4:
+            case 5:
+            case 6:
+                return LEVEL.MEDIUM;
+            case 7:
+            case 8:
+            case 9:
+                return LEVEL.STRONG;
+            case 10:
+            case 11:
+            case 12:
+                return LEVEL.VERY_STRONG;
+            default:
+                return LEVEL.EXTREMELY_STRONG;
+        }
+    }
+}
+

common/common-core/src/main/java/com/hungraim/ism/util/DateUtils.java → common/common-core/src/main/java/com/hungraim/ltr/util/DateUtils.java

-package com.hungraim.ism.util;
+package com.hungraim.ltr.util;
 
 
 import cn.hutool.core.util.StrUtil;

common/common-core/src/main/java/com/hungraim/ism/util/IResultCode.java → common/common-core/src/main/java/com/hungraim/ltr/util/IResultCode.java

-package com.hungraim.ism.util;
+package com.hungraim.ltr.util;
 
 /**
  * @author hubin

common/common-core/src/main/java/com/hungraim/ism/util/RequestUtils.java → common/common-core/src/main/java/com/hungraim/ltr/util/RequestUtils.java

-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;

common/common-core/src/main/java/com/hungraim/ism/util/Result.java → common/common-core/src/main/java/com/hungraim/ltr/util/Result.java

-package com.hungraim.ism.util;
+package com.hungraim.ltr.util;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/util/ResultCode.java → common/common-core/src/main/java/com/hungraim/ltr/util/ResultCode.java

-package com.hungraim.ism.util;
+package com.hungraim.ltr.util;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

common/common-mybatis/pom.xml

@@ -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>

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/SysConfig/ChCfgPropertiesMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/dept/ChFndDeptCateMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/dept/ChFndDeptMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/ChDepositAcctMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDepositTrnsMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableApplyHisMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableInfoChangeMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableLongitudeMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableRiskLevelHisMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableRiskLevelMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableTreatmentMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chFndApplyStatusTypeMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/tppesChDisabilityInfo1Mapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/tppesFndChUserInfo1Mapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/eval/ChAprReportEvaluateMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/eval/ChCfgAprGroupDetailMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcModuleMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcModuleUrlBakMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcRoleMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcRoleModuleMapper.java

-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

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcUserRoleMapper.java

-package com.hungraim.ism.mapper.role;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.role.ChFndAcUserRole;
-
-public interface ChFndAcUserRoleMapper extends BaseMapper<ChFndAcUserRole> {
-}
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/TppesChRoleMapper.java

-package com.hungraim.ism.mapper.role;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.role.TppesChRole;
-
-public interface TppesChRoleMapper extends BaseMapper<TppesChRole> {
-}
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/TppesChRoleMenuMapper.java

-package com.hungraim.ism.mapper.role;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.role.TppesChRoleMenu;
-
-public interface TppesChRoleMenuMapper extends BaseMapper<TppesChRoleMenu> {
-}
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/TppesChUserRoleMapper.java

-package com.hungraim.ism.mapper.role;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.role.TppesChUserRole;
-
-public interface TppesChUserRoleMapper extends BaseMapper<TppesChUserRole> {
-}
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/serviceManage/ChCfgAccMapper.java

-package com.hungraim.ism.mapper.serviceManage;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.serviceManage.ChCfgAcc;
-
-public interface ChCfgAccMapper extends BaseMapper<ChCfgAcc> {
-}
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/serviceManage/ChSrvProgramMapper.java

-package com.hungraim.ism.mapper.serviceManage;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.serviceManage.ChSrvProgram;
-
-public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> {
-}
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/serviceManage/ChSrvSendEvaluateMapper.java

-package com.hungraim.ism.mapper.serviceManage;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.serviceManage.ChSrvSendEvaluate;
-
-public interface ChSrvSendEvaluateMapper extends BaseMapper<ChSrvSendEvaluate> {
-}
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/serviceManage/TppesChh5Picture1Mapper.java

-package com.hungraim.ism.mapper.serviceManage;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.serviceManage.TppesChh5Picture1;
-
-public interface TppesChh5Picture1Mapper extends BaseMapper<TppesChh5Picture1> {
-}
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/config/DataSourceConfig.java → common/common-mybatis/src/main/java/com/hungraim/ltr/config/DataSourceConfig.java

-package com.hungraim.ism.config;
+package com.hungraim.ltr.config;
 
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;

common/common-mybatis/src/main/resources/mybatis/SysConfig/ChCfgPropertiesMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.SysConfig.ChCfgPropertiesMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.SysConfig.ChCfgProperties">
-    <constructor>
-      <idArg column="PROPERTIES_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="KEY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="VALUE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ORGAN_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="PROPERTIES_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REMARK" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="VISIBLE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    PROPERTIES_ID, KEY, VALUE, ORGAN_ID, PROPERTIES_NAME, DISTRICT_PROVINCIAL, DISTRICT_CITY, 
-    DISTRICT_AREA, REMARK, STATUS, VISIBLE, LCD, LCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/dept/ChFndDeptCateMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.dept.ChFndDeptCateMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.dept.ChFndDeptCate">
-    <constructor>
-      <arg column="DEPT_CATE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="CATE_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/dept/ChFndDeptMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.dept.ChFndDeptMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.dept.ChFndDept">
-    <constructor>
-      <arg column="DEPT_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEPT_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DEPT_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DEPT_ABBR" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="PARENT_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="IS_LEAF" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="STATUS" javaType="java.lang.String" jdbcType="CHAR" />
-      <arg column="FOUND_DATE" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="REVOKE_DATE" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="REVOKE_CAUSE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ORGAN_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DEPT_CATE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEPT_GRADE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADDR" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ZIP" javaType="java.lang.String" jdbcType="CHAR" />
-      <arg column="TEL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="AREA_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FAX" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="EMAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DEPT_FAMILY" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="HR_DEPT_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChDepositAcctMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.ChDepositAcctMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.ChDepositAcct">
-    <constructor>
-      <idArg column="ACCT_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISABLE_INFO_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACCT_STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACCT_AMOUNT" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="CREATE_DATE" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="CANCEL_DATE" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="DISTRICT_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DEFINE_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="EFF_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="END_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="END_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    ACCT_ID, DISABLE_INFO_ID, ACCT_STATUS, ACCT_AMOUNT, CREATE_DATE, CANCEL_DATE, DISTRICT_PROVINCIAL, 
-    DISTRICT_CITY, DISTRICT_AREA, DEFINE_EMP, EFF_TIME, END_EMP, END_TIME, FCD, FCU, 
-    LCD, LCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChDepositTrnsMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chDepositTrnsMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.chDepositTrns">
-    <constructor>
-      <idArg column="TRNS_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACCT_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEPOSIT_AMOUNT" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEPOSIT_DATE" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="BUSI_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEPOSIT_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="BALANCE_AMOUNT" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    TRNS_ID, ACCT_ID, DEPOSIT_AMOUNT, DEPOSIT_DATE, BUSI_ID, DEPOSIT_TYPE, BALANCE_AMOUNT, 
-    FCD, FCU, LCD, LCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChDisableApplyHisMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chDisableApplyHisMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.ChDisableApplyHis">
-    <constructor>
-      <idArg column="APPLY_HIS_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="APPLY_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ORGAN_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REAL_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CERTI_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="BIRTHDAY" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="GENDER" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="TEL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADRESS_DISTRICT_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADRESS_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISEASE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="SRV_MODE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISEASE_DESC" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MEDICAL_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="MEDICAL_CARD" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="SRV_ORGAN_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="OPER_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_CERTI_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_TEL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_RELATION" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_DISTRICT_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_ADDRESS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="APR_CONF_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="APPLY_STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="CHECK_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CHECK_REMARK" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CHECK_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="DEFINE_EMG" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="EFF_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="END_EMG" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="END_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="APL_ORGAN_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADRESS_DISTRICT_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADRESS_DISTRICT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_DISTRICT_PROVINCE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_DISTRICT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="LAST_TASK_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DATA_FROM" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="WEB_DEFINE_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="WEB_END_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="APR_TOTAL_SCORE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_ADDRESS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISE_TYPE_F" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISE_TYPE_S" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="CFG_MODE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="REASONS_REVIEW" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REASONS_REMARK" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="APPLY_METHOD" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="FIRST_APPLY_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADDRESS_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="AGENT_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="AGENT_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_ROAD_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_ROAD_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADDRESS_NUMBER_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_NUMBER_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_ROAD_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_ROAD_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_NUMBER_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_NUMBER_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="OPER_ROAD_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_ROAD_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="OPER_NUMBER_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_NUMBER_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_SRV_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_ROAD_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_ROAD_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_SRV_NUMBER_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_NUMBER_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_SRV_ADDRESS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_SRV_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FIXED_TEL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST_ADDRESS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MEDICAL_HISTORY1" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MEDICAL_HISTORY2" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MEDICAL_HISTORY3" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="HEIGHT" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="WEIGHT" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="LEFT_HAND_GRIP" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="RIGHT_HAND_GRIP" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="BODY_INCOMPLETE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="VISION_OBSTACLE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="HEARING_OBSTACLE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="MEDICAL_HISTORY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="HIS_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="HIS_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="OPER_FIXED_TEL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="TREATMENT_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    APPLY_HIS_ID, APPLY_ID, ORGAN_ID, DISTRICT_PROVINCIAL, DISTRICT_CITY, DISTRICT_AREA, 
-    REAL_NAME, CERTI_CODE, BIRTHDAY, GENDER, TEL, ADRESS_DISTRICT_CODE, ADRESS_DETAIL, 
-    REGIST, DISEASE, SRV_MODE_ID, DISEASE_DESC, MEDICAL_TYPE, MEDICAL_CARD, SRV_ORGAN_ID, 
-    OPER_NAME, OPER_CERTI_CODE, OPER_TEL, OPER_RELATION, OPER_DISTRICT_CODE, OPER_ADDRESS, 
-    APR_CONF_ID, APPLY_STATUS, CHECK_NAME, CHECK_REMARK, CHECK_TIME, DEFINE_EMG, EFF_TIME, 
-    END_EMG, END_TIME, FCD, FCU, LCD, LCU, APL_ORGAN_ID, ADRESS_DISTRICT_PROVINCIAL, 
-    ADRESS_DISTRICT_CITY, OPER_DISTRICT_PROVINCE, OPER_DISTRICT_CITY, LAST_TASK_ID, DATA_FROM, 
-    WEB_DEFINE_EMP, WEB_END_EMP, STREET, APR_TOTAL_SCORE, ACPT_PROVINCIAL, ACPT_CITY, 
-    ACPT_AREA, ACPT_STREET, ACPT_ADDRESS, ACPT_TYPE, DISE_TYPE_F, DISE_TYPE_S, CFG_MODE_ID, 
-    REASONS_REVIEW, REASONS_REMARK, APPLY_METHOD, FIRST_APPLY_ID, ADDRESS_LONGITUDE, 
-    ADDRESS_LATITUDE, ACPT_LONGITUDE, ACPT_LATITUDE, OPER_STREET, AGENT_LONGITUDE, AGENT_LATITUDE, 
-    ADDRESS_ROAD_DETAIL, ADDRESS_ROAD_TYPE, ADDRESS_NUMBER_DETAIL, ADDRESS_NUMBER_TYPE, 
-    ACPT_ROAD_DETAIL, ACPT_ROAD_TYPE, ACPT_NUMBER_DETAIL, ACPT_NUMBER_TYPE, OPER_ROAD_DETAIL, 
-    OPER_ROAD_TYPE, OPER_NUMBER_DETAIL, OPER_NUMBER_TYPE, ACPT_SRV_PROVINCIAL, ACPT_SRV_CITY, 
-    ACPT_SRV_AREA, ACPT_SRV_STREET, ACPT_SRV_ROAD_DETAIL, ACPT_SRV_ROAD_TYPE, ACPT_SRV_NUMBER_DETAIL, 
-    ACPT_SRV_NUMBER_TYPE, ACPT_SRV_ADDRESS, ACPT_SRV_TYPE, ACPT_SRV_LONGITUDE, ACPT_SRV_LATITUDE, 
-    FIXED_TEL, REGIST_PROVINCIAL, REGIST_CITY, REGIST_AREA, REGIST_STREET, REGIST_ADDRESS, 
-    REGIST_LONGITUDE, REGIST_LATITUDE, MEDICAL_HISTORY1, MEDICAL_HISTORY2, MEDICAL_HISTORY3, 
-    HEIGHT, WEIGHT, LEFT_HAND_GRIP, RIGHT_HAND_GRIP, BODY_INCOMPLETE, VISION_OBSTACLE, 
-    HEARING_OBSTACLE, MEDICAL_HISTORY, HIS_TIME, HIS_EMP, OPER_FIXED_TEL, TREATMENT_TYPE
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChDisableInfoChangeMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chDisableInfoChangeMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.ChDisableInfoChange">
-    <constructor>
-      <idArg column="CHANGE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISAB_INFO_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ORGAN_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_PROVINCE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REAL_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CERTIF_NUM" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="BIRTHDAY" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="GENDER" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="TEL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REGIST" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADDRESS_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_ROAD_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_ROAD_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADDRESS_NUMBER_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_NUMBER_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADDRESS_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_ROAD_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_ROAD_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_NUMBER_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_NUMBER_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_SRV_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_ROAD_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_ROAD_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ACPT_SRV_NUMBER_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_NUMBER_TYPE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_ADDRESS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_SRV_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="OPER_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_CERTI_NUM" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_TEL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_RELATION" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="OPER_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_ROAD_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_ROAD_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="OPER_NUMBER_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_NUMBER_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="OPER_ADDRESS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_DISTRICT_LONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="OPER_DISTRICT_LATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CHANGE_REASON" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="APPLY_STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="CHECK_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CHECK_REMARK" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CHECK_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="APL_ORGAN_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="WEB_DEFINE_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="WEB_END_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DATA_FROM" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEFINE_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="EFF_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="END_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="END_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADDRESS_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="TREATMENT_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    CHANGE_ID, DISAB_INFO_ID, ORGAN_ID, DISTRICT_PROVINCE, DISTRICT_CITY, DISTRICT_AREA, 
-    REAL_NAME, CERTIF_NUM, BIRTHDAY, GENDER, TEL, REGIST, ADDRESS_PROVINCIAL, ADDRESS_CITY, 
-    ADDRESS_AREA, ADDRESS_STREET, ADDRESS_ROAD_DETAIL, ADDRESS_ROAD_TYPE, ADDRESS_NUMBER_DETAIL, 
-    ADDRESS_NUMBER_TYPE, ADDRESS_DETAIL, ADDRESS_LONGITUDE, ADDRESS_LATITUDE, ACPT_PROVINCIAL, 
-    ACPT_CITY, ACPT_AREA, ACPT_STREET, ACPT_ROAD_DETAIL, ACPT_ROAD_TYPE, ACPT_NUMBER_DETAIL, 
-    ACPT_NUMBER_TYPE, ACPT_DETAIL, ACPT_LONGITUDE, ACPT_LATITUDE, ACPT_TYPE, ACPT_SRV_PROVINCIAL, 
-    ACPT_SRV_CITY, ACPT_SRV_AREA, ACPT_SRV_STREET, ACPT_SRV_ROAD_DETAIL, ACPT_SRV_ROAD_TYPE, 
-    ACPT_SRV_NUMBER_DETAIL, ACPT_SRV_NUMBER_TYPE, ACPT_SRV_ADDRESS, ACPT_SRV_LONGITUDE, 
-    ACPT_SRV_LATITUDE, ACPT_SRV_TYPE, OPER_NAME, OPER_CERTI_NUM, OPER_TEL, OPER_RELATION, 
-    OPER_PROVINCIAL, OPER_CITY, OPER_AREA, OPER_STREET, OPER_ROAD_DETAIL, OPER_ROAD_TYPE, 
-    OPER_NUMBER_DETAIL, OPER_NUMBER_TYPE, OPER_ADDRESS, OPER_DISTRICT_LONGITUDE, OPER_DISTRICT_LATITUDE, 
-    CHANGE_REASON, APPLY_STATUS, CHECK_NAME, CHECK_REMARK, CHECK_TIME, APL_ORGAN_ID, 
-    WEB_DEFINE_EMP, WEB_END_EMP, DATA_FROM, DEFINE_EMP, EFF_TIME, END_EMP, END_TIME, 
-    FCD, FCU, LCD, LCU, ADDRESS_TYPE, TREATMENT_TYPE
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChDisableLongitudeMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chDisableLongitudeMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.ChDisableLongitude">
-    <constructor>
-      <idArg column="DISABLE_SONGITUDE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="APPLY_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ADDRESS_ONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_ATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_ONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_ATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="AGENT_ONGITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="AGENT_ATITUDE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    DISABLE_SONGITUDE_ID, APPLY_ID, ADDRESS_ONGITUDE, ADDRESS_ATITUDE, ACPT_ONGITUDE, 
-    ACPT_ATITUDE, AGENT_ONGITUDE, AGENT_ATITUDE, FCD, FCU, LCD, LCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChDisableRiskLevelHisMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chDisableRiskLevelHisMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.ChDisableRiskLevelHis">
-    <constructor>
-      <idArg column="DISA_RISK_LEVEL_HIS_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISA_RISK_LEVEL_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISAB_INFO_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISAB_SUSP_COU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISAB_SUM_COU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="RISK_LEVEL_PERCENT" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="RISK_LEVEL" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="REMARK" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    DISA_RISK_LEVEL_HIS_ID, DISA_RISK_LEVEL_ID, DISAB_INFO_ID, DISAB_SUSP_COU, DISAB_SUM_COU, 
-    RISK_LEVEL_PERCENT, RISK_LEVEL, STATUS, REMARK, FCD, FCU, LCD, LCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChDisableRiskLevelMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chDisableRiskLevelMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.ChDisableRiskLevel">
-    <constructor>
-      <idArg column="DISA_RISK_LEVEL_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISAB_INFO_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISAB_SUSP_COU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISAB_SUM_COU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="RISK_LEVEL_PERCENT" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="RISK_LEVEL" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="REMARK" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    DISA_RISK_LEVEL_ID, DISAB_INFO_ID, DISAB_SUSP_COU, DISAB_SUM_COU, RISK_LEVEL_PERCENT, 
-    RISK_LEVEL, STATUS, REMARK, FCD, FCU, LCD, LCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChDisableTreatmentMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chDisableTreatmentMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.ChDisableTreatment">
-    <constructor>
-      <idArg column="TREATMENT_ID" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="DISABLE_INFO_ID" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="DISABLE_APPLY_ID" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="TREATMENT_STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="BE_HOSPITAL_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LEAVE_HOSPITAL_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="DIE_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="TREATMENT_CHOOSE_REMARK" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    TREATMENT_ID, DISABLE_INFO_ID, DISABLE_APPLY_ID, TREATMENT_STATUS, BE_HOSPITAL_TIME, 
-    LEAVE_HOSPITAL_TIME, DIE_TIME, TREATMENT_CHOOSE_REMARK, STATUS, FCD, FCU, LCD, LCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/ChFndApplyStatusTypeMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chFndApplyStatusTypeMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.ChFndApplyStatusType">
-    <constructor>
-      <arg column="APL_STATUS_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="APL_STATUS_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/TppesChDisabilityInfo1Mapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.tppesChDisabilityInfo1Mapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.TppesChDisabilityInfo1">
-    <constructor>
-      <idArg column="DISABILITY_ID" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="TASK_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REAL_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="PRO" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CERTI_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="BIRTH_DATE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="SEX" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="TEL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISEASE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISEASE_DESC" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRES" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ORGAN_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ORGAN_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="INSERT_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="TYPEF_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="TYPEF_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="TYPES_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="TYPES_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTPRO_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTPRO_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTCITY_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTCITY_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTAREA_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTAREA_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTSTREET_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTSTREET_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_ADD" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTADD_TYPE_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPTADD_TYPE_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MODE_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MODE_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MODE_DESC" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    DISABILITY_ID, TASK_ID, REAL_NAME, PRO, CITY, CERTI_CODE, BIRTH_DATE, SEX, TEL, DISEASE, 
-    DISEASE_DESC, ADDRES, ORGAN_ID, ORGAN_NAME, INSERT_TIME, TYPEF_ID, TYPEF_NAME, TYPES_ID, 
-    TYPES_NAME, ACPTPRO_CODE, ACPTPRO_NAME, ACPTCITY_CODE, ACPTCITY_NAME, ACPTAREA_CODE, 
-    ACPTAREA_NAME, ACPTSTREET_CODE, ACPTSTREET_NAME, ACPT_ADD, ACPTADD_TYPE_CODE, ACPTADD_TYPE_NAME, 
-    MODE_ID, MODE_NAME, MODE_DESC
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/disable/TppesFndChUserInfo1Mapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.tppesFndChUserInfo1Mapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.disable.TppesFndChUserInfo1">
-    <constructor>
-      <idArg column="INFO_ID" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="USER_ID" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="CERTI_TYPE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CERTI_CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="REAL_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MP" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="STATUS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="USER_TYPE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="IS_CREATE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="SEX" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="BIRTHDAY" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    INFO_ID, USER_ID, CERTI_TYPE, CERTI_CODE, REAL_NAME, MP, STATUS, USER_TYPE, FCD, 
-    IS_CREATE, SEX, BIRTHDAY
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/eval/ChAprReportEvaluateMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.eval.ChAprReportEvaluateMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.eval.ChAprReportEvaluate">
-    <constructor>
-      <idArg column="EVALUATE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="REPORT_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="CONDITION_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="CONDITION_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    EVALUATE_ID, REPORT_ID, CONDITION_TYPE, CONDITION_ID, STATUS, FCD, FCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/eval/ChCfgAprGroupDetailMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.eval.ChCfgAprGroupDetailMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.eval.ChCfgAprGroupDetail">
-    <constructor>
-      <idArg column="DETAIL_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="GROUP_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISTRICT_PROVINCE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DISTRICT_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS_DETAIL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ADDRESS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="EVALUATE_TASK_START_TIME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="EVALUATE_TASK_END_TIME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="NOON_BREAK_START_TIME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="NOON_BREAK_END_TIME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="EVALUATE_TASK_TIME" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="NOON_BREAK" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    DETAIL_ID, GROUP_ID, DISTRICT_PROVINCE, DISTRICT_CITY, DISTRICT_AREA, STREET, ADDRESS_DETAIL, 
-    ADDRESS, EVALUATE_TASK_START_TIME, EVALUATE_TASK_END_TIME, NOON_BREAK_START_TIME, 
-    NOON_BREAK_END_TIME, EVALUATE_TASK_TIME, FCD, FCU, LCD, LCU, STATUS, NOON_BREAK
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/role/ChFndAcModuleMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.role.ChFndAcModuleMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.role.ChFndAcModule">
-    <constructor>
-      <arg column="MODULE_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="PARENT_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="MODULE_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="VIEW_ORDER" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="IS_LEAF" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="URL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="IS_FINANCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/role/ChFndAcModuleUrlBakMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.role.ChFndAcModuleUrlBakMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.role.ChFndAcModuleUrlBak">
-    <constructor>
-      <arg column="MODULE_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="URL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="URL_DESC" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/role/ChFndAcRoleMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.role.ChFndAcRoleMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.role.ChFndAcRole">
-    <constructor>
-      <arg column="ROLE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ROLE_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ROLE_CATE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEPICT" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="SUPERVISE" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="PARENT_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ORGAN_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/role/ChFndAcRoleModuleMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.role.ChFndAcRoleModuleMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.role.ChFndAcRoleModule">
-    <constructor>
-      <arg column="ROLE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="MODULE_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/role/ChFndAcUserRoleMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.role.ChFndAcUserRoleMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.role.ChFndAcUserRole">
-    <constructor>
-      <arg column="USER_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ROLE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/role/TppesChRoleMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.role.TppesChRoleMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.role.TppesChRole">
-    <constructor>
-      <idArg column="ROLE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ROLE_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="DEPICT" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ROLE_STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ROLE_STOP_DATE" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/role/TppesChRoleMenuMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.role.TppesChRoleMenuMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.role.TppesChRoleMenu">
-    <constructor>
-      <arg column="ROLE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="MENU_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/role/TppesChUserRoleMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.role.TppesChUserRoleMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.role.TppesChUserRole">
-    <constructor>
-      <arg column="USER_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ROLE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="EMP_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/serviceManage/ChCfgAccMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.serviceManage.ChCfgAccMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.serviceManage.ChCfgAcc">
-    <constructor>
-      <idArg column="ACC_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="SRV_MODE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="SRV_MODE_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACC" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="LEVEL_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="REMARK" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    ACC_ID, SRV_MODE_ID, SRV_MODE_NAME, ACC, LEVEL_ID, REMARK
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/serviceManage/ChSrvProgramMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.serviceManage.ChSrvProgramMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.serviceManage.ChSrvProgram">
-    <constructor>
-      <arg column="PROGRAM_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ITEM_CFG_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="SRV_ORGAN_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="SRV_MODE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DISAB_INFO_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEFINE_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="EFF_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="END_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="END_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="PROG_STATUS" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="END_REASON" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="PROGRAM_DATE" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="PROGRAM_EDN_DATE" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="WEB_DEFINE_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="WEB_END_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DATA_FROM" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="TREATMENT_START_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="TREATMENT_END_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="SRV_PACK_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="SRV_PACK_FREQ" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="SRV_PACK_TIMES" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="SRV_PACK_PRICE" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="CHARGE_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="BUILD_BED_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/serviceManage/ChSrvSendEvaluateMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.serviceManage.ChSrvSendEvaluateMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.serviceManage.ChSrvSendEvaluate">
-    <constructor>
-      <idArg column="SRV_SEND_EVALUATE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="SRV_ORGAN_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="SRV_MODE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="EVALUATE_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="ALLOT_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="ACPT_PROVINCIAL" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_CITY" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_AREA" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_STREET" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_ADDRESS" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="ACPT_TYPE" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="IS_VALID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="DEFINE_EMP" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="EFF_TIME" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="LCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-    </constructor>
-  </resultMap>
-  <sql id="Base_Column_List">
-    SRV_SEND_EVALUATE_ID, SRV_ORGAN_ID, SRV_MODE_ID, EVALUATE_ID, ALLOT_TIME, ACPT_PROVINCIAL, 
-    ACPT_CITY, ACPT_AREA, ACPT_STREET, ACPT_ADDRESS, ACPT_TYPE, IS_VALID, DEFINE_EMP, 
-    EFF_TIME, FCD, FCU, LCD, LCU
-  </sql>
-</mapper>
\ No newline at end of file

common/common-mybatis/src/main/resources/mybatis/serviceManage/TppesChh5Picture1Mapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.serviceManage.TppesChh5Picture1Mapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ism.pojo.entity.serviceManage.TppesChh5Picture1">
-    <constructor>
-      <arg column="PICTURE_ID" javaType="java.math.BigDecimal" jdbcType="DECIMAL" />
-      <arg column="MEDIA_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FILE_PATH" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FILE_NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="FCU" javaType="java.lang.Integer" jdbcType="DECIMAL" />
-      <arg column="LCD" javaType="java.util.Date" jdbcType="TIMESTAMP" />
-      <arg column="IS_READ" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CH_USER_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="CH_DISAB_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="PROGRAM_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="STEP_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="FRONT_FILE_PATH" javaType="java.lang.String" jdbcType="VARCHAR" />
-    </constructor>
-  </resultMap>
-</mapper>
\ No newline at end of file

common/common-redis/pom.xml

@@ -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>

common/common-redis/src/main/java/com/hungraim/ism/redis/RedisConfig.java → common/common-redis/src/main/java/com/hungraim/ltr/redis/RedisConfig.java

-package com.hungraim.ism.redis;
+package com.hungraim.ltr.redis;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;

common/pom.xml

@@ -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>

gateway-service/deployment.yaml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ism-gateway-service
-  namespace: ism-service
+  name: ltc-gateway-service
+  namespace: ltc-service
   labels:
-    app: ism-gateway-service
+    app: ltc-gateway-service
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: ism-gateway-service
+      app: ltc-gateway-service
   template:
     metadata:
       labels:
-        app: ism-gateway-service
+        app: ltc-gateway-service
     spec:
       imagePullSecrets:
-        - name: ism-harbor
+        - name: ltc-harbor
       containers:
-        - name: ism-gateway-service                          #TODO:pod的名称，必须字段，名称唯一且对象创建后不可以被修改
-          image: localhost:9999/ism/ism-gateway-service:latest  #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
+        - name: ltc-gateway-service                          #TODO:pod的名称，必须字段，名称唯一且对象创建后不可以被修改
+          image: localhost:9999/ltc/ltc-gateway-service:latest  #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
           imagePullPolicy: Always                         #Always(总是去仓库下载),Never(从不去仓库下载),IfNotPresent(如果本地没有就去仓库下载),默认是"IfNotPresent"
           ports:
             - containerPort: 8001                       #TODO:containerPort是pod内部容器的端口，targetPort映射到containerPort;例如，mysql服务需要暴露3306端口，redis暴露6379端口

gateway-service/pom.xml

@@ -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>
@@ -39,12 +39,12 @@
       </exclusions>
     </dependency>
     <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-redis</artifactId>
       <version>0.0.1</version>
     </dependency>

gateway-service/src/main/java/com/hungraim/ism/gateway/utils/WebUtils.java

-package com.hungraim.ism.gateway.utils;
-
-import cn.hutool.json.JSONUtil;
-import com.hungraim.ism.util.Result;
-import com.hungraim.ism.util.ResultCode;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpResponse;
-import reactor.core.publisher.Mono;
-
-
-import java.nio.charset.Charset;
-
-/**
- * @author hubin
- */
-public class WebUtils {
-
-
-
-}

gateway-service/src/main/java/com/hungraim/ism/GatewayApplication.java → gateway-service/src/main/java/com/hungraim/ltr/GatewayApplication.java

-package com.hungraim.ism;
+package com.hungraim.ltr;
 
 
 import org.springframework.boot.SpringApplication;

gateway-service/src/main/java/com/hungraim/ism/gateway/config/CorsConfig.java → gateway-service/src/main/java/com/hungraim/ltr/gateway/config/CorsConfig.java

-package com.hungraim.ism.gateway.config;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.gateway.discovery.DiscoveryClientRouteDefinitionLocator;
-import org.springframework.cloud.gateway.discovery.DiscoveryLocatorProperties;
-import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
+package com.hungraim.ltr.gateway.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;

gateway-service/src/main/java/com/hungraim/ism/gateway/config/GatewayConfig.java → gateway-service/src/main/java/com/hungraim/ltr/gateway/config/GatewayConfig.java

-package com.hungraim.ism.gateway.config;
+package com.hungraim.ltr.gateway.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

gateway-service/src/main/java/com/hungraim/ism/gateway/config/NacosGatewayDefineConfig.java → gateway-service/src/main/java/com/hungraim/ltr/gateway/config/NacosGatewayDefineConfig.java

-package com.hungraim.ism.gateway.config;
+package com.hungraim.ltr.gateway.config;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.nacos.api.NacosFactory;
 import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.config.listener.Listener;
 import com.alibaba.nacos.api.exception.NacosException;
-import com.hungraim.ism.gateway.service.impl.NacosDynamicRouteServiceImpl;
+import com.hungraim.ltr.gateway.service.impl.NacosDynamicRouteServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;

gateway-service/src/main/java/com/hungraim/ism/gateway/config/ResourceServerConfig.java → gateway-service/src/main/java/com/hungraim/ltr/gateway/config/ResourceServerConfig.java

-package com.hungraim.ism.gateway.config;
+package com.hungraim.ltr.gateway.config;
 
 import cn.hutool.json.JSONUtil;
-import com.hungraim.ism.constant.AuthConstants;
-import com.hungraim.ism.gateway.security.AuthorizationManager;
-import com.hungraim.ism.util.Result;
-import com.hungraim.ism.util.ResultCode;
+import com.hungraim.ltr.constant.AuthConstants;
+import com.hungraim.ltr.gateway.security.AuthorizationManager;
+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;

gateway-service/src/main/java/com/hungraim/ism/gateway/security/AuthorizationManager.java → gateway-service/src/main/java/com/hungraim/ltr/gateway/security/AuthorizationManager.java

-package com.hungraim.ism.gateway.security;
+package com.hungraim.ltr.gateway.security;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
-import com.hungraim.ism.constant.AuthConstants;
+import com.hungraim.ltr.constant.AuthConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

gateway-service/src/main/java/com/hungraim/ism/gateway/service/INacosDynamicRouteService.java → gateway-service/src/main/java/com/hungraim/ltr/gateway/service/INacosDynamicRouteService.java

-package com.hungraim.ism.gateway.service;
+package com.hungraim.ltr.gateway.service;
 
 import org.springframework.cloud.gateway.route.RouteDefinition;
 

gateway-service/src/main/java/com/hungraim/ism/gateway/service/impl/NacosDynamicRouteServiceImpl.java → gateway-service/src/main/java/com/hungraim/ltr/gateway/service/impl/NacosDynamicRouteServiceImpl.java

-package com.hungraim.ism.gateway.service.impl;
+package com.hungraim.ltr.gateway.service.impl;
 
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
-import com.hungraim.ism.gateway.service.INacosDynamicRouteService;
+import com.hungraim.ltr.gateway.service.INacosDynamicRouteService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.event.RefreshRoutesEvent;

gateway-service/src/main/java/com/hungraim/ltr/gateway/utils/WebUtils.java

+package com.hungraim.ltr.gateway.utils;
+
+/**
+ * @author hubin
+ */
+public class WebUtils {
+
+
+
+}

gateway-service/src/main/resources/bootstrap.yml

@@ -4,24 +4,24 @@ spring:
       enabled: true
       additional-paths: src/main/java
   application:
-    name: ISM-GATEWAY-SERVICE
+    name: LTC-GATEWAY-SERVICE
   cloud:
     nacos:
       discovery:
         server-addr: qw.hungraim.com:31158
-        namespace: 74494ee6-1c9c-4165-97d2-d876f4b4befc
+        namespace: 87d6f6f1-6583-46ea-ad02-7e8125f03c90
       config:
-        namespace: 74494ee6-1c9c-4165-97d2-d876f4b4befc
+        namespace: 87d6f6f1-6583-46ea-ad02-7e8125f03c90
         server-addr: qw.hungraim.com:31158
         file-extension: yaml  # 必须修改成yaml
         extension-configs:
-          - data-id: ism-basic.yaml
+          - data-id: ltc-basic.yaml
             group: common
             refresh: true
-          - data-id: ism-database.yaml
+          - data-id: ltc-database.yaml
             group: common
             refresh: true
-          - data-id: ism-gateway.yaml
+          - data-id: ltc-gateway.yaml
             group: gateway
             refresh: true
     gateway:
@@ -34,7 +34,7 @@ nacos:
     gateway:
       route:
         config:
-          data-id: ism-gateway-router
+          data-id: ltc-gateway-router
           group: common
 server:
   port: 8001

manage/manage-api/pom.xml

@@ -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>manage</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>

manage/manage-service/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: manage-service
-  namespace: ism-service
+  namespace: ltc-service
   labels:
     app: manage-service
 spec:
@@ -16,10 +16,10 @@ spec:
         app: manage-service
     spec:
       imagePullSecrets:
-        - name: ism-harbor
+        - name: ltc-harbor
       containers:
         - name: manage                          #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端口

manage/manage-service/pom.xml

@@ -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>manage</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>

manage/manage-service/src/main/java/com/hungraim/ism/ManageApplication.java → manage/manage-service/src/main/java/com/hungraim/ltr/ManageApplication.java

-package com.hungraim.ism;
+package com.hungraim.ltr;
 
 
 import org.springframework.boot.SpringApplication;

manage/manage-service/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
       enabled: true
       additional-paths: src/main/java
   application:
-    name: ISM-SYSTEM-USER-SERVICE-SERVICE
+    name: LTC-MANAGE-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

manage/pom.xml

@@ -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>

pom.xml

@@ -16,8 +16,8 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <packaging>pom</packaging>
-  <groupId>com.hungraim.ism</groupId>
-  <artifactId>ism</artifactId>
+    <groupId>com.hungraim.ltc</groupId>
+    <artifactId>ltc</artifactId>
     <version>0.0.1</version>
     <name>spring-cloud-init</name>
     <description>parent</description>

system/pom.xml

@@ -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>
@@ -13,7 +13,7 @@
   <packaging>pom</packaging>
   <modules>
     <module>system-api</module>
-    <module>system-user-service</module>
+    <module>system-admin-service</module>
   </modules>
 
   <properties>

system/system-user-service/DOCKERFILE → system/system-admin-service/DOCKERFILE

@@ -5,7 +5,7 @@ VOLUME /tmp
 #容器使用端口
 EXPOSE 8002
 #添加jar包入容器
-ADD system/system-user-service/target/system-user-0.0.1.jar app.jar
+ADD system/system-admin-service/target/system-admin-0.0.1.jar app.jar
 #改名
 RUN sh -c 'touch /app.jar'
 #容器启动java

system/system-user-service/deployment.yaml → system/system-admin-service/deployment.yaml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ism-system-user-service
-  namespace: ism-service
+  name: ltc-system-admin-service
+  namespace: ltc-service
   labels:
-    app: ism-system-user-service
+    app: ltc-system-admin-service
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: ism-system-user-service
+      app: ltc-system-admin-service
   template:
     metadata:
       labels:
-        app: ism-system-user-service
+        app: ltc-system-admin-service
     spec:
       imagePullSecrets:
-        - name: ism-harbor
+        - name: ltc-harbor
       containers:
-        - name: ism-system-user-service                          #TODO:pod的名称，必须字段，名称唯一且对象创建后不可以被修改
-          image: localhost:9999/ism/ism-system-user-service:latest  #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
+        - name: ltc-system-admin-service                          #TODO:pod的名称，必须字段，名称唯一且对象创建后不可以被修改
+          image: localhost:9999/ltc/ltc-system-admin-service:latest  #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
           imagePullPolicy: Always                         #Always(总是去仓库下载),Never(从不去仓库下载),IfNotPresent(如果本地没有就去仓库下载),默认是"IfNotPresent"
           ports:
             - containerPort: 8001                       #TODO:containerPort是pod内部容器的端口，targetPort映射到containerPort;例如，mysql服务需要暴露3306端口，redis暴露6379端口

system/system-user-service/pom.xml → system/system-admin-service/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>system</artifactId>
-    <groupId>com.hungraim.ism</groupId>
+    <groupId>com.hungraim.ltc</groupId>
     <version>0.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>system-user</artifactId>
+  <artifactId>system-admin</artifactId>
 
   <dependencies>
     <dependency>
@@ -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>

system/system-user-service/src/main/java/com/hungraim/ism/SystemApplication.java → system/system-admin-service/src/main/java/com/hungraim/ltr/SystemApplication.java

-package com.hungraim.ism;
+package com.hungraim.ltr;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

system/system-user-service/src/main/java/com/hungraim/ism/component/InitResourceRoleCacheRunner.java → system/system-admin-service/src/main/java/com/hungraim/ltr/component/InitResourceRoleCacheRunner.java

-package com.hungraim.ism.component;
+package com.hungraim.ltr.component;
 
-import com.hungraim.ism.system.service.impl.SystemResourceServiceImpl;
+import com.hungraim.ltr.system.service.impl.SystemResourceServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;

system/system-admin-service/src/main/java/com/hungraim/ltr/system/controller/ResourcesController.java

+package com.hungraim.ltr.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hungraim.ltr.pojo.entity.system.SystemResource;
+import com.hungraim.ltr.pojo.vo.system.MainMenuVO;
+import com.hungraim.ltr.pojo.vo.system.ReqResource;
+import com.hungraim.ltr.system.service.ISystemResourceService;
+import com.hungraim.ltr.util.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author hubin
+ */
+@RestController
+@RequestMapping("/api.system/resource")
+@Slf4j
+public class ResourcesController {
+
+    @Autowired
+    private ISystemResourceService resourceService;
+
+
+    /**
+     * 获取主菜单信息
+     * @return
+     */
+    @GetMapping("/getManinMenu")
+    public Result getMainMenu() {
+
+        //查出所有菜单 并且转换成菜单vo
+        List<MainMenuVO> resourceList = resourceService.list(new LambdaQueryWrapper<SystemResource>().eq(SystemResource::getResourceType, "2"))
+            .stream().map(item -> {
+                MainMenuVO mainMenuVO = new MainMenuVO();
+                mainMenuVO.setIcon(item.getIcon());
+                mainMenuVO.setName(item.getResourceName());
+                mainMenuVO.setId(item.getId());
+                mainMenuVO.setParentId(item.getParentId());
+                return mainMenuVO;
+            }).collect(Collectors.toList());
+        //转成tree形式菜单数据
+        List<MainMenuVO> result = resourceList.stream().filter(item -> 0 == item.getParentId()).peek(item -> item.setChildren(getChildren(item, resourceList))
+        ).collect(Collectors.toList());
+        return Result.success(result);
+    }
+
+    /**
+     * 递归获取子菜单
+     *
+     * @param root
+     * @param all
+     * @return
+     */
+    public static List<MainMenuVO> getChildren(MainMenuVO root, List<MainMenuVO> all) {
+        return all.stream().filter(item -> item.getParentId().equals(root.getId()))
+            .peek((item) -> item.setChildren(getChildren(item, all))).collect(Collectors.toList());
+    }
+
+
+    @PostMapping("/addResource")
+    public Result addResource(ReqResource reqResource){
+
+        if (StrUtil.isBlankIfStr(reqResource.getName())) {
+            return Result.failed("资源类型不能为空！");
+        }
+        if (StrUtil.isBlankIfStr(reqResource.getType())) {
+            return Result.failed("资源名称不能为空！");
+        }
+
+        SystemResource systemResource = new SystemResource();
+        systemResource.setResourceName(reqResource.getName());
+        systemResource.setResourceUrl(reqResource.getUrl());
+        systemResource.setResourceType(reqResource.getType());
+        systemResource.setIcon(reqResource.getIcon());
+        systemResource.setIcon(reqResource.getIcon());
+        systemResource.setParentId(reqResource.getParentId());
+        systemResource.setCreateTime(new Date());
+        resourceService.save(systemResource);
+        return  Result.success("插入成功");
+    }
+
+    @PostMapping("/queryResources")
+    public Result queryResources(ReqResource reqResource){
+        QueryWrapper<SystemResource> systemResourceQueryWrapper = new QueryWrapper<>();
+        if (StrUtil.isBlankIfStr(reqResource.getName())) {
+            systemResourceQueryWrapper.and(wrapper -> wrapper.lambda().like(SystemResource::getResourceName, reqResource.getName()));
+        }
+        if (StrUtil.isBlankIfStr(reqResource.getUrl())) {
+            systemResourceQueryWrapper.and(wrapper -> wrapper.lambda().like(SystemResource::getResourceUrl, reqResource.getUrl()));
+        }
+        return  Result.success(resourceService.list(systemResourceQueryWrapper));
+    }
+
+
+
+}

system/system-admin-service/src/main/java/com/hungraim/ltr/system/controller/RoleController.java

+package com.hungraim.ltr.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hungraim.ltr.pojo.entity.system.SystemRole;
+import com.hungraim.ltr.pojo.entity.system.SystemRoleResource;
+import com.hungraim.ltr.pojo.vo.system.ReqRoleInfo;
+import com.hungraim.ltr.system.service.ISystemRoleResourceService;
+import com.hungraim.ltr.system.service.ISystemRoleService;
+import com.hungraim.ltr.util.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author hubin
+ */
+@RestController
+@RequestMapping("/api.system/role")
+@Slf4j
+public class RoleController {
+
+    @Autowired
+    private ISystemRoleResourceService roleResourceService;
+    @Autowired
+    private ISystemRoleService roleService;
+
+
+    /**
+     * 根据权限id获取相应的资源id
+     *
+     * @param roleIds
+     * @return
+     */
+    @PostMapping("/getRoleResource")
+    public Result getRoleResource(@RequestParam List<String> roleIds) {
+        List<Long> list = roleResourceService.list(new LambdaQueryWrapper<SystemRoleResource>().in(
+            SystemRoleResource::getRoleId, roleIds
+        )).stream().map(SystemRoleResource::getResourceId).collect(Collectors.toList());
+        return Result.success(list);
+    }
+
+    @PostMapping("/addRole")
+    public Result addRole(ReqRoleInfo reqRoleInfo) {
+
+        if (StrUtil.isBlankIfStr(reqRoleInfo.getName())) {
+            return Result.failed("角色名称不能为空！");
+        }
+
+        SystemRole role = roleService.getOne(new LambdaQueryWrapper<SystemRole>()
+            .eq(SystemRole::getName, reqRoleInfo.getName()));
+
+        if (role != null) {
+            return Result.failed("角色名称不能重复！");
+        }
+
+        SystemRole systemRole = new SystemRole();
+        systemRole.setName(reqRoleInfo.getName());
+        systemRole.setStatus(reqRoleInfo.getStatus());
+        systemRole.setCreateTime(new Date());
+        roleService.save(systemRole);
+
+        List<SystemRoleResource> roleResources = reqRoleInfo.getResource().stream().map(resourceId -> {
+            SystemRoleResource systemRoleResource = new SystemRoleResource();
+            systemRoleResource.setRoleId(reqRoleInfo.getId());
+            systemRoleResource.setResourceId(resourceId);
+            return systemRoleResource;
+        }).collect(Collectors.toList());
+        roleResourceService.saveBatch(roleResources);
+
+        return Result.success("新增成功");
+
+    }
+
+    /**
+     * 判断是否合法
+     *
+     * @param roleName
+     * @return
+     */
+    @GetMapping("/isLegitimate/{roleName}")
+    public Result isLegitimate(@PathVariable String roleName) {
+        if (StrUtil.isBlankIfStr(roleName)) {
+            return Result.failed("名称不能为空！");
+        }
+        SystemRole systemRole = roleService.getOne(new LambdaQueryWrapper<SystemRole>()
+            .eq(SystemRole::getName, roleName));
+        if (systemRole != null) {
+            return Result.failed("名称已存在！");
+        }
+        return Result.success("成功");
+    }
+
+    /**
+     * 查询角色列表
+     * @param reqRoleInfo
+     * @return
+     */
+    @PostMapping("/queryRoles")
+    public Result queryRoles(ReqRoleInfo reqRoleInfo) {
+        QueryWrapper<SystemRole> systemRoleQueryWrapper = new QueryWrapper<>();
+
+        if (!StrUtil.isBlankIfStr(reqRoleInfo.getName())) {
+            systemRoleQueryWrapper.and(wrapper -> wrapper.lambda().like(SystemRole::getName, reqRoleInfo.getName()));
+        }
+        if (!StrUtil.isBlankIfStr(reqRoleInfo.getStatus())) {
+            systemRoleQueryWrapper.and(wrapper -> wrapper.lambda().eq(SystemRole::getStatus, reqRoleInfo.getStatus()));
+        }
+        return Result.success(roleService.list(systemRoleQueryWrapper));
+    }
+
+    /**
+     * 更新角色信息
+     * @param reqRoleInfo
+     * @return
+     */
+    @PostMapping("/updateRole")
+    public Result updateRole(ReqRoleInfo reqRoleInfo) {
+        if (reqRoleInfo.getId() == null || reqRoleInfo.getId() == 0) {
+            return Result.failed("角色ID无效！");
+        }
+        SystemRole systemRole = roleService.getOne(new LambdaQueryWrapper<SystemRole>().eq(SystemRole::getId, reqRoleInfo.getId()));
+        if (systemRole == null) {
+            return Result.failed("角色ID无效！");
+        }
+        boolean flag = false;
+        if (!reqRoleInfo.getName().equals(systemRole.getName())) {
+            systemRole.setName(reqRoleInfo.getName());
+            flag = true;
+        }
+        if (!reqRoleInfo.getStatus().equals(systemRole.getStatus())) {
+            systemRole.setStatus(reqRoleInfo.getStatus());
+            flag = true;
+        }
+        if (flag) {
+            systemRole.setModifyTime(new Date());
+            roleService.save(systemRole);
+        }
+
+        //查询该角色下所有的资源数据
+        List<SystemRoleResource> roleResources = roleResourceService.list(new LambdaQueryWrapper<SystemRoleResource>().eq(SystemRoleResource::getRoleId, reqRoleInfo.getId()));
+        List<SystemRoleResource> newRoleResources = reqRoleInfo.getResource().stream()
+            .filter(id -> {
+            for (SystemRoleResource r : roleResources) {
+                if (r.getResourceId().equals(id)) {
+                    return false;
+                }
+            }
+            return true;
+        }).map(resourceId -> {
+            SystemRoleResource systemRoleResource = new SystemRoleResource();
+            systemRoleResource.setResourceId(resourceId);
+            systemRoleResource.setRoleId(reqRoleInfo.getId());
+            return systemRoleResource;
+        }).collect(Collectors.toList());
+        roleResourceService.saveBatch(newRoleResources);
+
+        List<Long> deleteRoleResources = roleResources.stream()
+            .map(SystemRoleResource::getResourceId).filter(resourceId -> !reqRoleInfo.getResource().contains(resourceId))
+            .collect(Collectors.toList());
+        roleResourceService.removeByIds(deleteRoleResources);
+        return Result.success("更新成功");
+    }
+
+
+}

system/system-admin-service/src/main/java/com/hungraim/ltr/system/controller/UserController.java

+package com.hungraim.ltr.system.controller;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hungraim.ltr.constant.Gender;
+import com.hungraim.ltr.pojo.entity.system.SystemUser;
+import com.hungraim.ltr.pojo.entity.system.SystemUserRole;
+import com.hungraim.ltr.pojo.vo.system.ReqUserInfo;
+import com.hungraim.ltr.system.service.ISystemUserRoleService;
+import com.hungraim.ltr.system.service.ISystemUserService;
+import com.hungraim.ltr.system.service.impl.SystemUserRoleServiceImpl;
+import com.hungraim.ltr.system.service.impl.SystemUserServiceImpl;
+import com.hungraim.ltr.util.CheckStrength;
+import com.hungraim.ltr.util.Result;
+import com.hungraim.ltr.util.ResultCode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author hubin
+ */
+@RestController
+@RequestMapping("/api.system/user")
+@Slf4j
+public class UserController {
+
+
+    private final ISystemUserService userInfoService;
+    private final ISystemUserRoleService userRoleService;
+
+    @Autowired
+    public UserController(SystemUserServiceImpl userInfoService, SystemUserRoleServiceImpl userRoleService) {
+        this.userInfoService = userInfoService;
+        this.userRoleService = userRoleService;
+    }
+
+
+    /**
+     * 根据用户账号获取用户基本信息
+     *
+     * @param account 用户账号
+     * @return 营销员信息
+     */
+    @GetMapping("/loadUserInfoByAccount/{account}")
+    public Result<SystemUser> loadUserInfoByAccount(@PathVariable String account) {
+        log.info("user:{} 请求登陆。。。", account);
+        SystemUser systemUser = userInfoService.getOne(new LambdaQueryWrapper<SystemUser>().eq(SystemUser::getAccount, account));
+        if (systemUser == null) {
+            log.warn("user:{} 账号未找到！", account);
+            return Result.failed(ResultCode.USER_NOT_EXIST);
+        }
+        return Result.success(systemUser);
+    }
+
+    /**
+     * 根据用户id获取用户权限
+     *
+     * @param id 用户id
+     * @return 权限列表
+     */
+    @GetMapping("/loadUserRolesByUserId/{id}")
+    public Result loadUserRolesByUserId(@PathVariable Long id) {
+        List<Long> roleIds = userRoleService.list(new LambdaQueryWrapper<SystemUserRole>()
+            .eq(SystemUserRole::getUserId, id)
+        ).stream().map(SystemUserRole::getRoleId).collect(Collectors.toList());
+        log.info("user:{},拥有的权限:{}", id, roleIds);
+        return Result.success(roleIds);
+    }
+
+
+    /**
+     * 新增用户
+     */
+    @PostMapping("/addUser")
+    public Result addUser(ReqUserInfo reqUserInfo) {
+        if (StrUtil.isBlankIfStr(reqUserInfo.getAccount())) {
+            return Result.failed("账号不能为空！");
+        }
+        if (StrUtil.isBlankIfStr(reqUserInfo.getPassword())) {
+            return Result.failed("密码不能为空！");
+        }
+        if (StrUtil.isBlankIfStr(reqUserInfo.getName())) {
+            return Result.failed("昵称不能为空！");
+        }
+        if (CheckStrength.checkPasswordStrength(reqUserInfo.getPassword()) < 4) {
+            return Result.failed("密码太简单，请设置复杂密码！");
+        }
+        SystemUser systemUser = userInfoService.getOne(new LambdaQueryWrapper<SystemUser>()
+            .eq(SystemUser::getAccount, reqUserInfo.getAccount()).or()
+            .eq(SystemUser::getId, reqUserInfo.getId()));
+        if (systemUser != null) {
+            return Result.failed("账号已存在！");
+        }
+        SystemUser user = new SystemUser();
+        user.setId(reqUserInfo.getId());
+        user.setAccount(reqUserInfo.getAccount());
+        user.setPassword(new BCryptPasswordEncoder().encode(reqUserInfo.getPassword()));
+        user.setGender(reqUserInfo.getGender());
+        user.setMarketerCode(reqUserInfo.getMarketerCode());
+        user.setRealName(reqUserInfo.getName());
+        user.setUserStatus(reqUserInfo.getEnable());
+        user.setCreatedTime(new Date());
+        userInfoService.save(user);
+        //初始化权限
+        List<Long> roles = reqUserInfo.getRoleIds();
+        roles.add(1L);
+        List<SystemUserRole> roleList = roles.stream().map(roleId -> {
+            SystemUserRole systemUserRole = new SystemUserRole();
+            systemUserRole.setUserId(user.getId());
+            systemUserRole.setRoleId(roleId);
+            return systemUserRole;
+        }).collect(Collectors.toList());
+        userRoleService.saveBatch(roleList);
+        return Result.success("新增成功");
+    }
+
+
+    /**
+     * 获得密码强度等级，包括简单、一般、复杂、强、非常强
+     *
+     * @param password
+     * @return
+     */
+    @GetMapping("/getPasswordLevel/{password}")
+    public Result getPasswordLevel(@PathVariable String password) {
+        return Result.success(CheckStrength.getPasswordLevel(password));
+    }
+
+    /**
+     * 判断账户是否合法
+     *
+     * @param account
+     * @return
+     */
+    @GetMapping("/isLegitimate/{account}")
+    public Result isLegitimate(@PathVariable String account) {
+        if (StrUtil.isBlankIfStr(account)) {
+            return Result.failed("账号不能为空！");
+        }
+        if (account.length() < 4) {
+            return Result.failed("账号长度不能低于4位！");
+        }
+        if (!account.matches("^[a-z0-9A-Z_]+$")) {
+            return Result.failed("账号只能由字母、数字、下划线组成！");
+        }
+        SystemUser systemUser = userInfoService.getOne(new LambdaQueryWrapper<SystemUser>()
+            .eq(SystemUser::getAccount, account));
+        if (systemUser != null) {
+            return Result.failed("账号已存在！");
+        }
+        return Result.success("成功");
+    }
+
+
+    /**
+     * 查询用户列表
+     *
+     * @param reqUserInfo
+     * @return
+     */
+    @PostMapping("/queryUsers")
+    public Result queryUsers(ReqUserInfo reqUserInfo) {
+
+        QueryWrapper<SystemUser> systemUserQueryWrapper = new QueryWrapper<>();
+        if (!StrUtil.isBlankIfStr(reqUserInfo.getName())) {
+            systemUserQueryWrapper.and(wrapper -> wrapper.lambda().like(SystemUser::getRealName, reqUserInfo.getName()).or()
+                .like(SystemUser::getAccount, reqUserInfo.getName()));
+        }
+        if (!StrUtil.isBlankIfStr(reqUserInfo.getGender())) {
+            systemUserQueryWrapper.and(wrapper -> wrapper.lambda().eq(SystemUser::getGender, reqUserInfo.getGender()));
+        }
+        if (!StrUtil.isBlankIfStr(reqUserInfo.getEnable())) {
+            systemUserQueryWrapper.and(wrapper -> wrapper.lambda().eq(SystemUser::getUserStatus, reqUserInfo.getEnable()));
+        }
+        List<SystemUser> users = userInfoService.list(systemUserQueryWrapper);
+        List<ReqUserInfo> resUsers = users.stream().map(user -> {
+            ReqUserInfo userInfo = new ReqUserInfo();
+            userInfo.setId(user.getId());
+            userInfo.setName(user.getRealName());
+            userInfo.setAccount(user.getAccount());
+            userInfo.setEnable(user.getUserStatus());
+            userInfo.setAvatar(user.getAvatar());
+            userInfo.setGender(Gender.MAN.getCode().equals(user.getGender()) ? Gender.MAN.getDesc() : Gender.WOMAN.getDesc());
+            userInfo.setMarketerCode(user.getMarketerCode());
+            return userInfo;
+        }).collect(Collectors.toList());
+        return Result.success(resUsers);
+    }
+
+
+
+}

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemResourceMapper.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/dao/SystemResourceMapper.java

-package com.hungraim.ism.system.dao;
+package com.hungraim.ltr.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemResource;
+import com.hungraim.ltr.pojo.entity.system.SystemResource;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -17,9 +17,9 @@ public interface SystemResourceMapper extends BaseMapper<SystemResource> {
    * 查询所有资源对应的角色
    * @return list
    */
-  @Select("SELECT ID,RESOURCE_NAME,RESOURCE_URL,METHOD FROM ISM_RESOURCE")
+  @Select("SELECT ID,RESOURCE_NAME,RESOURCE_URL,METHOD FROM ltc_RESOURCE")
   @Results({
-    @Result(property = "roleIds", column = "id",many = @Many(select = "com.hungraim.ism.system.dao.SystemRoleResourceMapper.listRoleIds"))
+    @Result(property = "roleIds", column = "id",many = @Many(select = "com.hungraim.ltc.system.dao.SystemRoleResourceMapper.listRoleIds"))
   })
   List<SystemResource> listResourceRoles();
 

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemRoleMapper.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/dao/SystemRoleMapper.java

-package com.hungraim.ism.system.dao;
+package com.hungraim.ltr.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemRole;
+import com.hungraim.ltr.pojo.entity.system.SystemRole;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemRoleResourceMapper.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/dao/SystemRoleResourceMapper.java

-package com.hungraim.ism.system.dao;
+package com.hungraim.ltr.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemRoleResource;
+import com.hungraim.ltr.pojo.entity.system.SystemRoleResource;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -20,6 +20,6 @@ public interface SystemRoleResourceMapper extends BaseMapper<SystemRoleResource>
    * @param resourceId 资源id
    * @return 角色id
    */
-  @Select("SELECT ROLE_ID FROM ISM_ROLE_RESOURCE WHERE RESOURCE_ID = #{resourceId} ")
+  @Select("SELECT ROLE_ID FROM ltc_ROLE_RESOURCE WHERE RESOURCE_ID = #{resourceId} ")
   List<Long> listRoleIds(long resourceId);
 }

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemUserMapper.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/dao/SystemUserMapper.java

-package com.hungraim.ism.system.dao;
+package com.hungraim.ltr.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemUser;
+import com.hungraim.ltr.pojo.entity.system.SystemUser;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
 /**
  * 用户

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemUserRoleMapper.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/dao/SystemUserRoleMapper.java

-package com.hungraim.ism.system.dao;
+package com.hungraim.ltr.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemUserRole;
+import com.hungraim.ltr.pojo.entity.system.SystemUserRole;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemResourceService.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/ISystemResourceService.java

-package com.hungraim.ism.system.service;
+package com.hungraim.ltr.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemResource;
+import com.hungraim.ltr.pojo.entity.system.SystemResource;
 
 import java.util.List;
 

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemRoleResourceService.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/ISystemRoleResourceService.java

-package com.hungraim.ism.system.service;
+package com.hungraim.ltr.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemRoleResource;
+import com.hungraim.ltr.pojo.entity.system.SystemRoleResource;
 
 
 /**

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemRoleService.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/ISystemRoleService.java

-package com.hungraim.ism.system.service;
+package com.hungraim.ltr.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemRole;
+import com.hungraim.ltr.pojo.entity.system.SystemRole;
 
 /**
  * 角色

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemUserRoleService.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/ISystemUserRoleService.java

-package com.hungraim.ism.system.service;
+package com.hungraim.ltr.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemUserRole;
+import com.hungraim.ltr.pojo.entity.system.SystemUserRole;
 
 /**
  * @author hubin

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemUserService.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/ISystemUserService.java

-package com.hungraim.ism.system.service;
+package com.hungraim.ltr.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemUser;
+import com.hungraim.ltr.pojo.entity.system.SystemUser;
 
 /**
  * @author hubin

system/system-user-service/src/main/java/com/hungraim/ism/system/service/impl/SystemResourceServiceImpl.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/impl/SystemResourceServiceImpl.java

-package com.hungraim.ism.system.service.impl;
+package com.hungraim.ltr.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.constant.AuthConstants;
-import com.hungraim.ism.pojo.entity.system.SystemResource;
-import com.hungraim.ism.system.dao.SystemResourceMapper;
-import com.hungraim.ism.system.service.ISystemResourceService;
+import com.hungraim.ltr.constant.AuthConstants;
+import com.hungraim.ltr.pojo.entity.system.SystemResource;
+import com.hungraim.ltr.system.dao.SystemResourceMapper;
+import com.hungraim.ltr.system.service.ISystemResourceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -37,7 +37,7 @@ public class SystemResourceServiceImpl extends ServiceImpl<SystemResourceMapper,
   @SuppressWarnings("unchecked")
   public void refreshPermissionRolesCache(){
     log.info("refreshPermissionRolesCache run...");
-    redisTemplate.delete(AuthConstants.RESOURCE_ROLE_KEY);
+    redisTemplate.delete(AuthConstants.PERMISSION_ROLES_KEY);
     List<SystemResource> permissions = this.listResourceRoles();
     Map<String, List<String>> permissionRoles = new TreeMap<>();
     Optional.ofNullable(permissions).orElse(new ArrayList<>()).forEach(permission -> {
@@ -50,13 +50,8 @@ public class SystemResourceServiceImpl extends ServiceImpl<SystemResourceMapper,
       if (CollectionUtil.isNotEmpty(roles)) {
         permissionRoles.put(permission.getMethod() +"_"+ permission.getResourceUrl(), roles);
       }
-      redisTemplate.opsForHash().putAll(AuthConstants.PERMISSION_ROLES_KEY, permissionRoles);
     });
-
-
-
-
-
+    redisTemplate.opsForHash().putAll(AuthConstants.PERMISSION_ROLES_KEY, permissionRoles);
   }
 
   @Override

system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/impl/SystemRoleResourceServiceImpl.java

+package com.hungraim.ltr.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltr.pojo.entity.system.SystemRoleResource;
+import com.hungraim.ltr.system.dao.SystemRoleResourceMapper;
+import com.hungraim.ltr.system.service.ISystemRoleResourceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author hubin
+ */
+@Service
+public class SystemRoleResourceServiceImpl extends ServiceImpl<SystemRoleResourceMapper, SystemRoleResource> implements ISystemRoleResourceService {
+}

system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/impl/SystemRoleServiceImpl.java

+package com.hungraim.ltr.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltr.pojo.entity.system.SystemRole;
+import com.hungraim.ltr.system.dao.SystemRoleMapper;
+import com.hungraim.ltr.system.service.ISystemRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author hubin
+ */
+@Service
+public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleMapper, SystemRole> implements ISystemRoleService {
+}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/impl/SystemUserRoleServiceImpl.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/impl/SystemUserRoleServiceImpl.java

-package com.hungraim.ism.system.service.impl;
+package com.hungraim.ltr.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.pojo.entity.system.SystemUserRole;
-import com.hungraim.ism.system.dao.SystemUserRoleMapper;
-import com.hungraim.ism.system.service.ISystemUserRoleService;
+import com.hungraim.ltr.pojo.entity.system.SystemUserRole;
+import com.hungraim.ltr.system.dao.SystemUserRoleMapper;
+import com.hungraim.ltr.system.service.ISystemUserRoleService;
 import org.springframework.stereotype.Service;
 
+/**
+ * @author hubin
+ */
 @Service
 public class SystemUserRoleServiceImpl extends ServiceImpl<SystemUserRoleMapper, SystemUserRole> implements ISystemUserRoleService {
 }

system/system-user-service/src/main/java/com/hungraim/ism/system/service/impl/SystemUserServiceImpl.java → system/system-admin-service/src/main/java/com/hungraim/ltr/system/service/impl/SystemUserServiceImpl.java

-package com.hungraim.ism.system.service.impl;
+package com.hungraim.ltr.system.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.pojo.entity.system.SystemUser;
-import com.hungraim.ism.system.dao.SystemUserMapper;
-import com.hungraim.ism.system.dao.SystemUserRoleMapper;
-import com.hungraim.ism.system.service.ISystemUserService;
+import com.hungraim.ltr.pojo.entity.system.SystemUser;
+import com.hungraim.ltr.system.dao.SystemUserMapper;
+import com.hungraim.ltr.system.dao.SystemUserRoleMapper;
+import com.hungraim.ltr.system.service.ISystemUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

system/system-user-service/src/main/resources/bootstrap.yml → system/system-admin-service/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
       enabled: true
       additional-paths: src/main/java
   application:
-    name: ISM-SYSTEM-USER-SERVICE-SERVICE
+    name: LTC-SYSTEM-ADMIN-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

system/system-api/pom.xml

@@ -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>system</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 @@
       <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>

system/system-api/src/main/java/com/hungraim/ism/api/SystemUserFeignService.java → system/system-api/src/main/java/com/hungraim/ltr/api/SystemAdminFeignService.java

-package com.hungraim.ism.api;
+package com.hungraim.ltr.api;
 
-import com.hungraim.ism.pojo.entity.system.SystemUser;
-import com.hungraim.ism.util.Result;
+import com.hungraim.ltr.pojo.entity.system.SystemUser;
+import com.hungraim.ltr.util.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -11,8 +11,8 @@ import java.util.List;
 /**
  * @author hubin
  */
-@FeignClient("ISM-SYSTEM-user-service-SERVICE")
-public interface SystemUserFeignService {
+@FeignClient("ltc-SYSTEM-ADMIN-SERVICE")
+public interface SystemAdminFeignService {
 
     /**
      * feign api 根据用户账号获取用户基本信息

system/system-user-service/src/main/java/com/hungraim/ism/system/controller/UserController.java

-package com.hungraim.ism.system.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.hungraim.ism.pojo.entity.system.SystemUser;
-import com.hungraim.ism.pojo.entity.system.SystemUserRole;
-import com.hungraim.ism.system.service.ISystemUserRoleService;
-import com.hungraim.ism.system.service.ISystemUserService;
-import com.hungraim.ism.system.service.impl.SystemUserRoleServiceImpl;
-import com.hungraim.ism.system.service.impl.SystemUserServiceImpl;
-import com.hungraim.ism.util.Result;
-import com.hungraim.ism.util.ResultCode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author hubin
- */
-@RestController
-@RequestMapping("/api.system/user")
-@Slf4j
-public class UserController {
-
-
-    private final ISystemUserService userInfoService;
-    private final ISystemUserRoleService userRoleService;
-
-    @Autowired
-    public UserController(SystemUserServiceImpl userInfoService, SystemUserRoleServiceImpl userRoleService) {
-        this.userInfoService = userInfoService;
-        this.userRoleService = userRoleService;
-    }
-
-
-    /**
-     * 根据用户账号获取用户基本信息
-     *
-     * @param account 用户账号
-     * @return 营销员信息
-     */
-    @GetMapping("/loadUserInfoByAccount/{account}")
-    public Result<SystemUser> loadUserInfoByAccount(@PathVariable String account) {
-        log.info("user:{} 请求登陆。。。", account);
-        SystemUser systemUser = userInfoService.getOne(new LambdaQueryWrapper<SystemUser>().eq(SystemUser::getAccount, account));
-        if (systemUser == null) {
-            log.warn("user:{} 账号未找到！", account);
-            return Result.failed(ResultCode.USER_NOT_EXIST);
-        }
-        return Result.success(systemUser);
-    }
-
-    /**
-     * 根据用户id获取用户权限
-     *
-     * @param id 用户id
-     * @return 权限列表
-     */
-    @GetMapping("/loadUserRolesByUserId/{id}")
-    public Result loadUserRolesByUserId(@PathVariable Long id) {
-        List<Long> roleIds = userRoleService.list(new LambdaQueryWrapper<SystemUserRole>()
-            .eq(SystemUserRole::getUserId, id)
-        ).stream().map(SystemUserRole::getRoleId).collect(Collectors.toList());
-        log.info("user:{},拥有的权限:{}", id, roleIds);
-        return Result.success(roleIds);
-    }
-
-}