czg_team
/
chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
lyf 2023-02-06 19:14:21 +08:00
parent 55cabfa8af 004a57ccfd
commit 77235109a1
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml
View File

@ -17,7 +17,7 @@
<module name="pluss-api-page" /> <module name="pluss-api-page" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel> <bytecodeTargetLevel target="8">
<module name="code-generator" target="1.8" /> <module name="code-generator" target="1.8" />
<module name="pluss-api-page" target="1.8" /> <module name="pluss-api-page" target="1.8" />
<module name="pluss-common-bundle" target="1.8" /> <module name="pluss-common-bundle" target="1.8" />

6
pluss-common-bundle/src/main/resources/config/application-common.yml
View File

@ -9,11 +9,11 @@ ip138:
aliyun: aliyun:
# 这里推荐使用RAM账号信息 # # 这里推荐使用RAM账号信息 #
keyid: LTAI5tMLHwnM1zYYAFuRa1fK keyid: LTAI5tPdEfYSZcqHbjCrtPRD
keysecret: jS1h2STq1vcODczDNFQkjcU6ODyYAj keysecret: DZjyHBq3nTujF0NMLxnZgsecU8ZCvy
region-id: cn-hangzhou region-id: cn-hangzhou
sts: sts:
role-arn: role-arn: acs:ram::1413456038175003:role/oss
endpoint: https://sts.cn-hangzhou.aliyuncs.com endpoint: https://sts.cn-hangzhou.aliyuncs.com
oss: oss:
endpoint: https://oss-cn-hangzhou.aliyuncs.com endpoint: https://oss-cn-hangzhou.aliyuncs.com

6
pluss-manage-page/pluss-manage-page.iml
View File

@ -6,6 +6,11 @@
<webroots> <webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" /> <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots> </webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
<root url="file://$MODULE_DIR$/src/main/webapp" />
</sourceRoots>
</configuration> </configuration>
</facet> </facet>
<facet type="Spring" name="Spring"> <facet type="Spring" name="Spring">
@ -37,6 +42,7 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <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/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" /> <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" /> <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />

6
pluss-manage-page/pom.xml
View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>pluss-manage-page</artifactId> <artifactId>pluss-manage-page</artifactId>
<packaging>war</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
@ -80,13 +80,13 @@
</resource> </resource>
<!--2022-07-22 add--> <!--2022-07-22 add-->
<!-- <resource> <resource>
<directory>src/main/webapp</directory> <directory>src/main/webapp</directory>
<targetPath>META-INF/resources</targetPath> <targetPath>META-INF/resources</targetPath>
<includes> <includes>
<include>**/*.*</include> <include>**/*.*</include>
</includes> </includes>
</resource>--> </resource>
</resources> </resources>
<plugins> <plugins>

2
pluss-wap-page/pluss-wap-page.iml
View File

@ -36,6 +36,8 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <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/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />