From 23588c13fc31f6403184d46b027a9e0fd2fc2a9b Mon Sep 17 00:00:00 2001
From: zhujunshuai <602228920@qq.com>
Date: Mon, 6 Feb 2023 10:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9oss=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                                          | 2 +-
 .../src/main/resources/config/application-common.yml        | 6 +++---
 pluss-manage-page/pluss-manage-page.iml                     | 6 ++++++
 pluss-manage-page/pom.xml                                   | 6 +++---
 pluss-wap-page/pluss-wap-page.iml                           | 2 ++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index a82a4ae..e1229c0 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
         <module name="pluss-api-page" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="8">
       <module name="code-generator" target="1.8" />
       <module name="pluss-api-page" target="1.8" />
       <module name="pluss-common-bundle" target="1.8" />
diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml
index cb8bbd6..59ed1f7 100644
--- a/pluss-common-bundle/src/main/resources/config/application-common.yml
+++ b/pluss-common-bundle/src/main/resources/config/application-common.yml
@@ -9,11 +9,11 @@ ip138:
 
 aliyun:
   # 这里推荐使用RAM账号信息 #
-  keyid: LTAI5tMLHwnM1zYYAFuRa1fK
-  keysecret: jS1h2STq1vcODczDNFQkjcU6ODyYAj
+  keyid: LTAI5tPdEfYSZcqHbjCrtPRD
+  keysecret: DZjyHBq3nTujF0NMLxnZgsecU8ZCvy
   region-id: cn-hangzhou
   sts:
-    role-arn:
+    role-arn: acs:ram::1413456038175003:role/oss
     endpoint: https://sts.cn-hangzhou.aliyuncs.com
   oss:
     endpoint: https://oss-cn-hangzhou.aliyuncs.com
diff --git a/pluss-manage-page/pluss-manage-page.iml b/pluss-manage-page/pluss-manage-page.iml
index 9ade217..f43d653 100644
--- a/pluss-manage-page/pluss-manage-page.iml
+++ b/pluss-manage-page/pluss-manage-page.iml
@@ -6,6 +6,11 @@
         <webroots>
           <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
         </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>
     </facet>
     <facet type="Spring" name="Spring">
@@ -37,6 +42,7 @@
     <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/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" />
diff --git a/pluss-manage-page/pom.xml b/pluss-manage-page/pom.xml
index 5a1a8ca..9621304 100644
--- a/pluss-manage-page/pom.xml
+++ b/pluss-manage-page/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>pluss-manage-page</artifactId>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -80,13 +80,13 @@
             </resource>
 
             <!--2022-07-22 add-->
-        <!--    <resource>
+           <resource>
                 <directory>src/main/webapp</directory>
                 <targetPath>META-INF/resources</targetPath>
                 <includes>
                     <include>**/*.*</include>
                 </includes>
-            </resource>-->
+            </resource>
 
         </resources>
         <plugins>
diff --git a/pluss-wap-page/pluss-wap-page.iml b/pluss-wap-page/pluss-wap-page.iml
index a5cf495..462208b 100644
--- a/pluss-wap-page/pluss-wap-page.iml
+++ b/pluss-wap-page/pluss-wap-page.iml
@@ -36,6 +36,8 @@
       <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/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" />
     </content>
     <orderEntry type="inheritedJdk" />