Skip to content
GitLab
Commit f4ef5aa0 authored by 季圣华's avatar 季圣华
Browse files

vue版本上线

parent 76a0033a
Expand all Hide whitespace changes
Inline Side-by-side
.gitattributes
View file @ f4ef5aa0
*.js linguist-language=Java *.js linguist-language=Java
*.css linguist-language=Java *.css linguist-language=Java
*.html linguist-language=Java *.html linguist-language=Java
*.vue linguist-language=Java
.gitignore
View file @ f4ef5aa0
*.class ## ide
**/.idea
# Mobile Tools for Java (J2ME) *.iml
.mtj.tmp/
## backend
*.iml **/target
# Package Files # **/logs
*.jar
*.war ## front
*.ear **/*.lock
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
.idea
/target
**/*.iml
README.md
View file @ f4ef5aa0
# 项目总述 # 项目总述
* 很多人说华夏ERP（英文名：jshERP）是目前人气领先的国产ERP系统 * 很多人说华夏ERP（英文名：jshERP）是目前人气领先的国产ERP系统
* 虽然目前只有进销存+财务+生产的功能，但后面会推出ERP的全部功能，有兴趣请帮点一下 **Star** 哦 * 虽然目前只有进销存+财务+生产的功能，但后面将会推出ERP的全部功能，有兴趣请帮点一下 **Star** 哦
* **官网URL：http://www.huaxiaerp.com 商务合作或技术交流，请联系QQ：752718920** * **官网URL：http://www.huaxiaerp.com 商务合作或技术交流，请联系QQ：752718920**
* 欢迎加入华夏ERP交流QQ群，群1：120725710(满)、群2：732152262 * 欢迎加入华夏ERP交流QQ群，群1：120725710(满)、群2：732152262
* 演示地址：http://47.116.69.14 演示账号：jsh，密码：123456 * 演示地址：http://47.116.69.14 演示账号：jsh，密码：123456
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
* UI框架: EasyUI 1.9.4 * UI框架: EasyUI 1.9.4
* 模板框架: AdminLTE 2.4.0 * 模板框架: AdminLTE 2.4.0
* 项目管理框架: Maven 3.2.3 * 项目管理框架: Maven 3.2.3
* API接口框架: swagger2.7.0(ip:port/doc.html)
# 开发环境 # 开发环境
建议开发者使用以下环境，可以避免版本不一致带来的问题 建议开发者使用以下环境，可以避免版本带来的问题
* IDE: IntelliJ IDEA 2017+ * IDE: IntelliJ IDEA 2017+
* DB: Mysql5.7+ * DB: Mysql5.7+
* JDK: JDK1.8 * JDK: JDK1.8
...@@ -38,7 +37,7 @@ ...@@ -38,7 +37,7 @@
* JAVA平台: JRE1.8 * JAVA平台: JRE1.8
* 操作系统：Windows、Linux等 * 操作系统：Windows、Linux等
* 为方便大家搭建运行环境，分享了下载地址 https://pan.baidu.com/s/1jlild9uyGdQ7H2yaMx76zw 提取码:814g * 为方便大家搭建运行环境，分享了下载地址 https://pan.baidu.com/s/1jlild9uyGdQ7H2yaMx76zw 提取码:814g
* 不会maven打包的小伙伴，请下载此打包后的文件 https://pan.baidu.com/s/1Opqz-WjonJEfwWL_7iiyPw 提取码：yrq2 * 不会maven打包的小伙伴，请下载此打包后的文件：https://pan.baidu.com/s/1soId837KuvhpzTAgF62XRA 提取码：tm3k
# 开源说明 # 开源说明
* 本系统100%开源，遵守GPL-3.0协议 * 本系统100%开源，遵守GPL-3.0协议
...@@ -66,7 +65,7 @@ ...@@ -66,7 +65,7 @@
![输入图片说明](https://images.gitee.com/uploads/images/2020/0529/232101_a502d325_852955.png "系统管理.png") ![输入图片说明](https://images.gitee.com/uploads/images/2020/0529/232101_a502d325_852955.png "系统管理.png")
# 捐赠 # 捐赠
开源不易，坚持更难！如果您觉得华夏ERP不错，可以通过捐赠请作者喝杯咖啡~，在此表示感谢^_^。 开源不易，坚持更难！如果您觉得华夏ERP不错，可以捐赠请作者喝杯咖啡~，在此表示感谢^_^。
点击以下链接，将页面拉到最下方点击“捐赠”即可。 点击以下链接，将页面拉到最下方点击“捐赠”即可。
......
jshERP-boot/.gitattributes 0 → 100644
View file @ f4ef5aa0
*.js linguist-language=Java
*.css linguist-language=Java
*.html linguist-language=Java
jshERP-boot/.gitignore 0 → 100644
View file @ f4ef5aa0
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
*.iml
# Package Files #
*.jar
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
.idea
/target
**/*.iml
jshERP-boot/docs/jsh_erp.sql 0 → 100644
View file @ f4ef5aa0
This diff is collapsed.
jshERP-boot/pom.xml 0 → 100644
View file @ f4ef5aa0
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>com.jsh</groupId>
<artifactId>jshERP-boot</artifactId>
<version>2.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>jshERP-boot</name>
<description>华夏ERP</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>com.gitee.starblues</groupId>
<artifactId>springboot-plugin-framework</artifactId>
<version>2.2.1-RELEASE</version>
</dependency>
<dependency>
<groupId>com.gitee.starblues</groupId>
<artifactId>springboot-plugin-framework-extension-mybatis</artifactId>
<version>2.2.1-RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.55</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.30</version>
</dependency>
<!--http-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.6.12</version>
</dependency>
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
</dependency>
<!-- 日志 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.10.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.25</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.0.7.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-redis</artifactId>
<version>1.4.1.RELEASE</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>1.6</version>
</dependency>
</dependencies>
<build>
<finalName>jshERP3.0</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.0.3.RELEASE</version>
<executions>
<execution>
<id>build-info</id>
<phase>generate-sources</phase>
<goals>
<goal>build-info</goal>
</goals>
</execution>
<execution>
<id>repackage</id>
<phase>package</phase>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>com.jsh.erp.ErpApplication</mainClass>
<layout>JAR</layout>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.1</version>
<executions>
<execution>
<id>make-zip</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
<outputDirectory>./dist</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<configurationFile>${basedir}/src/test/resources/generatorConfig.xml</configurationFile>
<verbose>true</verbose>
<overwrite>true</overwrite>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
jshERP-boot/src/main/assembly/assembly.xml 0 → 100644
View file @ f4ef5aa0
<?xml version="1.0" encoding="UTF-8" ?>
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 ">
<id>bin</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>erp_web</directory>
<outputDirectory>/erp_web</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/target</directory>
<includes>
<include>*.jar</include>
</includes>
<outputDirectory>/lib</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>*.properties</include>
<include>*.yml</include>
<include>*.yaml</include>
<include>*.xml</include>
</includes>
<outputDirectory>/config</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/bin</directory>
<outputDirectory>/bin</outputDirectory>
<includes>
<include>run-manage.sh</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/bin/</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>start.bat</include>
<include>restart.sh</include>
<include>start.sh</include>
<include>stop.sh</include>
<include>status.sh</include>
</includes>
</fileSet>
<fileSet>
<directory>docs</directory>
<outputDirectory>/docs</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}</directory>
<includes>
<include>*.md</include>
<include>*.txt</include>
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
jshERP-boot/src/main/bin/restart.sh 0 → 100644
View file @ f4ef5aa0
./bin/run-manage.sh restart
\ No newline at end of file
jshERP-boot/src/main/bin/run-manage.sh 0 → 100644
View file @ f4ef5aa0
SERVER_NAME=jshERP
readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))}
#readonly JAVA_HOME=""
readonly CONFIG_HOME="$APP_HOME/config/"
readonly LIB_HOME="$APP_HOME/lib"
readonly LOGS_HOME="$APP_HOME/logs"
readonly PID_FILE="$LOGS_HOME/application.pid"
readonly APP_MAIN_CLASS="jshERP3.0.jar"
readonly LOG_CONFIG="$CONFIG_HOME/logback-spring.xml"
readonly JAVA_RUN="-Dlogs.home=$LOGS_HOME -Dlogging.config=$LOG_CONFIG -Dspring.config.location=file:$CONFIG_HOME -Dspring.pid.file=$PID_FILE -Dspring.pid.fail-on-write-error=true"
readonly JAVA_OPTS="-server -Xms128m -Xmx320m -XX:PermSize=128M -XX:MaxPermSize=256M $JAVA_RUN"
readonly JAVA="java"
PID=0
if [ ! -x "$LOGS_HOME" ]
then
mkdir $LOGS_HOME
fi
chmod +x -R "$JAVA_HOME/bin/"
functions="/etc/functions.sh"
if test -f $functions ; then
. $functions
else
success()
{
echo " SUCCESS! $@"
}
failure()
{
echo " ERROR! $@"
}
warning()
{
echo "WARNING! $@"
}
fi
function checkpid() {
PID=$(ps -ef | grep $APP_MAIN_CLASS | grep -v 'grep' | awk '{print int($2)}')
if [[ -n "$PID" ]]
then
return 0
else
return 1
fi
}
function start() {
checkpid
if [[ $? -eq 0 ]]
then
warning "[$APP_MAIN_CLASS]: already started! (PID=$PID)"
else
echo -n "[$APP_MAIN_CLASS]: Starting ..."
JAVA_CMD="nohup $JAVA $JAVA_OPTS -jar $LIB_HOME/$APP_MAIN_CLASS > /dev/null 2>&1 &"
# echo "Exec cmmand : $JAVA_CMD"
sh -c "$JAVA_CMD"
sleep 3
checkpid
if [[ $? -eq 0 ]]
then
success "(PID=$PID) "
else
failure " "
fi
fi
}
function stop() {
checkpid
if [[ $? -eq 0 ]];
then
echo -n "[$APP_MAIN_CLASS]: Shutting down ...(PID=$PID) "
kill -9 $PID
if [[ $? -eq 0 ]];
then
echo 0 > $PID_FILE
success " "
else
failure " "
fi
else
warning "[$APP_MAIN_CLASS]: is not running ..."
fi
}
function status() {
checkpid
if [[ $? -eq 0 ]]
then
success "[$APP_MAIN_CLASS]: is running! (PID=$PID)"
return 0
else
failure "[$APP_MAIN_CLASS]: is not running"
return 1
fi
}
function info() {
echo "System Information:"
echo
echo "****************************"
echo `head -n 1 /etc/issue`
echo `uname -a`
echo
echo "JAVA_HOME=$JAVA_HOME"
echo
echo "JAVA Environment Information:"
echo `$JAVA -version`
echo
echo "APP_HOME=$APP_HOME"
echo "APP_MAIN_CLASS=$APP_MAIN_CLASS"
echo
echo "****************************"
}
case "$1" in
'start')
start
;;
'stop')
stop
;;
'restart')
stop
start
;;
'status')
status
;;
'info')
info
;;
*)
echo "Usage: $0 {help|start|stop|restart|status|info}"
;;
esac
exit 0
jshERP-boot/src/main/bin/start.bat 0 → 100644
View file @ f4ef5aa0
@echo off
title jshERP
java -Xms1000m -Xmx2000m -jar .\lib\jshERP.jar
pause over
\ No newline at end of file
jshERP-boot/src/main/bin/start.sh 0 → 100644
View file @ f4ef5aa0
./bin/run-manage.sh start
\ No newline at end of file
jshERP-boot/src/main/bin/status.sh 0 → 100644
View file @ f4ef5aa0
./bin/run-manage.sh status
\ No newline at end of file
jshERP-boot/src/main/bin/stop.sh 0 → 100644
View file @ f4ef5aa0
./bin/run-manage.sh stop
\ No newline at end of file
jshERP-boot/src/main/java/com/jsh/erp/ErpApplication.java 0 → 100644
View file @ f4ef5aa0
package com.jsh.erp;
import com.jsh.erp.utils.ComputerInfo;
import org.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.scheduling.annotation.EnableScheduling;
import java.io.IOException;
@SpringBootApplication
@MapperScan("com.jsh.erp.datasource.mappers")
@ServletComponentScan
@EnableScheduling
public class ErpApplication{
public static void main(String[] args) throws IOException {
ConfigurableApplicationContext context = SpringApplication.run(ErpApplication.class, args);
Environment environment = context.getBean(Environment.class);
System.out.println("启动成功，访问地址：http://" + ComputerInfo.getIpAddr() + ":"
+ environment.getProperty("server.port") + "，测试用户：jsh，密码：123456");
}
}
jshERP-boot/src/main/java/com/jsh/erp/config/PluginBeanConfig.java 0 → 100644
View file @ f4ef5aa0
package com.jsh.erp.config;
import com.gitee.starblues.extension.mybatis.SpringBootMybatisExtension;
import com.gitee.starblues.integration.application.AutoPluginApplication;
import com.gitee.starblues.integration.application.PluginApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @Author: jishenghua
* @Version: 1.0
* @Create Date Time: 2019-05-30 15:53
* @Update Date Time:
* @see
*/
@Configuration
public class PluginBeanConfig {
@Bean
public PluginApplication pluginApplication(){
PluginApplication pluginApplication = new AutoPluginApplication();
pluginApplication.addExtension(new SpringBootMybatisExtension());
return pluginApplication;
}
}
jshERP-boot/src/main/java/com/jsh/erp/config/PluginConfiguration.java 0 → 100644
View file @ f4ef5aa0
package com.jsh.erp.config;
import com.gitee.starblues.integration.DefaultIntegrationConfiguration;
import org.pf4j.RuntimeMode;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
* @Description:
* @Author: jishenghua
* @Version: 1.0
* @Create Date Time: 2019-05-25 12:36
* @Update Date Time:
* @see
*/
@Component
@ConfigurationProperties(prefix = "plugin")
public class PluginConfiguration extends DefaultIntegrationConfiguration {
/**
* 运行模式
* 开发环境: development、dev
* 生产/部署 环境: deployment、prod
*/
@Value("${runMode:dev}")
private String runMode;
@Value("${pluginPath:plugins}")
private String pluginPath;
@Value("${pluginConfigFilePath:pluginConfigs}")
private String pluginConfigFilePath;
@Override
public RuntimeMode environment() {
return RuntimeMode.byName(runMode);
}
@Override
public String pluginPath() {
return pluginPath;
}
@Override
public String pluginConfigFilePath() {
return pluginConfigFilePath;
}
@Override
public String uploadTempPath() {
return "temp";
}
@Override
public String backupPath() {
return "backupPlugin";
}
@Override
public String pluginRestControllerPathPrefix() {
return "/api/plugin";
}
@Override
public boolean enablePluginIdRestControllerPathPrefix() {
return true;
}
public String getRunMode() {
return runMode;
}
public void setRunMode(String runMode) {
this.runMode = runMode;
}
public String getPluginPath() {
return pluginPath;
}
public void setPluginPath(String pluginPath) {
this.pluginPath = pluginPath;
}
public String getPluginConfigFilePath() {
return pluginConfigFilePath;
}
public void setPluginConfigFilePath(String pluginConfigFilePath) {
this.pluginConfigFilePath = pluginConfigFilePath;
}
@Override
public String toString() {
return "PluginArgConfiguration{" +
"runMode='" + runMode + '\'' +
", pluginPath='" + pluginPath + '\'' +
", pluginConfigFilePath='" + pluginConfigFilePath + '\'' +
'}';
}
}
jshERP-boot/src/main/java/com/jsh/erp/config/Swagger2Config.java 0 → 100644
View file @ f4ef5aa0
package com.jsh.erp.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/**
* 插件集成配置
*
* @author jishenghua
* @version 1.0
*/
@Configuration
@EnableSwagger2
public class Swagger2Config {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(this.apiInfo())
.select()
.apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any())
.build();
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("Mybatis-Plus Plugin Example RESTful APIs")
.description("集成Mybatis-Plus模块接口描述")
.termsOfServiceUrl("http://127.0.0.1")
.contact(new Contact("jishenghua", "", ""))
.version("2.1.1")
.build();
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment