修改包名
This commit is contained in:
parent
627ed43025
commit
5d5fcd76bc
@ -3,12 +3,12 @@
|
||||
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>
|
||||
<groupId>com.qiwen</groupId>
|
||||
<groupId>com.qiwenshare</groupId>
|
||||
<artifactId>file</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.qiwen</groupId>
|
||||
<groupId>com.qiwenshare</groupId>
|
||||
<artifactId>file-common</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
@ -1,133 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
<facet type="web" name="Web">
|
||||
<configuration>
|
||||
<webroots />
|
||||
</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" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.4.RELEASE" 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" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.4.RELEASE" 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.core:jackson-core:2.9.8" 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.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.17" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.17" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.17" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.16.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.12.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.36.0" 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.commons:commons-lang3:3.8.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.8" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.8" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.36.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:neko-htmlunit:2.36.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-cssparser:1.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.brotli:dec:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.15.v20190215" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.15.v20190215" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.15.v20190215" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.15.v20190215" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.15.v20190215" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.15.v20190215" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.15.v20190215" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.15.v20190215" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.28" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.15" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.4.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: javax.persistence:javax.persistence-api:2.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.javassist:javassist:3.24.0-GA" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.0.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jvnet.staxex:stax-ex:1.8" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.15" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.4.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.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.3.RC1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.3.RC1" level="project" />
|
||||
<orderEntry type="library" name="Maven: cglib:cglib:3.2.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.ant:ant:1.10.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.10.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.1.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.6.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.1" level="project" />
|
||||
</component>
|
||||
</module>
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.cbb;
|
||||
package com.qiwenshare.common.cbb;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.text.ParseException;
|
@ -1,7 +1,7 @@
|
||||
package com.mac.common.cbb;
|
||||
package com.qiwenshare.common.cbb;
|
||||
|
||||
|
||||
import com.mac.common.domain.TableQueryBean;
|
||||
import com.qiwenshare.common.domain.TableQueryBean;
|
||||
|
||||
public class MiniuiUtil {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.cbb;
|
||||
package com.qiwenshare.common.cbb;
|
||||
|
||||
public class RestResult<T> {
|
||||
private boolean success = true;
|
@ -1,9 +1,9 @@
|
||||
package com.mac.common.cbb;
|
||||
package com.qiwenshare.common.cbb;
|
||||
|
||||
import com.mac.common.domain.UploadFile;
|
||||
import com.mac.common.operation.ImageOperation;
|
||||
import com.mac.common.util.FileUtil;
|
||||
import com.mac.common.util.PathUtil;
|
||||
import com.qiwenshare.common.domain.UploadFile;
|
||||
import com.qiwenshare.common.operation.ImageOperation;
|
||||
import com.qiwenshare.common.util.FileUtil;
|
||||
import com.qiwenshare.common.util.PathUtil;
|
||||
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.apache.commons.fileupload.util.Streams;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.domain;
|
||||
package com.qiwenshare.common.domain;
|
||||
|
||||
import javax.persistence.*;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.domain;
|
||||
package com.qiwenshare.common.domain;
|
||||
|
||||
public class TableData<T> {
|
||||
private T data;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.domain;
|
||||
package com.qiwenshare.common.domain;
|
||||
|
||||
public class TableQueryBean {
|
||||
//key, pageIndex, pageSize, sortField, sortOrder
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.domain;
|
||||
package com.qiwenshare.common.domain;
|
||||
|
||||
/**
|
||||
* md-edit插件上传图片返回数据实体类
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.operation;
|
||||
package com.qiwenshare.common.operation;
|
||||
|
||||
import org.springframework.util.DigestUtils;
|
||||
|
@ -1,13 +1,11 @@
|
||||
package com.mac.common.operation;
|
||||
package com.qiwenshare.common.operation;
|
||||
|
||||
import com.mac.common.util.FileUtil;
|
||||
import com.mac.common.util.PathUtil;
|
||||
import com.qiwenshare.common.util.FileUtil;
|
||||
import com.qiwenshare.common.util.PathUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.*;
|
||||
import java.sql.Array;
|
||||
import java.sql.SQLOutput;
|
||||
import java.util.*;
|
||||
|
||||
import java.util.zip.ZipEntry;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.operation;
|
||||
package com.qiwenshare.common.operation;
|
||||
|
||||
import net.coobird.thumbnailator.Thumbnails;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.util;
|
||||
package com.qiwenshare.common.util;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.ArrayList;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.util;
|
||||
package com.qiwenshare.common.util;
|
||||
|
||||
import java.util.Random;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.common.util;
|
||||
package com.qiwenshare.common.util;
|
||||
|
||||
import org.springframework.util.ResourceUtils;
|
||||
|
@ -3,14 +3,14 @@
|
||||
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>
|
||||
<groupId>com.qiwen</groupId>
|
||||
<groupId>com.qiwenshare</groupId>
|
||||
<artifactId>file</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>com.qiwen</groupId>
|
||||
<groupId>com.qiwenshare</groupId>
|
||||
<artifactId>file-web</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<name>web</name>
|
||||
<name>file-web</name>
|
||||
<description>www.qiwenshare.com/file</description>
|
||||
<packaging>jar</packaging>
|
||||
<properties>
|
||||
@ -91,7 +91,7 @@
|
||||
<version>1.3.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.qiwen</groupId>
|
||||
<groupId>com.qiwenshare</groupId>
|
||||
<artifactId>file-common</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
@ -155,8 +155,9 @@
|
||||
<configuration>
|
||||
<target>
|
||||
<copy file="target/${app-name}.jar" tofile="${release-path}/app/${project.artifactId}/${app-name}.jar" />
|
||||
<copy file="target/classes/script/startWeb.bat" tofile="${release-path}/startWeb.bat" />
|
||||
|
||||
<copy file="target/classes/script/startup.bat" tofile="${release-path}/startup.bat"/>
|
||||
<copy file="target/classes/script/startup.sh" tofile="${release-path}/startup.sh"/>
|
||||
<copy file="target/classes/script/stop.sh" tofile="${release-path}/stop.sh"/>
|
||||
<copy todir="${release-path}">
|
||||
<fileset dir="target/classes">
|
||||
<include name="**/static/**" />
|
||||
|
@ -1,19 +1,15 @@
|
||||
package com.mac.scp;
|
||||
package com.qiwenshare.file;
|
||||
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.web.server.ConfigurableWebServerFactory;
|
||||
import org.springframework.boot.web.server.ErrorPage;
|
||||
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
|
||||
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
@SpringBootApplication
|
||||
@MapperScan("com.mac.scp.mapper")
|
||||
@MapperScan("com.qiwenshare.file.mapper")
|
||||
@EnableScheduling //启用定时任务
|
||||
public class FileApplication {
|
||||
|
@ -1,9 +1,7 @@
|
||||
package com.mac.scp.api;
|
||||
package com.qiwenshare.file.api;
|
||||
|
||||
import com.mac.common.cbb.RestResult;
|
||||
import com.mac.scp.domain.*;
|
||||
import com.qiwenshare.file.domain.FileBean;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
public interface IFileService {
|
@ -1,7 +1,9 @@
|
||||
package com.mac.scp.api;
|
||||
package com.qiwenshare.file.api;
|
||||
|
||||
import com.mac.common.cbb.RestResult;
|
||||
import com.mac.scp.domain.*;
|
||||
import com.qiwenshare.common.cbb.RestResult;
|
||||
import com.qiwenshare.file.domain.FileBean;
|
||||
import com.qiwenshare.file.domain.StorageBean;
|
||||
import com.qiwenshare.file.domain.UserImageBean;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,8 +1,10 @@
|
||||
package com.mac.scp.api;
|
||||
package com.qiwenshare.file.api;
|
||||
|
||||
import com.mac.common.cbb.RestResult;
|
||||
import com.mac.common.domain.TableQueryBean;
|
||||
import com.mac.scp.domain.*;
|
||||
import com.qiwenshare.common.cbb.RestResult;
|
||||
import com.qiwenshare.common.domain.TableQueryBean;
|
||||
import com.qiwenshare.file.domain.Permission;
|
||||
import com.qiwenshare.file.domain.Role;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.config.cors;
|
||||
package com.qiwenshare.file.config.cors;
|
||||
|
||||
import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.servlet.config.annotation.CorsRegistration;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.config.exception;
|
||||
package com.qiwenshare.file.config.exception;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.config.exception;
|
||||
package com.qiwenshare.file.config.exception;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
@ -1,9 +1,9 @@
|
||||
package com.mac.scp.config.shiro;
|
||||
package com.qiwenshare.file.config.shiro;
|
||||
|
||||
import com.mac.scp.domain.Permission;
|
||||
import com.mac.scp.domain.Role;
|
||||
import com.mac.scp.domain.UserBean;
|
||||
import com.mac.scp.service.UserService;
|
||||
import com.qiwenshare.file.domain.Permission;
|
||||
import com.qiwenshare.file.domain.Role;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
import com.qiwenshare.file.service.UserService;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authc.AuthenticationException;
|
||||
import org.apache.shiro.authc.AuthenticationInfo;
|
@ -1,6 +1,6 @@
|
||||
package com.mac.scp.config.shiro;
|
||||
package com.qiwenshare.file.config.shiro;
|
||||
|
||||
import com.mac.scp.config.cors.MyCorsRegistration;
|
||||
import com.qiwenshare.file.config.cors.MyCorsRegistration;
|
||||
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
|
||||
import org.apache.shiro.mgt.SecurityManager;
|
||||
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.config.shiro;
|
||||
package com.qiwenshare.file.config.shiro;
|
||||
|
||||
import org.springframework.boot.web.servlet.ServletComponentScan;
|
||||
import org.springframework.core.annotation.Order;
|
@ -1,24 +1,25 @@
|
||||
package com.mac.scp.controller;
|
||||
package com.qiwenshare.file.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.mac.common.cbb.DateUtil;
|
||||
import com.mac.common.cbb.RestResult;
|
||||
import com.mac.common.operation.FileOperation;
|
||||
import com.mac.common.util.FileUtil;
|
||||
import com.mac.common.util.PathUtil;
|
||||
import com.mac.scp.api.IFileService;
|
||||
import com.mac.scp.api.IFiletransferService;
|
||||
import com.mac.scp.domain.*;
|
||||
import com.qiwenshare.common.cbb.DateUtil;
|
||||
import com.qiwenshare.common.cbb.RestResult;
|
||||
import com.qiwenshare.common.operation.FileOperation;
|
||||
import com.qiwenshare.common.util.FileUtil;
|
||||
import com.qiwenshare.common.util.PathUtil;
|
||||
import com.qiwenshare.file.api.IFileService;
|
||||
import com.qiwenshare.file.api.IFiletransferService;
|
||||
import com.qiwenshare.file.domain.FileBean;
|
||||
import com.qiwenshare.file.domain.TreeNode;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
|
||||
import static com.mac.common.util.FileUtil.getFileExtendsByType;
|
||||
import static com.qiwenshare.common.util.FileUtil.getFileExtendsByType;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/file")
|
@ -1,13 +1,15 @@
|
||||
package com.mac.scp.controller;
|
||||
package com.qiwenshare.file.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.mac.common.operation.FileOperation;
|
||||
import com.mac.common.util.PathUtil;
|
||||
import com.mac.common.cbb.RestResult;
|
||||
import com.mac.common.operation.ImageOperation;
|
||||
import com.mac.scp.api.IFileService;
|
||||
import com.mac.scp.api.IFiletransferService;
|
||||
import com.mac.scp.domain.*;
|
||||
import com.qiwenshare.common.operation.FileOperation;
|
||||
import com.qiwenshare.common.util.PathUtil;
|
||||
import com.qiwenshare.common.cbb.RestResult;
|
||||
import com.qiwenshare.common.operation.ImageOperation;
|
||||
import com.qiwenshare.file.api.IFileService;
|
||||
import com.qiwenshare.file.api.IFiletransferService;
|
||||
import com.qiwenshare.file.domain.FileBean;
|
||||
import com.qiwenshare.file.domain.StorageBean;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@ -15,7 +17,6 @@ import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.*;
|
||||
import java.net.URLDecoder;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
@ -1,15 +1,15 @@
|
||||
package com.mac.scp.controller;
|
||||
package com.qiwenshare.file.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.serializer.SerializerFeature;
|
||||
import com.mac.common.cbb.RestResult;
|
||||
import com.mac.common.domain.TableData;
|
||||
import com.mac.common.domain.TableQueryBean;
|
||||
import com.mac.scp.api.IFiletransferService;
|
||||
import com.mac.scp.api.IUserService;
|
||||
import com.mac.scp.domain.Permission;
|
||||
import com.mac.scp.domain.Role;
|
||||
import com.mac.scp.domain.UserBean;
|
||||
import com.qiwenshare.common.cbb.RestResult;
|
||||
import com.qiwenshare.common.domain.TableData;
|
||||
import com.qiwenshare.common.domain.TableQueryBean;
|
||||
import com.qiwenshare.file.api.IFiletransferService;
|
||||
import com.qiwenshare.file.api.IUserService;
|
||||
import com.qiwenshare.file.domain.Permission;
|
||||
import com.qiwenshare.file.domain.Role;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authc.UsernamePasswordToken;
|
||||
import org.springframework.web.bind.annotation.*;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.domain;
|
||||
package com.qiwenshare.file.domain;
|
||||
|
||||
import javax.persistence.*;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.domain;
|
||||
package com.qiwenshare.file.domain;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.List;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.domain;
|
||||
package com.qiwenshare.file.domain;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.List;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.domain;
|
||||
package com.qiwenshare.file.domain;
|
||||
|
||||
import javax.persistence.*;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.domain;
|
||||
package com.qiwenshare.file.domain;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.domain;
|
||||
package com.qiwenshare.file.domain;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.websocket.Session;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.domain;
|
||||
package com.qiwenshare.file.domain;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.io.Serializable;
|
@ -1,9 +1,9 @@
|
||||
package com.mac.scp.mapper;
|
||||
package com.qiwenshare.file.mapper;
|
||||
|
||||
import com.mac.scp.domain.*;
|
||||
|
||||
import com.qiwenshare.file.domain.FileBean;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
|
||||
public interface FileMapper {
|
@ -1,7 +1,8 @@
|
||||
package com.mac.scp.mapper;
|
||||
package com.qiwenshare.file.mapper;
|
||||
|
||||
import com.mac.scp.domain.*;
|
||||
import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoProperties;
|
||||
|
||||
import com.qiwenshare.file.domain.StorageBean;
|
||||
import com.qiwenshare.file.domain.UserImageBean;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,7 +1,10 @@
|
||||
package com.mac.scp.mapper;
|
||||
package com.qiwenshare.file.mapper;
|
||||
|
||||
import com.mac.common.domain.TableQueryBean;
|
||||
import com.mac.scp.domain.*;
|
||||
import com.qiwenshare.common.domain.TableQueryBean;
|
||||
|
||||
import com.qiwenshare.file.domain.Permission;
|
||||
import com.qiwenshare.file.domain.Role;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,11 +1,13 @@
|
||||
package com.mac.scp.service;
|
||||
package com.qiwenshare.file.service;
|
||||
|
||||
import com.mac.common.cbb.DateUtil;
|
||||
import com.mac.common.operation.FileOperation;
|
||||
import com.mac.common.util.PathUtil;
|
||||
import com.mac.scp.api.IFileService;
|
||||
import com.mac.scp.domain.*;
|
||||
import com.mac.scp.mapper.FileMapper;
|
||||
import com.qiwenshare.common.cbb.DateUtil;
|
||||
import com.qiwenshare.common.operation.FileOperation;
|
||||
import com.qiwenshare.common.util.PathUtil;
|
||||
import com.qiwenshare.file.api.IFileService;
|
||||
import com.qiwenshare.file.mapper.FileMapper;
|
||||
import com.qiwenshare.file.domain.FileBean;
|
||||
import com.qiwenshare.file.domain.StorageBean;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
@ -1,19 +1,22 @@
|
||||
package com.mac.scp.service;
|
||||
package com.qiwenshare.file.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.mac.common.cbb.DateUtil;
|
||||
import com.mac.common.cbb.RestResult;
|
||||
import com.mac.common.cbb.Uploader;
|
||||
import com.mac.common.domain.UploadFile;
|
||||
import com.mac.scp.api.IFiletransferService;
|
||||
import com.qiwenshare.common.cbb.DateUtil;
|
||||
import com.qiwenshare.common.cbb.RestResult;
|
||||
import com.qiwenshare.common.cbb.Uploader;
|
||||
import com.qiwenshare.common.domain.UploadFile;
|
||||
import com.qiwenshare.file.api.IFiletransferService;
|
||||
|
||||
import com.mac.scp.domain.*;
|
||||
import com.mac.scp.mapper.FileMapper;
|
||||
import com.mac.scp.mapper.FiletransferMapper;
|
||||
import com.qiwenshare.file.mapper.FileMapper;
|
||||
import com.qiwenshare.file.mapper.FiletransferMapper;
|
||||
import com.qiwenshare.file.domain.FileBean;
|
||||
import com.qiwenshare.file.domain.StorageBean;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
import com.qiwenshare.file.domain.UserImageBean;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.service;
|
||||
package com.qiwenshare.file.service;
|
||||
|
||||
import javax.servlet.ServletRequestEvent;
|
||||
import javax.servlet.ServletRequestListener;
|
@ -1,17 +1,17 @@
|
||||
package com.mac.scp.service;
|
||||
package com.qiwenshare.file.service;
|
||||
|
||||
import com.mac.common.cbb.DateUtil;
|
||||
import com.mac.common.cbb.MiniuiUtil;
|
||||
import com.mac.common.cbb.RestResult;
|
||||
import com.mac.common.domain.TableQueryBean;
|
||||
import com.mac.common.util.PasswordUtil;
|
||||
import com.mac.scp.api.IUserService;
|
||||
import com.mac.scp.controller.UserController;
|
||||
import com.mac.scp.domain.Permission;
|
||||
import com.mac.scp.domain.Role;
|
||||
import com.mac.scp.domain.UserBean;
|
||||
import com.mac.scp.domain.UserImageBean;
|
||||
import com.mac.scp.mapper.UserMapper;
|
||||
import com.qiwenshare.common.cbb.DateUtil;
|
||||
import com.qiwenshare.common.cbb.MiniuiUtil;
|
||||
import com.qiwenshare.common.cbb.RestResult;
|
||||
import com.qiwenshare.common.domain.TableQueryBean;
|
||||
import com.qiwenshare.common.util.PasswordUtil;
|
||||
import com.qiwenshare.file.api.IUserService;
|
||||
import com.qiwenshare.file.controller.UserController;
|
||||
import com.qiwenshare.file.domain.Permission;
|
||||
import com.qiwenshare.file.domain.Role;
|
||||
import com.qiwenshare.file.domain.UserBean;
|
||||
import com.qiwenshare.file.domain.UserImageBean;
|
||||
import com.qiwenshare.file.mapper.UserMapper;
|
||||
import org.apache.shiro.crypto.hash.SimpleHash;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
@ -15,14 +15,14 @@ logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %boldYe
|
||||
logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss.SSS} = [%thread] = %-5level = %logger{50} - %msg%n
|
||||
|
||||
#mybatis配置
|
||||
mybatis.type-aliases-package=com.mac.scp.domain
|
||||
mybatis.type-aliases-package=com.qiwenshare.file.domain
|
||||
mybatis.config-locations=classpath:mybatis/mybatis-config.xml
|
||||
mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
|
||||
#jdbc连接
|
||||
spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
|
||||
spring.datasource.url = jdbc:mysql://localhost:3306/file?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=password123
|
||||
spring.datasource.password=ma123456
|
||||
|
||||
#数据库初始化
|
||||
spring.datasource.data=classpath:database/data.sql
|
||||
|
@ -4,9 +4,9 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.mac.scp.mapper.FileMapper">
|
||||
<mapper namespace="com.qiwenshare.file.mapper.FileMapper">
|
||||
|
||||
<insert id="insertFile" parameterType="com.mac.scp.domain.FileBean">
|
||||
<insert id="insertFile" parameterType="com.qiwenshare.file.domain.FileBean">
|
||||
INSERT ignore INTO file (essayid,albumid,userid, filename,timestampname, fileurl,
|
||||
filepath, extendname, uploadtime, filesize, isdir)
|
||||
VALUES (#{essayid},#{albumid},#{userid}, #{filename},#{timestampname},
|
||||
@ -25,7 +25,7 @@
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<update id="updateFile" parameterType="com.mac.scp.domain.FileBean">
|
||||
<update id="updateFile" parameterType="com.qiwenshare.file.domain.FileBean">
|
||||
update file
|
||||
SET filename = #{filename}, uploadtime = #{uploadtime}
|
||||
where fileid = #{fileid}
|
||||
@ -48,25 +48,25 @@
|
||||
</if>
|
||||
</update>
|
||||
|
||||
<select id="selectFileById" parameterType="com.mac.scp.domain.FileBean" resultType="com.mac.scp.domain.FileBean">
|
||||
<select id="selectFileById" parameterType="com.qiwenshare.file.domain.FileBean" resultType="com.qiwenshare.file.domain.FileBean">
|
||||
select * from file
|
||||
where fileid = #{fileid}
|
||||
</select>
|
||||
|
||||
<select id="selectFileList" parameterType="com.mac.scp.domain.FileBean" resultType="com.mac.scp.domain.FileBean">
|
||||
<select id="selectFileList" parameterType="com.qiwenshare.file.domain.FileBean" resultType="com.qiwenshare.file.domain.FileBean">
|
||||
select * from file
|
||||
where filepath = #{filepath} and userid = #{userid}
|
||||
order by isdir desc, filename
|
||||
</select>
|
||||
|
||||
<select id="selectFileListByIds" resultType="com.mac.scp.domain.FileBean" parameterType="int">
|
||||
<select id="selectFileListByIds" resultType="com.qiwenshare.file.domain.FileBean" parameterType="int">
|
||||
select * from file where fileid in
|
||||
<foreach collection="list" open="(" separator="," close=")" item="fileid">
|
||||
#{fileid}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
<select id="selectFileByExtendName" resultType="com.mac.scp.domain.FileBean">
|
||||
<select id="selectFileByExtendName" resultType="com.qiwenshare.file.domain.FileBean">
|
||||
select * from file
|
||||
where extendname in
|
||||
<foreach collection="filenameList" open="(" separator="," close=")" item="extendname">
|
||||
@ -75,12 +75,12 @@
|
||||
and userid = #{userid}
|
||||
</select>
|
||||
|
||||
<select id="selectFileTreeListLikeFilePath" parameterType="com.mac.scp.domain.FileBean" resultType="com.mac.scp.domain.FileBean">
|
||||
<select id="selectFileTreeListLikeFilePath" parameterType="com.qiwenshare.file.domain.FileBean" resultType="com.qiwenshare.file.domain.FileBean">
|
||||
select * from file
|
||||
where filepath like N'${filepath}%'
|
||||
</select>
|
||||
|
||||
<delete id="deleteFileById" parameterType="com.mac.scp.domain.FileBean">
|
||||
<delete id="deleteFileById" parameterType="com.qiwenshare.file.domain.FileBean">
|
||||
DELETE FROM file WHERE fileid = #{fileid}
|
||||
</delete>
|
||||
|
||||
@ -91,12 +91,12 @@
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<select id="selectFilePathTreeByUserid" parameterType="com.mac.scp.domain.FileBean" resultType="com.mac.scp.domain.FileBean">
|
||||
<select id="selectFilePathTreeByUserid" parameterType="com.qiwenshare.file.domain.FileBean" resultType="com.qiwenshare.file.domain.FileBean">
|
||||
SELECT * FROM file
|
||||
WHERE isdir = 1 and userid=#{userid}
|
||||
</select>
|
||||
|
||||
<!-- <select id="selectFileByExtendName" resultType="com.mac.scp.domain.FileBean" parameterType="java.lang.String">-->
|
||||
<!-- <select id="selectFileByExtendName" resultType="FileBean" parameterType="java.lang.String">-->
|
||||
<!-- select * from file-->
|
||||
<!-- where extendname in-->
|
||||
<!-- <foreach collection="list" separator="," open="(" close=")" item="extendname">-->
|
||||
|
@ -4,13 +4,13 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.mac.scp.mapper.FiletransferMapper">
|
||||
<mapper namespace="com.qiwenshare.file.mapper.FiletransferMapper">
|
||||
|
||||
<delete id="deleteUserImageById" parameterType="com.mac.scp.domain.UserImageBean">
|
||||
<delete id="deleteUserImageById" parameterType="com.qiwenshare.file.domain.UserImageBean">
|
||||
DELETE FROM userimage WHERE imageid = #{imageid}
|
||||
</delete>
|
||||
|
||||
<resultMap type="com.mac.scp.domain.UserImageBean" id="imageBeanMap">
|
||||
<resultMap type="com.qiwenshare.file.domain.UserImageBean" id="imageBeanMap">
|
||||
<id property="imageid" column="imageid"/>
|
||||
<result property="userid" column="userid"/>
|
||||
<result property="imageurl" column="imageurl"/>
|
||||
@ -19,36 +19,36 @@
|
||||
SELECT imageid, userid, imageurl FROM userimage
|
||||
where userid = #{userid}
|
||||
</select>
|
||||
<insert id="insertUserImage" parameterType="com.mac.scp.domain.UserImageBean">
|
||||
<insert id="insertUserImage" parameterType="com.qiwenshare.file.domain.UserImageBean">
|
||||
INSERT INTO userimage (userid, imageurl, uploadtime)
|
||||
VALUES (#{userid}, #{imageurl}, #{uploadtime});
|
||||
</insert>
|
||||
|
||||
<select id="selectUserImage" parameterType="int" resultType="com.mac.scp.domain.UserImageBean">
|
||||
<select id="selectUserImage" parameterType="int" resultType="com.qiwenshare.file.domain.UserImageBean">
|
||||
SELECT * FROM userimage where userid = #{userId}
|
||||
</select>
|
||||
|
||||
<select id="selectUserImageByUrl" parameterType="String" resultType="com.mac.scp.domain.UserImageBean">
|
||||
<select id="selectUserImageByUrl" parameterType="String" resultType="com.qiwenshare.file.domain.UserImageBean">
|
||||
SELECT * FROM userimage WHERE imageurl =#{imageurl}
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<select id="selectStorageBean" resultType="com.mac.scp.domain.StorageBean" parameterType="com.mac.scp.domain.StorageBean">
|
||||
<select id="selectStorageBean" resultType="com.qiwenshare.file.domain.StorageBean" parameterType="com.qiwenshare.file.domain.StorageBean">
|
||||
select * from storage where userid = #{userid};
|
||||
</select>
|
||||
|
||||
<insert id="updateStorageBean" parameterType="com.mac.scp.domain.StorageBean">
|
||||
<insert id="updateStorageBean" parameterType="com.qiwenshare.file.domain.StorageBean">
|
||||
update storage
|
||||
set storagesize = #{storagesize}
|
||||
where userid = #{userid} and storageid = #{storageid}
|
||||
</insert>
|
||||
<insert id="insertStorageBean" parameterType="com.mac.scp.domain.StorageBean">
|
||||
<insert id="insertStorageBean" parameterType="com.qiwenshare.file.domain.StorageBean">
|
||||
insert into storage (storageid, userid, storagesize)
|
||||
values (#{storageid}, #{userid}, #{storagesize})
|
||||
</insert>
|
||||
|
||||
<select id="selectStorageByUser" resultType="com.mac.scp.domain.StorageBean" parameterType="com.mac.scp.domain.StorageBean">
|
||||
<select id="selectStorageByUser" resultType="com.qiwenshare.file.domain.StorageBean" parameterType="com.qiwenshare.file.domain.StorageBean">
|
||||
select * from storage where userid=#{userid}
|
||||
</select>
|
||||
</mapper>
|
@ -4,9 +4,9 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.mac.scp.mapper.UserMapper">
|
||||
<mapper namespace="com.qiwenshare.file.mapper.UserMapper">
|
||||
|
||||
<resultMap type="com.mac.scp.domain.UserBean" id="userBeanResultMapId">
|
||||
<resultMap type="com.qiwenshare.file.domain.UserBean" id="userBeanResultMapId">
|
||||
<id property="userId" column="userId"/>
|
||||
<result property="username" column="username"/>
|
||||
<result property="realname" column="realname"/>
|
||||
@ -21,18 +21,18 @@
|
||||
<result property="intro" column="intro"/>
|
||||
<result property="notReadCount" column="notReadCount"/>
|
||||
<result property="imageurl" column="imageurl" />
|
||||
<collection property="roleList" ofType="com.mac.scp.domain.Role">
|
||||
<collection property="roleList" ofType="com.qiwenshare.file.domain.Role">
|
||||
<id property="roleid" column="roleid"/>
|
||||
<result property="role" column="role"/>
|
||||
<result property="description" column="description"/>
|
||||
<result property="available" column="available"/>
|
||||
<collection property="permissions" ofType="com.mac.scp.domain.Permission" column="roleid"
|
||||
select="com.mac.scp.mapper.UserMapper.getPermissionByRoleid">
|
||||
<collection property="permissions" ofType="com.qiwenshare.file.domain.Permission" column="roleid"
|
||||
select="com.qiwenshare.file.mapper.UserMapper.getPermissionByRoleid">
|
||||
</collection>
|
||||
</collection>
|
||||
</resultMap>
|
||||
|
||||
<insert id="insertUser" parameterType="com.mac.scp.domain.UserBean" useGeneratedKeys="true" keyProperty="userId">
|
||||
<insert id="insertUser" parameterType="com.qiwenshare.file.domain.UserBean" useGeneratedKeys="true" keyProperty="userId">
|
||||
INSERT INTO user (username, salt, PASSWORD, qqpassword, telephone, sex, openid, imageurl, registertime)
|
||||
VALUES (#{username},#{salt}, #{password}, #{qqpassword}, #{telephone}, #{sex}, #{openid}, #{imageurl}, #{registertime});
|
||||
</insert>
|
||||
@ -42,7 +42,7 @@
|
||||
VALUES (#{param1}, #{param2});
|
||||
</insert>
|
||||
|
||||
<select id="selectUser" parameterType="com.mac.scp.domain.UserBean" resultMap="userBeanResultMapId">
|
||||
<select id="selectUser" parameterType="com.qiwenshare.file.domain.UserBean" resultMap="userBeanResultMapId">
|
||||
SELECT *
|
||||
FROM user
|
||||
WHERE (username=#{username} OR telephone=#{telephone}) AND PASSWORD=#{password};
|
||||
@ -56,7 +56,7 @@
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getPermissionByRoleid" parameterType="int" resultType="com.mac.scp.domain.Permission">
|
||||
<select id="getPermissionByRoleid" parameterType="int" resultType="com.qiwenshare.file.domain.Permission">
|
||||
select * from permission
|
||||
inner join role_permission on role_permission.permissionid = permission.permissionid
|
||||
where permission.permissionid = #{roleid}
|
||||
@ -68,7 +68,7 @@
|
||||
WHERE user.userId = #{userId}
|
||||
</select>
|
||||
|
||||
<select id="selectUserByopenid" resultType="com.mac.scp.domain.UserBean" parameterType="java.lang.String">
|
||||
<select id="selectUserByopenid" resultType="com.qiwenshare.file.domain.UserBean" parameterType="java.lang.String">
|
||||
SELECT *
|
||||
FROM user
|
||||
WHERE user.openid = #{openid}
|
||||
@ -80,7 +80,7 @@
|
||||
</select>
|
||||
|
||||
<select id="selectUserListByCondition" resultMap="userBeanResultMapId"
|
||||
parameterType="com.mac.common.domain.TableQueryBean">
|
||||
parameterType="com.qiwenshare.common.domain.TableQueryBean">
|
||||
SELECT * FROM user
|
||||
<if test="key != null">
|
||||
where username LIKE '%${key}%'
|
||||
@ -91,7 +91,7 @@
|
||||
limit #{beginCount}, #{limit}
|
||||
</select>
|
||||
|
||||
<select id="selectUserCountByCondition" resultType="int" parameterType="com.mac.common.domain.TableQueryBean">
|
||||
<select id="selectUserCountByCondition" resultType="int" parameterType="com.qiwenshare.common.domain.TableQueryBean">
|
||||
SELECT count(*) FROM user
|
||||
<if test="key != null">
|
||||
where username LIKE '%${key}%'
|
||||
@ -99,11 +99,11 @@
|
||||
limit #{beginCount}, #{limit}
|
||||
</select>
|
||||
|
||||
<delete id="deleteUserInfo" parameterType="com.mac.scp.domain.UserBean">
|
||||
<delete id="deleteUserInfo" parameterType="com.qiwenshare.file.domain.UserBean">
|
||||
delete from user where userId = #{userId}
|
||||
</delete>
|
||||
|
||||
<update id="updateUserInfo" parameterType="com.mac.scp.domain.UserBean">
|
||||
<update id="updateUserInfo" parameterType="com.qiwenshare.file.domain.UserBean">
|
||||
update user set
|
||||
username = #{username},
|
||||
realname = #{realname},
|
||||
@ -119,37 +119,37 @@
|
||||
|
||||
</update>
|
||||
|
||||
<update id="updateEmail" parameterType="com.mac.scp.domain.UserBean">
|
||||
<update id="updateEmail" parameterType="com.qiwenshare.file.domain.UserBean">
|
||||
update user set
|
||||
email = #{email}
|
||||
where userId = #{userId}
|
||||
|
||||
</update>
|
||||
<update id="updataImageUrl" parameterType="com.mac.scp.domain.UserBean">
|
||||
<update id="updataImageUrl" parameterType="com.qiwenshare.file.domain.UserBean">
|
||||
update user set
|
||||
imageurl = #{imageurl}
|
||||
where userId = #{userId}
|
||||
</update>
|
||||
|
||||
<select id="selectUserByUserName" parameterType="com.mac.scp.domain.UserBean" resultMap="userBeanResultMapId">
|
||||
<select id="selectUserByUserName" parameterType="com.qiwenshare.file.domain.UserBean" resultMap="userBeanResultMapId">
|
||||
select * from user
|
||||
left join user_role on user_role.userId = user.userId
|
||||
left join role on role.roleid = user_role.roleid
|
||||
where (username = #{username}) AND openid IS NULL
|
||||
</select>
|
||||
|
||||
<select id="selectUserByTelephone" parameterType="com.mac.scp.domain.UserBean"
|
||||
resultType="com.mac.scp.domain.UserBean">
|
||||
<select id="selectUserByTelephone" parameterType="com.qiwenshare.file.domain.UserBean"
|
||||
resultType="com.qiwenshare.file.domain.UserBean">
|
||||
select * from user where telephone = #{telephone}
|
||||
</select>
|
||||
|
||||
<select id="selectRoleList" resultType="com.mac.scp.domain.Role">
|
||||
<select id="selectRoleList" resultType="com.qiwenshare.file.domain.Role">
|
||||
SELECT * FROM role
|
||||
|
||||
</select>
|
||||
|
||||
<select id="selectPermissionListByCondition" resultType="com.mac.scp.domain.Permission"
|
||||
parameterType="com.mac.common.domain.TableQueryBean">
|
||||
<select id="selectPermissionListByCondition" resultType="com.qiwenshare.file.domain.Permission"
|
||||
parameterType="com.qiwenshare.common.domain.TableQueryBean">
|
||||
SELECT * FROM permission
|
||||
<if test="key != null">
|
||||
where permission LIKE '%${key}%'
|
||||
|
8
file-web/src/main/resources/script/startup.sh
Normal file
8
file-web/src/main/resources/script/startup.sh
Normal file
@ -0,0 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
BUILD_ID=dontKillMe
|
||||
|
||||
nohup java -jar app/file-web/file-web-0.0.1-SNAPSHOT.jar --server.port=8763 &
|
||||
|
||||
|
||||
|
11
file-web/src/main/resources/script/stop.sh
Normal file
11
file-web/src/main/resources/script/stop.sh
Normal file
@ -0,0 +1,11 @@
|
||||
#!/bin/bash
|
||||
|
||||
PID=$(ps -ef | grep app/file-web |grep -v grep | awk '{ print $2 }')
|
||||
if [ -z "$PID" ]
|
||||
then
|
||||
echo Application is already stopped
|
||||
else
|
||||
echo kill $PID
|
||||
kill $PID
|
||||
fi
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp;
|
||||
package com.qiwenshare.file;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
@ -1,4 +1,4 @@
|
||||
package com.mac.scp.config.redis;
|
||||
package com.qiwenshare.file.config.redis;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
Loading…
Reference in New Issue
Block a user