Skip to content

K
kaoshi-java
Commit 63bca5aa authored by 张昊飞's avatar 张昊飞
Browse files
Options

1、修改pom 

2、同步实体类
parent 73743d00
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 3 deletions
ruoyi-admin/src/main/resources/logback.xml
View file @ 63bca5aa
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="/home/ruoyi/logs" /> <property name="log.path" value="logs" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
......
ruoyi-common/lib/aspose/aspose-words/23.4/_remote.repositories 0 → 100644
View file @ 63bca5aa
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Wed Apr 24 19:38:09 CST 2024
aspose-words-23.4-jdk17.jar>aspose-maven-repository=
aspose-words-23.4.pom>aspose-maven-repository=
ruoyi-common/lib/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar.lastUpdated 0 → 100644
View file @ 63bca5aa
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Sat Aug 23 14:37:19 CST 2025
962b12a5cc1af195354cac928a1e79667ae6ad76@default-nexus-http\://maven.miaoyouche.cn/repository/public/.lastUpdated=1713958687016
http\://artifact.aspose.com/repo/.lastUpdated=1713958689750
http\://maven.aliyun.com/nexus/content/repositories/central/.error=
http\://maven.aliyun.com/nexus/content/repositories/central/.lastUpdated=1737425966714
http\://maven.miaoyouche.cn/repository/public/.error=Could not transfer artifact com.aspose\:aspose-words\:jar\:jdk17\:23.4 from/to nexus (http\://maven.miaoyouche.cn/repository/public/)\: Transfer failed for http\://maven.miaoyouche.cn/repository/public/com/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar
https\://maven.aliyun.com/repository/public/.error=
https\://maven.aliyun.com/repository/public/.lastUpdated=1755931038922
https\://mirrors.huaweicloud.com/repository/maven/.error=
https\://mirrors.huaweicloud.com/repository/maven/.lastUpdated=1713958687176
https\://packages.aliyun.com/maven/repository/2462725-release-LeztUs/.error=
https\://packages.aliyun.com/maven/repository/2462725-release-LeztUs/.lastUpdated=1755931039200
https\://repo.maven.apache.org/maven2/.error=
https\://repo.maven.apache.org/maven2/.lastUpdated=1755931039064
ruoyi-common/lib/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar.sha1 0 → 100644
View file @ 63bca5aa
843a6c95763b0c98fe83b2a89672d006f19c759b
\ No newline at end of file
ruoyi-common/lib/aspose/aspose-words/23.4/aspose-words-23.4-jdk21.jar.lastUpdated 0 → 100644
View file @ 63bca5aa
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Sat Aug 23 14:16:16 CST 2025
https\://maven.aliyun.com/repository/public/.error=
https\://maven.aliyun.com/repository/public/.lastUpdated=1755929775789
https\://packages.aliyun.com/maven/repository/2462725-release-LeztUs/.error=
https\://packages.aliyun.com/maven/repository/2462725-release-LeztUs/.lastUpdated=1755929776269
https\://repo.maven.apache.org/maven2/.error=
https\://repo.maven.apache.org/maven2/.lastUpdated=1755929776127
ruoyi-common/lib/aspose/aspose-words/23.4/aspose-words-23.4.pom 0 → 100644
View file @ 63bca5aa
<?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.aspose</groupId>
<artifactId>aspose-words</artifactId>
<version>23.4</version>
<packaging>pom</packaging>
<name>Aspose.Words for Java</name>
<description>
Aspose.Words for Java is a full-featured Word Processing API.
It allows to read, modify, convert, generate, format, render
and print human-readable documents. Aspose.Words for Java
supports all the popular Word Processing file formats.
</description>
<url>https://products.aspose.com/words/java</url>
<issueManagement>
<url>https://forum.aspose.com/c/words</url>
</issueManagement>
<licenses>
<license>
<name>Aspose EULA</name>
<url>https://company.aspose.com/legal/eula</url>
</license>
</licenses>
<properties>
<jogl.version>2.3.2</jogl.version>
</properties>
<organization>
<name>Aspose Pty Ltd</name>
<url>https://www.aspose.com/</url>
</organization>
<dependencies>
<!-- JogAmp JOGL library is used for hardware-accelerated OpenGL rendering. -->
<!-- JogAmp's .pom configured for "portability": it just loads all native jar files for all supported platforms. -->
<!-- See https://jogamp.org/wiki/index.php/Maven -->
<!-- If you don't like these spare jars on your disk, you have 2 options: -->
<!-- 1. Remove both org.jogamp.jogl and org.jogamp.gluegen dependencies if you don't need OpenGL. -->
<!-- 2. OR Edit the full list of JoGL dependencies to preserve only needed jars. (the full commented-out list is below) -->
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all-main</artifactId>
<version>${jogl.version}</version>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt-main</artifactId>
<version>${jogl.version}</version>
</dependency>
<!--
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>${jogl.version}</version>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>${jogl.version}</version>
<classifier>natives-windows-i586</classifier>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>${jogl.version}</version>
<classifier>natives-windows-amd64</classifier>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>${jogl.version}</version>
<classifier>natives-linux-i586</classifier>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>${jogl.version}</version>
<classifier>natives-linux-amd64</classifier>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>${jogl.version}</version>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>${jogl.version}</version>
<classifier>natives-windows-i586</classifier>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>${jogl.version}</version>
<classifier>natives-windows-amd64</classifier>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>${jogl.version}</version>
<classifier>natives-linux-i586</classifier>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>${jogl.version}</version>
<classifier>natives-linux-amd64</classifier>
</dependency>
-->
</dependencies>
</project>
\ No newline at end of file
ruoyi-common/lib/aspose/aspose-words/23.4/aspose-words-23.4.pom.lastUpdated 0 → 100644
View file @ 63bca5aa
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Sat Aug 23 14:37:18 CST 2025
962b12a5cc1af195354cac928a1e79667ae6ad76@default-nexus-http\://maven.miaoyouche.cn/repository/public/.lastUpdated=1713958684017
@default-maven-default-http-blocker-http\://0.0.0.0/.lastUpdated=1755929402871
http\://0.0.0.0/.error=Could not transfer artifact com.aspose\:aspose-words\:pom\:23.4 from/to maven-default-http-blocker (http\://0.0.0.0/)\: Blocked mirror for repositories\: [aspose-maven-repository (http\://artifact.aspose.com/repo/, default, releases+snapshots)]
http\://artifact.aspose.com/repo/.lastUpdated=1713958686743
http\://maven.aliyun.com/nexus/content/repositories/central/.error=
http\://maven.aliyun.com/nexus/content/repositories/central/.lastUpdated=1737425966186
http\://maven.miaoyouche.cn/repository/public/.error=Could not transfer artifact com.aspose\:aspose-words\:pom\:23.4 from/to nexus (http\://maven.miaoyouche.cn/repository/public/)\: Transfer failed for http\://maven.miaoyouche.cn/repository/public/com/aspose/aspose-words/23.4/aspose-words-23.4.pom
https\://maven.aliyun.com/repository/public/.error=
https\://maven.aliyun.com/repository/public/.lastUpdated=1755931036607
https\://mirrors.huaweicloud.com/repository/maven/.error=
https\://mirrors.huaweicloud.com/repository/maven/.lastUpdated=1755929402869
https\://packages.aliyun.com/maven/repository/2462725-release-LeztUs/.error=
https\://packages.aliyun.com/maven/repository/2462725-release-LeztUs/.lastUpdated=1755931038713
https\://repo.maven.apache.org/maven2/.error=
https\://repo.maven.apache.org/maven2/.lastUpdated=1755931038508
ruoyi-common/lib/aspose/aspose-words/23.4/aspose-words-23.4.pom.sha1 0 → 100644
View file @ 63bca5aa
55114bc27950004b3e0a81d992931b80157ea7ad
\ No newline at end of file
ruoyi-common/pom.xml
View file @ 63bca5aa
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<version>23.4</version> <version>23.4</version>
<classifier>jdk17</classifier> <classifier>jdk17</classifier>
<scope>system</scope> <scope>system</scope>
<systemPath>D:/apache-maven-3.6.2/repository/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar</systemPath> <systemPath>${project.basedir}/lib/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
......
ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMajorClass.java
View file @ 63bca5aa
...@@ -35,6 +35,40 @@ public class TbMajorClass extends TreeEntity ...@@ -35,6 +35,40 @@ public class TbMajorClass extends TreeEntity
/** 类型（0-全部） */ /** 类型（0-全部） */
private Integer type; private Integer type;
/**
* 专业详情
*/
private String majorDetails;
/**
* 专业概述
*/
private String majorOverview;
/**
* 专业大纲
*/
private String majorSyllabus;
/**
* 专业大纲
*/
private String majorKnowledge;
/**
* 证书要求
*/
private String majorCertificate;
/**
* 参考资料
*/
private String majorInformation;
/** 专业名称 */ /** 专业名称 */
@Excel(name = "专业名称") @Excel(name = "专业名称")
private String majorName; private String majorName;
......
ruoyi-ui/src/views/hezhi/notice/index.vue
View file @ 63bca5aa
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="缩略图" prop="showImg"> <el-form-item label="缩略图" prop="showImg">
<image-upload v-model="form.showImg" :limit="1" :width="752" :height="480"/> <image-upload v-model="form.showImg" :limit="1" :width="1900" :height="500"/>
</el-form-item> </el-form-item>
<el-form-item label="通知类型" prop="type"> <el-form-item label="通知类型" prop="type">
<el-radio-group v-model="form.type"> <el-radio-group v-model="form.type">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment