Merge pull request #56 from Jzow/v1.0.1

V1.0.1

.github/workflows/greetings.yml

@@ -0,0 +1,16 @@
+name: Greetings
+
+on: [pull_request_target, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: "Message that will be displayed on users' first issue"
+        pr-message: "Message that will be displayed on users' first pull request"

.github/workflows/maven.yml

@@ -10,25 +10,21 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ "master", "dev" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "master", "dev" ]
+    branches: [ "master" ]
 
 jobs:
   build:
 
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-     matrix:
-       os: [windows-latest, macos-latest, ubuntu-latest]
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 20.0.2
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '20.0.2'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

.gitignore

@@ -19,8 +19,4 @@ hs_err_pid*
 **/*.iml
 .gitattributes
 
-/api/src/main/resources/application-prod.yml
-/api/src/main/resources/application-dev.yml
-
-/log
-**/log/
+/api/src/main/resources/application-prod.yml

README.md

@@ -36,10 +36,6 @@ If you have any questions or suggestions, please submit [issue](https://github.c
 
 preview address: http://erp.wansen.cloud/
 
-## Version
-1. 1.0.2 (current version)
-2. 1.0.1 [old versions](https://github.com/wansenai/wansen-erp/releases/tag/V1.0.1)
-
 ## Module Description
 
 1. **Domain Module:**

api/pom.xml

@@ -5,14 +5,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.wansensoft</groupId>
-        <artifactId>wansen-erp-core</artifactId>
+        <artifactId>wansen-erp-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>api</artifactId>
+
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

api/src/main/java/com/wansensoft/api/ErpApplication.java

@@ -1,15 +1,3 @@
-/*
- * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
- * with the License. A copy of the License is located at
- *
- * http://opensource.wansenai.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
 package com.wansensoft.api;
 
 import com.wansensoft.utils.ComputerInfo;
@@ -37,4 +25,4 @@ public static void main(String[] args) throws IOException {
         System.out.println("您还需启动前端服务，启动命令：yarn run serve 或 npm run serve，测试用户：wansenerp，密码：123456");
     }
 
-}
+}

api/src/main/java/com/wansensoft/api/IncomeExpenseController.java

@@ -1,17 +1,6 @@
-/*
- * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
- * with the License. A copy of the License is located at
- *
- * http://opensource.wansenai.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
 package com.wansensoft.api;
 
+
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;