Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mob...

许鹏程

2023-08-21 01e2c982dec2a55fb8666f8cc801dd1540fa62cd

Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0

 .gitignore

@@ -1,8 +1 @@
lx_file/upload/
lucene/
attachment/upload/*/
!attachment/upload/template/
target/
.classpath
.project
.settings/
/target/

 doc/ÊÖ»úÓ¦Óýâ¾ö·½°¸.docx

Binary files differ

 pom.xml

@@ -2,19 +2,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
         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">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <artifactId>product-server</artifactId>
        <groupId>com.lx</groupId>
        <artifactId>product-server</artifactId>
        <version>2.0.0-release</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>product-server-mobile-core</artifactId>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>
    <name>product-server-mobile-core</name>
    <description>product-server-mobile-core</description>
    <dependencies>
        <dependency>
            <groupId>com.lx</groupId>
@@ -32,10 +28,12 @@
        <dependency>
            <groupId>com.lx</groupId>
            <artifactId>product-server-core</artifactId>
            <version>2.0.1</version>
        </dependency>
        <dependency>
            <groupId>com.lx</groupId>
            <artifactId>product-server-file</artifactId>
        </dependency>
    </dependencies>

</project>

 product-server-mobile-core.iml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,275 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <webroots />
        <sourceRoots>
          <root url="file://$MODULE_DIR$/src/main/java" />
          <root url="file://$MODULE_DIR$/src/main/resources" />
        </sourceRoots>
      </configuration>
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="product-server-common" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.7" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
    <orderEntry type="module" module-name="product-server-util" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl3:3.1" level="project" />
    <orderEntry type="module" module-name="product-server-admin" />
    <orderEntry type="module" module-name="product-server-email" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.1.3.RELEASE" level="project" />
    <orderEntry type="module" module-name="product-server-auth" />
    <orderEntry type="module" module-name="product-server-text-message" />
    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
    <orderEntry type="library" name="Maven: com.sendgrid:sendgrid-java:4.3.0" level="project" />
    <orderEntry type="library" name="Maven: com.sendgrid:java-http-client:4.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.lx:product-server-core:2.0.1" level="project" />
    <orderEntry type="module" module-name="product-server-file" />
    <orderEntry type="module" module-name="product-server-lucene" />
    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7" level="project" />
    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.6" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:8.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:8.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:8.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:8.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:8.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:8.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-smartcn:8.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:8.3.0" level="project" />
    <orderEntry type="library" name="Maven: cn.bestwu:ik-analyzers:5.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.chenlb.mmseg4j:mmseg4j-solr:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: com.chenlb.mmseg4j:mmseg4j-core:1.10.0" level="project" />
    <orderEntry type="library" name="Maven: com.deepoove:poi-tl:1.10.5" level="project" />
    <orderEntry type="library" name="Maven: com.deepoove:poi-ooxml-schemas-extra:4.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
    <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
    <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
    <orderEntry type="library" name="Maven: com.artofsolving:jodconverter:2.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.openoffice:jurt:3.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.openoffice:ridl:3.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.openoffice:juh:3.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.openoffice:unoil:3.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.artofsolving.jodconverter:jodconverter-core:3.0-beta-4" level="project" />
    <orderEntry type="library" name="Maven: commons-net:commons-net:3.7.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.25" level="project" />
    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.25" level="project" />
    <orderEntry type="library" name="Maven: com.aspose:aspose-cells:23.6.1" level="project" />
    <orderEntry type="library" name="Maven: org.aspose:slides-line:15.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.aspose:aspose-words:21.11.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.15.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.15.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.15.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.16" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.16" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.33.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.33.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.33.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.33.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.33.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.33.Final" level="project" />
    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:9.0.16" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:9.0.16" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.10" level="project" />
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.10" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
    <orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.57" level="project" />
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.3" level="project" />
    <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.7" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.7" level="project" />
    <orderEntry type="library" name="Maven: net.sf.jmimemagic:jmimemagic:0.1.5" level="project" />
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:5.0.3" level="project" />
    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.7" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.5" level="project" />
    <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:4.1.2" level="project" />
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.adobe.xmp:xmpcore:5.1.2" level="project" />
    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.3.0" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.56" level="project" />
    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.3.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ognl:ognl:3.1.12" level="project" />
    <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.46" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.20" level="project" />
    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.2" level="project" />
    <orderEntry type="library" name="Maven: io.logz.logback:logzio-logback-appender:1.0.24" level="project" />
    <orderEntry type="library" name="Maven: io.logz.sender:logzio-sender:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:guava:25.0-jre" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
    <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
    <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.11" level="project" />
    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.19.4" level="project" />
    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.19.4" level="project" />
    <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.11" level="project" />
    <orderEntry type="library" name="Maven: com.bladejava:blade-patchca:1.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
    <orderEntry type="library" name="Maven: com.drewnoakes:metadata-extractor:2.11.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
    <orderEntry type="library" name="Maven: org.fusesource:sigar:1.6.4" level="project" />
  </component>
</module>

 src/main/java/com/product/mobile/core/controller/ContactPersonController.java

@@ -1,5 +1,6 @@
package com.product.mobile.core.controller;

import com.product.common.lang.StringUtils;
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
import com.product.core.entity.FieldSetEntity;
@@ -14,9 +15,9 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;


/**
 * é€šè¿…录
 * 
 * @Date 2022/3/3 19:54
 * @Desc
 */
@@ -24,19 +25,24 @@
@RequestMapping("/api/mobile")
public class ContactPersonController extends AbstractBaseController {

    @Autowired
    ContanctOrgListService contanctOrgListService;
    @Autowired
    ContanctOrgListService contanctOrgListService;

    @RequestMapping(value = "/contact/org/list/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String contactOrgList(HttpServletRequest request) {
         FieldSetEntity fse = null;
         Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
         if (bean != null) {
             RequestParameterEntity reqp = (RequestParameterEntity) bean;
             fse = reqp.getFormData();
         }
        return this.OK_List(contanctOrgListService.orgList(fse));
    }
    @RequestMapping(value = "/contact/org/list/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String contactOrgList(HttpServletRequest request) {
        FieldSetEntity fse = null;
        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        if (bean != null) {
            RequestParameterEntity reqp = (RequestParameterEntity) bean;
            fse = reqp.getFormData();
        }
        if (StringUtils.isEmpty(fse.getString("orgCode"))) {//延迟加载时，指定部门
            return this.OK_List(contanctOrgListService.orgList(fse));
        } else {
            return this.OK_List(contanctOrgListService.orgList(fse.getString("orgCode")));
        }

    }

}

 src/main/java/com/product/mobile/core/controller/MobileLoggerController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.product.mobile.core.controller;

import javax.servlet.http.HttpServletRequest;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
import com.product.core.entity.FieldSetEntity;
import com.product.core.entity.RequestParameterEntity;
import com.product.core.log.SystemLogger;
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.mobile.core.config.MobileCoreCode;
import com.product.module.sys.version.ApiVersion;

/**
 * APP日志记录，存储到日志表中，或打印到后台。
 *
 * @author shicf
 */
@RequestMapping("/api/mobile")
@RestController
public class MobileLoggerController extends AbstractBaseController {
    /**
     * @param request
     * @return
     */
    @RequestMapping(value = "/system/log/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String writeLog(HttpServletRequest request) {
        FieldSetEntity fse = null;
        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        RequestParameterEntity reqp=null;
        if (bean != null) {
            reqp = (RequestParameterEntity) bean;
            fse = reqp.getFormData();
        }
        if (bean == null || fse == null) {
            SpringMVCContextHolder.getSystemLogger().error(MobileCoreCode.SYSTEM_FORM_NODATA.getValue(),
                    MobileCoreCode.SYSTEM_FORM_NODATA.getText());
            return this.error(MobileCoreCode.SYSTEM_FORM_NODATA.getValue(),
                    MobileCoreCode.SYSTEM_FORM_NODATA.getText());
        }
        if(fse.getString("log_type")==null || SystemLogger.LOG_TYPES_INFO.equals(fse.getString("log_type"))) {//普通日志
            if(fse.getBoolean("isSave")) {
                SpringMVCContextHolder.getSystemLogger().writeLog(fse.getString(CoreConst.CLIENT_TYPE)+"----- "+fse.getString("content"), reqp);
            }else {
                SpringMVCContextHolder.getSystemLogger().info(fse.getString(CoreConst.CLIENT_TYPE)+"------ "+fse.getString("content"));
            }
			
        }else if( SystemLogger.LOG_TYPES_ERROR.equals(fse.getString("log_type"))) {
            if(fse.getBoolean("isSave")) {
                SpringMVCContextHolder.getSystemLogger().writeLog(fse.getString(CoreConst.CLIENT_TYPE)+"------ "+fse.getString("content"), reqp);
            }else {
                SpringMVCContextHolder.getSystemLogger().error(fse.getString(CoreConst.CLIENT_TYPE)+"----- "+fse.getString("content"));
            }
        }
		
        return this.OK();
    }
}

 src/main/java/com/product/mobile/core/service/ContanctOrgListService.java

@@ -29,7 +29,7 @@
@Component
public class ContanctOrgListService extends AbstractBaseService{
    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //制定输出格式

	
    @Autowired
    public BaseDao baseDao;
    /**
@@ -42,23 +42,48 @@
    public DataTableEntity orgList(FieldSetEntity fse) throws BaseException{
        SystemUser user=SpringMVCContextHolder.getCurrentUser();
        boolean all=Global.getPropertyToBoolean("mobile.contanct.org.all", "false").booleanValue();
        boolean delay=Global.getPropertyToBoolean("mobile.contanct.org.delay", "false").booleanValue();
    	
        String code=user.getCurrentCompany().getString("org_level_code");
        //公司部门
        StringBuilder b=new StringBuilder();
        b.append("select uuid,org_level_name name, org_level_type,org_level_code code,org_level_code_parent,org_level_type type from  product_sys_org_levels where  org_level_status=0 ");
        if(all) {b.append(" and org_level_code like '").append(code).append("%'");}//只加载公司
        b.append(" order by org_level_code");
        if(!all) {b.append(" and org_level_code like '").append(code).append("%'");}//只加载公司
        b.append(" order by LENGTH(org_level_code) ,org_level_type");
        DataTableEntity org=baseDao.listTable(b.toString(), new String[] {});
        //员工
        b=new StringBuilder();
        b.append("select a.uuid,a.tricode code, a.show_name name,a.contact_address,a.sex,b.thumbnail_img,a.job_post_uuid,c.job_post_name post,a.staff_email mail,a.office_telephone tel,a.mobile_phone mobile,2 type,d.org_level_name com from  product_sys_staffs a left join product_sys_users b on a.user_id=b.user_id left join product_sys_job_posts c on a.job_post_uuid=c.uuid left join product_sys_org_levels d on a.org_level_uuid=d.uuid where b.status=1 ");
        if(all) {b.append(" and  a.tricode like '").append(code).append("%'");}//只加载公司人员
//        b.append(" order by a.org_level_code");
    	
        if(delay) {//延迟回载，只加载当前人所在部门的人员
            b.append(" and  a.tricode like '").append(user.getCurrentDept().getString("org_level_code")).append("%'");
        }else if(!all) {
            b.append(" and  a.tricode like '").append(code).append("%'");
        }//只加载公司人员
        b.append(" order by CONVERT(a.show_name USING gbk) COLLATE gbk_chinese_ci ASC");
        DataTableEntity staff=baseDao.listTable(b.toString(), new String[] {});

    	
        return parseData(org,staff);
    }

    /**
     *     å…ˆæŸ¥å‡ºåŽ†å²æ‰“卡记录
     * @param cpage
     * @param pagesize
     * @return
     * @throws BaseException
     */
    public DataTableEntity orgList(String orgCode) throws BaseException{
        SystemUser user=SpringMVCContextHolder.getCurrentUser();
        if(StringUtils.isEmpty(orgCode) || orgCode.equals(user.getCurrentDept().getString("tricode") )  ) {//当前人部门，也不用传
            return new DataTableEntity();
        }
        //员工
        StringBuilder b=new StringBuilder();
        b.append("select a.uuid,a.tricode code, a.show_name name,a.contact_address,a.sex,b.thumbnail_img,a.job_post_uuid,c.job_post_name post,a.staff_email mail,a.office_telephone tel,a.mobile_phone mobile,2 type,d.org_level_name com from  product_sys_staffs a left join product_sys_users b on a.user_id=b.user_id left join product_sys_job_posts c on a.job_post_uuid=c.uuid left join product_sys_org_levels d on a.org_level_uuid=d.uuid where b.status=1 ");
        b.append(" and  a.tricode = '").append(orgCode).append("'");
        DataTableEntity staff=baseDao.listTable(b.toString(), new String[] {});
        return staff;
    }
    /**
     * å¯¹æ•°æ®è¿›è¡Œå°è£…
     * @param dt
@@ -110,9 +135,9 @@
                    sub.addFieldSetEntity(f);
                }
            }

    		
        }

    	
        return pdt;
    }
}

 src/main/java/com/product/mobile/core/service/SysMessageService.java

@@ -1,12 +1,13 @@
package com.product.mobile.core.service;

import com.product.admin.config.CmnConst;
import com.product.admin.service.UserService;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.module.sys.service.UserService;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -31,7 +32,7 @@
     */
    public DataTableEntity listReadMessage(FieldSetEntity fse) {
        StringBuilder sql = new StringBuilder();
        sql.append("\nselect m.uuid,m.title,m.content,m.send_user_id,mu.user_name send_user_name,m.send_time,m.message_type,m.mobile_url url ");
        sql.append("\nselect m.uuid,m.title,m.content,m.send_user_id,mu.user_name send_user_name,m.send_time,m.message_type,ifnull(m.mobile_url,'') url ");
        sql.append("\nfrom product_sys_message m");
        sql.append("\nleft join product_sys_users mu on mu.user_id=m.send_user_id ");
        sql.append("\ninner join product_sys_message_user u on u.message_uuid=m.uuid and u.read_type=1 and u.user_id=?");
@@ -44,7 +45,7 @@
        FieldSetEntity tempFse;
        for (int i = 0;i < dte.getRows();i++) {
            tempFse = dte.getFieldSetEntity(i);
            tempFse.setValue("sender_avatar", userService.getUserAvatar(tempFse.getString("send_user_id")));
            tempFse.setValue(com.product.core.websocket.config.CmnConst.SEND_THUMBNAIL_IMG, userService.getUserAvatar(tempFse.getString("send_user_id_save_value")));
        }

        return dte;

 target/classes/com/product/mobile/core/controller/ContactPersonController.class

Binary files differ

 target/classes/com/product/mobile/core/service/ContanctOrgListService.class

Binary files differ

 target/classes/com/product/mobile/core/service/SysMessageService.class

Binary files differ